From e5ce2dc4987a654936fa4242ab1dcedc29fb55d7 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Wed, 14 Aug 2024 14:18:40 +0000
Subject: [PATCH 001/170] Bump 6.11.1

---
 .changeset/bump-patch-1723645120544.md |  5 +++++
 yarn.lock                              | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/bump-patch-1723645120544.md

diff --git a/.changeset/bump-patch-1723645120544.md b/.changeset/bump-patch-1723645120544.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1723645120544.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/yarn.lock b/yarn.lock
index a04c45ee1f64..d36e9c6d753a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8968,10 +8968,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 5.0.0-rc.6
-    "@rocket.chat/ui-contexts": 9.0.0-rc.6
-    "@rocket.chat/ui-kit": 0.36.0-rc.0
-    "@rocket.chat/ui-video-conf": 9.0.0-rc.6
+    "@rocket.chat/ui-avatar": 5.0.0
+    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-kit": 0.36.0
+    "@rocket.chat/ui-video-conf": 9.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9060,8 +9060,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 9.0.0-rc.6
-    "@rocket.chat/ui-contexts": 9.0.0-rc.6
+    "@rocket.chat/ui-client": 9.0.0
+    "@rocket.chat/ui-contexts": 9.0.0
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10281,7 +10281,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 9.0.0-rc.6
+    "@rocket.chat/ui-contexts": 9.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10334,7 +10334,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 9.0.0-rc.6
+    "@rocket.chat/ui-contexts": 9.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10510,8 +10510,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 5.0.0-rc.6
-    "@rocket.chat/ui-contexts": 9.0.0-rc.6
+    "@rocket.chat/ui-avatar": 5.0.0
+    "@rocket.chat/ui-contexts": 9.0.0
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10600,8 +10600,8 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/layout": "*"
-    "@rocket.chat/tools": 0.2.2-rc.0
-    "@rocket.chat/ui-contexts": 9.0.0-rc.6
+    "@rocket.chat/tools": 0.2.2
+    "@rocket.chat/ui-contexts": 9.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From b3ac6d93ae36af9ddd7cf750e34301891ccd2579 Mon Sep 17 00:00:00 2001
From: "Julio A." <52619625+julio-cfa@users.noreply.github.com>
Date: Thu, 15 Aug 2024 23:02:15 +0200
Subject: [PATCH 002/170] fix: security hotfix (#33062)

---
 .changeset/perfect-dancers-grab.md            |   5 +
 apps/meteor/app/api/server/v1/rooms.ts        |  10 +-
 apps/meteor/app/api/server/v1/users.ts        |   6 +
 .../app/livechat/imports/server/rest/sms.ts   |  12 +-
 .../views/admin/oauthApps/EditOauthApp.tsx    |   3 +-
 apps/meteor/ee/server/lib/audit/methods.ts    |  46 +++-
 apps/meteor/server/lib/ldap/Manager.ts        |   2 +-
 apps/meteor/server/methods/reportMessage.ts   |  13 ++
 .../server/methods/sendConfirmationEmail.ts   |  13 ++
 .../providers/mobex.ts                        |   5 +
 .../providers/twilio.ts                       |  26 +++
 .../providers/voxtelesys.ts                   |   5 +
 apps/meteor/server/settings/message.ts        |   2 +-
 apps/meteor/tests/end-to-end/api/methods.ts   | 162 +++++++++++++-
 apps/meteor/tests/end-to-end/api/rooms.ts     |   1 -
 apps/meteor/tests/end-to-end/api/users.ts     |  41 +++-
 .../providers/twilio.spec.ts                  | 211 ++++++++++++++++++
 packages/core-typings/package.json            |   3 +-
 packages/core-typings/src/omnichannel/sms.ts  |   3 +
 packages/rest-typings/src/v1/rooms.ts         |  69 +++++-
 yarn.lock                                     |  13 ++
 21 files changed, 605 insertions(+), 46 deletions(-)
 create mode 100644 .changeset/perfect-dancers-grab.md
 create mode 100644 apps/meteor/tests/unit/server/services/omnichannel-integrations/providers/twilio.spec.ts

diff --git a/.changeset/perfect-dancers-grab.md b/.changeset/perfect-dancers-grab.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/perfect-dancers-grab.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index e3296b98ef17..ee76dcdd9fe3 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -2,7 +2,13 @@ import { Media } from '@rocket.chat/core-services';
 import type { IRoom, IUpload } from '@rocket.chat/core-typings';
 import { Messages, Rooms, Users, Uploads } from '@rocket.chat/models';
 import type { Notifications } from '@rocket.chat/rest-typings';
-import { isGETRoomsNameExists, isRoomsImagesProps, isRoomsMuteUnmuteUserProps, isRoomsExportProps } from '@rocket.chat/rest-typings';
+import {
+	isGETRoomsNameExists,
+	isRoomsCleanHistoryProps,
+	isRoomsImagesProps,
+	isRoomsMuteUnmuteUserProps,
+	isRoomsExportProps,
+} from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { isTruthy } from '../../../../lib/isTruthy';
@@ -355,7 +361,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'rooms.cleanHistory',
-	{ authRequired: true },
+	{ authRequired: true, validateParams: isRoomsCleanHistoryProps },
 	{
 		async post() {
 			const { _id } = await findRoomByIdOrName({ params: this.bodyParams });
diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 7ae585b89dfa..6c680b6648d8 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -750,6 +750,12 @@ API.v1.addRoute(
 	{ authRequired: false },
 	{
 		async post() {
+			const isPasswordResetEnabled = settings.get('Accounts_PasswordReset');
+
+			if (!isPasswordResetEnabled) {
+				return API.v1.failure('Password reset is not enabled');
+			}
+
 			const { email } = this.bodyParams;
 			if (!email) {
 				return API.v1.failure("The 'email' param is required");
diff --git a/apps/meteor/app/livechat/imports/server/rest/sms.ts b/apps/meteor/app/livechat/imports/server/rest/sms.ts
index 6f8ce64bc635..6b2411cf8e3d 100644
--- a/apps/meteor/app/livechat/imports/server/rest/sms.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/sms.ts
@@ -97,12 +97,18 @@ const normalizeLocationSharing = (payload: ServiceData) => {
 // @ts-expect-error - this is an special endpoint that requires the return to not be wrapped as regular returns
 API.v1.addRoute('livechat/sms-incoming/:service', {
 	async post() {
-		if (!(await OmnichannelIntegration.isConfiguredSmsService(this.urlParams.service))) {
+		const { service } = this.urlParams;
+		if (!(await OmnichannelIntegration.isConfiguredSmsService(service))) {
 			return API.v1.failure('Invalid service');
 		}
 
 		const smsDepartment = settings.get<string>('SMS_Default_Omnichannel_Department');
-		const SMSService = await OmnichannelIntegration.getSmsService(this.urlParams.service);
+		const SMSService = await OmnichannelIntegration.getSmsService(service);
+
+		if (!SMSService.validateRequest(this.request)) {
+			return API.v1.failure('Invalid request');
+		}
+
 		const sms = SMSService.parse(this.bodyParams);
 		const { department } = this.queryParams;
 		let targetDepartment = await defineDepartment(department || smsDepartment);
@@ -121,7 +127,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 			},
 			source: {
 				type: OmnichannelSourceType.SMS,
-				alias: this.urlParams.service,
+				alias: service,
 			},
 		};
 
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
index 19bef201492f..79d2fbe11140 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
@@ -8,6 +8,7 @@ import {
 	FieldRow,
 	FieldError,
 	FieldHint,
+	PasswordInput,
 	TextAreaInput,
 	ToggleSwitch,
 	FieldGroup,
@@ -136,7 +137,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 				<Field>
 					<FieldLabel>{t('Client_Secret')}</FieldLabel>
 					<FieldRow>
-						<TextInput value={data.clientSecret} />
+						<PasswordInput value={data.clientSecret} />
 					</FieldRow>
 				</Field>
 				<Field>
diff --git a/apps/meteor/ee/server/lib/audit/methods.ts b/apps/meteor/ee/server/lib/audit/methods.ts
index add64414c6e8..b221f4a2f1e1 100644
--- a/apps/meteor/ee/server/lib/audit/methods.ts
+++ b/apps/meteor/ee/server/lib/audit/methods.ts
@@ -88,11 +88,18 @@ Meteor.methods<ServerMethods>({
 		check(startDate, Date);
 		check(endDate, Date);
 
-		const user = await Meteor.userAsync();
+		const user = (await Meteor.userAsync()) as IUser;
 		if (!user || !(await hasPermissionAsync(user._id, 'can-audit'))) {
 			throw new Meteor.Error('Not allowed');
 		}
 
+		const userFields = {
+			_id: user._id,
+			username: user.username,
+			...(user.name && { name: user.name }),
+			...(user.avatarETag && { avatarETag: user.avatarETag }),
+		};
+
 		const rooms: IRoom[] = await LivechatRooms.findByVisitorIdAndAgentId(visitor, agent, {
 			projection: { _id: 1 },
 		}).toArray();
@@ -118,7 +125,7 @@ Meteor.methods<ServerMethods>({
 		await AuditLog.insertOne({
 			ts: new Date(),
 			results: messages.length,
-			u: user,
+			u: userFields,
 			fields: { msg, users: usernames, rids, room: name, startDate, endDate, type, visitor, agent },
 		});
 
@@ -128,11 +135,18 @@ Meteor.methods<ServerMethods>({
 		check(startDate, Date);
 		check(endDate, Date);
 
-		const user = await Meteor.userAsync();
+		const user = (await Meteor.userAsync()) as IUser;
 		if (!user || !(await hasPermissionAsync(user._id, 'can-audit'))) {
 			throw new Meteor.Error('Not allowed');
 		}
 
+		const userFields = {
+			_id: user._id,
+			username: user.username,
+			...(user.name && { name: user.name }),
+			...(user.avatarETag && { avatarETag: user.avatarETag }),
+		};
+
 		let rids;
 		let name;
 
@@ -169,9 +183,10 @@ Meteor.methods<ServerMethods>({
 		await AuditLog.insertOne({
 			ts: new Date(),
 			results: messages.length,
-			u: user,
+			u: userFields,
 			fields: { msg, users: usernames, rids, room: name, startDate, endDate, type, visitor, agent },
 		});
+
 		updateCounter({ settingsId: 'Message_Auditing_Panel_Load_Count' });
 
 		return messages;
@@ -183,13 +198,24 @@ Meteor.methods<ServerMethods>({
 		if (!uid || !(await hasPermissionAsync(uid, 'can-audit-log'))) {
 			throw new Meteor.Error('Not allowed');
 		}
-		return AuditLog.find({
-			// 'u._id': userId,
-			ts: {
-				$gt: startDate,
-				$lt: endDate,
+		return AuditLog.find(
+			{
+				// 'u._id': userId,
+				ts: {
+					$gt: startDate,
+					$lt: endDate,
+				},
 			},
-		}).toArray();
+			{
+				projection: {
+					'u.services': 0,
+					'u.roles': 0,
+					'u.lastLogin': 0,
+					'u.statusConnection': 0,
+					'u.emails': 0,
+				},
+			},
+		).toArray();
 	},
 });
 
diff --git a/apps/meteor/server/lib/ldap/Manager.ts b/apps/meteor/server/lib/ldap/Manager.ts
index ab000b142225..f0efcc04539d 100644
--- a/apps/meteor/server/lib/ldap/Manager.ts
+++ b/apps/meteor/server/lib/ldap/Manager.ts
@@ -165,7 +165,7 @@ export class LDAPManager {
 
 		const { attribute: idAttribute, value: id } = uniqueId;
 		const username = this.slugifyUsername(ldapUser, usedUsername || id || '') || undefined;
-		const emails = this.getLdapEmails(ldapUser, username);
+		const emails = this.getLdapEmails(ldapUser, username).map((email) => email.trim());
 		const name = this.getLdapName(ldapUser) || undefined;
 
 		const userData: IImportUser = {
diff --git a/apps/meteor/server/methods/reportMessage.ts b/apps/meteor/server/methods/reportMessage.ts
index 05ac5aaf7e7b..14ef69189b33 100644
--- a/apps/meteor/server/methods/reportMessage.ts
+++ b/apps/meteor/server/methods/reportMessage.ts
@@ -3,6 +3,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { ModerationReports, Rooms, Users, Messages } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import { Meteor } from 'meteor/meteor';
 
 import { canAccessRoomAsync } from '../../app/authorization/server/functions/canAccessRoom';
@@ -82,3 +83,15 @@ Meteor.methods<ServerMethods>({
 		return true;
 	},
 });
+
+DDPRateLimiter.addRule(
+	{
+		type: 'method',
+		name: 'reportMessage',
+		userId() {
+			return true;
+		},
+	},
+	5,
+	60000,
+);
diff --git a/apps/meteor/server/methods/sendConfirmationEmail.ts b/apps/meteor/server/methods/sendConfirmationEmail.ts
index 8c7d056532d3..9ed7e0b99da2 100644
--- a/apps/meteor/server/methods/sendConfirmationEmail.ts
+++ b/apps/meteor/server/methods/sendConfirmationEmail.ts
@@ -2,6 +2,7 @@ import { Users } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Accounts } from 'meteor/accounts-base';
 import { check } from 'meteor/check';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import { Meteor } from 'meteor/meteor';
 
 import { methodDeprecationLogger } from '../../app/lib/server/lib/deprecationWarningLogger';
@@ -31,3 +32,15 @@ Meteor.methods<ServerMethods>({
 		}
 	},
 });
+
+DDPRateLimiter.addRule(
+	{
+		type: 'method',
+		name: 'sendConfirmationEmail',
+		userId() {
+			return true;
+		},
+	},
+	5,
+	60000,
+);
diff --git a/apps/meteor/server/services/omnichannel-integrations/providers/mobex.ts b/apps/meteor/server/services/omnichannel-integrations/providers/mobex.ts
index 19284b8e1e6b..d036345663cd 100644
--- a/apps/meteor/server/services/omnichannel-integrations/providers/mobex.ts
+++ b/apps/meteor/server/services/omnichannel-integrations/providers/mobex.ts
@@ -1,6 +1,7 @@
 import { Base64 } from '@rocket.chat/base64';
 import type { ISMSProvider, ServiceData, SMSProviderResult, SMSProviderResponse } from '@rocket.chat/core-typings';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
+import type { Request } from 'express';
 
 import { settings } from '../../../../app/settings/server';
 import { SystemLogger } from '../../../lib/logger/system';
@@ -196,6 +197,10 @@ export class Mobex implements ISMSProvider {
 		};
 	}
 
+	validateRequest(_request: Request): boolean {
+		return true;
+	}
+
 	error(error: Error & { reason?: string }): SMSProviderResponse {
 		let message = '';
 		if (error.reason) {
diff --git a/apps/meteor/server/services/omnichannel-integrations/providers/twilio.ts b/apps/meteor/server/services/omnichannel-integrations/providers/twilio.ts
index 3aff869a95a0..4a1c8d9d0ebf 100644
--- a/apps/meteor/server/services/omnichannel-integrations/providers/twilio.ts
+++ b/apps/meteor/server/services/omnichannel-integrations/providers/twilio.ts
@@ -1,6 +1,7 @@
 import { api } from '@rocket.chat/core-services';
 import type { ISMSProvider, ServiceData, SMSProviderResponse, SMSProviderResult } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
+import type { Request } from 'express';
 import filesize from 'filesize';
 import twilio from 'twilio';
 
@@ -244,6 +245,31 @@ export class Twilio implements ISMSProvider {
 		};
 	}
 
+	isRequestFromTwilio(signature: string, requestBody: object): boolean {
+		const authToken = settings.get<string>('SMS_Twilio_authToken');
+		const siteUrl = settings.get<string>('Site_Url');
+
+		if (!authToken || !siteUrl) {
+			SystemLogger.error(`(Twilio) -> URL or Twilio token not configured.`);
+			return false;
+		}
+
+		const twilioUrl = siteUrl.endsWith('/')
+			? `${siteUrl}api/v1/livechat/sms-incoming/twilio`
+			: `${siteUrl}/api/v1/livechat/sms-incoming/twilio`;
+		return twilio.validateRequest(authToken, signature, twilioUrl, requestBody);
+	}
+
+	validateRequest(request: Request): boolean {
+		// We're not getting original twilio requests on CI :p
+		if (process.env.TEST_MODE === 'true') {
+			return true;
+		}
+		const twilioHeader = request.headers['x-twilio-signature'] || '';
+		const twilioSignature = Array.isArray(twilioHeader) ? twilioHeader[0] : twilioHeader;
+		return this.isRequestFromTwilio(twilioSignature, request.body);
+	}
+
 	error(error: Error & { reason?: string }): SMSProviderResponse {
 		let message = '';
 		if (error.reason) {
diff --git a/apps/meteor/server/services/omnichannel-integrations/providers/voxtelesys.ts b/apps/meteor/server/services/omnichannel-integrations/providers/voxtelesys.ts
index 3e78907bbf75..aa42bacad624 100644
--- a/apps/meteor/server/services/omnichannel-integrations/providers/voxtelesys.ts
+++ b/apps/meteor/server/services/omnichannel-integrations/providers/voxtelesys.ts
@@ -2,6 +2,7 @@ import { api } from '@rocket.chat/core-services';
 import type { ISMSProvider, ServiceData, SMSProviderResponse } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
+import type { Request } from 'express';
 import filesize from 'filesize';
 
 import { settings } from '../../../../app/settings/server';
@@ -162,6 +163,10 @@ export class Voxtelesys implements ISMSProvider {
 		};
 	}
 
+	validateRequest(_request: Request): boolean {
+		return true;
+	}
+
 	error(error: Error & { reason?: string }): SMSProviderResponse {
 		let message = '';
 		if (error.reason) {
diff --git a/apps/meteor/server/settings/message.ts b/apps/meteor/server/settings/message.ts
index 6ec6e3355655..520af87d2333 100644
--- a/apps/meteor/server/settings/message.ts
+++ b/apps/meteor/server/settings/message.ts
@@ -32,7 +32,7 @@ export const createMessageSettings = () =>
 				],
 			});
 
-			await this.add('Message_Attachments_Strip_Exif', false, {
+			await this.add('Message_Attachments_Strip_Exif', true, {
 				type: 'boolean',
 				public: true,
 				i18nDescription: 'Message_Attachments_Strip_ExifDescription',
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index e1ca05d1fbf2..197a71f8e8f2 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -2030,6 +2030,13 @@ describe('Meteor.methods', () => {
 		let messageWithMarkdownId: IMessage['_id'];
 		let channelName: string;
 		const siteUrl = process.env.SITE_URL || process.env.TEST_API_URL || 'http://localhost:3000';
+		let testUser: TestUser<IUser>;
+		let testUserCredentials: Credentials;
+
+		before(async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+		});
 
 		before('create room', (done) => {
 			channelName = `methods-test-channel-${Date.now()}`;
@@ -2125,13 +2132,14 @@ describe('Meteor.methods', () => {
 		after(() =>
 			Promise.all([
 				deleteRoom({ type: 'p', roomId: rid }),
+				deleteUser(testUser),
 				updatePermission('bypass-time-limit-edit-and-delete', ['bot', 'app']),
 				updateSetting('Message_AllowEditing_BlockEditInMinutes', 0),
 			]),
 		);
 
-		it('should update a message with a URL', (done) => {
-			void request
+		it('should update a message with a URL', async () => {
+			await request
 				.post(methodCall('updateMessage'))
 				.set(credentials)
 				.send({
@@ -2149,8 +2157,53 @@ describe('Meteor.methods', () => {
 					expect(res.body).to.have.a.property('message').that.is.a('string');
 					const data = JSON.parse(res.body.message);
 					expect(data).to.have.a.property('msg').that.is.an('string');
+				});
+		});
+
+		it('should fail if user does not have permissions to update a message with the same content', async () => {
+			await request
+				.post(methodCall('updateMessage'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateMessage',
+						params: [{ _id: messageId, rid, msg: 'test message with https://github.com' }],
+						id: 'id',
+						msg: 'method',
+					}),
 				})
-				.end(done);
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('success', true);
+					expect(res.body).to.have.a.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('msg').that.is.an('string');
+					expect(data.error).to.have.a.property('error', 'error-action-not-allowed');
+				});
+		});
+
+		it('should fail if user does not have permissions to update a message with different content', async () => {
+			await request
+				.post(methodCall('updateMessage'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateMessage',
+						params: [{ _id: messageId, rid, msg: 'updating test message with https://github.com' }],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('success', true);
+					expect(res.body).to.have.a.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('msg').that.is.an('string');
+					expect(data.error).to.have.a.property('error', 'error-action-not-allowed');
+				});
 		});
 
 		it('should add a quote attachment to a message', async () => {
@@ -3295,4 +3348,107 @@ describe('Meteor.methods', () => {
 				.end(done);
 		});
 	});
+	(IS_EE ? describe : describe.skip)('[@auditGetAuditions] EE', () => {
+		let testUser: TestUser<IUser>;
+		let testUserCredentials: Credentials;
+
+		const now = new Date();
+		const startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0, 0).getTime();
+		const endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999).getTime();
+
+		before('create test user', async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+		});
+
+		before('generate audits data', async () => {
+			await request
+				.post(methodCall('auditGetMessages'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'auditGetMessages',
+						params: [
+							{
+								type: '',
+								msg: 'test1234',
+								startDate: { $date: startDate },
+								endDate: { $date: endDate },
+								rid: 'GENERAL',
+								users: [],
+							},
+						],
+						id: '14',
+						msg: 'method',
+					}),
+				});
+		});
+
+		after(() => Promise.all([deleteUser(testUser)]));
+
+		it('should fail if the user does not have permissions to get auditions', async () => {
+			await request
+				.post(methodCall('auditGetAuditions'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'auditGetAuditions',
+						params: [
+							{
+								startDate: { $date: startDate },
+								endDate: { $date: endDate },
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('error', 'Not allowed');
+				});
+		});
+
+		it('should not return more user data than necessary - e.g. passwords, hashes, tokens', async () => {
+			await request
+				.post(methodCall('auditGetAuditions'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'auditGetAuditions',
+						params: [
+							{
+								startDate: { $date: startDate },
+								endDate: { $date: endDate },
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('success', true);
+					expect(res.body).to.have.a.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('result').that.is.an('array');
+					expect(data.result.length).to.be.greaterThan(0);
+					expect(data).to.have.a.property('msg', 'result');
+					expect(data).to.have.a.property('id', '18');
+					data.result.forEach((item: any) => {
+						expect(item).to.have.all.keys('_id', 'ts', 'results', 'u', 'fields', '_updatedAt');
+						expect(item.u).to.not.have.property('services');
+						expect(item.u).to.not.have.property('roles');
+						expect(item.u).to.not.have.property('lastLogin');
+						expect(item.u).to.not.have.property('statusConnection');
+						expect(item.u).to.not.have.property('emails');
+					});
+				});
+		});
+	});
 });
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index a8d64b1f4c7d..b502bca6add8 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -1024,7 +1024,6 @@ describe('[Rooms]', () => {
 				.end(done);
 		});
 	});
-
 	describe('[/rooms.info]', () => {
 		let testChannel: IRoom;
 		let testGroup: IRoom;
diff --git a/apps/meteor/tests/end-to-end/api/users.ts b/apps/meteor/tests/end-to-end/api/users.ts
index d6112dd2416b..ea2aa5baa99b 100644
--- a/apps/meteor/tests/end-to-end/api/users.ts
+++ b/apps/meteor/tests/end-to-end/api/users.ts
@@ -2624,18 +2624,37 @@ describe('[Users]', () => {
 	});
 
 	describe('[/users.forgotPassword]', () => {
+		it('should return an error when "Accounts_PasswordReset" is disabled', (done) => {
+			void updateSetting('Accounts_PasswordReset', false).then(() => {
+				void request
+					.post(api('users.forgotPassword'))
+					.send({
+						email: adminEmail,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'Password reset is not enabled');
+					})
+					.end(done);
+			});
+		});
+
 		it('should send email to user (return success), when is a valid email', (done) => {
-			void request
-				.post(api('users.forgotPassword'))
-				.send({
-					email: adminEmail,
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(200)
-				.expect((res) => {
-					expect(res.body).to.have.property('success', true);
-				})
-				.end(done);
+			void updateSetting('Accounts_PasswordReset', true).then(() => {
+				void request
+					.post(api('users.forgotPassword'))
+					.send({
+						email: adminEmail,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+					})
+					.end(done);
+			});
 		});
 
 		it('should not send email to user(return error), when is a invalid email', (done) => {
diff --git a/apps/meteor/tests/unit/server/services/omnichannel-integrations/providers/twilio.spec.ts b/apps/meteor/tests/unit/server/services/omnichannel-integrations/providers/twilio.spec.ts
new file mode 100644
index 000000000000..f3c5d281aefb
--- /dev/null
+++ b/apps/meteor/tests/unit/server/services/omnichannel-integrations/providers/twilio.spec.ts
@@ -0,0 +1,211 @@
+import crypto from 'crypto';
+
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const settingsStub = {
+	get: sinon.stub(),
+};
+
+const twilioStub = {
+	validateRequest: sinon.stub(),
+	isRequestFromTwilio: sinon.stub(),
+};
+
+const { Twilio } = proxyquire.noCallThru().load('../../../../../../server/services/omnichannel-integrations/providers/twilio.ts', {
+	'../../../../app/settings/server': { settings: settingsStub },
+	'../../../../app/utils/server/restrictions': { fileUploadIsValidContentType: sinon.stub() },
+	'../../../lib/i18n': { i18n: sinon.stub() },
+	'../../../lib/logger/system': { SystemLogger: { error: sinon.stub() } },
+});
+
+/**
+ * Get a valid Twilio signature for a request
+ *
+ * @param {String} authToken your Twilio AuthToken
+ * @param {String} url your webhook URL
+ * @param {Object} params the included request parameters
+ */
+function getSignature(authToken: string, url: string, params: Record<string, any>): string {
+	// get all request parameters
+	const data = Object.keys(params)
+		// sort them
+		.sort()
+		// concatenate them to a string
+
+		.reduce((acc, key) => acc + key + params[key], url);
+
+	return (
+		crypto
+			// sign the string with sha1 using your AuthToken
+			.createHmac('sha1', authToken)
+			.update(Buffer.from(data, 'utf-8'))
+			// base64 encode it
+			.digest('base64')
+	);
+}
+
+describe('Twilio Request Validation', () => {
+	beforeEach(() => {
+		settingsStub.get.reset();
+		twilioStub.validateRequest.reset();
+		twilioStub.isRequestFromTwilio.reset();
+	});
+
+	it('should not validate a request when process.env.TEST_MODE is true', () => {
+		process.env.TEST_MODE = 'true';
+
+		const twilio = new Twilio();
+		const request = {
+			headers: {
+				'x-twilio-signature': 'test',
+			},
+		};
+
+		expect(twilio.validateRequest(request)).to.be.true;
+	});
+
+	it('should not validate a request when process.env.TEST_MODE is true', () => {
+		process.env.TEST_MODE = 'true';
+
+		const twilio = new Twilio();
+		const request = {
+			headers: {
+				'x-twilio-signature': 'test',
+			},
+		};
+
+		expect(twilio.validateRequest(request)).to.be.true;
+	});
+
+	it('should validate a request when process.env.TEST_MODE is false', () => {
+		process.env.TEST_MODE = 'false';
+
+		settingsStub.get.withArgs('SMS_Twilio_authToken').returns('test');
+		settingsStub.get.withArgs('Site_Url').returns('https://example.com');
+
+		const twilio = new Twilio();
+		const requestBody = {
+			To: 'test',
+			From: 'test',
+			Body: 'test',
+		};
+
+		const request = {
+			headers: {
+				'x-twilio-signature': getSignature('test', 'https://example.com/api/v1/livechat/sms-incoming/twilio', requestBody),
+			},
+			body: requestBody,
+		};
+
+		expect(twilio.validateRequest(request)).to.be.true;
+	});
+
+	it('should reject a request where signature doesnt match', () => {
+		settingsStub.get.withArgs('SMS_Twilio_authToken').returns('test');
+		settingsStub.get.withArgs('Site_Url').returns('https://example.com');
+
+		const twilio = new Twilio();
+		const requestBody = {
+			To: 'test',
+			From: 'test',
+			Body: 'test',
+		};
+
+		const request = {
+			headers: {
+				'x-twilio-signature': getSignature('anotherAuthToken', 'https://example.com/api/v1/livechat/sms-incoming/twilio', requestBody),
+			},
+			body: requestBody,
+		};
+
+		expect(twilio.validateRequest(request)).to.be.false;
+	});
+
+	it('should reject a request where signature is missing', () => {
+		settingsStub.get.withArgs('SMS_Twilio_authToken').returns('test');
+		settingsStub.get.withArgs('Site_Url').returns('https://example.com');
+
+		const twilio = new Twilio();
+		const requestBody = {
+			To: 'test',
+			From: 'test',
+			Body: 'test',
+		};
+
+		const request = {
+			headers: {},
+			body: requestBody,
+		};
+
+		expect(twilio.validateRequest(request)).to.be.false;
+	});
+
+	it('should reject a request where the signature doesnt correspond body', () => {
+		settingsStub.get.withArgs('SMS_Twilio_authToken').returns('test');
+		settingsStub.get.withArgs('Site_Url').returns('https://example.com');
+
+		const twilio = new Twilio();
+		const requestBody = {
+			To: 'test',
+			From: 'test',
+			Body: 'test',
+		};
+
+		const request = {
+			headers: {
+				'x-twilio-signature': getSignature('test', 'https://example.com/api/v1/livechat/sms-incoming/twilio', {}),
+			},
+			body: requestBody,
+		};
+
+		expect(twilio.validateRequest(request)).to.be.false;
+	});
+
+	it('should return false if URL is not provided', () => {
+		process.env.TEST_MODE = 'false';
+
+		settingsStub.get.withArgs('SMS_Twilio_authToken').returns('test');
+		settingsStub.get.withArgs('Site_Url').returns('');
+
+		const twilio = new Twilio();
+		const requestBody = {
+			To: 'test',
+			From: 'test',
+			Body: 'test',
+		};
+
+		const request = {
+			headers: {
+				'x-twilio-signature': getSignature('test', 'https://example.com/api/v1/livechat/sms-incoming/twilio', requestBody),
+			},
+			body: requestBody,
+		};
+
+		expect(twilio.validateRequest(request)).to.be.false;
+	});
+
+	it('should return false if authToken is not provided', () => {
+		process.env.TEST_MODE = 'false';
+
+		settingsStub.get.withArgs('SMS_Twilio_authToken').returns('');
+		settingsStub.get.withArgs('Site_Url').returns('https://example.com');
+
+		const twilio = new Twilio();
+		const requestBody = {
+			To: 'test',
+			From: 'test',
+			Body: 'test',
+		};
+
+		const request = {
+			headers: {
+				'x-twilio-signature': getSignature('test', 'https://example.com/api/v1/livechat/sms-incoming/twilio', requestBody),
+			},
+			body: requestBody,
+		};
+
+		expect(twilio.validateRequest(request)).to.be.false;
+	});
+});
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index a9f4fdd293e3..3c0c97198b7f 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -25,7 +25,8 @@
 		"@rocket.chat/apps-engine": "1.44.0",
 		"@rocket.chat/icons": "^0.36.0",
 		"@rocket.chat/message-parser": "workspace:^",
-		"@rocket.chat/ui-kit": "workspace:~"
+		"@rocket.chat/ui-kit": "workspace:~",
+		"@types/express": "^4.17.21"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/core-typings/src/omnichannel/sms.ts b/packages/core-typings/src/omnichannel/sms.ts
index 7ff7a4768a13..49364da2b8c3 100644
--- a/packages/core-typings/src/omnichannel/sms.ts
+++ b/packages/core-typings/src/omnichannel/sms.ts
@@ -1,3 +1,5 @@
+import type { Request } from 'express';
+
 type ServiceMedia = {
 	url: string;
 	contentType: string;
@@ -27,6 +29,7 @@ export interface ISMSProviderConstructor {
 
 export interface ISMSProvider {
 	parse(data: unknown): ServiceData;
+	validateRequest(request: Request): boolean;
 
 	sendBatch?(from: string, to: string[], message: string): Promise<SMSProviderResult>;
 	response(): SMSProviderResponse;
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index 1c0b6a360f7b..868fd5850157 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -527,6 +527,62 @@ const roomsImagesPropsSchema = {
 
 export const isRoomsImagesProps = ajv.compile<RoomsImagesProps>(roomsImagesPropsSchema);
 
+export type RoomsCleanHistoryProps = {
+	roomId: IRoom['_id'];
+	latest: string;
+	oldest: string;
+	inclusive?: boolean;
+	excludePinned?: boolean;
+	filesOnly?: boolean;
+	users?: IUser['username'][];
+	limit?: number;
+	ignoreDiscussion?: boolean;
+	ignoreThreads?: boolean;
+};
+
+const roomsCleanHistorySchema = {
+	type: 'object',
+	properties: {
+		roomId: {
+			type: 'string',
+		},
+		latest: {
+			type: 'string',
+		},
+		oldest: {
+			type: 'string',
+		},
+		inclusive: {
+			type: 'boolean',
+		},
+		excludePinned: {
+			type: 'boolean',
+		},
+		filesOnly: {
+			type: 'boolean',
+		},
+		users: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+		},
+		limit: {
+			type: 'number',
+		},
+		ignoreDiscussion: {
+			type: 'boolean',
+		},
+		ignoreThreads: {
+			type: 'boolean',
+		},
+	},
+	required: ['roomId', 'latest', 'oldest'],
+	additionalProperties: false,
+};
+
+export const isRoomsCleanHistoryProps = ajv.compile<RoomsCleanHistoryProps>(roomsCleanHistorySchema);
+
 export type RoomsEndpoints = {
 	'/v1/rooms.autocomplete.channelAndPrivate': {
 		GET: (params: RoomsAutoCompleteChannelAndPrivateProps) => {
@@ -559,18 +615,7 @@ export type RoomsEndpoints = {
 	};
 
 	'/v1/rooms.cleanHistory': {
-		POST: (params: {
-			roomId: IRoom['_id'];
-			latest: string;
-			oldest: string;
-			inclusive?: boolean;
-			excludePinned?: boolean;
-			filesOnly?: boolean;
-			users?: IUser['username'][];
-			limit?: number;
-			ignoreDiscussion?: boolean;
-			ignoreThreads?: boolean;
-		}) => { _id: IRoom['_id']; count: number; success: boolean };
+		POST: (params: RoomsCleanHistoryProps) => { _id: IRoom['_id']; count: number; success: boolean };
 	};
 
 	'/v1/rooms.createDiscussion': {
diff --git a/yarn.lock b/yarn.lock
index d36e9c6d753a..84ca676c886c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8645,6 +8645,7 @@ __metadata:
     "@rocket.chat/icons": ^0.36.0
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
+    "@types/express": ^4.17.21
     eslint: ~8.45.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
@@ -13548,6 +13549,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/express@npm:^4.17.21":
+  version: 4.17.21
+  resolution: "@types/express@npm:4.17.21"
+  dependencies:
+    "@types/body-parser": "*"
+    "@types/express-serve-static-core": ^4.17.33
+    "@types/qs": "*"
+    "@types/serve-static": "*"
+  checksum: fb238298630370a7392c7abdc80f495ae6c716723e114705d7e3fb67e3850b3859bbfd29391463a3fb8c0b32051847935933d99e719c0478710f8098ee7091c5
+  languageName: node
+  linkType: hard
+
 "@types/fibers@npm:^3.1.3":
   version: 3.1.3
   resolution: "@types/fibers@npm:3.1.3"

From 3ca62ee7f78914bef393ae97c5ddd3719e794b81 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 21:18:41 +0000
Subject: [PATCH 003/170] fix: Retention policy cron max age settings
 reactivity (#33049)

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
---
 .../server/cronPruneMessages.ts               | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
index 337691bfbe57..640aa517a679 100644
--- a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
+++ b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
@@ -6,13 +6,20 @@ import { getCronAdvancedTimerFromPrecisionSetting } from '../../../lib/getCronAd
 import { cleanRoomHistory } from '../../lib/server/functions/cleanRoomHistory';
 import { settings } from '../../settings/server';
 
-const maxTimes = {
-	c: 0,
-	p: 0,
-	d: 0,
+type RetentionRoomTypes = 'c' | 'p' | 'd';
+
+const getMaxAgeSettingIdByRoomType = (type: RetentionRoomTypes) => {
+	switch (type) {
+		case 'c':
+			return settings.get<number>('RetentionPolicy_TTL_Channels');
+		case 'p':
+			return settings.get<number>('RetentionPolicy_TTL_Groups');
+		case 'd':
+			return settings.get<number>('RetentionPolicy_TTL_DMs');
+	}
 };
 
-let types: (keyof typeof maxTimes)[] = [];
+let types: RetentionRoomTypes[] = [];
 
 const oldest = new Date('0001-01-01T00:00:00Z');
 
@@ -29,7 +36,7 @@ async function job(): Promise<void> {
 
 	// get all rooms with default values
 	for await (const type of types) {
-		const maxAge = maxTimes[type] || 0;
+		const maxAge = getMaxAgeSettingIdByRoomType(type) || 0;
 		const latest = new Date(now.getTime() - maxAge);
 
 		const rooms = await Rooms.find(
@@ -95,9 +102,6 @@ settings.watchMultiple(
 		'RetentionPolicy_AppliesToChannels',
 		'RetentionPolicy_AppliesToGroups',
 		'RetentionPolicy_AppliesToDMs',
-		'RetentionPolicy_TTL_Channels',
-		'RetentionPolicy_TTL_Groups',
-		'RetentionPolicy_TTL_DMs',
 		'RetentionPolicy_Advanced_Precision',
 		'RetentionPolicy_Advanced_Precision_Cron',
 		'RetentionPolicy_Precision',
@@ -120,10 +124,6 @@ settings.watchMultiple(
 			types.push('d');
 		}
 
-		maxTimes.c = settings.get<number>('RetentionPolicy_TTL_Channels');
-		maxTimes.p = settings.get<number>('RetentionPolicy_TTL_Groups');
-		maxTimes.d = settings.get<number>('RetentionPolicy_TTL_DMs');
-
 		const precision =
 			(settings.get<boolean>('RetentionPolicy_Advanced_Precision') && settings.get<string>('RetentionPolicy_Advanced_Precision_Cron')) ||
 			getCronAdvancedTimerFromPrecisionSetting(settings.get('RetentionPolicy_Precision'));

From 12e000d8894e83418345f2550e22d2a3c444eb4b Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 16 Aug 2024 00:45:00 +0000
Subject: [PATCH 004/170] Release 6.11.1

[no ci]
---
 .changeset/bump-patch-1723645120544.md        |  5 ---
 .changeset/perfect-dancers-grab.md            |  5 ---
 apps/meteor/CHANGELOG.md                      | 36 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 +++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 13 +++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 +++++++
 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   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 +++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 +++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/api-client/CHANGELOG.md           | 10 ++++++
 ee/packages/api-client/package.json           |  2 +-
 ee/packages/ddp-client/CHANGELOG.md           | 10 ++++++
 ee/packages/ddp-client/package.json           |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/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/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/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               |  9 +++++
 packages/ui-client/package.json               |  4 +--
 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/uikit-playground/CHANGELOG.md        | 11 ++++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +--
 68 files changed, 410 insertions(+), 54 deletions(-)
 delete mode 100644 .changeset/bump-patch-1723645120544.md
 delete mode 100644 .changeset/perfect-dancers-grab.md

diff --git a/.changeset/bump-patch-1723645120544.md b/.changeset/bump-patch-1723645120544.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1723645120544.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/perfect-dancers-grab.md b/.changeset/perfect-dancers-grab.md
deleted file mode 100644
index eacb88108a0f..000000000000
--- a/.changeset/perfect-dancers-grab.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index f466c34da838..aa58cd1ba36a 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/meteor
 
+## 6.11.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33062](https://github.com/RocketChat/Rocket.Chat/pull/33062)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/api-client@0.2.4
+  - @rocket.chat/license@0.2.4
+  - @rocket.chat/omnichannel-services@0.3.1
+  - @rocket.chat/pdf-worker@0.2.1
+  - @rocket.chat/presence@0.2.4
+  - @rocket.chat/apps@0.1.4
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/cron@0.1.4
+  - @rocket.chat/fuselage-ui-kit@9.0.1
+  - @rocket.chat/gazzodown@9.0.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/ui-contexts@9.0.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.1
+  - @rocket.chat/ui-theming@0.2.0
+  - @rocket.chat/ui-avatar@5.0.1
+  - @rocket.chat/ui-client@9.0.1
+  - @rocket.chat/ui-video-conf@9.0.1
+  - @rocket.chat/web-ui-registration@9.0.1
+  - @rocket.chat/instance-status@0.1.4
+  </details>
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index d5c0801e8d9c..74c84a88cef2 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.11.0"
+	"version": "6.11.1"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 230250c5ca64..87dd221531e1 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 1.3.0
 
 ### Minor Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 76a0c59d54e6..59f351444031 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": "1.3.0",
+	"version": "1.3.1",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 2cb522daf0d0..044bb765e2db 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": "6.11.0",
+	"version": "6.11.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index fd5eb3925946..c72b16bd401f 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index ac28eb76e76d..895d955510fd 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.3",
+	"version": "0.4.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 df7be3c9b1eb..03f7cb62a50b 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index bff15e7f7d91..7c6783838a84 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.3",
+	"version": "0.4.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 1162e17c05d7..22ddcea338a5 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.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/ui-contexts@9.0.1
+  - @rocket.chat/models@0.2.1
+  - @rocket.chat/instance-status@0.1.4
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 7bcf45bf354c..e2d4fd6320b0 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.3",
+	"version": "0.3.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 aac67c02dd3d..b9837882510c 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/omnichannel-services@0.3.1
+  - @rocket.chat/pdf-worker@0.2.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index f23c79d97652..293e5c1be775 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.3",
+	"version": "0.4.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 b9544b0cdde9..614c49928415 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/presence@0.2.4
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index c800dd4d6c80..457eb9225b6c 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.3",
+	"version": "0.4.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 12271005af74..53be288ed34d 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/omnichannel-services@0.3.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 0a227cb271c0..72bc5d688e36 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.3",
+	"version": "0.4.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 3fbf664a0b30..284e853f4737 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 812522a5f1d8..d1f2e64acfc0 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.3",
+	"version": "0.4.4",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md
index 8fe130aeaf28..7430778db198 100644
--- a/ee/packages/api-client/CHANGELOG.md
+++ b/ee/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json
index bc809cff907f..d5744d456a46 100644
--- a/ee/packages/api-client/package.json
+++ b/ee/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
 		"@swc/jest": "^0.2.29",
diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md
index 0f9b5f7f26b3..c26b0c47f6cb 100644
--- a/ee/packages/ddp-client/CHANGELOG.md
+++ b/ee/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ddp-client
 
+## 0.3.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/api-client@0.2.4
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json
index 46d67b3ee508..192ea63af72d 100644
--- a/ee/packages/ddp-client/package.json
+++ b/ee/packages/ddp-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.3",
+	"version": "0.3.4",
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
 		"@swc/jest": "^0.2.29",
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index 8cc9df0dd502..9dce96a0310d 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 468a3d1a857c..e5317dc08bcc 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"private": true,
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index a4a49de7aa30..d3bbf0b00655 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.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/pdf-worker@0.2.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/model-typings@0.6.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index b66697cd7ed8..f6c66eba4550 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.0",
+	"version": "0.3.1",
 	"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 5ebe251216a7..a67dc8eafd21 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.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  </details>
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 7ce07434aca7..d2a0e3029eff 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.0",
+	"version": "0.2.1",
 	"private": true,
 	"devDependencies": {
 		"@storybook/addon-essentials": "~6.5.16",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 3d1a7e35b705..93d927c5bc5c 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/core-services@0.5.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index b7c4ea821fe2..a01538b8de6c 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 690dc984c631..edc1f5da7e54 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.11.0",
+	"version": "6.11.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 07f4af49f31e..e9efd36ae6bc 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/model-typings@0.6.1
+  </details>
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 32a25abbbf43..254e1566e120 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 0c10b78c3bf4..9871852c0245 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.5.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.5.0
 
 ### Minor Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 0c459736456c..072157066bcf 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index fb313a4d1320..42bcd35326fa 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.11.1
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 3c0c97198b7f..16e17d410ad5 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.11.0",
+	"version": "6.11.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 33c0c9872a60..b2b06e586370 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 868d5b5fb504..ede7f521da8c 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index e8fe73f6d549..0b1435f47f1b 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 9.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/gazzodown@9.0.1
+  - @rocket.chat/ui-contexts@9.0.1
+  - @rocket.chat/ui-avatar@5.0.1
+  - @rocket.chat/ui-video-conf@9.0.1
+  </details>
+
 ## 9.0.0
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 4a1d7e4b7839..32d18d782968 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "5.0.0",
-    "@rocket.chat/ui-contexts": "9.0.0",
+    "@rocket.chat/ui-avatar": "5.0.1",
+    "@rocket.chat/ui-contexts": "9.0.1",
     "@rocket.chat/ui-kit": "0.36.0",
-    "@rocket.chat/ui-video-conf": "9.0.0",
+    "@rocket.chat/ui-video-conf": "9.0.1",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 4febdb0f54b2..48b701cbeb54 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 9.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/ui-contexts@9.0.1
+  - @rocket.chat/ui-client@9.0.1
+  </details>
+
 ## 9.0.0
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 054a6ccaef66..7341d79bba85 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -71,8 +71,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "9.0.0",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-client": "9.0.1",
+		"@rocket.chat/ui-contexts": "9.0.1",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 849ccf591d08..d314c504721c 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.1
+  </details>
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 088cba613d8e..2037a3cf5f61 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.3",
+	"version": "0.1.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 56265d43563f..87cdaae78911 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@9.0.1
+  </details>
+
 ## 1.19.0
 
 ### Minor Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 9d40643dd4c5..6974bd1a2acd 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.0",
+	"version": "1.19.1",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 29eaadd0e0fe..6b27e4ad4ab1 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.6.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  </details>
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index c06e25f68d73..edc79f10e2df 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index e2b984708aaa..772805da3b8f 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.6.1
+  </details>
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 174464796076..c09d8cea307f 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"private": true,
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index efcab160b8e6..9f0e3a01cd21 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.11.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  </details>
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 77a78a6e938a..a7a8275dd276 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.11.0",
+	"version": "6.11.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/jest": "~29.5.7",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index f65d986cfaf5..927a3463e069 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 5.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.1
+  </details>
+
 ## 5.0.0
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 3f429ca08278..92d1382de36e 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "5.0.0",
+	"version": "5.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-contexts": "9.0.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 5936f8038bc8..8dee0ec12c50 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 9.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.1
+  </details>
+
 ## 9.0.0
 
 ### Minor Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index d5b6c74cf982..43743f37339f 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -63,7 +63,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-contexts": "9.0.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index fb3d074b6fbe..4e21589c1388 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 9.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.1
+  - @rocket.chat/rest-typings@6.11.1
+  - @rocket.chat/ddp-client@0.3.4
+  </details>
+
 ## 9.0.0
 
 ### Minor Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 4971be05fdcc..85d6df1b93e6 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"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 2a697e293211..feb33d9679e0 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 9.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.1
+  - @rocket.chat/ui-avatar@5.0.1
+  </details>
+
 ## 9.0.0
 
 ### Minor Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index a60e9a9b2d1f..861da958667c 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": "9.0.0",
+	"version": "9.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -36,8 +36,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "5.0.0",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-avatar": "5.0.1",
+		"@rocket.chat/ui-contexts": "9.0.1",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 0107fc049b8f..7515e3005bc6 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.3.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@9.0.1
+  - @rocket.chat/ui-contexts@9.0.1
+  - @rocket.chat/ui-avatar@5.0.1
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 0d1d1ab9e246..2923804daa48 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.3.3",
+  "version": "0.3.4",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 871e66b0f29c..ab10df1e8c58 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 9.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.1
+  </details>
+
 ## 9.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 635633c808e2..3e0a0483eb86 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": "9.0.0",
+	"version": "9.0.1",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -51,7 +51,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-contexts": "9.0.1",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From 72f00a6e9128df85af611794b348f66ee767787f Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Mon, 19 Aug 2024 14:21:17 +0000
Subject: [PATCH 005/170] Bump 6.11.2

---
 .changeset/bump-patch-1724077277110.md |  5 +++++
 yarn.lock                              | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/bump-patch-1724077277110.md

diff --git a/.changeset/bump-patch-1724077277110.md b/.changeset/bump-patch-1724077277110.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1724077277110.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/yarn.lock b/yarn.lock
index 84ca676c886c..93f2f41c7999 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8969,10 +8969,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 5.0.0
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-avatar": 5.0.1
+    "@rocket.chat/ui-contexts": 9.0.1
     "@rocket.chat/ui-kit": 0.36.0
-    "@rocket.chat/ui-video-conf": 9.0.0
+    "@rocket.chat/ui-video-conf": 9.0.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9061,8 +9061,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 9.0.0
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-client": 9.0.1
+    "@rocket.chat/ui-contexts": 9.0.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10282,7 +10282,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-contexts": 9.0.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10335,7 +10335,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-contexts": 9.0.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10511,8 +10511,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 5.0.0
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-avatar": 5.0.1
+    "@rocket.chat/ui-contexts": 9.0.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10602,7 +10602,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-contexts": 9.0.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 6bcbc02ed3121c8f2c7e3fe4cccc42416abc8d87 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:07:25 +0000
Subject: [PATCH 006/170] fix: Realtime Monitoring LineCharts not updating
 (#33086)

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>
---
 .../RealTimeMonitoringPage.js                 | 57 +++++++++++++++----
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
index 5b4d837d211c..b6e29530b5e7 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
@@ -18,11 +18,19 @@ import ChatsOverview from './overviews/ChatsOverview';
 import ConversationOverview from './overviews/ConversationOverview';
 import ProductivityOverview from './overviews/ProductivityOverview';
 
+const randomizeKeys = (keys) => {
+	keys.current = keys.current.map((_key, i) => {
+		return `${i}_${new Date().getTime()}`;
+	});
+};
+
 const dateRange = getDateRange();
 
 const RealTimeMonitoringPage = () => {
 	const t = useTranslation();
 
+	const keys = useRef([...Array(10).keys()]);
+
 	const [reloadFrequency, setReloadFrequency] = useState(5);
 	const [departmentId, setDepartment] = useState('');
 
@@ -43,6 +51,10 @@ const RealTimeMonitoringPage = () => {
 		[departmentParams],
 	);
 
+	useEffect(() => {
+		randomizeKeys(keys);
+	}, [allParams]);
+
 	const reloadCharts = useMutableCallback(() => {
 		Object.values(reloadRef.current).forEach((reload) => {
 			reload();
@@ -53,6 +65,7 @@ const RealTimeMonitoringPage = () => {
 		const interval = setInterval(reloadCharts, reloadFrequency * 1000);
 		return () => {
 			clearInterval(interval);
+			randomizeKeys(keys);
 		};
 	}, [reloadCharts, reloadFrequency]);
 
@@ -90,30 +103,54 @@ const RealTimeMonitoringPage = () => {
 						</Box>
 					</Box>
 					<Box display='flex' flexDirection='row' w='full' alignItems='stretch' flexShrink={1}>
-						<ConversationOverview flexGrow={1} flexShrink={1} width='50%' reloadRef={reloadRef} params={allParams} />
+						<ConversationOverview key={keys?.current[0]} flexGrow={1} flexShrink={1} width='50%' reloadRef={reloadRef} params={allParams} />
 					</Box>
 					<Box display='flex' flexDirection='row' w='full' alignItems='stretch' flexShrink={1}>
-						<ChatsChart flexGrow={1} flexShrink={1} width='50%' mie={2} reloadRef={reloadRef} params={allParams} />
-						<ChatsPerAgentChart flexGrow={1} flexShrink={1} width='50%' mis={2} reloadRef={reloadRef} params={allParams} />
+						<ChatsChart key={keys?.current[1]} flexGrow={1} flexShrink={1} width='50%' mie={2} reloadRef={reloadRef} params={allParams} />
+						<ChatsPerAgentChart
+							key={keys?.current[2]}
+							flexGrow={1}
+							flexShrink={1}
+							width='50%'
+							mis={2}
+							reloadRef={reloadRef}
+							params={allParams}
+						/>
 					</Box>
 					<Box display='flex' flexDirection='row' w='full' alignItems='stretch' flexShrink={1}>
-						<ChatsOverview flexGrow={1} flexShrink={1} width='50%' reloadRef={reloadRef} params={allParams} />
+						<ChatsOverview key={keys?.current[3]} flexGrow={1} flexShrink={1} width='50%' reloadRef={reloadRef} params={allParams} />
 					</Box>
 					<Box display='flex' flexDirection='row' w='full' alignItems='stretch' flexShrink={1}>
-						<AgentStatusChart flexGrow={1} flexShrink={1} width='50%' mie={2} reloadRef={reloadRef} params={allParams} />
-						<ChatsPerDepartmentChart flexGrow={1} flexShrink={1} width='50%' mis={2} reloadRef={reloadRef} params={allParams} />
+						<AgentStatusChart
+							key={keys?.current[4]}
+							flexGrow={1}
+							flexShrink={1}
+							width='50%'
+							mie={2}
+							reloadRef={reloadRef}
+							params={allParams}
+						/>
+						<ChatsPerDepartmentChart
+							key={keys?.current[5]}
+							flexGrow={1}
+							flexShrink={1}
+							width='50%'
+							mis={2}
+							reloadRef={reloadRef}
+							params={allParams}
+						/>
 					</Box>
 					<Box display='flex' flexDirection='row' w='full' alignItems='stretch' flexShrink={1}>
-						<AgentsOverview flexGrow={1} flexShrink={1} reloadRef={reloadRef} params={allParams} />
+						<AgentsOverview key={keys?.current[6]} flexGrow={1} flexShrink={1} reloadRef={reloadRef} params={allParams} />
 					</Box>
 					<Box display='flex' w='full' flexShrink={1}>
-						<ChatDurationChart flexGrow={1} flexShrink={1} w='100%' reloadRef={reloadRef} params={allParams} />
+						<ChatDurationChart key={keys?.current[7]} flexGrow={1} flexShrink={1} w='100%' reloadRef={reloadRef} params={allParams} />
 					</Box>
 					<Box display='flex' flexDirection='row' w='full' alignItems='stretch' flexShrink={1}>
-						<ProductivityOverview flexGrow={1} flexShrink={1} reloadRef={reloadRef} params={allParams} />
+						<ProductivityOverview key={keys?.current[8]} flexGrow={1} flexShrink={1} reloadRef={reloadRef} params={allParams} />
 					</Box>
 					<Box display='flex' w='full' flexShrink={1}>
-						<ResponseTimesChart flexGrow={1} flexShrink={1} w='100%' reloadRef={reloadRef} params={allParams} />
+						<ResponseTimesChart key={keys?.current[9]} flexGrow={1} flexShrink={1} w='100%' reloadRef={reloadRef} params={allParams} />
 					</Box>
 				</Margins>
 			</PageScrollableContentWithShadow>

From 9e1b9ad624e470bd60e83a9bc90c2c70504ac48a Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:45:46 +0000
Subject: [PATCH 007/170] fix: Avoid `processRoomAbandonment` callback from
 erroring when Business Hours config is missing for day (#33084)

Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>
---
 .changeset/gentle-bugs-think.md                           | 5 +++++
 .../app/livechat/server/hooks/processRoomAbandonment.ts   | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/gentle-bugs-think.md

diff --git a/.changeset/gentle-bugs-think.md b/.changeset/gentle-bugs-think.md
new file mode 100644
index 000000000000..fc4738f3043a
--- /dev/null
+++ b/.changeset/gentle-bugs-think.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
diff --git a/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts b/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts
index 8a5a4c280670..8eb53fbb8fa7 100644
--- a/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts
+++ b/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts
@@ -43,7 +43,8 @@ const getSecondsSinceLastAgentResponse = async (room: IOmnichannelRoom, agentLas
 		officeDays = (await businessHourManager.getBusinessHour())?.workHours.reduce(parseDays, {});
 	}
 
-	if (!officeDays) {
+	// Empty object we assume invalid config
+	if (!officeDays || !Object.keys(officeDays).length) {
 		return getSecondsWhenOfficeHoursIsDisabled(room, agentLastMessage);
 	}
 
@@ -55,6 +56,11 @@ const getSecondsSinceLastAgentResponse = async (room: IOmnichannelRoom, agentLas
 	for (let index = 0; index <= daysOfInactivity; index++) {
 		const today = inactivityDay.clone().format('dddd');
 		const officeDay = officeDays[today];
+		// Config doesnt have data for this day, we skip day
+		if (!officeDay) {
+			inactivityDay.add(1, 'days');
+			continue;
+		}
 		const startTodaysOfficeHour = moment(`${officeDay.start.day}:${officeDay.start.time}`, 'dddd:HH:mm').add(index, 'days');
 		const endTodaysOfficeHour = moment(`${officeDay.finish.day}:${officeDay.finish.time}`, 'dddd:HH:mm').add(index, 'days');
 		if (officeDays[today].open) {

From 9f6883ead4748a847ed263752479943d2df7fee8 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 23 Aug 2024 03:49:05 +0000
Subject: [PATCH 008/170] Release 6.12.0-rc.0

---
 .changeset/pre.json                           | 102 ++++++++++++++++
 apps/meteor/CHANGELOG.md                      | 111 ++++++++++++++++++
 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 +-
 ee/apps/account-service/CHANGELOG.md          |  13 ++
 ee/apps/account-service/package.json          |   2 +-
 ee/apps/authorization-service/CHANGELOG.md    |  13 ++
 ee/apps/authorization-service/package.json    |   2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             |  14 +++
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   |  14 +++
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/presence-service/CHANGELOG.md         |  13 ++
 ee/apps/presence-service/package.json         |   2 +-
 ee/apps/queue-worker/CHANGELOG.md             |  13 ++
 ee/apps/queue-worker/package.json             |   2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       |  12 ++
 ee/apps/stream-hub-service/package.json       |   2 +-
 ee/packages/license/CHANGELOG.md              |   9 ++
 ee/packages/license/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 +-
 ee/packages/ui-theming/CHANGELOG.md           |   6 +
 ee/packages/ui-theming/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           |  16 +++
 packages/core-services/package.json           |   2 +-
 packages/core-typings/CHANGELOG.md            |  27 +++++
 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/fuselage-ui-kit/CHANGELOG.md         |  16 +++
 packages/fuselage-ui-kit/package.json         |  10 +-
 packages/gazzodown/CHANGELOG.md               |  13 ++
 packages/gazzodown/package.json               |   6 +-
 packages/i18n/CHANGELOG.md                    |  28 +++++
 packages/i18n/package.json                    |   2 +-
 packages/instance-status/CHANGELOG.md         |   9 ++
 packages/instance-status/package.json         |   2 +-
 packages/livechat/CHANGELOG.md                |  12 ++
 packages/livechat/package.json                |   2 +-
 packages/mock-providers/CHANGELOG.md          |   9 ++
 packages/mock-providers/package.json          |   2 +-
 packages/model-typings/CHANGELOG.md           |  17 +++
 packages/model-typings/package.json           |   2 +-
 packages/models/CHANGELOG.md                  |   9 ++
 packages/models/package.json                  |   2 +-
 packages/rest-typings/CHANGELOG.md            |  16 +++
 packages/rest-typings/package.json            |   2 +-
 packages/ui-avatar/CHANGELOG.md               |  11 ++
 packages/ui-avatar/package.json               |   4 +-
 packages/ui-client/CHANGELOG.md               |  11 ++
 packages/ui-client/package.json               |   4 +-
 packages/ui-composer/CHANGELOG.md             |   6 +
 packages/ui-composer/package.json             |   2 +-
 packages/ui-contexts/CHANGELOG.md             |  12 ++
 packages/ui-contexts/package.json             |   2 +-
 packages/ui-kit/CHANGELOG.md                  |   6 +
 packages/ui-kit/package.json                  |   2 +-
 packages/ui-video-conf/CHANGELOG.md           |  12 ++
 packages/ui-video-conf/package.json           |   6 +-
 packages/uikit-playground/CHANGELOG.md        |  17 +++
 packages/uikit-playground/package.json        |   2 +-
 packages/web-ui-registration/CHANGELOG.md     |  11 ++
 packages/web-ui-registration/package.json     |   4 +-
 77 files changed, 717 insertions(+), 50 deletions(-)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 000000000000..fabea75cbf61
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,102 @@
+{
+  "mode": "pre",
+  "tag": "rc",
+  "initialVersions": {
+    "@rocket.chat/meteor": "6.12.0-develop",
+    "rocketchat-services": "1.3.0",
+    "@rocket.chat/account-service": "0.4.3",
+    "@rocket.chat/authorization-service": "0.4.3",
+    "@rocket.chat/ddp-streamer": "0.3.3",
+    "@rocket.chat/omnichannel-transcript": "0.4.3",
+    "@rocket.chat/presence-service": "0.4.3",
+    "@rocket.chat/queue-worker": "0.4.3",
+    "@rocket.chat/stream-hub-service": "0.4.3",
+    "@rocket.chat/license": "0.2.3",
+    "@rocket.chat/omnichannel-services": "0.3.0",
+    "@rocket.chat/pdf-worker": "0.2.0",
+    "@rocket.chat/presence": "0.2.3",
+    "@rocket.chat/ui-theming": "0.2.0",
+    "@rocket.chat/account-utils": "0.0.2",
+    "@rocket.chat/agenda": "0.1.0",
+    "@rocket.chat/api-client": "0.2.3",
+    "@rocket.chat/apps": "0.1.3",
+    "@rocket.chat/base64": "1.0.13",
+    "@rocket.chat/cas-validate": "0.0.2",
+    "@rocket.chat/core-services": "0.5.0",
+    "@rocket.chat/core-typings": "6.12.0-develop",
+    "@rocket.chat/cron": "0.1.3",
+    "@rocket.chat/ddp-client": "0.3.3",
+    "@rocket.chat/eslint-config": "0.7.0",
+    "@rocket.chat/favicon": "0.0.2",
+    "@rocket.chat/fuselage-ui-kit": "9.0.0",
+    "@rocket.chat/gazzodown": "9.0.0",
+    "@rocket.chat/i18n": "0.6.0",
+    "@rocket.chat/instance-status": "0.1.3",
+    "@rocket.chat/jest-presets": "0.0.1",
+    "@rocket.chat/jwt": "0.1.1",
+    "@rocket.chat/livechat": "1.19.0",
+    "@rocket.chat/log-format": "0.0.2",
+    "@rocket.chat/logger": "0.0.2",
+    "@rocket.chat/message-parser": "0.31.29",
+    "@rocket.chat/mock-providers": "0.1.1",
+    "@rocket.chat/model-typings": "0.6.0",
+    "@rocket.chat/models": "0.2.0",
+    "@rocket.chat/poplib": "0.0.2",
+    "@rocket.chat/password-policies": "0.0.2",
+    "@rocket.chat/patch-injection": "0.0.1",
+    "@rocket.chat/peggy-loader": "0.31.25",
+    "@rocket.chat/random": "1.2.2",
+    "@rocket.chat/release-action": "2.2.3",
+    "@rocket.chat/release-changelog": "0.1.0",
+    "@rocket.chat/rest-typings": "6.12.0-develop",
+    "@rocket.chat/server-cloud-communication": "0.0.2",
+    "@rocket.chat/server-fetch": "0.0.3",
+    "@rocket.chat/sha256": "1.0.10",
+    "@rocket.chat/tools": "0.2.2",
+    "@rocket.chat/ui-avatar": "5.0.0",
+    "@rocket.chat/ui-client": "9.0.0",
+    "@rocket.chat/ui-composer": "0.2.0",
+    "@rocket.chat/ui-contexts": "9.0.0",
+    "@rocket.chat/ui-kit": "0.36.0",
+    "@rocket.chat/ui-video-conf": "9.0.0",
+    "@rocket.chat/uikit-playground": "0.3.3",
+    "@rocket.chat/web-ui-registration": "9.0.0"
+  },
+  "changesets": [
+    "bright-humans-cross",
+    "brown-crabs-chew",
+    "calm-tigers-peel",
+    "cool-rocks-remember",
+    "empty-toys-smell",
+    "fast-lobsters-turn",
+    "funny-boats-guess",
+    "gentle-bugs-think",
+    "gentle-news-wonder",
+    "giant-spiders-pay",
+    "gorgeous-hotels-attend",
+    "large-geese-ring",
+    "lemon-steaks-provide",
+    "nasty-windows-smile",
+    "new-mayflies-wait",
+    "ninety-hounds-exist",
+    "popular-bottles-visit",
+    "proud-years-buy",
+    "purple-dolls-serve",
+    "rich-pillows-hang",
+    "rooms-table-ts",
+    "rotten-camels-pretend",
+    "rude-dogs-burn",
+    "six-beers-fry",
+    "smart-mice-attack",
+    "spicy-kings-think",
+    "strong-swans-double",
+    "strong-terms-love",
+    "stupid-fishes-relate",
+    "swift-maps-tickle",
+    "ten-bulldogs-clap",
+    "thirty-dryers-help",
+    "twelve-windows-train",
+    "two-bikes-crash",
+    "violet-radios-begin"
+  ]
+}
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index f466c34da838..afc6a6751992 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,116 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.0
+
+### Minor Changes
+
+- ([#32535](https://github.com/RocketChat/Rocket.Chat/pull/32535)) Federation actions like sending message in a federated DM, reacting in a federated chat, etc, will no longer work if the configuration is invalid.
+
+- ([#32916](https://github.com/RocketChat/Rocket.Chat/pull/32916)) Added a new Audit endpoint `audit/rooms.members` that allows users with `view-members-list-all-rooms` to fetch a list of the members of any room even if the user is not part of it.
+
+- ([#32032](https://github.com/RocketChat/Rocket.Chat/pull/32032)) Added a new 'Deactivated' tab to the users page, this tab lists users who have logged in for the first time but have been deactivated for any reason. Also added the UI code for the Active tab;
+
+- ([#33044](https://github.com/RocketChat/Rocket.Chat/pull/33044)) Replaces an outdated banner with the Bubble component in order to display retention policy warning
+
+- ([#32867](https://github.com/RocketChat/Rocket.Chat/pull/32867)) Added an accordion for advanced settings on Create teams and channels
+
+- ([#32709](https://github.com/RocketChat/Rocket.Chat/pull/32709) by [@heet434](https://github.com/heet434)) Add "Created at" column to admin rooms table
+
+- ([#32535](https://github.com/RocketChat/Rocket.Chat/pull/32535)) New button added to validate Matrix Federation configuration. A new field inside admin settings will reflect the configuration status being either 'Valid' or 'Invalid'.
+
+- ([#32969](https://github.com/RocketChat/Rocket.Chat/pull/32969)) Upgrades fuselage-toastbar version in order to add pause on hover functionality
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Added a new setting to enable/disable file encryption in an end to end encrypted room.
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Fixed a bug related to uploading end to end encrypted file.
+
+  E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
+
+  The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
+
+  E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type.
+
+  Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- ([#32986](https://github.com/RocketChat/Rocket.Chat/pull/32986)) Fixed login with third-party apps not working without the "Manage OAuth Apps" permission
+
+- ([#32852](https://github.com/RocketChat/Rocket.Chat/pull/32852)) Federated users can no longer be deleted.
+
+- ([#33033](https://github.com/RocketChat/Rocket.Chat/pull/33033)) Fixed an issue due to an endpoint pagination that was causing that when an agent have assigned more than 50 departments, the departments have a blank space instead of the name.
+
+- ([#33058](https://github.com/RocketChat/Rocket.Chat/pull/33058)) Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
+
+- ([#24889](https://github.com/RocketChat/Rocket.Chat/pull/24889) by [@Shivansh2287](https://github.com/Shivansh2287)) Fixes an issue where the Announcement modal with long words was adding a horizontal scrollbar
+
+- ([#32940](https://github.com/RocketChat/Rocket.Chat/pull/32940)) Stopped non channel members from dragging and dropping files in a channel they do not belong
+
+- ([#33001](https://github.com/RocketChat/Rocket.Chat/pull/33001)) Allow apps to react/unreact to messages via bridge
+
+- ([#32809](https://github.com/RocketChat/Rocket.Chat/pull/32809)) Deactivating users who federated will now be permanent.
+
+- ([#31525](https://github.com/RocketChat/Rocket.Chat/pull/31525)) Fix: Show correct user info actions for non-members in channels.
+
+- ([#32931](https://github.com/RocketChat/Rocket.Chat/pull/32931)) Fixed an issue that caused UI to show an error when the call to get the Business Hour type from settings returned `undefined`.
+
+- ([#32743](https://github.com/RocketChat/Rocket.Chat/pull/32743)) Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
+
+- ([#33109](https://github.com/RocketChat/Rocket.Chat/pull/33109)) Fixes the `expanded` prop being accidentally forwarded to `ContextualbarHeader`
+
+- ([#32846](https://github.com/RocketChat/Rocket.Chat/pull/32846)) Fixed issue with system messages being counted as agents' first responses in livechat rooms (which caused the "best first response time" and "average first response time" metrics to be unreliable for all agents)
+
+- ([#32791](https://github.com/RocketChat/Rocket.Chat/pull/32791)) Fixed a behavior when updating messages that prevented the `customFields` prop from being updated if there were no changes to the `msg` property. Now, `customFields` will be always updated on message update even if `msg` doesn't change
+
+- ([#33101](https://github.com/RocketChat/Rocket.Chat/pull/33101)) Fixed an issue where teams were being created with no room associated with it.
+
+- ([#33036](https://github.com/RocketChat/Rocket.Chat/pull/33036)) Fixes multiple problems with the `processRoomAbandonment` hook. This hook is in charge of calculating the time a room has been abandoned (this means, the time that elapsed since a room was last answered by an agent until it was closed). However, when business hours were enabled and the user didn't open on one day, if an abandoned room happened to be abandoned _over_ the day there was no business hour configuration, then the process will error out.
+  Additionally, the values the code was calculating were not right. When business hours are enabled, this code should only count the abandonment time _while a business hour was open_. When rooms were left abandoned for days or weeks, this will also throw an error or output an invalid count.
+- ([#33054](https://github.com/RocketChat/Rocket.Chat/pull/33054)) Fixed issue with livechat analytics in a given date range considering conversation data from the following day
+
+- ([#32981](https://github.com/RocketChat/Rocket.Chat/pull/32981)) fixed an issue with the "follow message" button not changing state after click
+
+- ([#32928](https://github.com/RocketChat/Rocket.Chat/pull/32928)) Fixed issue where `after-registration-triggers` would show up in a page when the user was not yet registered
+
+- ([#33047](https://github.com/RocketChat/Rocket.Chat/pull/33047)) Fixed: Custom fields in extraData now correctly added to extraRoomInfo by livechat.beforeRoom callback during livechat room creation.
+
+- ([#33040](https://github.com/RocketChat/Rocket.Chat/pull/33040)) Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
+
+  The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.
+
+- <details><summary>Updated dependencies [8ea6517c4e, c11f3722df, 7f88158036, 127866ce97, 0c919db7b4, b764c415dc, 1f061a1aa5, dd37ea1b35, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.0
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-video-conf@10.0.0-rc.0
+  - @rocket.chat/ui-composer@0.2.1-rc.0
+  - @rocket.chat/gazzodown@10.0.0-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.0
+  - @rocket.chat/ui-client@10.0.0-rc.0
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/i18n@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/web-ui-registration@10.0.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.1-rc.0
+  - @rocket.chat/apps@0.1.4-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  - @rocket.chat/presence@0.2.4-rc.0
+  - @rocket.chat/api-client@0.2.4-rc.0
+  - @rocket.chat/license@0.2.4-rc.0
+  - @rocket.chat/pdf-worker@0.2.1-rc.0
+  - @rocket.chat/cron@0.1.4-rc.0
+  - @rocket.chat/instance-status@0.1.4-rc.0
+  - @rocket.chat/server-cloud-communication@0.0.2
+  </details>
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index faf0e8f47de6..529a0ee307e9 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-develop"
+	"version": "6.12.0-rc.0"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 230250c5ca64..352967c136b1 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 1.3.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [c11f3722df, 7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 1.3.0
 
 ### Minor Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 58b73351c4e0..32d99abf64c0 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": "1.3.0",
+	"version": "1.3.1-rc.0",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9c49c2cb33f8..23429fed2242 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": "6.12.0-develop",
+	"version": "6.12.0-rc.0",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index fd5eb3925946..b3f4dd1e7126 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index ac28eb76e76d..36ecb61a9e28 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.3",
+	"version": "0.4.4-rc.0",
 	"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 df7be3c9b1eb..0400f8c98ce9 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index bff15e7f7d91..49299353f38a 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.3",
+	"version": "0.4.4-rc.0",
 	"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 1162e17c05d7..2e893ab08be4 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  - @rocket.chat/instance-status@0.1.4-rc.0
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 1687042e0d31..10cf4b709a7d 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.3",
+	"version": "0.3.4-rc.0",
 	"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 aac67c02dd3d..01b7d95f435b 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.1-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  - @rocket.chat/pdf-worker@0.2.1-rc.0
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index c60542c180ec..ded176a6d413 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.3",
+	"version": "0.4.4-rc.0",
 	"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 b9544b0cdde9..d8d28a169255 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  - @rocket.chat/presence@0.2.4-rc.0
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index c800dd4d6c80..b7efe31c51d4 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.3",
+	"version": "0.4.4-rc.0",
 	"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 12271005af74..6103b2805fd9 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.1-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 0a227cb271c0..246d82843599 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.3",
+	"version": "0.4.4-rc.0",
 	"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 3fbf664a0b30..c930928c8e94 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 812522a5f1d8..d2fda6422851 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.3",
+	"version": "0.4.4-rc.0",
 	"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 8cc9df0dd502..5c212f8e6c77 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 1c746514d443..50d6e575dd4b 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.3",
+	"version": "0.2.4-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index a4a49de7aa30..78d02fb9aa38 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.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  - @rocket.chat/pdf-worker@0.2.1-rc.0
+  </details>
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index f520d82bd7d3..36ce0e1efb06 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.0",
+	"version": "0.3.1-rc.0",
 	"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 5ebe251216a7..51df0b0eed01 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.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  </details>
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 749d48ccc9c2..93b521ff65c2 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.0",
+	"version": "0.2.1-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 3d1a7e35b705..5e569c03b1e6 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/core-services@0.6.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 787eb2053007..9bf86c60c504 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.3",
+	"version": "0.2.4-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/ee/packages/ui-theming/CHANGELOG.md b/ee/packages/ui-theming/CHANGELOG.md
index 2d01b23733b1..7b9d7c385f6c 100644
--- a/ee/packages/ui-theming/CHANGELOG.md
+++ b/ee/packages/ui-theming/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-theming
 
+## 0.2.1-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 713265b36bfa..519937865872 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-theming",
-	"version": "0.2.0",
+	"version": "0.2.1-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
diff --git a/package.json b/package.json
index 29de436373e2..0c0a96a189de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-develop",
+	"version": "6.12.0-rc.0",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 8fe130aeaf28..2ed77faee070 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [b764c415dc, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 43de20583d47..520ce86c9127 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.3",
+	"version": "0.2.4-rc.0",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 07f4af49f31e..5c318e5a4512 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  </details>
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 816e271535df..b4ec74defa0d 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.3",
+	"version": "0.1.4-rc.0",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 0c10b78c3bf4..48c182f44c68 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.0
+
+### Minor Changes
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [c11f3722df, b764c415dc, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.5.0
 
 ### Minor Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index fe1d4ef0dcea..729f8cac2767 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.5.0",
+	"version": "0.6.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index fb313a4d1320..885f05f60031 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.0
+
+### Minor Changes
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Added a new setting to enable/disable file encryption in an end to end encrypted room.
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Fixed a bug related to uploading end to end encrypted file.
+
+  E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
+
+  The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
+
+  E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type.
+
+  Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
+
+### Patch Changes
+
+- ([#32846](https://github.com/RocketChat/Rocket.Chat/pull/32846)) Fixed issue with system messages being counted as agents' first responses in livechat rooms (which caused the "best first response time" and "average first response time" metrics to be unreliable for all agents)
+
+- <details><summary>Updated dependencies [c11f3722df]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  </details>
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 34bdc67438ca..7dccf47493eb 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-develop",
+	"version": "6.12.0-rc.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 33c0c9872a60..6f05eddf1bc1 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index a6484224ded5..b2c70c89aaa4 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.3",
+	"version": "0.1.4-rc.0",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 0f9b5f7f26b3..ef67f9df32d7 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [b764c415dc, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/api-client@0.2.4-rc.0
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 9e4fdfd85910..bc5ee0e8ce7e 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.3",
+	"version": "0.3.4-rc.0",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index e8fe73f6d549..0ef3df446d2c 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## 10.0.0-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e, c11f3722df, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-video-conf@10.0.0-rc.0
+  - @rocket.chat/gazzodown@10.0.0-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.0
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 9.0.0
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 9431a0c19d96..1d911f5437cb 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "9.0.0",
+  "version": "10.0.0-rc.0",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "5.0.0",
-    "@rocket.chat/ui-contexts": "9.0.0",
-    "@rocket.chat/ui-kit": "0.36.0",
-    "@rocket.chat/ui-video-conf": "9.0.0",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.0",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.0",
+    "@rocket.chat/ui-kit": "0.36.1-rc.0",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.0",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 4febdb0f54b2..f4e7cc8e0492 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-client@10.0.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 9.0.0
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 6ecb49fa9544..8f0a87b4a3ee 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "9.0.0",
+	"version": "10.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "9.0.0",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-client": "10.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 8c46d5736706..31ca8e91df6d 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @rocket.chat/i18n
 
+## 0.7.0-rc.0
+
+### Minor Changes
+
+- ([#32916](https://github.com/RocketChat/Rocket.Chat/pull/32916)) Added a new Audit endpoint `audit/rooms.members` that allows users with `view-members-list-all-rooms` to fetch a list of the members of any room even if the user is not part of it.
+
+- ([#32867](https://github.com/RocketChat/Rocket.Chat/pull/32867)) Added an accordion for advanced settings on Create teams and channels
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Added a new setting to enable/disable file encryption in an end to end encrypted room.
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Fixed a bug related to uploading end to end encrypted file.
+
+  E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
+
+  The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
+
+  E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type.
+
+  Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
+
+### Patch Changes
+
+- ([#31525](https://github.com/RocketChat/Rocket.Chat/pull/31525)) Fix: Show correct user info actions for non-members in channels.
+
+- ([#33029](https://github.com/RocketChat/Rocket.Chat/pull/33029)) Fixes a typo in german translation and fixes the broken hyperlink for Resend and Change Email
+
+- ([#32743](https://github.com/RocketChat/Rocket.Chat/pull/32743)) Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 6927aae08d1c..8bae9a225113 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.6.0",
+	"version": "0.7.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 849ccf591d08..8e77d18f93a3 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.1-rc.0
+  </details>
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 088cba613d8e..09068b9bf095 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.3",
+	"version": "0.1.4-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 56265d43563f..b504a91bef55 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.1-rc.0
+
+### Patch Changes
+
+- ([#32928](https://github.com/RocketChat/Rocket.Chat/pull/32928)) Fixed issue where `after-registration-triggers` would show up in a page when the user was not yet registered
+
+- <details><summary>Updated dependencies [8ea6517c4e, c11f3722df]:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.0
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  </details>
+
 ## 1.19.0
 
 ### Minor Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 9d40643dd4c5..c88eeeac89b2 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.0",
+	"version": "1.19.1-rc.0",
 	"files": [
 		"/build"
 	],
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index 300b624d5dff..55af119d59fe 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/mock-providers
 
+## 0.1.2-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [127866ce97, 0c919db7b4, b764c415dc, 1f061a1aa5, dd37ea1b35, 58c0efc732, 58c0efc732]:</summary>
+
+  - @rocket.chat/i18n@0.7.0-rc.0
+  </details>
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 64310f0695cc..d2b2589b8f89 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.1",
+	"version": "0.1.2-rc.0",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 29eaadd0e0fe..ad3bb3bc7ef8 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.0
+
+### Minor Changes
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+### Patch Changes
+
+- ([#32986](https://github.com/RocketChat/Rocket.Chat/pull/32986)) Fixed login with third-party apps not working without the "Manage OAuth Apps" permission
+
+- ([#33054](https://github.com/RocketChat/Rocket.Chat/pull/33054)) Fixed issue with livechat analytics in a given date range considering conversation data from the following day
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  </details>
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index f96764fa49af..f548b14cee84 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.6.0",
+	"version": "0.7.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index e2b984708aaa..5db18e89fe9e 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, a14c0678bb, e28be46db7]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.0
+  </details>
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 19f1f28438f6..7867b7ea9bd2 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.0",
+	"version": "0.2.1-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index efcab160b8e6..3485f148c7ec 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.0
+
+### Minor Changes
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+### Patch Changes
+
+- ([#31525](https://github.com/RocketChat/Rocket.Chat/pull/31525)) Fix: Show correct user info actions for non-members in channels.
+
+- <details><summary>Updated dependencies [c11f3722df, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  </details>
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 53bd1d2f5cb2..1cb919fca8ce 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-develop",
+	"version": "6.12.0-rc.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index f65d986cfaf5..1ca9f058fb94 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 5.0.0
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 1c2dc6dabbc4..5188712463bf 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "5.0.0",
+	"version": "6.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 5936f8038bc8..80e2b4ca8bfa 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 9.0.0
 
 ### Minor Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index f43b2d8622b8..d3d7fc1646ec 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "9.0.0",
+	"version": "10.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-composer/CHANGELOG.md b/packages/ui-composer/CHANGELOG.md
index d37e917e0375..18571eca048a 100644
--- a/packages/ui-composer/CHANGELOG.md
+++ b/packages/ui-composer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-composer
 
+## 0.2.1-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index d854a6ffea86..0f4534a421a9 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/ui-composer",
-  "version": "0.2.0",
+  "version": "0.2.1-rc.0",
   "private": true,
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index fb3d074b6fbe..1f2f332f676b 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [127866ce97, 0c919db7b4, b764c415dc, 1f061a1aa5, dd37ea1b35, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/i18n@0.7.0-rc.0
+  - @rocket.chat/rest-typings@6.12.0-rc.0
+  - @rocket.chat/core-typings@6.12.0-rc.0
+  - @rocket.chat/ddp-client@0.3.4-rc.0
+  </details>
+
 ## 9.0.0
 
 ### Minor Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 513aebd86a30..67281b6e0652 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "9.0.0",
+	"version": "10.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-kit/CHANGELOG.md b/packages/ui-kit/CHANGELOG.md
index 9f31c620f4db..7b7a94cfbbe0 100644
--- a/packages/ui-kit/CHANGELOG.md
+++ b/packages/ui-kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.36.1-rc.0
+
+### Patch Changes
+
+- ([#33000](https://github.com/RocketChat/Rocket.Chat/pull/33000)) fix UiKit error message: Failed to resolve module: @rocket.chat/icons
+
 ## 0.36.0
 
 ### Minor Changes
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index c7e8159d457d..cd8ad2399aa5 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-kit",
-	"version": "0.36.0",
+	"version": "0.36.1-rc.0",
 	"description": "Interactive UI elements for Rocket.Chat Apps",
 	"homepage": "https://rocket.chat",
 	"author": {
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index 2a697e293211..f6c609860a9c 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e]:</summary>
+
+  - @rocket.chat/ui-avatar@6.0.0-rc.0
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 9.0.0
 
 ### Minor Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 5e7d114a3576..b71f1396706d 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": "9.0.0",
+	"version": "10.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "5.0.0",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 0107fc049b8f..d499769b2edf 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.0
+
+### Minor Changes
+
+- ([#32969](https://github.com/RocketChat/Rocket.Chat/pull/32969)) Upgrades fuselage-toastbar version in order to add pause on hover functionality
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.0
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index f46f139a66f4..1a3195460525 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.3.3",
+  "version": "0.4.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 871e66b0f29c..30164a65f035 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.0
+
+### Patch Changes
+
+- ([#32743](https://github.com/RocketChat/Rocket.Chat/pull/32743)) Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.0
+  </details>
+
 ## 9.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ba3dc31423a6..ae6601f59224 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": "9.0.0",
+	"version": "10.0.0-rc.0",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "9.0.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From ac084524171073a01e7121bc0f0483ad05093f1d Mon Sep 17 00:00:00 2001
From: "Julio A." <52619625+julio-cfa@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:36:17 +0200
Subject: [PATCH 009/170] fix: imported fixes (#33136)

---
 .changeset/orange-clocks-wait.md              |   5 +
 .../functions/getModifiedHttpHeaders.ts       |  20 ++
 apps/meteor/app/lib/server/lib/debug.js       |   3 +-
 .../meteor/app/livechat/server/api/v1/room.ts | 109 +++++----
 .../app/livechat/server/api/v1/visitor.ts     | 213 +++++++++---------
 .../tests/end-to-end/api/miscellaneous.ts     | 137 ++++++++++-
 .../functions/getModifiedHttpHeaders.tests.ts |  59 +++++
 7 files changed, 392 insertions(+), 154 deletions(-)
 create mode 100644 .changeset/orange-clocks-wait.md
 create mode 100644 apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
 create mode 100644 apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts

diff --git a/.changeset/orange-clocks-wait.md b/.changeset/orange-clocks-wait.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/orange-clocks-wait.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts b/apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
new file mode 100644
index 000000000000..e62727814de3
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
@@ -0,0 +1,20 @@
+export const getModifiedHttpHeaders = (httpHeaders: Record<string, any>) => {
+	const modifiedHttpHeaders = { ...httpHeaders };
+
+	if ('x-auth-token' in modifiedHttpHeaders) {
+		modifiedHttpHeaders['x-auth-token'] = '[redacted]';
+	}
+
+	if (modifiedHttpHeaders.cookie) {
+		const cookies = modifiedHttpHeaders.cookie.split('; ');
+		const modifiedCookies = cookies.map((cookie: string) => {
+			if (cookie.startsWith('rc_token=')) {
+				return 'rc_token=[redacted]';
+			}
+			return cookie;
+		});
+		modifiedHttpHeaders.cookie = modifiedCookies.join('; ');
+	}
+
+	return modifiedHttpHeaders;
+};
diff --git a/apps/meteor/app/lib/server/lib/debug.js b/apps/meteor/app/lib/server/lib/debug.js
index aaa492e80337..cbf38528579f 100644
--- a/apps/meteor/app/lib/server/lib/debug.js
+++ b/apps/meteor/app/lib/server/lib/debug.js
@@ -7,6 +7,7 @@ import _ from 'underscore';
 import { getMethodArgs } from '../../../../server/lib/logger/logPayloads';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
+import { getModifiedHttpHeaders } from '../functions/getModifiedHttpHeaders';
 
 const logger = new Logger('Meteor');
 
@@ -41,7 +42,7 @@ const traceConnection = (enable, filter, prefix, name, connection, userId) => {
 		console.log(name, {
 			id: connection.id,
 			clientAddress: connection.clientAddress,
-			httpHeaders: connection.httpHeaders,
+			httpHeaders: getModifiedHttpHeaders(connection.httpHeaders),
 			userId,
 		});
 	} else {
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index b0f45a63ff87..565f8e0bb3f4 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -31,63 +31,72 @@ import { findVisitorInfo } from '../lib/visitors';
 
 const isAgentWithInfo = (agentObj: ILivechatAgent | { hiddenInfo: boolean }): agentObj is ILivechatAgent => !('hiddenInfo' in agentObj);
 
-API.v1.addRoute('livechat/room', {
-	async get() {
-		// I'll temporary use check for validation, as validateParams doesnt support what's being done here
-		const extraCheckParams = await onCheckRoomParams({
-			token: String,
-			rid: Match.Maybe(String),
-			agentId: Match.Maybe(String),
-		});
-
-		check(this.queryParams, extraCheckParams as any);
-
-		const { token, rid, agentId, ...extraParams } = this.queryParams;
-
-		const guest = token && (await findGuest(token));
-		if (!guest) {
-			throw new Error('invalid-token');
-		}
-
-		if (!rid) {
-			const room = await LivechatRooms.findOneOpenByVisitorToken(token, {});
-			if (room) {
-				return API.v1.success({ room, newRoom: false });
-			}
-
-			let agent: SelectedAgent | undefined;
-			const agentObj = agentId && (await findAgent(agentId));
-			if (agentObj) {
-				if (isAgentWithInfo(agentObj)) {
-					const { username = undefined } = agentObj;
-					agent = { agentId, username };
-				} else {
-					agent = { agentId };
-				}
+API.v1.addRoute(
+	'livechat/room',
+	{
+		rateLimiterOptions: {
+			numRequestsAllowed: 5,
+			intervalTimeInMS: 60000,
+		},
+	},
+	{
+		async get() {
+			// I'll temporary use check for validation, as validateParams doesnt support what's being done here
+			const extraCheckParams = await onCheckRoomParams({
+				token: String,
+				rid: Match.Maybe(String),
+				agentId: Match.Maybe(String),
+			});
+
+			check(this.queryParams, extraCheckParams as any);
+
+			const { token, rid, agentId, ...extraParams } = this.queryParams;
+
+			const guest = token && (await findGuest(token));
+			if (!guest) {
+				throw new Error('invalid-token');
 			}
 
-			const roomInfo = {
-				source: {
-					type: isWidget(this.request.headers) ? OmnichannelSourceType.WIDGET : OmnichannelSourceType.API,
-				},
-			};
+			if (!rid) {
+				const room = await LivechatRooms.findOneOpenByVisitorToken(token, {});
+				if (room) {
+					return API.v1.success({ room, newRoom: false });
+				}
 
-			const newRoom = await LivechatTyped.createRoom({ visitor: guest, roomInfo, agent, extraData: extraParams });
+				let agent: SelectedAgent | undefined;
+				const agentObj = agentId && (await findAgent(agentId));
+				if (agentObj) {
+					if (isAgentWithInfo(agentObj)) {
+						const { username = undefined } = agentObj;
+						agent = { agentId, username };
+					} else {
+						agent = { agentId };
+					}
+				}
 
-			return API.v1.success({
-				room: newRoom,
-				newRoom: true,
-			});
-		}
+				const roomInfo = {
+					source: {
+						type: isWidget(this.request.headers) ? OmnichannelSourceType.WIDGET : OmnichannelSourceType.API,
+					},
+				};
+
+				const newRoom = await LivechatTyped.createRoom({ visitor: guest, roomInfo, agent, extraData: extraParams });
 
-		const froom = await LivechatRooms.findOneOpenByRoomIdAndVisitorToken(rid, token, {});
-		if (!froom) {
-			throw new Error('invalid-room');
-		}
+				return API.v1.success({
+					room: newRoom,
+					newRoom: true,
+				});
+			}
+
+			const froom = await LivechatRooms.findOneOpenByRoomIdAndVisitorToken(rid, token, {});
+			if (!froom) {
+				throw new Error('invalid-room');
+			}
 
-		return API.v1.success({ room: froom, newRoom: false });
+			return API.v1.success({ room: froom, newRoom: false });
+		},
 	},
-});
+);
 
 // Note: use this route if a visitor is closing a room
 // If a RC user(like eg agent) is closing a room, use the `livechat/room.closeByUser` route
diff --git a/apps/meteor/app/livechat/server/api/v1/visitor.ts b/apps/meteor/app/livechat/server/api/v1/visitor.ts
index a5b3f2de35b1..ed32f0e2d279 100644
--- a/apps/meteor/app/livechat/server/api/v1/visitor.ts
+++ b/apps/meteor/app/livechat/server/api/v1/visitor.ts
@@ -9,119 +9,128 @@ import { settings } from '../../../../settings/server';
 import { Livechat as LivechatTyped } from '../../lib/LivechatTyped';
 import { findGuest, normalizeHttpHeaderData } from '../lib/livechat';
 
-API.v1.addRoute('livechat/visitor', {
-	async post() {
-		check(this.bodyParams, {
-			visitor: Match.ObjectIncluding({
-				token: String,
-				name: Match.Maybe(String),
-				email: Match.Maybe(String),
-				department: Match.Maybe(String),
-				phone: Match.Maybe(String),
-				username: Match.Maybe(String),
-				customFields: Match.Maybe([
-					Match.ObjectIncluding({
-						key: String,
-						value: String,
-						overwrite: Boolean,
-					}),
-				]),
-			}),
-		});
-
-		const { customFields, id, token, name, email, department, phone, username, connectionData } = this.bodyParams.visitor;
-
-		if (!token?.trim()) {
-			throw new Meteor.Error('error-invalid-token', 'Token cannot be empty', { method: 'livechat/visitor' });
-		}
-
-		const guest = {
-			token,
-			...(id && { id }),
-			...(name && { name }),
-			...(email && { email }),
-			...(department && { department }),
-			...(username && { username }),
-			...(connectionData && { connectionData }),
-			...(phone && typeof phone === 'string' && { phone: { number: phone as string } }),
-			connectionData: normalizeHttpHeaderData(this.request.headers),
-		};
-
-		const visitor = await LivechatTyped.registerGuest(guest);
-		if (!visitor) {
-			throw new Meteor.Error('error-livechat-visitor-registration', 'Error registering visitor', {
-				method: 'livechat/visitor',
+API.v1.addRoute(
+	'livechat/visitor',
+	{
+		rateLimiterOptions: {
+			numRequestsAllowed: 5,
+			intervalTimeInMS: 60000,
+		},
+	},
+	{
+		async post() {
+			check(this.bodyParams, {
+				visitor: Match.ObjectIncluding({
+					token: String,
+					name: Match.Maybe(String),
+					email: Match.Maybe(String),
+					department: Match.Maybe(String),
+					phone: Match.Maybe(String),
+					username: Match.Maybe(String),
+					customFields: Match.Maybe([
+						Match.ObjectIncluding({
+							key: String,
+							value: String,
+							overwrite: Boolean,
+						}),
+					]),
+				}),
 			});
-		}
 
-		const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
-		// If it's updating an existing visitor, it must also update the roomInfo
-		const rooms = await LivechatRooms.findOpenByVisitorToken(visitor?.token, {}, extraQuery).toArray();
-		await Promise.all(
-			rooms.map(
-				(room: IRoom) =>
-					visitor &&
-					LivechatTyped.saveRoomInfo(room, {
-						_id: visitor._id,
-						name: visitor.name,
-						phone: visitor.phone?.[0]?.phoneNumber,
-						livechatData: visitor.livechatData as { [k: string]: string },
-					}),
-			),
-		);
-
-		if (customFields && Array.isArray(customFields) && customFields.length > 0) {
-			const keys = customFields.map((field) => field.key);
-			const errors: string[] = [];
-
-			const processedKeys = await Promise.all(
-				await LivechatCustomField.findByIdsAndScope<Pick<ILivechatCustomField, '_id'>>(keys, 'visitor', {
-					projection: { _id: 1 },
-				})
-					.map(async (field) => {
-						const customField = customFields.find((f) => f.key === field._id);
-						if (!customField) {
-							return;
-						}
-
-						const { key, value, overwrite } = customField;
-						// TODO: Change this to Bulk update
-						if (!(await VisitorsRaw.updateLivechatDataByToken(token, key, value, overwrite))) {
-							errors.push(key);
-						}
-
-						return key;
-					})
-					.toArray(),
-			);
+			const { customFields, id, token, name, email, department, phone, username, connectionData } = this.bodyParams.visitor;
 
-			if (processedKeys.length !== keys.length) {
-				LivechatTyped.logger.warn({
-					msg: 'Some custom fields were not processed',
-					visitorId: visitor._id,
-					missingKeys: keys.filter((key) => !processedKeys.includes(key)),
-				});
+			if (!token?.trim()) {
+				throw new Meteor.Error('error-invalid-token', 'Token cannot be empty', { method: 'livechat/visitor' });
 			}
 
-			if (errors.length > 0) {
-				LivechatTyped.logger.error({
-					msg: 'Error updating custom fields',
-					visitorId: visitor._id,
-					errors,
+			const guest = {
+				token,
+				...(id && { id }),
+				...(name && { name }),
+				...(email && { email }),
+				...(department && { department }),
+				...(username && { username }),
+				...(connectionData && { connectionData }),
+				...(phone && typeof phone === 'string' && { phone: { number: phone as string } }),
+				connectionData: normalizeHttpHeaderData(this.request.headers),
+			};
+
+			const visitor = await LivechatTyped.registerGuest(guest);
+			if (!visitor) {
+				throw new Meteor.Error('error-livechat-visitor-registration', 'Error registering visitor', {
+					method: 'livechat/visitor',
 				});
-				throw new Error('error-updating-custom-fields');
 			}
 
-			return API.v1.success({ visitor: await VisitorsRaw.findOneEnabledById(visitor._id) });
-		}
+			const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
+			// If it's updating an existing visitor, it must also update the roomInfo
+			const rooms = await LivechatRooms.findOpenByVisitorToken(visitor?.token, {}, extraQuery).toArray();
+			await Promise.all(
+				rooms.map(
+					(room: IRoom) =>
+						visitor &&
+						LivechatTyped.saveRoomInfo(room, {
+							_id: visitor._id,
+							name: visitor.name,
+							phone: visitor.phone?.[0]?.phoneNumber,
+							livechatData: visitor.livechatData as { [k: string]: string },
+						}),
+				),
+			);
 
-		if (!visitor) {
-			throw new Meteor.Error('error-saving-visitor', 'An error ocurred while saving visitor');
-		}
+			if (customFields && Array.isArray(customFields) && customFields.length > 0) {
+				const keys = customFields.map((field) => field.key);
+				const errors: string[] = [];
 
-		return API.v1.success({ visitor });
+				const processedKeys = await Promise.all(
+					await LivechatCustomField.findByIdsAndScope<Pick<ILivechatCustomField, '_id'>>(keys, 'visitor', {
+						projection: { _id: 1 },
+					})
+						.map(async (field) => {
+							const customField = customFields.find((f) => f.key === field._id);
+							if (!customField) {
+								return;
+							}
+
+							const { key, value, overwrite } = customField;
+							// TODO: Change this to Bulk update
+							if (!(await VisitorsRaw.updateLivechatDataByToken(token, key, value, overwrite))) {
+								errors.push(key);
+							}
+
+							return key;
+						})
+						.toArray(),
+				);
+
+				if (processedKeys.length !== keys.length) {
+					LivechatTyped.logger.warn({
+						msg: 'Some custom fields were not processed',
+						visitorId: visitor._id,
+						missingKeys: keys.filter((key) => !processedKeys.includes(key)),
+					});
+				}
+
+				if (errors.length > 0) {
+					LivechatTyped.logger.error({
+						msg: 'Error updating custom fields',
+						visitorId: visitor._id,
+						errors,
+					});
+					throw new Error('error-updating-custom-fields');
+				}
+
+				return API.v1.success({ visitor: await VisitorsRaw.findOneEnabledById(visitor._id) });
+			}
+
+			if (!visitor) {
+				throw new Meteor.Error('error-saving-visitor', 'An error ocurred while saving visitor');
+			}
+
+			return API.v1.success({ visitor });
+		},
 	},
-});
+);
 
 API.v1.addRoute('livechat/visitor/:token', {
 	async get() {
diff --git a/apps/meteor/tests/end-to-end/api/miscellaneous.ts b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
index 613a874ecd8c..b8341f7c0994 100644
--- a/apps/meteor/tests/end-to-end/api/miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
@@ -5,7 +5,7 @@ import type { IInstance } from '@rocket.chat/rest-typings';
 import { AssertionError, expect } from 'chai';
 import { after, before, describe, it } from 'mocha';
 
-import { getCredentials, api, request, credentials } from '../../data/api-data';
+import { getCredentials, api, request, credentials, methodCall } from '../../data/api-data';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { createTeam, deleteTeam } from '../../data/teams.helper';
@@ -703,4 +703,139 @@ describe('miscellaneous', () => {
 				.end(done);
 		});
 	});
+
+	describe('[/stdout.queue]', () => {
+		let testUser: TestUser<IUser>;
+		let testUsername: string;
+		let testUserPassword: string;
+		before(async () => {
+			testUser = await createUser();
+			testUsername = testUser.username;
+			testUserPassword = password;
+			await updateSetting('Log_Trace_Methods', true);
+			await updateSetting('Log_Level', '2');
+
+			// populate the logs by sending method calls
+			const populateLogsPromises = [];
+			populateLogsPromises.push(
+				request
+					.post(methodCall('getRoomRoles'))
+					.set(credentials)
+					.set('Cookie', `rc_token=${credentials['X-Auth-Token']}`)
+					.send({
+						message: JSON.stringify({
+							method: 'getRoomRoles',
+							params: ['GENERAL'],
+							id: 'id',
+							msg: 'method',
+						}),
+					}),
+			);
+
+			populateLogsPromises.push(
+				request
+					.post(methodCall('private-settings:get'))
+					.set(credentials)
+					.send({
+						message: JSON.stringify({
+							method: 'private-settings/get',
+							params: [
+								{
+									$date: new Date().getTime(),
+								},
+							],
+							id: 'id',
+							msg: 'method',
+						}),
+					}),
+			);
+
+			populateLogsPromises.push(
+				request.post(api('login')).send({
+					user: {
+						username: testUsername,
+					},
+					password: testUserPassword,
+				}),
+			);
+
+			await Promise.all(populateLogsPromises);
+		});
+
+		after(async () => {
+			await Promise.all([updateSetting('Log_Trace_Methods', false), updateSetting('Log_Level', '0'), deleteUser(testUser)]);
+		});
+
+		it('if log trace enabled, x-auth-token should be redacted', async () => {
+			await request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('queue').that.is.an('array');
+
+					const { queue } = res.body;
+					let foundRedactedToken = false;
+
+					for (const log of queue) {
+						if (log.string.includes("'x-auth-token': '[redacted]'")) {
+							foundRedactedToken = true;
+							break;
+						}
+					}
+
+					expect(foundRedactedToken).to.be.true;
+				});
+		});
+
+		it('if log trace enabled, rc_token should be redacted', async () => {
+			await request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('queue').that.is.an('array');
+
+					const { queue } = res.body;
+					let foundRedactedCookie = false;
+
+					for (const log of queue) {
+						if (log.string.includes('rc_token=[redacted]')) {
+							foundRedactedCookie = true;
+							break;
+						}
+					}
+
+					expect(foundRedactedCookie).to.be.true;
+				});
+		});
+
+		it('should not return user token anywhere in the log stream', async () => {
+			await request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('queue').that.is.an('array');
+
+					const { queue } = res.body;
+					let foundTokenValue = false;
+
+					for (const log of queue) {
+						if (log.string.includes(credentials['X-Auth-Token'])) {
+							foundTokenValue = true;
+							break;
+						}
+					}
+
+					expect(foundTokenValue).to.be.false;
+				});
+		});
+	});
 });
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts b/apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts
new file mode 100644
index 000000000000..5130bbe59a99
--- /dev/null
+++ b/apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts
@@ -0,0 +1,59 @@
+import { expect } from 'chai';
+
+import { getModifiedHttpHeaders } from '../../../../../../app/lib/server/functions/getModifiedHttpHeaders';
+
+describe('getModifiedHttpHeaders', () => {
+	it('should redact x-auth-token if present', () => {
+		const inputHeaders = {
+			'x-auth-token': '12345',
+			'some-other-header': 'value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result['x-auth-token']).to.equal('[redacted]');
+		expect(result['some-other-header']).to.equal('value');
+	});
+
+	it('should not modify headers if x-auth-token is not present', () => {
+		const inputHeaders = {
+			'some-other-header': 'value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result).to.deep.equal(inputHeaders);
+	});
+
+	it('should redact rc_token in cookies if present', () => {
+		const inputHeaders = {
+			cookie: 'session_id=abc123; rc_token=98765; other_cookie=value',
+		};
+		const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result.cookie).to.equal(expectedCookies);
+	});
+
+	it('should not modify cookies if rc_token is not present', () => {
+		const inputHeaders = {
+			cookie: 'session_id=abc123; other_cookie=value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result.cookie).to.equal(inputHeaders.cookie);
+	});
+
+	it('should return headers unchanged if neither x-auth-token nor cookie are present', () => {
+		const inputHeaders = {
+			'some-other-header': 'value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result).to.deep.equal(inputHeaders);
+	});
+
+	it('should handle cases with both x-auth-token and rc_token in cookie', () => {
+		const inputHeaders = {
+			'x-auth-token': '12345',
+			'cookie': 'session_id=abc123; rc_token=98765; other_cookie=value',
+		};
+		const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result['x-auth-token']).to.equal('[redacted]');
+		expect(result.cookie).to.equal(expectedCookies);
+	});
+});

From d4dde2b123c98b47e91d81f54f92c02f45be86b0 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:09:19 +0530
Subject: [PATCH 010/170] regression: Handle live setting forget user session
 on window close update (#33133)

---
 apps/meteor/client/startup/accounts.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/startup/accounts.ts
index 60f2de02bde0..88008a606656 100644
--- a/apps/meteor/client/startup/accounts.ts
+++ b/apps/meteor/client/startup/accounts.ts
@@ -27,13 +27,15 @@ Accounts.onEmailVerificationLink((token: string) => {
 });
 
 Meteor.startup(() => {
-	Tracker.autorun(() => {
+	Tracker.autorun((computation) => {
 		const forgetUserSessionOnWindowClose = settings.get('Accounts_ForgetUserSessionOnWindowClose');
 
 		if (forgetUserSessionOnWindowClose === undefined) {
 			return;
 		}
 
+		computation.stop();
+
 		Accounts.config({ clientStorage: forgetUserSessionOnWindowClose ? 'session' : 'local' });
 	});
 });

From 3d019906cc83aa6e9d646269593b3b5053861ed7 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:30:47 +0000
Subject: [PATCH 011/170] fix: Forget session on window close (#33129)

Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
---
 .changeset/two-bikes-crash.md                 |  7 +++
 apps/meteor/client/startup/accounts.ts        | 13 +++++
 .../externals/meteor/accounts-base.d.ts       |  2 +
 ...account-forgetSessionOnWindowClose.spec.ts | 55 +++++++++++++++++++
 4 files changed, 77 insertions(+)
 create mode 100644 .changeset/two-bikes-crash.md
 create mode 100644 apps/meteor/tests/e2e/account-forgetSessionOnWindowClose.spec.ts

diff --git a/.changeset/two-bikes-crash.md b/.changeset/two-bikes-crash.md
new file mode 100644
index 000000000000..a120435e4a48
--- /dev/null
+++ b/.changeset/two-bikes-crash.md
@@ -0,0 +1,7 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
+
+The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.
diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/startup/accounts.ts
index 3be110bc0a09..60f2de02bde0 100644
--- a/apps/meteor/client/startup/accounts.ts
+++ b/apps/meteor/client/startup/accounts.ts
@@ -2,6 +2,7 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
+import { settings } from '../../app/settings/client';
 import { mainReady } from '../../app/ui-utils/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { t } from '../../app/utils/lib/i18n';
@@ -24,3 +25,15 @@ Accounts.onEmailVerificationLink((token: string) => {
 		});
 	});
 });
+
+Meteor.startup(() => {
+	Tracker.autorun(() => {
+		const forgetUserSessionOnWindowClose = settings.get('Accounts_ForgetUserSessionOnWindowClose');
+
+		if (forgetUserSessionOnWindowClose === undefined) {
+			return;
+		}
+
+		Accounts.config({ clientStorage: forgetUserSessionOnWindowClose ? 'session' : 'local' });
+	});
+});
diff --git a/apps/meteor/definition/externals/meteor/accounts-base.d.ts b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
index 3f0b148120e7..31b70f7b7154 100644
--- a/apps/meteor/definition/externals/meteor/accounts-base.d.ts
+++ b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
@@ -42,6 +42,8 @@ declare module 'meteor/accounts-base' {
 
 		function _clearAllLoginTokens(userId: string | null): void;
 
+		function config(options: { clientStorage: 'session' | 'local' }): void;
+
 		class ConfigError extends Error {}
 
 		class LoginCancelledError extends Error {
diff --git a/apps/meteor/tests/e2e/account-forgetSessionOnWindowClose.spec.ts b/apps/meteor/tests/e2e/account-forgetSessionOnWindowClose.spec.ts
new file mode 100644
index 000000000000..a19b0e9866da
--- /dev/null
+++ b/apps/meteor/tests/e2e/account-forgetSessionOnWindowClose.spec.ts
@@ -0,0 +1,55 @@
+import { DEFAULT_USER_CREDENTIALS } from './config/constants';
+import { Registration } from './page-objects';
+import { test, expect } from './utils/test';
+
+test.describe.serial('Forget session on window close setting', () => {
+	let poRegistration: Registration;
+
+	test.beforeEach(async ({ page }) => {
+		poRegistration = new Registration(page);
+
+		await page.goto('/home');
+	});
+
+	test.describe('Setting off', async () => {
+		test.beforeAll(async ({ api }) => {
+			await api.post('/settings/Accounts_ForgetUserSessionOnWindowClose', { value: false });
+		});
+
+		test('Login using credentials and reload to stay logged in', async ({ page, context }) => {
+			await poRegistration.username.type('user1');
+			await poRegistration.inputPassword.type(DEFAULT_USER_CREDENTIALS.password);
+			await poRegistration.btnLogin.click();
+
+			await expect(page.locator('role=heading[name="Welcome to Rocket.Chat"]')).toBeVisible();
+
+			const newPage = await context.newPage();
+			await newPage.goto('/home');
+
+			await expect(newPage.locator('role=heading[name="Welcome to Rocket.Chat"]')).toBeVisible();
+		});
+	});
+
+	test.describe('Setting on', async () => {
+		test.beforeAll(async ({ api }) => {
+			await api.post('/settings/Accounts_ForgetUserSessionOnWindowClose', { value: true });
+		});
+
+		test.afterAll(async ({ api }) => {
+			await api.post('/settings/Accounts_ForgetUserSessionOnWindowClose', { value: false });
+		});
+
+		test('Login using credentials and reload to get logged out', async ({ page, context }) => {
+			await poRegistration.username.type('user1');
+			await poRegistration.inputPassword.type(DEFAULT_USER_CREDENTIALS.password);
+			await poRegistration.btnLogin.click();
+
+			await expect(page.locator('role=heading[name="Welcome to Rocket.Chat"]')).toBeVisible();
+
+			const newPage = await context.newPage();
+			await newPage.goto('/home');
+
+			await expect(newPage.locator('role=button[name="Login"]')).toBeVisible();
+		});
+	});
+});

From aa39197d1c41d04fdceec9b0340c02c3ae20ced3 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:53:50 +0000
Subject: [PATCH 012/170] fix: imported fixes (#33153)

Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
---
 .changeset/orange-clocks-wait.md              |   5 +
 .../functions/getModifiedHttpHeaders.ts       |  20 ++
 apps/meteor/app/lib/server/lib/debug.js       |   3 +-
 .../meteor/app/livechat/server/api/v1/room.ts | 109 +++++----
 .../app/livechat/server/api/v1/visitor.ts     | 213 +++++++++---------
 .../tests/end-to-end/api/miscellaneous.ts     | 137 ++++++++++-
 .../functions/getModifiedHttpHeaders.tests.ts |  59 +++++
 7 files changed, 392 insertions(+), 154 deletions(-)
 create mode 100644 .changeset/orange-clocks-wait.md
 create mode 100644 apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
 create mode 100644 apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts

diff --git a/.changeset/orange-clocks-wait.md b/.changeset/orange-clocks-wait.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/orange-clocks-wait.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts b/apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
new file mode 100644
index 000000000000..e62727814de3
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
@@ -0,0 +1,20 @@
+export const getModifiedHttpHeaders = (httpHeaders: Record<string, any>) => {
+	const modifiedHttpHeaders = { ...httpHeaders };
+
+	if ('x-auth-token' in modifiedHttpHeaders) {
+		modifiedHttpHeaders['x-auth-token'] = '[redacted]';
+	}
+
+	if (modifiedHttpHeaders.cookie) {
+		const cookies = modifiedHttpHeaders.cookie.split('; ');
+		const modifiedCookies = cookies.map((cookie: string) => {
+			if (cookie.startsWith('rc_token=')) {
+				return 'rc_token=[redacted]';
+			}
+			return cookie;
+		});
+		modifiedHttpHeaders.cookie = modifiedCookies.join('; ');
+	}
+
+	return modifiedHttpHeaders;
+};
diff --git a/apps/meteor/app/lib/server/lib/debug.js b/apps/meteor/app/lib/server/lib/debug.js
index aaa492e80337..cbf38528579f 100644
--- a/apps/meteor/app/lib/server/lib/debug.js
+++ b/apps/meteor/app/lib/server/lib/debug.js
@@ -7,6 +7,7 @@ import _ from 'underscore';
 import { getMethodArgs } from '../../../../server/lib/logger/logPayloads';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
+import { getModifiedHttpHeaders } from '../functions/getModifiedHttpHeaders';
 
 const logger = new Logger('Meteor');
 
@@ -41,7 +42,7 @@ const traceConnection = (enable, filter, prefix, name, connection, userId) => {
 		console.log(name, {
 			id: connection.id,
 			clientAddress: connection.clientAddress,
-			httpHeaders: connection.httpHeaders,
+			httpHeaders: getModifiedHttpHeaders(connection.httpHeaders),
 			userId,
 		});
 	} else {
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index b0f45a63ff87..565f8e0bb3f4 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -31,63 +31,72 @@ import { findVisitorInfo } from '../lib/visitors';
 
 const isAgentWithInfo = (agentObj: ILivechatAgent | { hiddenInfo: boolean }): agentObj is ILivechatAgent => !('hiddenInfo' in agentObj);
 
-API.v1.addRoute('livechat/room', {
-	async get() {
-		// I'll temporary use check for validation, as validateParams doesnt support what's being done here
-		const extraCheckParams = await onCheckRoomParams({
-			token: String,
-			rid: Match.Maybe(String),
-			agentId: Match.Maybe(String),
-		});
-
-		check(this.queryParams, extraCheckParams as any);
-
-		const { token, rid, agentId, ...extraParams } = this.queryParams;
-
-		const guest = token && (await findGuest(token));
-		if (!guest) {
-			throw new Error('invalid-token');
-		}
-
-		if (!rid) {
-			const room = await LivechatRooms.findOneOpenByVisitorToken(token, {});
-			if (room) {
-				return API.v1.success({ room, newRoom: false });
-			}
-
-			let agent: SelectedAgent | undefined;
-			const agentObj = agentId && (await findAgent(agentId));
-			if (agentObj) {
-				if (isAgentWithInfo(agentObj)) {
-					const { username = undefined } = agentObj;
-					agent = { agentId, username };
-				} else {
-					agent = { agentId };
-				}
+API.v1.addRoute(
+	'livechat/room',
+	{
+		rateLimiterOptions: {
+			numRequestsAllowed: 5,
+			intervalTimeInMS: 60000,
+		},
+	},
+	{
+		async get() {
+			// I'll temporary use check for validation, as validateParams doesnt support what's being done here
+			const extraCheckParams = await onCheckRoomParams({
+				token: String,
+				rid: Match.Maybe(String),
+				agentId: Match.Maybe(String),
+			});
+
+			check(this.queryParams, extraCheckParams as any);
+
+			const { token, rid, agentId, ...extraParams } = this.queryParams;
+
+			const guest = token && (await findGuest(token));
+			if (!guest) {
+				throw new Error('invalid-token');
 			}
 
-			const roomInfo = {
-				source: {
-					type: isWidget(this.request.headers) ? OmnichannelSourceType.WIDGET : OmnichannelSourceType.API,
-				},
-			};
+			if (!rid) {
+				const room = await LivechatRooms.findOneOpenByVisitorToken(token, {});
+				if (room) {
+					return API.v1.success({ room, newRoom: false });
+				}
 
-			const newRoom = await LivechatTyped.createRoom({ visitor: guest, roomInfo, agent, extraData: extraParams });
+				let agent: SelectedAgent | undefined;
+				const agentObj = agentId && (await findAgent(agentId));
+				if (agentObj) {
+					if (isAgentWithInfo(agentObj)) {
+						const { username = undefined } = agentObj;
+						agent = { agentId, username };
+					} else {
+						agent = { agentId };
+					}
+				}
 
-			return API.v1.success({
-				room: newRoom,
-				newRoom: true,
-			});
-		}
+				const roomInfo = {
+					source: {
+						type: isWidget(this.request.headers) ? OmnichannelSourceType.WIDGET : OmnichannelSourceType.API,
+					},
+				};
+
+				const newRoom = await LivechatTyped.createRoom({ visitor: guest, roomInfo, agent, extraData: extraParams });
 
-		const froom = await LivechatRooms.findOneOpenByRoomIdAndVisitorToken(rid, token, {});
-		if (!froom) {
-			throw new Error('invalid-room');
-		}
+				return API.v1.success({
+					room: newRoom,
+					newRoom: true,
+				});
+			}
+
+			const froom = await LivechatRooms.findOneOpenByRoomIdAndVisitorToken(rid, token, {});
+			if (!froom) {
+				throw new Error('invalid-room');
+			}
 
-		return API.v1.success({ room: froom, newRoom: false });
+			return API.v1.success({ room: froom, newRoom: false });
+		},
 	},
-});
+);
 
 // Note: use this route if a visitor is closing a room
 // If a RC user(like eg agent) is closing a room, use the `livechat/room.closeByUser` route
diff --git a/apps/meteor/app/livechat/server/api/v1/visitor.ts b/apps/meteor/app/livechat/server/api/v1/visitor.ts
index a5b3f2de35b1..ed32f0e2d279 100644
--- a/apps/meteor/app/livechat/server/api/v1/visitor.ts
+++ b/apps/meteor/app/livechat/server/api/v1/visitor.ts
@@ -9,119 +9,128 @@ import { settings } from '../../../../settings/server';
 import { Livechat as LivechatTyped } from '../../lib/LivechatTyped';
 import { findGuest, normalizeHttpHeaderData } from '../lib/livechat';
 
-API.v1.addRoute('livechat/visitor', {
-	async post() {
-		check(this.bodyParams, {
-			visitor: Match.ObjectIncluding({
-				token: String,
-				name: Match.Maybe(String),
-				email: Match.Maybe(String),
-				department: Match.Maybe(String),
-				phone: Match.Maybe(String),
-				username: Match.Maybe(String),
-				customFields: Match.Maybe([
-					Match.ObjectIncluding({
-						key: String,
-						value: String,
-						overwrite: Boolean,
-					}),
-				]),
-			}),
-		});
-
-		const { customFields, id, token, name, email, department, phone, username, connectionData } = this.bodyParams.visitor;
-
-		if (!token?.trim()) {
-			throw new Meteor.Error('error-invalid-token', 'Token cannot be empty', { method: 'livechat/visitor' });
-		}
-
-		const guest = {
-			token,
-			...(id && { id }),
-			...(name && { name }),
-			...(email && { email }),
-			...(department && { department }),
-			...(username && { username }),
-			...(connectionData && { connectionData }),
-			...(phone && typeof phone === 'string' && { phone: { number: phone as string } }),
-			connectionData: normalizeHttpHeaderData(this.request.headers),
-		};
-
-		const visitor = await LivechatTyped.registerGuest(guest);
-		if (!visitor) {
-			throw new Meteor.Error('error-livechat-visitor-registration', 'Error registering visitor', {
-				method: 'livechat/visitor',
+API.v1.addRoute(
+	'livechat/visitor',
+	{
+		rateLimiterOptions: {
+			numRequestsAllowed: 5,
+			intervalTimeInMS: 60000,
+		},
+	},
+	{
+		async post() {
+			check(this.bodyParams, {
+				visitor: Match.ObjectIncluding({
+					token: String,
+					name: Match.Maybe(String),
+					email: Match.Maybe(String),
+					department: Match.Maybe(String),
+					phone: Match.Maybe(String),
+					username: Match.Maybe(String),
+					customFields: Match.Maybe([
+						Match.ObjectIncluding({
+							key: String,
+							value: String,
+							overwrite: Boolean,
+						}),
+					]),
+				}),
 			});
-		}
 
-		const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
-		// If it's updating an existing visitor, it must also update the roomInfo
-		const rooms = await LivechatRooms.findOpenByVisitorToken(visitor?.token, {}, extraQuery).toArray();
-		await Promise.all(
-			rooms.map(
-				(room: IRoom) =>
-					visitor &&
-					LivechatTyped.saveRoomInfo(room, {
-						_id: visitor._id,
-						name: visitor.name,
-						phone: visitor.phone?.[0]?.phoneNumber,
-						livechatData: visitor.livechatData as { [k: string]: string },
-					}),
-			),
-		);
-
-		if (customFields && Array.isArray(customFields) && customFields.length > 0) {
-			const keys = customFields.map((field) => field.key);
-			const errors: string[] = [];
-
-			const processedKeys = await Promise.all(
-				await LivechatCustomField.findByIdsAndScope<Pick<ILivechatCustomField, '_id'>>(keys, 'visitor', {
-					projection: { _id: 1 },
-				})
-					.map(async (field) => {
-						const customField = customFields.find((f) => f.key === field._id);
-						if (!customField) {
-							return;
-						}
-
-						const { key, value, overwrite } = customField;
-						// TODO: Change this to Bulk update
-						if (!(await VisitorsRaw.updateLivechatDataByToken(token, key, value, overwrite))) {
-							errors.push(key);
-						}
-
-						return key;
-					})
-					.toArray(),
-			);
+			const { customFields, id, token, name, email, department, phone, username, connectionData } = this.bodyParams.visitor;
 
-			if (processedKeys.length !== keys.length) {
-				LivechatTyped.logger.warn({
-					msg: 'Some custom fields were not processed',
-					visitorId: visitor._id,
-					missingKeys: keys.filter((key) => !processedKeys.includes(key)),
-				});
+			if (!token?.trim()) {
+				throw new Meteor.Error('error-invalid-token', 'Token cannot be empty', { method: 'livechat/visitor' });
 			}
 
-			if (errors.length > 0) {
-				LivechatTyped.logger.error({
-					msg: 'Error updating custom fields',
-					visitorId: visitor._id,
-					errors,
+			const guest = {
+				token,
+				...(id && { id }),
+				...(name && { name }),
+				...(email && { email }),
+				...(department && { department }),
+				...(username && { username }),
+				...(connectionData && { connectionData }),
+				...(phone && typeof phone === 'string' && { phone: { number: phone as string } }),
+				connectionData: normalizeHttpHeaderData(this.request.headers),
+			};
+
+			const visitor = await LivechatTyped.registerGuest(guest);
+			if (!visitor) {
+				throw new Meteor.Error('error-livechat-visitor-registration', 'Error registering visitor', {
+					method: 'livechat/visitor',
 				});
-				throw new Error('error-updating-custom-fields');
 			}
 
-			return API.v1.success({ visitor: await VisitorsRaw.findOneEnabledById(visitor._id) });
-		}
+			const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
+			// If it's updating an existing visitor, it must also update the roomInfo
+			const rooms = await LivechatRooms.findOpenByVisitorToken(visitor?.token, {}, extraQuery).toArray();
+			await Promise.all(
+				rooms.map(
+					(room: IRoom) =>
+						visitor &&
+						LivechatTyped.saveRoomInfo(room, {
+							_id: visitor._id,
+							name: visitor.name,
+							phone: visitor.phone?.[0]?.phoneNumber,
+							livechatData: visitor.livechatData as { [k: string]: string },
+						}),
+				),
+			);
 
-		if (!visitor) {
-			throw new Meteor.Error('error-saving-visitor', 'An error ocurred while saving visitor');
-		}
+			if (customFields && Array.isArray(customFields) && customFields.length > 0) {
+				const keys = customFields.map((field) => field.key);
+				const errors: string[] = [];
 
-		return API.v1.success({ visitor });
+				const processedKeys = await Promise.all(
+					await LivechatCustomField.findByIdsAndScope<Pick<ILivechatCustomField, '_id'>>(keys, 'visitor', {
+						projection: { _id: 1 },
+					})
+						.map(async (field) => {
+							const customField = customFields.find((f) => f.key === field._id);
+							if (!customField) {
+								return;
+							}
+
+							const { key, value, overwrite } = customField;
+							// TODO: Change this to Bulk update
+							if (!(await VisitorsRaw.updateLivechatDataByToken(token, key, value, overwrite))) {
+								errors.push(key);
+							}
+
+							return key;
+						})
+						.toArray(),
+				);
+
+				if (processedKeys.length !== keys.length) {
+					LivechatTyped.logger.warn({
+						msg: 'Some custom fields were not processed',
+						visitorId: visitor._id,
+						missingKeys: keys.filter((key) => !processedKeys.includes(key)),
+					});
+				}
+
+				if (errors.length > 0) {
+					LivechatTyped.logger.error({
+						msg: 'Error updating custom fields',
+						visitorId: visitor._id,
+						errors,
+					});
+					throw new Error('error-updating-custom-fields');
+				}
+
+				return API.v1.success({ visitor: await VisitorsRaw.findOneEnabledById(visitor._id) });
+			}
+
+			if (!visitor) {
+				throw new Meteor.Error('error-saving-visitor', 'An error ocurred while saving visitor');
+			}
+
+			return API.v1.success({ visitor });
+		},
 	},
-});
+);
 
 API.v1.addRoute('livechat/visitor/:token', {
 	async get() {
diff --git a/apps/meteor/tests/end-to-end/api/miscellaneous.ts b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
index 613a874ecd8c..b8341f7c0994 100644
--- a/apps/meteor/tests/end-to-end/api/miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
@@ -5,7 +5,7 @@ import type { IInstance } from '@rocket.chat/rest-typings';
 import { AssertionError, expect } from 'chai';
 import { after, before, describe, it } from 'mocha';
 
-import { getCredentials, api, request, credentials } from '../../data/api-data';
+import { getCredentials, api, request, credentials, methodCall } from '../../data/api-data';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { createTeam, deleteTeam } from '../../data/teams.helper';
@@ -703,4 +703,139 @@ describe('miscellaneous', () => {
 				.end(done);
 		});
 	});
+
+	describe('[/stdout.queue]', () => {
+		let testUser: TestUser<IUser>;
+		let testUsername: string;
+		let testUserPassword: string;
+		before(async () => {
+			testUser = await createUser();
+			testUsername = testUser.username;
+			testUserPassword = password;
+			await updateSetting('Log_Trace_Methods', true);
+			await updateSetting('Log_Level', '2');
+
+			// populate the logs by sending method calls
+			const populateLogsPromises = [];
+			populateLogsPromises.push(
+				request
+					.post(methodCall('getRoomRoles'))
+					.set(credentials)
+					.set('Cookie', `rc_token=${credentials['X-Auth-Token']}`)
+					.send({
+						message: JSON.stringify({
+							method: 'getRoomRoles',
+							params: ['GENERAL'],
+							id: 'id',
+							msg: 'method',
+						}),
+					}),
+			);
+
+			populateLogsPromises.push(
+				request
+					.post(methodCall('private-settings:get'))
+					.set(credentials)
+					.send({
+						message: JSON.stringify({
+							method: 'private-settings/get',
+							params: [
+								{
+									$date: new Date().getTime(),
+								},
+							],
+							id: 'id',
+							msg: 'method',
+						}),
+					}),
+			);
+
+			populateLogsPromises.push(
+				request.post(api('login')).send({
+					user: {
+						username: testUsername,
+					},
+					password: testUserPassword,
+				}),
+			);
+
+			await Promise.all(populateLogsPromises);
+		});
+
+		after(async () => {
+			await Promise.all([updateSetting('Log_Trace_Methods', false), updateSetting('Log_Level', '0'), deleteUser(testUser)]);
+		});
+
+		it('if log trace enabled, x-auth-token should be redacted', async () => {
+			await request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('queue').that.is.an('array');
+
+					const { queue } = res.body;
+					let foundRedactedToken = false;
+
+					for (const log of queue) {
+						if (log.string.includes("'x-auth-token': '[redacted]'")) {
+							foundRedactedToken = true;
+							break;
+						}
+					}
+
+					expect(foundRedactedToken).to.be.true;
+				});
+		});
+
+		it('if log trace enabled, rc_token should be redacted', async () => {
+			await request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('queue').that.is.an('array');
+
+					const { queue } = res.body;
+					let foundRedactedCookie = false;
+
+					for (const log of queue) {
+						if (log.string.includes('rc_token=[redacted]')) {
+							foundRedactedCookie = true;
+							break;
+						}
+					}
+
+					expect(foundRedactedCookie).to.be.true;
+				});
+		});
+
+		it('should not return user token anywhere in the log stream', async () => {
+			await request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('queue').that.is.an('array');
+
+					const { queue } = res.body;
+					let foundTokenValue = false;
+
+					for (const log of queue) {
+						if (log.string.includes(credentials['X-Auth-Token'])) {
+							foundTokenValue = true;
+							break;
+						}
+					}
+
+					expect(foundTokenValue).to.be.false;
+				});
+		});
+	});
 });
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts b/apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts
new file mode 100644
index 000000000000..5130bbe59a99
--- /dev/null
+++ b/apps/meteor/tests/unit/app/lib/server/functions/getModifiedHttpHeaders.tests.ts
@@ -0,0 +1,59 @@
+import { expect } from 'chai';
+
+import { getModifiedHttpHeaders } from '../../../../../../app/lib/server/functions/getModifiedHttpHeaders';
+
+describe('getModifiedHttpHeaders', () => {
+	it('should redact x-auth-token if present', () => {
+		const inputHeaders = {
+			'x-auth-token': '12345',
+			'some-other-header': 'value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result['x-auth-token']).to.equal('[redacted]');
+		expect(result['some-other-header']).to.equal('value');
+	});
+
+	it('should not modify headers if x-auth-token is not present', () => {
+		const inputHeaders = {
+			'some-other-header': 'value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result).to.deep.equal(inputHeaders);
+	});
+
+	it('should redact rc_token in cookies if present', () => {
+		const inputHeaders = {
+			cookie: 'session_id=abc123; rc_token=98765; other_cookie=value',
+		};
+		const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result.cookie).to.equal(expectedCookies);
+	});
+
+	it('should not modify cookies if rc_token is not present', () => {
+		const inputHeaders = {
+			cookie: 'session_id=abc123; other_cookie=value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result.cookie).to.equal(inputHeaders.cookie);
+	});
+
+	it('should return headers unchanged if neither x-auth-token nor cookie are present', () => {
+		const inputHeaders = {
+			'some-other-header': 'value',
+		};
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result).to.deep.equal(inputHeaders);
+	});
+
+	it('should handle cases with both x-auth-token and rc_token in cookie', () => {
+		const inputHeaders = {
+			'x-auth-token': '12345',
+			'cookie': 'session_id=abc123; rc_token=98765; other_cookie=value',
+		};
+		const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
+		const result = getModifiedHttpHeaders(inputHeaders);
+		expect(result['x-auth-token']).to.equal('[redacted]');
+		expect(result.cookie).to.equal(expectedCookies);
+	});
+});

From 560a432ffdda7867378b664497f35fa5547efc79 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Mon, 26 Aug 2024 22:55:58 +0000
Subject: [PATCH 013/170] Release 6.12.0-rc.1

[no ci]
---
 .changeset/bump-patch-1724712948901.md        |  5 +++
 .changeset/pre.json                           |  2 ++
 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 +-
 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              | 10 ++++++
 ee/packages/license/package.json              |  2 +-
 ee/packages/omnichannel-services/CHANGELOG.md | 15 ++++++++
 ee/packages/omnichannel-services/package.json |  2 +-
 ee/packages/pdf-worker/CHANGELOG.md           | 10 ++++++
 ee/packages/pdf-worker/package.json           |  2 +-
 ee/packages/presence/CHANGELOG.md             | 12 +++++++
 ee/packages/presence/package.json             |  2 +-
 package.json                                  |  2 +-
 packages/api-client/CHANGELOG.md              | 11 ++++++
 packages/api-client/package.json              |  2 +-
 packages/apps/CHANGELOG.md                    | 11 ++++++
 packages/apps/package.json                    |  2 +-
 packages/core-services/CHANGELOG.md           | 12 +++++++
 packages/core-services/package.json           |  2 +-
 packages/core-typings/CHANGELOG.md            |  3 ++
 packages/core-typings/package.json            |  2 +-
 packages/cron/CHANGELOG.md                    | 11 ++++++
 packages/cron/package.json                    |  2 +-
 packages/ddp-client/CHANGELOG.md              | 12 +++++++
 packages/ddp-client/package.json              |  2 +-
 packages/fuselage-ui-kit/CHANGELOG.md         | 14 ++++++++
 packages/fuselage-ui-kit/package.json         |  8 ++---
 packages/gazzodown/CHANGELOG.md               | 12 +++++++
 packages/gazzodown/package.json               |  6 ++--
 packages/instance-status/CHANGELOG.md         | 10 ++++++
 packages/instance-status/package.json         |  2 +-
 packages/livechat/CHANGELOG.md                | 10 ++++++
 packages/livechat/package.json                |  2 +-
 packages/model-typings/CHANGELOG.md           |  9 +++++
 packages/model-typings/package.json           |  2 +-
 packages/models/CHANGELOG.md                  | 10 ++++++
 packages/models/package.json                  |  2 +-
 packages/rest-typings/CHANGELOG.md            | 10 ++++++
 packages/rest-typings/package.json            |  2 +-
 packages/ui-avatar/CHANGELOG.md               | 10 ++++++
 packages/ui-avatar/package.json               |  4 +--
 packages/ui-client/CHANGELOG.md               | 10 ++++++
 packages/ui-client/package.json               |  4 +--
 packages/ui-contexts/CHANGELOG.md             | 12 +++++++
 packages/ui-contexts/package.json             |  2 +-
 packages/ui-video-conf/CHANGELOG.md           | 11 ++++++
 packages/ui-video-conf/package.json           |  6 ++--
 packages/uikit-playground/CHANGELOG.md        | 12 +++++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     | 10 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 22 ++++++------
 69 files changed, 457 insertions(+), 55 deletions(-)
 create mode 100644 .changeset/bump-patch-1724712948901.md

diff --git a/.changeset/bump-patch-1724712948901.md b/.changeset/bump-patch-1724712948901.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1724712948901.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 fabea75cbf61..f23c7ae178fa 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -65,6 +65,7 @@
   "changesets": [
     "bright-humans-cross",
     "brown-crabs-chew",
+    "bump-patch-1724712948901",
     "calm-tigers-peel",
     "cool-rocks-remember",
     "empty-toys-smell",
@@ -79,6 +80,7 @@
     "nasty-windows-smile",
     "new-mayflies-wait",
     "ninety-hounds-exist",
+    "orange-clocks-wait",
     "popular-bottles-visit",
     "proud-years-buy",
     "purple-dolls-serve",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 9c1da2279dbb..75b8e3e71df6 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33136](https://github.com/RocketChat/Rocket.Chat/pull/33136)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/license@0.2.5-rc.1
+  - @rocket.chat/omnichannel-services@0.3.2-rc.1
+  - @rocket.chat/pdf-worker@0.2.2-rc.1
+  - @rocket.chat/presence@0.2.5-rc.1
+  - @rocket.chat/api-client@0.2.5-rc.1
+  - @rocket.chat/apps@0.1.5-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/cron@0.1.5-rc.1
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.1
+  - @rocket.chat/gazzodown@10.0.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.2-rc.1
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.1
+  - @rocket.chat/ui-client@10.0.0-rc.1
+  - @rocket.chat/ui-video-conf@10.0.0-rc.1
+  - @rocket.chat/web-ui-registration@10.0.0-rc.1
+  - @rocket.chat/instance-status@0.1.5-rc.1
+  </details>
+
 ## 6.12.0-rc.0
 
 ### Minor Changes
@@ -110,6 +144,7 @@
   - @rocket.chat/instance-status@0.1.4-rc.0
   - @rocket.chat/server-cloud-communication@0.0.2
   </details>
+
 ## 6.11.1
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 529a0ee307e9..184b030fe19d 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.0"
+	"version": "6.12.0-rc.1"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index cb411e026346..5b8af0e9703c 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 1.3.1-rc.0
 
 ### Patch Changes
@@ -13,6 +26,7 @@
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 1.3.1
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index d55531916cdd..6baf89d95ebf 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": "1.3.2-rc.0",
+	"version": "1.3.2-rc.1",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 23429fed2242..e9ac01e6b972 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": "6.12.0-rc.0",
+	"version": "6.12.0-rc.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index e392178dc323..9aec6081bf30 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.4.4-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index d08ff76a32bb..6b4e12e0ae52 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.5-rc.0",
+	"version": "0.4.5-rc.1",
 	"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 f0ac95f4b858..ee81e466ed3c 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.4.5-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 3f3ab6bddd41..723f97b071bf 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.5-rc.0",
+	"version": "0.4.5-rc.1",
 	"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 5070335cae3e..80733d804be1 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  - @rocket.chat/instance-status@0.1.5-rc.1
+  </details>
+
 ## 0.3.5-rc.0
 
 ### Patch Changes
@@ -13,6 +27,7 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/instance-status@0.1.4-rc.0
   </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 2aa081c494ed..60198b5a42e6 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.5-rc.0",
+	"version": "0.3.5-rc.1",
 	"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 194c8cefa2d8..7f7f7945dd56 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.2-rc.1
+  - @rocket.chat/pdf-worker@0.2.2-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.4.5-rc.0
 
 ### Patch Changes
@@ -13,6 +27,7 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/pdf-worker@0.2.1-rc.0
   </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index ae96ff93a5da..2639125f3dc3 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.5-rc.0",
+	"version": "0.4.5-rc.1",
 	"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 a9331e470e16..853a25180cd4 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/presence@0.2.5-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.4.5-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/presence@0.2.4-rc.0
   </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 0bd6e1523276..35f639b59890 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.5-rc.0",
+	"version": "0.4.5-rc.1",
 	"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 f89555b52009..b39ed0a8815a 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.2-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.4.5-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/omnichannel-services@0.3.1-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 630f5ff9d63b..1ed210871152 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.5-rc.0",
+	"version": "0.4.5-rc.1",
 	"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 e2226d9be84b..9b5ce23e3638 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.4.5-rc.0
 
 ### Patch Changes
@@ -11,6 +23,7 @@
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index f140bcdf6203..d06a102d4de9 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.5-rc.0",
+	"version": "0.4.5-rc.1",
 	"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 0c35027cfc07..d851f26399a6 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  </details>
+
 ## 0.2.5-rc.0
 
 ### Patch Changes
@@ -8,6 +17,7 @@
 
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 5b56a5460222..2cbfc160c8cc 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.5-rc.0",
+	"version": "0.2.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index d9cdb867b808..ba0a528d36eb 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.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/pdf-worker@0.2.2-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.3.2-rc.0
 
 ### Patch Changes
@@ -13,6 +27,7 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/pdf-worker@0.2.1-rc.0
   </details>
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 755bce1263b2..f818090964b7 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.2-rc.0",
+	"version": "0.3.2-rc.1",
 	"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 bed554a450b7..0a776c02449a 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.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  </details>
+
 ## 0.2.2-rc.0
 
 ### Patch Changes
@@ -8,6 +17,7 @@
 
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index b6b3ccd5add4..af8f5977011e 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.2-rc.0",
+	"version": "0.2.2-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 0396e0715f49..7beefdd32fe3 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/core-services@0.6.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.2.5-rc.0
 
 ### Patch Changes
@@ -10,6 +21,7 @@
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 753b1287c683..4f9afd8c042f 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.5-rc.0",
+	"version": "0.2.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 0c0a96a189de..9268f2ba988a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.0",
+	"version": "6.12.0-rc.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 980dbc25820b..838a08685baa 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  </details>
+
 ## 0.2.5-rc.0
 
 ### Patch Changes
@@ -9,6 +19,7 @@
   - @rocket.chat/rest-typings@6.12.0-rc.0
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 98cada713e20..7e289eef6146 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.5-rc.0",
+	"version": "0.2.5-rc.1",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 7fa142931a20..413ec5b3af90 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  </details>
+
 ## 0.1.5-rc.0
 
 ### Patch Changes
@@ -9,6 +19,7 @@
   - @rocket.chat/model-typings@0.7.0-rc.0
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 08e3141a3b7e..fec607e1f8ab 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.5-rc.0",
+	"version": "0.1.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index d8daff9630c2..ae5e4b1aceb1 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.6.0-rc.0
 
 ### Minor Changes
@@ -15,6 +26,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.5.1
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 729f8cac2767..b8a27cc8d0ab 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.0",
+	"version": "0.6.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 417cb749dfbd..58236a95d7da 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.1
+
 ## 6.12.0-rc.0
 
 ### Minor Changes
@@ -26,6 +28,7 @@
 
   - @rocket.chat/ui-kit@0.36.1-rc.0
   </details>
+
 ## 6.11.1
 
 ## 6.11.0
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 39108e7f4ec5..737fb013a0ff 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.0",
+	"version": "6.12.0-rc.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 6b6133b6cffe..6e42bb323a59 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.1.5-rc.0
 
 ### Patch Changes
@@ -9,6 +19,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index da50349f4c9d..c0908cb3e88e 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.5-rc.0",
+	"version": "0.1.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 98eb68739b19..2fb7c90d2327 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/api-client@0.2.5-rc.1
+  </details>
+
 ## 0.3.5-rc.0
 
 ### Patch Changes
@@ -10,6 +21,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/api-client@0.2.4-rc.0
   </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index b9c5047a3fe6..51a14bed4cba 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.5-rc.0",
+	"version": "0.3.5-rc.1",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 380f93d2b239..12f56f72659c 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 10.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/gazzodown@10.0.0-rc.1
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  - @rocket.chat/ui-avatar@6.0.0-rc.1
+  - @rocket.chat/ui-video-conf@10.0.0-rc.1
+  </details>
+
 ## 10.0.0-rc.0
 
 ### Patch Changes
@@ -15,6 +28,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 1d911f5437cb..d906859a5d5a 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.0",
+  "version": "10.0.0-rc.1",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.0",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.0",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.1",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.1",
     "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.0",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.1",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index a66bcb8ac5d4..2137661bff33 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  - @rocket.chat/ui-client@10.0.0-rc.1
+  </details>
+
 ## 10.0.0-rc.0
 
 ### Patch Changes
@@ -12,6 +23,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 8f0a87b4a3ee..7610f0db85cf 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.0",
+	"version": "10.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.0",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
+		"@rocket.chat/ui-client": "10.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index fb5f2b845123..2965cdf9e189 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.2-rc.1
+  </details>
+
 ## 0.1.5-rc.0
 
 ### Patch Changes
@@ -7,6 +16,7 @@
 - <details><summary>Updated dependencies []:</summary>
 - @rocket.chat/models@0.2.1-rc.0
 </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 7f175b22ff07..f957756ad7cd 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.5-rc.0",
+	"version": "0.1.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 0ca65ce566c5..9432f8055254 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.1
+  </details>
+
 ## 1.19.1-rc.0
 
 ### Patch Changes
@@ -11,6 +20,7 @@
   - @rocket.chat/gazzodown@10.0.0-rc.0
   - @rocket.chat/ui-kit@0.36.1-rc.0
   </details>
+
 ## 1.19.1
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 1f2f7bf2bdce..419b34b67604 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.2-rc.0",
+	"version": "1.19.2-rc.1",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 8198319fd403..6c090c3ff504 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  </details>
+
 ## 0.7.0-rc.0
 
 ### Minor Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index f548b14cee84..2532ee5edf80 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.0",
+	"version": "0.7.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 3fedb5d3bfb4..03bf4ac0a3fd 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.1
+  </details>
+
 ## 0.2.2-rc.0
 
 ### Patch Changes
@@ -8,6 +17,7 @@
 
   - @rocket.chat/model-typings@0.7.0-rc.0
   </details>
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 7d2378e32bfb..b4a07acb8cfd 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.2-rc.0",
+	"version": "0.2.2-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 4b77f3a8efc6..003368df6617 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  </details>
+
 ## 6.12.0-rc.0
 
 ### Minor Changes
@@ -15,6 +24,7 @@
   - @rocket.chat/ui-kit@0.36.1-rc.0
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 6.11.1
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 1cb919fca8ce..d037e77e7546 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.0",
+	"version": "6.12.0-rc.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 1efc49970211..1c917fd00821 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  </details>
+
 ## 6.0.0-rc.0
 
 ### Patch Changes
@@ -10,6 +19,7 @@
 
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 5.0.1
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 5188712463bf..32054f4b4984 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.0",
+	"version": "6.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 38798caa76e1..a4b1f55300ee 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  </details>
+
 ## 10.0.0-rc.0
 
 ### Patch Changes
@@ -10,6 +19,7 @@
 
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index d3d7fc1646ec..ed67fb084a91 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.0",
+	"version": "10.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index c0409d4f263c..e98fa6e55d91 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.1
+  - @rocket.chat/rest-typings@6.12.0-rc.1
+  - @rocket.chat/ddp-client@0.3.5-rc.1
+  </details>
+
 ## 10.0.0-rc.0
 
 ### Patch Changes
@@ -11,6 +22,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/ddp-client@0.3.4-rc.0
   </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 67281b6e0652..a5750b7d5065 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.0",
+	"version": "10.0.0-rc.1",
 	"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 07883f1b3256..39e0237d1e49 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  - @rocket.chat/ui-avatar@6.0.0-rc.1
+  </details>
+
 ## 10.0.0-rc.0
 
 ### Patch Changes
@@ -11,6 +21,7 @@
   - @rocket.chat/ui-avatar@6.0.0-rc.0
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index b71f1396706d..8c899c42f03e 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": "10.0.0-rc.0",
+	"version": "10.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.0",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index f5f0acc46a60..853ce4759b4d 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.1
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  - @rocket.chat/ui-avatar@6.0.0-rc.1
+  </details>
+
 ## 0.4.0-rc.0
 
 ### Minor Changes
@@ -16,6 +27,7 @@
   - @rocket.chat/ui-avatar@6.0.0-rc.0
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 1a3195460525..ec3937c2fedd 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.0",
+  "version": "0.4.0-rc.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 2a71ffad5101..e653ae6501ae 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.1
+  </details>
+
 ## 10.0.0-rc.0
 
 ### Patch Changes
@@ -10,6 +19,7 @@
 
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ae6601f59224..ce73a83e6802 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": "10.0.0-rc.0",
+	"version": "10.0.0-rc.1",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index f1704485f7c1..4fbcd9d54089 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 5.0.0
-    "@rocket.chat/ui-contexts": 9.0.0
-    "@rocket.chat/ui-kit": 0.36.0
-    "@rocket.chat/ui-video-conf": 9.0.0
+    "@rocket.chat/ui-avatar": 6.0.0-rc.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-kit": 0.36.1-rc.0
+    "@rocket.chat/ui-video-conf": 10.0.0-rc.0
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 9.0.0
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-client": 10.0.0-rc.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.0
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 5.0.0
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-avatar": 6.0.0-rc.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.0
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 9.0.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 4baf1e4960a88fda9e47fcfe171f253663060b91 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 19:29:13 +0000
Subject: [PATCH 014/170] regression: Handle live setting forget user session
 on window close update (#33165)

Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
---
 apps/meteor/client/startup/accounts.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/startup/accounts.ts
index 60f2de02bde0..88008a606656 100644
--- a/apps/meteor/client/startup/accounts.ts
+++ b/apps/meteor/client/startup/accounts.ts
@@ -27,13 +27,15 @@ Accounts.onEmailVerificationLink((token: string) => {
 });
 
 Meteor.startup(() => {
-	Tracker.autorun(() => {
+	Tracker.autorun((computation) => {
 		const forgetUserSessionOnWindowClose = settings.get('Accounts_ForgetUserSessionOnWindowClose');
 
 		if (forgetUserSessionOnWindowClose === undefined) {
 			return;
 		}
 
+		computation.stop();
+
 		Accounts.config({ clientStorage: forgetUserSessionOnWindowClose ? 'session' : 'local' });
 	});
 });

From 5cbbb4585146fe28474fe89789172218abd266f8 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Wed, 28 Aug 2024 11:01:41 -0300
Subject: [PATCH 015/170] fix: Multi-step modals closing unexpectedly (#33158)

---
 .changeset/wise-avocados-taste.md             |  5 +++++
 .../components/GenericModal/GenericModal.tsx  |  2 +-
 .../GenericModal/GenericModalSkeleton.tsx     | 22 +++++--------------
 .../ReadReceiptsModal/ReadReceiptsModal.tsx   |  8 ++-----
 .../ConvertToChannelModal.tsx                 |  2 +-
 .../DeleteTeam/DeleteTeamModalWithRooms.tsx   | 12 +++-------
 .../info/LeaveTeam/LeaveTeamWithData.tsx      | 12 +++-------
 .../RemoveUsersModal/RemoveUsersModal.js      | 11 ++--------
 apps/meteor/tests/e2e/team-management.spec.ts |  4 ----
 9 files changed, 22 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/wise-avocados-taste.md

diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
new file mode 100644
index 000000000000..c4c9bce010b8
--- /dev/null
+++ b/.changeset/wise-avocados-taste.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where multi-step modals were closing unexpectedly
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.tsx b/apps/meteor/client/components/GenericModal/GenericModal.tsx
index d371e1ff4ef2..5d025e05827d 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.tsx
@@ -111,7 +111,7 @@ const GenericModal = ({
 					{tagline && <Modal.Tagline>{tagline}</Modal.Tagline>}
 					<Modal.Title id={`${genericModalId}-title`}>{title ?? t('Are_you_sure')}</Modal.Title>
 				</Modal.HeaderText>
-				<Modal.Close aria-label={t('Close')} onClick={handleCloseButtonClick} />
+				{onClose && <Modal.Close aria-label={t('Close')} onClick={handleCloseButtonClick} />}
 			</Modal.Header>
 			<Modal.Content fontScale='p2'>{children}</Modal.Content>
 			<Modal.Footer justifyContent={dontAskAgain ? 'space-between' : 'end'}>
diff --git a/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx b/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx
index d56cbdd26a67..2dcdf3b3578c 100644
--- a/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx
@@ -1,25 +1,13 @@
 import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 
 import GenericModal from './GenericModal';
 
-const GenericModalSkeleton = ({ onClose, ...props }: ComponentProps<typeof GenericModal>) => {
-	const t = useTranslation();
-
-	return (
-		<GenericModal
-			{...props}
-			variant='warning'
-			onClose={onClose}
-			title={<Skeleton width='50%' />}
-			confirmText={t('Cancel')}
-			onConfirm={onClose}
-		>
-			<Skeleton width='full' />
-		</GenericModal>
-	);
-};
+const GenericModalSkeleton = (props: ComponentProps<typeof GenericModal>) => (
+	<GenericModal {...props} icon={null} title={<Skeleton width='50%' />}>
+		<Skeleton width='full' />
+	</GenericModal>
+);
 
 export default GenericModalSkeleton;
diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
index c4da16264646..ca033c2dcb0d 100644
--- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
@@ -1,11 +1,11 @@
 import type { IMessage, ReadReceipt } from '@rocket.chat/core-typings';
-import { Skeleton } from '@rocket.chat/fuselage';
 import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../components/GenericModal/GenericModalSkeleton';
 import ReadReceiptRow from './ReadReceiptRow';
 
 type ReadReceiptsModalProps = {
@@ -29,11 +29,7 @@ const ReadReceiptsModal = ({ messageId, onClose }: ReadReceiptsModalProps): Reac
 	}, [dispatchToastMessage, t, onClose, readReceiptsResult.isError, readReceiptsResult.error]);
 
 	if (readReceiptsResult.isLoading || readReceiptsResult.isError) {
-		return (
-			<GenericModal title={t('Read_by')} onConfirm={onClose} onClose={onClose}>
-				<Skeleton type='rect' w='full' h='x120' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 
 	const readReceipts = readReceiptsResult.data;
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
index c29f6c0ec586..3efcdb89690f 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
@@ -20,7 +20,7 @@ const ConvertToChannelModal = ({ onClose, onCancel, onConfirm, teamId, userId }:
 	});
 
 	if (phase === AsyncStatePhase.LOADING) {
-		return <GenericModalSkeleton onClose={onClose} />;
+		return <GenericModalSkeleton />;
 	}
 
 	return <BaseConvertToChannelModal onClose={onClose} onCancel={onCancel} onConfirm={onConfirm} rooms={value?.rooms} />;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
index 5226a3602c0f..1375ec532c91 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
@@ -1,11 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
-import GenericModal from '../../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import DeleteTeamModal from './DeleteTeamModal';
 
 type DeleteTeamModalWithRoomsProps = {
@@ -15,17 +14,12 @@ type DeleteTeamModalWithRoomsProps = {
 };
 
 const DeleteTeamModalWithRooms = ({ teamId, onConfirm, onCancel }: DeleteTeamModalWithRoomsProps): ReactElement => {
-	const t = useTranslation();
 	const query = useMemo(() => ({ teamId }), [teamId]);
 	const getTeamsListRooms = useEndpoint('GET', '/v1/teams.listRooms');
 	const { data, isLoading } = useQuery(['getTeamsListRooms', query], async () => getTeamsListRooms(query));
 
 	if (isLoading) {
-		return (
-			<GenericModal variant='warning' onClose={onCancel} onConfirm={onCancel} title={<Skeleton width='50%' />} confirmText={t('Cancel')}>
-				<Skeleton width='full' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 	return <DeleteTeamModal onCancel={onCancel} onConfirm={onConfirm} rooms={data?.rooms || []} />;
 };
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
index 9bab0acc3d86..58f98705d2bb 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
@@ -1,11 +1,10 @@
 import type { ITeam } from '@rocket.chat/core-typings';
-import { Skeleton } from '@rocket.chat/fuselage';
-import { useUserId, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserId, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import GenericModal from '../../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import LeaveTeamModal from './LeaveTeamModal/LeaveTeamModal';
 
 type LeaveTeamWithDataProps = {
@@ -15,7 +14,6 @@ type LeaveTeamWithDataProps = {
 };
 
 const LeaveTeamWithData = ({ teamId, onCancel, onConfirm }: LeaveTeamWithDataProps): ReactElement => {
-	const t = useTranslation();
 	const userId = useUserId();
 
 	if (!userId) {
@@ -26,11 +24,7 @@ const LeaveTeamWithData = ({ teamId, onCancel, onConfirm }: LeaveTeamWithDataPro
 	const { data, isLoading } = useQuery(['teams.listRoomsOfUser'], () => getRoomsOfUser({ teamId, userId }));
 
 	if (isLoading) {
-		return (
-			<GenericModal variant='warning' onClose={onCancel} onConfirm={onCancel} title={<Skeleton width='50%' />} confirmText={t('Cancel')}>
-				<Skeleton width='full' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 
 	return <LeaveTeamModal onCancel={onCancel} onConfirm={onConfirm} rooms={data?.rooms || []} />;
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js
index 76a38b680692..f85d5434c1d1 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js
@@ -1,8 +1,6 @@
-import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 
-import GenericModal from '../../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../../../lib/asyncState';
 import BaseRemoveUsersModal from './BaseRemoveUsersModal';
@@ -10,7 +8,6 @@ import BaseRemoveUsersModal from './BaseRemoveUsersModal';
 const initialData = { user: { username: '' } };
 
 const RemoveUsersModal = ({ teamId, userId, onClose, onCancel, onConfirm }) => {
-	const t = useTranslation();
 	const { value, phase } = useEndpointData('/v1/teams.listRoomsOfUser', { params: useMemo(() => ({ teamId, userId }), [teamId, userId]) });
 	const userDataFetch = useEndpointData('/v1/users.info', { params: useMemo(() => ({ userId }), [userId]), initialValue: initialData });
 	const {
@@ -18,11 +15,7 @@ const RemoveUsersModal = ({ teamId, userId, onClose, onCancel, onConfirm }) => {
 	} = userDataFetch?.value;
 
 	if (phase === AsyncStatePhase.LOADING) {
-		return (
-			<GenericModal variant='warning' onClose={onClose} title={<Skeleton width='50%' />} confirmText={t('Cancel')} onConfirm={onClose}>
-				<Skeleton width='full' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 
 	return <BaseRemoveUsersModal onClose={onClose} username={username} onCancel={onCancel} onConfirm={onConfirm} rooms={value?.rooms} />;
diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index 1d2ab3a82854..690fa2b5b5dd 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -116,7 +116,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should remove user1 from targetTeamNonPrivate', async () => {
-		test.fail();
 		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
 		await poHomeTeam.tabs.kebab.click({ force: true });
 		await poHomeTeam.tabs.btnTeamMembers.click();
@@ -130,7 +129,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should delete targetTeamNonPrivate', async () => {
-		test.fail();
 		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnDelete.click();
@@ -142,7 +140,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should user1 leave from targetTeam', async ({ browser }) => {
-		test.fail();
 		const user1Page = await browser.newPage({ storageState: Users.user1.state });
 		const user1Channel = new HomeTeam(user1Page);
 		await user1Page.goto(`/group/${targetTeam}`);
@@ -163,7 +160,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should convert team into a channel', async ({ page }) => {
-		test.fail();
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnMore.click();

From 87a59e0352c25f45c07b9b1d719d6ef7b9852763 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:41:20 +0000
Subject: [PATCH 016/170] fix: Multi-step modals closing unexpectedly (#33178)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 .changeset/wise-avocados-taste.md             |  5 +++++
 .../components/GenericModal/GenericModal.tsx  |  2 +-
 .../GenericModal/GenericModalSkeleton.tsx     | 22 +++++--------------
 .../ReadReceiptsModal/ReadReceiptsModal.tsx   |  8 ++-----
 .../ConvertToChannelModal.tsx                 |  2 +-
 .../DeleteTeam/DeleteTeamModalWithRooms.tsx   | 12 +++-------
 .../info/LeaveTeam/LeaveTeamWithData.tsx      | 12 +++-------
 .../RemoveUsersModal/RemoveUsersModal.js      | 11 ++--------
 8 files changed, 22 insertions(+), 52 deletions(-)
 create mode 100644 .changeset/wise-avocados-taste.md

diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
new file mode 100644
index 000000000000..c4c9bce010b8
--- /dev/null
+++ b/.changeset/wise-avocados-taste.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where multi-step modals were closing unexpectedly
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.tsx b/apps/meteor/client/components/GenericModal/GenericModal.tsx
index d371e1ff4ef2..5d025e05827d 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.tsx
@@ -111,7 +111,7 @@ const GenericModal = ({
 					{tagline && <Modal.Tagline>{tagline}</Modal.Tagline>}
 					<Modal.Title id={`${genericModalId}-title`}>{title ?? t('Are_you_sure')}</Modal.Title>
 				</Modal.HeaderText>
-				<Modal.Close aria-label={t('Close')} onClick={handleCloseButtonClick} />
+				{onClose && <Modal.Close aria-label={t('Close')} onClick={handleCloseButtonClick} />}
 			</Modal.Header>
 			<Modal.Content fontScale='p2'>{children}</Modal.Content>
 			<Modal.Footer justifyContent={dontAskAgain ? 'space-between' : 'end'}>
diff --git a/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx b/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx
index d56cbdd26a67..2dcdf3b3578c 100644
--- a/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModalSkeleton.tsx
@@ -1,25 +1,13 @@
 import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 
 import GenericModal from './GenericModal';
 
-const GenericModalSkeleton = ({ onClose, ...props }: ComponentProps<typeof GenericModal>) => {
-	const t = useTranslation();
-
-	return (
-		<GenericModal
-			{...props}
-			variant='warning'
-			onClose={onClose}
-			title={<Skeleton width='50%' />}
-			confirmText={t('Cancel')}
-			onConfirm={onClose}
-		>
-			<Skeleton width='full' />
-		</GenericModal>
-	);
-};
+const GenericModalSkeleton = (props: ComponentProps<typeof GenericModal>) => (
+	<GenericModal {...props} icon={null} title={<Skeleton width='50%' />}>
+		<Skeleton width='full' />
+	</GenericModal>
+);
 
 export default GenericModalSkeleton;
diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
index c4da16264646..ca033c2dcb0d 100644
--- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
@@ -1,11 +1,11 @@
 import type { IMessage, ReadReceipt } from '@rocket.chat/core-typings';
-import { Skeleton } from '@rocket.chat/fuselage';
 import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../components/GenericModal/GenericModalSkeleton';
 import ReadReceiptRow from './ReadReceiptRow';
 
 type ReadReceiptsModalProps = {
@@ -29,11 +29,7 @@ const ReadReceiptsModal = ({ messageId, onClose }: ReadReceiptsModalProps): Reac
 	}, [dispatchToastMessage, t, onClose, readReceiptsResult.isError, readReceiptsResult.error]);
 
 	if (readReceiptsResult.isLoading || readReceiptsResult.isError) {
-		return (
-			<GenericModal title={t('Read_by')} onConfirm={onClose} onClose={onClose}>
-				<Skeleton type='rect' w='full' h='x120' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 
 	const readReceipts = readReceiptsResult.data;
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
index c29f6c0ec586..3efcdb89690f 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
@@ -20,7 +20,7 @@ const ConvertToChannelModal = ({ onClose, onCancel, onConfirm, teamId, userId }:
 	});
 
 	if (phase === AsyncStatePhase.LOADING) {
-		return <GenericModalSkeleton onClose={onClose} />;
+		return <GenericModalSkeleton />;
 	}
 
 	return <BaseConvertToChannelModal onClose={onClose} onCancel={onCancel} onConfirm={onConfirm} rooms={value?.rooms} />;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
index 5226a3602c0f..1375ec532c91 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
@@ -1,11 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
-import GenericModal from '../../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import DeleteTeamModal from './DeleteTeamModal';
 
 type DeleteTeamModalWithRoomsProps = {
@@ -15,17 +14,12 @@ type DeleteTeamModalWithRoomsProps = {
 };
 
 const DeleteTeamModalWithRooms = ({ teamId, onConfirm, onCancel }: DeleteTeamModalWithRoomsProps): ReactElement => {
-	const t = useTranslation();
 	const query = useMemo(() => ({ teamId }), [teamId]);
 	const getTeamsListRooms = useEndpoint('GET', '/v1/teams.listRooms');
 	const { data, isLoading } = useQuery(['getTeamsListRooms', query], async () => getTeamsListRooms(query));
 
 	if (isLoading) {
-		return (
-			<GenericModal variant='warning' onClose={onCancel} onConfirm={onCancel} title={<Skeleton width='50%' />} confirmText={t('Cancel')}>
-				<Skeleton width='full' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 	return <DeleteTeamModal onCancel={onCancel} onConfirm={onConfirm} rooms={data?.rooms || []} />;
 };
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
index 9bab0acc3d86..58f98705d2bb 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
@@ -1,11 +1,10 @@
 import type { ITeam } from '@rocket.chat/core-typings';
-import { Skeleton } from '@rocket.chat/fuselage';
-import { useUserId, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserId, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import GenericModal from '../../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import LeaveTeamModal from './LeaveTeamModal/LeaveTeamModal';
 
 type LeaveTeamWithDataProps = {
@@ -15,7 +14,6 @@ type LeaveTeamWithDataProps = {
 };
 
 const LeaveTeamWithData = ({ teamId, onCancel, onConfirm }: LeaveTeamWithDataProps): ReactElement => {
-	const t = useTranslation();
 	const userId = useUserId();
 
 	if (!userId) {
@@ -26,11 +24,7 @@ const LeaveTeamWithData = ({ teamId, onCancel, onConfirm }: LeaveTeamWithDataPro
 	const { data, isLoading } = useQuery(['teams.listRoomsOfUser'], () => getRoomsOfUser({ teamId, userId }));
 
 	if (isLoading) {
-		return (
-			<GenericModal variant='warning' onClose={onCancel} onConfirm={onCancel} title={<Skeleton width='50%' />} confirmText={t('Cancel')}>
-				<Skeleton width='full' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 
 	return <LeaveTeamModal onCancel={onCancel} onConfirm={onConfirm} rooms={data?.rooms || []} />;
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js
index 76a38b680692..f85d5434c1d1 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.js
@@ -1,8 +1,6 @@
-import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 
-import GenericModal from '../../../../../components/GenericModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../../../lib/asyncState';
 import BaseRemoveUsersModal from './BaseRemoveUsersModal';
@@ -10,7 +8,6 @@ import BaseRemoveUsersModal from './BaseRemoveUsersModal';
 const initialData = { user: { username: '' } };
 
 const RemoveUsersModal = ({ teamId, userId, onClose, onCancel, onConfirm }) => {
-	const t = useTranslation();
 	const { value, phase } = useEndpointData('/v1/teams.listRoomsOfUser', { params: useMemo(() => ({ teamId, userId }), [teamId, userId]) });
 	const userDataFetch = useEndpointData('/v1/users.info', { params: useMemo(() => ({ userId }), [userId]), initialValue: initialData });
 	const {
@@ -18,11 +15,7 @@ const RemoveUsersModal = ({ teamId, userId, onClose, onCancel, onConfirm }) => {
 	} = userDataFetch?.value;
 
 	if (phase === AsyncStatePhase.LOADING) {
-		return (
-			<GenericModal variant='warning' onClose={onClose} title={<Skeleton width='50%' />} confirmText={t('Cancel')} onConfirm={onClose}>
-				<Skeleton width='full' />
-			</GenericModal>
-		);
+		return <GenericModalSkeleton />;
 	}
 
 	return <BaseRemoveUsersModal onClose={onClose} username={username} onCancel={onCancel} onConfirm={onConfirm} rooms={value?.rooms} />;

From 7180790e2836ea0126319cf632d1cfaea43afb16 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:29:22 -0300
Subject: [PATCH 017/170] regression: Encrypted file upload throws an error on
 mobile (#33169)

---
 .changeset/smart-baboons-allow.md             |  5 +++
 .../app/file-upload/server/lib/FileUpload.ts  |  7 +++-
 apps/meteor/tests/end-to-end/api/rooms.ts     | 36 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/smart-baboons-allow.md

diff --git a/.changeset/smart-baboons-allow.md b/.changeset/smart-baboons-allow.md
new file mode 100644
index 000000000000..0c593e4ed2c5
--- /dev/null
+++ b/.changeset/smart-baboons-allow.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue that prevented sending encrypted filed from the mobile app
diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
index 8714c71f20d6..ac97923be41e 100644
--- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts
+++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
@@ -175,7 +175,12 @@ export const FileUpload = {
 			throw new Meteor.Error('error-invalid-file-type', reason);
 		}
 
-		// E2EE files are of type - application/octet-stream, application/octet-stream is whitelisted for E2EE files.
+		// E2EE files should be of type application/octet-stream. no information about them should be disclosed on upload if they are encrypted
+		if (isE2EEUpload(file)) {
+			file.type = 'application/octet-stream';
+		}
+
+		// E2EE files are of type application/octet-stream, which is whitelisted for E2EE files
 		if (!fileUploadIsValidContentType(file?.type, isE2EEUpload(file) ? 'application/octet-stream' : undefined)) {
 			const reason = i18n.t('File_type_is_not_accepted', { lng: language });
 			throw new Meteor.Error('error-invalid-file-type', reason);
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index 5a2caedb075f..bb4cbb8fb196 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -747,6 +747,42 @@ describe('[Rooms]', () => {
 				});
 		});
 
+		it('should correctly save encrypted file with the default media type even if another type is provided', async () => {
+			let fileId;
+
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', fs.createReadStream(path.join(__dirname, '../../mocks/files/sample-jpeg.jpg')), {
+					contentType: 'image/jpeg',
+				})
+				.field({ content: JSON.stringify({ algorithm: 'rc.v1.aes-sha2', ciphertext: 'something' }) })
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('file');
+					expect(res.body.file).to.have.property('_id');
+					expect(res.body.file).to.have.property('url');
+
+					fileId = res.body.file._id;
+				});
+
+			await request
+				.post(api(`rooms.mediaConfirm/${testChannel._id}/${fileId}`))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('message');
+					expect(res.body.message).to.have.property('files');
+					expect(res.body.message.files).to.be.an('array').of.length(1);
+					expect(res.body.message.files[0]).to.have.property('type', 'application/octet-stream');
+					expect(res.body.message.files[0]).to.have.property('name', 'sample-jpeg.jpg');
+				});
+		});
+
 		it('should fail encrypted file upload when files encryption is disabled', async () => {
 			await updateSetting('E2E_Enable_Encrypt_Files', false);
 

From 347a37e868912b69790bde600e55466e13793d86 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Wed, 28 Aug 2024 16:44:50 -0300
Subject: [PATCH 018/170] chore: remove notifyListener call that was causing
 startup issues (#33154)

---
 apps/meteor/server/startup/cloudRegistration.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/meteor/server/startup/cloudRegistration.ts b/apps/meteor/server/startup/cloudRegistration.ts
index 65d870de4d89..e69d4446d6ec 100644
--- a/apps/meteor/server/startup/cloudRegistration.ts
+++ b/apps/meteor/server/startup/cloudRegistration.ts
@@ -1,7 +1,5 @@
 import { Settings } from '@rocket.chat/models';
 
-import { notifyOnSettingChangedById } from '../../app/lib/server/lib/notifyListener';
-
 export async function ensureCloudWorkspaceRegistered(): Promise<void> {
 	const cloudWorkspaceClientId = await Settings.getValueById('Cloud_Workspace_Client_Id');
 	const cloudWorkspaceClientSecret = await Settings.getValueById('Cloud_Workspace_Client_Secret');
@@ -18,6 +16,5 @@ export async function ensureCloudWorkspaceRegistered(): Promise<void> {
 	}
 
 	// otherwise, set the setup wizard to in_progress forcing admins to complete the registration
-	(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
-		void notifyOnSettingChangedById('Show_Setup_Wizard');
+	await Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
 }

From 6a27d7b28723334170946ef282a291a4626a1424 Mon Sep 17 00:00:00 2001
From: csuadev <72958726+csuadev@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:21:38 +0200
Subject: [PATCH 019/170] test: Add unit test for RoomMenu options (#32891)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 apps/meteor/client/sidebar/RoomMenu.spec.tsx | 67 ++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 apps/meteor/client/sidebar/RoomMenu.spec.tsx

diff --git a/apps/meteor/client/sidebar/RoomMenu.spec.tsx b/apps/meteor/client/sidebar/RoomMenu.spec.tsx
new file mode 100644
index 000000000000..e12063c9cdb0
--- /dev/null
+++ b/apps/meteor/client/sidebar/RoomMenu.spec.tsx
@@ -0,0 +1,67 @@
+import type { RoomType } from '@rocket.chat/core-typings';
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import RoomMenu from './RoomMenu';
+
+jest.mock('../../client/lib/rooms/roomCoordinator', () => ({
+	roomCoordinator: {
+		getRoomDirectives: () => ({
+			getUiText: () => 'leaveWarning',
+		}),
+	},
+}));
+
+jest.mock('../../app/ui-utils/client', () => ({
+	LegacyRoomManager: {
+		close: jest.fn(),
+	},
+}));
+
+const defaultProps = {
+	rid: 'roomId',
+	type: 'c' as RoomType,
+	hideDefaultOptions: false,
+	placement: 'right-start',
+};
+
+const renderOptions = {
+	wrapper: mockAppRoot()
+		.withTranslations('en', 'core', {
+			Hide: 'Hide',
+			Mark_unread: 'Mark Unread',
+			Favorite: 'Favorite',
+			Leave_room: 'Leave',
+		})
+		.withSetting('Favorite_Rooms', true)
+		.withPermission('leave-c')
+		.withPermission('leave-p')
+		.build(),
+	legacyRoot: true,
+};
+
+it('should display all the menu options for regular rooms', async () => {
+	render(<RoomMenu {...defaultProps} />, renderOptions);
+
+	const menu = screen.queryByRole('button');
+	await userEvent.click(menu as HTMLElement);
+
+	expect(await screen.findByRole('option', { name: 'Hide' })).toBeInTheDocument();
+	expect(await screen.findByRole('option', { name: 'Favorite' })).toBeInTheDocument();
+	expect(await screen.findByRole('option', { name: 'Mark Unread' })).toBeInTheDocument();
+	expect(await screen.findByRole('option', { name: 'Leave' })).toBeInTheDocument();
+});
+
+it('should display only mark unread and favorite for omnichannel rooms', async () => {
+	render(<RoomMenu {...defaultProps} type='l' />, renderOptions);
+
+	const menu = screen.queryByRole('button');
+	await userEvent.click(menu as HTMLElement);
+
+	expect(await screen.findAllByRole('option')).toHaveLength(2);
+	expect(screen.queryByRole('option', { name: 'Hide' })).not.toBeInTheDocument();
+	expect(screen.queryByRole('option', { name: 'Leave' })).not.toBeInTheDocument();
+});

From bb7d7212558e4ac8aec3be9181c7e57613338a3e Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 29 Aug 2024 14:49:17 -0300
Subject: [PATCH 020/170] fix: restore tooltips to units Multiselect (#33174)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 .changeset/strong-rings-rush.md                            | 5 +++++
 apps/meteor/client/omnichannel/units/UnitEdit.tsx          | 2 +-
 .../meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts | 7 +++++--
 apps/meteor/tests/e2e/page-objects/omnichannel-units.ts    | 4 ++++
 packages/ui-client/src/components/TooltipComponent.tsx     | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/strong-rings-rush.md

diff --git a/.changeset/strong-rings-rush.md b/.changeset/strong-rings-rush.md
new file mode 100644
index 000000000000..5125f47dcb3b
--- /dev/null
+++ b/.changeset/strong-rings-rush.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Restored tooltips to the unit edit department field selected options
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index e4bc1c0efb50..e71e8e2a94d0 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -228,7 +228,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 											value={value}
 											onChange={onChange}
 											onBlur={onBlur}
-											withTitle={false}
+											withTitle
 											filter={departmentsFilter}
 											setFilter={setDepartmentsFilter}
 											options={departmentsOptions}
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
index 9c1b5fdd5948..cd33a56caa04 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
@@ -185,11 +185,14 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.btnSave.click();
 		});
 
-		await test.step('expect department to be in the chosen departments list', async () => {
+		await test.step('expect department to be in the chosen departments list and have title', async () => {
 			await poOmnichannelUnits.search(unit.name);
 			await poOmnichannelUnits.findRowByName(unit.name).click();
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
-			await expect(page.getByRole('option', { name: department2.data.name })).toBeVisible();
+			await expect(poOmnichannelUnits.selectOptionChip(department2.data.name)).toBeVisible();
+			await poOmnichannelUnits.selectOptionChip(department2.data.name).hover();
+
+			await expect(page.getByRole('tooltip', { name: department2.data.name })).toBeVisible();
 			await poOmnichannelUnits.btnContextualbarClose.click();
 		});
 
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
index abcd794f8efa..2d0e24073a45 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
@@ -43,6 +43,10 @@ export class OmnichannelUnits extends OmnichannelAdministration {
 		return this.page.locator(`[role=option][value="${name}"]`);
 	}
 
+	public selectOptionChip(name: string) {
+		return this.page.getByRole('option', { name });
+	}
+
 	async selectDepartment({ name, _id }: { name: string; _id: string }) {
 		await this.inputDepartments.click();
 		await this.inputDepartments.fill(name);
diff --git a/packages/ui-client/src/components/TooltipComponent.tsx b/packages/ui-client/src/components/TooltipComponent.tsx
index 137ec913ec78..4a46e5536a53 100644
--- a/packages/ui-client/src/components/TooltipComponent.tsx
+++ b/packages/ui-client/src/components/TooltipComponent.tsx
@@ -12,7 +12,7 @@ export const TooltipComponent = ({ title, anchor }: TooltipComponentProps): Reac
 
 	return (
 		<PositionAnimated anchor={ref} placement='top-middle' margin={8} visible={AnimatedVisibility.UNHIDING}>
-			<Tooltip>{title}</Tooltip>
+			<Tooltip role='tooltip'>{title}</Tooltip>
 		</PositionAnimated>
 	);
 };

From 0bfba5bf7fa81c9aa3add080aed590b9ef5721ff Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 29 Aug 2024 14:49:17 -0300
Subject: [PATCH 021/170] fix: restore tooltips to units Multiselect (#33174)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 .changeset/strong-rings-rush.md                            | 5 +++++
 apps/meteor/client/omnichannel/units/UnitEdit.tsx          | 2 +-
 .../meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts | 7 +++++--
 apps/meteor/tests/e2e/page-objects/omnichannel-units.ts    | 4 ++++
 packages/ui-client/src/components/TooltipComponent.tsx     | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/strong-rings-rush.md

diff --git a/.changeset/strong-rings-rush.md b/.changeset/strong-rings-rush.md
new file mode 100644
index 000000000000..5125f47dcb3b
--- /dev/null
+++ b/.changeset/strong-rings-rush.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Restored tooltips to the unit edit department field selected options
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index e4bc1c0efb50..e71e8e2a94d0 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -228,7 +228,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 											value={value}
 											onChange={onChange}
 											onBlur={onBlur}
-											withTitle={false}
+											withTitle
 											filter={departmentsFilter}
 											setFilter={setDepartmentsFilter}
 											options={departmentsOptions}
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
index 9c1b5fdd5948..cd33a56caa04 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
@@ -185,11 +185,14 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.btnSave.click();
 		});
 
-		await test.step('expect department to be in the chosen departments list', async () => {
+		await test.step('expect department to be in the chosen departments list and have title', async () => {
 			await poOmnichannelUnits.search(unit.name);
 			await poOmnichannelUnits.findRowByName(unit.name).click();
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
-			await expect(page.getByRole('option', { name: department2.data.name })).toBeVisible();
+			await expect(poOmnichannelUnits.selectOptionChip(department2.data.name)).toBeVisible();
+			await poOmnichannelUnits.selectOptionChip(department2.data.name).hover();
+
+			await expect(page.getByRole('tooltip', { name: department2.data.name })).toBeVisible();
 			await poOmnichannelUnits.btnContextualbarClose.click();
 		});
 
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
index abcd794f8efa..2d0e24073a45 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
@@ -43,6 +43,10 @@ export class OmnichannelUnits extends OmnichannelAdministration {
 		return this.page.locator(`[role=option][value="${name}"]`);
 	}
 
+	public selectOptionChip(name: string) {
+		return this.page.getByRole('option', { name });
+	}
+
 	async selectDepartment({ name, _id }: { name: string; _id: string }) {
 		await this.inputDepartments.click();
 		await this.inputDepartments.fill(name);
diff --git a/packages/ui-client/src/components/TooltipComponent.tsx b/packages/ui-client/src/components/TooltipComponent.tsx
index 137ec913ec78..4a46e5536a53 100644
--- a/packages/ui-client/src/components/TooltipComponent.tsx
+++ b/packages/ui-client/src/components/TooltipComponent.tsx
@@ -12,7 +12,7 @@ export const TooltipComponent = ({ title, anchor }: TooltipComponentProps): Reac
 
 	return (
 		<PositionAnimated anchor={ref} placement='top-middle' margin={8} visible={AnimatedVisibility.UNHIDING}>
-			<Tooltip>{title}</Tooltip>
+			<Tooltip role='tooltip'>{title}</Tooltip>
 		</PositionAnimated>
 	);
 };

From a9b1ca88ed36c73e90cf2b79c869efae16612405 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:22:12 +0000
Subject: [PATCH 022/170] fix: restore tooltips to units Multiselect (#33185)

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>
---
 .changeset/strong-rings-rush.md                            | 5 +++++
 apps/meteor/client/omnichannel/units/UnitEdit.tsx          | 2 +-
 .../meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts | 7 +++++--
 apps/meteor/tests/e2e/page-objects/omnichannel-units.ts    | 4 ++++
 packages/ui-client/src/components/TooltipComponent.tsx     | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/strong-rings-rush.md

diff --git a/.changeset/strong-rings-rush.md b/.changeset/strong-rings-rush.md
new file mode 100644
index 000000000000..5125f47dcb3b
--- /dev/null
+++ b/.changeset/strong-rings-rush.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Restored tooltips to the unit edit department field selected options
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index e4bc1c0efb50..e71e8e2a94d0 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -228,7 +228,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 											value={value}
 											onChange={onChange}
 											onBlur={onBlur}
-											withTitle={false}
+											withTitle
 											filter={departmentsFilter}
 											setFilter={setDepartmentsFilter}
 											options={departmentsOptions}
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
index 9c1b5fdd5948..cd33a56caa04 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
@@ -185,11 +185,14 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.btnSave.click();
 		});
 
-		await test.step('expect department to be in the chosen departments list', async () => {
+		await test.step('expect department to be in the chosen departments list and have title', async () => {
 			await poOmnichannelUnits.search(unit.name);
 			await poOmnichannelUnits.findRowByName(unit.name).click();
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
-			await expect(page.getByRole('option', { name: department2.data.name })).toBeVisible();
+			await expect(poOmnichannelUnits.selectOptionChip(department2.data.name)).toBeVisible();
+			await poOmnichannelUnits.selectOptionChip(department2.data.name).hover();
+
+			await expect(page.getByRole('tooltip', { name: department2.data.name })).toBeVisible();
 			await poOmnichannelUnits.btnContextualbarClose.click();
 		});
 
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
index abcd794f8efa..2d0e24073a45 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
@@ -43,6 +43,10 @@ export class OmnichannelUnits extends OmnichannelAdministration {
 		return this.page.locator(`[role=option][value="${name}"]`);
 	}
 
+	public selectOptionChip(name: string) {
+		return this.page.getByRole('option', { name });
+	}
+
 	async selectDepartment({ name, _id }: { name: string; _id: string }) {
 		await this.inputDepartments.click();
 		await this.inputDepartments.fill(name);
diff --git a/packages/ui-client/src/components/TooltipComponent.tsx b/packages/ui-client/src/components/TooltipComponent.tsx
index 137ec913ec78..4a46e5536a53 100644
--- a/packages/ui-client/src/components/TooltipComponent.tsx
+++ b/packages/ui-client/src/components/TooltipComponent.tsx
@@ -12,7 +12,7 @@ export const TooltipComponent = ({ title, anchor }: TooltipComponentProps): Reac
 
 	return (
 		<PositionAnimated anchor={ref} placement='top-middle' margin={8} visible={AnimatedVisibility.UNHIDING}>
-			<Tooltip>{title}</Tooltip>
+			<Tooltip role='tooltip'>{title}</Tooltip>
 		</PositionAnimated>
 	);
 };

From 0f5a39e317d2f7cf4b7b82182d4d3f4b9179f91b Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 29 Aug 2024 18:08:48 -0300
Subject: [PATCH 023/170] refactor: Realtime Monitoring Counters to TS (#33182)

---
 .../counter/CounterContainer.stories.tsx      | 10 ++++-----
 ...unterContainer.js => CounterContainer.tsx} | 22 ++++++++++++++++---
 2 files changed, 24 insertions(+), 8 deletions(-)
 rename apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/{CounterContainer.js => CounterContainer.tsx} (59%)

diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
index d3a43adf701d..c3e4d0aeb535 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
@@ -12,10 +12,10 @@ export const Default: ComponentStory<typeof CounterContainer> = (args) => <Count
 Default.storyName = 'CounterContainer';
 Default.args = {
 	initialData: [
-		{ title: 'total conversations', value: 10 },
-		{ title: 'open conversations', value: 10 },
-		{ title: 'total messages', value: 10 },
-		{ title: 'total visitors' },
+		{ title: 'Total_conversations', value: 10 },
+		{ title: 'Open_conversations', value: 10 },
+		{ title: 'Total_messages', value: 10 },
+		{ title: 'Total_visitors', value: 0 },
 	],
-	data: [],
+	data: { totalizers: [] },
 };
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
similarity index 59%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
index 1340647a4616..f10909e19f01 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
@@ -1,4 +1,5 @@
 import { Skeleton } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
 
@@ -6,10 +7,25 @@ import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import CounterItem from './CounterItem';
 import CounterRow from './CounterRow';
 
-const CounterContainer = ({ data, state, initialData, ...props }) => {
+export type DataType = {
+	title: string;
+	value: number | string;
+}[];
+
+type Totalizers = {
+	totalizers: DataType;
+};
+
+type CounterContainerProps = {
+	data?: Totalizers;
+	state: AsyncStatePhase;
+	initialData: DataType;
+};
+
+const CounterContainer = ({ data, state, initialData, ...props }: CounterContainerProps) => {
 	const t = useTranslation();
 
-	const [displayData, setDisplayData] = useState(initialData);
+	const [displayData, setDisplayData] = useState<DataType>(initialData);
 
 	const { totalizers } = data || { totalizers: initialData };
 
@@ -22,7 +38,7 @@ const CounterContainer = ({ data, state, initialData, ...props }) => {
 	return (
 		<CounterRow {...props}>
 			{displayData.map(({ title, value }, i) => (
-				<CounterItem key={i} title={title ? t(title) : <Skeleton width='x60' />} count={value} />
+				<CounterItem key={i} title={title ? t(title as TranslationKey) : <Skeleton width='x60' />} count={value} />
 			))}
 		</CounterRow>
 	);

From 54eff23813a4d804f2503769b20ddffed2e9e181 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Thu, 29 Aug 2024 21:06:08 -0300
Subject: [PATCH 024/170] regression: Retention policy warning not truncating
 text (#33186)

---
 .../room/body/RetentionPolicyWarning.tsx      |  6 +--
 apps/meteor/package.json                      |  2 +-
 ee/packages/ui-theming/package.json           |  2 +-
 packages/fuselage-ui-kit/package.json         |  2 +-
 packages/gazzodown/package.json               |  2 +-
 packages/ui-avatar/package.json               |  2 +-
 packages/ui-client/package.json               |  2 +-
 packages/ui-composer/package.json             |  2 +-
 packages/ui-video-conf/package.json           |  2 +-
 packages/uikit-playground/package.json        |  2 +-
 yarn.lock                                     | 46 +++++++++----------
 11 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
index f4939a261145..4629b812bbff 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
@@ -1,5 +1,5 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Bubble, MessageDivider } from '@rocket.chat/fuselage';
+import { Box, Bubble } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
@@ -13,11 +13,11 @@ const RetentionPolicyWarning = ({ room }: { room: IRoom }): ReactElement => {
 	const message = usePruneWarningMessage(room);
 
 	return (
-		<MessageDivider>
+		<Box display='flex' justifyContent='center' pi={20} mb={8}>
 			<Bubble role='alert' aria-live='polite' aria-label={t('Retention_policy_warning_banner')} small secondary>
 				{message}
 			</Bubble>
-		</MessageDivider>
+		</Box>
 	);
 };
 
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e9ac01e6b972..ec9c06d820b6 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -241,7 +241,7 @@
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
-		"@rocket.chat/fuselage": "^0.57.0",
+		"@rocket.chat/fuselage": "^0.57.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
 		"@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 519937865872..bce501e2dc6f 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.0",
+		"@rocket.chat/fuselage": "^0.57.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index d906859a5d5a..d35727e58af3 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -66,7 +66,7 @@
     "@rocket.chat/apps-engine": "1.45.0-alpha.866",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.57.0",
+    "@rocket.chat/fuselage": "^0.57.1",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/icons": "~0.38.0",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 7610f0db85cf..57ff4d4dd142 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.0",
+		"@rocket.chat/fuselage": "^0.57.1",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 32054f4b4984..e673d1a5db06 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
-		"@rocket.chat/fuselage": "^0.57.0",
+		"@rocket.chat/fuselage": "^0.57.1",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@types/babel__core": "~7.20.3",
 		"@types/react": "~17.0.69",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index ed67fb084a91..cc3b4df35bf4 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.0",
+		"@rocket.chat/fuselage": "^0.57.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 0f4534a421a9..0f69b1df3868 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -19,7 +19,7 @@
     "@babel/core": "~7.22.20",
     "@react-aria/toolbar": "^3.0.0-beta.1",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.57.0",
+    "@rocket.chat/fuselage": "^0.57.1",
     "@rocket.chat/icons": "~0.38.0",
     "@storybook/addon-actions": "~6.5.16",
     "@storybook/addon-docs": "~6.5.16",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 8c899c42f03e..03db3dbecef4 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.57.0",
+		"@rocket.chat/fuselage": "^0.57.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index ec3937c2fedd..73cfd4369652 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -15,7 +15,7 @@
     "@codemirror/tooltip": "^0.19.16",
     "@lezer/highlight": "^1.1.6",
     "@rocket.chat/css-in-js": "~0.31.25",
-    "@rocket.chat/fuselage": "^0.57.0",
+    "@rocket.chat/fuselage": "^0.57.1",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/yarn.lock b/yarn.lock
index 4fbcd9d54089..2dadeaa4d3d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8883,7 +8883,7 @@ __metadata:
     "@rocket.chat/apps-engine": 1.45.0-alpha.866
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/gazzodown": "workspace:^"
@@ -8934,19 +8934,19 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.0
-    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-avatar": 6.0.0-rc.1
+    "@rocket.chat/ui-contexts": 10.0.0-rc.1
     "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.0
+    "@rocket.chat/ui-video-conf": 10.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.57.0":
-  version: 0.57.0
-  resolution: "@rocket.chat/fuselage@npm:0.57.0"
+"@rocket.chat/fuselage@npm:^0.57.1":
+  version: 0.57.1
+  resolution: "@rocket.chat/fuselage@npm:0.57.1"
   dependencies:
     "@rocket.chat/css-in-js": ^0.31.25
     "@rocket.chat/css-supports": ^0.31.25
@@ -8964,7 +8964,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: 80f49f79ca6655067f528a9b427a7bfabbcf1583d0c9f3ed40b79217c7a495e93e0335e15e29b23237bf2ccb5ee5fa063051b40bf4d539439f452ffd45fdb537
+  checksum: ed40c4e9ec6f6294e0e7c7a3912ae7c9eca026455506f3f1983483010d3d0c41169f9e38d173e5e63ed0e9824979edd607dda3c881202bf797a97b5b76e83a34
   languageName: node
   linkType: hard
 
@@ -8975,7 +8975,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.0
-    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-client": 10.0.0-rc.1
+    "@rocket.chat/ui-contexts": 10.0.0-rc.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9342,7 +9342,7 @@ __metadata:
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -10214,7 +10214,7 @@ __metadata:
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/ui-contexts": "workspace:^"
     "@types/babel__core": ~7.20.3
     "@types/react": ~17.0.69
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10240,7 +10240,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10290,7 +10290,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/icons": ~0.38.0
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10385,7 +10385,7 @@ __metadata:
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10415,7 +10415,7 @@ __metadata:
     "@rocket.chat/css-in-js": ~0.31.25
     "@rocket.chat/emitter": ~0.31.25
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.0
-    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-avatar": 6.0.0-rc.1
+    "@rocket.chat/ui-contexts": 10.0.0-rc.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10464,7 +10464,7 @@ __metadata:
     "@codemirror/tooltip": ^0.19.16
     "@lezer/highlight": ^1.1.6
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.0
+    "@rocket.chat/fuselage": ^0.57.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.0
+    "@rocket.chat/ui-contexts": 10.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 44f905e40f13fe7ee4cdf166bf5c8550d69fb698 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 30 Aug 2024 00:33:01 +0000
Subject: [PATCH 025/170] Release 6.12.0-rc.2

[no ci]
---
 .changeset/bump-patch-1724977971712.md        |  5 +++
 .changeset/pre.json                           |  3 ++
 apps/meteor/CHANGELOG.md                      | 36 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 +++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 13 +++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 +++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 +++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 +++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/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/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               |  9 +++++
 packages/ui-client/package.json               |  4 +--
 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/uikit-playground/CHANGELOG.md        | 11 ++++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +--
 68 files changed, 418 insertions(+), 44 deletions(-)
 create mode 100644 .changeset/bump-patch-1724977971712.md

diff --git a/.changeset/bump-patch-1724977971712.md b/.changeset/bump-patch-1724977971712.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1724977971712.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 f23c7ae178fa..b16c34f330cd 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -66,6 +66,7 @@
     "bright-humans-cross",
     "brown-crabs-chew",
     "bump-patch-1724712948901",
+    "bump-patch-1724977971712",
     "calm-tigers-peel",
     "cool-rocks-remember",
     "empty-toys-smell",
@@ -89,8 +90,10 @@
     "rotten-camels-pretend",
     "rude-dogs-burn",
     "six-beers-fry",
+    "smart-baboons-allow",
     "smart-mice-attack",
     "spicy-kings-think",
+    "strong-rings-rush",
     "strong-swans-double",
     "strong-terms-love",
     "stupid-fishes-relate",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 75b8e3e71df6..862232d77787 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.2
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33169](https://github.com/RocketChat/Rocket.Chat/pull/33169)) Fixed issue that prevented sending encrypted filed from the mobile app
+
+- ([#33174](https://github.com/RocketChat/Rocket.Chat/pull/33174)) Restored tooltips to the unit edit department field selected options
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/license@0.2.5-rc.2
+  - @rocket.chat/omnichannel-services@0.3.2-rc.2
+  - @rocket.chat/pdf-worker@0.2.2-rc.2
+  - @rocket.chat/presence@0.2.5-rc.2
+  - @rocket.chat/api-client@0.2.5-rc.2
+  - @rocket.chat/apps@0.1.5-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/cron@0.1.5-rc.2
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.2
+  - @rocket.chat/gazzodown@10.0.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.2-rc.2
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.2
+  - @rocket.chat/ui-client@10.0.0-rc.2
+  - @rocket.chat/ui-video-conf@10.0.0-rc.2
+  - @rocket.chat/web-ui-registration@10.0.0-rc.2
+  - @rocket.chat/instance-status@0.1.5-rc.2
+  </details>
+
 ## 6.12.0-rc.1
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 184b030fe19d..b88a04d76851 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.1"
+	"version": "6.12.0-rc.2"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 5b8af0e9703c..1d6a25b73776 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 1.3.2-rc.1
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 6baf89d95ebf..8d9679014361 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": "1.3.2-rc.1",
+	"version": "1.3.2-rc.2",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index ec9c06d820b6..ab76940fee8a 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": "6.12.0-rc.1",
+	"version": "6.12.0-rc.2",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 9aec6081bf30..630cb593da8a 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.4.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 6b4e12e0ae52..5a4b896658f0 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.5-rc.1",
+	"version": "0.4.5-rc.2",
 	"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 ee81e466ed3c..1c86327bd7c0 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.4.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 723f97b071bf..f814e9e423ab 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.5-rc.1",
+	"version": "0.4.5-rc.2",
 	"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 80733d804be1..a8f4bf3e076b 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  - @rocket.chat/instance-status@0.1.5-rc.2
+  </details>
+
 ## 0.3.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 60198b5a42e6..25203f96d8c3 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.5-rc.1",
+	"version": "0.3.5-rc.2",
 	"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 7f7f7945dd56..fa7eb91835b5 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.2-rc.2
+  - @rocket.chat/pdf-worker@0.2.2-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.4.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 2639125f3dc3..80e7c5456bd6 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.5-rc.1",
+	"version": "0.4.5-rc.2",
 	"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 853a25180cd4..80a6bc702eff 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/presence@0.2.5-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.4.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 35f639b59890..83e816c9f0b4 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.5-rc.1",
+	"version": "0.4.5-rc.2",
 	"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 b39ed0a8815a..6e075a3b50f4 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.2-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.4.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 1ed210871152..0c8281eaec2b 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.5-rc.1",
+	"version": "0.4.5-rc.2",
 	"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 9b5ce23e3638..7a6d5fa93c67 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.4.5-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index d06a102d4de9..125ba400991c 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.5-rc.1",
+	"version": "0.4.5-rc.2",
 	"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 d851f26399a6..a3fb453b888f 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  </details>
+
 ## 0.2.5-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 2cbfc160c8cc..d357d2e85243 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.5-rc.1",
+	"version": "0.2.5-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index ba0a528d36eb..51dd515e5a3a 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.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/pdf-worker@0.2.2-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.3.2-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index f818090964b7..676576e42b3c 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.2-rc.1",
+	"version": "0.3.2-rc.2",
 	"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 0a776c02449a..f9881b0273ff 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.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  </details>
+
 ## 0.2.2-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index af8f5977011e..8724b3d4d6e1 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.2-rc.1",
+	"version": "0.2.2-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 7beefdd32fe3..f211e5812b68 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/core-services@0.6.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.2.5-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 4f9afd8c042f..530d53767c7a 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.5-rc.1",
+	"version": "0.2.5-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 9268f2ba988a..fd4f9abcfc2f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.1",
+	"version": "6.12.0-rc.2",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 838a08685baa..3694ba19c009 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  </details>
+
 ## 0.2.5-rc.1
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 7e289eef6146..d2f203161cb7 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.5-rc.1",
+	"version": "0.2.5-rc.2",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 413ec5b3af90..bc6dd6e55408 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  </details>
+
 ## 0.1.5-rc.1
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index fec607e1f8ab..7b23ba55bcf9 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.5-rc.1",
+	"version": "0.1.5-rc.2",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index ae5e4b1aceb1..8f62112c8922 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.6.0-rc.1
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index b8a27cc8d0ab..a4e8ada23f19 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.1",
+	"version": "0.6.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 58236a95d7da..f9bb8458f37a 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.2
+
 ## 6.12.0-rc.1
 
 ## 6.12.0-rc.0
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 737fb013a0ff..eb9c2a47866a 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.1",
+	"version": "6.12.0-rc.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 6e42bb323a59..6f684940f3c1 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.1.5-rc.1
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index c0908cb3e88e..78e1579405ec 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.5-rc.1",
+	"version": "0.1.5-rc.2",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 2fb7c90d2327..9dcb8a73d04c 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/api-client@0.2.5-rc.2
+  </details>
+
 ## 0.3.5-rc.1
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 51a14bed4cba..89db267343fe 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.5-rc.1",
+	"version": "0.3.5-rc.2",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 12f56f72659c..30c34bf191b7 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 10.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/gazzodown@10.0.0-rc.2
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  - @rocket.chat/ui-avatar@6.0.0-rc.2
+  - @rocket.chat/ui-video-conf@10.0.0-rc.2
+  </details>
+
 ## 10.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index d35727e58af3..2dcfab40ce11 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.1",
+  "version": "10.0.0-rc.2",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.1",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.1",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.2",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.2",
     "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.1",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.2",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 2137661bff33..bfdcc3cf881f 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  - @rocket.chat/ui-client@10.0.0-rc.2
+  </details>
+
 ## 10.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 57ff4d4dd142..64f33c6bbfd1 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.1",
+	"version": "10.0.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.1",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
+		"@rocket.chat/ui-client": "10.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 2965cdf9e189..a654321650cf 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.2-rc.2
+  </details>
+
 ## 0.1.5-rc.1
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index f957756ad7cd..0e385002d153 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.5-rc.1",
+	"version": "0.1.5-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 9432f8055254..c4b6702ce273 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.2
+  </details>
+
 ## 1.19.2-rc.1
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 419b34b67604..8204d6478f4b 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.2-rc.1",
+	"version": "1.19.2-rc.2",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 6c090c3ff504..1e52e3e6f005 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  </details>
+
 ## 0.7.0-rc.1
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 2532ee5edf80..524d012e41a5 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.1",
+	"version": "0.7.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 03bf4ac0a3fd..f7995184602a 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.2
+  </details>
+
 ## 0.2.2-rc.1
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index b4a07acb8cfd..4f32e1edbffa 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.2-rc.1",
+	"version": "0.2.2-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 003368df6617..fab8b499954d 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  </details>
+
 ## 6.12.0-rc.1
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index d037e77e7546..c11dc05cd6c2 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.1",
+	"version": "6.12.0-rc.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 1c917fd00821..52845ddff3be 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  </details>
+
 ## 6.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index e673d1a5db06..b34b9e4891f4 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.1",
+	"version": "6.0.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index a4b1f55300ee..a3d0b59dc6d9 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  </details>
+
 ## 10.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index cc3b4df35bf4..13119376a79b 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.1",
+	"version": "10.0.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index e98fa6e55d91..37c1e0a5431c 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.2
+  - @rocket.chat/rest-typings@6.12.0-rc.2
+  - @rocket.chat/ddp-client@0.3.5-rc.2
+  </details>
+
 ## 10.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index a5750b7d5065..0a5fbf4a83f2 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.1",
+	"version": "10.0.0-rc.2",
 	"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 39e0237d1e49..e7f617bb3c07 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  - @rocket.chat/ui-avatar@6.0.0-rc.2
+  </details>
+
 ## 10.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 03db3dbecef4..f89db00eae82 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": "10.0.0-rc.1",
+	"version": "10.0.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.1",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 853ce4759b4d..0154c2a5d005 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.2
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  - @rocket.chat/ui-avatar@6.0.0-rc.2
+  </details>
+
 ## 0.4.0-rc.1
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 73cfd4369652..6a91a7681572 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.1",
+  "version": "0.4.0-rc.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index e653ae6501ae..56bf9390b687 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.2
+  </details>
+
 ## 10.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ce73a83e6802..cb9c41903091 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": "10.0.0-rc.1",
+	"version": "10.0.0-rc.2",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From bb94c9c67a06a13461374cce1f27e1f7a28e64f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Fri, 30 Aug 2024 00:55:30 -0300
Subject: [PATCH 026/170] feat: add `sidepanelNavigation` to Feature preview
 list (#33156)

---
 .changeset/brown-singers-appear.md            |  7 ++++++
 .../AccountFeaturePreviewPage.tsx             | 25 +++++++++++++++++--
 packages/i18n/src/locales/en.i18n.json        |  6 ++++-
 .../src/hooks/useFeaturePreviewList.ts        | 20 ++++++++++++++-
 4 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/brown-singers-appear.md

diff --git a/.changeset/brown-singers-appear.md b/.changeset/brown-singers-appear.md
new file mode 100644
index 000000000000..8a9a69f225ac
--- /dev/null
+++ b/.changeset/brown-singers-appear.md
@@ -0,0 +1,7 @@
+---
+'@rocket.chat/ui-client': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+added `sidepanelNavigation` to feature preview list
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
index c8cd7138e5a6..dd9ab6a90959 100644
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
+++ b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
@@ -24,6 +24,21 @@ import { useForm } from 'react-hook-form';
 
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 
+const handleEnableQuery = (features: FeaturePreviewProps[]) => {
+	return features.map((item) => {
+		if (item.enableQuery) {
+			const expected = item.enableQuery.value;
+			const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
+			if (expected !== received) {
+				item.disabled = true;
+				item.value = false;
+			} else {
+				item.disabled = false;
+			}
+		}
+		return item;
+	});
+};
 const AccountFeaturePreviewPage = () => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -71,7 +86,7 @@ const AccountFeaturePreviewPage = () => {
 	};
 
 	const grouppedFeaturesPreview = Object.entries(
-		featuresPreview.reduce((result, currentValue) => {
+		handleEnableQuery(featuresPreview).reduce((result, currentValue) => {
 			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
 			return result;
 		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
@@ -108,7 +123,13 @@ const AccountFeaturePreviewPage = () => {
 													<Field>
 														<FieldRow>
 															<FieldLabel htmlFor={feature.name}>{t(feature.i18n)}</FieldLabel>
-															<ToggleSwitch id={feature.name} checked={feature.value} name={feature.name} onChange={handleFeatures} />
+															<ToggleSwitch
+																id={feature.name}
+																checked={feature.value}
+																name={feature.name}
+																onChange={handleFeatures}
+																disabled={feature.disabled}
+															/>
 														</FieldRow>
 														{feature.description && <FieldHint mbs={12}>{t(feature.description)}</FieldHint>}
 													</Field>
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 159c1641e05e..b28b1fc2bfde 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -6533,5 +6533,9 @@
   "Sidebar_Sections_Order_Description": "Select the categories in your preferred order",
   "Incoming_Calls": "Incoming calls",
   "Advanced_settings": "Advanced settings",
-  "Security_and_permissions": "Security and permissions"
+  "Security_and_permissions": "Security and permissions",
+  "Sidepanel_navigation": "Sidepanel navigation for teams",
+  "Sidepanel_navigation_description": "Option to open a sidepanel with channels and/or discussions associated with the team. This allows team owners to customize communication methods to best meet their team’s needs. This feature is only available when Enhanced navigation experience is enabled.",
+  "Show_channels_description": "Show team channels in second sidebar",
+  "Show_discussions_description": "Show team discussions in second sidebar"
 }
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index 4e79eebbd13a..172045197f8c 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -6,7 +6,8 @@ export type FeaturesAvailable =
 	| 'navigationBar'
 	| 'enable-timestamp-message-parser'
 	| 'contextualbarResizable'
-	| 'newNavigation';
+	| 'newNavigation'
+	| 'sidepanelNavigation';
 
 export type FeaturePreviewProps = {
 	name: FeaturesAvailable;
@@ -16,6 +17,11 @@ export type FeaturePreviewProps = {
 	imageUrl?: string;
 	value: boolean;
 	enabled: boolean;
+	disabled?: boolean;
+	enableQuery?: {
+		name: FeaturesAvailable;
+		value: boolean;
+	};
 };
 
 export const defaultFeaturesPreview: FeaturePreviewProps[] = [
@@ -60,6 +66,18 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		value: false,
 		enabled: true,
 	},
+	{
+		name: 'sidepanelNavigation',
+		i18n: 'Sidepanel_navigation',
+		description: 'Sidepanel_navigation_description',
+		group: 'Navigation',
+		value: false,
+		enabled: false,
+		enableQuery: {
+			name: 'newNavigation',
+			value: true,
+		},
+	},
 ];
 
 export const enabledDefaultFeatures = defaultFeaturesPreview.filter((feature) => feature.enabled);

From 377b8bbd945c4d9e5e36952f9ee58eaa6515a3bc Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Mon, 2 Sep 2024 11:16:59 -0300
Subject: [PATCH 027/170] refactor: Upgrade to TypeScript 5.5 (#33187)

---
 ...patch => typia-npm-6.9.0-2fd4d85f25.patch} | 248 ++++++++++--------
 apps/meteor/client/hooks/useEndpointAction.ts |   2 +-
 apps/meteor/client/hooks/useEndpointData.ts   |   4 +-
 apps/meteor/client/lib/createRouteGroup.tsx   |  14 +-
 apps/meteor/client/lib/getLocalePercentage.ts |   9 +-
 .../providers/CallProvider/CallProvider.tsx   |   4 +-
 .../DeviceProvider/DeviceProvider.tsx         |   4 +-
 .../lib/isSetSinkIdAvailable.tsx              |   4 +-
 .../client/providers/TranslationProvider.tsx  |   2 +-
 .../client/views/admin/viewLogs/ansispan.ts   |  15 +-
 apps/meteor/ee/server/services/package.json   |   2 +-
 apps/meteor/package.json                      |   4 +-
 .../server/services/federation/Federation.ts  |   4 +-
 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/omnichannel-services/package.json |   2 +-
 ee/packages/pdf-worker/package.json           |   2 +-
 ee/packages/presence/package.json             |   2 +-
 ee/packages/ui-theming/package.json           |   2 +-
 package.json                                  |   3 +-
 packages/account-utils/package.json           |   2 +-
 packages/agenda/package.json                  |   2 +-
 packages/api-client/package.json              |   2 +-
 packages/apps/package.json                    |   2 +-
 packages/base64/package.json                  |   2 +-
 packages/cas-validate/package.json            |   2 +-
 packages/core-services/package.json           |   2 +-
 packages/core-typings/package.json            |   2 +-
 packages/cron/package.json                    |   2 +-
 packages/ddp-client/package.json              |   2 +-
 packages/favicon/package.json                 |   2 +-
 packages/fuselage-ui-kit/package.json         |   2 +-
 packages/gazzodown/package.json               |   2 +-
 packages/i18n/package.json                    |   2 +-
 packages/instance-status/package.json         |   2 +-
 packages/jest-presets/package.json            |   2 +-
 packages/jwt/package.json                     |   2 +-
 packages/livechat/package.json                |   2 +-
 packages/log-format/package.json              |   2 +-
 packages/logger/package.json                  |   2 +-
 packages/message-parser/package.json          |   2 +-
 packages/mock-providers/package.json          |   2 +-
 packages/model-typings/package.json           |   2 +-
 packages/models/package.json                  |   2 +-
 packages/node-poplib/package.json             |   2 +-
 packages/password-policies/package.json       |   2 +-
 packages/patch-injection/package.json         |   2 +-
 packages/peggy-loader/package.json            |   2 +-
 packages/random/package.json                  |   2 +-
 packages/release-action/package.json          |   2 +-
 packages/release-changelog/package.json       |   2 +-
 packages/rest-typings/package.json            |   2 +-
 .../server-cloud-communication/package.json   |   2 +-
 packages/server-fetch/package.json            |   2 +-
 packages/sha256/package.json                  |   2 +-
 packages/tools/package.json                   |   2 +-
 packages/ui-avatar/package.json               |   2 +-
 packages/ui-client/package.json               |   2 +-
 packages/ui-composer/package.json             |   2 +-
 packages/ui-contexts/package.json             |   2 +-
 packages/ui-contexts/src/DeviceContext.ts     |   6 +-
 packages/ui-contexts/src/hooks/useEndpoint.ts |   2 +-
 .../src/hooks/useSetOutputMediaDevice.ts      |  10 +-
 packages/ui-contexts/src/index.ts             |   2 +-
 packages/ui-kit/package.json                  |   6 +-
 packages/ui-video-conf/package.json           |   2 +-
 packages/uikit-playground/package.json        |   2 +-
 packages/web-ui-registration/package.json     |   2 +-
 yarn.lock                                     | 199 +++++++-------
 75 files changed, 334 insertions(+), 320 deletions(-)
 rename .yarn/patches/{typia-npm-5.3.3-21d3e18463.patch => typia-npm-6.9.0-2fd4d85f25.patch} (64%)

diff --git a/.yarn/patches/typia-npm-5.3.3-21d3e18463.patch b/.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch
similarity index 64%
rename from .yarn/patches/typia-npm-5.3.3-21d3e18463.patch
rename to .yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch
index 1487a9f4712d..22a02fa15957 100644
--- a/.yarn/patches/typia-npm-5.3.3-21d3e18463.patch
+++ b/.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch
@@ -1,22 +1,22 @@
 diff --git a/lib/factories/internal/metadata/iterate_metadata_intersection.js b/lib/factories/internal/metadata/iterate_metadata_intersection.js
-index 260670b8ea37b63dcacadeffa26450f81087c90e..f07b44b16099d896ab40c46f03df86ee2f2c1a90 100644
+index da05ef3ac6f397d68b8fa10285f62d1794c57579..0f2b9b26e01cebd0b9c04a2db8857f911cfbaf57 100644
 --- a/lib/factories/internal/metadata/iterate_metadata_intersection.js
 +++ b/lib/factories/internal/metadata/iterate_metadata_intersection.js
-@@ -247,7 +247,7 @@ var iterate_metadata_intersection = function (checker) {
+@@ -181,7 +181,7 @@ var iterate_metadata_intersection = function (checker) {
                          var tags = MetadataTypeTagFactory_1.MetadataTypeTagFactory.analyze(errors)(target)(objects.map(function (om) { return om.objects; }).flat(), explore);
                          if (tags.length)
                              if (target === "array")
 -                                meta.arrays.at(-1).tags.push(tags);
 +                                meta.arrays.slice(-1)[0].tags.push(tags);
-                             else if (booleanLiteral === null)
+                             else if (atomics.size)
                                  meta.atomics.find(function (a) { return a.type === target; }).tags.push(tags);
-                             else {
+                             else if (constants.length) {
 diff --git a/lib/programmers/CheckerProgrammer.js b/lib/programmers/CheckerProgrammer.js
-index bbec09f22798d144b96f59bb946e7e32e3438c05..dc13cb47b72358b8e6165b768cff2360db2bd617 100644
+index 662e6ff51c91598229c88f691b7ce07200957167..4028a50cc92ee293e98b13822293d0fb35c64c1f 100644
 --- a/lib/programmers/CheckerProgrammer.js
 +++ b/lib/programmers/CheckerProgrammer.js
-@@ -458,8 +458,8 @@ var CheckerProgrammer;
-                                 ? "".concat(explore.postfix.slice(0, -1), "[").concat(index, "]\"")
+@@ -529,8 +529,8 @@ var CheckerProgrammer;
+                                 ? "".concat((0, postfix_of_tuple_1.postfix_of_tuple)(explore.postfix), "[").concat(index, "]\"")
                                  : "\"[".concat(index, "]\"") }));
                      });
 -                    var rest = tuple.elements.length && tuple.elements.at(-1).rest !== null
@@ -27,7 +27,7 @@ index bbec09f22798d144b96f59bb946e7e32e3438c05..dc13cb47b72358b8e6165b768cff2360
                      var arrayLength = typescript_1.default.factory.createPropertyAccessExpression(input, "length");
                      return config.combiner(explore)("and")(input, __spreadArray(__spreadArray(__spreadArray([], __read((rest === null
 diff --git a/lib/programmers/TypiaProgrammer.js b/lib/programmers/TypiaProgrammer.js
-index c75ab1bc077b788e36c32834ea4916c22df34500..99452220e2dd090d4d562296e26fb266faa617f9 100644
+index db244cb5e40fd68e15b7a06936b0f92802e5e4c9..c2f64885f67cc543c62b0b09e141c88684f99253 100644
 --- a/lib/programmers/TypiaProgrammer.js
 +++ b/lib/programmers/TypiaProgrammer.js
 @@ -165,7 +165,7 @@ var TypiaProgrammer;
@@ -39,34 +39,53 @@ index c75ab1bc077b788e36c32834ea4916c22df34500..99452220e2dd090d4d562296e26fb266
                              })()
                              : [0, 0], 2), line = _k[0], pos = _k[1];
                          console.error("".concat(file, ":").concat(line, ":").concat(pos, " - ").concat(category, " TS").concat(diag.code, ": ").concat(diag.messageText));
-diff --git a/lib/programmers/internal/application_tuple.js b/lib/programmers/internal/application_tuple.js
-index 5c1853a3a1692f95fe702bdae9813e958f54ac4c..04ca996c2ffe72d1cd5969e45a38e91937b975b1 100644
---- a/lib/programmers/internal/application_tuple.js
-+++ b/lib/programmers/internal/application_tuple.js
-@@ -22,15 +22,15 @@ var application_tuple = function (options) {
-                 var schema = __assign(__assign({ type: "array", items: tuple.type.elements.map(function (meta, i) {
-                         var _a;
-                         return (0, application_schema_1.application_schema)(options)(false)(components)((_a = meta.rest) !== null && _a !== void 0 ? _a : meta)(__assign(__assign({}, attribute), { "x-typia-rest": i === tuple.type.elements.length - 1 && meta.rest !== null, "x-typia-required": meta.required, "x-typia-optional": meta.optional }));
--                    }) }, attribute), { minItems: !!((_a = tuple.type.elements.at(-1)) === null || _a === void 0 ? void 0 : _a.rest)
-+                    }) }, attribute), { minItems: !!((_a = tuple.type.elements.slice(-1)[0]) === null || _a === void 0 ? void 0 : _a.rest)
-                         ? tuple.type.elements.length - 1
--                        : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.at(-1)) === null || _b === void 0 ? void 0 : _b.rest)
-+                        : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.slice(-1)[0]) === null || _b === void 0 ? void 0 : _b.rest)
-                         ? undefined
-                         : tuple.type.elements.length });
-                 if (options.purpose === "ajv")
-                     if (tuple.type.elements.length === 0)
-                         return schema;
--                    else if (!((_c = tuple.type.elements.at(-1)) === null || _c === void 0 ? void 0 : _c.rest))
-+                    else if (!((_c = tuple.type.elements.slice(-1)[0]) === null || _c === void 0 ? void 0 : _c.rest))
-                         return schema;
-                 var wrapper = __assign(__assign({}, schema), { items: (0, application_schema_1.application_schema)(options)(false)(components)(tuple.type.elements.reduce(function (x, y) { var _a, _b; return Metadata_1.Metadata.merge((_a = x.rest) !== null && _a !== void 0 ? _a : x, (_b = y.rest) !== null && _b !== void 0 ? _b : y); }, Metadata_1.Metadata.initialize()))(tuple.type.recursive ? {} : attribute), "x-typia-tuple": schema, minItems: schema.minItems, maxItems: schema.maxItems });
-                 return wrapper;
+diff --git a/lib/programmers/internal/application_v30_tuple.js b/lib/programmers/internal/application_v30_tuple.js
+index 94e8827fd94df3792c1d7b2cdacac604175ba8ca..c9a3a1bcdd978b97a080ed2c467188d808d10c8f 100644
+--- a/lib/programmers/internal/application_v30_tuple.js
++++ b/lib/programmers/internal/application_v30_tuple.js
+@@ -21,9 +21,9 @@ var application_v30_tuple = function (components) {
+     return function (tuple) {
+         return function (attribute) {
+             var _a, _b;
+-            return (__assign(__assign({}, attribute), { type: "array", items: (0, application_v30_schema_1.application_v30_schema)(false)(components)(tuple.type.recursive ? {} : attribute)(tuple.type.elements.reduce(function (x, y) { var _a, _b; return Metadata_1.Metadata.merge((_a = x.rest) !== null && _a !== void 0 ? _a : x, (_b = y.rest) !== null && _b !== void 0 ? _b : y); }, Metadata_1.Metadata.initialize())), minItems: !!((_a = tuple.type.elements.at(-1)) === null || _a === void 0 ? void 0 : _a.rest)
++            return (__assign(__assign({}, attribute), { type: "array", items: (0, application_v30_schema_1.application_v30_schema)(false)(components)(tuple.type.recursive ? {} : attribute)(tuple.type.elements.reduce(function (x, y) { var _a, _b; return Metadata_1.Metadata.merge((_a = x.rest) !== null && _a !== void 0 ? _a : x, (_b = y.rest) !== null && _b !== void 0 ? _b : y); }, Metadata_1.Metadata.initialize())), minItems: !!((_a = tuple.type.elements.slice(-1)[0]) === null || _a === void 0 ? void 0 : _a.rest)
+                     ? tuple.type.elements.length - 1
+-                    : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.at(-1)) === null || _b === void 0 ? void 0 : _b.rest)
++                    : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.slice(-1)[0]) === null || _b === void 0 ? void 0 : _b.rest)
+                     ? undefined
+                     : tuple.type.elements.length }));
+         };
+diff --git a/lib/programmers/internal/application_v31_tuple.js b/lib/programmers/internal/application_v31_tuple.js
+index af7bbbe1536244eec93d7311e289fc8b34245c0f..e7f126b72a3480f761f57e4d43826a26b8b06e3f 100644
+--- a/lib/programmers/internal/application_v31_tuple.js
++++ b/lib/programmers/internal/application_v31_tuple.js
+@@ -7,7 +7,7 @@ exports.application_v31_tuple = void 0;
+ var application_v31_tuple = function (generator) {
+     return function (tuple) {
+         var _a, _b;
+-        var tail = (_b = (_a = tuple.type.elements.at(-1)) === null || _a === void 0 ? void 0 : _a.rest) !== null && _b !== void 0 ? _b : null;
++        var tail = (_b = (_a = tuple.type.elements.slice(-1)[0]) === null || _a === void 0 ? void 0 : _a.rest) !== null && _b !== void 0 ? _b : null;
+         var prefixItems = tuple.type.isRest()
+             ? tuple.type.elements.slice(0, -1)
+             : tuple.type.elements;
+diff --git a/lib/programmers/internal/decode_union_object.js b/lib/programmers/internal/decode_union_object.js
+index c283bdfdcfb99f26954e6d76d35ccef4f78ddcee..7cdef1aeec80238014cf9457ca4351f02e99b638 100644
+--- a/lib/programmers/internal/decode_union_object.js
++++ b/lib/programmers/internal/decode_union_object.js
+@@ -72,7 +72,7 @@ var iterate = function (escaper) {
+                 ? typescript_1.default.factory.createIfStatement(b.condition, typescript_1.default.factory.createReturnStatement(b.value), undefined)
+                 : typescript_1.default.factory.createReturnStatement(b.value);
+         });
+-        if (branches.at(-1).condition !== null)
++        if (branches.slice(-1)[0].condition !== null)
+             statements.push(escaper(input, expected));
+         return typescript_1.default.factory.createBlock(statements, true);
+     };
 diff --git a/lib/programmers/json/JsonStringifyProgrammer.js b/lib/programmers/json/JsonStringifyProgrammer.js
-index ce0ae787164f7eba68ef35b05232b4b94ad8e7d7..8f70cfc8c8e9d82cd1ec5004ca5637487f57b3bc 100644
+index 77f2812cb509f5b9093dc311f8ae8558e4469a74..54a6c4e22f9cfa87cd30f8ade50e6cb8ccda9957 100644
 --- a/lib/programmers/json/JsonStringifyProgrammer.js
 +++ b/lib/programmers/json/JsonStringifyProgrammer.js
-@@ -424,10 +424,10 @@ var JsonStringifyProgrammer;
+@@ -469,10 +469,10 @@ var JsonStringifyProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -80,10 +99,10 @@ index ce0ae787164f7eba68ef35b05232b4b94ad8e7d7..8f70cfc8c8e9d82cd1ec5004ca563748
                      })();
                      return StringifyJoinder_1.StringifyJoiner.tuple(children, rest);
 diff --git a/lib/programmers/misc/MiscCloneProgrammer.js b/lib/programmers/misc/MiscCloneProgrammer.js
-index 3db6bc92637284468c5fe47ef59f51a9b41d06eb..0b3fa9deaaadf28d4f348225c0d44f49700c1bca 100644
+index 38bec89fba26db7a9c3ee71abd49086692c7e78b..9b9d7a9b0606da78224ce083bcbd7e07cd6ce82e 100644
 --- a/lib/programmers/misc/MiscCloneProgrammer.js
 +++ b/lib/programmers/misc/MiscCloneProgrammer.js
-@@ -291,11 +291,11 @@ var MiscCloneProgrammer;
+@@ -318,11 +318,11 @@ var MiscCloneProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -98,10 +117,10 @@ index 3db6bc92637284468c5fe47ef59f51a9b41d06eb..0b3fa9deaaadf28d4f348225c0d44f49
                      return CloneJoiner_1.CloneJoiner.tuple(children, rest);
                  };
 diff --git a/lib/programmers/misc/MiscPruneProgrammer.js b/lib/programmers/misc/MiscPruneProgrammer.js
-index 8440aaba9e449dae2468e96dfd7035ac7e170cfc..e97ceec78427b7eed08db23cc4775fdb10c6b2ff 100644
+index d4a9c66c0b5508b4ffdc4b7684364a9d748f6508..33f9356bab69faffadb8c2b49997d2c3ca429810 100644
 --- a/lib/programmers/misc/MiscPruneProgrammer.js
 +++ b/lib/programmers/misc/MiscPruneProgrammer.js
-@@ -272,11 +272,11 @@ var MiscPruneProgrammer;
+@@ -305,11 +305,11 @@ var MiscPruneProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -116,10 +135,10 @@ index 8440aaba9e449dae2468e96dfd7035ac7e170cfc..e97ceec78427b7eed08db23cc4775fdb
                      return PruneJoiner_1.PruneJoiner.tuple(children, rest);
                  };
 diff --git a/lib/programmers/notations/NotationGeneralProgrammer.js b/lib/programmers/notations/NotationGeneralProgrammer.js
-index 6e0b582a802180d7671c00b999469e7e59193b30..f11cc1d523875a040d3e27ce9a850b083c5d0275 100644
+index dfe64a21a5a81a7e887ab5ae02d73e6d3bdddb03..aa4b6070ed6a83c49018384e3a0c1dbd4a7c540b 100644
 --- a/lib/programmers/notations/NotationGeneralProgrammer.js
 +++ b/lib/programmers/notations/NotationGeneralProgrammer.js
-@@ -301,11 +301,11 @@ var NotationGeneralProgrammer;
+@@ -328,11 +328,11 @@ var NotationGeneralProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -134,36 +153,36 @@ index 6e0b582a802180d7671c00b999469e7e59193b30..f11cc1d523875a040d3e27ce9a850b08
                      return NotationJoiner_1.NotationJoiner.tuple(children, rest);
                  };
 diff --git a/lib/transformers/CallExpressionTransformer.js b/lib/transformers/CallExpressionTransformer.js
-index 2c5a23879d171ee271ebf6857dc9c65ec29c0ea7..96a40845614f6c54fe8e4ebc48a7d8efeba52a41 100644
+index f7be23d98552526d8c2348ba0f3d32b8d31e522b..133af0caa37ffcf7330811ef7bda79e75b9ecd89 100644
 --- a/lib/transformers/CallExpressionTransformer.js
 +++ b/lib/transformers/CallExpressionTransformer.js
-@@ -101,7 +101,7 @@ var CallExpressionTransformer;
-             var location = path_1.default.resolve(declaration.getSourceFile().fileName);
-             if (isTarget(location) === false)
-                 return expression;
+@@ -129,7 +129,7 @@ var CallExpressionTransformer;
+             // TRANSFORMATION
+             //----
+             // FUNCTION NAME
 -            var module = location.split(path_1.default.sep).at(-1).split(".")[0];
 +            var module = location.split(path_1.default.sep).slice(-1)[0].split(".")[0];
              var name = project.checker.getTypeAtLocation(declaration).symbol.name;
+             // FIND TRANSFORMER
              var functor = (_b = FUNCTORS[module]) === null || _b === void 0 ? void 0 : _b[name];
-             if (functor === undefined)
 diff --git a/src/factories/internal/metadata/iterate_metadata_intersection.ts b/src/factories/internal/metadata/iterate_metadata_intersection.ts
-index f46caa25c987092597073e046ae3b9e8130bd994..1eedd727c74f173a5b98a9572b865e058885811d 100644
+index c4d93a961385c09abb6f448896ad4636b648703b..99b1547e6a501caf28a452390fe721cd47dc2ca1 100644
 --- a/src/factories/internal/metadata/iterate_metadata_intersection.ts
 +++ b/src/factories/internal/metadata/iterate_metadata_intersection.ts
-@@ -214,7 +214,7 @@ export const iterate_metadata_intersection =
+@@ -188,7 +188,7 @@ export const iterate_metadata_intersection =
          target,
        )(objects.map((om) => om.objects).flat(), explore);
        if (tags.length)
 -        if (target === "array") meta.arrays.at(-1)!.tags.push(tags);
 +        if (target === "array") meta.arrays.slice(-1)[0]!.tags.push(tags);
-         else if (booleanLiteral === null)
+         else if (atomics.size)
            meta.atomics.find((a) => a.type === target)!.tags.push(tags);
-         else {
+         else if (constants.length) {
 diff --git a/src/programmers/CheckerProgrammer.ts b/src/programmers/CheckerProgrammer.ts
-index 892748b80755b89d1449f4d515aa3166534c6b19..8cb5ce35fe6f918545c82066f0583dead2661c89 100644
+index 40f46e8212a5173e19e0214422086655de908933..18a1a2371cac697e1b621a8fbc6b090b691e3072 100644
 --- a/src/programmers/CheckerProgrammer.ts
 +++ b/src/programmers/CheckerProgrammer.ts
-@@ -702,14 +702,14 @@ export namespace CheckerProgrammer {
+@@ -785,14 +785,14 @@ export namespace CheckerProgrammer {
            ),
          );
        const rest: ts.Expression | null =
@@ -181,47 +200,66 @@ index 892748b80755b89d1449f4d515aa3166534c6b19..8cb5ce35fe6f918545c82066f0583dea
                  ...explore,
                  start: tuple.elements.length - 1,
 diff --git a/src/programmers/TypiaProgrammer.ts b/src/programmers/TypiaProgrammer.ts
-index e01eccf62eccd73e1f0720db897f539256a6bbc1..cae5eb6fc702d359d4886acefdb68d42691edf97 100644
+index 67d9fc138483832aae43574fd2753bbe40a27d14..4397517aa620a8733c51917eebfa467f2922bf6d 100644
 --- a/src/programmers/TypiaProgrammer.ts
 +++ b/src/programmers/TypiaProgrammer.ts
 @@ -101,7 +101,7 @@ export namespace TypiaProgrammer {
-               .file!.text.substring(0, diag.start)
-               .split("\n");
-             if (lines.length === 0) return [0, 0];
--            return [lines.length, lines.at(-1)!.length + 1];
-+            return [lines.length, lines.slice(-1)[0]!.length + 1];
-           })()
-         : [0, 0];
-       console.error(
-diff --git a/src/programmers/internal/application_tuple.ts b/src/programmers/internal/application_tuple.ts
-index 5e10b9051e4a846f298aa8f086109e8d6bb38bf9..a8e24d5c2a2a4a4d5d1dc49eb45b4784654a4b66 100644
---- a/src/programmers/internal/application_tuple.ts
-+++ b/src/programmers/internal/application_tuple.ts
-@@ -28,16 +28,16 @@ export const application_tuple =
-         }),
+               .file!.text.substring(0, diag.start)
+               .split("\n");
+             if (lines.length === 0) return [0, 0];
+-            return [lines.length, lines.at(-1)!.length + 1];
++            return [lines.length, lines.slice(-1)[0]!.length + 1];
+           })()
+         : [0, 0];
+       console.error(
+diff --git a/src/programmers/internal/application_v30_tuple.ts b/src/programmers/internal/application_v30_tuple.ts
+index 0431273d439c6069a1bb5fbfd7808c5e8d0ea255..4b27cfc3ebde7ce9dcdb5161d34e70004a327b1e 100644
+--- a/src/programmers/internal/application_v30_tuple.ts
++++ b/src/programmers/internal/application_v30_tuple.ts
+@@ -24,10 +24,10 @@ export const application_v30_tuple =
+         Metadata.initialize(),
        ),
-       ...attribute,
--      minItems: !!tuple.type.elements.at(-1)?.rest
-+      minItems: !!tuple.type.elements.slice(-1)[0]?.rest
-         ? tuple.type.elements.length - 1
-         : tuple.type.elements.filter((x) => !x.optional).length,
--      maxItems: !!tuple.type.elements.at(-1)?.rest
-+      maxItems: !!tuple.type.elements.slice(-1)[0]?.rest
-         ? undefined
-         : tuple.type.elements.length,
-     };
-     if (options.purpose === "ajv")
-       if (tuple.type.elements.length === 0) return schema;
--      else if (!tuple.type.elements.at(-1)?.rest) return schema;
-+      else if (!tuple.type.elements.slice(-1)[0]?.rest) return schema;
- 
-     const wrapper: IJsonSchema.IArray = {
-       ...schema,
+     ),
+-    minItems: !!tuple.type.elements.at(-1)?.rest
++    minItems: !!tuple.type.elements.slice(-1)[0]?.rest
+       ? tuple.type.elements.length - 1
+       : tuple.type.elements.filter((x) => !x.optional).length,
+-    maxItems: !!tuple.type.elements.at(-1)?.rest
++    maxItems: !!tuple.type.elements.slice(-1)[0]?.rest
+       ? undefined!
+       : tuple.type.elements.length,
+   });
+diff --git a/src/programmers/internal/application_v31_tuple.ts b/src/programmers/internal/application_v31_tuple.ts
+index 426abad3423de706c368b35b2cf6b4845f6f3d91..be15ec0fda1725bf1ea882c9901e0f837c052fde 100644
+--- a/src/programmers/internal/application_v31_tuple.ts
++++ b/src/programmers/internal/application_v31_tuple.ts
+@@ -9,7 +9,7 @@ import { MetadataTuple } from "../../schemas/metadata/MetadataTuple";
+ export const application_v31_tuple =
+   (generator: (meta: Metadata) => OpenApi.IJsonSchema) =>
+   (tuple: MetadataTuple): OpenApi.IJsonSchema.ITuple => {
+-    const tail: Metadata | null = tuple.type.elements.at(-1)?.rest ?? null;
++    const tail: Metadata | null = tuple.type.elements.slice(-1)[0]?.rest ?? null;
+     const prefixItems: Metadata[] = tuple.type.isRest()
+       ? tuple.type.elements.slice(0, -1)
+       : tuple.type.elements;
+diff --git a/src/programmers/internal/decode_union_object.ts b/src/programmers/internal/decode_union_object.ts
+index f60bf69f91f35dee2efc807475fd6eca71aab052..ef8d51160f7eb9853ec0c827827aaa6c65db1587 100644
+--- a/src/programmers/internal/decode_union_object.ts
++++ b/src/programmers/internal/decode_union_object.ts
+@@ -87,7 +87,7 @@ const iterate =
+           )
+         : ts.factory.createReturnStatement(b.value),
+     );
+-    if (branches.at(-1)!.condition !== null)
++    if (branches.slice(-1)[0]!.condition !== null)
+       statements.push(escaper(input, expected));
+     return ts.factory.createBlock(statements, true);
+   };
 diff --git a/src/programmers/json/JsonStringifyProgrammer.ts b/src/programmers/json/JsonStringifyProgrammer.ts
-index c317cec2c78e984a6e64c7bf287d0c67e530e309..5974830c62dbd2b865aa2e64e2e757283258d872 100644
+index 558e5bf4b79f5cc28791ba0f5e40ebe6599361ce..c43d77b5d15343af90f7362d1757fc758659d5c9 100644
 --- a/src/programmers/json/JsonStringifyProgrammer.ts
 +++ b/src/programmers/json/JsonStringifyProgrammer.ts
-@@ -543,7 +543,7 @@ export namespace JsonStringifyProgrammer {
+@@ -560,7 +560,7 @@ export namespace JsonStringifyProgrammer {
          );
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
@@ -230,7 +268,7 @@ index c317cec2c78e984a6e64c7bf287d0c67e530e309..5974830c62dbd2b865aa2e64e2e75728
          if (last.rest === null) return null;
  
          const code = decode(project)(config)(importer)(
-@@ -552,7 +552,7 @@ export namespace JsonStringifyProgrammer {
+@@ -569,7 +569,7 @@ export namespace JsonStringifyProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -240,10 +278,10 @@ index c317cec2c78e984a6e64c7bf287d0c67e530e309..5974830c62dbd2b865aa2e64e2e75728
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/programmers/misc/MiscCloneProgrammer.ts b/src/programmers/misc/MiscCloneProgrammer.ts
-index 94d768b0a0738c0caccd711671351d1f22fa3848..739fd5f2baf4d2eb8e9dd65d73179242a0244707 100644
+index c8c9cb90085eff7dd68ac332a362674ca33d93d8..76a810816bc4ad57ff5e1787a33cd7f01471ffbe 100644
 --- a/src/programmers/misc/MiscCloneProgrammer.ts
 +++ b/src/programmers/misc/MiscCloneProgrammer.ts
-@@ -343,7 +343,7 @@ export namespace MiscCloneProgrammer {
+@@ -395,7 +395,7 @@ export namespace MiscCloneProgrammer {
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
  
@@ -252,7 +290,7 @@ index 94d768b0a0738c0caccd711671351d1f22fa3848..739fd5f2baf4d2eb8e9dd65d73179242
          const rest: Metadata | null = last.rest;
          if (rest === null) return null;
  
-@@ -353,7 +353,7 @@ export namespace MiscCloneProgrammer {
+@@ -405,7 +405,7 @@ export namespace MiscCloneProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -262,10 +300,10 @@ index 94d768b0a0738c0caccd711671351d1f22fa3848..739fd5f2baf4d2eb8e9dd65d73179242
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/programmers/misc/MiscPruneProgrammer.ts b/src/programmers/misc/MiscPruneProgrammer.ts
-index ed1465267066e382ae6696a25a806c2489597593..661f3cd93ae66070c978bd3e8d2b8db07189fe47 100644
+index 1051204a00041ddfb39da9de77b35ab8b44b75ee..73db30fdc06955f43dc2f563cbfc174e50a1bc6f 100644
 --- a/src/programmers/misc/MiscPruneProgrammer.ts
 +++ b/src/programmers/misc/MiscPruneProgrammer.ts
-@@ -310,7 +310,7 @@ export namespace MiscPruneProgrammer {
+@@ -347,7 +347,7 @@ export namespace MiscPruneProgrammer {
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
  
@@ -274,7 +312,7 @@ index ed1465267066e382ae6696a25a806c2489597593..661f3cd93ae66070c978bd3e8d2b8db0
          const rest: Metadata | null = last.rest;
          if (rest === null || filter(rest) === false) return null;
  
-@@ -320,7 +320,7 @@ export namespace MiscPruneProgrammer {
+@@ -357,7 +357,7 @@ export namespace MiscPruneProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -284,10 +322,10 @@ index ed1465267066e382ae6696a25a806c2489597593..661f3cd93ae66070c978bd3e8d2b8db0
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/programmers/notations/NotationGeneralProgrammer.ts b/src/programmers/notations/NotationGeneralProgrammer.ts
-index bd49b1e34002b1a1ec4f5444a8f91fa0ab794360..71d676de290986045910602ab10c6ef09a19c07d 100644
+index d8b2e22a8f9f3bfcb8f3e7987edaa7bf19a48720..96632214cb02b1534dc1987a0f892a3bf41e892f 100644
 --- a/src/programmers/notations/NotationGeneralProgrammer.ts
 +++ b/src/programmers/notations/NotationGeneralProgrammer.ts
-@@ -353,7 +353,7 @@ export namespace NotationGeneralProgrammer {
+@@ -411,7 +411,7 @@ export namespace NotationGeneralProgrammer {
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
  
@@ -296,7 +334,7 @@ index bd49b1e34002b1a1ec4f5444a8f91fa0ab794360..71d676de290986045910602ab10c6ef0
          const rest: Metadata | null = last.rest;
          if (rest === null) return null;
  
-@@ -363,7 +363,7 @@ export namespace NotationGeneralProgrammer {
+@@ -421,7 +421,7 @@ export namespace NotationGeneralProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -306,15 +344,15 @@ index bd49b1e34002b1a1ec4f5444a8f91fa0ab794360..71d676de290986045910602ab10c6ef0
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/transformers/CallExpressionTransformer.ts b/src/transformers/CallExpressionTransformer.ts
-index c58a1b143ce4f204bb249a4858c9d16a26f97408..9e9ffcf73e4c01aa6ac8c213669fdcd50e0181b9 100644
+index 99a4604f1a1944336b4d93dc61390269c346c243..c31ba72f1d206c441d6c237314a1c4d5c808dd09 100644
 --- a/src/transformers/CallExpressionTransformer.ts
 +++ b/src/transformers/CallExpressionTransformer.ts
-@@ -111,7 +111,7 @@ export namespace CallExpressionTransformer {
-       // TRANSFORMATION
-       //----
-       // FUNCTION NAME
--      const module: string = location.split(path.sep).at(-1)!.split(".")[0]!;
-+      const module: string = location.split(path.sep).slice(-1)[0]!.split(".")[0]!;
-       const { name } = project.checker.getTypeAtLocation(declaration).symbol;
- 
-       // FIND TRANSFORMER
+@@ -131,7 +131,7 @@ export namespace CallExpressionTransformer {
+       // TRANSFORMATION
+       //----
+       // FUNCTION NAME
+-      const module: string = location.split(path.sep).at(-1)!.split(".")[0]!;
++      const module: string = location.split(path.sep).slice(-1)[0]!.split(".")[0]!;
+       const { name } = project.checker.getTypeAtLocation(declaration).symbol;
+ 
+       // FIND TRANSFORMER
diff --git a/apps/meteor/client/hooks/useEndpointAction.ts b/apps/meteor/client/hooks/useEndpointAction.ts
index c7c371a04e1f..2cfb22b18548 100644
--- a/apps/meteor/client/hooks/useEndpointAction.ts
+++ b/apps/meteor/client/hooks/useEndpointAction.ts
@@ -15,7 +15,7 @@ type UseEndpointActionOptions<TPathPattern extends PathPattern> = (undefined ext
 export function useEndpointAction<TMethod extends Method, TPathPattern extends PathPattern>(
 	method: TMethod,
 	pathPattern: TPathPattern,
-	options: UseEndpointActionOptions<TPathPattern> = { keys: {} as UrlParams<TPathPattern> },
+	options: NoInfer<UseEndpointActionOptions<TPathPattern>> = { keys: {} as UrlParams<TPathPattern> },
 ) {
 	const sendData = useEndpoint(method, pathPattern, options.keys as UrlParams<TPathPattern>);
 
diff --git a/apps/meteor/client/hooks/useEndpointData.ts b/apps/meteor/client/hooks/useEndpointData.ts
index 6e759ad587e5..93942946ede0 100644
--- a/apps/meteor/client/hooks/useEndpointData.ts
+++ b/apps/meteor/client/hooks/useEndpointData.ts
@@ -20,11 +20,11 @@ const deprecationWarning = log('useEndpointData is deprecated, use @tanstack/rea
  */
 export const useEndpointData = <TPathPattern extends PathPattern>(
 	endpoint: TPathPattern,
-	options: {
+	options: NoInfer<{
 		keys?: UrlParams<TPathPattern>;
 		params?: OperationParams<'GET', TPathPattern>;
 		initialValue?: Serialized<OperationResult<'GET', TPathPattern>> | (() => Serialized<OperationResult<'GET', TPathPattern>>);
-	} = {},
+	}> = {},
 ): AsyncState<Serialized<OperationResult<'GET', TPathPattern>>> & {
 	reload: () => void;
 } => {
diff --git a/apps/meteor/client/lib/createRouteGroup.tsx b/apps/meteor/client/lib/createRouteGroup.tsx
index e418ecc56e99..70eab4782dd1 100644
--- a/apps/meteor/client/lib/createRouteGroup.tsx
+++ b/apps/meteor/client/lib/createRouteGroup.tsx
@@ -1,4 +1,4 @@
-import { type IRouterPaths, type RouteName, type RouterPathPattern } from '@rocket.chat/ui-contexts';
+import type { IRouterPaths, RouteName, RouterPathPattern } from '@rocket.chat/ui-contexts';
 import React, { type ElementType, type ReactNode } from 'react';
 
 import { router } from '../providers/RouterProvider';
@@ -9,21 +9,21 @@ type GroupName = 'omnichannel' | 'marketplace' | 'account' | 'admin';
 
 type GroupPrefix<TGroupName extends GroupName> = IRouterPaths[`${TGroupName}-index`]['pattern'];
 
-type RouteNamesOf<TGroupName extends GroupName> = Extract<
+type RouteNamesOf<TGroupName extends GroupName> = (
 	| keyof {
 			[TRouteName in RouteName as IRouterPaths[TRouteName]['pattern'] extends `${GroupPrefix<TGroupName>}/${string}`
 				? TRouteName
 				: never]: never;
 	  }
-	| `${GroupName}-index`,
-	RouteName
->;
+	| `${GroupName}-index`
+) &
+	RouteName;
 
-type TrimPrefix<T extends string, P extends string> = T extends `${P}${infer U}` ? U : T;
+type TrimPrefix<T, P extends string> = T extends `${P}${infer U}` ? U : T;
 
 export const createRouteGroup = <TGroupName extends GroupName>(
 	name: TGroupName,
-	prefix: GroupPrefix<TGroupName>,
+	prefix: NoInfer<GroupPrefix<TGroupName>>,
 	RouterComponent: ElementType<{
 		children?: ReactNode;
 	}>,
diff --git a/apps/meteor/client/lib/getLocalePercentage.ts b/apps/meteor/client/lib/getLocalePercentage.ts
index e6f2fa3bbff1..3aa84b59f03f 100644
--- a/apps/meteor/client/lib/getLocalePercentage.ts
+++ b/apps/meteor/client/lib/getLocalePercentage.ts
@@ -1,9 +1,6 @@
-export const getLocalePercentage = (locale: string, total: number, fraction: number, decimalCount = 2): string => {
-	const option = {
+export const getLocalePercentage = (locale: string, total: number, fraction: number, decimalCount = 2) =>
+	new Intl.NumberFormat(locale, {
 		style: 'percent',
 		minimumFractionDigits: decimalCount,
 		maximumFractionDigits: decimalCount,
-	};
-
-	return new Intl.NumberFormat(locale, option).format(fraction / total);
-};
+	}).format(fraction / total);
diff --git a/apps/meteor/client/providers/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
index f2c884aeb05f..6e728dc35eb6 100644
--- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx
+++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
@@ -11,7 +11,7 @@ import {
 } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Random } from '@rocket.chat/random';
-import type { Device, IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
+import type { Device } from '@rocket.chat/ui-contexts';
 import {
 	useRouter,
 	useUser,
@@ -65,7 +65,7 @@ export const CallProvider = ({ children }: CallProviderProps) => {
 
 	const hasVoIPEnterpriseLicense = useIsVoipEnterprise();
 
-	const remoteAudioMediaRef = useRef<IExperimentalHTMLAudioElement>(null); // TODO: Create a dedicated file for the AUDIO and make the controls accessible
+	const remoteAudioMediaRef = useRef<HTMLAudioElement>(null); // TODO: Create a dedicated file for the AUDIO and make the controls accessible
 
 	const [queueCounter, setQueueCounter] = useState(0);
 	const [queueName, setQueueName] = useState('');
diff --git a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
index 90ced3b0459a..c8fd77fa257b 100644
--- a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
@@ -1,5 +1,5 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import type { Device, IExperimentalHTMLAudioElement, DeviceContextValue } from '@rocket.chat/ui-contexts';
+import type { Device, DeviceContextValue } from '@rocket.chat/ui-contexts';
 import { DeviceContext } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useEffect, useState, useMemo } from 'react';
@@ -33,7 +33,7 @@ export const DeviceProvider = ({ children }: DeviceProviderProps): ReactElement
 	};
 
 	const setAudioOutputDevice = useMutableCallback(
-		({ outputDevice, HTMLAudioElement }: { outputDevice: Device; HTMLAudioElement: IExperimentalHTMLAudioElement }): void => {
+		({ outputDevice, HTMLAudioElement }: { outputDevice: Device; HTMLAudioElement: HTMLAudioElement }): void => {
 			if (!isSetSinkIdAvailable()) {
 				throw new Error('setSinkId is not available in this browser');
 			}
diff --git a/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx b/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
index 65bf99ed116f..2f835819afe6 100644
--- a/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
@@ -1,6 +1,4 @@
-import type { IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
-
 export const isSetSinkIdAvailable = (): boolean => {
-	const audio = new Audio() as IExperimentalHTMLAudioElement;
+	const audio = new Audio();
 	return !!audio.setSinkId;
 };
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
index 0c0ef00b5ac0..eb546c91c6bd 100644
--- a/apps/meteor/client/providers/TranslationProvider.tsx
+++ b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -84,7 +84,7 @@ const useI18next = (lng: string): typeof i18next => {
 				loadPath: 'i18n/{{lng}}.json',
 				parse: (data: string, _lngs?: string | string[], namespaces: string | string[] = []) =>
 					extractTranslationKeys(JSON.parse(data), namespaces),
-				request: (_options, url, _payload, callback) => {
+				request: (_options: unknown, url: string, _payload: unknown, callback: (error: unknown, data: unknown) => void) => {
 					const params = url.split('/');
 
 					const lng = params[params.length - 1];
diff --git a/apps/meteor/client/views/admin/viewLogs/ansispan.ts b/apps/meteor/client/views/admin/viewLogs/ansispan.ts
index 7f1709e48ef2..8aa5bccb1195 100644
--- a/apps/meteor/client/views/admin/viewLogs/ansispan.ts
+++ b/apps/meteor/client/views/admin/viewLogs/ansispan.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-control-regex */
 const foregroundColors = {
 	30: 'var(--rcx-color-font-secondary-info, #6C727A)',
 	31: 'var(--rcx-color-font-danger, #D40C26)',
@@ -16,13 +17,13 @@ export const ansispan = (str: string): string => {
 		.replace(/>/g, '&gt;')
 		.replace(/</g, '&lt;')
 		.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '<span>$1</span>')
-		.replace(/\033\[1m/g, '<strong>')
-		.replace(/\033\[22m/g, '</strong>')
-		.replace(/\033\[3m/g, '<em>')
-		.replace(/\033\[23m/g, '</em>')
-		.replace(/\033\[m/g, '</span>')
-		.replace(/\033\[0m/g, '</span>')
-		.replace(/\033\[39m/g, '</span>');
+		.replace(/\x1b\[1m/g, '<strong>')
+		.replace(/\x1b\[22m/g, '</strong>')
+		.replace(/\x1b\[3m/g, '<em>')
+		.replace(/\x1b\[23m/g, '</em>')
+		.replace(/\x1b\[m/g, '</span>')
+		.replace(/\x1b\[0m/g, '</span>')
+		.replace(/\x1b\[39m/g, '</span>');
 	return Object.entries(foregroundColors).reduce((str, [ansiCode, color]) => {
 		const span = `<span style="color: ${color}">`;
 		return str.replace(new RegExp(`\\033\\[${ansiCode}m`, 'g'), span).replace(new RegExp(`\\033\\[0;${ansiCode}m`, 'g'), span);
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 58b73351c4e0..27794da80e16 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -62,7 +62,7 @@
 		"pino-pretty": "^7.6.1",
 		"pm2": "^5.2.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../../package.json"
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9c49c2cb33f8..b1230a0fa813 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -210,7 +210,7 @@
 		"supports-color": "~7.2.0",
 		"template-file": "^6.0.1",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@babel/runtime": "~7.22.15",
@@ -430,7 +430,7 @@
 		"turndown": "^7.1.2",
 		"twilio": "^3.76.1",
 		"twit": "^2.2.11",
-		"typia": "^5.3.3",
+		"typia": "~6.9.0",
 		"ua-parser-js": "^1.0.37",
 		"underscore": "^1.13.6",
 		"universal-perf-hooks": "^1.0.1",
diff --git a/apps/meteor/server/services/federation/Federation.ts b/apps/meteor/server/services/federation/Federation.ts
index c8e2a9b1bc57..34331dc00971 100644
--- a/apps/meteor/server/services/federation/Federation.ts
+++ b/apps/meteor/server/services/federation/Federation.ts
@@ -17,7 +17,9 @@ const allowedActionsInFederatedRooms: ValueOf<typeof RoomMemberActions>[] = [
 	RoomMemberActions.LEAVE,
 ];
 
-const allowedActionsForModerators = allowedActionsInFederatedRooms.filter((action) => action !== RoomMemberActions.SET_AS_OWNER);
+const allowedActionsForModerators: ValueOf<typeof RoomMemberActions>[] = allowedActionsInFederatedRooms.filter(
+	(action) => action !== RoomMemberActions.SET_AS_OWNER,
+);
 
 const allowedRoomSettingsChangesInFederatedRooms: ValueOf<typeof RoomSettingsEnum>[] = [RoomSettingsEnum.NAME, RoomSettingsEnum.TOPIC];
 
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index ac28eb76e76d..c0c3dab2ef8c 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -45,7 +45,7 @@
 		"@types/polka": "^0.5.6",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/account-service/src/service.js",
 	"files": [
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index bff15e7f7d91..ab1429fd0223 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -41,7 +41,7 @@
 		"@types/polka": "^0.5.6",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/authorization-service/src/service.js",
 	"files": [
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 1687042e0d31..fab1967867da 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -57,7 +57,7 @@
 		"eslint": "~8.45.0",
 		"pino-pretty": "^7.6.1",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/service.js",
 	"files": [
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index c60542c180ec..959ea0605c02 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -47,7 +47,7 @@
 		"@types/polka": "^0.5.6",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/omnichannel-transcript/src/service.js",
 	"files": [
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index c800dd4d6c80..49653f0dcbaf 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -41,7 +41,7 @@
 		"@types/polka": "^0.5.6",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/presence-service/src/service.js",
 	"files": [
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 0a227cb271c0..19b252b70601 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -45,7 +45,7 @@
 		"@types/polka": "^0.5.6",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/queue-worker/src/service.js",
 	"files": [
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 812522a5f1d8..069e58586fe7 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -43,7 +43,7 @@
 		"@types/polka": "^0.5.6",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/stream-hub-service/src/service.js",
 	"files": [
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 1c746514d443..76d18fc35a8e 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -10,7 +10,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "tsc",
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index f520d82bd7d3..6e9c80ae02ea 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -8,7 +8,7 @@
 		"@types/jest": "~29.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 749d48ccc9c2..9c58aff464bd 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -14,7 +14,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"react-dom": "~18.3.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "tsc -p tsconfig.build.json && cp -r src/public dist/public",
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 787eb2053007..997f80c60dd7 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -13,7 +13,7 @@
 		"babel-jest": "^29.0.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint src",
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 713265b36bfa..2c5e6c41267d 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -16,7 +16,7 @@
 		"eslint-plugin-testing-library": "^5.11.1",
 		"react": "~17.0.2",
 		"react-docgen-typescript-plugin": "~1.0.5",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/package.json b/package.json
index 29de436373e2..7cb5f88cdbe9 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,7 @@
 		"@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0": "patch:@storybook/react-docgen-typescript-plugin@npm%3A1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0#./.yarn/patches/@storybook-react-docgen-typescript-plugin-npm-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0-b31cc57c40.patch",
 		"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
 		"@rocket.chat/forked-matrix-sdk-crypto-nodejs": "0.1.0-beta.13",
-		"typia@5.3.3": "patch:typia@npm:5.3.3#.yarn/patches/typia-npm-5.3.3-21d3e18463.patch",
-		"typia@~5.3.3": "patch:typia@npm%3A5.3.3#./.yarn/patches/typia-npm-5.3.3-21d3e18463.patch"
+		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch"
 	},
 	"dependencies": {
 		"node-gyp": "^9.4.1"
diff --git a/packages/account-utils/package.json b/packages/account-utils/package.json
index e33876a02d28..4ec6cd3bcab5 100644
--- a/packages/account-utils/package.json
+++ b/packages/account-utils/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/agenda/package.json b/packages/agenda/package.json
index 71b8b01bd6b0..f09921de6c31 100644
--- a/packages/agenda/package.json
+++ b/packages/agenda/package.json
@@ -14,7 +14,7 @@
 	"devDependencies": {
 		"@types/debug": "^4.1.10",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 43de20583d47..6d84bfe46f7e 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -8,7 +8,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-fetch-mock": "^3.0.3",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "tsc",
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 816e271535df..4491237dc047 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/base64/package.json b/packages/base64/package.json
index c58a652877a3..441fed0e06c1 100644
--- a/packages/base64/package.json
+++ b/packages/base64/package.json
@@ -21,7 +21,7 @@
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/cas-validate/package.json b/packages/cas-validate/package.json
index 769b74d38e56..a7cccb911781 100644
--- a/packages/cas-validate/package.json
+++ b/packages/cas-validate/package.json
@@ -5,7 +5,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index fe1d4ef0dcea..281982a62c57 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -16,7 +16,7 @@
 		"jest": "~29.7.0",
 		"mongodb": "^4.17.2",
 		"prettier": "~2.8.8",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 34bdc67438ca..98d496c05054 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -7,7 +7,7 @@
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
 		"prettier": "~2.8.8",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/cron/package.json b/packages/cron/package.json
index a6484224ded5..3003eacb39dc 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 9e4fdfd85910..5d8ef8867497 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -8,7 +8,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
-		"typescript": "~5.3.3",
+		"typescript": "~5.5.4",
 		"ws": "^8.13.0"
 	},
 	"peerDependencies": {
diff --git a/packages/favicon/package.json b/packages/favicon/package.json
index b61eaee02a68..67f5c6dcdfea 100644
--- a/packages/favicon/package.json
+++ b/packages/favicon/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 9431a0c19d96..688033a1a7dc 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -106,7 +106,7 @@
     "rimraf": "^3.0.2",
     "storybook-dark-mode": "~3.0.1",
     "tslib": "^2.5.3",
-    "typescript": "~5.3.3"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 6ecb49fa9544..d025320e6874 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -41,7 +41,7 @@
 		"outdent": "^0.8.0",
 		"react-docgen-typescript-plugin": "~1.0.5",
 		"react-dom": "~17.0.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc -p tsconfig.build.json",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 6927aae08d1c..92fa97c42df7 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -7,7 +7,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"tsup": "^6.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "node ./src/index.mjs",
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 088cba613d8e..f15a8feceff5 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -7,7 +7,7 @@
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
 		"prettier": "~2.8.8",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json
index e6c0c9197bce..5fb2e26389a0 100644
--- a/packages/jest-presets/package.json
+++ b/packages/jest-presets/package.json
@@ -30,7 +30,7 @@
 		"@types/uuid": "^9",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.4.5"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
index a6d989e2c275..d945bd3a6f9c 100644
--- a/packages/jwt/package.json
+++ b/packages/jwt/package.json
@@ -7,7 +7,7 @@
 		"@types/jest": "~29.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 9d40643dd4c5..073c2e999e42 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -85,7 +85,7 @@
 		"stylelint-order": "^5.0.0",
 		"svg-loader": "^0.0.2",
 		"terser-webpack-plugin": "~4.2.3",
-		"typescript": "~5.3.3",
+		"typescript": "~5.5.4",
 		"url-loader": "^4.1.1",
 		"webpack": "^5.89.0",
 		"webpack-bundle-analyzer": "^4.9.1",
diff --git a/packages/log-format/package.json b/packages/log-format/package.json
index b43a3954a96f..f6f7c03b6f63 100644
--- a/packages/log-format/package.json
+++ b/packages/log-format/package.json
@@ -6,7 +6,7 @@
 		"@types/chalk": "^2.2.0",
 		"@types/ejson": "^2.2.1",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index aae996f35139..d073ebddbf49 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index fd7e88dc1d86..78ffd3401ff4 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -68,7 +68,7 @@
     "rimraf": "^3.0.2",
     "ts-loader": "~9.4.2",
     "typedoc": "~0.24.1",
-    "typescript": "~5.3.3",
+    "typescript": "~5.5.4",
     "webpack": "~5.78.0",
     "webpack-cli": "~5.0.1"
   },
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 64310f0695cc..f5fba6c3b74b 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -17,7 +17,7 @@
 		"@types/use-sync-external-store": "^0.0.5",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
 		"@tanstack/react-query": "*",
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index f96764fa49af..13ee8c08b727 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -6,7 +6,7 @@
 		"@types/node-rsa": "^1.1.3",
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/models/package.json b/packages/models/package.json
index 19f1f28438f6..6b0d1c0a6fe7 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -7,7 +7,7 @@
 		"@types/jest": "~29.5.12",
 		"eslint": "~8.45.0",
 		"jest": "^29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@rocket.chat/model-typings": "workspace:~"
diff --git a/packages/node-poplib/package.json b/packages/node-poplib/package.json
index a232d6b4c476..1d0c4c462e46 100644
--- a/packages/node-poplib/package.json
+++ b/packages/node-poplib/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./src/index.js",
 	"typings": "./dist/index.d.ts"
diff --git a/packages/password-policies/package.json b/packages/password-policies/package.json
index d53ffa1f5249..a2fef4ae0543 100644
--- a/packages/password-policies/package.json
+++ b/packages/password-policies/package.json
@@ -7,7 +7,7 @@
 		"@types/jest": "~29.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/patch-injection/package.json b/packages/patch-injection/package.json
index 99f676bff831..8dabf2fb3f2a 100644
--- a/packages/patch-injection/package.json
+++ b/packages/patch-injection/package.json
@@ -7,7 +7,7 @@
 		"@types/jest": "~29.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index 5fa014da7f29..f0ac6d915567 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -50,7 +50,7 @@
     "peggy": "3.0.2",
     "prettier": "~2.8.7",
     "rimraf": "^3.0.2",
-    "typescript": "~5.3.3",
+    "typescript": "~5.5.4",
     "webpack": "~5.78.0"
   },
   "volta": {
diff --git a/packages/random/package.json b/packages/random/package.json
index 72fc8c5c566a..498e218338d9 100644
--- a/packages/random/package.json
+++ b/packages/random/package.json
@@ -23,7 +23,7 @@
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/release-action/package.json b/packages/release-action/package.json
index 0d17e4fb4221..e633ef69d06f 100644
--- a/packages/release-action/package.json
+++ b/packages/release-action/package.json
@@ -11,7 +11,7 @@
 	"packageManager": "yarn@3.5.1",
 	"devDependencies": {
 		"@types/node": "^16.18.60",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@actions/core": "^1.10.1",
diff --git a/packages/release-changelog/package.json b/packages/release-changelog/package.json
index 9e48d015b321..f183d00b550b 100644
--- a/packages/release-changelog/package.json
+++ b/packages/release-changelog/package.json
@@ -12,7 +12,7 @@
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/node": "^14.18.63",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"dataloader": "^1.4.0",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 53bd1d2f5cb2..b5846800ad69 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -7,7 +7,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "^4.17.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/server-cloud-communication/package.json b/packages/server-cloud-communication/package.json
index 8c970687ab8b..35e67a2c0638 100644
--- a/packages/server-cloud-communication/package.json
+++ b/packages/server-cloud-communication/package.json
@@ -5,7 +5,7 @@
 	"devDependencies": {
 		"@rocket.chat/license": "workspace:^",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/server-fetch/package.json b/packages/server-fetch/package.json
index c98b4ba99e54..27f957758520 100644
--- a/packages/server-fetch/package.json
+++ b/packages/server-fetch/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/sha256/package.json b/packages/sha256/package.json
index 6d10f5b80d65..fb9e0d0d7f26 100644
--- a/packages/sha256/package.json
+++ b/packages/sha256/package.json
@@ -22,7 +22,7 @@
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/tools/package.json b/packages/tools/package.json
index d1301efb7055..11dade3ac5c8 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -7,7 +7,7 @@
 		"@types/jest": "~29.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 1c2dc6dabbc4..d315553b8d83 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -15,7 +15,7 @@
 		"eslint-plugin-storybook": "~0.6.15",
 		"eslint-plugin-testing-library": "~5.11.1",
 		"react": "^17.0.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index f43b2d8622b8..31492399dee9 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -37,7 +37,7 @@
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc -p tsconfig.build.json",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index d854a6ffea86..a051bc16db23 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -38,7 +38,7 @@
     "react": "~17.0.2",
     "react-docgen-typescript-plugin": "~1.0.5",
     "react-dom": "~17.0.2",
-    "typescript": "~5.3.3"
+    "typescript": "~5.5.4"
   },
   "peerDependencies": {
     "@react-aria/toolbar": "*",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 513aebd86a30..b2954e61c9ec 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -16,7 +16,7 @@
 		"eslint-plugin-react-hooks": "^4.6.0",
 		"mongodb": "^4.17.2",
 		"react": "~17.0.2",
-		"typescript": "~5.3.3",
+		"typescript": "~5.5.4",
 		"use-sync-external-store": "^1.2.0"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-contexts/src/DeviceContext.ts b/packages/ui-contexts/src/DeviceContext.ts
index 483f03707f95..5bbda60cfcd5 100644
--- a/packages/ui-contexts/src/DeviceContext.ts
+++ b/packages/ui-contexts/src/DeviceContext.ts
@@ -6,10 +6,6 @@ export type Device = {
 	type: string;
 };
 
-export interface IExperimentalHTMLAudioElement extends HTMLAudioElement {
-	setSinkId: (sinkId: string) => void;
-}
-
 type EnabledDeviceContextValue = {
 	enabled: true;
 	availableAudioOutputDevices: Device[];
@@ -18,7 +14,7 @@ type EnabledDeviceContextValue = {
 	selectedAudioOutputDevice?: Device;
 	selectedAudioInputDevice?: Device;
 	// selectedVideoInputDevice?: Device;
-	setAudioOutputDevice: (data: { outputDevice: Device; HTMLAudioElement: IExperimentalHTMLAudioElement }) => void;
+	setAudioOutputDevice: (data: { outputDevice: Device; HTMLAudioElement: HTMLAudioElement }) => void;
 	setAudioInputDevice: (device: Device) => void;
 	// setVideoInputDevice: (device: Device) => void;
 };
diff --git a/packages/ui-contexts/src/hooks/useEndpoint.ts b/packages/ui-contexts/src/hooks/useEndpoint.ts
index a0b7c977f2c6..3d29917c63e2 100644
--- a/packages/ui-contexts/src/hooks/useEndpoint.ts
+++ b/packages/ui-contexts/src/hooks/useEndpoint.ts
@@ -14,7 +14,7 @@ export type EndpointFunction<TMethod extends Method, TPathPattern extends PathPa
 export function useEndpoint<TMethod extends Method, TPathPattern extends PathPattern>(
 	method: TMethod,
 	pathPattern: TPathPattern,
-	...[keys]: undefined extends UrlParams<TPathPattern> ? [keys?: UrlParams<TPathPattern>] : [keys: UrlParams<TPathPattern>]
+	...[keys]: NoInfer<undefined extends UrlParams<TPathPattern> ? [keys?: UrlParams<TPathPattern>] : [keys: UrlParams<TPathPattern>]>
 ): EndpointFunction<TMethod, TPathPattern> {
 	const { callEndpoint } = useContext(ServerContext);
 	const keysRef = useRef(keys);
diff --git a/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts b/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts
index 7a68d7b10e0d..c3d6b9425876 100644
--- a/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts
+++ b/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts
@@ -1,17 +1,11 @@
 import { useContext } from 'react';
 
-import type { Device, IExperimentalHTMLAudioElement } from '../DeviceContext';
+import type { Device } from '../DeviceContext';
 import { DeviceContext, isDeviceContextEnabled } from '../DeviceContext';
 
 // This allows different places to set the output device by providing a HTMLAudioElement
 
-type setOutputMediaDevice = ({
-	outputDevice,
-	HTMLAudioElement,
-}: {
-	outputDevice: Device;
-	HTMLAudioElement: IExperimentalHTMLAudioElement;
-}) => void;
+type setOutputMediaDevice = ({ outputDevice, HTMLAudioElement }: { outputDevice: Device; HTMLAudioElement: HTMLAudioElement }) => void;
 
 export const useSetOutputMediaDevice = (): setOutputMediaDevice => {
 	const context = useContext(DeviceContext);
diff --git a/packages/ui-contexts/src/index.ts b/packages/ui-contexts/src/index.ts
index e021eb840aa0..313710bbfd4e 100644
--- a/packages/ui-contexts/src/index.ts
+++ b/packages/ui-contexts/src/index.ts
@@ -14,7 +14,7 @@ export { ToastMessagesContext, ToastMessagesContextValue } from './ToastMessages
 export { TooltipContext, TooltipContextValue } from './TooltipContext';
 export { TranslationContext, TranslationContextValue } from './TranslationContext';
 export { UserContext, UserContextValue } from './UserContext';
-export { DeviceContext, Device, IExperimentalHTMLAudioElement, DeviceContextValue } from './DeviceContext';
+export { DeviceContext, Device, DeviceContextValue } from './DeviceContext';
 export { ActionManagerContext, IActionManager } from './ActionManagerContext';
 
 export { useAbsoluteUrl } from './hooks/useAbsoluteUrl';
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index c7e8159d457d..ae42ec71b2a0 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -52,11 +52,11 @@
 		"ts-jest": "~29.1.1",
 		"ts-loader": "~9.4.2",
 		"ts-node": "~10.9.1",
-		"ts-patch": "~3.0.2",
-		"typescript": "~5.3.3"
+		"ts-patch": "~3.2.1",
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
-		"typia": "~5.3.3"
+		"typia": "~6.9.0"
 	},
 	"peerDependencies": {
 		"@rocket.chat/icons": "*"
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 5e7d114a3576..befa3514509f 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -32,7 +32,7 @@
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
 		"react-docgen-typescript-plugin": "~1.0.5",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
 		"@rocket.chat/css-in-js": "*",
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index f46f139a66f4..e29be5287b65 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -50,7 +50,7 @@
     "eslint": "~8.45.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.4",
-    "typescript": "~5.3.3",
+    "typescript": "~5.5.4",
     "vite": "^4.3.9"
   },
   "volta": {
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ba3dc31423a6..4a9b4ac82a9c 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -42,7 +42,7 @@
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
 		"storybook-dark-mode": "~3.0.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
diff --git a/yarn.lock b/yarn.lock
index f2e902295848..7ef356f54646 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8433,7 +8433,7 @@ __metadata:
     pino: ^8.15.0
     polka: ^0.5.2
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     uuid: ^9.0.1
   languageName: unknown
   linkType: soft
@@ -8443,7 +8443,7 @@ __metadata:
   resolution: "@rocket.chat/account-utils@workspace:packages/account-utils"
   dependencies:
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8459,7 +8459,7 @@ __metadata:
     human-interval: ^2.0.1
     moment-timezone: ~0.5.43
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8479,7 +8479,7 @@ __metadata:
     query-string: ^7.1.3
     split-on-first: ^3.0.0
     strict-uri-encode: ^2.0.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8513,7 +8513,7 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8545,7 +8545,7 @@ __metadata:
     pino: ^8.15.0
     polka: ^0.5.2
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8561,7 +8561,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8571,7 +8571,7 @@ __metadata:
   dependencies:
     cheerio: 1.0.0-rc.10
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8601,7 +8601,7 @@ __metadata:
     jest: ~29.7.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8617,7 +8617,7 @@ __metadata:
     eslint: ~8.45.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8631,7 +8631,7 @@ __metadata:
     "@rocket.chat/random": "workspace:^"
     eslint: ~8.45.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8670,7 +8670,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     jest-websocket-mock: ~2.5.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     ws: ^8.13.0
   peerDependencies:
     "@rocket.chat/emitter": "*"
@@ -8718,7 +8718,7 @@ __metadata:
     polka: ^0.5.2
     sharp: ^0.32.6
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     underscore: ^1.13.6
     uuid: ^7.0.3
     ws: ^8.8.1
@@ -8758,7 +8758,7 @@ __metadata:
   resolution: "@rocket.chat/favicon@workspace:packages/favicon"
   dependencies:
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8923,7 +8923,7 @@ __metadata:
     rimraf: ^3.0.2
     storybook-dark-mode: ~3.0.1
     tslib: ^2.5.3
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/apps-engine": "*"
     "@rocket.chat/eslint-config": 0.7.0
@@ -9012,7 +9012,7 @@ __metadata:
     react-docgen-typescript-plugin: ~1.0.5
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "*"
@@ -9035,7 +9035,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     tsup: ^6.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9055,7 +9055,7 @@ __metadata:
     eslint: ~8.45.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9077,7 +9077,7 @@ __metadata:
     jest-axe: ~9.0.0
     jest-environment-jsdom: ~29.7.0
     jest-environment-node: ~29.7.0
-    typescript: ~5.4.5
+    typescript: ~5.5.4
     uuid: ~9.0.1
   languageName: unknown
   linkType: soft
@@ -9091,7 +9091,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     jose: ^4.14.4
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9122,7 +9122,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     jest-websocket-mock: ~2.5.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9210,7 +9210,7 @@ __metadata:
     stylelint-order: ^5.0.0
     svg-loader: ^0.0.2
     terser-webpack-plugin: ~4.2.3
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     url-loader: ^4.1.1
     webpack: ^5.89.0
     webpack-bundle-analyzer: ^4.9.1
@@ -9232,7 +9232,7 @@ __metadata:
     chalk: ^4.0.0
     ejson: ^2.2.3
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9243,7 +9243,7 @@ __metadata:
     "@rocket.chat/emitter": ~0.31.25
     eslint: ~8.45.0
     pino: ^8.15.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9292,7 +9292,7 @@ __metadata:
     tldts: ~5.7.112
     ts-loader: ~9.4.2
     typedoc: ~0.24.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     webpack: ~5.78.0
     webpack-cli: ~5.0.1
   languageName: unknown
@@ -9665,8 +9665,8 @@ __metadata:
     turndown: ^7.1.2
     twilio: ^3.76.1
     twit: ^2.2.11
-    typescript: ~5.3.3
-    typia: ^5.3.3
+    typescript: ~5.5.4
+    typia: ~6.9.0
     ua-parser-js: ^1.0.37
     underscore: ^1.13.6
     universal-perf-hooks: ^1.0.1
@@ -9698,7 +9698,7 @@ __metadata:
     i18next: ~23.4.9
     react: ~17.0.2
     react-i18next: ~13.2.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     use-sync-external-store: ~1.2.2
   peerDependencies:
     "@tanstack/react-query": "*"
@@ -9714,7 +9714,7 @@ __metadata:
     "@types/node-rsa": ^1.1.3
     eslint: ~8.45.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9727,7 +9727,7 @@ __metadata:
     "@types/jest": ~29.5.12
     eslint: ~8.45.0
     jest: ^29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9770,7 +9770,7 @@ __metadata:
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     pino: ^8.15.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9808,7 +9808,7 @@ __metadata:
     pino: ^8.15.0
     polka: ^0.5.2
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9841,7 +9841,7 @@ __metadata:
     "@types/jest": ~29.5.12
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9853,7 +9853,7 @@ __metadata:
     "@types/jest": ~29.5.12
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9880,7 +9880,7 @@ __metadata:
     moment-timezone: ^0.5.43
     react: ~18.3.1
     react-dom: ~18.3.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9896,7 +9896,7 @@ __metadata:
     peggy: 3.0.2
     prettier: ~2.8.7
     rimraf: ^3.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     webpack: ~5.78.0
   peerDependencies:
     peggy: "*"
@@ -9909,7 +9909,7 @@ __metadata:
   resolution: "@rocket.chat/poplib@workspace:packages/node-poplib"
   dependencies:
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9941,7 +9941,7 @@ __metadata:
     pino: ^8.15.0
     polka: ^0.5.2
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9963,7 +9963,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10008,7 +10008,7 @@ __metadata:
     pino: ^8.15.0
     polka: ^0.5.2
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10024,7 +10024,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10043,7 +10043,7 @@ __metadata:
     remark-parse: 9.0.0
     remark-stringify: 9.0.1
     semver: ^7.5.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     unified: 9.2.2
   languageName: unknown
   linkType: soft
@@ -10058,7 +10058,7 @@ __metadata:
     dataloader: ^1.4.0
     eslint: ~8.45.0
     node-fetch: ^2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10077,7 +10077,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10100,7 +10100,7 @@ __metadata:
   dependencies:
     "@rocket.chat/license": "workspace:^"
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10114,7 +10114,7 @@ __metadata:
     https-proxy-agent: ^5.0.1
     node-fetch: 2.3.0
     proxy-from-env: ^1.1.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10130,7 +10130,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10164,7 +10164,7 @@ __metadata:
     pino: ^8.15.0
     polka: ^0.5.2
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10204,7 +10204,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     moment-timezone: ^0.5.43
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10224,7 +10224,7 @@ __metadata:
     eslint-plugin-storybook: ~0.6.15
     eslint-plugin-testing-library: ~5.11.1
     react: ^17.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/ui-contexts": 9.0.0
@@ -10270,7 +10270,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-hook-form: ~7.45.4
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
     "@rocket.chat/css-in-js": "*"
@@ -10308,7 +10308,7 @@ __metadata:
     react: ~17.0.2
     react-docgen-typescript-plugin: ~1.0.5
     react-dom: ~17.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
     "@rocket.chat/fuselage": "*"
@@ -10336,7 +10336,7 @@ __metadata:
     eslint-plugin-react-hooks: ^4.6.0
     mongodb: ^4.17.2
     react: ~17.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     use-sync-external-store: ^1.2.0
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -10371,9 +10371,9 @@ __metadata:
     ts-jest: ~29.1.1
     ts-loader: ~9.4.2
     ts-node: ~10.9.1
-    ts-patch: ~3.0.2
-    typescript: ~5.3.3
-    typia: ~5.3.3
+    ts-patch: ~3.2.1
+    typescript: ~5.5.4
+    typia: ~6.9.0
   peerDependencies:
     "@rocket.chat/icons": "*"
   languageName: unknown
@@ -10396,7 +10396,7 @@ __metadata:
     eslint-plugin-testing-library: ^5.11.1
     react: ~17.0.2
     react-docgen-typescript-plugin: ~1.0.5
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
@@ -10440,7 +10440,7 @@ __metadata:
     jest: ~29.7.0
     jest-axe: ~9.0.0
     react-docgen-typescript-plugin: ~1.0.5
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
@@ -10495,7 +10495,7 @@ __metadata:
     react-split-pane: ^0.1.92
     react-virtuoso: ^4.7.1
     reactflow: ^11.7.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     use-subscription: ^1.8.0
     vite: ^4.3.9
   languageName: unknown
@@ -10531,7 +10531,7 @@ __metadata:
     react-hook-form: ~7.45.4
     react-i18next: ~13.2.2
     storybook-dark-mode: ~3.0.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
@@ -10543,6 +10543,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@samchon/openapi@npm:^0.4.6":
+  version: 0.4.9
+  resolution: "@samchon/openapi@npm:0.4.9"
+  checksum: a6fd35db27ebf3223c4793bd9a6669fc0e48ccbe522fa8eb26519073b897fb774cd652777e8d7d414bc19bf47ae03be227dfc2b65e2e1a5869c9723c5adad2e0
+  languageName: node
+  linkType: hard
+
 "@selderee/plugin-htmlparser2@npm:^0.6.0":
   version: 0.6.0
   resolution: "@selderee/plugin-htmlparser2@npm:0.6.0"
@@ -36734,7 +36741,7 @@ __metadata:
     sodium-native: ^3.3.0
     sodium-plus: ^0.9.0
     ts-node: ^10.9.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     uuid: ^8.3.2
     ws: ^8.8.1
   languageName: unknown
@@ -37200,7 +37207,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:^7.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -40047,20 +40054,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-patch@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "ts-patch@npm:3.0.2"
+"ts-patch@npm:~3.2.1":
+  version: 3.2.1
+  resolution: "ts-patch@npm:3.2.1"
   dependencies:
     chalk: ^4.1.2
     global-prefix: ^3.0.0
     minimist: ^1.2.8
     resolve: ^1.22.2
-    semver: ^7.3.8
+    semver: ^7.5.4
     strip-ansi: ^6.0.1
   bin:
     ts-patch: bin/ts-patch.js
     tspc: bin/tspc.js
-  checksum: 09cdc54bf517b11d4b0de64515e9a0d7e71e238d6065b3c02a04280dc2683143cd810a9065046228571af0865a7d876a4a852ff9a909cb2cae8fe33b41e4eb81
+  checksum: 8da4472dcd67b561a6299b54e30ab96181598edb90a97bc8dbe0066b28d706ec7402fee73496d25a281e2c4c94cb8e86d3b1592b1ca7591ea0b6cb48617ed19c
   languageName: node
   linkType: hard
 
@@ -40544,75 +40551,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~5.3.3":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
-  languageName: node
-  linkType: hard
-
-"typescript@npm:~5.4.5":
-  version: 5.4.5
-  resolution: "typescript@npm:5.4.5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 53c879c6fa1e3bcb194b274d4501ba1985894b2c2692fa079db03c5a5a7140587a1e04e1ba03184605d35f439b40192d9e138eb3279ca8eee313c081c8bcd9b0
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@~5.3.3#~builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=85af82"
+"typescript@npm:~5.5.4":
+  version: 5.5.4
+  resolution: "typescript@npm:5.5.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
+  checksum: b309040f3a1cd91c68a5a58af6b9fdd4e849b8c42d837b2c2e73f9a4f96a98c4f1ed398a9aab576ee0a4748f5690cf594e6b99dbe61de7839da748c41e6d6ca8
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@~5.4.5#~builtin<compat/typescript>":
-  version: 5.4.5
-  resolution: "typescript@patch:typescript@npm%3A5.4.5#~builtin<compat/typescript>::version=5.4.5&hash=85af82"
+"typescript@patch:typescript@~5.5.4#~builtin<compat/typescript>":
+  version: 5.5.4
+  resolution: "typescript@patch:typescript@npm%3A5.5.4#~builtin<compat/typescript>::version=5.5.4&hash=85af82"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 2373c693f3b328f3b2387c3efafe6d257b057a142f9a79291854b14ff4d5367d3d730810aee981726b677ae0fd8329b23309da3b6aaab8263dbdccf1da07a3ba
+  checksum: fc52962f31a5bcb716d4213bef516885e4f01f30cea797a831205fc9ef12b405a40561c40eae3127ab85ba1548e7df49df2bcdee6b84a94bfbe3a0d7eff16b14
   languageName: node
   linkType: hard
 
-"typia@npm:5.3.3, typia@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "typia@npm:5.3.3"
+"typia@npm:6.9.0":
+  version: 6.9.0
+  resolution: "typia@npm:6.9.0"
   dependencies:
+    "@samchon/openapi": ^0.4.6
     commander: ^10.0.0
     comment-json: ^4.2.3
     inquirer: ^8.2.5
     randexp: ^0.5.3
   peerDependencies:
-    typescript: ">=4.8.0 <5.4.0"
+    typescript: ">=4.8.0 <5.6.0"
   bin:
     typia: lib/executable/typia.js
-  checksum: 6e6c9f4c1382deda6ee91fb42f0adbfa57c5b73541a2e411474108d1deac9dd2f590fbbe48399c0357064a6298b5ab17324aa521195cf8e470057171ce868a64
+  checksum: 1d5ab0d331ff29b84914f5c8c5655fe3b1d17fae45ac3a76d30690de8414e8c45a27c189662896730c3211a436373e8c2eb3fc55d2eeb6ac8d15a1f50218a2e9
   languageName: node
   linkType: hard
 
-"typia@patch:typia@npm%3A5.3.3#./.yarn/patches/typia-npm-5.3.3-21d3e18463.patch::locator=rocket.chat%40workspace%3A.":
-  version: 5.3.3
-  resolution: "typia@patch:typia@npm%3A5.3.3#./.yarn/patches/typia-npm-5.3.3-21d3e18463.patch::version=5.3.3&hash=777cd5&locator=rocket.chat%40workspace%3A."
+"typia@patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch::locator=rocket.chat%40workspace%3A.":
+  version: 6.9.0
+  resolution: "typia@patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch::version=6.9.0&hash=71fcee&locator=rocket.chat%40workspace%3A."
   dependencies:
+    "@samchon/openapi": ^0.4.6
     commander: ^10.0.0
     comment-json: ^4.2.3
     inquirer: ^8.2.5
     randexp: ^0.5.3
   peerDependencies:
-    typescript: ">=4.8.0 <5.4.0"
+    typescript: ">=4.8.0 <5.6.0"
   bin:
     typia: lib/executable/typia.js
-  checksum: 256a670f6d3265135090a493c9519cd97466444188766ce9f4e434d2bfe29ec88c3a4ac3ac39938921e116873694ac526136957cbed5710109525d4d0d2425da
+  checksum: d87f150a526959f92ac9bafe7ad88121e69a2807c7aeb01a625cb845e0614fb09c54bbdbd68d0c90bce37072c2da5e153daa2ccd1f5ff7ca92eca4b5edf9e8a9
   languageName: node
   linkType: hard
 

From 037128cc55d9f3293f6f73adcbedd74f41125f8a Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Mon, 2 Sep 2024 13:00:47 -0300
Subject: [PATCH 028/170] test: Add some unit tests for `useRetentionPolicy`
 (#33196)

---
 .../room/hooks/useRetentionPolicy.spec.ts     | 87 +++++++++++++++++++
 apps/meteor/tests/mocks/data.ts               |  2 +-
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts

diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
new file mode 100644
index 000000000000..9b99d6e4d781
--- /dev/null
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
@@ -0,0 +1,87 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook } from '@testing-library/react';
+
+import { createFakeRoom } from '../../../../tests/mocks/data';
+import { useRetentionPolicy } from './useRetentionPolicy';
+
+const getGlobalSettings = ({
+	enabled = false,
+	filesOnly = false,
+	doNotPrunePinned = false,
+	ignoreThreads = false,
+	appliesToChannels = false,
+	appliesToGroups = false,
+	appliesToDMs = false,
+}) => {
+	return mockAppRoot()
+		.withSetting('RetentionPolicy_Enabled', enabled)
+		.withSetting('RetentionPolicy_FilesOnly', filesOnly)
+		.withSetting('RetentionPolicy_DoNotPrunePinned', doNotPrunePinned)
+		.withSetting('RetentionPolicy_DoNotPruneThreads', ignoreThreads)
+		.withSetting('RetentionPolicy_AppliesToChannels', appliesToChannels)
+		.withSetting('RetentionPolicy_AppliesToGroups', appliesToGroups)
+		.withSetting('RetentionPolicy_AppliesToDMs', appliesToDMs);
+};
+
+const defaultValue = {
+	enabled: false,
+	isActive: false,
+	filesOnly: false,
+	excludePinned: false,
+	ignoreThreads: false,
+};
+
+const roomTypeConfig = {
+	c: { appliesToChannels: true },
+	p: { appliesToGroups: true },
+	d: { appliesToDMs: true },
+};
+
+const CHANNELS_TYPE = 'c';
+
+it('should return the default value if global retention is not enabled', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({}).build(),
+	});
+
+	expect(result.current).toEqual(expect.objectContaining(defaultValue));
+});
+
+it('should return enabled true if global retention is enabled', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({ enabled: true }).build(),
+	});
+
+	expect(result.current).toEqual(expect.objectContaining({ ...defaultValue, enabled: true }));
+});
+
+it('should return enabled and active true global retention is active for rooms of the type', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({ enabled: true, ...roomTypeConfig[CHANNELS_TYPE] }).build(),
+	});
+
+	expect(result.current).toEqual(expect.objectContaining({ ...defaultValue, enabled: true, isActive: true }));
+});
+
+it.failing(
+	'should isActive be false if global retention is active for rooms of the type and room has retention.enabled false',
+	async () => {
+		const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE, retention: { enabled: false } });
+
+		const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+			legacyRoot: true,
+			wrapper: getGlobalSettings({ enabled: true, ...roomTypeConfig[CHANNELS_TYPE] }).build(),
+		});
+
+		expect(result.current?.isActive).toBe(false);
+	},
+);
diff --git a/apps/meteor/tests/mocks/data.ts b/apps/meteor/tests/mocks/data.ts
index 14f03a6bd9ab..fd6a0ce91123 100644
--- a/apps/meteor/tests/mocks/data.ts
+++ b/apps/meteor/tests/mocks/data.ts
@@ -21,7 +21,7 @@ export function createFakeUser(overrides?: Partial<IUser>): IUser {
 	};
 }
 
-export const createFakeRoom = (overrides?: Partial<IRoom>): IRoom => ({
+export const createFakeRoom = (overrides?: Partial<IRoom & { retention?: { enabled: boolean } }>): IRoom => ({
 	_id: faker.database.mongodbObjectId(),
 	_updatedAt: faker.date.recent(),
 	t: faker.helpers.arrayElement(['c', 'p', 'd']),

From 833880737fab6b02ba611541e309a483d13a8c50 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Mon, 2 Sep 2024 15:20:57 -0300
Subject: [PATCH 029/170] feat: email bridge (#33160)

---
 .changeset/tame-mayflies-press.md             |  5 ++++
 .../meteor/app/apps/server/bridges/bridges.js |  6 +++++
 apps/meteor/app/apps/server/bridges/email.ts  | 16 ++++++++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/packages/presence/package.json             |  2 +-
 packages/apps/package.json                    |  2 +-
 packages/core-services/package.json           |  2 +-
 packages/core-typings/package.json            |  2 +-
 packages/fuselage-ui-kit/package.json         |  2 +-
 packages/rest-typings/package.json            |  2 +-
 yarn.lock                                     | 26 +++++++++----------
 13 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/tame-mayflies-press.md
 create mode 100644 apps/meteor/app/apps/server/bridges/email.ts

diff --git a/.changeset/tame-mayflies-press.md b/.changeset/tame-mayflies-press.md
new file mode 100644
index 000000000000..e470306cbc25
--- /dev/null
+++ b/.changeset/tame-mayflies-press.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Implemented sending email via apps
diff --git a/apps/meteor/app/apps/server/bridges/bridges.js b/apps/meteor/app/apps/server/bridges/bridges.js
index 6d52a1d8e56d..aeab9f191039 100644
--- a/apps/meteor/app/apps/server/bridges/bridges.js
+++ b/apps/meteor/app/apps/server/bridges/bridges.js
@@ -5,6 +5,7 @@ import { AppApisBridge } from './api';
 import { AppCloudBridge } from './cloud';
 import { AppCommandsBridge } from './commands';
 import { AppDetailChangesBridge } from './details';
+import { AppEmailBridge } from './email';
 import { AppEnvironmentalVariableBridge } from './environmental';
 import { AppHttpBridge } from './http';
 import { AppInternalBridge } from './internal';
@@ -53,6 +54,7 @@ export class RealAppBridges extends AppBridges {
 		this._moderationBridge = new AppModerationBridge(orch);
 		this._threadBridge = new AppThreadBridge(orch);
 		this._roleBridge = new AppRoleBridge(orch);
+		this._emailBridge = new AppEmailBridge(orch);
 	}
 
 	getCommandBridge() {
@@ -150,4 +152,8 @@ export class RealAppBridges extends AppBridges {
 	getRoleBridge() {
 		return this._roleBridge;
 	}
+
+	getEmailBridge() {
+		return this._emailBridge;
+	}
 }
diff --git a/apps/meteor/app/apps/server/bridges/email.ts b/apps/meteor/app/apps/server/bridges/email.ts
new file mode 100644
index 000000000000..4c9cb9a93ed6
--- /dev/null
+++ b/apps/meteor/app/apps/server/bridges/email.ts
@@ -0,0 +1,16 @@
+import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import type { IEmail } from '@rocket.chat/apps-engine/definition/email';
+import { EmailBridge } from '@rocket.chat/apps-engine/server/bridges';
+
+import * as Mailer from '../../../mailer/server/api';
+
+export class AppEmailBridge extends EmailBridge {
+	constructor(private readonly orch: IAppServerOrchestrator) {
+		super();
+	}
+
+	protected async sendEmail(email: IEmail, appId: string): Promise<void> {
+		this.orch.debugLog(`The app ${appId} is sending an email.`);
+		await Mailer.send(email);
+	}
+}
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 27794da80e16..5d7039d0962f 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -18,7 +18,7 @@
 	"author": "Rocket.Chat",
 	"license": "MIT",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b1230a0fa813..f0fbd66c087d 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -230,7 +230,7 @@
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
 		"@rocket.chat/apps": "workspace:^",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/base64": "workspace:^",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index fab1967867da..e776c1a573b8 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -15,7 +15,7 @@
 	],
 	"author": "Rocket.Chat",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 997f80c60dd7..f7c195678dd6 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@types/node": "^14.18.63",
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 4491237dc047..b970a7d8cc20 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -18,7 +18,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^"
 	}
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 281982a62c57..191240062908 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -34,7 +34,7 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 98d496c05054..485dec1d88ed 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -22,7 +22,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~"
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 688033a1a7dc..75684f3f9fb5 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -63,7 +63,7 @@
     "@babel/preset-env": "~7.22.20",
     "@babel/preset-react": "~7.22.15",
     "@babel/preset-typescript": "~7.22.15",
-    "@rocket.chat/apps-engine": "1.45.0-alpha.866",
+    "@rocket.chat/apps-engine": "1.45.0-alpha.868",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/fuselage": "^0.57.0",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index b5846800ad69..2c676f04a07f 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -23,7 +23,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index 7ef356f54646..6578c3ba2410 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8483,9 +8483,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:1.45.0-alpha.866":
-  version: 1.45.0-alpha.866
-  resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.866"
+"@rocket.chat/apps-engine@npm:1.45.0-alpha.868":
+  version: 1.45.0-alpha.868
+  resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.868"
   dependencies:
     "@msgpack/msgpack": 3.0.0-beta2
     adm-zip: ^0.5.9
@@ -8501,7 +8501,7 @@ __metadata:
     uuid: ~8.3.2
   peerDependencies:
     "@rocket.chat/ui-kit": "*"
-  checksum: 04abb4f712fcca206c6791322b52e2a3d97f3db06f606cd1f58fdda4e63d2123d7004bb445ad7582c52808c3ec4433d465d8855e24f3ab2f8457dafa6b017c5b
+  checksum: 3ac41e3de76be67e856e4bca888f113360628e510f9d4c66d70ed71d84f25bda6ca6659ead6c7a87d21c117c47bfa090b4508cce66e8630d2e935d3ed3158835
   languageName: node
   linkType: hard
 
@@ -8509,7 +8509,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/apps@workspace:packages/apps"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     eslint: ~8.45.0
@@ -8582,7 +8582,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
@@ -8609,7 +8609,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/message-parser": "workspace:^"
@@ -8681,7 +8681,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
@@ -8879,7 +8879,7 @@ __metadata:
     "@babel/preset-env": ~7.22.20
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": ^0.57.0
@@ -9329,7 +9329,7 @@ __metadata:
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
     "@rocket.chat/apps": "workspace:^"
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/base64": "workspace:^"
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
@@ -9952,7 +9952,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -10066,7 +10066,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -36701,7 +36701,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": ~0.31.25

From 9e7cc89e48e8b237a189cded88e243153be1c9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9ssica=20Souza?= <jessica_schelly@hotmail.com>
Date: Mon, 2 Sep 2024 17:06:10 -0300
Subject: [PATCH 030/170] test: create tests for omnichannel queue management
 (#33149)

---
 ...ichannel-livechat-queue-management.spec.ts | 120 ++++++++++++++++++
 .../e2e/page-objects/omnichannel-livechat.ts  |  13 ++
 2 files changed, 133 insertions(+)
 create mode 100644 apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts
new file mode 100644
index 000000000000..ee91c49bfb16
--- /dev/null
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts
@@ -0,0 +1,120 @@
+import { createFakeVisitor } from '../../mocks/data';
+import { IS_EE } from '../config/constants';
+import { createAuxContext } from '../fixtures/createAuxContext';
+import { Users } from '../fixtures/userStates';
+import { HomeOmnichannel, OmnichannelLiveChat } from '../page-objects';
+import { test, expect } from '../utils/test';
+
+const firstVisitor = createFakeVisitor();
+
+const secondVisitor = createFakeVisitor();
+
+test.use({ storageState: Users.user1.state });
+
+test.describe('OC - Livechat - Queue Management', () => {
+	test.skip(!IS_EE, 'Enterprise Only');
+
+	let poHomeOmnichannel: HomeOmnichannel;
+	let poLiveChat: OmnichannelLiveChat;
+
+	const waitingQueueMessage = 'This is a message from Waiting Queue';
+	const queuePosition1 = 'Your spot is #1';
+	const queuePosition2 = 'Your spot is #2';
+
+	test.beforeAll(async ({ api, browser }) => {
+		await Promise.all([
+			api.post('/settings/Livechat_Routing_Method', { value: 'Manual_Selection' }),
+			api.post('/settings/Livechat_waiting_queue', { value: true }),
+			api.post('/settings/Livechat_waiting_queue_message', { value: waitingQueueMessage }),
+			api.post('/livechat/users/agent', { username: 'user1' }),
+		]);
+
+		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		poHomeOmnichannel = new HomeOmnichannel(omniPage);
+	});
+
+	test.beforeEach(async ({ browser, api }) => {
+		const context = await browser.newContext();
+		const page2 = await context.newPage();
+
+		poLiveChat = new OmnichannelLiveChat(page2, api);
+		await poLiveChat.page.goto('/livechat');
+	});
+
+	test.afterAll(async ({ api }) => {
+		await Promise.all([
+			api.post('/settings/Livechat_Routing_Method', { value: 'Auto_Selection' }),
+			api.post('/settings/Livechat_waiting_queue', { value: false }),
+			api.post('/settings/Livechat_waiting_queue_message', { value: '' }),
+			api.delete('/livechat/users/agent/user1'),
+		]);
+		await poHomeOmnichannel.page.close();
+	});
+
+	test.afterEach(async () => {
+		await poLiveChat.closeChat();
+		await poLiveChat.page.close();
+	});
+
+	test('OC - Queue Management - Waiting Queue Message enabled', async () => {
+		await test.step('should start livechat session', async () => {
+			await poLiveChat.openAnyLiveChatAndSendMessage({
+				liveChatUser: firstVisitor,
+				message: 'Test message',
+				isOffline: false,
+			});
+		});
+		await test.step('expect to receive Waiting Queue message on chat', async () => {
+			await expect(poLiveChat.page.locator(`div >> text=${waitingQueueMessage}`)).toBeVisible();
+		});
+	});
+
+	test.describe('OC - Queue Management - Update Queue Position', () => {
+		let poLiveChat2: OmnichannelLiveChat;
+
+		test.beforeEach(async ({ browser, api }) => {
+			const context = await browser.newContext();
+			const page = await context.newPage();
+			poLiveChat2 = new OmnichannelLiveChat(page, api);
+			await poLiveChat2.page.goto('/livechat');
+		});
+
+		test.afterEach(async () => {
+			await poLiveChat2.closeChat();
+			await poLiveChat2.page.close();
+		});
+
+		test('Update user position on Queue', async () => {
+			await test.step('should start secondary livechat session', async () => {
+				await poLiveChat2.openAnyLiveChatAndSendMessage({
+					liveChatUser: secondVisitor,
+					message: 'Test message',
+					isOffline: false,
+				});
+			});
+
+			await test.step('should start primary livechat session', async () => {
+				await poLiveChat.openAnyLiveChatAndSendMessage({
+					liveChatUser: firstVisitor,
+					message: 'Test message',
+					isOffline: false,
+				});
+			});
+
+			await test.step('should verify the queue position of the primary user', async () => {
+				await expect(poLiveChat.page.locator(`div[role='alert'] >> text=${queuePosition2}`)).toBeVisible();
+			});
+
+			await test.step('should allow the agent to take the secondary user chat', async () => {
+				await poHomeOmnichannel.sidenav.getQueuedChat(secondVisitor.name).click();
+				await expect(poHomeOmnichannel.content.btnTakeChat).toBeVisible();
+				await poHomeOmnichannel.content.btnTakeChat.click();
+				await expect(poHomeOmnichannel.content.lastSystemMessageBody).toHaveText('joined the channel');
+			});
+
+			await test.step('expect the queue position of the primary user to update after the secondary users chat is taken', async () => {
+				await expect(poLiveChat.page.locator(`div[role='alert'] >> text=${queuePosition1}`)).toBeVisible();
+			});
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
index 330fc981237f..e52ae45782c8 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
@@ -88,6 +88,19 @@ export class OmnichannelLiveChat {
 		await this.btnNewChat.click();
 	}
 
+	async openAnyLiveChatAndSendMessage(params: {
+		liveChatUser: { name: string; email: string };
+		message: string;
+		isOffline?: boolean;
+		department?: string;
+	}): Promise<void> {
+		const { liveChatUser, message, isOffline, department } = params;
+		await this.openAnyLiveChat();
+		await this.sendMessage(liveChatUser, isOffline, department);
+		await this.onlineAgentMessage.fill(message);
+		await this.btnSendMessageToOnlineAgent.click();
+	}
+
 	unreadMessagesBadge(count: number): Locator {
 		const name = count === 1 ? `${count} unread message` : `${count} unread messages`;
 

From a71352063b906848010359ad8f005b43d5d1cfe2 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 2 Sep 2024 19:24:23 -0300
Subject: [PATCH 031/170] regression: fix subscription counter for DMs (#33200)

---
 apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
index 7551cabb6e63..7d727ab49685 100644
--- a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
+++ b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
@@ -111,7 +111,7 @@ async function updateUsersSubscriptions(message: IMessage, room: IRoom): Promise
 		roomId: room._id,
 		uidsExclude: [message.u._id],
 		uidsInclude: userIds,
-		onlyRead: !toAll && !toHere,
+		onlyRead: !toAll && !toHere && unreadCount !== 'all_messages',
 	}).forEach((sub) => {
 		const hasUserMention = userIds.includes(sub.u._id);
 		const shouldIncUnread = hasUserMention || toAll || toHere || unreadCount === 'all_messages';

From 304bc6d5ad7be7d1371190277abd53cd96a17a15 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 2 Sep 2024 21:49:40 -0300
Subject: [PATCH 032/170] chore: improve omni queue metrics query (#33159)

---
 .changeset/cool-actors-sin.md                 |   5 +
 .../meteor/server/models/raw/LivechatRooms.ts |  80 +++--
 .../tests/end-to-end/api/livechat/00-rooms.ts |   4 +
 .../tests/end-to-end/api/livechat/07-queue.ts | 322 +++++++++++++++++-
 4 files changed, 375 insertions(+), 36 deletions(-)
 create mode 100644 .changeset/cool-actors-sin.md

diff --git a/.changeset/cool-actors-sin.md b/.changeset/cool-actors-sin.md
new file mode 100644
index 000000000000..e53b8f136ebb
--- /dev/null
+++ b/.changeset/cool-actors-sin.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Improves Omnichannel queue page performance
diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
index b01d7e62c5ff..ae03d67251ec 100644
--- a/apps/meteor/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -91,22 +91,31 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		options?: { offset?: number; count?: number; sort?: { [k: string]: number } };
 	}) {
 		const match: Document = { $match: { t: 'l', open: true, servedBy: { $exists: true } } };
-		const matchUsers: Document = { $match: {} };
+
 		if (departmentId && departmentId !== 'undefined') {
 			match.$match.departmentId = departmentId;
 		}
-		if (agentId) {
-			matchUsers.$match['user._id'] = agentId;
-		}
-		if (!includeOfflineAgents) {
-			matchUsers.$match['user.status'] = { $ne: 'offline' };
-			matchUsers.$match['user.statusLivechat'] = { $eq: 'available' };
-		}
+
 		const departmentsLookup = {
 			$lookup: {
 				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
+				let: {
+					deptId: '$departmentId',
+				},
+				pipeline: [
+					{
+						$match: {
+							$expr: {
+								$eq: ['$_id', '$$deptId'],
+							},
+						},
+					},
+					{
+						$project: {
+							name: 1,
+						},
+					},
+				],
 				as: 'departments',
 			},
 		};
@@ -116,27 +125,40 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 				preserveNullAndEmptyArrays: true,
 			},
 		};
-		const departmentsGroup = {
-			$group: {
-				_id: {
-					departmentId: '$departmentId',
-					name: '$departments.name',
-					room: '$$ROOT',
-				},
-			},
-		};
+
 		const usersLookup = {
 			$lookup: {
 				from: 'users',
-				localField: '_id.room.servedBy._id',
-				foreignField: '_id',
+				let: {
+					servedById: '$servedBy._id',
+				},
+				pipeline: [
+					{
+						$match: {
+							$expr: {
+								$eq: ['$_id', '$$servedById'],
+							},
+							...(!includeOfflineAgents && {
+								status: { $ne: 'offline' },
+								statusLivechat: 'available',
+							}),
+							...(agentId && { _id: agentId }),
+						},
+					},
+					{
+						$project: {
+							_id: 1,
+							username: 1,
+							status: 1,
+						},
+					},
+				],
 				as: 'user',
 			},
 		};
 		const usersUnwind = {
 			$unwind: {
 				path: '$user',
-				preserveNullAndEmptyArrays: true,
 			},
 		};
 		const usersGroup = {
@@ -145,8 +167,8 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 					userId: '$user._id',
 					username: '$user.username',
 					status: '$user.status',
-					departmentId: '$_id.departmentId',
-					departmentName: '$_id.name',
+					departmentId: '$departmentId',
+					departmentName: '$departments.name',
 				},
 				chats: { $sum: 1 },
 			},
@@ -160,16 +182,13 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 					status: '$_id.status',
 				},
 				department: {
-					_id: { $ifNull: ['$_id.departmentId', null] },
-					name: { $ifNull: ['$_id.departmentName', null] },
+					_id: '$_id.departmentId',
+					name: '$_id.departmentName',
 				},
 				chats: 1,
 			},
 		};
-		const firstParams = [match, departmentsLookup, departmentsUnwind, departmentsGroup, usersLookup, usersUnwind];
-		if (Object.keys(matchUsers.$match)) {
-			firstParams.push(matchUsers);
-		}
+		const firstParams = [match, departmentsLookup, departmentsUnwind, usersLookup, usersUnwind];
 		const sort: Document = { $sort: options.sort || { chats: -1 } };
 		const pagination = [sort];
 
@@ -188,6 +207,7 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		};
 
 		const params = [...firstParams, usersGroup, project, facet];
+
 		return this.col.aggregate(params, { readPreference: readSecondaryPreferred(), allowDiskUse: true }).toArray();
 	}
 
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index f3ae205c7090..7142725a1d99 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -2468,6 +2468,10 @@ describe('LIVECHAT - rooms', () => {
 			await updateSetting('Unread_Count_Omni', 'all_messages');
 		});
 
+		after(async () => {
+			await deleteDepartment(departmentWithAgent.department._id);
+		});
+
 		it('it should prepare the required data for further tests', async () => {
 			departmentWithAgent = await createDepartmentWithAnOnlineAgent();
 			visitor = await createVisitor(departmentWithAgent.department._id);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
index 1d5ef110d308..4e2128b682a6 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
@@ -1,27 +1,58 @@
 /* eslint-env mocha */
 
+import { faker } from '@faker-js/faker';
+import type { ILivechatDepartment, ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
+import { createDepartmentWithAnOnlineAgent, deleteDepartment, addOrRemoveAgentFromDepartment } from '../../../data/livechat/department';
+import { createVisitor, createLivechatRoom, closeOmnichannelRoom, deleteVisitor } from '../../../data/livechat/rooms';
+import { createAnOnlineAgent } from '../../../data/livechat/users';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { deleteUser } from '../../../data/users.helper';
+import { IS_EE } from '../../../e2e/config/constants';
+
+const cleanupRooms = async () => {
+	const response = await request.get(api('livechat/queue')).set(credentials).expect('Content-Type', 'application/json').expect(200);
+
+	const { queue } = response.body;
+
+	for await (const item of queue) {
+		const {
+			body: { rooms },
+		} = await request.get(api('livechat/rooms')).query({ 'agents[]': item.user._id }).set(credentials);
+
+		await Promise.all(
+			rooms.map((room: IOmnichannelRoom) =>
+				request.post(api('livechat/room.closeByUser')).set(credentials).send({ rid: room._id, comment: faker.lorem.sentence() }),
+			),
+		);
+	}
+};
 
 describe('LIVECHAT - Queue', () => {
 	before((done) => getCredentials(done));
 
-	before(async () => {
-		await updateSetting('Livechat_enabled', true);
-	});
+	before(async () =>
+		Promise.all([
+			updateSetting('Livechat_enabled', true),
+			updateSetting('Livechat_Routing_Method', 'Auto_Selection'),
+
+			// this cleanup is required since previous tests left the DB dirty
+			cleanupRooms(),
+		]),
+	);
 
 	describe('livechat/queue', () => {
 		it('should return an "unauthorized error" when the user does not have the necessary permission', async () => {
 			await updatePermission('view-l-room', []);
 			await request.get(api('livechat/queue')).set(credentials).expect('Content-Type', 'application/json').expect(403);
+			await updatePermission('view-l-room', ['admin']);
 		});
 
 		it('should return an array of queued metrics', async () => {
-			await updatePermission('view-l-room', ['admin']);
 			await request
 				.get(api('livechat/queue'))
 				.set(credentials)
@@ -36,7 +67,6 @@ describe('LIVECHAT - Queue', () => {
 				});
 		});
 		it('should return an array of queued metrics even requested with count and offset params', async () => {
-			await updatePermission('view-l-room', ['admin']);
 			await request
 				.get(api('livechat/queue'))
 				.set(credentials)
@@ -55,4 +85,284 @@ describe('LIVECHAT - Queue', () => {
 				});
 		});
 	});
+
+	describe('queue position', () => {
+		let agent1: { user: IUser };
+		let agent2: { user: IUser };
+		let agent3: { user: IUser };
+		let deptd1: ILivechatDepartment;
+		let deptd2: ILivechatDepartment;
+
+		const roomsToClose: IOmnichannelRoom[] = [];
+		const visitors: ILivechatVisitor[] = [];
+		const usersToDelete: IUser[] = [];
+
+		before(async () => {
+			const { department, agent } = await createDepartmentWithAnOnlineAgent();
+
+			deptd1 = department;
+			agent1 = agent;
+
+			usersToDelete.push(agent.user);
+
+			const newVisitor = await createVisitor(deptd1._id);
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+		});
+
+		after(async () => {
+			await deleteDepartment(deptd1._id);
+
+			if (deptd2) {
+				await deleteDepartment(deptd2._id);
+			}
+
+			await Promise.all(roomsToClose.map((room) => closeOmnichannelRoom(room._id)));
+			await Promise.all(visitors.map((visitor) => deleteVisitor(visitor.token)));
+			await Promise.all(usersToDelete.map((user) => deleteUser(user)));
+		});
+
+		it('should have one item in the queue', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(1);
+
+					const [queue] = res.body.queue;
+
+					expect(queue).to.have.property('chats', 1);
+					expect(queue).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should return empty results when filtering by another agent', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ agentId: 'another-agent' })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total', 0);
+					expect(res.body).to.have.property('count', 0);
+					expect(res.body.queue).to.be.an('array').of.length(0);
+				});
+		});
+
+		it('should increase chats when a new room for same department is created', async () => {
+			const newVisitor = await createVisitor();
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(1);
+
+					const [queue] = res.body.queue;
+
+					expect(queue).to.have.property('chats', 2);
+					expect(queue).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should have two items when create room for another agent', async () => {
+			const { user } = await createAnOnlineAgent();
+			await addOrRemoveAgentFromDepartment(deptd1._id, { agentId: user._id, username: user.username }, true);
+
+			agent2 = { user };
+
+			usersToDelete.push(user);
+
+			const newVisitor = await createVisitor(deptd1._id);
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(2);
+
+					const [queue1, queue2] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 2);
+					expect(queue1).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+
+					expect(queue2).to.have.property('chats', 1);
+					expect(queue2).to.have.nested.property('user._id', agent2.user._id);
+					expect(queue2).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should be able to filter for second agent only', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ agentId: agent2.user._id })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(1);
+
+					const [queue1] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 1);
+					expect(queue1).to.have.nested.property('user._id', agent2.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should return empty if filter for a department without chats', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ departmentId: 'no-chats' })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total', 0);
+					expect(res.body).to.have.property('count', 0);
+					expect(res.body.queue).to.be.an('array').of.length(0);
+				});
+		});
+
+		it('should be able to filter for first department only', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ departmentId: deptd1._id })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(2);
+
+					const [queue1] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 2);
+					expect(queue1).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		(IS_EE ? it : it.skip)('should have three items when create room for another department', async () => {
+			const { department: dep2, agent: ag3 } = await createDepartmentWithAnOnlineAgent();
+
+			agent3 = ag3;
+
+			usersToDelete.push(ag3.user);
+
+			deptd2 = dep2;
+
+			const newVisitor = await createVisitor(deptd2._id);
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(3);
+
+					const [queue1, queue2, queue3] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 2);
+					expect(queue1).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+
+					expect(queue2).to.have.property('chats', 1);
+					expect(queue3).to.have.property('chats', 1);
+				});
+		});
+
+		(IS_EE ? it : it.skip)('should change the order when second department gets more rooms', async () => {
+			const newVisitor1 = await createVisitor(deptd2._id);
+			const newRoom1 = await createLivechatRoom(newVisitor1.token);
+
+			roomsToClose.push(newRoom1);
+			visitors.push(newVisitor1);
+
+			const newVisitor2 = await createVisitor(deptd2._id);
+			const newRoom2 = await createLivechatRoom(newVisitor2.token);
+
+			roomsToClose.push(newRoom2);
+			visitors.push(newVisitor2);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(3);
+
+					const [queue1, queue2, queue3] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 3);
+					expect(queue1).to.have.nested.property('user._id', agent3.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd2._id);
+
+					expect(queue2).to.have.property('chats', 2);
+					expect(queue2).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue2).to.have.nested.property('department._id', deptd1._id);
+
+					expect(queue3).to.have.property('chats', 1);
+					expect(queue3).to.have.nested.property('user._id', agent2.user._id);
+					expect(queue3).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+	});
 });

From 2d7f6dc3e845fd29587cf012bce601423ff1f2ef Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 2 Sep 2024 21:49:40 -0300
Subject: [PATCH 033/170] chore: improve omni queue metrics query (#33159)

---
 .changeset/cool-actors-sin.md                 |   5 +
 .../meteor/server/models/raw/LivechatRooms.ts |  80 +++--
 .../tests/end-to-end/api/livechat/00-rooms.ts |   4 +
 .../tests/end-to-end/api/livechat/07-queue.ts | 322 +++++++++++++++++-
 4 files changed, 375 insertions(+), 36 deletions(-)
 create mode 100644 .changeset/cool-actors-sin.md

diff --git a/.changeset/cool-actors-sin.md b/.changeset/cool-actors-sin.md
new file mode 100644
index 000000000000..e53b8f136ebb
--- /dev/null
+++ b/.changeset/cool-actors-sin.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Improves Omnichannel queue page performance
diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
index b01d7e62c5ff..ae03d67251ec 100644
--- a/apps/meteor/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -91,22 +91,31 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		options?: { offset?: number; count?: number; sort?: { [k: string]: number } };
 	}) {
 		const match: Document = { $match: { t: 'l', open: true, servedBy: { $exists: true } } };
-		const matchUsers: Document = { $match: {} };
+
 		if (departmentId && departmentId !== 'undefined') {
 			match.$match.departmentId = departmentId;
 		}
-		if (agentId) {
-			matchUsers.$match['user._id'] = agentId;
-		}
-		if (!includeOfflineAgents) {
-			matchUsers.$match['user.status'] = { $ne: 'offline' };
-			matchUsers.$match['user.statusLivechat'] = { $eq: 'available' };
-		}
+
 		const departmentsLookup = {
 			$lookup: {
 				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
+				let: {
+					deptId: '$departmentId',
+				},
+				pipeline: [
+					{
+						$match: {
+							$expr: {
+								$eq: ['$_id', '$$deptId'],
+							},
+						},
+					},
+					{
+						$project: {
+							name: 1,
+						},
+					},
+				],
 				as: 'departments',
 			},
 		};
@@ -116,27 +125,40 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 				preserveNullAndEmptyArrays: true,
 			},
 		};
-		const departmentsGroup = {
-			$group: {
-				_id: {
-					departmentId: '$departmentId',
-					name: '$departments.name',
-					room: '$$ROOT',
-				},
-			},
-		};
+
 		const usersLookup = {
 			$lookup: {
 				from: 'users',
-				localField: '_id.room.servedBy._id',
-				foreignField: '_id',
+				let: {
+					servedById: '$servedBy._id',
+				},
+				pipeline: [
+					{
+						$match: {
+							$expr: {
+								$eq: ['$_id', '$$servedById'],
+							},
+							...(!includeOfflineAgents && {
+								status: { $ne: 'offline' },
+								statusLivechat: 'available',
+							}),
+							...(agentId && { _id: agentId }),
+						},
+					},
+					{
+						$project: {
+							_id: 1,
+							username: 1,
+							status: 1,
+						},
+					},
+				],
 				as: 'user',
 			},
 		};
 		const usersUnwind = {
 			$unwind: {
 				path: '$user',
-				preserveNullAndEmptyArrays: true,
 			},
 		};
 		const usersGroup = {
@@ -145,8 +167,8 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 					userId: '$user._id',
 					username: '$user.username',
 					status: '$user.status',
-					departmentId: '$_id.departmentId',
-					departmentName: '$_id.name',
+					departmentId: '$departmentId',
+					departmentName: '$departments.name',
 				},
 				chats: { $sum: 1 },
 			},
@@ -160,16 +182,13 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 					status: '$_id.status',
 				},
 				department: {
-					_id: { $ifNull: ['$_id.departmentId', null] },
-					name: { $ifNull: ['$_id.departmentName', null] },
+					_id: '$_id.departmentId',
+					name: '$_id.departmentName',
 				},
 				chats: 1,
 			},
 		};
-		const firstParams = [match, departmentsLookup, departmentsUnwind, departmentsGroup, usersLookup, usersUnwind];
-		if (Object.keys(matchUsers.$match)) {
-			firstParams.push(matchUsers);
-		}
+		const firstParams = [match, departmentsLookup, departmentsUnwind, usersLookup, usersUnwind];
 		const sort: Document = { $sort: options.sort || { chats: -1 } };
 		const pagination = [sort];
 
@@ -188,6 +207,7 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		};
 
 		const params = [...firstParams, usersGroup, project, facet];
+
 		return this.col.aggregate(params, { readPreference: readSecondaryPreferred(), allowDiskUse: true }).toArray();
 	}
 
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index f3ae205c7090..7142725a1d99 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -2468,6 +2468,10 @@ describe('LIVECHAT - rooms', () => {
 			await updateSetting('Unread_Count_Omni', 'all_messages');
 		});
 
+		after(async () => {
+			await deleteDepartment(departmentWithAgent.department._id);
+		});
+
 		it('it should prepare the required data for further tests', async () => {
 			departmentWithAgent = await createDepartmentWithAnOnlineAgent();
 			visitor = await createVisitor(departmentWithAgent.department._id);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
index 1d5ef110d308..4e2128b682a6 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
@@ -1,27 +1,58 @@
 /* eslint-env mocha */
 
+import { faker } from '@faker-js/faker';
+import type { ILivechatDepartment, ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
+import { createDepartmentWithAnOnlineAgent, deleteDepartment, addOrRemoveAgentFromDepartment } from '../../../data/livechat/department';
+import { createVisitor, createLivechatRoom, closeOmnichannelRoom, deleteVisitor } from '../../../data/livechat/rooms';
+import { createAnOnlineAgent } from '../../../data/livechat/users';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { deleteUser } from '../../../data/users.helper';
+import { IS_EE } from '../../../e2e/config/constants';
+
+const cleanupRooms = async () => {
+	const response = await request.get(api('livechat/queue')).set(credentials).expect('Content-Type', 'application/json').expect(200);
+
+	const { queue } = response.body;
+
+	for await (const item of queue) {
+		const {
+			body: { rooms },
+		} = await request.get(api('livechat/rooms')).query({ 'agents[]': item.user._id }).set(credentials);
+
+		await Promise.all(
+			rooms.map((room: IOmnichannelRoom) =>
+				request.post(api('livechat/room.closeByUser')).set(credentials).send({ rid: room._id, comment: faker.lorem.sentence() }),
+			),
+		);
+	}
+};
 
 describe('LIVECHAT - Queue', () => {
 	before((done) => getCredentials(done));
 
-	before(async () => {
-		await updateSetting('Livechat_enabled', true);
-	});
+	before(async () =>
+		Promise.all([
+			updateSetting('Livechat_enabled', true),
+			updateSetting('Livechat_Routing_Method', 'Auto_Selection'),
+
+			// this cleanup is required since previous tests left the DB dirty
+			cleanupRooms(),
+		]),
+	);
 
 	describe('livechat/queue', () => {
 		it('should return an "unauthorized error" when the user does not have the necessary permission', async () => {
 			await updatePermission('view-l-room', []);
 			await request.get(api('livechat/queue')).set(credentials).expect('Content-Type', 'application/json').expect(403);
+			await updatePermission('view-l-room', ['admin']);
 		});
 
 		it('should return an array of queued metrics', async () => {
-			await updatePermission('view-l-room', ['admin']);
 			await request
 				.get(api('livechat/queue'))
 				.set(credentials)
@@ -36,7 +67,6 @@ describe('LIVECHAT - Queue', () => {
 				});
 		});
 		it('should return an array of queued metrics even requested with count and offset params', async () => {
-			await updatePermission('view-l-room', ['admin']);
 			await request
 				.get(api('livechat/queue'))
 				.set(credentials)
@@ -55,4 +85,284 @@ describe('LIVECHAT - Queue', () => {
 				});
 		});
 	});
+
+	describe('queue position', () => {
+		let agent1: { user: IUser };
+		let agent2: { user: IUser };
+		let agent3: { user: IUser };
+		let deptd1: ILivechatDepartment;
+		let deptd2: ILivechatDepartment;
+
+		const roomsToClose: IOmnichannelRoom[] = [];
+		const visitors: ILivechatVisitor[] = [];
+		const usersToDelete: IUser[] = [];
+
+		before(async () => {
+			const { department, agent } = await createDepartmentWithAnOnlineAgent();
+
+			deptd1 = department;
+			agent1 = agent;
+
+			usersToDelete.push(agent.user);
+
+			const newVisitor = await createVisitor(deptd1._id);
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+		});
+
+		after(async () => {
+			await deleteDepartment(deptd1._id);
+
+			if (deptd2) {
+				await deleteDepartment(deptd2._id);
+			}
+
+			await Promise.all(roomsToClose.map((room) => closeOmnichannelRoom(room._id)));
+			await Promise.all(visitors.map((visitor) => deleteVisitor(visitor.token)));
+			await Promise.all(usersToDelete.map((user) => deleteUser(user)));
+		});
+
+		it('should have one item in the queue', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(1);
+
+					const [queue] = res.body.queue;
+
+					expect(queue).to.have.property('chats', 1);
+					expect(queue).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should return empty results when filtering by another agent', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ agentId: 'another-agent' })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total', 0);
+					expect(res.body).to.have.property('count', 0);
+					expect(res.body.queue).to.be.an('array').of.length(0);
+				});
+		});
+
+		it('should increase chats when a new room for same department is created', async () => {
+			const newVisitor = await createVisitor();
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(1);
+
+					const [queue] = res.body.queue;
+
+					expect(queue).to.have.property('chats', 2);
+					expect(queue).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should have two items when create room for another agent', async () => {
+			const { user } = await createAnOnlineAgent();
+			await addOrRemoveAgentFromDepartment(deptd1._id, { agentId: user._id, username: user.username }, true);
+
+			agent2 = { user };
+
+			usersToDelete.push(user);
+
+			const newVisitor = await createVisitor(deptd1._id);
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(2);
+
+					const [queue1, queue2] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 2);
+					expect(queue1).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+
+					expect(queue2).to.have.property('chats', 1);
+					expect(queue2).to.have.nested.property('user._id', agent2.user._id);
+					expect(queue2).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should be able to filter for second agent only', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ agentId: agent2.user._id })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(1);
+
+					const [queue1] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 1);
+					expect(queue1).to.have.nested.property('user._id', agent2.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		it('should return empty if filter for a department without chats', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ departmentId: 'no-chats' })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total', 0);
+					expect(res.body).to.have.property('count', 0);
+					expect(res.body.queue).to.be.an('array').of.length(0);
+				});
+		});
+
+		it('should be able to filter for first department only', async () => {
+			await request
+				.get(api('livechat/queue'))
+				.query({ departmentId: deptd1._id })
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(2);
+
+					const [queue1] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 2);
+					expect(queue1).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+
+		(IS_EE ? it : it.skip)('should have three items when create room for another department', async () => {
+			const { department: dep2, agent: ag3 } = await createDepartmentWithAnOnlineAgent();
+
+			agent3 = ag3;
+
+			usersToDelete.push(ag3.user);
+
+			deptd2 = dep2;
+
+			const newVisitor = await createVisitor(deptd2._id);
+			const newRoom = await createLivechatRoom(newVisitor.token);
+
+			roomsToClose.push(newRoom);
+			visitors.push(newVisitor);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(3);
+
+					const [queue1, queue2, queue3] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 2);
+					expect(queue1).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd1._id);
+
+					expect(queue2).to.have.property('chats', 1);
+					expect(queue3).to.have.property('chats', 1);
+				});
+		});
+
+		(IS_EE ? it : it.skip)('should change the order when second department gets more rooms', async () => {
+			const newVisitor1 = await createVisitor(deptd2._id);
+			const newRoom1 = await createLivechatRoom(newVisitor1.token);
+
+			roomsToClose.push(newRoom1);
+			visitors.push(newVisitor1);
+
+			const newVisitor2 = await createVisitor(deptd2._id);
+			const newRoom2 = await createLivechatRoom(newVisitor2.token);
+
+			roomsToClose.push(newRoom2);
+			visitors.push(newVisitor2);
+
+			await request
+				.get(api('livechat/queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('count');
+					expect(res.body.queue).to.be.an('array').of.length(3);
+
+					const [queue1, queue2, queue3] = res.body.queue;
+
+					expect(queue1).to.have.property('chats', 3);
+					expect(queue1).to.have.nested.property('user._id', agent3.user._id);
+					expect(queue1).to.have.nested.property('department._id', deptd2._id);
+
+					expect(queue2).to.have.property('chats', 2);
+					expect(queue2).to.have.nested.property('user._id', agent1.user._id);
+					expect(queue2).to.have.nested.property('department._id', deptd1._id);
+
+					expect(queue3).to.have.property('chats', 1);
+					expect(queue3).to.have.nested.property('user._id', agent2.user._id);
+					expect(queue3).to.have.nested.property('department._id', deptd1._id);
+				});
+		});
+	});
 });

From 2aa343d79deb8385f45ef0b7c49ed25c21fc440c Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 3 Sep 2024 01:14:30 +0000
Subject: [PATCH 034/170] Release 6.12.0-rc.3

[no ci]
---
 .changeset/bump-patch-1725326060827.md        |  5 +++
 .changeset/pre.json                           |  2 ++
 apps/meteor/CHANGELOG.md                      | 34 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 +++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 13 +++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 +++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 +++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 +++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/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/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               |  9 +++++
 packages/ui-client/package.json               |  4 +--
 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/uikit-playground/CHANGELOG.md        | 11 ++++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 20 +++++------
 69 files changed, 425 insertions(+), 54 deletions(-)
 create mode 100644 .changeset/bump-patch-1725326060827.md

diff --git a/.changeset/bump-patch-1725326060827.md b/.changeset/bump-patch-1725326060827.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1725326060827.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 b16c34f330cd..947aecb92f25 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -67,7 +67,9 @@
     "brown-crabs-chew",
     "bump-patch-1724712948901",
     "bump-patch-1724977971712",
+    "bump-patch-1725326060827",
     "calm-tigers-peel",
+    "cool-actors-sin",
     "cool-rocks-remember",
     "empty-toys-smell",
     "fast-lobsters-turn",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 862232d77787..2f6758c0dd90 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.3
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33159](https://github.com/RocketChat/Rocket.Chat/pull/33159)) Improves Omnichannel queue page performance
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/license@0.2.5-rc.3
+  - @rocket.chat/omnichannel-services@0.3.2-rc.3
+  - @rocket.chat/pdf-worker@0.2.2-rc.3
+  - @rocket.chat/presence@0.2.5-rc.3
+  - @rocket.chat/api-client@0.2.5-rc.3
+  - @rocket.chat/apps@0.1.5-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/cron@0.1.5-rc.3
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.3
+  - @rocket.chat/gazzodown@10.0.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.2-rc.3
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.3
+  - @rocket.chat/ui-client@10.0.0-rc.3
+  - @rocket.chat/ui-video-conf@10.0.0-rc.3
+  - @rocket.chat/web-ui-registration@10.0.0-rc.3
+  - @rocket.chat/instance-status@0.1.5-rc.3
+  </details>
+
 ## 6.12.0-rc.2
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index b88a04d76851..1bca0bac5765 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.2"
+	"version": "6.12.0-rc.3"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 1d6a25b73776..abf8d5228b29 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 1.3.2-rc.2
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 8d9679014361..83c091192c61 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": "1.3.2-rc.2",
+	"version": "1.3.2-rc.3",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index ab76940fee8a..f81fca6618aa 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": "6.12.0-rc.2",
+	"version": "6.12.0-rc.3",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 630cb593da8a..38c443cf3a4b 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.4.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 5a4b896658f0..536cef003036 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.5-rc.2",
+	"version": "0.4.5-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 1c86327bd7c0..45d15fd042a5 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.4.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index f814e9e423ab..1a71691c0a14 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.5-rc.2",
+	"version": "0.4.5-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 a8f4bf3e076b..3a5f74b87852 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  - @rocket.chat/instance-status@0.1.5-rc.3
+  </details>
+
 ## 0.3.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 25203f96d8c3..38581e470022 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.5-rc.2",
+	"version": "0.3.5-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 fa7eb91835b5..7be9afcd9559 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.2-rc.3
+  - @rocket.chat/pdf-worker@0.2.2-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.4.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 80e7c5456bd6..404a7aca3441 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.5-rc.2",
+	"version": "0.4.5-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 80a6bc702eff..30a99e7b8e55 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/presence@0.2.5-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.4.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 83e816c9f0b4..6bb81a60e6cb 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.5-rc.2",
+	"version": "0.4.5-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 6e075a3b50f4..71d6c295cb38 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.2-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.4.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 0c8281eaec2b..335e656f4f8a 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.5-rc.2",
+	"version": "0.4.5-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 7a6d5fa93c67..392d9a2e9b9b 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.4.5-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 125ba400991c..d3b12e730262 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.5-rc.2",
+	"version": "0.4.5-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 a3fb453b888f..3c8436ca82e6 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  </details>
+
 ## 0.2.5-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index d357d2e85243..2a86ce9f12a7 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.5-rc.2",
+	"version": "0.2.5-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 51dd515e5a3a..6ca6e78c68ba 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.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/pdf-worker@0.2.2-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.3.2-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 676576e42b3c..91937d884f5d 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.2-rc.2",
+	"version": "0.3.2-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 f9881b0273ff..d050ccf77ea0 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.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  </details>
+
 ## 0.2.2-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 8724b3d4d6e1..0405b1530dc8 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.2-rc.2",
+	"version": "0.2.2-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index f211e5812b68..989426b15d05 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/core-services@0.6.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.2.5-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 530d53767c7a..eab9e4050f3a 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.5-rc.2",
+	"version": "0.2.5-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index fd4f9abcfc2f..6012e87ef2ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.2",
+	"version": "6.12.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 3694ba19c009..a80e5a7e0900 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  </details>
+
 ## 0.2.5-rc.2
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index d2f203161cb7..68b249942c1f 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.5-rc.2",
+	"version": "0.2.5-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index bc6dd6e55408..3e6c5ef39e4f 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  </details>
+
 ## 0.1.5-rc.2
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 7b23ba55bcf9..7919ee2f3f6f 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.5-rc.2",
+	"version": "0.1.5-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 8f62112c8922..bb87268b8e8f 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.6.0-rc.2
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index a4e8ada23f19..d6db1dfdc31f 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.2",
+	"version": "0.6.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index f9bb8458f37a..bfa83d392816 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.3
+
 ## 6.12.0-rc.2
 
 ## 6.12.0-rc.1
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index eb9c2a47866a..43cbc3a6292f 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.2",
+	"version": "6.12.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 6f684940f3c1..a4bc7615db55 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.1.5-rc.2
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 78e1579405ec..7d243266bc25 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.5-rc.2",
+	"version": "0.1.5-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 9dcb8a73d04c..0ec02a88ff69 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/api-client@0.2.5-rc.3
+  </details>
+
 ## 0.3.5-rc.2
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 89db267343fe..2484f6b3b99f 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.5-rc.2",
+	"version": "0.3.5-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 30c34bf191b7..9da6098482ea 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 10.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/gazzodown@10.0.0-rc.3
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  - @rocket.chat/ui-avatar@6.0.0-rc.3
+  - @rocket.chat/ui-video-conf@10.0.0-rc.3
+  </details>
+
 ## 10.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 2dcfab40ce11..cbc2e9c29d62 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.2",
+  "version": "10.0.0-rc.3",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.2",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.2",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.3",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.3",
     "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.2",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.3",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index bfdcc3cf881f..4c2f98d560b1 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  - @rocket.chat/ui-client@10.0.0-rc.3
+  </details>
+
 ## 10.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 64f33c6bbfd1..2716d57f0250 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.2",
+	"version": "10.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
+		"@rocket.chat/ui-client": "10.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index a654321650cf..0be6adf6cc59 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.2-rc.3
+  </details>
+
 ## 0.1.5-rc.2
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 0e385002d153..04683fad8ce4 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.5-rc.2",
+	"version": "0.1.5-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index c4b6702ce273..9df991bae547 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.3
+  </details>
+
 ## 1.19.2-rc.2
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 8204d6478f4b..6112165c723e 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.2-rc.2",
+	"version": "1.19.2-rc.3",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 1e52e3e6f005..566249984b5f 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  </details>
+
 ## 0.7.0-rc.2
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 524d012e41a5..bb45b3a08ba6 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.2",
+	"version": "0.7.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index f7995184602a..206a949666e0 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.3
+  </details>
+
 ## 0.2.2-rc.2
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 4f32e1edbffa..cd7f2c743876 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.2-rc.2",
+	"version": "0.2.2-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 fab8b499954d..a850f0e0ec90 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  </details>
+
 ## 6.12.0-rc.2
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index c11dc05cd6c2..c248c18267f9 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.2",
+	"version": "6.12.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 52845ddff3be..dc5e70097220 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  </details>
+
 ## 6.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index b34b9e4891f4..78d9ffe249d3 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.2",
+	"version": "6.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index a3d0b59dc6d9..364b71169f1f 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  </details>
+
 ## 10.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 13119376a79b..025db00782a7 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.2",
+	"version": "10.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 37c1e0a5431c..f311763386b1 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.3
+  - @rocket.chat/rest-typings@6.12.0-rc.3
+  - @rocket.chat/ddp-client@0.3.5-rc.3
+  </details>
+
 ## 10.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 0a5fbf4a83f2..7f82271d1d30 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.2",
+	"version": "10.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 e7f617bb3c07..9e28fff148a4 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  - @rocket.chat/ui-avatar@6.0.0-rc.3
+  </details>
+
 ## 10.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index f89db00eae82..50b5f67c5a8b 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": "10.0.0-rc.2",
+	"version": "10.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 0154c2a5d005..6b1b3cb0c981 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.3
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  - @rocket.chat/ui-avatar@6.0.0-rc.3
+  </details>
+
 ## 0.4.0-rc.2
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 6a91a7681572..5ba9ceebb62e 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.2",
+  "version": "0.4.0-rc.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 56bf9390b687..c475eb1607c2 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.3
+  </details>
+
 ## 10.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index cb9c41903091..54d67b89dbbe 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": "10.0.0-rc.2",
+	"version": "10.0.0-rc.3",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index 2dadeaa4d3d9..a948ba3748ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.1
-    "@rocket.chat/ui-contexts": 10.0.0-rc.1
+    "@rocket.chat/ui-avatar": 6.0.0-rc.2
+    "@rocket.chat/ui-contexts": 10.0.0-rc.2
     "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.1
+    "@rocket.chat/ui-video-conf": 10.0.0-rc.2
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.1
-    "@rocket.chat/ui-contexts": 10.0.0-rc.1
+    "@rocket.chat/ui-client": 10.0.0-rc.2
+    "@rocket.chat/ui-contexts": 10.0.0-rc.2
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.1
+    "@rocket.chat/ui-contexts": 10.0.0-rc.2
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.1
+    "@rocket.chat/ui-contexts": 10.0.0-rc.2
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.1
-    "@rocket.chat/ui-contexts": 10.0.0-rc.1
+    "@rocket.chat/ui-avatar": 6.0.0-rc.2
+    "@rocket.chat/ui-contexts": 10.0.0-rc.2
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.1
+    "@rocket.chat/ui-contexts": 10.0.0-rc.2
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 9eaefdc892cb89d2f0c7296d805b93d742f73f0c Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 3 Sep 2024 10:16:56 -0300
Subject: [PATCH 035/170] feat: update contact endpoint (#32729)

---
 .changeset/heavy-snails-help.md               |   6 +
 .../server/constant/permissions.ts            |   4 +
 .../app/livechat/server/api/v1/contact.ts     |  19 +-
 .../app/livechat/server/lib/Contacts.ts       |  61 +++-
 .../server/models/raw/LivechatContacts.ts     |   9 +
 .../tests/end-to-end/api/livechat/contacts.ts | 285 +++++++++++++++++-
 .../app/livechat/server/lib/Contacts.spec.ts  |  70 ++++-
 packages/i18n/src/locales/en.i18n.json        |   3 +
 packages/i18n/src/locales/pt-BR.i18n.json     |   3 +
 .../src/models/ILivechatContactsModel.ts      |   4 +-
 packages/rest-typings/src/v1/omnichannel.ts   |  53 ++++
 11 files changed, 499 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/heavy-snails-help.md

diff --git a/.changeset/heavy-snails-help.md b/.changeset/heavy-snails-help.md
new file mode 100644
index 000000000000..fb10bac9ea8f
--- /dev/null
+++ b/.changeset/heavy-snails-help.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Implemented "omnichannel/contacts.update" endpoint to update contacts
diff --git a/apps/meteor/app/authorization/server/constant/permissions.ts b/apps/meteor/app/authorization/server/constant/permissions.ts
index d9ae4133e49e..e5e8f7fb05dd 100644
--- a/apps/meteor/app/authorization/server/constant/permissions.ts
+++ b/apps/meteor/app/authorization/server/constant/permissions.ts
@@ -97,6 +97,10 @@ export const permissions = [
 		_id: 'create-livechat-contact',
 		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
 	},
+	{
+		_id: 'update-livechat-contact',
+		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
+	},
 	{ _id: 'view-livechat-manager', roles: ['livechat-manager', 'livechat-monitor', 'admin'] },
 	{
 		_id: 'view-omnichannel-contact-center',
diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index 91b18a6b21af..94bd5ed3e11c 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -1,11 +1,11 @@
 import { LivechatCustomField, LivechatVisitors } from '@rocket.chat/models';
-import { isPOSTOmnichannelContactsProps } from '@rocket.chat/rest-typings';
+import { isPOSTOmnichannelContactsProps, isPOSTUpdateOmnichannelContactsProps } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { API } from '../../../../api/server';
-import { Contacts, createContact } from '../../lib/Contacts';
+import { Contacts, createContact, updateContact } from '../../lib/Contacts';
 
 API.v1.addRoute(
 	'omnichannel/contact',
@@ -101,3 +101,18 @@ API.v1.addRoute(
 		},
 	},
 );
+API.v1.addRoute(
+	'omnichannel/contacts.update',
+	{ authRequired: true, permissionsRequired: ['update-livechat-contact'], validateParams: isPOSTUpdateOmnichannelContactsProps },
+	{
+		async post() {
+			if (!process.env.TEST_MODE) {
+				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			}
+
+			const contact = await updateContact({ ...this.bodyParams });
+
+			return API.v1.success({ contact });
+		},
+	},
+);
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index 4f4a33ee61b2..58404ce27584 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -1,4 +1,11 @@
-import type { ILivechatContactChannel, ILivechatCustomField, ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
+import type {
+	ILivechatContact,
+	ILivechatContactChannel,
+	ILivechatCustomField,
+	ILivechatVisitor,
+	IOmnichannelRoom,
+	IUser,
+} from '@rocket.chat/core-typings';
 import {
 	LivechatVisitors,
 	Users,
@@ -45,6 +52,16 @@ type CreateContactParams = {
 	channels?: ILivechatContactChannel[];
 };
 
+type UpdateContactParams = {
+	contactId: string;
+	name?: string;
+	emails?: string[];
+	phones?: string[];
+	customFields?: Record<string, unknown>;
+	contactManager?: string;
+	channels?: ILivechatContactChannel[];
+};
+
 export const Contacts = {
 	async registerContact({
 		token,
@@ -189,10 +206,7 @@ export async function createContact(params: CreateContactParams): Promise<string
 	const { name, emails, phones, customFields = {}, contactManager, channels, unknown } = params;
 
 	if (contactManager) {
-		const contactManagerUser = await Users.findOneAgentById<Pick<IUser, 'roles'>>(contactManager, { projection: { roles: 1 } });
-		if (!contactManagerUser) {
-			throw new Error('error-contact-manager-not-found');
-		}
+		await validateContactManager(contactManager);
 	}
 
 	const allowedCustomFields = await getAllowedCustomFields();
@@ -211,6 +225,29 @@ export async function createContact(params: CreateContactParams): Promise<string
 	return insertedId;
 }
 
+export async function updateContact(params: UpdateContactParams): Promise<ILivechatContact> {
+	const { contactId, name, emails, phones, customFields, contactManager, channels } = params;
+
+	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id'>>(contactId, { projection: { _id: 1 } });
+
+	if (!contact) {
+		throw new Error('error-contact-not-found');
+	}
+
+	if (contactManager) {
+		await validateContactManager(contactManager);
+	}
+
+	if (customFields) {
+		const allowedCustomFields = await getAllowedCustomFields();
+		validateCustomFields(allowedCustomFields, customFields);
+	}
+
+	const updatedContact = await LivechatContacts.updateContact(contactId, { name, emails, phones, contactManager, channels, customFields });
+
+	return updatedContact;
+}
+
 async function getAllowedCustomFields(): Promise<ILivechatCustomField[]> {
 	return LivechatCustomField.findByScope(
 		'visitor',
@@ -245,4 +282,18 @@ export function validateCustomFields(allowedCustomFields: ILivechatCustomField[]
 			}
 		}
 	}
+
+	const allowedCustomFieldIds = new Set(allowedCustomFields.map((cf) => cf._id));
+	for (const key in customFields) {
+		if (!allowedCustomFieldIds.has(key)) {
+			throw new Error(i18n.t('error-custom-field-not-allowed', { key }));
+		}
+	}
+}
+
+export async function validateContactManager(contactManagerUserId: string) {
+	const contactManagerUser = await Users.findOneAgentById<Pick<IUser, '_id'>>(contactManagerUserId, { projection: { _id: 1 } });
+	if (!contactManagerUser) {
+		throw new Error('error-contact-manager-not-found');
+	}
 }
diff --git a/apps/meteor/server/models/raw/LivechatContacts.ts b/apps/meteor/server/models/raw/LivechatContacts.ts
index 1f5f29a3cc78..88dac1b9f5c1 100644
--- a/apps/meteor/server/models/raw/LivechatContacts.ts
+++ b/apps/meteor/server/models/raw/LivechatContacts.ts
@@ -8,4 +8,13 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatContact>>) {
 		super(db, 'livechat_contact', trash);
 	}
+
+	async updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact> {
+		const updatedValue = await this.findOneAndUpdate(
+			{ _id: contactId },
+			{ $set: { ...data, unknown: false } },
+			{ returnDocument: 'after' },
+		);
+		return updatedValue.value as ILivechatContact;
+	}
 }
diff --git a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
index 21eced5ee7e9..957d22ba92ae 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -1,27 +1,42 @@
 import { faker } from '@faker-js/faker';
+import type { ILivechatAgent, IUser } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
 import { before, after, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';
 import { createAgent } from '../../../data/livechat/rooms';
+import { removeAgent } from '../../../data/livechat/users';
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { createUser, deleteUser } from '../../../data/users.helper';
 
 describe('LIVECHAT - contacts', () => {
+	let agentUser: IUser;
+	let livechatAgent: ILivechatAgent;
 	before((done) => getCredentials(done));
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
-		await updatePermission('create-livechat-contact', ['admin']);
+		agentUser = await createUser();
+		livechatAgent = await createAgent(agentUser.username);
 	});
 
 	after(async () => {
+		await removeAgent(livechatAgent._id);
+		await deleteUser(agentUser);
 		await restorePermissionToRoles('create-livechat-contact');
 		await updateSetting('Livechat_enabled', true);
 	});
 
 	describe('[POST] omnichannel/contacts', () => {
+		before(async () => {
+			await updatePermission('create-livechat-contact', ['admin']);
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('create-livechat-contact');
+		});
+
 		it('should be able to create a new contact', async () => {
 			const res = await request
 				.post(api('omnichannel/contacts'))
@@ -92,9 +107,6 @@ describe('LIVECHAT - contacts', () => {
 		});
 
 		it('should be able to create a new contact with a contact manager', async () => {
-			const user = await createUser();
-			const livechatAgent = await createAgent(user.username);
-
 			const res = await request
 				.post(api('omnichannel/contacts'))
 				.set(credentials)
@@ -108,8 +120,6 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body).to.have.property('success', true);
 			expect(res.body).to.have.property('contactId');
 			expect(res.body.contactId).to.be.an('string');
-
-			await deleteUser(user);
 		});
 
 		describe('Custom Fields', () => {
@@ -296,4 +306,267 @@ describe('LIVECHAT - contacts', () => {
 			});
 		});
 	});
+
+	describe('[POST] omnichannel/contacts.update', () => {
+		let contactId: string;
+
+		before(async () => {
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+			contactId = body.contactId;
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('update-livechat-contact');
+		});
+
+		it('should be able to update a contact', async () => {
+			const name = faker.person.fullName();
+			const emails = [faker.internet.email().toLowerCase()];
+			const phones = [faker.phone.number()];
+
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				name,
+				emails,
+				phones,
+			});
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.name).to.be.equal(name);
+			expect(res.body.contact.emails).to.be.deep.equal(emails);
+			expect(res.body.contact.phones).to.be.deep.equal(phones);
+		});
+
+		it('should set the unknown field to false when updating a contact', async () => {
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				name: faker.person.fullName(),
+			});
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.unknown).to.be.equal(false);
+		});
+
+		it('should be able to update the contact manager', async () => {
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				contactManager: livechatAgent._id,
+			});
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.contactManager).to.be.equal(livechatAgent._id);
+		});
+
+		it('should return an error if contact does not exist', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.update'))
+				.set(credentials)
+				.send({
+					contactId: 'invalid',
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal('error-contact-not-found');
+		});
+
+		it('should return an error if contact manager not exists', async () => {
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				contactManager: 'invalid',
+			});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal('error-contact-manager-not-found');
+		});
+
+		describe('Permissions', () => {
+			before(async () => {
+				await removePermissionFromAllRoles('update-livechat-contact');
+			});
+
+			after(async () => {
+				await restorePermissionToRoles('update-livechat-contact');
+			});
+
+			it("should return an error if user doesn't have 'update-livechat-contact' permission", async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+			});
+		});
+
+		describe('Custom Fields', () => {
+			before(async () => {
+				await createCustomField({
+					field: 'cf1',
+					label: 'Custom Field 1',
+					scope: 'visitor',
+					visibility: 'public',
+					type: 'input',
+					required: true,
+					regexp: '^[0-9]+$',
+					searchable: true,
+					public: true,
+				});
+			});
+
+			after(async () => {
+				await deleteCustomField('cf1');
+			});
+
+			it('should validate custom fields correctly', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						customFields: {
+							cf1: '123',
+						},
+					});
+
+				expect(res.status).to.be.equal(200);
+				expect(res.body).to.have.property('success', true);
+				expect(res.body.contact._id).to.be.equal(contactId);
+			});
+
+			it('should return an error for invalid custom field value', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						customFields: {
+							cf1: 'invalid',
+						},
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('Invalid value for Custom Field 1 field');
+			});
+
+			it('should return an error if additional custom fields are provided', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						customFields: {
+							cf1: '123',
+							cf2: 'invalid',
+						},
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('Custom field cf2 is not allowed');
+			});
+		});
+
+		describe('Fields Validation', () => {
+			it('should return an error if contactId is missing', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is not an array', async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+					emails: 'invalid',
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be array [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is not an array of strings', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						emails: [{ invalid: true }],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be string [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if phones is not an array', async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+					phones: 'invalid',
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be array [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if phones is not an array of strings', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						phones: [{ invalid: true }],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be string [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if additional fields are provided', async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+					unknown: true,
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must NOT have additional properties [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+		});
+	});
 });
diff --git a/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
index 9ff2019ffca5..fef3c59469f8 100644
--- a/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
+++ b/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
@@ -2,10 +2,22 @@ import { expect } from 'chai';
 import proxyquire from 'proxyquire';
 import sinon from 'sinon';
 
-const { validateCustomFields } = proxyquire.noCallThru().load('../../../../../../app/livechat/server/lib/Contacts', {
-	'meteor/check': sinon.stub(),
-	'meteor/meteor': sinon.stub(),
-});
+const modelsMock = {
+	Users: {
+		findOneAgentById: sinon.stub(),
+	},
+	LivechatContacts: {
+		findOneById: sinon.stub(),
+		updateContact: sinon.stub(),
+	},
+};
+const { validateCustomFields, validateContactManager, updateContact } = proxyquire
+	.noCallThru()
+	.load('../../../../../../app/livechat/server/lib/Contacts', {
+		'meteor/check': sinon.stub(),
+		'meteor/meteor': sinon.stub(),
+		'@rocket.chat/models': modelsMock,
+	});
 
 describe('[OC] Contacts', () => {
 	describe('validateCustomFields', () => {
@@ -36,5 +48,55 @@ describe('[OC] Contacts', () => {
 
 			expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
 		});
+
+		it('should throw an error if a extra custom field is passed', () => {
+			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+			const customFields = { field2: 'value' };
+
+			expect(() => validateCustomFields(allowedCustomFields, customFields)).to.throw();
+		});
+	});
+
+	describe('validateContactManager', () => {
+		beforeEach(() => {
+			modelsMock.Users.findOneAgentById.reset();
+		});
+
+		it('should throw an error if the user does not exist', async () => {
+			modelsMock.Users.findOneAgentById.resolves(undefined);
+			await expect(validateContactManager('any_id')).to.be.rejectedWith('error-contact-manager-not-found');
+		});
+
+		it('should not throw an error if the user has the "livechat-agent" role', async () => {
+			const user = { _id: 'userId' };
+			modelsMock.Users.findOneAgentById.resolves(user);
+
+			await expect(validateContactManager('userId')).to.not.be.rejected;
+			expect(modelsMock.Users.findOneAgentById.getCall(0).firstArg).to.be.equal('userId');
+		});
+	});
+
+	describe('updateContact', () => {
+		beforeEach(() => {
+			modelsMock.LivechatContacts.findOneById.reset();
+			modelsMock.LivechatContacts.updateContact.reset();
+		});
+
+		it('should throw an error if the contact does not exist', async () => {
+			modelsMock.LivechatContacts.findOneById.resolves(undefined);
+			await expect(updateContact('any_id')).to.be.rejectedWith('error-contact-not-found');
+			expect(modelsMock.LivechatContacts.updateContact.getCall(0)).to.be.null;
+		});
+
+		it('should update the contact with correct params', async () => {
+			modelsMock.LivechatContacts.findOneById.resolves({ _id: 'contactId' });
+			modelsMock.LivechatContacts.updateContact.resolves({ _id: 'contactId', name: 'John Doe' } as any);
+
+			const updatedContact = await updateContact({ contactId: 'contactId', name: 'John Doe' });
+
+			expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[0]).to.be.equal('contactId');
+			expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[1]).to.be.deep.contain({ name: 'John Doe' });
+			expect(updatedContact).to.be.deep.equal({ _id: 'contactId', name: 'John Doe' });
+		});
 	});
 });
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index b28b1fc2bfde..ea7e31422cb1 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -2082,6 +2082,7 @@
   "error-invalid-custom-field": "Invalid custom field",
   "error-invalid-custom-field-name": "Invalid custom field name. Use only letters, numbers, hyphens and underscores.",
   "error-invalid-custom-field-value": "Invalid value for {{field}} field",
+  "error-custom-field-not-allowed": "Custom field {{key}} is not allowed",
   "error-invalid-date": "Invalid date provided.",
   "error-invalid-dates": "From date cannot be after To date",
   "error-invalid-description": "Invalid description",
@@ -5842,6 +5843,8 @@
   "view-joined-room": "View Joined Room",
   "view-joined-room_description": "Permission to view the currently joined channels",
   "view-l-room": "View Omnichannel Rooms",
+  "create-livechat-contact": "Create Omnichannel contacts",
+  "update-livechat-contact": "Update Omnichannel contacts",
   "view-l-room_description": "Permission to view Omnichannel rooms",
   "view-livechat-analytics": "View Omnichannel Analytics",
   "onboarding.page.awaitingConfirmation.subtitle": "We have sent you an email to {{emailAddress}} with a confirmation link. Please verify that the security code below matches the one in the email.",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index f072bc626270..dc62318cb230 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -1736,6 +1736,7 @@
   "error-invalid-custom-field": "Campo personalizado inválido",
   "error-invalid-custom-field-name": "Nome inválido para o campo personalizado. Use apenas letras, números, hífens e travessão.",
   "error-invalid-custom-field-value": "Valor inválido para o campo {{field}}",
+  "error-custom-field-not-allowed": "O campo personalizado {{key}} não é permitido",
   "error-invalid-date": "Data fornecida inválida",
   "error-invalid-description": "Descrição inválida",
   "error-invalid-domain": "Domínio inválido",
@@ -4678,6 +4679,8 @@
   "view-joined-room": "Ver sala incorporada",
   "view-joined-room_description": "Permissão para ver os canais atualmente associados",
   "view-l-room": "Ver salas de omnichannel",
+  "create-livechat-contact": "Criar contatos do omnichannel",
+  "update-livechat-contact": "Atualizar contatos do omnichannel",
   "view-l-room_description": "Permissão para ver salas de omnichannel",
   "view-livechat-analytics": "Ver a análise do omnichannel",
   "onboarding.page.awaitingConfirmation.subtitle": "Enviamos um e-mail para {{emailAddress}} com um link de confirmação. Verifique se o código de segurança abaixo coincide com o do e-mail.",
diff --git a/packages/model-typings/src/models/ILivechatContactsModel.ts b/packages/model-typings/src/models/ILivechatContactsModel.ts
index bcf48a837400..f94216830884 100644
--- a/packages/model-typings/src/models/ILivechatContactsModel.ts
+++ b/packages/model-typings/src/models/ILivechatContactsModel.ts
@@ -2,4 +2,6 @@ import type { ILivechatContact } from '@rocket.chat/core-typings';
 
 import type { IBaseModel } from './IBaseModel';
 
-export type ILivechatContactsModel = IBaseModel<ILivechatContact>;
+export interface ILivechatContactsModel extends IBaseModel<ILivechatContact> {
+	updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact>;
+}
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index c15e94030de3..1ed249f5dd55 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -27,6 +27,7 @@ import type {
 	ReportWithUnmatchingElements,
 	SMSProviderResponse,
 	ILivechatTriggerActionResponse,
+	ILivechatContact,
 } from '@rocket.chat/core-typings';
 import { ILivechatAgentStatus } from '@rocket.chat/core-typings';
 import Ajv from 'ajv';
@@ -1254,6 +1255,55 @@ const POSTOmnichannelContactsSchema = {
 
 export const isPOSTOmnichannelContactsProps = ajv.compile<POSTOmnichannelContactsProps>(POSTOmnichannelContactsSchema);
 
+type POSTUpdateOmnichannelContactsProps = {
+	contactId: string;
+	name?: string;
+	emails?: string[];
+	phones?: string[];
+	customFields?: Record<string, unknown>;
+	contactManager?: string;
+};
+
+const POSTUpdateOmnichannelContactsSchema = {
+	type: 'object',
+	properties: {
+		contactId: {
+			type: 'string',
+		},
+		name: {
+			type: 'string',
+		},
+		emails: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+			uniqueItems: true,
+			nullable: true,
+		},
+		phones: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+			uniqueItems: true,
+			nullable: true,
+		},
+		customFields: {
+			type: 'object',
+			nullable: true,
+		},
+		contactManager: {
+			type: 'string',
+			nullable: true,
+		},
+	},
+	required: ['contactId'],
+	additionalProperties: false,
+};
+
+export const isPOSTUpdateOmnichannelContactsProps = ajv.compile<POSTUpdateOmnichannelContactsProps>(POSTUpdateOmnichannelContactsSchema);
+
 type GETOmnichannelContactProps = { contactId: string };
 
 const GETOmnichannelContactSchema = {
@@ -3695,6 +3745,9 @@ export type OmnichannelEndpoints = {
 	'/v1/omnichannel/contacts': {
 		POST: (params: POSTOmnichannelContactsProps) => { contactId: string };
 	};
+	'/v1/omnichannel/contacts.update': {
+		POST: (params: POSTUpdateOmnichannelContactsProps) => { contact: ILivechatContact };
+	};
 
 	'/v1/omnichannel/contact.search': {
 		GET: (params: GETOmnichannelContactSearchProps) => { contact: ILivechatVisitor | null };

From 4dc145f1a1d9d076b70f87455245932f1bb62c61 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 3 Sep 2024 16:50:24 +0000
Subject: [PATCH 036/170] Release 6.11.2

[no ci]
---
 .changeset/bump-patch-1724077277110.md        |  5 --
 .changeset/gentle-bugs-think.md               |  5 --
 .changeset/orange-clocks-wait.md              |  5 --
 .changeset/strong-rings-rush.md               |  5 --
 .changeset/two-bikes-crash.md                 |  7 ---
 .changeset/wise-avocados-taste.md             |  5 --
 apps/meteor/CHANGELOG.md                      | 46 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 ++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 13 ++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++
 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   | 14 ++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/api-client/CHANGELOG.md           | 10 ++++
 ee/packages/api-client/package.json           |  2 +-
 ee/packages/ddp-client/CHANGELOG.md           | 10 ++++
 ee/packages/ddp-client/package.json           |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++
 ee/packages/license/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/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/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               |  9 ++++
 packages/ui-client/package.json               |  4 +-
 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/uikit-playground/CHANGELOG.md        | 11 +++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 ++++
 packages/web-ui-registration/package.json     |  4 +-
 72 files changed, 420 insertions(+), 76 deletions(-)
 delete mode 100644 .changeset/bump-patch-1724077277110.md
 delete mode 100644 .changeset/gentle-bugs-think.md
 delete mode 100644 .changeset/orange-clocks-wait.md
 delete mode 100644 .changeset/strong-rings-rush.md
 delete mode 100644 .changeset/two-bikes-crash.md
 delete mode 100644 .changeset/wise-avocados-taste.md

diff --git a/.changeset/bump-patch-1724077277110.md b/.changeset/bump-patch-1724077277110.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1724077277110.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/gentle-bugs-think.md b/.changeset/gentle-bugs-think.md
deleted file mode 100644
index fc4738f3043a..000000000000
--- a/.changeset/gentle-bugs-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
diff --git a/.changeset/orange-clocks-wait.md b/.changeset/orange-clocks-wait.md
deleted file mode 100644
index eacb88108a0f..000000000000
--- a/.changeset/orange-clocks-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/.changeset/strong-rings-rush.md b/.changeset/strong-rings-rush.md
deleted file mode 100644
index 5125f47dcb3b..000000000000
--- a/.changeset/strong-rings-rush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Restored tooltips to the unit edit department field selected options
diff --git a/.changeset/two-bikes-crash.md b/.changeset/two-bikes-crash.md
deleted file mode 100644
index a120435e4a48..000000000000
--- a/.changeset/two-bikes-crash.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
-
-The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.
diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
deleted file mode 100644
index c4c9bce010b8..000000000000
--- a/.changeset/wise-avocados-taste.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes an issue where multi-step modals were closing unexpectedly
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index aa58cd1ba36a..4a5a8c760a8c 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @rocket.chat/meteor
 
+## 6.11.2
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33084](https://github.com/RocketChat/Rocket.Chat/pull/33084) by [@dionisio-bot](https://github.com/dionisio-bot)) Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
+
+- ([#33153](https://github.com/RocketChat/Rocket.Chat/pull/33153) by [@dionisio-bot](https://github.com/dionisio-bot)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#33185](https://github.com/RocketChat/Rocket.Chat/pull/33185) by [@dionisio-bot](https://github.com/dionisio-bot)) Restored tooltips to the unit edit department field selected options
+
+- ([#33129](https://github.com/RocketChat/Rocket.Chat/pull/33129) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
+
+  The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.
+
+- ([#33178](https://github.com/RocketChat/Rocket.Chat/pull/33178) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixes an issue where multi-step modals were closing unexpectedly
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/api-client@0.2.5
+  - @rocket.chat/license@0.2.5
+  - @rocket.chat/omnichannel-services@0.3.2
+  - @rocket.chat/pdf-worker@0.2.2
+  - @rocket.chat/presence@0.2.5
+  - @rocket.chat/apps@0.1.5
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/cron@0.1.5
+  - @rocket.chat/fuselage-ui-kit@9.0.2
+  - @rocket.chat/gazzodown@9.0.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/ui-contexts@9.0.2
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.2
+  - @rocket.chat/ui-theming@0.2.0
+  - @rocket.chat/ui-avatar@5.0.2
+  - @rocket.chat/ui-client@9.0.2
+  - @rocket.chat/ui-video-conf@9.0.2
+  - @rocket.chat/web-ui-registration@9.0.2
+  - @rocket.chat/instance-status@0.1.5
+  </details>
+
 ## 6.11.1
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 74c84a88cef2..0604041b61c7 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.11.1"
+	"version": "6.11.2"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 87dd221531e1..7e9c69fc3a8f 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 1.3.1
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 59f351444031..34d57e65ab1a 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": "1.3.1",
+	"version": "1.3.2",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 044bb765e2db..be520ecf6fa1 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": "6.11.1",
+	"version": "6.11.2",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index c72b16bd401f..f289dbe21329 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 895d955510fd..73ff677d29f5 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.4",
+	"version": "0.4.5",
 	"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 03f7cb62a50b..08efe1cb2e77 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 7c6783838a84..f3ade2612149 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.4",
+	"version": "0.4.5",
 	"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 22ddcea338a5..3b8ce871f86a 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.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/ui-contexts@9.0.2
+  - @rocket.chat/models@0.2.2
+  - @rocket.chat/instance-status@0.1.5
+  </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index e2d4fd6320b0..1307dde1d7c1 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.4",
+	"version": "0.3.5",
 	"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 b9837882510c..12831f929366 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/omnichannel-services@0.3.2
+  - @rocket.chat/pdf-worker@0.2.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 293e5c1be775..cf3801bdd513 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.4",
+	"version": "0.4.5",
 	"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 614c49928415..a6e47fc6f9af 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/presence@0.2.5
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 457eb9225b6c..f0d43ab5fe84 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.4",
+	"version": "0.4.5",
 	"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 53be288ed34d..ff37f0acf2dd 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/omnichannel-services@0.3.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 72bc5d688e36..1903ef994958 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.4",
+	"version": "0.4.5",
 	"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 284e853f4737..41efb8e4a8bd 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index d1f2e64acfc0..96b2f95197bd 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.4",
+	"version": "0.4.5",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md
index 7430778db198..a78f2c6b738f 100644
--- a/ee/packages/api-client/CHANGELOG.md
+++ b/ee/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json
index d5744d456a46..07e141691f0d 100644
--- a/ee/packages/api-client/package.json
+++ b/ee/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
 		"@swc/jest": "^0.2.29",
diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md
index c26b0c47f6cb..ad4c010470c4 100644
--- a/ee/packages/ddp-client/CHANGELOG.md
+++ b/ee/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ddp-client
 
+## 0.3.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/api-client@0.2.5
+  </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json
index 192ea63af72d..4e9a7b8564c6 100644
--- a/ee/packages/ddp-client/package.json
+++ b/ee/packages/ddp-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
 		"@swc/jest": "^0.2.29",
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index 9dce96a0310d..958a23f152ad 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index e5317dc08bcc..22e54c3d5cc9 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"private": true,
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index d3bbf0b00655..a8f12d64def3 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.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/pdf-worker@0.2.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/model-typings@0.6.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index f6c66eba4550..5958ccdf131b 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.1",
+	"version": "0.3.2",
 	"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 a67dc8eafd21..95479cecb74e 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.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  </details>
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index d2a0e3029eff..726de909bc17 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.1",
+	"version": "0.2.2",
 	"private": true,
 	"devDependencies": {
 		"@storybook/addon-essentials": "~6.5.16",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 93d927c5bc5c..b186efdfd733 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/core-services@0.5.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index a01538b8de6c..a7213ab2c793 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index edc1f5da7e54..5679d4f1a101 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.11.1",
+	"version": "6.11.2",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index e9efd36ae6bc..ea366e23cef1 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/model-typings@0.6.2
+  </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 254e1566e120..076601f770af 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 9871852c0245..0a2f604faabf 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.5.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.5.1
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 072157066bcf..bc2c7c9b5d3c 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.5.1",
+	"version": "0.5.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 42bcd35326fa..8760abdf06a0 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.11.2
+
 ## 6.11.1
 
 ## 6.11.0
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 16e17d410ad5..aca37032fd82 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.11.1",
+	"version": "6.11.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index b2b06e586370..64e5823dea43 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index ede7f521da8c..ff7cb93469c8 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 0b1435f47f1b..f5185a744fad 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 9.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/gazzodown@9.0.2
+  - @rocket.chat/ui-contexts@9.0.2
+  - @rocket.chat/ui-avatar@5.0.2
+  - @rocket.chat/ui-video-conf@9.0.2
+  </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 32d18d782968..492ec6799e61 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "9.0.1",
+  "version": "9.0.2",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "5.0.1",
-    "@rocket.chat/ui-contexts": "9.0.1",
+    "@rocket.chat/ui-avatar": "5.0.2",
+    "@rocket.chat/ui-contexts": "9.0.2",
     "@rocket.chat/ui-kit": "0.36.0",
-    "@rocket.chat/ui-video-conf": "9.0.1",
+    "@rocket.chat/ui-video-conf": "9.0.2",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 48b701cbeb54..f418d2055016 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 9.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/ui-contexts@9.0.2
+  - @rocket.chat/ui-client@9.0.2
+  </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 7341d79bba85..8d33aadcb2e3 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "9.0.1",
+	"version": "9.0.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -71,8 +71,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "9.0.1",
-		"@rocket.chat/ui-contexts": "9.0.1",
+		"@rocket.chat/ui-client": "9.0.2",
+		"@rocket.chat/ui-contexts": "9.0.2",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index d314c504721c..1ffe17fc3fbf 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.2
+  </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 2037a3cf5f61..7d86bf07dc01 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.4",
+	"version": "0.1.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 87cdaae78911..f7554d380b02 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@9.0.2
+  </details>
+
 ## 1.19.1
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 6974bd1a2acd..c61496d9420c 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.1",
+	"version": "1.19.2",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 6b27e4ad4ab1..6f367165df67 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.6.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  </details>
+
 ## 0.6.1
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index edc79f10e2df..0e4df28c7ad5 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 772805da3b8f..a74d88f3161d 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.6.2
+  </details>
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index c09d8cea307f..f0c0a0fe4e5a 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"private": true,
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 9f0e3a01cd21..c9c3fd7652b3 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.11.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  </details>
+
 ## 6.11.1
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index a7a8275dd276..4a4388f814bd 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.11.1",
+	"version": "6.11.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/jest": "~29.5.7",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 927a3463e069..f059f62949b5 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 5.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.2
+  </details>
+
 ## 5.0.1
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 92d1382de36e..ac528e7cf4ad 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "5.0.1",
+	"version": "5.0.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "9.0.1",
+		"@rocket.chat/ui-contexts": "9.0.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 8dee0ec12c50..b0bf87281f0b 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 9.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.2
+  </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 43743f37339f..71c80e9fd8e6 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "9.0.1",
+	"version": "9.0.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -63,7 +63,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "9.0.1",
+		"@rocket.chat/ui-contexts": "9.0.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 4e21589c1388..14bd6d6514d2 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 9.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.11.2
+  - @rocket.chat/rest-typings@6.11.2
+  - @rocket.chat/ddp-client@0.3.5
+  </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 85d6df1b93e6..bc3bb0daba3f 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "9.0.1",
+	"version": "9.0.2",
 	"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 feb33d9679e0..27dacec94f8c 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 9.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.2
+  - @rocket.chat/ui-avatar@5.0.2
+  </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 861da958667c..489cd82cd363 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": "9.0.1",
+	"version": "9.0.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -36,8 +36,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "5.0.1",
-		"@rocket.chat/ui-contexts": "9.0.1",
+		"@rocket.chat/ui-avatar": "5.0.2",
+		"@rocket.chat/ui-contexts": "9.0.2",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 7515e3005bc6..a098342b1427 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.3.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@9.0.2
+  - @rocket.chat/ui-contexts@9.0.2
+  - @rocket.chat/ui-avatar@5.0.2
+  </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 2923804daa48..f9850b9052a9 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.3.4",
+  "version": "0.3.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index ab10df1e8c58..f115425281a4 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 9.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@9.0.2
+  </details>
+
 ## 9.0.1
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 3e0a0483eb86..8909fa91b65a 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": "9.0.1",
+	"version": "9.0.2",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -51,7 +51,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "9.0.1",
+		"@rocket.chat/ui-contexts": "9.0.2",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From 75041350a5cd6c93affd99959f5025fef44b3ce3 Mon Sep 17 00:00:00 2001
From: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
Date: Tue, 3 Sep 2024 22:58:47 +0530
Subject: [PATCH 037/170] ci: change release repository (#32923)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 514dd6d1c518..40260f71d21f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -824,7 +824,7 @@ jobs:
         with:
           token: ${{ secrets.DISTRIBUTION_TOKEN }}
           event-type: new_release
-          repository: RocketChat/Release.Distributions
+          repository: RocketChat/public-releases
           client-payload: '{"tag": "${{ github.ref_name }}"}'
 
   docs-update:

From e04a6d19b21a74d5bc6fe135d739aeb6de19d188 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 3 Sep 2024 18:13:40 +0000
Subject: [PATCH 038/170] Release 6.12.0-rc.4

[no ci]
---
 .changeset/bump-patch-1725387211812.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   | 13 +++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 15 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 26 ++++++++++----
 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   | 19 ++++++++--
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 15 +++++++-
 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       | 16 ++++++++-
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              | 12 ++++++-
 ee/packages/license/package.json              |  2 +-
 ee/packages/omnichannel-services/CHANGELOG.md | 17 +++++++++
 ee/packages/omnichannel-services/package.json |  2 +-
 ee/packages/pdf-worker/CHANGELOG.md           | 15 +++++++-
 ee/packages/pdf-worker/package.json           |  2 +-
 ee/packages/presence/CHANGELOG.md             | 14 ++++++++
 ee/packages/presence/package.json             |  2 +-
 package.json                                  |  2 +-
 packages/api-client/CHANGELOG.md              | 11 ++++++
 packages/api-client/package.json              |  2 +-
 packages/apps/CHANGELOG.md                    | 13 +++++++
 packages/apps/package.json                    |  2 +-
 packages/core-services/CHANGELOG.md           | 11 ++++++
 packages/core-services/package.json           |  2 +-
 packages/core-typings/CHANGELOG.md            |  3 ++
 packages/core-typings/package.json            |  2 +-
 packages/cron/CHANGELOG.md                    | 11 ++++++
 packages/cron/package.json                    |  2 +-
 packages/ddp-client/CHANGELOG.md              | 13 +++++++
 packages/ddp-client/package.json              |  2 +-
 packages/fuselage-ui-kit/CHANGELOG.md         | 15 ++++++++
 packages/fuselage-ui-kit/package.json         |  8 ++---
 packages/gazzodown/CHANGELOG.md               | 13 +++++++
 packages/gazzodown/package.json               |  6 ++--
 packages/instance-status/CHANGELOG.md         | 12 ++++++-
 packages/instance-status/package.json         |  2 +-
 packages/livechat/CHANGELOG.md                | 10 ++++++
 packages/livechat/package.json                |  2 +-
 packages/model-typings/CHANGELOG.md           | 10 ++++++
 packages/model-typings/package.json           |  2 +-
 packages/models/CHANGELOG.md                  | 13 ++++++-
 packages/models/package.json                  |  2 +-
 packages/rest-typings/CHANGELOG.md            | 11 ++++++
 packages/rest-typings/package.json            |  2 +-
 packages/ui-avatar/CHANGELOG.md               | 12 +++++++
 packages/ui-avatar/package.json               |  4 +--
 packages/ui-client/CHANGELOG.md               | 11 ++++++
 packages/ui-client/package.json               |  4 +--
 packages/ui-contexts/CHANGELOG.md             | 15 ++++++--
 packages/ui-contexts/package.json             |  2 +-
 packages/ui-video-conf/CHANGELOG.md           | 14 +++++++-
 packages/ui-video-conf/package.json           |  6 ++--
 packages/uikit-playground/CHANGELOG.md        | 15 +++++++-
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     | 11 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 68 files changed, 483 insertions(+), 63 deletions(-)
 create mode 100644 .changeset/bump-patch-1725387211812.md

diff --git a/.changeset/bump-patch-1725387211812.md b/.changeset/bump-patch-1725387211812.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1725387211812.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 947aecb92f25..6aa4b3dd5bf9 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -68,6 +68,7 @@
     "bump-patch-1724712948901",
     "bump-patch-1724977971712",
     "bump-patch-1725326060827",
+    "bump-patch-1725387211812",
     "calm-tigers-peel",
     "cool-actors-sin",
     "cool-rocks-remember",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 754ffaa5686c..a3c6f38176ac 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,11 +1,45 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.4
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/license@0.2.6-rc.4
+  - @rocket.chat/omnichannel-services@0.3.3-rc.4
+  - @rocket.chat/pdf-worker@0.2.3-rc.4
+  - @rocket.chat/presence@0.2.6-rc.4
+  - @rocket.chat/api-client@0.2.6-rc.4
+  - @rocket.chat/apps@0.1.6-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/cron@0.1.6-rc.4
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.4
+  - @rocket.chat/gazzodown@10.0.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.3-rc.4
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.4
+  - @rocket.chat/ui-client@10.0.0-rc.4
+  - @rocket.chat/ui-video-conf@10.0.0-rc.4
+  - @rocket.chat/web-ui-registration@10.0.0-rc.4
+  - @rocket.chat/instance-status@0.1.6-rc.4
+  </details>
+
 ## 6.11.2
+
 ### Patch Changes
 
 - Bump @rocket.chat/meteor version.
 
 ## 6.12.0-rc.3
+
 ### Patch Changes
 
 - Bump @rocket.chat/meteor version.
@@ -218,6 +252,7 @@
   - @rocket.chat/instance-status@0.1.4-rc.0
   - @rocket.chat/server-cloud-communication@0.0.2
   </details>
+
 - Bump @rocket.chat/meteor version.
 
 - ([#33084](https://github.com/RocketChat/Rocket.Chat/pull/33084) by [@dionisio-bot](https://github.com/dionisio-bot)) Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 1bca0bac5765..77fdbe3d6942 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.3"
+	"version": "6.12.0-rc.4"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index d4ad4a47d8b8..8ff59eaabd3e 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,17 @@
 # rocketchat-services
 
+## 1.3.3-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
 
 ## 1.3.2
 
@@ -8,6 +20,7 @@
 - <details><summary>Updated dependencies []:</summary>
 
 ## 1.3.3-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 687c00eb676f..5ef1b16af1c2 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": "1.3.3-rc.3",
+	"version": "1.3.3-rc.4",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index f81fca6618aa..b1d00dd1b931 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": "6.12.0-rc.3",
+	"version": "6.12.0-rc.4",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 0febefd2e0b7..ab5fcbb3f11d 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,6 +1,20 @@
 # @rocket.chat/account-service
 
+## 0.4.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
+
 ## 0.4.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -12,6 +26,7 @@
   </details>
 
 ## 0.4.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 710f1b064c1a..16d72db9844e 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.6-rc.3",
+	"version": "0.4.6-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 ebc00c17b413..6d82edcf5808 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,20 +1,32 @@
 # @rocket.chat/authorization-service
 
-
-## 0.4.5
+## 0.4.6-rc.4
 
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
- - @rocket.chat/core-typings@6.11.2
-  - @rocket.chat/rest-typings@6.11.2
-  - @rocket.chat/core-services@0.5.2
-  - @rocket.chat/model-typings@0.6.2
-  - @rocket.chat/models@0.2.2
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
   </details>
 
+## 0.4.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+- @rocket.chat/core-typings@6.11.2
+- @rocket.chat/rest-typings@6.11.2
+- @rocket.chat/core-services@0.5.2
+- @rocket.chat/model-typings@0.6.2
+- @rocket.chat/models@0.2.2
+</details>
 
 ## 0.4.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 60ced4f57d26..b247e6f5dbb5 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.6-rc.3",
+	"version": "0.4.6-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 5d97da181d36..1c9c37bf3400 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,6 +1,21 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  - @rocket.chat/instance-status@0.1.6-rc.4
+  </details>
+
 ## 0.3.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -54,7 +69,9 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/instance-status@0.1.4-rc.0
   </details>
+
 ## 0.3.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 438afa9791de..fbe9173b32db 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.6-rc.3",
+	"version": "0.3.6-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 33d1b880524f..bfb8ca03b676 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,11 +1,24 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.6-rc.4
 
-## 0.4.6-rc.3
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
 
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.3-rc.4
+  - @rocket.chat/pdf-worker@0.2.3-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
+
+## 0.4.6-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
 
   - @rocket.chat/core-typings@6.12.0-rc.3
   - @rocket.chat/omnichannel-services@0.3.2-rc.3
@@ -55,8 +68,10 @@
   - @rocket.chat/omnichannel-services@0.3.1-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/pdf-worker@0.2.1-rc.0
-</details>
+  </details>
+
 ## 0.4.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 40cfb3667ef4..6ce61b7e1a71 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.6-rc.3",
+	"version": "0.4.6-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 5258a6aa180e..238f5b922e4d 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/presence@0.2.6-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
+
 ## 0.4.6-rc.3
 
 ### Patch Changes
@@ -50,8 +63,8 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/presence@0.2.4-rc.0
   </details>
-## 0.4.5
 
+## 0.4.5
 
 ### Patch Changes
 
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 7cd653e0969d..958b1da5293b 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.6-rc.3",
+	"version": "0.4.6-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 3335455fe454..9fd9667e3115 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,7 +1,20 @@
 # @rocket.chat/queue-worker
 
+## 0.4.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.3-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
 
 ## 0.4.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -53,6 +66,7 @@
   </details>
 
 ## 0.4.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index a07d9784deea..262787811e43 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.6-rc.3",
+	"version": "0.4.6-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 aad9d0186738..fe29a82ffbba 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,7 +1,19 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
 
 ## 0.4.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -46,8 +58,10 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
-</details>
+  </details>
+
 ## 0.4.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index c00be846e78a..80ce39023626 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.6-rc.3",
+	"version": "0.4.6-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 3909267868b5..0c857093c129 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,8 +1,16 @@
 # @rocket.chat/license
 
+## 0.2.6-rc.4
 
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  </details>
 
 ## 0.2.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -35,8 +43,10 @@
 - <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
 
   - @rocket.chat/core-typings@6.12.0-rc.0
-</details>
+  </details>
+
 ## 0.2.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 8d083ed4d47b..694e6faaee5c 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6-rc.3",
+	"version": "0.2.6-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 49a904ae5535..752cb9a7d8c2 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,6 +1,21 @@
 # @rocket.chat/omnichannel-services
 
+## 0.3.3-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/pdf-worker@0.2.3-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
+
 ## 0.3.3-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -54,7 +69,9 @@
   - @rocket.chat/models@0.2.1-rc.0
   - @rocket.chat/pdf-worker@0.2.1-rc.0
   </details>
+
 ## 0.3.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index aee66810ed7c..10da64e14995 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.3-rc.3",
+	"version": "0.3.3-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 a2f4d8471002..c2fbbdf3c0cf 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,11 +1,22 @@
 # @rocket.chat/pdf-worker
 
+## 0.2.3-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  </details>
+
 ## 0.2.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
 
 ## 0.2.3-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -38,8 +49,10 @@
 - <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
 
   - @rocket.chat/core-typings@6.12.0-rc.0
-</details>
+  </details>
+
 ## 0.2.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 2c637c6421e3..037d976bb484 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.3-rc.3",
+	"version": "0.2.3-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 09713273474e..41d732348c84 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,6 +1,18 @@
 # @rocket.chat/presence
 
+## 0.2.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/core-services@0.6.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
+
 ## 0.2.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -42,7 +54,9 @@
   - @rocket.chat/core-services@0.6.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.2.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 196446fcc7b0..f5e1bafa6747 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6-rc.3",
+	"version": "0.2.6-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 6012e87ef2ca..7b92d068451a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.3",
+	"version": "6.12.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 cf34b109064a..f572a907479f 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,8 +1,17 @@
 # @rocket.chat/api-client
 
+## 0.2.6-rc.4
 
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  </details>
 
 ## 0.2.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -39,7 +48,9 @@
   - @rocket.chat/rest-typings@6.12.0-rc.0
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 0.2.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 75d7a0f00e39..8483d0eed41a 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.6-rc.3",
+	"version": "0.2.6-rc.4",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 584580544eb9..37eff88a3664 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,6 +1,17 @@
 # @rocket.chat/apps
 
+## 0.1.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  </details>
+
 ## 0.1.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -38,7 +49,9 @@
   - @rocket.chat/model-typings@0.7.0-rc.0
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 0.1.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/apps/package.json b/packages/apps/package.json
index c18989113fec..3a36c524822c 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6-rc.3",
+	"version": "0.1.6-rc.4",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index cbe5a476a772..d1bb14df9ada 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,7 +1,18 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
 
 ## 0.6.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index d6db1dfdc31f..409952cc0c37 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.3",
+	"version": "0.6.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 30a859b84d2b..599b1cc5833e 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.4
+
 ## 6.12.0-rc.3
 
 ## 6.12.0-rc.2
@@ -32,6 +34,7 @@
 
   - @rocket.chat/ui-kit@0.36.1-rc.0
   </details>
+
 ## 6.11.2
 
 ## 6.11.1
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 43cbc3a6292f..75705fb91541 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.3",
+	"version": "6.12.0-rc.4",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 7e136b7cde6f..3547dc00b3d5 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,7 +1,17 @@
 # @rocket.chat/cron
 
+## 0.1.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
 
 ## 0.1.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -39,6 +49,7 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/models@0.2.1-rc.0
   </details>
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 8fb41d605846..a91aac727d37 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6-rc.3",
+	"version": "0.1.6-rc.4",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 1e70d11ad1b3..f95d31c25370 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,7 +1,18 @@
 # @rocket.chat/ddp-client
 
+## 0.3.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/api-client@0.2.6-rc.4
+  </details>
 
 ## 0.3.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -43,7 +54,9 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/api-client@0.2.4-rc.0
   </details>
+
 ## 0.3.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index bb3c9f36a066..f477fc732ca4 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.6-rc.3",
+	"version": "0.3.6-rc.4",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index dfcd7c6bada3..d44f1c9c56ce 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Change Log
 
+## 10.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/gazzodown@10.0.0-rc.4
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  - @rocket.chat/ui-avatar@6.0.0-rc.4
+  - @rocket.chat/ui-video-conf@10.0.0-rc.4
+  </details>
+
 ## 10.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -54,6 +68,7 @@
   </details>
 
 ## 9.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index cbc2e9c29d62..ab8dee206f07 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.3",
+  "version": "10.0.0-rc.4",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.3",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.3",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.4",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.4",
     "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.3",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.4",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 4c142863bf66..b29df6d2887b 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,7 +1,18 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  - @rocket.chat/ui-client@10.0.0-rc.4
+  </details>
 
 ## 10.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -45,7 +56,9 @@
   - @rocket.chat/core-typings@6.12.0-rc.0
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 2716d57f0250..bae2ed3fdb15 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.3",
+	"version": "10.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
+		"@rocket.chat/ui-client": "10.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 53c7dcf1de93..bcffe470bc5a 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,11 +1,20 @@
 # @rocket.chat/instance-status
 
+## 0.1.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.3-rc.4
+  </details>
 
 ## 0.1.6-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
-  
+
   - @rocket.chat/models@0.2.2-rc.3
   </details>
 
@@ -36,6 +45,7 @@
 </details>
 
 ## 0.1.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 128759dcf044..aa8e0432c99b 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.6-rc.3",
+	"version": "0.1.6-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index f306219ec318..08c7ccff3c86 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,6 +1,16 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.3-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.4
+  </details>
+
 ## 1.19.3-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 7ba74445aec0..3153925ef531 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3-rc.3",
+	"version": "1.19.3-rc.4",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 8a237189774f..e411eea4e61c 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  </details>
 
 ## 0.6.2
 
@@ -9,7 +17,9 @@
 
   - @rocket.chat/core-typings@6.11.2
   </details>
+
 ## 0.7.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index bb45b3a08ba6..812ec223bd0f 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.3",
+	"version": "0.7.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index fd8131004e2f..b45739ee48e8 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,7 +1,16 @@
 # @rocket.chat/models
 
+## 0.2.3-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.4
+  </details>
 
 ## 0.2.3-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -34,8 +43,10 @@
 - <details><summary>Updated dependencies [7f88158036, a14c0678bb, e28be46db7]:</summary>
 
   - @rocket.chat/model-typings@0.7.0-rc.0
-</details>
+  </details>
+
 ## 0.2.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/models/package.json b/packages/models/package.json
index f61f9c014fd3..74af2a1a3865 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3-rc.3",
+	"version": "0.2.3-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 9aebef66f43c..93c80293523d 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,7 +1,16 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  </details>
 
 ## 6.12.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -41,7 +50,9 @@
   - @rocket.chat/ui-kit@0.36.1-rc.0
   - @rocket.chat/core-typings@6.12.0-rc.0
   </details>
+
 ## 6.11.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index c248c18267f9..2c6b13e5dd29 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.3",
+	"version": "6.12.0-rc.4",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 18721b7d5314..ebd57cd5bcc9 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,6 +1,16 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  </details>
+
 ## 6.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -35,7 +45,9 @@
 
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 5.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 78d9ffe249d3..a31d61205759 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.3",
+	"version": "6.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 37f8e5542051..037fd7e893b9 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,7 +1,16 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  </details>
 
 ## 10.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -36,7 +45,9 @@
 
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 025db00782a7..9d1e1b2c356f 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.3",
+	"version": "10.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index c9d8e9e1647e..2a846d730bc0 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,12 +1,22 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.4
+  - @rocket.chat/rest-typings@6.12.0-rc.4
+  - @rocket.chat/ddp-client@0.3.6-rc.4
+  </details>
 
 ## 10.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
- 
-  
+
   - @rocket.chat/core-typings@6.12.0-rc.3
   - @rocket.chat/rest-typings@6.12.0-rc.3
   - @rocket.chat/ddp-client@0.3.5-rc.3
@@ -47,6 +57,7 @@
   </details>
 
 ## 9.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 7f82271d1d30..1a27dd1de101 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.3",
+	"version": "10.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 fa727d7a25fc..85c06375e2a0 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,11 +1,21 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  - @rocket.chat/ui-avatar@6.0.0-rc.4
+  </details>
+
 ## 10.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
 
-  
   - @rocket.chat/ui-contexts@10.0.0-rc.3
   - @rocket.chat/ui-avatar@6.0.0-rc.3
   </details>
@@ -41,7 +51,9 @@
   - @rocket.chat/ui-avatar@6.0.0-rc.0
   - @rocket.chat/ui-contexts@10.0.0-rc.0
   </details>
+
 ## 9.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 50b5f67c5a8b..0718e7ce8765 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": "10.0.0-rc.3",
+	"version": "10.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index b46e958bffe3..ad7bfcc86739 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,6 +1,18 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.4
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  - @rocket.chat/ui-avatar@6.0.0-rc.4
+  </details>
+
 ## 0.4.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -49,6 +61,7 @@
   </details>
 
 ## 0.3.5
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -56,7 +69,7 @@
   - @rocket.chat/fuselage-ui-kit@9.0.2
   - @rocket.chat/ui-contexts@9.0.2
   - @rocket.chat/ui-avatar@5.0.2
-</details>
+  </details>
 
 ## 0.3.4
 
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 5ba9ceebb62e..008ebcbbdc62 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.3",
+  "version": "0.4.0-rc.4",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index fc755af1cd97..c549e60d2d0a 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,6 +1,16 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.4
+  </details>
+
 ## 10.0.0-rc.3
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
@@ -38,6 +48,7 @@
   </details>
 
 ## 9.0.2
+
 ### Patch Changes
 
 - <details><summary>Updated dependencies []:</summary>
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 54d67b89dbbe..ec2ab7a9f089 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": "10.0.0-rc.3",
+	"version": "10.0.0-rc.4",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From efb41b43ffd3c72a9882e67251601d747b823d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <43561537+rique223@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:23:04 -0300
Subject: [PATCH 039/170] regression: Add password verification to new user
 panel contextual bar (#33198)

---
 .../admin/users/AdminUserSetRandomPasswordContent.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
index 814ab8a22776..25d7a52a6ad4 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
@@ -1,6 +1,6 @@
 import { Box, FieldError, FieldLabel, FieldRow, PasswordInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { PasswordVerifier } from '@rocket.chat/ui-client';
+import { PasswordVerifier, useValidatePassword } from '@rocket.chat/ui-client';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { Control, FieldErrors } from 'react-hook-form';
@@ -35,6 +35,8 @@ const AdminUserSetRandomPasswordContent = ({
 	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
 	const passwordConfirmationPlaceholder = String(useSetting('Accounts_ConfirmPasswordPlaceholder'));
 
+	const passwordIsValid = useValidatePassword(password);
+
 	return (
 		<>
 			<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1} mbe={8} mbs={12}>
@@ -53,7 +55,10 @@ const AdminUserSetRandomPasswordContent = ({
 				<Controller
 					control={control}
 					name='password'
-					rules={{ required: isNewUserPage && t('The_field_is_required', t('Password')) }}
+					rules={{
+						validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
+						required: isNewUserPage && t('The_field_is_required', t('Password')),
+					}}
 					render={({ field }) => (
 						<PasswordInput
 							{...field}
@@ -80,7 +85,7 @@ const AdminUserSetRandomPasswordContent = ({
 						rules={{
 							required: isNewUserPage && t('The_field_is_required', t('Confirm_password')),
 							deps: ['password'],
-							validate: (val: string) => (password === val ? true : t('Invalid_confirm_pass')),
+							validate: (confirmationPassword) => (password !== confirmationPassword ? t('Invalid_confirm_pass') : true),
 						}}
 						render={({ field }) => (
 							<PasswordInput

From bbd8b54e2dc47461c38a5bf2441db7de362a466a Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Tue, 27 Aug 2024 17:20:40 -0300
Subject: [PATCH 040/170] test: Add e2e tests for teams multi-step modals
 (#33168)

---
 .../contextualBar/channels/TeamsChannels.tsx  |   2 +-
 .../teams/contextualBar/info/TeamsInfo.tsx    |   3 +-
 .../tests/e2e/channel-management.spec.ts      |  32 +++---
 .../page-objects/fragments/home-content.ts    |  14 +++
 .../fragments/home-flextab-channels.ts        |  24 +++++
 .../fragments/home-flextab-members.ts         |   8 ++
 .../fragments/home-flextab-room.ts            |  40 +++++++
 .../page-objects/fragments/home-flextab.ts    |   4 +
 .../page-objects/fragments/home-sidenav.ts    |  16 ++-
 .../tests/e2e/page-objects/home-channel.ts    |  13 ---
 .../meteor/tests/e2e/retention-policy.spec.ts |   2 +-
 apps/meteor/tests/e2e/team-management.spec.ts | 102 +++++++++++++++---
 12 files changed, 210 insertions(+), 50 deletions(-)

diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
index 8bad02c135c8..b1847825ffab 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
@@ -110,7 +110,7 @@ const TeamsChannels = ({
 								{t('Total')}: {total}
 							</Box>
 						</Box>
-						<Box w='full' h='full' overflow='hidden' flexShrink={1}>
+						<Box w='full' h='full' role='list' overflow='hidden' flexShrink={1}>
 							<Virtuoso
 								totalCount={total}
 								data={channels}
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index fc1b2905478e..f28f4c8b5742 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -109,12 +109,13 @@ const TeamsInfo = ({
 				flexGrow={0}
 				key='menu'
 				maxHeight='initial'
+				title={t('More')}
 				secondary
 				renderItem={({ label: { label, icon }, ...props }): ReactElement => <Option {...props} label={label} icon={icon} />}
 				options={menuOptions}
 			/>
 		);
-	}, [menuOptions]);
+	}, [t, menuOptions]);
 
 	const actions = useMemo(() => {
 		const mapAction = ([key, { label, icon, action }]: [string, Action]): ReactElement => (
diff --git a/apps/meteor/tests/e2e/channel-management.spec.ts b/apps/meteor/tests/e2e/channel-management.spec.ts
index dc0ec9b1ebaa..cd3ab365240f 100644
--- a/apps/meteor/tests/e2e/channel-management.spec.ts
+++ b/apps/meteor/tests/e2e/channel-management.spec.ts
@@ -64,7 +64,7 @@ test.describe.serial('channel-management', () => {
 		await poHomeChannel.tabs.members.addUser('user1');
 
 		await expect(poHomeChannel.tabs.members.memberOption('user1')).toBeVisible();
-		await expect(poHomeChannel.getSystemMessageByText('added user1')).toBeVisible();
+		await expect(poHomeChannel.content.getSystemMessageByText('added user1')).toBeVisible();
 	});
 
 	test('should edit topic of targetChannel', async ({ page }) => {
@@ -78,7 +78,7 @@ test.describe.serial('channel-management', () => {
 		await poHomeChannel.tabs.btnRoomInfo.click();
 		await expect(page.getByRole('heading', { name: 'hello-topic-edited' })).toBeVisible();
 		await expect(page.getByRole('dialog', { name: 'Channel info' })).toContainText('hello-topic-edited');
-		await expect(poHomeChannel.getSystemMessageByText('changed room topic to hello-topic-edited')).toBeVisible();
+		await expect(poHomeChannel.content.getSystemMessageByText('changed room topic to hello-topic-edited')).toBeVisible();
 	});
 
 	test('should edit announcement of targetChannel', async ({ page }) => {
@@ -91,7 +91,7 @@ test.describe.serial('channel-management', () => {
 		await poHomeChannel.dismissToast();
 		await poHomeChannel.tabs.btnRoomInfo.click();
 		await expect(page.getByRole('dialog', { name: 'Channel info' })).toContainText('hello-announcement-edited');
-		await expect(poHomeChannel.getSystemMessageByText('changed room announcement to: hello-announcement-edited')).toBeVisible();
+		await expect(poHomeChannel.content.getSystemMessageByText('changed room announcement to: hello-announcement-edited')).toBeVisible();
 	});
 
 	test('should edit description of targetChannel', async ({ page }) => {
@@ -104,7 +104,7 @@ test.describe.serial('channel-management', () => {
 		await poHomeChannel.dismissToast();
 		await poHomeChannel.tabs.btnRoomInfo.click();
 		await expect(page.getByRole('dialog', { name: 'Channel info' })).toContainText('hello-description-edited');
-		await expect(poHomeChannel.getSystemMessageByText('changed room description to: hello-description-edited')).toBeVisible();
+		await expect(poHomeChannel.content.getSystemMessageByText('changed room description to: hello-description-edited')).toBeVisible();
 	});
 
 	test('should edit name of targetChannel', async ({ page }) => {
@@ -202,11 +202,11 @@ test.describe.serial('channel-management', () => {
 			await poHomeChannel.tabs.members.showAllUsers();
 			await poHomeChannel.tabs.members.muteUser('user1');
 
-			await expect(poHomeChannel.getSystemMessageByText('muted user1')).toBeVisible();
+			await expect(poHomeChannel.content.getSystemMessageByText('muted user1')).toBeVisible();
 
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await expect(user1Channel.readOnlyFooter).toBeVisible();
 		});
 
@@ -216,11 +216,11 @@ test.describe.serial('channel-management', () => {
 			await poHomeChannel.tabs.members.showAllUsers();
 			await poHomeChannel.tabs.members.unmuteUser('user1');
 
-			await expect(poHomeChannel.getSystemMessageByText('unmuted user1')).toBeVisible();
+			await expect(poHomeChannel.content.getSystemMessageByText('unmuted user1')).toBeVisible();
 
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await expect(user1Channel.composer).toBeVisible();
 		});
 
@@ -230,11 +230,11 @@ test.describe.serial('channel-management', () => {
 			await poHomeChannel.tabs.members.showAllUsers();
 			await poHomeChannel.tabs.members.setUserAsModerator('user1');
 
-			await expect(poHomeChannel.getSystemMessageByText('set user1 as moderator')).toBeVisible();
+			await expect(poHomeChannel.content.getSystemMessageByText('set user1 as moderator')).toBeVisible();
 
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await user1Channel.tabs.btnRoomInfo.click();
 			await expect(user1Channel.tabs.room.btnEdit).toBeVisible();
 		});
@@ -245,12 +245,12 @@ test.describe.serial('channel-management', () => {
 			await poHomeChannel.tabs.members.showAllUsers();
 			await poHomeChannel.tabs.members.setUserAsOwner('user1');
 
-			await expect(poHomeChannel.getSystemMessageByText('set user1 as owner')).toBeVisible();
+			await expect(poHomeChannel.content.getSystemMessageByText('set user1 as owner')).toBeVisible();
 
 			const user1Page = await browser.newPage({ storageState: Users.user1.state });
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await user1Channel.tabs.btnRoomInfo.click();
 
 			await user1Channel.tabs.room.btnMore.click();
@@ -271,7 +271,7 @@ test.describe.serial('channel-management', () => {
 
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await user1Channel.content.sendMessage('message to check ignore');
 
 			await expect(poHomeChannel.content.lastUserMessageBody).toContainText('This message was ignored');
@@ -282,7 +282,7 @@ test.describe.serial('channel-management', () => {
 
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await user1Channel.content.sendMessage('only message to be unignored');
 
 			await poHomeChannel.sidenav.openChat(targetChannel);
@@ -295,7 +295,7 @@ test.describe.serial('channel-management', () => {
 		test('should unignore user1 messages', async () => {
 			const user1Channel = new HomeChannel(user1Page);
 			await user1Page.goto(`/channel/${targetChannel}`);
-			await user1Channel.waitForChannel();
+			await user1Channel.content.waitForChannel();
 			await user1Channel.content.sendMessage('message before being unignored');
 
 			await poHomeChannel.sidenav.openChat(targetChannel);
@@ -327,7 +327,7 @@ test.describe.serial('channel-management', () => {
 			const channel = new HomeChannel(user1Page);
 
 			await user1Page.goto(`/channel/${channelName}`);
-			await channel.waitForChannel();
+			await channel.content.waitForChannel();
 			await expect(user1Page.locator('button >> text="Join"')).toBeVisible();
 		});
 	});
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 ec761ddbfa73..9d5e2081ca93 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -2,6 +2,8 @@ import fs from 'fs/promises';
 
 import type { Locator, Page } from '@playwright/test';
 
+import { expect } from '../../utils/test';
+
 export class HomeContent {
 	protected readonly page: Page;
 
@@ -376,7 +378,19 @@ export class HomeContent {
 		return this.page.locator('div[class="swiper-slide swiper-slide-active"] img');
 	}
 
+	// TODO: use getSystemMessageByText instead
 	findSystemMessage(text: string): Locator {
 		return this.page.locator(`[data-qa-type="system-message-body"] >> text="${text}"`);
 	}
+
+	getSystemMessageByText(text: string): Locator {
+		return this.page.locator('[aria-roledescription="system message"]', { hasText: text });
+	}
+
+	async waitForChannel(): Promise<void> {
+		await this.page.locator('role=main').waitFor();
+		await this.page.locator('role=main >> role=heading[level=1]').waitFor();
+
+		await expect(this.page.locator('role=main >> role=list')).not.toHaveAttribute('aria-busy', 'true');
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-channels.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-channels.ts
index b09e90d0cd61..98d864598834 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-channels.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-channels.ts
@@ -7,6 +7,10 @@ export class HomeFlextabChannels {
 		this.page = page;
 	}
 
+	get channelsTab(): Locator {
+		return this.page.getByRole('dialog', { exact: true });
+	}
+
 	get btnAddExisting(): Locator {
 		return this.page.locator('button >> text="Add Existing"');
 	}
@@ -18,4 +22,24 @@ export class HomeFlextabChannels {
 	get btnAdd(): Locator {
 		return this.page.locator('role=dialog >> role=group >> role=button[name=Add]');
 	}
+
+	get channelsList(): Locator {
+		return this.channelsTab.getByRole('list');
+	}
+
+	channelOption(name: string) {
+		return this.channelsTab.locator('li', { hasText: name });
+	}
+
+	async openChannelOptionMoreActions(name: string) {
+		await this.channelOption(name).hover();
+		await this.channelOption(name).locator('role=button[name="More"]').click();
+	}
+
+	async confirmRemoveChannel() {
+		return this.page
+			.getByRole('dialog', { name: 'Are you sure?', exact: true })
+			.getByRole('button', { name: 'Remove', exact: true })
+			.click();
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts
index d4a9638691be..6a2740831e2c 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts
@@ -79,4 +79,12 @@ export class HomeFlextabMembers {
 	async unignoreUser(username: string) {
 		await this.ignoreUserAction('Unignore', username);
 	}
+
+	get confirmRemoveUserModal() {
+		return this.page.getByRole('dialog', { name: 'Confirmation', exact: true });
+	}
+
+	async confirmRemoveUser() {
+		return this.confirmRemoveUserModal.getByRole('button', { name: 'Remove', exact: true }).click();
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
index a76d89a9d962..3d0fca96a37a 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
@@ -7,6 +7,10 @@ export class HomeFlextabRoom {
 		this.page = page;
 	}
 
+	get roomInfoTab(): Locator {
+		return this.page.getByRole('dialog', { exact: true });
+	}
+
 	get btnEdit(): Locator {
 		return this.page.locator('role=button[name="Edit"]');
 	}
@@ -15,6 +19,42 @@ export class HomeFlextabRoom {
 		return this.page.locator('role=button[name="More"]');
 	}
 
+	get btnLeave(): Locator {
+		return this.roomInfoTab.locator('role=button[name="Leave"]');
+	}
+
+	get btnDelete(): Locator {
+		return this.roomInfoTab.locator('role=button[name="Delete"]');
+	}
+
+	getMoreOption(option: string) {
+		return this.roomInfoTab.locator(`role=menuitem[name="${option}"]`);
+	}
+
+	get confirmLeaveModal(): Locator {
+		return this.page.getByRole('dialog', { name: 'Confirmation', exact: true });
+	}
+
+	async confirmLeave() {
+		return this.confirmLeaveModal.getByRole('button', { name: 'Leave', exact: true }).click();
+	}
+
+	get confirmDeleteTeamModal(): Locator {
+		return this.page.getByRole('dialog', { name: 'Delete team', exact: true });
+	}
+
+	async confirmDeleteTeam() {
+		return this.confirmDeleteTeamModal.getByRole('button', { name: 'Yes, delete', exact: true }).click();
+	}
+
+	get confirmConvertModal(): Locator {
+		return this.page.getByRole('dialog', { name: 'Confirmation', exact: true });
+	}
+
+	async confirmConvert() {
+		return this.confirmConvertModal.getByRole('button', { name: 'Convert', exact: true }).click();
+	}
+
 	get optionDelete(): Locator {
 		return this.page.locator('label[data-key="delete"]');
 	}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
index 2ae5acf5fb9d..6e22bea99faf 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
@@ -36,6 +36,10 @@ export class HomeFlextab {
 		return this.page.locator('[data-qa-id="ToolBoxAction-hash"]');
 	}
 
+	get btnTeamMembers(): Locator {
+		return this.page.locator('role=menuitem[name="Teams Members"]');
+	}
+
 	get kebab(): Locator {
 		return this.page.locator('role=button[name="Options"]');
 	}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
index 0f17b7ccb5d4..d0bdd5028010 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -95,7 +95,16 @@ export class HomeSidenav {
 	}
 
 	async openSearch(): Promise<void> {
-		await this.page.locator('role=button[name="Search"]').click();
+		await this.page.locator('role=navigation >> role=button[name=Search]').click();
+	}
+
+	getSearchRoomByName(name: string): Locator {
+		return this.page.locator(`role=search >> role=listbox >> role=link >> text="${name}"`);
+	}
+
+	async searchRoom(name: string): Promise<void> {
+		await this.openSearch();
+		await this.page.locator('role=search >> role=searchbox').fill(name);
 	}
 
 	async logout(): Promise<void> {
@@ -109,9 +118,8 @@ export class HomeSidenav {
 	}
 
 	async openChat(name: string): Promise<void> {
-		await this.page.locator('role=navigation >> role=button[name=Search]').click();
-		await this.page.locator('role=search >> role=searchbox').fill(name);
-		await this.page.locator(`role=search >> role=listbox >> role=link >> text="${name}"`).click();
+		await this.searchRoom(name);
+		await this.getSearchRoomByName(name).click();
 		await this.waitForChannel();
 	}
 
diff --git a/apps/meteor/tests/e2e/page-objects/home-channel.ts b/apps/meteor/tests/e2e/page-objects/home-channel.ts
index 7b3c0d093ddc..a2784ea4c67b 100644
--- a/apps/meteor/tests/e2e/page-objects/home-channel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-channel.ts
@@ -1,6 +1,5 @@
 import type { Locator, Page } from '@playwright/test';
 
-import { expect } from '../utils/test';
 import { HomeContent, HomeSidenav, HomeFlextab } from './fragments';
 
 export class HomeChannel {
@@ -27,14 +26,6 @@ export class HomeChannel {
 		return this.page.locator('[data-qa="ContextualbarActionClose"]');
 	}
 
-	async waitForChannel(): Promise<void> {
-		await this.page.locator('role=main').waitFor();
-		await this.page.locator('role=main >> role=heading[level=1]').waitFor();
-
-		await expect(this.page.locator('role=main >> .rcx-skeleton')).toHaveCount(0);
-		await expect(this.page.locator('role=main >> role=list')).not.toHaveAttribute('aria-busy', 'true');
-	}
-
 	async dismissToast() {
 		// this is a workaround for when the toast is blocking the click of the button
 		await this.toastSuccess.locator('button >> i.rcx-icon--name-cross.rcx-icon').click();
@@ -68,8 +59,4 @@ export class HomeChannel {
 	get roomHeaderToolbar(): Locator {
 		return this.page.locator('[role=toolbar][aria-label="Primary Room actions"]');
 	}
-
-	getSystemMessageByText(text: string): Locator {
-		return this.page.locator('[aria-roledescription="system message"]', { hasText: text });
-	}
 }
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index 708e5f19b520..128f8eea2d74 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -118,7 +118,7 @@ test.describe.serial('retention-policy', () => {
 				await auxContext.poHomeChannel.tabs.room.checkboxReadOnly.check();
 				await auxContext.poHomeChannel.tabs.room.btnSave.click();
 
-				await expect(auxContext.poHomeChannel.getSystemMessageByText('set room to read only')).toBeVisible();
+				await expect(auxContext.poHomeChannel.content.getSystemMessageByText('set room to read only')).toBeVisible();
 			});
 		});
 
diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index 55530302ca96..1f0b35317ffb 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -24,18 +24,18 @@ test.describe.serial('teams-management', () => {
 		await page.goto('/home');
 	});
 
-	test('expect create "targetTeam" private', async ({ page }) => {
+	test('should create targetTeam private', async ({ page }) => {
 		await poHomeTeam.sidenav.openNewByLabel('Team');
-		await poHomeTeam.inputTeamName.type(targetTeam);
+		await poHomeTeam.inputTeamName.fill(targetTeam);
 		await poHomeTeam.addMember('user1');
 		await poHomeTeam.btnTeamCreate.click();
 
 		await expect(page).toHaveURL(`/group/${targetTeam}`);
 	});
 
-	test('expect create "targetTeamNonPrivate" non private', async ({ page }) => {
+	test('should create targetTeamNonPrivate non private', async ({ page }) => {
 		await poHomeTeam.sidenav.openNewByLabel('Team');
-		await poHomeTeam.inputTeamName.type(targetTeamNonPrivate);
+		await poHomeTeam.inputTeamName.fill(targetTeamNonPrivate);
 		await poHomeTeam.textPrivate.click();
 		await poHomeTeam.addMember('user1');
 		await poHomeTeam.btnTeamCreate.click();
@@ -43,9 +43,9 @@ test.describe.serial('teams-management', () => {
 		await expect(page).toHaveURL(`/channel/${targetTeamNonPrivate}`);
 	});
 
-	test('expect create "targetTeamReadOnly" readonly', async ({ page }) => {
+	test('should create targetTeamReadOnly readonly', async ({ page }) => {
 		await poHomeTeam.sidenav.openNewByLabel('Team');
-		await poHomeTeam.inputTeamName.type(targetTeamReadOnly);
+		await poHomeTeam.inputTeamName.fill(targetTeamReadOnly);
 		await poHomeTeam.sidenav.advancedSettingsAccordion.click();
 		await poHomeTeam.textReadOnly.click();
 		await poHomeTeam.addMember('user1');
@@ -54,15 +54,15 @@ test.describe.serial('teams-management', () => {
 		await expect(page).toHaveURL(`/group/${targetTeamReadOnly}`);
 	});
 
-	test('expect throw validation error if team name already exists', async () => {
+	test('should throw validation error if team name already exists', async () => {
 		await poHomeTeam.sidenav.openNewByLabel('Team');
-		await poHomeTeam.inputTeamName.type(targetTeam);
+		await poHomeTeam.inputTeamName.fill(targetTeam);
 		await poHomeTeam.btnTeamCreate.click();
 
 		await expect(poHomeTeam.inputTeamName).toHaveAttribute('aria-invalid', 'true');
 	});
 
-	test('expect send hello in the "targetTeam" and reply in a thread', async ({ page }) => {
+	test('should send hello in the targetTeam and reply in a thread', async ({ page }) => {
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.content.sendMessage('hello');
 		await page.locator('[data-qa-type="message"]').last().hover();
@@ -73,25 +73,28 @@ test.describe.serial('teams-management', () => {
 		await expect(poHomeTeam.tabs.flexTabViewThreadMessage).toHaveText('any-reply-message');
 	});
 
-	test('expect set "targetTeam" as readonly', async () => {
+	test('should set targetTeam as readonly', async () => {
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnEdit.click();
 		await poHomeTeam.tabs.room.checkboxReadOnly.click();
 		await poHomeTeam.tabs.room.btnSave.click();
+
+		await expect(poHomeTeam.content.getSystemMessageByText('set room to read only')).toBeVisible();
 	});
 
-	test('expect insert a channel inside "targetTeam"', async ({ page }) => {
+	test('should insert targetChannel inside targetTeam', async ({ page }) => {
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnChannels.click();
 		await poHomeTeam.tabs.channels.btnAddExisting.click();
-		await poHomeTeam.tabs.channels.inputChannels.type(targetChannel, { delay: 100 });
+		await poHomeTeam.tabs.channels.inputChannels.fill(targetChannel);
 		await page.locator(`.rcx-option__content:has-text("${targetChannel}")`).click();
 		await poHomeTeam.tabs.channels.btnAdd.click();
-		await expect(page.getByRole('dialog').getByRole('listitem')).toContainText(targetChannel);
+
+		await expect(poHomeTeam.tabs.channels.channelsList).toContainText(targetChannel);
 	});
 
-	test('should access team channel through "targetTeam" header', async ({ page }) => {
+	test('should access team channel through targetTeam header', async ({ page }) => {
 		await poHomeTeam.sidenav.openChat(targetChannel);
 		await page.getByRole('button', { name: targetChannel }).first().focus();
 		await page.keyboard.press('Tab');
@@ -100,4 +103,75 @@ test.describe.serial('teams-management', () => {
 
 		await expect(page).toHaveURL(`/group/${targetTeam}`);
 	});
+
+	test('should remove targetChannel from targetTeam', async ({ page }) => {
+		await poHomeTeam.sidenav.openChat(targetTeam);
+		await poHomeTeam.tabs.btnChannels.click();
+		await poHomeTeam.tabs.channels.openChannelOptionMoreActions(targetChannel);
+		await page.getByRole('menu', { exact: true }).getByRole('menuitem', { name: 'Remove from team' }).click();
+		await poHomeTeam.tabs.channels.confirmRemoveChannel();
+
+		await expect(poHomeTeam.tabs.channels.channelsList).not.toBeVisible();
+	});
+
+	test('should remove user1 from targetTeamNonPrivate', async () => {
+		test.fail();
+		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
+		await poHomeTeam.tabs.kebab.click({ force: true });
+		await poHomeTeam.tabs.btnTeamMembers.click();
+		await poHomeTeam.tabs.members.showAllUsers();
+		await poHomeTeam.tabs.members.openMemberOptionMoreActions('user1');
+		await poHomeTeam.tabs.members.getMenuItemAction('Remove from team').click();
+		await expect(poHomeTeam.tabs.members.confirmRemoveUserModal).toBeVisible();
+
+		await poHomeTeam.tabs.members.confirmRemoveUser();
+		await expect(poHomeTeam.tabs.members.memberOption('user1')).not.toBeVisible();
+	});
+
+	test('should delete targetTeamNonPrivate', async () => {
+		test.fail();
+		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
+		await poHomeTeam.tabs.btnRoomInfo.click();
+		await poHomeTeam.tabs.room.btnDelete.click();
+		await expect(poHomeTeam.tabs.room.confirmDeleteTeamModal).toBeVisible();
+
+		await poHomeTeam.tabs.room.confirmDeleteTeam();
+		await poHomeTeam.sidenav.searchRoom(targetTeamNonPrivate);
+		await expect(poHomeTeam.sidenav.getSearchRoomByName(targetTeamNonPrivate)).not.toBeVisible();
+	});
+
+	test('should user1 leave from targetTeam', async ({ browser }) => {
+		test.fail();
+		const user1Page = await browser.newPage({ storageState: Users.user1.state });
+		const user1Channel = new HomeTeam(user1Page);
+		await user1Page.goto(`/group/${targetTeam}`);
+		await user1Channel.content.waitForChannel();
+
+		await user1Channel.tabs.btnRoomInfo.click();
+		await user1Channel.tabs.room.btnLeave.click();
+		await expect(user1Channel.tabs.room.confirmLeaveModal).toBeVisible();
+
+		await user1Channel.tabs.room.confirmLeave();
+		await user1Page.close();
+
+		await poHomeTeam.sidenav.openChat(targetTeam);
+		await poHomeTeam.tabs.kebab.click({ force: true });
+		await poHomeTeam.tabs.btnTeamMembers.click();
+		await poHomeTeam.tabs.members.showAllUsers();
+		await expect(poHomeTeam.tabs.members.memberOption('user1')).not.toBeVisible();
+	});
+
+	test('should convert team into a channel', async ({ page }) => {
+		test.fail();
+		await poHomeTeam.sidenav.openChat(targetTeam);
+		await poHomeTeam.tabs.btnRoomInfo.click();
+		await poHomeTeam.tabs.room.btnMore.click();
+		await page.getByRole('listbox', { exact: true }).getByRole('option', { name: 'Convert to Channel' }).click();
+		await expect(poHomeTeam.tabs.room.confirmConvertModal).toBeVisible();
+
+		await poHomeTeam.tabs.room.confirmConvert();
+
+		// TODO: improve this locator and check the action reactivity
+		await expect(poHomeTeam.content.getSystemMessageByText(`converted #${targetTeam} to channel`)).toBeVisible();
+	});
 });

From a3d7ce081b72b5899dc99fc5536567cedde85f40 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Wed, 28 Aug 2024 11:01:41 -0300
Subject: [PATCH 041/170] fix: Multi-step modals closing unexpectedly (#33158)

---
 .changeset/wise-avocados-taste.md             | 5 +++++
 apps/meteor/tests/e2e/team-management.spec.ts | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/wise-avocados-taste.md

diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
new file mode 100644
index 000000000000..c4c9bce010b8
--- /dev/null
+++ b/.changeset/wise-avocados-taste.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where multi-step modals were closing unexpectedly
diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index 1f0b35317ffb..74daca0e7be3 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -115,7 +115,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should remove user1 from targetTeamNonPrivate', async () => {
-		test.fail();
 		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
 		await poHomeTeam.tabs.kebab.click({ force: true });
 		await poHomeTeam.tabs.btnTeamMembers.click();
@@ -129,7 +128,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should delete targetTeamNonPrivate', async () => {
-		test.fail();
 		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnDelete.click();
@@ -141,7 +139,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should user1 leave from targetTeam', async ({ browser }) => {
-		test.fail();
 		const user1Page = await browser.newPage({ storageState: Users.user1.state });
 		const user1Channel = new HomeTeam(user1Page);
 		await user1Page.goto(`/group/${targetTeam}`);
@@ -162,7 +159,6 @@ test.describe.serial('teams-management', () => {
 	});
 
 	test('should convert team into a channel', async ({ page }) => {
-		test.fail();
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnMore.click();

From 757d8becced31f93fa590b4f3230fef96200d844 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Wed, 4 Sep 2024 02:59:32 +0000
Subject: [PATCH 042/170] Release 6.12.0-rc.5

[no ci]
---
 .changeset/bump-patch-1725418762836.md        |  5 +++
 .changeset/pre.json                           |  4 ++-
 apps/meteor/CHANGELOG.md                      | 34 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 +++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 13 +++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 +++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 +++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 +++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/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/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               |  9 +++++
 packages/ui-client/package.json               |  4 +--
 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/uikit-playground/CHANGELOG.md        | 11 ++++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 20 +++++------
 69 files changed, 426 insertions(+), 55 deletions(-)
 create mode 100644 .changeset/bump-patch-1725418762836.md

diff --git a/.changeset/bump-patch-1725418762836.md b/.changeset/bump-patch-1725418762836.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1725418762836.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 6aa4b3dd5bf9..966b3deeed85 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -69,6 +69,7 @@
     "bump-patch-1724977971712",
     "bump-patch-1725326060827",
     "bump-patch-1725387211812",
+    "bump-patch-1725418762836",
     "calm-tigers-peel",
     "cool-actors-sin",
     "cool-rocks-remember",
@@ -105,6 +106,7 @@
     "thirty-dryers-help",
     "twelve-windows-train",
     "two-bikes-crash",
-    "violet-radios-begin"
+    "violet-radios-begin",
+    "wise-avocados-taste"
   ]
 }
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index a3c6f38176ac..44c13e0b1085 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.5
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33158](https://github.com/RocketChat/Rocket.Chat/pull/33158)) Fixes an issue where multi-step modals were closing unexpectedly
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/license@0.2.6-rc.5
+  - @rocket.chat/omnichannel-services@0.3.3-rc.5
+  - @rocket.chat/pdf-worker@0.2.3-rc.5
+  - @rocket.chat/presence@0.2.6-rc.5
+  - @rocket.chat/api-client@0.2.6-rc.5
+  - @rocket.chat/apps@0.1.6-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/cron@0.1.6-rc.5
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.5
+  - @rocket.chat/gazzodown@10.0.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.3-rc.5
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.5
+  - @rocket.chat/ui-client@10.0.0-rc.5
+  - @rocket.chat/ui-video-conf@10.0.0-rc.5
+  - @rocket.chat/web-ui-registration@10.0.0-rc.5
+  - @rocket.chat/instance-status@0.1.6-rc.5
+  </details>
+
 ## 6.12.0-rc.4
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 77fdbe3d6942..4c0b261312d8 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.4"
+	"version": "6.12.0-rc.5"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 8ff59eaabd3e..ff77c0e62483 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.3-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 1.3.3-rc.4
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 5ef1b16af1c2..29bbca9680fc 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": "1.3.3-rc.4",
+	"version": "1.3.3-rc.5",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b1d00dd1b931..f77584f2ca85 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": "6.12.0-rc.4",
+	"version": "6.12.0-rc.5",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index ab5fcbb3f11d..6e93e3205b2e 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.4.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 16d72db9844e..9e4b1a45f45f 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.6-rc.4",
+	"version": "0.4.6-rc.5",
 	"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 6d82edcf5808..7d80c71c36eb 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.4.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index b247e6f5dbb5..49c74b3ba748 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.6-rc.4",
+	"version": "0.4.6-rc.5",
 	"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 1c9c37bf3400..cc11a5613508 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  - @rocket.chat/instance-status@0.1.6-rc.5
+  </details>
+
 ## 0.3.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index fbe9173b32db..a6026e76eee5 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.6-rc.4",
+	"version": "0.3.6-rc.5",
 	"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 bfb8ca03b676..a2a3de3b28c0 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/omnichannel-services@0.3.3-rc.5
+  - @rocket.chat/pdf-worker@0.2.3-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.4.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 6ce61b7e1a71..e3432e3927dc 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.6-rc.4",
+	"version": "0.4.6-rc.5",
 	"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 238f5b922e4d..84684338e7db 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/presence@0.2.6-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.4.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 958b1da5293b..7f58cb4ea770 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.6-rc.4",
+	"version": "0.4.6-rc.5",
 	"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 9fd9667e3115..d7a8a85e5bc2 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/omnichannel-services@0.3.3-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.4.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 262787811e43..0483b364bd32 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.6-rc.4",
+	"version": "0.4.6-rc.5",
 	"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 fe29a82ffbba..dcdf5198a4e7 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.4.6-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 80ce39023626..1a8334a9504a 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.6-rc.4",
+	"version": "0.4.6-rc.5",
 	"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 0c857093c129..54c89d860d0c 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  </details>
+
 ## 0.2.6-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 694e6faaee5c..fe0bbef1bae2 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6-rc.4",
+	"version": "0.2.6-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 752cb9a7d8c2..3ddb60b3a36a 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.3-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/pdf-worker@0.2.3-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.3.3-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 10da64e14995..c74867095711 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.3-rc.4",
+	"version": "0.3.3-rc.5",
 	"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 c2fbbdf3c0cf..eb6d9e8641d9 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.3-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  </details>
+
 ## 0.2.3-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 037d976bb484..001c0a33490c 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.3-rc.4",
+	"version": "0.2.3-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 41d732348c84..1a9aa1fff4f5 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/core-services@0.6.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.2.6-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index f5e1bafa6747..63ec2f2d3486 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6-rc.4",
+	"version": "0.2.6-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 7b92d068451a..b21c9693ce1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.4",
+	"version": "6.12.0-rc.5",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index f572a907479f..141f53d057e8 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  </details>
+
 ## 0.2.6-rc.4
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 8483d0eed41a..aefccc5b873b 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.6-rc.4",
+	"version": "0.2.6-rc.5",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 37eff88a3664..55d3a88d8923 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  </details>
+
 ## 0.1.6-rc.4
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 3a36c524822c..874c9739bf6d 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6-rc.4",
+	"version": "0.1.6-rc.5",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index d1bb14df9ada..ff823ed84205 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.6.0-rc.4
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 409952cc0c37..14bd7d3a009c 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.4",
+	"version": "0.6.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 599b1cc5833e..1436a4574137 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.5
+
 ## 6.12.0-rc.4
 
 ## 6.12.0-rc.3
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 75705fb91541..7bf0e2ee1674 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.4",
+	"version": "6.12.0-rc.5",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 3547dc00b3d5..8ad0313ccacd 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.1.6-rc.4
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index a91aac727d37..c514833740fb 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6-rc.4",
+	"version": "0.1.6-rc.5",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index f95d31c25370..5c68668aa694 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/api-client@0.2.6-rc.5
+  </details>
+
 ## 0.3.6-rc.4
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index f477fc732ca4..c2c8d0bc21ed 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.6-rc.4",
+	"version": "0.3.6-rc.5",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index d44f1c9c56ce..008441a63a78 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 10.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/gazzodown@10.0.0-rc.5
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  - @rocket.chat/ui-avatar@6.0.0-rc.5
+  - @rocket.chat/ui-video-conf@10.0.0-rc.5
+  </details>
+
 ## 10.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index ab8dee206f07..a5f8bdcdc0f8 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.4",
+  "version": "10.0.0-rc.5",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.4",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.4",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.5",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.5",
     "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.4",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.5",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index b29df6d2887b..cfdd9da8c47d 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  - @rocket.chat/ui-client@10.0.0-rc.5
+  </details>
+
 ## 10.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index bae2ed3fdb15..f4011fa279e9 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.4",
+	"version": "10.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.4",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
+		"@rocket.chat/ui-client": "10.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index bcffe470bc5a..a28e9a9054e8 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.6-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.3-rc.5
+  </details>
+
 ## 0.1.6-rc.4
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index aa8e0432c99b..d5d015202ae1 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.6-rc.4",
+	"version": "0.1.6-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 08c7ccff3c86..e61f9f6bca12 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.3-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.5
+  </details>
+
 ## 1.19.3-rc.4
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 3153925ef531..d1b76b4315b4 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3-rc.4",
+	"version": "1.19.3-rc.5",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index e411eea4e61c..c648c97333fd 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  </details>
+
 ## 0.7.0-rc.4
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 812ec223bd0f..195ab53bb133 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.4",
+	"version": "0.7.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index b45739ee48e8..789ccd5cfad4 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.3-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.5
+  </details>
+
 ## 0.2.3-rc.4
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 74af2a1a3865..fc56fd13223e 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3-rc.4",
+	"version": "0.2.3-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 93c80293523d..56eef7e3c4be 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  </details>
+
 ## 6.12.0-rc.4
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 2c6b13e5dd29..2faad232effb 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.4",
+	"version": "6.12.0-rc.5",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index ebd57cd5bcc9..d7ca03f4634b 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  </details>
+
 ## 6.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index a31d61205759..c7b29cc62b5d 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.4",
+	"version": "6.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 037fd7e893b9..108c2675256f 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  </details>
+
 ## 10.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 9d1e1b2c356f..db009245d142 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.4",
+	"version": "10.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 2a846d730bc0..222312189158 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.5
+  - @rocket.chat/rest-typings@6.12.0-rc.5
+  - @rocket.chat/ddp-client@0.3.6-rc.5
+  </details>
+
 ## 10.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 1a27dd1de101..fbb0b39c1e45 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.4",
+	"version": "10.0.0-rc.5",
 	"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 85c06375e2a0..e02e5aa89f7c 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  - @rocket.chat/ui-avatar@6.0.0-rc.5
+  </details>
+
 ## 10.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 0718e7ce8765..7ac9d862af00 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": "10.0.0-rc.4",
+	"version": "10.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.4",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index ad7bfcc86739..f8b55932f38e 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.5
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  - @rocket.chat/ui-avatar@6.0.0-rc.5
+  </details>
+
 ## 0.4.0-rc.4
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 008ebcbbdc62..6091805421a0 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.4",
+  "version": "0.4.0-rc.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index c549e60d2d0a..8db07776d70b 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.5
+  </details>
+
 ## 10.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ec2ab7a9f089..e67c7e2bb3a2 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": "10.0.0-rc.4",
+	"version": "10.0.0-rc.5",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index a2919bb116e9..62935fd57614 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.3
-    "@rocket.chat/ui-contexts": 10.0.0-rc.3
+    "@rocket.chat/ui-avatar": 6.0.0-rc.4
+    "@rocket.chat/ui-contexts": 10.0.0-rc.4
     "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.3
+    "@rocket.chat/ui-video-conf": 10.0.0-rc.4
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.3
-    "@rocket.chat/ui-contexts": 10.0.0-rc.3
+    "@rocket.chat/ui-client": 10.0.0-rc.4
+    "@rocket.chat/ui-contexts": 10.0.0-rc.4
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.3
+    "@rocket.chat/ui-contexts": 10.0.0-rc.4
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.3
+    "@rocket.chat/ui-contexts": 10.0.0-rc.4
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.3
-    "@rocket.chat/ui-contexts": 10.0.0-rc.3
+    "@rocket.chat/ui-avatar": 6.0.0-rc.4
+    "@rocket.chat/ui-contexts": 10.0.0-rc.4
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.3
+    "@rocket.chat/ui-contexts": 10.0.0-rc.4
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 3ba185443e025fc7e649358693029319b411ce71 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Wed, 4 Sep 2024 09:33:49 -0300
Subject: [PATCH 043/170] regression: remove unnecessary log on
 notifyUsersOnMessage (#33207)

---
 apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
index 7d727ab49685..fdb99c83207c 100644
--- a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
+++ b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
@@ -168,8 +168,6 @@ export async function updateThreadUsersSubscriptions(message: IMessage, replies:
 }
 
 export async function notifyUsersOnMessage(message: IMessage, room: IRoom, roomUpdater: Updater<IRoom>): Promise<IMessage> {
-	console.log('notifyUsersOnMessage function');
-
 	// Skips this callback if the message was edited and increments it if the edit was way in the past (aka imported)
 	if (isEditedMessage(message)) {
 		if (Math.abs(moment(message.editedAt).diff(Date.now())) > 60000) {

From e12661abc648f9341ecfe0c3921e071590f3e235 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Wed, 4 Sep 2024 09:33:49 -0300
Subject: [PATCH 044/170] regression: remove unnecessary log on
 notifyUsersOnMessage (#33207)

---
 apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
index 7d727ab49685..fdb99c83207c 100644
--- a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
+++ b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
@@ -168,8 +168,6 @@ export async function updateThreadUsersSubscriptions(message: IMessage, replies:
 }
 
 export async function notifyUsersOnMessage(message: IMessage, room: IRoom, roomUpdater: Updater<IRoom>): Promise<IMessage> {
-	console.log('notifyUsersOnMessage function');
-
 	// Skips this callback if the message was edited and increments it if the edit was way in the past (aka imported)
 	if (isEditedMessage(message)) {
 		if (Math.abs(moment(message.editedAt).diff(Date.now())) > 60000) {

From 7ad8a87dd4e50ce54aa157531f0e28a5c121eb7b Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Wed, 4 Sep 2024 20:44:51 +0000
Subject: [PATCH 045/170] Release 6.12.0-rc.6

[no ci]
---
 .changeset/bump-patch-1725482682951.md        |  5 +++
 .changeset/pre.json                           |  1 +
 apps/meteor/CHANGELOG.md                      | 32 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 ++++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 13 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++++
 ee/packages/license/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/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               |  9 ++++++
 packages/ui-client/package.json               |  4 +--
 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/uikit-playground/CHANGELOG.md        | 11 +++++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 20 ++++++------
 69 files changed, 422 insertions(+), 54 deletions(-)
 create mode 100644 .changeset/bump-patch-1725482682951.md

diff --git a/.changeset/bump-patch-1725482682951.md b/.changeset/bump-patch-1725482682951.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1725482682951.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 966b3deeed85..d362d52ea894 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -70,6 +70,7 @@
     "bump-patch-1725326060827",
     "bump-patch-1725387211812",
     "bump-patch-1725418762836",
+    "bump-patch-1725482682951",
     "calm-tigers-peel",
     "cool-actors-sin",
     "cool-rocks-remember",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 44c13e0b1085..b1563788be60 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @rocket.chat/meteor
 
+## 6.12.0-rc.6
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/license@0.2.6-rc.6
+  - @rocket.chat/omnichannel-services@0.3.3-rc.6
+  - @rocket.chat/pdf-worker@0.2.3-rc.6
+  - @rocket.chat/presence@0.2.6-rc.6
+  - @rocket.chat/api-client@0.2.6-rc.6
+  - @rocket.chat/apps@0.1.6-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/cron@0.1.6-rc.6
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.6
+  - @rocket.chat/gazzodown@10.0.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.3-rc.6
+  - @rocket.chat/ui-theming@0.2.1-rc.0
+  - @rocket.chat/ui-avatar@6.0.0-rc.6
+  - @rocket.chat/ui-client@10.0.0-rc.6
+  - @rocket.chat/ui-video-conf@10.0.0-rc.6
+  - @rocket.chat/web-ui-registration@10.0.0-rc.6
+  - @rocket.chat/instance-status@0.1.6-rc.6
+  </details>
+
 ## 6.12.0-rc.5
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 4c0b261312d8..7393abfd78f3 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.5"
+	"version": "6.12.0-rc.6"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index ff77c0e62483..88e7e359bc96 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.3-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 1.3.3-rc.5
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 29bbca9680fc..cec8d063c965 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": "1.3.3-rc.5",
+	"version": "1.3.3-rc.6",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index f77584f2ca85..eda70c409922 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": "6.12.0-rc.5",
+	"version": "6.12.0-rc.6",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 6e93e3205b2e..ac7781d28bc2 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.4.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 9e4b1a45f45f..bec29a8b79ce 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.6-rc.5",
+	"version": "0.4.6-rc.6",
 	"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 7d80c71c36eb..6b63a869b35c 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.4.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 49c74b3ba748..b38a8575a4c6 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.6-rc.5",
+	"version": "0.4.6-rc.6",
 	"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 cc11a5613508..940db182a501 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  - @rocket.chat/instance-status@0.1.6-rc.6
+  </details>
+
 ## 0.3.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index a6026e76eee5..83848e3963ee 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.6-rc.5",
+	"version": "0.3.6-rc.6",
 	"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 a2a3de3b28c0..76542396e313 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/omnichannel-services@0.3.3-rc.6
+  - @rocket.chat/pdf-worker@0.2.3-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.4.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index e3432e3927dc..68303c58088c 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.6-rc.5",
+	"version": "0.4.6-rc.6",
 	"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 84684338e7db..e73a9694364d 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/presence@0.2.6-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.4.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 7f58cb4ea770..8dfae32d4654 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.6-rc.5",
+	"version": "0.4.6-rc.6",
 	"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 d7a8a85e5bc2..152a84fd8aac 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/omnichannel-services@0.3.3-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.4.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 0483b364bd32..ce730cd187e4 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.6-rc.5",
+	"version": "0.4.6-rc.6",
 	"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 dcdf5198a4e7..eb56806b8a13 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.4.6-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 1a8334a9504a..7d3f02a9b3e6 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.6-rc.5",
+	"version": "0.4.6-rc.6",
 	"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 54c89d860d0c..f6ce972eb0bd 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  </details>
+
 ## 0.2.6-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index fe0bbef1bae2..28879f81cac8 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6-rc.5",
+	"version": "0.2.6-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 3ddb60b3a36a..b0e8b86ef2bf 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.3-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/pdf-worker@0.2.3-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.3.3-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index c74867095711..7c6341bb31e4 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.3-rc.5",
+	"version": "0.3.3-rc.6",
 	"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 eb6d9e8641d9..2757de6f3a0f 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.3-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  </details>
+
 ## 0.2.3-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 001c0a33490c..b83f9dfa1f68 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.3-rc.5",
+	"version": "0.2.3-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 1a9aa1fff4f5..4e8013b5f332 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/core-services@0.6.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.2.6-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 63ec2f2d3486..6cbcde18d331 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6-rc.5",
+	"version": "0.2.6-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index b21c9693ce1f..15e5e0eff3a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.5",
+	"version": "6.12.0-rc.6",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 141f53d057e8..e40abfdd89fb 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  </details>
+
 ## 0.2.6-rc.5
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index aefccc5b873b..bce60c0b8d63 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.6-rc.5",
+	"version": "0.2.6-rc.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 55d3a88d8923..19a122d49979 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  </details>
+
 ## 0.1.6-rc.5
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 874c9739bf6d..b96b923273d7 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6-rc.5",
+	"version": "0.1.6-rc.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index ff823ed84205..251766374014 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.6.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.6.0-rc.5
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 14bd7d3a009c..37f26b4d8429 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.5",
+	"version": "0.6.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 1436a4574137..98ceafcae123 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.12.0-rc.6
+
 ## 6.12.0-rc.5
 
 ## 6.12.0-rc.4
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 7bf0e2ee1674..403dd028bacc 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.5",
+	"version": "6.12.0-rc.6",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 8ad0313ccacd..a7986195ff97 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.1.6-rc.5
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index c514833740fb..d0476a5de8fd 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6-rc.5",
+	"version": "0.1.6-rc.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 5c68668aa694..8aee54e192f2 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/api-client@0.2.6-rc.6
+  </details>
+
 ## 0.3.6-rc.5
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index c2c8d0bc21ed..36ac6cdc261f 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.6-rc.5",
+	"version": "0.3.6-rc.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 008441a63a78..f4e29b838b6d 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 10.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/gazzodown@10.0.0-rc.6
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  - @rocket.chat/ui-avatar@6.0.0-rc.6
+  - @rocket.chat/ui-video-conf@10.0.0-rc.6
+  </details>
+
 ## 10.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index a5f8bdcdc0f8..db5aa1a28e4f 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.5",
+  "version": "10.0.0-rc.6",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.5",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.5",
+    "@rocket.chat/ui-avatar": "6.0.0-rc.6",
+    "@rocket.chat/ui-contexts": "10.0.0-rc.6",
     "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.5",
+    "@rocket.chat/ui-video-conf": "10.0.0-rc.6",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index cfdd9da8c47d..66a435d93256 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  - @rocket.chat/ui-client@10.0.0-rc.6
+  </details>
+
 ## 10.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index f4011fa279e9..39dc8359bd50 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.5",
+	"version": "10.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.5",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
+		"@rocket.chat/ui-client": "10.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index a28e9a9054e8..538aa3a9fbb1 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.6-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.3-rc.6
+  </details>
+
 ## 0.1.6-rc.5
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index d5d015202ae1..353b5e32ca4d 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.6-rc.5",
+	"version": "0.1.6-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index e61f9f6bca12..02014c7dc441 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.3-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0-rc.6
+  </details>
+
 ## 1.19.3-rc.5
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index d1b76b4315b4..43785150b147 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3-rc.5",
+	"version": "1.19.3-rc.6",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index c648c97333fd..ed35844a153b 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.7.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  </details>
+
 ## 0.7.0-rc.5
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 195ab53bb133..fd663b278cca 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.5",
+	"version": "0.7.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 789ccd5cfad4..558c504c3268 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.3-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.0-rc.6
+  </details>
+
 ## 0.2.3-rc.5
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index fc56fd13223e..c86aafcb8bb1 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3-rc.5",
+	"version": "0.2.3-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 56eef7e3c4be..fc38cba221c4 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  </details>
+
 ## 6.12.0-rc.5
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 2faad232effb..41756394129f 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.5",
+	"version": "6.12.0-rc.6",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index d7ca03f4634b..79c48bb80737 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  </details>
+
 ## 6.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index c7b29cc62b5d..38b74d18d0bd 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.5",
+	"version": "6.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 108c2675256f..4e9ca998b624 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 10.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  </details>
+
 ## 10.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index db009245d142..116fc3e94309 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.5",
+	"version": "10.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 222312189158..710911bd9933 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.0-rc.6
+  - @rocket.chat/rest-typings@6.12.0-rc.6
+  - @rocket.chat/ddp-client@0.3.6-rc.6
+  </details>
+
 ## 10.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index fbb0b39c1e45..13ab83923751 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.5",
+	"version": "10.0.0-rc.6",
 	"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 e02e5aa89f7c..0db83b81ccd9 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  - @rocket.chat/ui-avatar@6.0.0-rc.6
+  </details>
+
 ## 10.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 7ac9d862af00..bda4146addab 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": "10.0.0-rc.5",
+	"version": "10.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.5",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
+		"@rocket.chat/ui-avatar": "6.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index f8b55932f38e..9c79731d5fc1 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0-rc.6
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  - @rocket.chat/ui-avatar@6.0.0-rc.6
+  </details>
+
 ## 0.4.0-rc.5
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 6091805421a0..94937b715a82 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.5",
+  "version": "0.4.0-rc.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 8db07776d70b..d44238b4a5ad 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0-rc.6
+  </details>
+
 ## 10.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index e67c7e2bb3a2..ad0af070a230 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": "10.0.0-rc.5",
+	"version": "10.0.0-rc.6",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index 62935fd57614..ea8b50d6539e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.4
-    "@rocket.chat/ui-contexts": 10.0.0-rc.4
+    "@rocket.chat/ui-avatar": 6.0.0-rc.5
+    "@rocket.chat/ui-contexts": 10.0.0-rc.5
     "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.4
+    "@rocket.chat/ui-video-conf": 10.0.0-rc.5
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.4
-    "@rocket.chat/ui-contexts": 10.0.0-rc.4
+    "@rocket.chat/ui-client": 10.0.0-rc.5
+    "@rocket.chat/ui-contexts": 10.0.0-rc.5
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.4
+    "@rocket.chat/ui-contexts": 10.0.0-rc.5
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.4
+    "@rocket.chat/ui-contexts": 10.0.0-rc.5
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.4
-    "@rocket.chat/ui-contexts": 10.0.0-rc.4
+    "@rocket.chat/ui-avatar": 6.0.0-rc.5
+    "@rocket.chat/ui-contexts": 10.0.0-rc.5
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.4
+    "@rocket.chat/ui-contexts": 10.0.0-rc.5
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 78e6ba482084277cf12a8bc37ad68caed74cbc88 Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Thu, 5 Sep 2024 08:35:49 -0300
Subject: [PATCH 046/170] fix(fuselage-ui-kit): `MultiStaticSelectElement` not
 working as expected (#32999)

Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
---
 .changeset/mighty-drinks-hide.md              |  6 ++
 apps/meteor/tests/e2e/apps/apps-modal.spec.ts |  2 +-
 .../src/hooks/useUiKitState.spec.ts           | 69 +++++++++++++++++++
 .../src/hooks/useUiKitState.ts                | 17 +++--
 4 files changed, 87 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/mighty-drinks-hide.md
 create mode 100644 packages/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts

diff --git a/.changeset/mighty-drinks-hide.md b/.changeset/mighty-drinks-hide.md
new file mode 100644
index 000000000000..955d1ed760cc
--- /dev/null
+++ b/.changeset/mighty-drinks-hide.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/fuselage-ui-kit": patch
+---
+
+Fixes multiple selection for MultiStaticSelectElement in UiKit
diff --git a/apps/meteor/tests/e2e/apps/apps-modal.spec.ts b/apps/meteor/tests/e2e/apps/apps-modal.spec.ts
index 53a4d479bb27..a74a439183d1 100644
--- a/apps/meteor/tests/e2e/apps/apps-modal.spec.ts
+++ b/apps/meteor/tests/e2e/apps/apps-modal.spec.ts
@@ -7,7 +7,7 @@ import { expect, test } from '../utils/test';
 
 test.use({ storageState: Users.user1.state });
 
-test.describe.serial('Apps > ContextualBar', () => {
+test.describe.serial('Apps > Modal', () => {
 	let poHomeChannel: HomeChannel;
 	let poModal: Modal;
 
diff --git a/packages/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts b/packages/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts
new file mode 100644
index 000000000000..4a62fcbda98b
--- /dev/null
+++ b/packages/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts
@@ -0,0 +1,69 @@
+import {
+  BlockContext,
+  type MultiStaticSelectElement,
+} from '@rocket.chat/ui-kit';
+import { act, renderHook } from '@testing-library/react';
+
+import { useUiKitState } from './useUiKitState';
+
+describe('state function', () => {
+  const context = BlockContext.NONE;
+
+  it('should handle arrays', async () => {
+    const element: MultiStaticSelectElement = {
+      type: 'multi_static_select',
+      placeholder: { type: 'plain_text', text: '' },
+      options: [],
+      initialValue: ['A', 'B'],
+      appId: 'app-id',
+      blockId: 'block-id',
+      actionId: 'action-id',
+    };
+
+    const { result } = renderHook(() => useUiKitState(element, context), {
+      legacyRoot: true,
+    });
+
+    await act(async () => {
+      const [, state] = result.current;
+      await state({
+        target: {
+          value: ['C', 'D'],
+        },
+      });
+    });
+
+    expect(result.current[0].value).toEqual(['C', 'D']);
+  });
+});
+
+describe('action function', () => {
+  const context = BlockContext.ACTION;
+
+  it('should handle arrays', async () => {
+    const element: MultiStaticSelectElement = {
+      type: 'multi_static_select',
+      placeholder: { type: 'plain_text', text: '' },
+      options: [],
+      initialValue: ['A', 'B'],
+      appId: 'app-id',
+      blockId: 'block-id',
+      actionId: 'action-id',
+    };
+
+    const { result } = renderHook(() => useUiKitState(element, context), {
+      legacyRoot: true,
+    });
+
+    await act(async () => {
+      const [, action] = result.current;
+      await action({
+        target: {
+          value: ['C', 'D'],
+        },
+      });
+    });
+
+    expect(result.current[0].value).toEqual(['C', 'D']);
+  });
+});
diff --git a/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts b/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
index 6af9245f9a51..be2813e5d28a 100644
--- a/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
+++ b/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
@@ -42,7 +42,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
       | Event
       | { target: EventTarget }
       | { target: { value: UiKit.ActionOf<TElement> } }
-  ) => void
+  ) => Promise<void>
 ] => {
   const { blockId, actionId, appId, dispatchActionConfig } = element;
   const {
@@ -70,15 +70,20 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
     const {
       target: { value: elValue },
     } = e;
+
     setLoading(true);
 
     if (Array.isArray(value)) {
-      const idx = value.findIndex((value) => value === elValue);
-
-      if (idx > -1) {
-        setValue(value.filter((_, i) => i !== idx));
+      if (Array.isArray(elValue)) {
+        setValue(elValue);
       } else {
-        setValue([...value, elValue]);
+        const idx = value.findIndex((value) => value === elValue);
+
+        if (idx > -1) {
+          setValue(value.filter((_, i) => i !== idx));
+        } else {
+          setValue([...value, elValue]);
+        }
       }
     } else {
       setValue(elValue);

From 6c1616d88e12df9c68c577f7a47330def280b381 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Thu, 5 Sep 2024 10:17:46 -0300
Subject: [PATCH 047/170] chore: Add proper deprecation remarks on Minimongo
 collections (#33213)

---
 apps/meteor/app/models/client/index.ts             | 14 ++++++--------
 .../app/models/client/models/CachedChatRoom.ts     |  2 +-
 .../models/client/models/CachedChatSubscription.ts |  2 +-
 .../meteor/app/models/client/models/ChatMessage.ts |  2 +-
 apps/meteor/app/models/client/models/ChatRoom.ts   |  2 +-
 .../app/models/client/models/ChatSubscription.ts   |  2 +-
 apps/meteor/app/models/client/models/Roles.ts      |  2 +-
 apps/meteor/app/models/client/models/RoomRoles.ts  |  2 +-
 .../meteor/app/models/client/models/UserAndRoom.ts |  3 ---
 apps/meteor/app/models/client/models/UserRoles.ts  |  2 +-
 apps/meteor/app/models/client/models/Users.ts      |  2 +-
 11 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 apps/meteor/app/models/client/models/UserAndRoom.ts

diff --git a/apps/meteor/app/models/client/index.ts b/apps/meteor/app/models/client/index.ts
index 354baa2b71fd..397a1e45bb18 100644
--- a/apps/meteor/app/models/client/index.ts
+++ b/apps/meteor/app/models/client/index.ts
@@ -11,7 +11,6 @@ import CustomSounds from './models/CustomSounds';
 import EmojiCustom from './models/EmojiCustom';
 import { Roles } from './models/Roles';
 import { RoomRoles } from './models/RoomRoles';
-import { UserAndRoom } from './models/UserAndRoom';
 import { UserRoles } from './models/UserRoles';
 import { Users } from './models/Users';
 
@@ -23,22 +22,21 @@ export {
 	CachedChatSubscription,
 	CachedUserList,
 	RoomRoles,
-	UserAndRoom,
 	UserRoles,
 	AuthzCachedCollection,
 	ChatPermissions,
 	CustomSounds,
 	EmojiCustom,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	Users,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatRoom,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatSubscription,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatSubscription as Subscriptions,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatMessage,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatMessage as Messages,
 };
diff --git a/apps/meteor/app/models/client/models/CachedChatRoom.ts b/apps/meteor/app/models/client/models/CachedChatRoom.ts
index 852bed5a6067..248b68554583 100644
--- a/apps/meteor/app/models/client/models/CachedChatRoom.ts
+++ b/apps/meteor/app/models/client/models/CachedChatRoom.ts
@@ -110,6 +110,6 @@ class CachedChatRoom extends CachedCollection<IRoom> {
 const instance = new CachedChatRoom();
 
 export {
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	instance as CachedChatRoom,
 };
diff --git a/apps/meteor/app/models/client/models/CachedChatSubscription.ts b/apps/meteor/app/models/client/models/CachedChatSubscription.ts
index 7c0e84800c77..d17493e57f2e 100644
--- a/apps/meteor/app/models/client/models/CachedChatSubscription.ts
+++ b/apps/meteor/app/models/client/models/CachedChatSubscription.ts
@@ -139,6 +139,6 @@ class CachedChatSubscription extends CachedCollection<SubscriptionWithRoom, ISub
 const instance = new CachedChatSubscription();
 
 export {
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	instance as CachedChatSubscription,
 };
diff --git a/apps/meteor/app/models/client/models/ChatMessage.ts b/apps/meteor/app/models/client/models/ChatMessage.ts
index bd8852a70662..1e9b066bdaaa 100644
--- a/apps/meteor/app/models/client/models/ChatMessage.ts
+++ b/apps/meteor/app/models/client/models/ChatMessage.ts
@@ -25,5 +25,5 @@ class ChatMessageCollection
 	public declare queries: MinimongoCollection<IMessage & { ignored?: boolean }>['queries'];
 }
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const ChatMessage = new ChatMessageCollection();
diff --git a/apps/meteor/app/models/client/models/ChatRoom.ts b/apps/meteor/app/models/client/models/ChatRoom.ts
index 00528233daed..f23f20e8048e 100644
--- a/apps/meteor/app/models/client/models/ChatRoom.ts
+++ b/apps/meteor/app/models/client/models/ChatRoom.ts
@@ -2,7 +2,7 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 
 import { CachedChatRoom } from './CachedChatRoom';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const ChatRoom = Object.assign(CachedChatRoom.collection, {
 	setReactionsInLastMessage(this: typeof CachedChatRoom.collection, roomId: IRoom['_id'], lastMessage: IMessage) {
 		return this.update({ _id: roomId }, { $set: { lastMessage } });
diff --git a/apps/meteor/app/models/client/models/ChatSubscription.ts b/apps/meteor/app/models/client/models/ChatSubscription.ts
index 023f9d8f4649..aa7892fe5031 100644
--- a/apps/meteor/app/models/client/models/ChatSubscription.ts
+++ b/apps/meteor/app/models/client/models/ChatSubscription.ts
@@ -6,7 +6,7 @@ import type { Filter } from 'mongodb';
 import { isTruthy } from '../../../../lib/isTruthy';
 import { CachedChatSubscription } from './CachedChatSubscription';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const ChatSubscription = Object.assign(CachedChatSubscription.collection, {
 	isUserInRole: mem(
 		function (this: typeof CachedChatSubscription.collection, _uid: IUser['_id'], roleId: IRole['_id'], rid?: IRoom['_id']) {
diff --git a/apps/meteor/app/models/client/models/Roles.ts b/apps/meteor/app/models/client/models/Roles.ts
index 475c0465c7cc..a048905cd2b4 100644
--- a/apps/meteor/app/models/client/models/Roles.ts
+++ b/apps/meteor/app/models/client/models/Roles.ts
@@ -53,5 +53,5 @@ class RolesCollection extends Mongo.Collection<IRole> implements MinimongoCollec
 	public declare queries: MinimongoCollection<IRole>['queries'];
 }
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const Roles = new RolesCollection();
diff --git a/apps/meteor/app/models/client/models/RoomRoles.ts b/apps/meteor/app/models/client/models/RoomRoles.ts
index bb9fabbedbf2..ab347a59eada 100644
--- a/apps/meteor/app/models/client/models/RoomRoles.ts
+++ b/apps/meteor/app/models/client/models/RoomRoles.ts
@@ -1,5 +1,5 @@
 import type { ISubscription } from '@rocket.chat/core-typings';
 import { Mongo } from 'meteor/mongo';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const RoomRoles = new Mongo.Collection<Pick<ISubscription, '_id' | 'rid' | 'u' | 'roles'>>(null);
diff --git a/apps/meteor/app/models/client/models/UserAndRoom.ts b/apps/meteor/app/models/client/models/UserAndRoom.ts
deleted file mode 100644
index f43b2c0fdbe0..000000000000
--- a/apps/meteor/app/models/client/models/UserAndRoom.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-
-export const UserAndRoom = new Mongo.Collection(null);
diff --git a/apps/meteor/app/models/client/models/UserRoles.ts b/apps/meteor/app/models/client/models/UserRoles.ts
index 9e68239bdb44..04a1710e8b9c 100644
--- a/apps/meteor/app/models/client/models/UserRoles.ts
+++ b/apps/meteor/app/models/client/models/UserRoles.ts
@@ -1,7 +1,7 @@
 import type { IRocketChatRecord, IRole } from '@rocket.chat/core-typings';
 import { Mongo } from 'meteor/mongo';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const UserRoles = new Mongo.Collection<
 	IRocketChatRecord & {
 		roles?: IRole['_id'][];
diff --git a/apps/meteor/app/models/client/models/Users.ts b/apps/meteor/app/models/client/models/Users.ts
index 26d333cc8bb1..e2d8c7856752 100644
--- a/apps/meteor/app/models/client/models/Users.ts
+++ b/apps/meteor/app/models/client/models/Users.ts
@@ -38,5 +38,5 @@ Object.assign(Meteor.users, {
 	remove: UsersCollection.prototype.remove,
 });
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const Users = Meteor.users as UsersCollection;

From ecff0a61cc9dce7597743799da098629ad9a088d Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Thu, 5 Sep 2024 13:30:17 +0000
Subject: [PATCH 048/170] Release 6.12.0

[no ci]
---
 .changeset/bright-humans-cross.md             |   5 -
 .changeset/brown-crabs-chew.md                |  13 --
 .changeset/bump-patch-1724712948901.md        |   5 -
 .changeset/bump-patch-1724977971712.md        |   5 -
 .changeset/bump-patch-1725326060827.md        |   5 -
 .changeset/bump-patch-1725387211812.md        |   5 -
 .changeset/bump-patch-1725418762836.md        |   5 -
 .changeset/bump-patch-1725482682951.md        |   5 -
 .changeset/calm-tigers-peel.md                |   5 -
 .changeset/cool-actors-sin.md                 |   5 -
 .changeset/cool-rocks-remember.md             |   6 -
 .changeset/empty-toys-smell.md                |   5 -
 .changeset/fast-lobsters-turn.md              |   5 -
 .changeset/funny-boats-guess.md               |   6 -
 .changeset/gentle-bugs-think.md               |   5 -
 .changeset/gentle-news-wonder.md              |   5 -
 .changeset/giant-spiders-pay.md               |   5 -
 .changeset/gorgeous-hotels-attend.md          |   5 -
 .changeset/large-geese-ring.md                |   5 -
 .changeset/lemon-steaks-provide.md            |   6 -
 .changeset/nasty-windows-smile.md             |   5 -
 .changeset/new-mayflies-wait.md               |   5 -
 .changeset/ninety-hounds-exist.md             |   7 -
 .changeset/orange-clocks-wait.md              |   5 -
 .changeset/popular-bottles-visit.md           |   5 -
 .changeset/pre.json                           | 113 ---------------
 .changeset/proud-years-buy.md                 |   5 -
 .changeset/purple-dolls-serve.md              |   7 -
 .changeset/rich-pillows-hang.md               |   5 -
 .changeset/rooms-table-ts.md                  |   5 -
 .changeset/rotten-camels-pretend.md           |   6 -
 .changeset/rude-dogs-burn.md                  |   5 -
 .changeset/six-beers-fry.md                   |   5 -
 .changeset/smart-baboons-allow.md             |   5 -
 .changeset/smart-mice-attack.md               |   5 -
 .changeset/spicy-kings-think.md               |   6 -
 .changeset/strong-rings-rush.md               |   5 -
 .changeset/strong-swans-double.md             |   6 -
 .changeset/strong-terms-love.md               |   6 -
 .changeset/stupid-fishes-relate.md            |   7 -
 .changeset/swift-maps-tickle.md               |   9 --
 .changeset/ten-bulldogs-clap.md               |   5 -
 .changeset/thirty-dryers-help.md              |   6 -
 .changeset/twelve-windows-train.md            |   5 -
 .changeset/two-bikes-crash.md                 |   7 -
 .changeset/violet-radios-begin.md             |  15 --
 .changeset/wise-avocados-taste.md             |   5 -
 apps/meteor/CHANGELOG.md                      | 135 ++++++++++++++++++
 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 +-
 ee/apps/account-service/CHANGELOG.md          |  13 ++
 ee/apps/account-service/package.json          |   2 +-
 ee/apps/authorization-service/CHANGELOG.md    |  13 ++
 ee/apps/authorization-service/package.json    |   2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             |  14 ++
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   |  14 ++
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/presence-service/CHANGELOG.md         |  13 ++
 ee/apps/presence-service/package.json         |   2 +-
 ee/apps/queue-worker/CHANGELOG.md             |  13 ++
 ee/apps/queue-worker/package.json             |   2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       |  12 ++
 ee/apps/stream-hub-service/package.json       |   2 +-
 ee/packages/license/CHANGELOG.md              |   9 ++
 ee/packages/license/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 +-
 ee/packages/ui-theming/CHANGELOG.md           |   6 +
 ee/packages/ui-theming/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           |  16 +++
 packages/core-services/package.json           |   2 +-
 packages/core-typings/CHANGELOG.md            |  27 ++++
 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/fuselage-ui-kit/CHANGELOG.md         |  16 +++
 packages/fuselage-ui-kit/package.json         |  10 +-
 packages/gazzodown/CHANGELOG.md               |  13 ++
 packages/gazzodown/package.json               |   6 +-
 packages/i18n/CHANGELOG.md                    |  28 ++++
 packages/i18n/package.json                    |   2 +-
 packages/instance-status/CHANGELOG.md         |   9 ++
 packages/instance-status/package.json         |   2 +-
 packages/livechat/CHANGELOG.md                |  12 ++
 packages/livechat/package.json                |   2 +-
 packages/mock-providers/CHANGELOG.md          |   9 ++
 packages/mock-providers/package.json          |   2 +-
 packages/model-typings/CHANGELOG.md           |  17 +++
 packages/model-typings/package.json           |   2 +-
 packages/models/CHANGELOG.md                  |   9 ++
 packages/models/package.json                  |   2 +-
 packages/rest-typings/CHANGELOG.md            |  16 +++
 packages/rest-typings/package.json            |   2 +-
 packages/ui-avatar/CHANGELOG.md               |  11 ++
 packages/ui-avatar/package.json               |   4 +-
 packages/ui-client/CHANGELOG.md               |  11 ++
 packages/ui-client/package.json               |   4 +-
 packages/ui-composer/CHANGELOG.md             |   6 +
 packages/ui-composer/package.json             |   2 +-
 packages/ui-contexts/CHANGELOG.md             |  12 ++
 packages/ui-contexts/package.json             |   2 +-
 packages/ui-kit/CHANGELOG.md                  |   6 +
 packages/ui-kit/package.json                  |   2 +-
 packages/ui-video-conf/CHANGELOG.md           |  12 ++
 packages/ui-video-conf/package.json           |   6 +-
 packages/uikit-playground/CHANGELOG.md        |  17 +++
 packages/uikit-playground/package.json        |   2 +-
 packages/web-ui-registration/CHANGELOG.md     |  11 ++
 packages/web-ui-registration/package.json     |   4 +-
 yarn.lock                                     |  20 +--
 124 files changed, 649 insertions(+), 441 deletions(-)
 delete mode 100644 .changeset/bright-humans-cross.md
 delete mode 100644 .changeset/brown-crabs-chew.md
 delete mode 100644 .changeset/bump-patch-1724712948901.md
 delete mode 100644 .changeset/bump-patch-1724977971712.md
 delete mode 100644 .changeset/bump-patch-1725326060827.md
 delete mode 100644 .changeset/bump-patch-1725387211812.md
 delete mode 100644 .changeset/bump-patch-1725418762836.md
 delete mode 100644 .changeset/bump-patch-1725482682951.md
 delete mode 100644 .changeset/calm-tigers-peel.md
 delete mode 100644 .changeset/cool-actors-sin.md
 delete mode 100644 .changeset/cool-rocks-remember.md
 delete mode 100644 .changeset/empty-toys-smell.md
 delete mode 100644 .changeset/fast-lobsters-turn.md
 delete mode 100644 .changeset/funny-boats-guess.md
 delete mode 100644 .changeset/gentle-bugs-think.md
 delete mode 100644 .changeset/gentle-news-wonder.md
 delete mode 100644 .changeset/giant-spiders-pay.md
 delete mode 100644 .changeset/gorgeous-hotels-attend.md
 delete mode 100644 .changeset/large-geese-ring.md
 delete mode 100644 .changeset/lemon-steaks-provide.md
 delete mode 100644 .changeset/nasty-windows-smile.md
 delete mode 100644 .changeset/new-mayflies-wait.md
 delete mode 100644 .changeset/ninety-hounds-exist.md
 delete mode 100644 .changeset/orange-clocks-wait.md
 delete mode 100644 .changeset/popular-bottles-visit.md
 delete mode 100644 .changeset/pre.json
 delete mode 100644 .changeset/proud-years-buy.md
 delete mode 100644 .changeset/purple-dolls-serve.md
 delete mode 100644 .changeset/rich-pillows-hang.md
 delete mode 100644 .changeset/rooms-table-ts.md
 delete mode 100644 .changeset/rotten-camels-pretend.md
 delete mode 100644 .changeset/rude-dogs-burn.md
 delete mode 100644 .changeset/six-beers-fry.md
 delete mode 100644 .changeset/smart-baboons-allow.md
 delete mode 100644 .changeset/smart-mice-attack.md
 delete mode 100644 .changeset/spicy-kings-think.md
 delete mode 100644 .changeset/strong-rings-rush.md
 delete mode 100644 .changeset/strong-swans-double.md
 delete mode 100644 .changeset/strong-terms-love.md
 delete mode 100644 .changeset/stupid-fishes-relate.md
 delete mode 100644 .changeset/swift-maps-tickle.md
 delete mode 100644 .changeset/ten-bulldogs-clap.md
 delete mode 100644 .changeset/thirty-dryers-help.md
 delete mode 100644 .changeset/twelve-windows-train.md
 delete mode 100644 .changeset/two-bikes-crash.md
 delete mode 100644 .changeset/violet-radios-begin.md
 delete mode 100644 .changeset/wise-avocados-taste.md

diff --git a/.changeset/bright-humans-cross.md b/.changeset/bright-humans-cross.md
deleted file mode 100644
index aa0c4c658994..000000000000
--- a/.changeset/bright-humans-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': minor
----
-
-Federation actions like sending message in a federated DM, reacting in a federated chat, etc, will no longer work if the configuration is invalid.
diff --git a/.changeset/brown-crabs-chew.md b/.changeset/brown-crabs-chew.md
deleted file mode 100644
index 3291f18bf225..000000000000
--- a/.changeset/brown-crabs-chew.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-'@rocket.chat/uikit-playground': patch
-'@rocket.chat/fuselage-ui-kit': patch
-'@rocket.chat/ui-theming': patch
-'@rocket.chat/ui-video-conf': patch
-'@rocket.chat/ui-composer': patch
-'@rocket.chat/gazzodown': patch
-'@rocket.chat/ui-avatar': patch
-'@rocket.chat/ui-client': patch
-'@rocket.chat/meteor': patch
----
-
-Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
diff --git a/.changeset/bump-patch-1724712948901.md b/.changeset/bump-patch-1724712948901.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1724712948901.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1724977971712.md b/.changeset/bump-patch-1724977971712.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1724977971712.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1725326060827.md b/.changeset/bump-patch-1725326060827.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1725326060827.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1725387211812.md b/.changeset/bump-patch-1725387211812.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1725387211812.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1725418762836.md b/.changeset/bump-patch-1725418762836.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1725418762836.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1725482682951.md b/.changeset/bump-patch-1725482682951.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1725482682951.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/calm-tigers-peel.md b/.changeset/calm-tigers-peel.md
deleted file mode 100644
index 32feed6f7107..000000000000
--- a/.changeset/calm-tigers-peel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/ui-kit": patch
----
-
-fix UiKit error message: Failed to resolve module: @rocket.chat/icons
diff --git a/.changeset/cool-actors-sin.md b/.changeset/cool-actors-sin.md
deleted file mode 100644
index e53b8f136ebb..000000000000
--- a/.changeset/cool-actors-sin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Improves Omnichannel queue page performance
diff --git a/.changeset/cool-rocks-remember.md b/.changeset/cool-rocks-remember.md
deleted file mode 100644
index 97af36e94320..000000000000
--- a/.changeset/cool-rocks-remember.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": patch
-"@rocket.chat/model-typings": patch
----
-
-Fixed login with third-party apps not working without the "Manage OAuth Apps" permission
diff --git a/.changeset/empty-toys-smell.md b/.changeset/empty-toys-smell.md
deleted file mode 100644
index 043d9c19567d..000000000000
--- a/.changeset/empty-toys-smell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Federated users can no longer be deleted.
diff --git a/.changeset/fast-lobsters-turn.md b/.changeset/fast-lobsters-turn.md
deleted file mode 100644
index ff1d97ea7289..000000000000
--- a/.changeset/fast-lobsters-turn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed an issue due to an endpoint pagination that was causing that when an agent have assigned more than 50 departments, the departments have a blank space instead of the name.
diff --git a/.changeset/funny-boats-guess.md b/.changeset/funny-boats-guess.md
deleted file mode 100644
index 076acff98329..000000000000
--- a/.changeset/funny-boats-guess.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/i18n": minor
----
-
-Added a new Audit endpoint `audit/rooms.members` that allows users with `view-members-list-all-rooms` to fetch a list of the members of any room even if the user is not part of it. 
diff --git a/.changeset/gentle-bugs-think.md b/.changeset/gentle-bugs-think.md
deleted file mode 100644
index fc4738f3043a..000000000000
--- a/.changeset/gentle-bugs-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
diff --git a/.changeset/gentle-news-wonder.md b/.changeset/gentle-news-wonder.md
deleted file mode 100644
index dd3218003d7a..000000000000
--- a/.changeset/gentle-news-wonder.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": minor
----
-
-Added a new 'Deactivated' tab to the users page, this tab lists users who have logged in for the first time but have been deactivated for any reason. Also added the UI code for the Active tab;
diff --git a/.changeset/giant-spiders-pay.md b/.changeset/giant-spiders-pay.md
deleted file mode 100644
index 1798cd2baaee..000000000000
--- a/.changeset/giant-spiders-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes an issue where the Announcement modal with long words was adding a horizontal scrollbar
diff --git a/.changeset/gorgeous-hotels-attend.md b/.changeset/gorgeous-hotels-attend.md
deleted file mode 100644
index fd858d7ace86..000000000000
--- a/.changeset/gorgeous-hotels-attend.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Stopped non channel members from dragging and dropping files in a channel they do not belong
diff --git a/.changeset/large-geese-ring.md b/.changeset/large-geese-ring.md
deleted file mode 100644
index 9b36edf1c02d..000000000000
--- a/.changeset/large-geese-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': minor
----
-
-Replaces an outdated banner with the Bubble component in order to display retention policy warning
diff --git a/.changeset/lemon-steaks-provide.md b/.changeset/lemon-steaks-provide.md
deleted file mode 100644
index 29f0289419a0..000000000000
--- a/.changeset/lemon-steaks-provide.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@rocket.chat/i18n': minor
-'@rocket.chat/meteor': minor
----
-
-Added an accordion for advanced settings on Create teams and channels
diff --git a/.changeset/nasty-windows-smile.md b/.changeset/nasty-windows-smile.md
deleted file mode 100644
index e80ec3db27a9..000000000000
--- a/.changeset/nasty-windows-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Allow apps to react/unreact to messages via bridge
diff --git a/.changeset/new-mayflies-wait.md b/.changeset/new-mayflies-wait.md
deleted file mode 100644
index 832db68cecd4..000000000000
--- a/.changeset/new-mayflies-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Deactivating users who federated will now be permanent.
diff --git a/.changeset/ninety-hounds-exist.md b/.changeset/ninety-hounds-exist.md
deleted file mode 100644
index 99882de12018..000000000000
--- a/.changeset/ninety-hounds-exist.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@rocket.chat/rest-typings': patch
-'@rocket.chat/meteor': patch
-'@rocket.chat/i18n': patch
----
-
-Fix: Show correct user info actions for non-members in channels.
diff --git a/.changeset/orange-clocks-wait.md b/.changeset/orange-clocks-wait.md
deleted file mode 100644
index eacb88108a0f..000000000000
--- a/.changeset/orange-clocks-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/.changeset/popular-bottles-visit.md b/.changeset/popular-bottles-visit.md
deleted file mode 100644
index 9e44e9dd7144..000000000000
--- a/.changeset/popular-bottles-visit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed an issue that caused UI to show an error when the call to get the Business Hour type from settings returned `undefined`.
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index d362d52ea894..000000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "rc",
-  "initialVersions": {
-    "@rocket.chat/meteor": "6.12.0-develop",
-    "rocketchat-services": "1.3.0",
-    "@rocket.chat/account-service": "0.4.3",
-    "@rocket.chat/authorization-service": "0.4.3",
-    "@rocket.chat/ddp-streamer": "0.3.3",
-    "@rocket.chat/omnichannel-transcript": "0.4.3",
-    "@rocket.chat/presence-service": "0.4.3",
-    "@rocket.chat/queue-worker": "0.4.3",
-    "@rocket.chat/stream-hub-service": "0.4.3",
-    "@rocket.chat/license": "0.2.3",
-    "@rocket.chat/omnichannel-services": "0.3.0",
-    "@rocket.chat/pdf-worker": "0.2.0",
-    "@rocket.chat/presence": "0.2.3",
-    "@rocket.chat/ui-theming": "0.2.0",
-    "@rocket.chat/account-utils": "0.0.2",
-    "@rocket.chat/agenda": "0.1.0",
-    "@rocket.chat/api-client": "0.2.3",
-    "@rocket.chat/apps": "0.1.3",
-    "@rocket.chat/base64": "1.0.13",
-    "@rocket.chat/cas-validate": "0.0.2",
-    "@rocket.chat/core-services": "0.5.0",
-    "@rocket.chat/core-typings": "6.12.0-develop",
-    "@rocket.chat/cron": "0.1.3",
-    "@rocket.chat/ddp-client": "0.3.3",
-    "@rocket.chat/eslint-config": "0.7.0",
-    "@rocket.chat/favicon": "0.0.2",
-    "@rocket.chat/fuselage-ui-kit": "9.0.0",
-    "@rocket.chat/gazzodown": "9.0.0",
-    "@rocket.chat/i18n": "0.6.0",
-    "@rocket.chat/instance-status": "0.1.3",
-    "@rocket.chat/jest-presets": "0.0.1",
-    "@rocket.chat/jwt": "0.1.1",
-    "@rocket.chat/livechat": "1.19.0",
-    "@rocket.chat/log-format": "0.0.2",
-    "@rocket.chat/logger": "0.0.2",
-    "@rocket.chat/message-parser": "0.31.29",
-    "@rocket.chat/mock-providers": "0.1.1",
-    "@rocket.chat/model-typings": "0.6.0",
-    "@rocket.chat/models": "0.2.0",
-    "@rocket.chat/poplib": "0.0.2",
-    "@rocket.chat/password-policies": "0.0.2",
-    "@rocket.chat/patch-injection": "0.0.1",
-    "@rocket.chat/peggy-loader": "0.31.25",
-    "@rocket.chat/random": "1.2.2",
-    "@rocket.chat/release-action": "2.2.3",
-    "@rocket.chat/release-changelog": "0.1.0",
-    "@rocket.chat/rest-typings": "6.12.0-develop",
-    "@rocket.chat/server-cloud-communication": "0.0.2",
-    "@rocket.chat/server-fetch": "0.0.3",
-    "@rocket.chat/sha256": "1.0.10",
-    "@rocket.chat/tools": "0.2.2",
-    "@rocket.chat/ui-avatar": "5.0.0",
-    "@rocket.chat/ui-client": "9.0.0",
-    "@rocket.chat/ui-composer": "0.2.0",
-    "@rocket.chat/ui-contexts": "9.0.0",
-    "@rocket.chat/ui-kit": "0.36.0",
-    "@rocket.chat/ui-video-conf": "9.0.0",
-    "@rocket.chat/uikit-playground": "0.3.3",
-    "@rocket.chat/web-ui-registration": "9.0.0"
-  },
-  "changesets": [
-    "bright-humans-cross",
-    "brown-crabs-chew",
-    "bump-patch-1724712948901",
-    "bump-patch-1724977971712",
-    "bump-patch-1725326060827",
-    "bump-patch-1725387211812",
-    "bump-patch-1725418762836",
-    "bump-patch-1725482682951",
-    "calm-tigers-peel",
-    "cool-actors-sin",
-    "cool-rocks-remember",
-    "empty-toys-smell",
-    "fast-lobsters-turn",
-    "funny-boats-guess",
-    "gentle-bugs-think",
-    "gentle-news-wonder",
-    "giant-spiders-pay",
-    "gorgeous-hotels-attend",
-    "large-geese-ring",
-    "lemon-steaks-provide",
-    "nasty-windows-smile",
-    "new-mayflies-wait",
-    "ninety-hounds-exist",
-    "orange-clocks-wait",
-    "popular-bottles-visit",
-    "proud-years-buy",
-    "purple-dolls-serve",
-    "rich-pillows-hang",
-    "rooms-table-ts",
-    "rotten-camels-pretend",
-    "rude-dogs-burn",
-    "six-beers-fry",
-    "smart-baboons-allow",
-    "smart-mice-attack",
-    "spicy-kings-think",
-    "strong-rings-rush",
-    "strong-swans-double",
-    "strong-terms-love",
-    "stupid-fishes-relate",
-    "swift-maps-tickle",
-    "ten-bulldogs-clap",
-    "thirty-dryers-help",
-    "twelve-windows-train",
-    "two-bikes-crash",
-    "violet-radios-begin",
-    "wise-avocados-taste"
-  ]
-}
diff --git a/.changeset/proud-years-buy.md b/.changeset/proud-years-buy.md
deleted file mode 100644
index 94f4ab0df736..000000000000
--- a/.changeset/proud-years-buy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/i18n': patch
----
-
-Fixes a typo in german translation and fixes the broken hyperlink for Resend and Change Email
diff --git a/.changeset/purple-dolls-serve.md b/.changeset/purple-dolls-serve.md
deleted file mode 100644
index fc44faa60a38..000000000000
--- a/.changeset/purple-dolls-serve.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@rocket.chat/web-ui-registration': patch
-'@rocket.chat/i18n': patch
-'@rocket.chat/meteor': patch
----
-
-Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
diff --git a/.changeset/rich-pillows-hang.md b/.changeset/rich-pillows-hang.md
deleted file mode 100644
index b714a5e6acd9..000000000000
--- a/.changeset/rich-pillows-hang.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes the `expanded` prop being accidentally forwarded to `ContextualbarHeader`
diff --git a/.changeset/rooms-table-ts.md b/.changeset/rooms-table-ts.md
deleted file mode 100644
index b5055ad26f69..000000000000
--- a/.changeset/rooms-table-ts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': minor
----
-
-Add "Created at" column to admin rooms table
diff --git a/.changeset/rotten-camels-pretend.md b/.changeset/rotten-camels-pretend.md
deleted file mode 100644
index 5145bbaa5050..000000000000
--- a/.changeset/rotten-camels-pretend.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": patch
-"@rocket.chat/core-typings": patch
----
-
-Fixed issue with system messages being counted as agents' first responses in livechat rooms (which caused the "best first response time" and "average first response time" metrics to be unreliable for all agents)
diff --git a/.changeset/rude-dogs-burn.md b/.changeset/rude-dogs-burn.md
deleted file mode 100644
index e81f00782083..000000000000
--- a/.changeset/rude-dogs-burn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed a behavior when updating messages that prevented the `customFields` prop from being updated if there were no changes to the `msg` property. Now, `customFields` will be always updated on message update even if `msg` doesn't change
diff --git a/.changeset/six-beers-fry.md b/.changeset/six-beers-fry.md
deleted file mode 100644
index 48409c2f8de5..000000000000
--- a/.changeset/six-beers-fry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': minor
----
-
-New button added to validate Matrix Federation configuration. A new field inside admin settings will reflect the configuration status being either 'Valid' or 'Invalid'.
diff --git a/.changeset/smart-baboons-allow.md b/.changeset/smart-baboons-allow.md
deleted file mode 100644
index 0c593e4ed2c5..000000000000
--- a/.changeset/smart-baboons-allow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed issue that prevented sending encrypted filed from the mobile app
diff --git a/.changeset/smart-mice-attack.md b/.changeset/smart-mice-attack.md
deleted file mode 100644
index 3ca47060ce5c..000000000000
--- a/.changeset/smart-mice-attack.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed an issue where teams were being created with no room associated with it.
diff --git a/.changeset/spicy-kings-think.md b/.changeset/spicy-kings-think.md
deleted file mode 100644
index 9e8f3648b28c..000000000000
--- a/.changeset/spicy-kings-think.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixes multiple problems with the `processRoomAbandonment` hook. This hook is in charge of calculating the time a room has been abandoned (this means, the time that elapsed since a room was last answered by an agent until it was closed). However, when business hours were enabled and the user didn't open on one day, if an abandoned room happened to be abandoned _over_ the day there was no business hour configuration, then the process will error out.
-Additionally, the values the code was calculating were not right. When business hours are enabled, this code should only count the abandonment time _while a business hour was open_. When rooms were left abandoned for days or weeks, this will also throw an error or output an invalid count.
diff --git a/.changeset/strong-rings-rush.md b/.changeset/strong-rings-rush.md
deleted file mode 100644
index 5125f47dcb3b..000000000000
--- a/.changeset/strong-rings-rush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Restored tooltips to the unit edit department field selected options
diff --git a/.changeset/strong-swans-double.md b/.changeset/strong-swans-double.md
deleted file mode 100644
index db521aeeef0f..000000000000
--- a/.changeset/strong-swans-double.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@rocket.chat/uikit-playground': minor
-'@rocket.chat/meteor': minor
----
-
-Upgrades fuselage-toastbar version in order to add pause on hover functionality
diff --git a/.changeset/strong-terms-love.md b/.changeset/strong-terms-love.md
deleted file mode 100644
index 2535a466eb8e..000000000000
--- a/.changeset/strong-terms-love.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": patch
-"@rocket.chat/model-typings": patch
----
-
-Fixed issue with livechat analytics in a given date range considering conversation data from the following day
diff --git a/.changeset/stupid-fishes-relate.md b/.changeset/stupid-fishes-relate.md
deleted file mode 100644
index 82bfaa1cfd28..000000000000
--- a/.changeset/stupid-fishes-relate.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@rocket.chat/core-typings': minor
-'@rocket.chat/i18n': minor
-'@rocket.chat/meteor': minor
----
-
-Added a new setting to enable/disable file encryption in an end to end encrypted room.
diff --git a/.changeset/swift-maps-tickle.md b/.changeset/swift-maps-tickle.md
deleted file mode 100644
index 076ead1cea4c..000000000000
--- a/.changeset/swift-maps-tickle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@rocket.chat/core-services': minor
-'@rocket.chat/model-typings': minor
-'@rocket.chat/core-typings': minor
-'@rocket.chat/rest-typings': minor
-'@rocket.chat/meteor': minor
----
-
-Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
diff --git a/.changeset/ten-bulldogs-clap.md b/.changeset/ten-bulldogs-clap.md
deleted file mode 100644
index 15f88bb6bd97..000000000000
--- a/.changeset/ten-bulldogs-clap.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-fixed an issue with the "follow message" button not changing state after click
diff --git a/.changeset/thirty-dryers-help.md b/.changeset/thirty-dryers-help.md
deleted file mode 100644
index 6d9a7dc205ae..000000000000
--- a/.changeset/thirty-dryers-help.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": patch
-"@rocket.chat/livechat": patch
----
-
-Fixed issue where `after-registration-triggers` would show up in a page when the user was not yet registered
diff --git a/.changeset/twelve-windows-train.md b/.changeset/twelve-windows-train.md
deleted file mode 100644
index 4c6ef548e650..000000000000
--- a/.changeset/twelve-windows-train.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixed: Custom fields in extraData now correctly added to extraRoomInfo by livechat.beforeRoom callback during livechat room creation.
diff --git a/.changeset/two-bikes-crash.md b/.changeset/two-bikes-crash.md
deleted file mode 100644
index a120435e4a48..000000000000
--- a/.changeset/two-bikes-crash.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
-
-The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.
diff --git a/.changeset/violet-radios-begin.md b/.changeset/violet-radios-begin.md
deleted file mode 100644
index d11f23b47478..000000000000
--- a/.changeset/violet-radios-begin.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-'@rocket.chat/core-typings': minor
-'@rocket.chat/i18n': minor
-'@rocket.chat/meteor': minor
----
-
-Fixed a bug related to uploading end to end encrypted file. 
-
-E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
-
-The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
-
-E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type. 
-
-Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
deleted file mode 100644
index c4c9bce010b8..000000000000
--- a/.changeset/wise-avocados-taste.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes an issue where multi-step modals were closing unexpectedly
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index b1563788be60..97a246abaca6 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,140 @@
 # @rocket.chat/meteor
 
+## 6.12.0
+
+### Minor Changes
+
+- ([#32535](https://github.com/RocketChat/Rocket.Chat/pull/32535)) Federation actions like sending message in a federated DM, reacting in a federated chat, etc, will no longer work if the configuration is invalid.
+
+- ([#32916](https://github.com/RocketChat/Rocket.Chat/pull/32916)) Added a new Audit endpoint `audit/rooms.members` that allows users with `view-members-list-all-rooms` to fetch a list of the members of any room even if the user is not part of it.
+
+- ([#32032](https://github.com/RocketChat/Rocket.Chat/pull/32032)) Added a new 'Deactivated' tab to the users page, this tab lists users who have logged in for the first time but have been deactivated for any reason. Also added the UI code for the Active tab;
+
+- ([#33044](https://github.com/RocketChat/Rocket.Chat/pull/33044)) Replaces an outdated banner with the Bubble component in order to display retention policy warning
+
+- ([#32867](https://github.com/RocketChat/Rocket.Chat/pull/32867)) Added an accordion for advanced settings on Create teams and channels
+
+- ([#32709](https://github.com/RocketChat/Rocket.Chat/pull/32709) by [@heet434](https://github.com/heet434)) Add "Created at" column to admin rooms table
+
+- ([#32535](https://github.com/RocketChat/Rocket.Chat/pull/32535)) New button added to validate Matrix Federation configuration. A new field inside admin settings will reflect the configuration status being either 'Valid' or 'Invalid'.
+
+- ([#32969](https://github.com/RocketChat/Rocket.Chat/pull/32969)) Upgrades fuselage-toastbar version in order to add pause on hover functionality
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Added a new setting to enable/disable file encryption in an end to end encrypted room.
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Fixed a bug related to uploading end to end encrypted file.
+
+  E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
+
+  The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
+
+  E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type.
+
+  Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33159](https://github.com/RocketChat/Rocket.Chat/pull/33159)) Improves Omnichannel queue page performance
+
+- ([#32986](https://github.com/RocketChat/Rocket.Chat/pull/32986)) Fixed login with third-party apps not working without the "Manage OAuth Apps" permission
+
+- ([#32852](https://github.com/RocketChat/Rocket.Chat/pull/32852)) Federated users can no longer be deleted.
+
+- ([#33033](https://github.com/RocketChat/Rocket.Chat/pull/33033) by [@csuadev](https://github.com/csuadev)) Fixed an issue due to an endpoint pagination that was causing that when an agent have assigned more than 50 departments, the departments have a blank space instead of the name.
+
+- ([#33058](https://github.com/RocketChat/Rocket.Chat/pull/33058)) Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
+
+- ([#24889](https://github.com/RocketChat/Rocket.Chat/pull/24889) by [@Shivansh2287](https://github.com/Shivansh2287)) Fixes an issue where the Announcement modal with long words was adding a horizontal scrollbar
+
+- ([#32940](https://github.com/RocketChat/Rocket.Chat/pull/32940)) Stopped non channel members from dragging and dropping files in a channel they do not belong
+
+- ([#33001](https://github.com/RocketChat/Rocket.Chat/pull/33001)) Allow apps to react/unreact to messages via bridge
+
+- ([#32809](https://github.com/RocketChat/Rocket.Chat/pull/32809)) Deactivating users who federated will now be permanent.
+
+- ([#31525](https://github.com/RocketChat/Rocket.Chat/pull/31525)) Fix: Show correct user info actions for non-members in channels.
+
+- ([#33136](https://github.com/RocketChat/Rocket.Chat/pull/33136)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#32931](https://github.com/RocketChat/Rocket.Chat/pull/32931)) Fixed an issue that caused UI to show an error when the call to get the Business Hour type from settings returned `undefined`.
+
+- ([#32743](https://github.com/RocketChat/Rocket.Chat/pull/32743)) Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
+
+- ([#33109](https://github.com/RocketChat/Rocket.Chat/pull/33109)) Fixes the `expanded` prop being accidentally forwarded to `ContextualbarHeader`
+
+- ([#32846](https://github.com/RocketChat/Rocket.Chat/pull/32846)) Fixed issue with system messages being counted as agents' first responses in livechat rooms (which caused the "best first response time" and "average first response time" metrics to be unreliable for all agents)
+
+- ([#32791](https://github.com/RocketChat/Rocket.Chat/pull/32791)) Fixed a behavior when updating messages that prevented the `customFields` prop from being updated if there were no changes to the `msg` property. Now, `customFields` will be always updated on message update even if `msg` doesn't change
+
+- ([#33169](https://github.com/RocketChat/Rocket.Chat/pull/33169)) Fixed issue that prevented sending encrypted filed from the mobile app
+
+- ([#33101](https://github.com/RocketChat/Rocket.Chat/pull/33101)) Fixed an issue where teams were being created with no room associated with it.
+
+- ([#33036](https://github.com/RocketChat/Rocket.Chat/pull/33036)) Fixes multiple problems with the `processRoomAbandonment` hook. This hook is in charge of calculating the time a room has been abandoned (this means, the time that elapsed since a room was last answered by an agent until it was closed). However, when business hours were enabled and the user didn't open on one day, if an abandoned room happened to be abandoned _over_ the day there was no business hour configuration, then the process will error out.
+  Additionally, the values the code was calculating were not right. When business hours are enabled, this code should only count the abandonment time _while a business hour was open_. When rooms were left abandoned for days or weeks, this will also throw an error or output an invalid count.
+- ([#33174](https://github.com/RocketChat/Rocket.Chat/pull/33174)) Restored tooltips to the unit edit department field selected options
+
+- ([#33054](https://github.com/RocketChat/Rocket.Chat/pull/33054)) Fixed issue with livechat analytics in a given date range considering conversation data from the following day
+
+- ([#32981](https://github.com/RocketChat/Rocket.Chat/pull/32981)) fixed an issue with the "follow message" button not changing state after click
+
+- ([#32928](https://github.com/RocketChat/Rocket.Chat/pull/32928)) Fixed issue where `after-registration-triggers` would show up in a page when the user was not yet registered
+
+- ([#33047](https://github.com/RocketChat/Rocket.Chat/pull/33047)) Fixed: Custom fields in extraData now correctly added to extraRoomInfo by livechat.beforeRoom callback during livechat room creation.
+
+- ([#33040](https://github.com/RocketChat/Rocket.Chat/pull/33040)) Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
+
+  The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.
+
+- ([#33158](https://github.com/RocketChat/Rocket.Chat/pull/33158)) Fixes an issue where multi-step modals were closing unexpectedly
+
+- <details><summary>Updated dependencies [8ea6517c4e, c11f3722df, 7f88158036, 127866ce97, 0c919db7b4, b764c415dc, 1f061a1aa5, dd37ea1b35, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0
+  - @rocket.chat/ui-theming@0.2.1
+  - @rocket.chat/ui-video-conf@10.0.0
+  - @rocket.chat/ui-composer@0.2.1
+  - @rocket.chat/gazzodown@10.0.0
+  - @rocket.chat/ui-avatar@6.0.0
+  - @rocket.chat/ui-client@10.0.0
+  - @rocket.chat/ui-kit@0.36.1
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/i18n@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/web-ui-registration@10.0.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/omnichannel-services@0.3.3
+  - @rocket.chat/apps@0.1.6
+  - @rocket.chat/models@0.2.3
+  - @rocket.chat/ui-contexts@10.0.0
+  - @rocket.chat/presence@0.2.6
+  - @rocket.chat/api-client@0.2.6
+  - @rocket.chat/license@0.2.6
+  - @rocket.chat/pdf-worker@0.2.3
+  - @rocket.chat/cron@0.1.6
+  - @rocket.chat/instance-status@0.1.6
+  - @rocket.chat/server-cloud-communication@0.0.2
+  </details>
+
 ## 6.12.0-rc.6
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 7393abfd78f3..dce2b0cfa1e0 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0-rc.6"
+	"version": "6.12.0"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 88e7e359bc96..1d6e058d7597 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 1.3.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [c11f3722df, 7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 1.3.3-rc.6
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index cec8d063c965..5535234bfaa1 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": "1.3.3-rc.6",
+	"version": "1.3.3",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index eda70c409922..a5924efe23ce 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": "6.12.0-rc.6",
+	"version": "6.12.0",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index ac7781d28bc2..8d306d7b1c17 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.4.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index bec29a8b79ce..226f531264bb 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.6-rc.6",
+	"version": "0.4.6",
 	"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 6b63a869b35c..494c052e8cf8 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.4.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index b38a8575a4c6..e614742754fe 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.6-rc.6",
+	"version": "0.4.6",
 	"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 940db182a501..97565b8bde88 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  - @rocket.chat/instance-status@0.1.6
+  </details>
+
 ## 0.3.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 83848e3963ee..5b620add788a 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.6-rc.6",
+	"version": "0.3.6",
 	"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 76542396e313..21fc879f9fd9 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/omnichannel-services@0.3.3
+  - @rocket.chat/models@0.2.3
+  - @rocket.chat/pdf-worker@0.2.3
+  </details>
+
 ## 0.4.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 68303c58088c..057b8b2911bb 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.6-rc.6",
+	"version": "0.4.6",
 	"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 e73a9694364d..a1ed37bb6fde 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  - @rocket.chat/presence@0.2.6
+  </details>
+
 ## 0.4.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 8dfae32d4654..94854d45cb40 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.6-rc.6",
+	"version": "0.4.6",
 	"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 152a84fd8aac..16dc2590f38b 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/omnichannel-services@0.3.3
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.4.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index ce730cd187e4..01ffc2cb4aa0 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.6-rc.6",
+	"version": "0.4.6",
 	"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 eb56806b8a13..ccbb83e7de0b 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.4.6-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 7d3f02a9b3e6..5f96b74cab8b 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.6-rc.6",
+	"version": "0.4.6",
 	"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 f6ce972eb0bd..181b6dfb0e7f 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0
+  </details>
+
 ## 0.2.6-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 28879f81cac8..35dfc7f8dc7a 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6-rc.6",
+	"version": "0.2.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index b0e8b86ef2bf..f54493a31cd1 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.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, b764c415dc, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  - @rocket.chat/pdf-worker@0.2.3
+  </details>
+
 ## 0.3.3-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 7c6341bb31e4..2110c254bf06 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.3-rc.6",
+	"version": "0.3.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 2757de6f3a0f..ccc01c92e84f 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.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0
+  </details>
+
 ## 0.2.3-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index b83f9dfa1f68..cf96d08efc8b 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.3-rc.6",
+	"version": "0.2.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 4e8013b5f332..a4effccb5f2b 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/core-services@0.6.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.2.6-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 6cbcde18d331..cce1869e562f 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6-rc.6",
+	"version": "0.2.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/ee/packages/ui-theming/CHANGELOG.md b/ee/packages/ui-theming/CHANGELOG.md
index 7b9d7c385f6c..3a4956d146c3 100644
--- a/ee/packages/ui-theming/CHANGELOG.md
+++ b/ee/packages/ui-theming/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-theming
 
+## 0.2.1
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
 ## 0.2.1-rc.0
 
 ### Patch Changes
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index bce501e2dc6f..da2b71c1877b 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-theming",
-	"version": "0.2.1-rc.0",
+	"version": "0.2.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
diff --git a/package.json b/package.json
index 15e5e0eff3a2..3f40f1d4ac3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0-rc.6",
+	"version": "6.12.0",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index e40abfdd89fb..50096d81e901 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [b764c415dc, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  </details>
+
 ## 0.2.6-rc.6
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index bce60c0b8d63..1ea3011a0010 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.6-rc.6",
+	"version": "0.2.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 19a122d49979..adb1b989bad0 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, 7937ff741a, a14c0678bb, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  - @rocket.chat/core-typings@6.12.0
+  </details>
+
 ## 0.1.6-rc.6
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index b96b923273d7..8b26679f7d5c 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6-rc.6",
+	"version": "0.1.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 251766374014..a73f804408ba 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/core-services
 
+## 0.6.0
+
+### Minor Changes
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [c11f3722df, b764c415dc, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.6.0-rc.6
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 37f26b4d8429..4de22804d3d0 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0-rc.6",
+	"version": "0.6.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 98ceafcae123..ac2c861590c0 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @rocket.chat/core-typings
 
+## 6.12.0
+
+### Minor Changes
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Added a new setting to enable/disable file encryption in an end to end encrypted room.
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Fixed a bug related to uploading end to end encrypted file.
+
+  E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
+
+  The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
+
+  E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type.
+
+  Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
+
+### Patch Changes
+
+- ([#32846](https://github.com/RocketChat/Rocket.Chat/pull/32846)) Fixed issue with system messages being counted as agents' first responses in livechat rooms (which caused the "best first response time" and "average first response time" metrics to be unreliable for all agents)
+
+- <details><summary>Updated dependencies [c11f3722df]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1
+  </details>
+
 ## 6.12.0-rc.6
 
 ## 6.12.0-rc.5
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 403dd028bacc..9dddf874ed40 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0-rc.6",
+	"version": "6.12.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index a7986195ff97..9c0c43c6f16e 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.1.6-rc.6
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index d0476a5de8fd..015ae8280045 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6-rc.6",
+	"version": "0.1.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 8aee54e192f2..29e062a1374d 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [b764c415dc, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/api-client@0.2.6
+  </details>
+
 ## 0.3.6-rc.6
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 36ac6cdc261f..55c2d748bec4 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.6-rc.6",
+	"version": "0.3.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index f4e29b838b6d..41cc87932393 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## 10.0.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e, c11f3722df, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-video-conf@10.0.0
+  - @rocket.chat/gazzodown@10.0.0
+  - @rocket.chat/ui-avatar@6.0.0
+  - @rocket.chat/ui-kit@0.36.1
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 10.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index db5aa1a28e4f..d84b1b595335 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0-rc.6",
+  "version": "10.0.0",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0-rc.6",
-    "@rocket.chat/ui-contexts": "10.0.0-rc.6",
-    "@rocket.chat/ui-kit": "0.36.1-rc.0",
-    "@rocket.chat/ui-video-conf": "10.0.0-rc.6",
+    "@rocket.chat/ui-avatar": "6.0.0",
+    "@rocket.chat/ui-contexts": "10.0.0",
+    "@rocket.chat/ui-kit": "0.36.1",
+    "@rocket.chat/ui-video-conf": "10.0.0",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 66a435d93256..74cd44cc291c 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/gazzodown
 
+## 10.0.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-client@10.0.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 10.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 39dc8359bd50..909be2dd192c 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0-rc.6",
+	"version": "10.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0-rc.6",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
+		"@rocket.chat/ui-client": "10.0.0",
+		"@rocket.chat/ui-contexts": "10.0.0",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 31ca8e91df6d..8a7e4f7317b9 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @rocket.chat/i18n
 
+## 0.7.0
+
+### Minor Changes
+
+- ([#32916](https://github.com/RocketChat/Rocket.Chat/pull/32916)) Added a new Audit endpoint `audit/rooms.members` that allows users with `view-members-list-all-rooms` to fetch a list of the members of any room even if the user is not part of it.
+
+- ([#32867](https://github.com/RocketChat/Rocket.Chat/pull/32867)) Added an accordion for advanced settings on Create teams and channels
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Added a new setting to enable/disable file encryption in an end to end encrypted room.
+
+- ([#33003](https://github.com/RocketChat/Rocket.Chat/pull/33003)) Fixed a bug related to uploading end to end encrypted file.
+
+  E2EE files and uploads are uploaded as files of mime type `application/octet-stream` as we can't reveal the mime type of actual content since it is encrypted and has to be kept confidential.
+
+  The server resolves the mime type of encrypted file as `application/octet-stream` but it wasn't playing nicely with existing settings related to whitelisted and blacklisted media types.
+
+  E2EE files upload was getting blocked if `application/octet-stream` is not a whitelisted media type.
+
+  Now this PR solves this issue by always accepting E2EE uploads even if `application/octet-stream` is not whitelisted but it will block the upload if `application/octet-stream` is black listed.
+
+### Patch Changes
+
+- ([#31525](https://github.com/RocketChat/Rocket.Chat/pull/31525)) Fix: Show correct user info actions for non-members in channels.
+
+- ([#33029](https://github.com/RocketChat/Rocket.Chat/pull/33029)) Fixes a typo in german translation and fixes the broken hyperlink for Resend and Change Email
+
+- ([#32743](https://github.com/RocketChat/Rocket.Chat/pull/32743)) Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
+
 ## 0.7.0-rc.0
 
 ### Minor Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 8bae9a225113..466c022ad904 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.7.0-rc.0",
+	"version": "0.7.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 538aa3a9fbb1..bebd0fd56b85 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.3
+  </details>
+
 ## 0.1.6-rc.6
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 353b5e32ca4d..686d4c710b1d 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.6-rc.6",
+	"version": "0.1.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 02014c7dc441..598fae50d68d 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.3
+
+### Patch Changes
+
+- ([#32928](https://github.com/RocketChat/Rocket.Chat/pull/32928)) Fixed issue where `after-registration-triggers` would show up in a page when the user was not yet registered
+
+- <details><summary>Updated dependencies [8ea6517c4e, c11f3722df]:</summary>
+
+  - @rocket.chat/gazzodown@10.0.0
+  - @rocket.chat/ui-kit@0.36.1
+  </details>
+
 ## 1.19.3-rc.6
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 43785150b147..564746ae9923 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3-rc.6",
+	"version": "1.19.3",
 	"files": [
 		"/build"
 	],
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index 55af119d59fe..3a2edfdf99ff 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/mock-providers
 
+## 0.1.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [127866ce97, 0c919db7b4, b764c415dc, 1f061a1aa5, dd37ea1b35, 58c0efc732, 58c0efc732]:</summary>
+
+  - @rocket.chat/i18n@0.7.0
+  </details>
+
 ## 0.1.2-rc.0
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index d2b2589b8f89..d2d1f412fae8 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.2-rc.0",
+	"version": "0.1.2",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index ed35844a153b..b743a1132b48 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/model-typings
 
+## 0.7.0
+
+### Minor Changes
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+### Patch Changes
+
+- ([#32986](https://github.com/RocketChat/Rocket.Chat/pull/32986)) Fixed login with third-party apps not working without the "Manage OAuth Apps" permission
+
+- ([#33054](https://github.com/RocketChat/Rocket.Chat/pull/33054)) Fixed issue with livechat analytics in a given date range considering conversation data from the following day
+
+- <details><summary>Updated dependencies [7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/core-typings@6.12.0
+  </details>
+
 ## 0.7.0-rc.6
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index fd663b278cca..4819a451c82f 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0-rc.6",
+	"version": "0.7.0",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 558c504c3268..1238c213ec4f 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [7f88158036, a14c0678bb, e28be46db7]:</summary>
+
+  - @rocket.chat/model-typings@0.7.0
+  </details>
+
 ## 0.2.3-rc.6
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index c86aafcb8bb1..b3060782e983 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3-rc.6",
+	"version": "0.2.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index fc38cba221c4..7cce8dcc6e99 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/rest-typings
 
+## 6.12.0
+
+### Minor Changes
+
+- ([#32868](https://github.com/RocketChat/Rocket.Chat/pull/32868)) Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
+
+### Patch Changes
+
+- ([#31525](https://github.com/RocketChat/Rocket.Chat/pull/31525)) Fix: Show correct user info actions for non-members in channels.
+
+- <details><summary>Updated dependencies [c11f3722df, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/ui-kit@0.36.1
+  - @rocket.chat/core-typings@6.12.0
+  </details>
+
 ## 6.12.0-rc.6
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 41756394129f..833326e26599 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0-rc.6",
+	"version": "6.12.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 79c48bb80737..a9fa21cf7195 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 6.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 38b74d18d0bd..3bed718fbba5 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0-rc.6",
+	"version": "6.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "10.0.0",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 4e9ca998b624..1d172fe1054f 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-client
 
+## 10.0.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 10.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 116fc3e94309..7ee4ded9bfee 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0-rc.6",
+	"version": "10.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "10.0.0",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-composer/CHANGELOG.md b/packages/ui-composer/CHANGELOG.md
index 18571eca048a..757dee9a2549 100644
--- a/packages/ui-composer/CHANGELOG.md
+++ b/packages/ui-composer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-composer
 
+## 0.2.1
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
 ## 0.2.1-rc.0
 
 ### Patch Changes
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 0f69b1df3868..9e575aed8478 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/ui-composer",
-  "version": "0.2.1-rc.0",
+  "version": "0.2.1",
   "private": true,
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 710911bd9933..aa0f00bc0e83 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [127866ce97, 0c919db7b4, b764c415dc, 1f061a1aa5, dd37ea1b35, 7937ff741a, 58c0efc732, e28be46db7, 58c0efc732]:</summary>
+
+  - @rocket.chat/i18n@0.7.0
+  - @rocket.chat/rest-typings@6.12.0
+  - @rocket.chat/core-typings@6.12.0
+  - @rocket.chat/ddp-client@0.3.6
+  </details>
+
 ## 10.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 13ab83923751..854e12deff93 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0-rc.6",
+	"version": "10.0.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-kit/CHANGELOG.md b/packages/ui-kit/CHANGELOG.md
index 7b7a94cfbbe0..e8d149f6b102 100644
--- a/packages/ui-kit/CHANGELOG.md
+++ b/packages/ui-kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.36.1
+
+### Patch Changes
+
+- ([#33000](https://github.com/RocketChat/Rocket.Chat/pull/33000)) fix UiKit error message: Failed to resolve module: @rocket.chat/icons
+
 ## 0.36.1-rc.0
 
 ### Patch Changes
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index cd8ad2399aa5..28eade795907 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-kit",
-	"version": "0.36.1-rc.0",
+	"version": "0.36.1",
 	"description": "Interactive UI elements for Rocket.Chat Apps",
 	"homepage": "https://rocket.chat",
 	"author": {
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index 0db83b81ccd9..0ebba8028576 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.0
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e]:</summary>
+
+  - @rocket.chat/ui-avatar@6.0.0
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 10.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index bda4146addab..ea97ec39ba58 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": "10.0.0-rc.6",
+	"version": "10.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0-rc.6",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
+		"@rocket.chat/ui-avatar": "6.0.0",
+		"@rocket.chat/ui-contexts": "10.0.0",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 9c79731d5fc1..63a8eb47d7c6 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.0
+
+### Minor Changes
+
+- ([#32969](https://github.com/RocketChat/Rocket.Chat/pull/32969)) Upgrades fuselage-toastbar version in order to add pause on hover functionality
+
+### Patch Changes
+
+- ([#32968](https://github.com/RocketChat/Rocket.Chat/pull/32968)) Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
+
+- <details><summary>Updated dependencies [8ea6517c4e]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.0
+  - @rocket.chat/ui-avatar@6.0.0
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 0.4.0-rc.6
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 94937b715a82..e3a029e181ec 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0-rc.6",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index d44238b4a5ad..601f9aa63494 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.0
+
+### Patch Changes
+
+- ([#32743](https://github.com/RocketChat/Rocket.Chat/pull/32743)) Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.0
+  </details>
+
 ## 10.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ad0af070a230..7daa6e21e68d 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": "10.0.0-rc.6",
+	"version": "10.0.0",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "10.0.0",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index ea8b50d6539e..d89ba8bce628 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.5
-    "@rocket.chat/ui-contexts": 10.0.0-rc.5
+    "@rocket.chat/ui-avatar": 6.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0-rc.6
     "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.5
+    "@rocket.chat/ui-video-conf": 10.0.0-rc.6
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.5
-    "@rocket.chat/ui-contexts": 10.0.0-rc.5
+    "@rocket.chat/ui-client": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0-rc.6
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.5
+    "@rocket.chat/ui-contexts": 10.0.0-rc.6
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.5
+    "@rocket.chat/ui-contexts": 10.0.0-rc.6
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.5
-    "@rocket.chat/ui-contexts": 10.0.0-rc.5
+    "@rocket.chat/ui-avatar": 6.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0-rc.6
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.5
+    "@rocket.chat/ui-contexts": 10.0.0-rc.6
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From e4e8541c915993e66115d00afccc5d7cbd18d657 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 5 Sep 2024 11:29:18 -0300
Subject: [PATCH 049/170] chore: Bump rocket.chat to 6.13.0-develop

---
 apps/meteor/app/utils/rocketchat.info | 2 +-
 apps/meteor/package.json              | 2 +-
 package.json                          | 2 +-
 packages/core-typings/package.json    | 2 +-
 packages/rest-typings/package.json    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index dce2b0cfa1e0..cb3ad01b882a 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0"
+	"version": "6.13.0-develop"
 }
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index c85382fb132f..e1f2eff94e07 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": "6.12.0",
+	"version": "6.13.0-develop",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/package.json b/package.json
index e4ff9f4e48dc..60ec7b46f62f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0",
+	"version": "6.13.0-develop",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 581ad0e3d9d9..86123a156e75 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0",
+	"version": "6.13.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index c7383c8537c3..61e23c4c93ce 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0",
+	"version": "6.13.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",

From 532f08819efbcb18d42817ea1e839062130c9cc7 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 5 Sep 2024 14:04:14 -0300
Subject: [PATCH 050/170] feat: add references to room.info endpoint (#33011)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>
---
 .changeset/quiet-cherries-punch.md            |   7 +
 apps/meteor/app/api/server/v1/rooms.ts        |  16 +-
 apps/meteor/server/services/team/service.ts   |  25 +++
 apps/meteor/tests/end-to-end/api/rooms.ts     | 158 +++++++++++++++++-
 .../core-services/src/types/ITeamService.ts   |   4 +
 packages/rest-typings/src/v1/rooms.ts         |   4 +-
 6 files changed, 210 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/quiet-cherries-punch.md

diff --git a/.changeset/quiet-cherries-punch.md b/.changeset/quiet-cherries-punch.md
new file mode 100644
index 000000000000..25c08506db41
--- /dev/null
+++ b/.changeset/quiet-cherries-punch.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-services": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Return `parent` and `team` information when calling `rooms.info` endpoint
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index a0ed75ceea30..5da59d977fb1 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -1,4 +1,4 @@
-import { Media } from '@rocket.chat/core-services';
+import { Media, Team } from '@rocket.chat/core-services';
 import type { IRoom, IUpload } from '@rocket.chat/core-typings';
 import { Messages, Rooms, Users, Uploads, Subscriptions } from '@rocket.chat/models';
 import type { Notifications } from '@rocket.chat/rest-typings';
@@ -417,7 +417,19 @@ API.v1.addRoute(
 				return API.v1.failure('not-allowed', 'Not Allowed');
 			}
 
-			return API.v1.success({ room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined });
+			const discussionParent =
+				room.prid &&
+				(await Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | 'prid' | 'u'>>(room.prid, {
+					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1 },
+				}));
+			const { team, parentRoom } = await Team.getRoomInfo(room);
+			const parent = discussionParent || parentRoom;
+
+			return API.v1.success({
+				room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined,
+				...(team && { team }),
+				...(parent && { parent }),
+			});
 		},
 	},
 );
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 190464f48da4..27f7af1f1b1c 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -20,6 +20,7 @@ import type {
 	ITeam,
 	ITeamMember,
 	ITeamStats,
+	AtLeast,
 } from '@rocket.chat/core-typings';
 import type { InsertionModel } from '@rocket.chat/model-typings';
 import { Team, Rooms, Subscriptions, Users, TeamMember } from '@rocket.chat/models';
@@ -1053,4 +1054,28 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 
 		return rooms;
 	}
+
+	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id'> | null> {
+		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id'>>(team.roomId, { projection: { name: 1, fname: 1, t: 1 } });
+	}
+
+	async getRoomInfo(
+		room: AtLeast<IRoom, 'teamId' | 'teamMain' | '_id'>,
+	): Promise<{ team?: Pick<ITeam, 'name' | 'roomId' | 'type'>; parentRoom?: Pick<IRoom, 'name' | 'fname' | 't' | '_id'> }> {
+		if (!room.teamId) {
+			return {};
+		}
+
+		const team = await Team.findOneById(room.teamId, { projection: { _id: 1, name: 1, roomId: 1, type: 1 } });
+		if (!team) {
+			return {};
+		}
+
+		if (room.teamMain) {
+			return { team };
+		}
+
+		const parentRoom = await this.getParentRoom(team);
+		return { team, ...(parentRoom && { parentRoom }) };
+	}
 }
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index bb4cbb8fb196..15f85964ffff 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -1264,8 +1264,164 @@ describe('[Rooms]', () => {
 				})
 				.end(done);
 		});
-	});
 
+		it('should not return parent & team for room thats not on a team nor is a discussion', async () => {
+			await request
+				.get(api('rooms.info'))
+				.set(credentials)
+				.query({
+					roomId: testChannel._id,
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('room').and.to.be.an('object');
+					expect(res.body.room).to.not.have.property('team');
+					expect(res.body.room).to.not.have.property('prid');
+				});
+		});
+
+		describe('with team and parent data', () => {
+			const testChannelName = `channel.test.${Date.now()}-${Math.random()}`;
+			const teamName = `test-team-${Date.now()}`;
+			const discussionName = `test-discussion-${Date.now()}`;
+			const testChannelOutsideTeamname = `channel.test.outside.${Date.now()}-${Math.random()}`;
+			let testChannel: IRoom;
+			let testDiscussion: IRoom;
+			let testDiscussionMainRoom: IRoom;
+			let testTeam: ITeam;
+			let testChannelOutside: IRoom;
+			let testDiscussionOutsideTeam: IRoom;
+
+			before(async () => {
+				testChannel = (await createRoom({ type: 'c', name: testChannelName })).body.channel;
+
+				const teamResponse = await request.post(api('teams.create')).set(credentials).send({ name: teamName, type: 1 }).expect(200);
+				testTeam = teamResponse.body.team;
+
+				const resDiscussion = await request.post(api('rooms.createDiscussion')).set(credentials).send({
+					prid: testChannel._id,
+					t_name: discussionName,
+				});
+				testDiscussion = resDiscussion.body.discussion;
+
+				testDiscussionMainRoom = (
+					await request
+						.post(api('rooms.createDiscussion'))
+						.set(credentials)
+						.send({
+							prid: testTeam.roomId,
+							t_name: `test-discussion-${Date.now()}-team`,
+						})
+				).body.discussion;
+
+				await request
+					.post(api('teams.addRooms'))
+					.set(credentials)
+					.send({ rooms: [testChannel._id], teamId: testTeam._id });
+			});
+
+			before(async () => {
+				testChannelOutside = (await createRoom({ type: 'c', name: testChannelOutsideTeamname })).body.channel;
+				testDiscussionOutsideTeam = (
+					await request
+						.post(api('rooms.createDiscussion'))
+						.set(credentials)
+						.send({
+							prid: testChannelOutside._id,
+							t_name: `test-discussion-${Date.now()}`,
+						})
+				).body.discussion;
+			});
+
+			after(() =>
+				Promise.all([
+					deleteRoom({ type: 'c', roomId: testChannel._id }),
+					deleteRoom({ type: 'p', roomId: testDiscussion._id }),
+					deleteRoom({ type: 'c', roomId: testChannelOutside._id }),
+					deleteRoom({ type: 'p', roomId: testDiscussionOutsideTeam._id }),
+					deleteRoom({ type: 'p', roomId: testDiscussionMainRoom._id }),
+					deleteTeam(credentials, teamName),
+				]),
+			);
+
+			it('should return the channel info, team and parent info', async () => {
+				const result = await request.get(api('rooms.info')).set(credentials).query({ roomId: testChannel._id }).expect(200);
+
+				expect(result.body).to.have.property('success', true);
+				expect(result.body).to.have.property('team');
+				expect(result.body).to.have.property('parent');
+				expect(result.body.parent).to.have.property('_id').and.to.equal(testTeam.roomId);
+			});
+
+			it('should return the dicsussion room info and parent info', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testDiscussion._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('parent').and.to.be.an('object');
+						expect(res.body.parent).to.have.property('_id').and.to.be.equal(testChannel._id);
+					});
+			});
+
+			it('should not return parent info for the main room of the team', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testTeam.roomId })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.not.have.property('parent');
+						expect(res.body).to.have.property('team');
+					});
+			});
+
+			it('should not return team for room outside team', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testChannelOutside._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.not.have.property('team');
+						expect(res.body).to.not.have.property('parent');
+					});
+			});
+
+			it('should return the parent for discussion outside team', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testDiscussionOutsideTeam._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('parent').and.to.be.an('object');
+						expect(res.body.parent).to.have.property('_id').and.to.be.equal(testChannelOutside._id);
+						expect(res.body).to.not.have.property('team');
+					});
+			});
+
+			it('should return the parent for a discussion created from team main room', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testDiscussionMainRoom._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('parent').and.to.be.an('object');
+						expect(res.body.parent).to.have.property('_id').and.to.be.equal(testTeam.roomId);
+						expect(res.body).to.not.have.property('team');
+					});
+			});
+		});
+	});
 	describe('[/rooms.leave]', () => {
 		let testChannel: IRoom;
 		let testGroup: IRoom;
diff --git a/packages/core-services/src/types/ITeamService.ts b/packages/core-services/src/types/ITeamService.ts
index 2d67bf515fca..3caa6a2e97df 100644
--- a/packages/core-services/src/types/ITeamService.ts
+++ b/packages/core-services/src/types/ITeamService.ts
@@ -9,6 +9,7 @@ import type {
 	IRoom,
 	IUser,
 	IRole,
+	AtLeast,
 } from '@rocket.chat/core-typings';
 import type { Document, Filter, FindOptions } from 'mongodb';
 
@@ -125,4 +126,7 @@ export interface ITeamService {
 	getStatistics(): Promise<ITeamStats>;
 	findBySubscribedUserIds(userId: string, callerId?: string): Promise<ITeam[]>;
 	addRolesToMember(teamId: string, userId: string, roles: Array<string>): Promise<boolean>;
+	getRoomInfo(
+		room: AtLeast<IRoom, 'teamId' | 'teamMain' | '_id'>,
+	): Promise<{ team?: Pick<ITeam, 'name' | 'roomId' | 'type'>; parentRoom?: Pick<IRoom, 'name' | 'fname' | 't' | '_id'> }>;
 }
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index 2172b5663afc..c837ba7186bd 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage, ITeam } from '@rocket.chat/core-typings';
 
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
@@ -626,6 +626,8 @@ export type RoomsEndpoints = {
 	'/v1/rooms.info': {
 		GET: (params: RoomsInfoProps) => {
 			room: IRoom | undefined;
+			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
+			team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 		};
 	};
 

From e8baaecd5e7a508b373e8116231e1a169cfbe724 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 5 Sep 2024 15:37:54 -0300
Subject: [PATCH 051/170] fix: prevent uiInteraction to invalidate multiple
 times (#33216)

---
 .changeset/rich-toes-bow.md                        | 5 +++++
 apps/meteor/client/hooks/useAppUiKitInteraction.ts | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/rich-toes-bow.md

diff --git a/.changeset/rich-toes-bow.md b/.changeset/rich-toes-bow.md
new file mode 100644
index 000000000000..a670f0756f1e
--- /dev/null
+++ b/.changeset/rich-toes-bow.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Prevented uiInteraction to subscribe multiple times
diff --git a/apps/meteor/client/hooks/useAppUiKitInteraction.ts b/apps/meteor/client/hooks/useAppUiKitInteraction.ts
index 55741b1961b4..56d984c709e6 100644
--- a/apps/meteor/client/hooks/useAppUiKitInteraction.ts
+++ b/apps/meteor/client/hooks/useAppUiKitInteraction.ts
@@ -1,3 +1,4 @@
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useStream, useUserId } from '@rocket.chat/ui-contexts';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { useEffect } from 'react';
@@ -6,13 +7,12 @@ export const useAppUiKitInteraction = (handleServerInteraction: (interaction: Ui
 	const notifyUser = useStream('notify-user');
 	const uid = useUserId();
 
+	const handle = useEffectEvent(handleServerInteraction);
 	useEffect(() => {
 		if (!uid) {
 			return;
 		}
 
-		return notifyUser(`${uid}/uiInteraction`, (interaction) => {
-			handleServerInteraction(interaction);
-		});
-	}, [notifyUser, uid, handleServerInteraction]);
+		return notifyUser(`${uid}/uiInteraction`, handle);
+	}, [notifyUser, uid, handle]);
 };

From a928cebd56b79cce0a5189f39c67df0122db6e69 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Thu, 5 Sep 2024 20:54:31 -0300
Subject: [PATCH 052/170] refactor: `AnchorPortal` component (#33217)

---
 apps/meteor/client/lib/utils/createAnchor.ts  | 18 --------
 apps/meteor/client/lib/utils/deleteAnchor.ts  | 11 -----
 apps/meteor/client/portals/TooltipPortal.tsx  | 11 ++---
 .../client/portals/VideoConfPopupPortal.tsx   | 11 ++---
 .../src/components/AnchorPortal.spec.tsx      | 45 +++++++++++++++++++
 .../ui-client/src/components/AnchorPortal.tsx | 25 +++++++++++
 packages/ui-client/src/components/index.ts    |  1 +
 packages/ui-client/src/helpers/anchors.ts     | 32 +++++++++++++
 yarn.lock                                     | 22 ++++-----
 9 files changed, 122 insertions(+), 54 deletions(-)
 delete mode 100644 apps/meteor/client/lib/utils/createAnchor.ts
 delete mode 100644 apps/meteor/client/lib/utils/deleteAnchor.ts
 create mode 100644 packages/ui-client/src/components/AnchorPortal.spec.tsx
 create mode 100644 packages/ui-client/src/components/AnchorPortal.tsx
 create mode 100644 packages/ui-client/src/helpers/anchors.ts

diff --git a/apps/meteor/client/lib/utils/createAnchor.ts b/apps/meteor/client/lib/utils/createAnchor.ts
deleted file mode 100644
index 836b30582f91..000000000000
--- a/apps/meteor/client/lib/utils/createAnchor.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { registerAnchor } from './deleteAnchor';
-
-type T = keyof HTMLElementTagNameMap;
-
-export const createAnchor: {
-	(id: string, tag?: T): T extends undefined ? HTMLElementTagNameMap['div'] : HTMLElementTagNameMap[T];
-} = (id: string, tag = 'div') => {
-	const anchor = document.getElementById(id);
-	if (anchor && anchor.tagName.toLowerCase() === tag) {
-		return anchor as any;
-	}
-	const a = document.createElement(tag);
-	a.id = id;
-	document.body.appendChild(a);
-
-	registerAnchor(a, () => document.body.removeChild(a));
-	return a;
-};
diff --git a/apps/meteor/client/lib/utils/deleteAnchor.ts b/apps/meteor/client/lib/utils/deleteAnchor.ts
deleted file mode 100644
index 33e34046ea3b..000000000000
--- a/apps/meteor/client/lib/utils/deleteAnchor.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-const anchor = new WeakMap<HTMLElement, () => void>();
-
-export const deleteAnchor = (element: HTMLElement): void => {
-	const fn = anchor.get(element);
-	if (fn) {
-		fn();
-	}
-};
-export const registerAnchor = (element: HTMLElement, fn: () => void): void => {
-	anchor.set(element, fn);
-};
diff --git a/apps/meteor/client/portals/TooltipPortal.tsx b/apps/meteor/client/portals/TooltipPortal.tsx
index 6897a98ad5d6..a4f7b03c4296 100644
--- a/apps/meteor/client/portals/TooltipPortal.tsx
+++ b/apps/meteor/client/portals/TooltipPortal.tsx
@@ -1,18 +1,15 @@
+import { AnchorPortal } from '@rocket.chat/ui-client';
 import type { ReactNode } from 'react';
-import React, { memo, useEffect, useState } from 'react';
-import { createPortal } from 'react-dom';
+import React, { memo } from 'react';
 
-import { createAnchor } from '../lib/utils/createAnchor';
-import { deleteAnchor } from '../lib/utils/deleteAnchor';
+const tooltipAnchorId = 'tooltip-root';
 
 type TooltipPortalProps = {
 	children?: ReactNode;
 };
 
 const TooltipPortal = ({ children }: TooltipPortalProps) => {
-	const [tooltipRoot] = useState(() => createAnchor('tooltip-root'));
-	useEffect(() => (): void => deleteAnchor(tooltipRoot), [tooltipRoot]);
-	return <>{createPortal(children, tooltipRoot)}</>;
+	return <AnchorPortal id={tooltipAnchorId}>{children}</AnchorPortal>;
 };
 
 export default memo(TooltipPortal);
diff --git a/apps/meteor/client/portals/VideoConfPopupPortal.tsx b/apps/meteor/client/portals/VideoConfPopupPortal.tsx
index b1c0746e93e2..4da4b0c39a51 100644
--- a/apps/meteor/client/portals/VideoConfPopupPortal.tsx
+++ b/apps/meteor/client/portals/VideoConfPopupPortal.tsx
@@ -1,18 +1,15 @@
+import { AnchorPortal } from '@rocket.chat/ui-client';
 import type { ReactElement, ReactNode } from 'react';
-import React, { memo, useEffect, useState } from 'react';
-import { createPortal } from 'react-dom';
+import React, { memo } from 'react';
 
-import { createAnchor } from '../lib/utils/createAnchor';
-import { deleteAnchor } from '../lib/utils/deleteAnchor';
+const videoConfAnchorId = 'video-conf-root';
 
 type VideoConfPortalProps = {
 	children?: ReactNode;
 };
 
 const VideoConfPortal = ({ children }: VideoConfPortalProps): ReactElement => {
-	const [videoConfRoot] = useState(() => createAnchor('video-conf-root'));
-	useEffect(() => (): void => deleteAnchor(videoConfRoot), [videoConfRoot]);
-	return <>{createPortal(children, videoConfRoot)}</>;
+	return <AnchorPortal id={videoConfAnchorId}>{children}</AnchorPortal>;
 };
 
 export default memo(VideoConfPortal);
diff --git a/packages/ui-client/src/components/AnchorPortal.spec.tsx b/packages/ui-client/src/components/AnchorPortal.spec.tsx
new file mode 100644
index 000000000000..309322c002b3
--- /dev/null
+++ b/packages/ui-client/src/components/AnchorPortal.spec.tsx
@@ -0,0 +1,45 @@
+import { render, screen } from '@testing-library/react';
+
+import AnchorPortal from './AnchorPortal';
+
+it('should render children', () => {
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, { legacyRoot: true });
+
+	expect(screen.getByRole('presentation', { name: 'example' })).toBeInTheDocument();
+});
+
+it('should not recreate the anchor element', () => {
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example A' />} />, { legacyRoot: true });
+	const anchorA = document.getElementById('test-anchor');
+
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example B' />} />, { legacyRoot: true });
+	const anchorB = document.getElementById('test-anchor');
+
+	expect(anchorA).toBe(anchorB);
+	expect(screen.getByRole('presentation', { name: 'example A' })).toBeInTheDocument();
+	expect(screen.getByRole('presentation', { name: 'example B' })).toBeInTheDocument();
+});
+
+it('should remove the anchor element when unmounted', () => {
+	const { unmount } = render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, {
+		legacyRoot: true,
+	});
+	expect(document.getElementById('test-anchor')).toBeInTheDocument();
+
+	unmount();
+	expect(document.getElementById('test-anchor')).not.toBeInTheDocument();
+});
+
+it('should not remove the anchor element after unmounting if there are other portals with the same id', () => {
+	const { unmount } = render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, {
+		legacyRoot: true,
+	});
+	expect(document.getElementById('test-anchor')).toBeInTheDocument();
+
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, {
+		legacyRoot: true,
+	});
+	unmount();
+
+	expect(document.getElementById('test-anchor')).toBeInTheDocument();
+});
diff --git a/packages/ui-client/src/components/AnchorPortal.tsx b/packages/ui-client/src/components/AnchorPortal.tsx
new file mode 100644
index 000000000000..c0d01122c2cf
--- /dev/null
+++ b/packages/ui-client/src/components/AnchorPortal.tsx
@@ -0,0 +1,25 @@
+import { ReactNode, useLayoutEffect } from 'react';
+import { createPortal } from 'react-dom';
+
+import { ensureAnchorElement, refAnchorElement, unrefAnchorElement } from '../helpers/anchors';
+
+export type AnchorPortalProps = {
+	id: string;
+	children: ReactNode;
+};
+
+const AnchorPortal = ({ id, children }: AnchorPortalProps) => {
+	const anchorElement = ensureAnchorElement(id);
+
+	useLayoutEffect(() => {
+		refAnchorElement(anchorElement);
+
+		return () => {
+			unrefAnchorElement(anchorElement);
+		};
+	}, [anchorElement]);
+
+	return <>{createPortal(children, anchorElement)}</>;
+};
+
+export default AnchorPortal;
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index c98eace56f13..1eccad1fd234 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -1,3 +1,4 @@
+export { default as AnchorPortal, AnchorPortalProps } from './AnchorPortal';
 export * from './EmojiPicker';
 export * from './ExternalLink';
 export * from './DotLeader';
diff --git a/packages/ui-client/src/helpers/anchors.ts b/packages/ui-client/src/helpers/anchors.ts
new file mode 100644
index 000000000000..6cbc6d454846
--- /dev/null
+++ b/packages/ui-client/src/helpers/anchors.ts
@@ -0,0 +1,32 @@
+export const ensureAnchorElement = (id: string): HTMLElement => {
+	const existingAnchor = document.getElementById(id);
+	if (existingAnchor) return existingAnchor;
+
+	const newAnchor = document.createElement('div');
+	newAnchor.id = id;
+	document.body.appendChild(newAnchor);
+	return newAnchor;
+};
+
+const getAnchorRefCount = (anchorElement: HTMLElement): number => {
+	const { refCount } = anchorElement.dataset;
+	if (refCount) return parseInt(refCount, 10);
+	return 0;
+};
+
+const setAnchorRefCount = (anchorElement: HTMLElement, refCount: number): void => {
+	anchorElement.dataset.refCount = String(refCount);
+};
+
+export const refAnchorElement = (anchorElement: HTMLElement): void => {
+	setAnchorRefCount(anchorElement, getAnchorRefCount(anchorElement) + 1);
+};
+
+export const unrefAnchorElement = (anchorElement: HTMLElement): void => {
+	const refCount = getAnchorRefCount(anchorElement) - 1;
+	setAnchorRefCount(anchorElement, refCount);
+
+	if (refCount <= 0) {
+		document.body.removeChild(anchorElement);
+	}
+};
diff --git a/yarn.lock b/yarn.lock
index 8806cad430c4..71d9ba0760ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.6
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
-    "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.6
+    "@rocket.chat/ui-avatar": 6.0.0
+    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-kit": 0.36.1
+    "@rocket.chat/ui-video-conf": 10.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.6
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-client": 10.0.0
+    "@rocket.chat/ui-contexts": 10.0.0
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.6
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-avatar": 6.0.0
+    "@rocket.chat/ui-contexts": 10.0.0
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From b8effb5196c46c3f4b511ad3091646d4a88ebdb6 Mon Sep 17 00:00:00 2001
From: Manoj Kumar <95513071+Iamsidar07@users.noreply.github.com>
Date: Fri, 6 Sep 2024 18:31:01 +0530
Subject: [PATCH 053/170] chore: meteor installation link (#33220)

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

diff --git a/README.md b/README.md
index 56e38c111e97..6461ad602516 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,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 **Meteor** ([version here](apps/meteor/.meteor/release)): https://www.meteor.com/developers/install
+- Install **Meteor** ([version here](apps/meteor/.meteor/release)): https://docs.meteor.com/about/install.html
 - Install **yarn**: https://yarnpkg.com/getting-started/install
 - Clone this repo: `git clone https://github.com/RocketChat/Rocket.Chat.git`
 - Run `yarn` to install dependencies

From d27cc363a5602c71cbdeca0dd6c1b7877c37ceca Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Fri, 6 Sep 2024 15:21:31 +0100
Subject: [PATCH 054/170] fix: Retention policy warning keep displaying if
 disabled in room (#33197)

---
 .changeset/khaki-cameras-glow.md              |  5 ++++
 .../room/hooks/useRetentionPolicy.spec.ts     | 23 ++++++++-----------
 .../views/room/hooks/useRetentionPolicy.ts    | 12 ++++++----
 3 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/khaki-cameras-glow.md

diff --git a/.changeset/khaki-cameras-glow.md b/.changeset/khaki-cameras-glow.md
new file mode 100644
index 000000000000..87470d5c497b
--- /dev/null
+++ b/.changeset/khaki-cameras-glow.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where the retention policy warning keep displaying even if the retention is disabled inside the room
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
index 9b99d6e4d781..b5d9079c9cab 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
@@ -72,16 +72,13 @@ it('should return enabled and active true global retention is active for rooms o
 	expect(result.current).toEqual(expect.objectContaining({ ...defaultValue, enabled: true, isActive: true }));
 });
 
-it.failing(
-	'should isActive be false if global retention is active for rooms of the type and room has retention.enabled false',
-	async () => {
-		const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE, retention: { enabled: false } });
-
-		const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
-			legacyRoot: true,
-			wrapper: getGlobalSettings({ enabled: true, ...roomTypeConfig[CHANNELS_TYPE] }).build(),
-		});
-
-		expect(result.current?.isActive).toBe(false);
-	},
-);
+it('should isActive be false if global retention is active for rooms of the type and room has retention.enabled false', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE, retention: { enabled: false } });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({ enabled: true, ...roomTypeConfig[CHANNELS_TYPE] }).build(),
+	});
+
+	expect(result.current?.isActive).toBe(false);
+});
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
index 96efedef692e..076ad13c5a0f 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
@@ -4,7 +4,9 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import { TIMEUNIT, isValidTimespan, timeUnitToMs } from '../../../lib/convertTimeUnit';
 
 const hasRetentionPolicy = (room: IRoom & { retention?: any }): room is IRoomWithRetentionPolicy =>
-	'retention' in room && room.retention !== undefined && 'overrideGlobal' in room.retention && isValidTimespan(room.retention.maxAge);
+	'retention' in room && room.retention !== undefined;
+
+const isRetentionOverridden = (room: IRoom & { retention?: any }) => 'overrideGlobal' in room.retention && room.retention.overrideGlobal;
 
 type RetentionPolicySettings = {
 	enabled: boolean;
@@ -41,7 +43,7 @@ const isActive = (room: IRoom, { enabled, appliesToChannels, appliesToGroups, ap
 };
 
 const extractFilesOnly = (room: IRoom, { filesOnly }: RetentionPolicySettings): boolean => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room)) {
 		return room.retention.filesOnly;
 	}
 
@@ -49,7 +51,7 @@ const extractFilesOnly = (room: IRoom, { filesOnly }: RetentionPolicySettings):
 };
 
 const extractExcludePinned = (room: IRoom, { doNotPrunePinned }: RetentionPolicySettings): boolean => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room)) {
 		return room.retention.excludePinned;
 	}
 
@@ -57,7 +59,7 @@ const extractExcludePinned = (room: IRoom, { doNotPrunePinned }: RetentionPolicy
 };
 
 const extractIgnoreThreads = (room: IRoom, { ignoreThreads }: RetentionPolicySettings): boolean => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room)) {
 		return room.retention.ignoreThreads;
 	}
 
@@ -65,7 +67,7 @@ const extractIgnoreThreads = (room: IRoom, { ignoreThreads }: RetentionPolicySet
 };
 
 const getMaxAge = (room: IRoom, { maxAgeChannels, maxAgeGroups, maxAgeDMs }: RetentionPolicySettings): number => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room) && isValidTimespan(room.retention.maxAge)) {
 		return timeUnitToMs(TIMEUNIT.days, room.retention.maxAge);
 	}
 

From cd0d50016e7f6ce65fdf3c92fff6f680764003b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:00:04 +0100
Subject: [PATCH 055/170] feat: `Sidebar` new components (#32821)

---
 .changeset/many-balloons-scream.md            |  13 +
 .../client/sidebarv2/Item/Condensed.tsx       |  38 +-
 .../sidebarv2/Item/Extended.stories.tsx       |   9 +-
 .../meteor/client/sidebarv2/Item/Extended.tsx |  70 ++--
 apps/meteor/client/sidebarv2/Item/Medium.tsx  |  41 +-
 .../client/sidebarv2/RoomList/RoomList.tsx    | 121 ++----
 .../client/sidebarv2/RoomList/RoomListRow.tsx |  19 +-
 .../sidebarv2/RoomList/RoomListRowWrapper.tsx |   3 +-
 ...ta.tsx => SidebarItemTemplateWithData.tsx} |  42 +-
 .../RoomList/useSidebarListNavigation.ts      |   4 +-
 apps/meteor/client/sidebarv2/Sidebar.tsx      |  26 +-
 .../client/sidebarv2/header/SearchList.tsx    |   2 +-
 .../client/sidebarv2/header/SearchSection.tsx |  15 +-
 .../sidebarv2/header/actions/CreateRoom.tsx   |   4 +-
 .../sidebarv2/header/actions/Search.tsx       |  50 ---
 .../client/sidebarv2/header/actions/Sort.tsx  |   6 +-
 .../sidebarv2/hooks/useAvatarTemplate.tsx     |   4 +-
 apps/meteor/client/sidebarv2/search/Row.tsx   |  10 +-
 .../client/sidebarv2/search/SearchList.tsx    | 382 ------------------
 .../client/sidebarv2/search/UserItem.tsx      |  14 +-
 .../sections/StatusDisabledSection.tsx        |  10 +-
 apps/meteor/package.json                      |   2 +-
 ee/packages/ui-theming/package.json           |   2 +-
 packages/fuselage-ui-kit/package.json         |   2 +-
 packages/gazzodown/package.json               |   2 +-
 packages/ui-avatar/package.json               |   2 +-
 packages/ui-client/package.json               |   2 +-
 packages/ui-composer/package.json             |   2 +-
 packages/ui-video-conf/package.json           |   2 +-
 packages/uikit-playground/package.json        |   2 +-
 yarn.lock                                     |  26 +-
 31 files changed, 196 insertions(+), 731 deletions(-)
 create mode 100644 .changeset/many-balloons-scream.md
 rename apps/meteor/client/sidebarv2/RoomList/{SideBarItemTemplateWithData.tsx => SidebarItemTemplateWithData.tsx} (86%)
 delete mode 100644 apps/meteor/client/sidebarv2/header/actions/Search.tsx
 delete mode 100644 apps/meteor/client/sidebarv2/search/SearchList.tsx

diff --git a/.changeset/many-balloons-scream.md b/.changeset/many-balloons-scream.md
new file mode 100644
index 000000000000..f017cdb81137
--- /dev/null
+++ b/.changeset/many-balloons-scream.md
@@ -0,0 +1,13 @@
+---
+'@rocket.chat/uikit-playground': minor
+'@rocket.chat/fuselage-ui-kit': minor
+'@rocket.chat/ui-theming': minor
+'@rocket.chat/ui-video-conf': minor
+'@rocket.chat/ui-composer': minor
+'@rocket.chat/gazzodown': minor
+'@rocket.chat/ui-avatar': minor
+'@rocket.chat/ui-client': minor
+'@rocket.chat/meteor': minor
+---
+
+Replaced new `SidebarV2` components under feature preview
diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.tsx b/apps/meteor/client/sidebarv2/Item/Condensed.tsx
index db76935d4c3f..6ca428fc7208 100644
--- a/apps/meteor/client/sidebarv2/Item/Condensed.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Condensed.tsx
@@ -1,11 +1,11 @@
-import { IconButton, Sidebar } from '@rocket.chat/fuselage';
+import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { ReactElement } from 'react';
 import React, { memo, useState } from 'react';
 
 type CondensedProps = {
-	title: ReactElement | string;
+	title: string;
 	titleIcon?: ReactElement;
 	avatar: ReactElement | boolean;
 	icon?: IconName;
@@ -19,7 +19,7 @@ type CondensedProps = {
 	clickable?: boolean;
 };
 
-const Condensed = ({ icon, title = '', avatar, actions, href, unread, menu, badges, ...props }: CondensedProps) => {
+const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected }: CondensedProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -32,28 +32,18 @@ const Condensed = ({ icon, title = '', avatar, actions, href, unread, menu, badg
 	};
 
 	return (
-		<Sidebar.Item {...props} {...({ href } as any)} clickable={!!href}>
-			{avatar && <Sidebar.Item.Avatar>{avatar}</Sidebar.Item.Avatar>}
-			<Sidebar.Item.Content>
-				<Sidebar.Item.Wrapper>
-					{icon}
-					<Sidebar.Item.Title data-qa='sidebar-item-title' className={(unread && 'rcx-sidebar-item--highlighted') as string}>
-						{title}
-					</Sidebar.Item.Title>
-				</Sidebar.Item.Wrapper>
-				{badges && <Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>}
-				{menu && (
-					<Sidebar.Item.Menu {...handleMenuEvent}>
-						{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-item__menu icon='kebab' />}
-					</Sidebar.Item.Menu>
-				)}
-			</Sidebar.Item.Content>
-			{actions && (
-				<Sidebar.Item.Container>
-					<Sidebar.Item.Actions>{actions}</Sidebar.Item.Actions>
-				</Sidebar.Item.Container>
+		<SidebarV2Item href={href} selected={selected}>
+			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
+			{icon && icon}
+			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
+			{badges && badges}
+			{actions && actions}
+			{menu && (
+				<SidebarV2ItemMenu {...handleMenuEvent}>
+					{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+				</SidebarV2ItemMenu>
 			)}
-		</Sidebar.Item>
+		</SidebarV2Item>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
index a6392eae5d61..7029e9f24dc1 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
@@ -25,14 +25,7 @@ export default {
 const Template: ComponentStory<typeof Extended> = (args) => (
 	<Extended
 		{...args}
-		title={
-			<Box display='flex' flexDirection='row' w='full' alignItems='center'>
-				<Box flexGrow='1' withTruncatedText>
-					John Doe
-				</Box>
-				<Box fontScale='micro'>15:38</Box>
-			</Box>
-		}
+		title='John Doe'
 		subtitle={
 			<Box display='flex' flexDirection='row' w='full' alignItems='center'>
 				<Box flexGrow='1' withTruncatedText>
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.tsx b/apps/meteor/client/sidebarv2/Item/Extended.tsx
index f288f5fd35c6..13112bc96cec 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Extended.tsx
@@ -1,4 +1,14 @@
-import { Sidebar, IconButton } from '@rocket.chat/fuselage';
+import {
+	SidebarV2Item,
+	SidebarV2ItemAvatarWrapper,
+	SidebarV2ItemCol,
+	SidebarV2ItemRow,
+	SidebarV2ItemTitle,
+	SidebarV2ItemTimestamp,
+	SidebarV2ItemContent,
+	SidebarV2ItemMenu,
+	IconButton,
+} from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import React, { memo, useState } from 'react';
@@ -7,7 +17,7 @@ import { useShortTimeAgo } from '../../hooks/useTimeAgo';
 
 type ExtendedProps = {
 	icon?: IconName;
-	title?: React.ReactNode;
+	title: string;
 	avatar?: React.ReactNode | boolean;
 	actions?: React.ReactNode;
 	href?: string;
@@ -24,7 +34,7 @@ type ExtendedProps = {
 
 const Extended = ({
 	icon,
-	title = '',
+	title,
 	avatar,
 	actions,
 	href,
@@ -37,7 +47,6 @@ const Extended = ({
 	threadUnread: _threadUnread,
 	unread,
 	selected,
-	...props
 }: ExtendedProps) => {
 	const formatDate = useShortTimeAgo();
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
@@ -47,42 +56,33 @@ const Extended = ({
 	const handleMenu = useEffectEvent((e) => {
 		setMenuVisibility(e.target.offsetWidth > 0 && Boolean(menu));
 	});
-
 	const handleMenuEvent = {
 		[isReduceMotionEnabled ? 'onMouseEnter' : 'onTransitionEnd']: handleMenu,
 	};
 
 	return (
-		<Sidebar.Item selected={selected} highlighted={unread} {...props} {...({ href } as any)} clickable={!!href}>
-			{avatar && <Sidebar.Item.Avatar>{avatar}</Sidebar.Item.Avatar>}
-			<Sidebar.Item.Content>
-				<Sidebar.Item.Content>
-					<Sidebar.Item.Wrapper>
-						{icon}
-						<Sidebar.Item.Title data-qa='sidebar-item-title' className={(unread && 'rcx-sidebar-item--highlighted') as string}>
-							{title}
-						</Sidebar.Item.Title>
-						{time && <Sidebar.Item.Time>{formatDate(time)}</Sidebar.Item.Time>}
-					</Sidebar.Item.Wrapper>
-				</Sidebar.Item.Content>
-				<Sidebar.Item.Content>
-					<Sidebar.Item.Wrapper>
-						<Sidebar.Item.Subtitle className={(unread && 'rcx-sidebar-item--highlighted') as string}>{subtitle}</Sidebar.Item.Subtitle>
-						<Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>
-						{menu && (
-							<Sidebar.Item.Menu {...handleMenuEvent}>
-								{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-item__menu icon='kebab' />}
-							</Sidebar.Item.Menu>
-						)}
-					</Sidebar.Item.Wrapper>
-				</Sidebar.Item.Content>
-			</Sidebar.Item.Content>
-			{actions && (
-				<Sidebar.Item.Container>
-					<Sidebar.Item.Actions>{actions}</Sidebar.Item.Actions>
-				</Sidebar.Item.Container>
-			)}
-		</Sidebar.Item>
+		<SidebarV2Item href={href} selected={selected}>
+			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
+
+			<SidebarV2ItemCol>
+				<SidebarV2ItemRow>
+					{icon && icon}
+					<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
+					{time && <SidebarV2ItemTimestamp>{formatDate(time)}</SidebarV2ItemTimestamp>}
+				</SidebarV2ItemRow>
+
+				<SidebarV2ItemRow>
+					<SidebarV2ItemContent unread={unread}>{subtitle}</SidebarV2ItemContent>
+					{badges && badges}
+					{actions && actions}
+					{menu && (
+						<SidebarV2ItemMenu {...handleMenuEvent}>
+							{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+						</SidebarV2ItemMenu>
+					)}
+				</SidebarV2ItemRow>
+			</SidebarV2ItemCol>
+		</SidebarV2Item>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/Item/Medium.tsx b/apps/meteor/client/sidebarv2/Item/Medium.tsx
index ffc13047f66d..13d2305ad7d5 100644
--- a/apps/meteor/client/sidebarv2/Item/Medium.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Medium.tsx
@@ -1,12 +1,13 @@
-import { Sidebar, IconButton } from '@rocket.chat/fuselage';
+import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
+import type { Keys as IconName } from '@rocket.chat/icons';
 import React, { memo, useState } from 'react';
 
 type MediumProps = {
-	title: React.ReactNode;
+	title: string;
 	titleIcon?: React.ReactNode;
 	avatar: React.ReactNode | boolean;
-	icon?: string;
+	icon?: IconName;
 	actions?: React.ReactNode;
 	href?: string;
 	unread?: boolean;
@@ -16,7 +17,7 @@ type MediumProps = {
 	menuOptions?: any;
 };
 
-const Medium = ({ icon, title = '', avatar, actions, href, badges, unread, menu, ...props }: MediumProps) => {
+const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected }: MediumProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -29,28 +30,18 @@ const Medium = ({ icon, title = '', avatar, actions, href, badges, unread, menu,
 	};
 
 	return (
-		<Sidebar.Item {...props} href={href} clickable={!!href}>
-			{avatar && <Sidebar.Item.Avatar>{avatar}</Sidebar.Item.Avatar>}
-			<Sidebar.Item.Content>
-				<Sidebar.Item.Wrapper>
-					{icon}
-					<Sidebar.Item.Title data-qa='sidebar-item-title' className={unread ? 'rcx-sidebar-item--highlighted' : undefined}>
-						{title}
-					</Sidebar.Item.Title>
-				</Sidebar.Item.Wrapper>
-				{badges && <Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>}
-				{menu && (
-					<Sidebar.Item.Menu {...handleMenuEvent}>
-						{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-item__menu icon='kebab' />}
-					</Sidebar.Item.Menu>
-				)}
-			</Sidebar.Item.Content>
-			{actions && (
-				<Sidebar.Item.Container>
-					<Sidebar.Item.Actions>{actions}</Sidebar.Item.Actions>
-				</Sidebar.Item.Container>
+		<SidebarV2Item href={href} selected={selected}>
+			<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
+			{icon && icon}
+			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
+			{badges && badges}
+			{actions && actions}
+			{menu && (
+				<SidebarV2ItemMenu {...handleMenuEvent}>
+					{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+				</SidebarV2ItemMenu>
 			)}
-		</Sidebar.Item>
+		</SidebarV2Item>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
index 3f137d4709c7..5f6592210d65 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
@@ -1,11 +1,11 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { css } from '@rocket.chat/css-in-js';
-import { Box } from '@rocket.chat/fuselage';
+/* eslint-disable react/no-multi-comp */
+import type { ISubscription, IRoom } from '@rocket.chat/core-typings';
+import { Box, SidebarV2GroupTitle } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useUserPreference, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { Virtuoso } from 'react-virtuoso';
+import { GroupedVirtuoso } from 'react-virtuoso';
 
 import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
 import { useOpenedRoom } from '../../lib/RoomManager';
@@ -18,7 +18,25 @@ import RoomListRow from './RoomListRow';
 import RoomListRowWrapper from './RoomListRowWrapper';
 import RoomListWrapper from './RoomListWrapper';
 
-const computeItemKey = (index: number, room: IRoom): IRoom['_id'] | number => room._id || index;
+const getRoomsByGroup = (rooms: (ISubscription & IRoom)[]) => {
+	const groupCounts = rooms
+		.reduce((acc, item, index) => {
+			if (typeof item === 'string') {
+				acc.push(index);
+			}
+			return acc;
+		}, [] as number[])
+		.map((item, index, arr) => (arr[index + 1] ? arr[index + 1] : rooms.length) - item - 1);
+
+	const groupList = rooms.filter((item) => typeof item === 'string') as unknown as TranslationKey[];
+	const roomList = rooms.filter((item) => typeof item !== 'string');
+
+	return {
+		groupCounts,
+		groupList,
+		roomList,
+	};
+};
 
 const RoomList = () => {
 	const t = useTranslation();
@@ -26,7 +44,7 @@ const RoomList = () => {
 	const roomsList = useRoomList();
 	const avatarTemplate = useAvatarTemplate();
 	const sideBarItemTemplate = useTemplateByViewMode();
-	const { ref } = useResizeObserver({ debounceDelay: 100 });
+	const { ref } = useResizeObserver<HTMLElement>({ debounceDelay: 100 });
 	const openedRoom = useOpenedRoom() ?? '';
 	const sidebarViewMode = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode') || 'extended';
 
@@ -35,7 +53,7 @@ const RoomList = () => {
 		() => ({
 			extended,
 			t,
-			SideBarItemTemplate: sideBarItemTemplate,
+			SidebarItemTemplate: sideBarItemTemplate,
 			AvatarTemplate: avatarTemplate,
 			openedRoom,
 			sidebarViewMode,
@@ -47,87 +65,16 @@ const RoomList = () => {
 	usePreventDefault(ref);
 	useShortcutOpenMenu(ref);
 
-	const roomsListStyle = css`
-		position: relative;
-
-		display: flex;
-
-		overflow-x: hidden;
-		overflow-y: hidden;
-
-		flex: 1 1 auto;
-
-		height: 100%;
-
-		&--embedded {
-			margin-top: 2rem;
-		}
-
-		&__list:not(:last-child) {
-			margin-bottom: 22px;
-		}
-
-		&__type {
-			display: flex;
-
-			flex-direction: row;
-
-			padding: 0 var(--sidebar-default-padding) 1rem var(--sidebar-default-padding);
-
-			color: var(--rooms-list-title-color);
-
-			font-size: var(--rooms-list-title-text-size);
-			align-items: center;
-			justify-content: space-between;
-
-			&-text--livechat {
-				flex: 1;
-			}
-		}
-
-		&__empty-room {
-			padding: 0 var(--sidebar-default-padding);
-
-			color: var(--rooms-list-empty-text-color);
-
-			font-size: var(--rooms-list-empty-text-size);
-		}
-
-		&__toolbar-search {
-			position: absolute;
-			z-index: 10;
-			left: 0;
-
-			overflow-y: scroll;
-
-			height: 100%;
-
-			background-color: var(--sidebar-background);
-
-			padding-block-start: 12px;
-		}
-
-		@media (max-width: 400px) {
-			padding: 0 calc(var(--sidebar-small-default-padding) - 4px);
-
-			&__type,
-			&__empty-room {
-				padding: 0 calc(var(--sidebar-small-default-padding) - 4px) 0.5rem calc(var(--sidebar-small-default-padding) - 4px);
-			}
-		}
-	`;
+	const { groupCounts, groupList, roomList } = getRoomsByGroup(roomsList);
 
 	return (
-		<Box className={[roomsListStyle, 'sidebar--custom-colors'].filter(Boolean)}>
-			<Box h='full' w='full' ref={ref}>
-				<Virtuoso
-					totalCount={roomsList.length}
-					data={roomsList}
-					components={{ Item: RoomListRowWrapper, List: RoomListWrapper, Scroller: VirtuosoScrollbars }}
-					computeItemKey={computeItemKey}
-					itemContent={(_, data): ReactElement => <RoomListRow data={itemData} item={data} />}
-				/>
-			</Box>
+		<Box position='relative' display='flex' overflow='hidden' height='full' flexGrow={1} flexShrink={1} flexBasis='auto' ref={ref}>
+			<GroupedVirtuoso
+				groupCounts={groupCounts}
+				groupContent={(index) => <SidebarV2GroupTitle title={t(groupList[index])} />}
+				itemContent={(index) => <RoomListRow data={itemData} item={roomList[index]} />}
+				components={{ Item: RoomListRowWrapper, List: RoomListWrapper, Scroller: VirtuosoScrollbars }}
+			/>
 		</Box>
 	);
 };
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
index 64796d2e12e4..b520033056f3 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
@@ -1,18 +1,17 @@
 import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
-import { SidebarSection } from '@rocket.chat/fuselage';
 import type { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo } from 'react';
 
 import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import SideBarItemTemplateWithData from './SideBarItemTemplateWithData';
+import SidebarItemTemplateWithData from './SidebarItemTemplateWithData';
 
 type RoomListRowProps = {
 	data: {
 		extended: boolean;
 		t: ReturnType<typeof useTranslation>;
-		SideBarItemTemplate: ReturnType<typeof useTemplateByViewMode>;
+		SidebarItemTemplate: ReturnType<typeof useTemplateByViewMode>;
 		AvatarTemplate: ReturnType<typeof useAvatarTemplate>;
 		openedRoom: string;
 		sidebarViewMode: 'extended' | 'condensed' | 'medium';
@@ -22,7 +21,7 @@ type RoomListRowProps = {
 };
 
 const RoomListRow = ({ data, item }: RoomListRowProps) => {
-	const { extended, t, SideBarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode } = data;
+	const { extended, t, SidebarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode } = data;
 
 	const acceptCall = useVideoConfAcceptCall();
 	const rejectCall = useVideoConfRejectIncomingCall();
@@ -38,22 +37,14 @@ const RoomListRow = ({ data, item }: RoomListRowProps) => {
 		[acceptCall, rejectCall, currentCall],
 	);
 
-	if (typeof item === 'string') {
-		return (
-			<SidebarSection>
-				<SidebarSection.Title>{t(item)}</SidebarSection.Title>
-			</SidebarSection>
-		);
-	}
-
 	return (
-		<SideBarItemTemplateWithData
+		<SidebarItemTemplateWithData
 			sidebarViewMode={sidebarViewMode}
 			selected={item.rid === openedRoom}
 			t={t}
 			room={item}
 			extended={extended}
-			SideBarItemTemplate={SideBarItemTemplate}
+			SidebarItemTemplate={SidebarItemTemplate}
 			AvatarTemplate={AvatarTemplate}
 			videoConfActions={videoConfActions}
 		/>
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx
index b2cd75193466..a848c74ad1d5 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx
@@ -1,10 +1,11 @@
+import { SidebarV2ListItem } from '@rocket.chat/fuselage';
 import type { ForwardedRef, HTMLAttributes } from 'react';
 import React, { forwardRef } from 'react';
 
 type RoomListRoomWrapperProps = HTMLAttributes<HTMLDivElement>;
 
 const RoomListRoomWrapper = forwardRef(function RoomListRoomWrapper(props: RoomListRoomWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
-	return <div role='listitem' ref={ref} {...props} />;
+	return <SidebarV2ListItem ref={ref} {...props} />;
 });
 
 export default RoomListRoomWrapper;
diff --git a/apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
similarity index 86%
rename from apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx
rename to apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
index 4eaba8cc37f0..51b8ce495af6 100644
--- a/apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
@@ -1,6 +1,6 @@
 import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom, isVideoConfMessage } from '@rocket.chat/core-typings';
-import { Badge, Sidebar, SidebarItemAction, SidebarItemActions, Margins } from '@rocket.chat/fuselage';
+import { SidebarV2Action, SidebarV2Actions, SidebarV2ItemBadge, SidebarV2ItemIcon } from '@rocket.chat/fuselage';
 import type { useTranslation } from '@rocket.chat/ui-contexts';
 import { useLayout } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
@@ -15,7 +15,7 @@ import { OmnichannelBadges } from '../badges/OmnichannelBadges';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import { normalizeSidebarMessage } from './normalizeSidebarMessage';
 
-const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnType<typeof useTranslation>): string | undefined => {
+export const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnType<typeof useTranslation>): string | undefined => {
 	if (!lastMessage) {
 		return t('No_messages_yet');
 	}
@@ -34,7 +34,7 @@ const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnTyp
 	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizeSidebarMessage(lastMessage, t)}`;
 };
 
-const getBadgeTitle = (
+export const getBadgeTitle = (
 	userMentions: number,
 	threadUnread: number,
 	groupMentions: number,
@@ -61,7 +61,7 @@ const getBadgeTitle = (
 type RoomListRowProps = {
 	extended: boolean;
 	t: ReturnType<typeof useTranslation>;
-	SideBarItemTemplate: ComponentType<
+	SidebarItemTemplate: ComponentType<
 		{
 			icon: ReactNode;
 			title: ReactNode;
@@ -98,13 +98,13 @@ type RoomListRowProps = {
 	};
 };
 
-const SideBarItemTemplateWithData = ({
+const SidebarItemTemplateWithData = ({
 	room,
 	id,
 	selected,
 	style,
 	extended,
-	SideBarItemTemplate,
+	SidebarItemTemplate,
 	AvatarTemplate,
 	t,
 	isAnonymous,
@@ -132,19 +132,19 @@ const SideBarItemTemplateWithData = ({
 
 	const highlighted = Boolean(!hideUnreadStatus && (alert || unread));
 	const icon = (
-		// TODO: Remove icon='at'
-		<Sidebar.Item.Icon highlighted={highlighted} icon='at'>
-			<RoomIcon room={room} placement='sidebar' isIncomingCall={Boolean(videoConfActions)} />
-		</Sidebar.Item.Icon>
+		<SidebarV2ItemIcon
+			highlighted={highlighted}
+			icon={<RoomIcon room={room} placement='sidebar' size='x20' isIncomingCall={Boolean(videoConfActions)} />}
+		/>
 	);
 
 	const actions = useMemo(
 		() =>
 			videoConfActions && (
-				<SidebarItemActions>
-					<SidebarItemAction onClick={videoConfActions.acceptCall} secondary success icon='phone' />
-					<SidebarItemAction onClick={videoConfActions.rejectCall} secondary danger icon='phone-off' />
-				</SidebarItemActions>
+				<SidebarV2Actions>
+					<SidebarV2Action onClick={videoConfActions.acceptCall} mini secondary success icon='phone' />
+					<SidebarV2Action onClick={videoConfActions.rejectCall} mini secondary danger icon='phone-off' />
+				</SidebarV2Actions>
 			),
 		[videoConfActions],
 	);
@@ -165,18 +165,18 @@ const SideBarItemTemplateWithData = ({
 	const badgeTitle = getBadgeTitle(userMentions, tunread.length, groupMentions, unread, t);
 
 	const badges = (
-		<Margins inlineStart={8}>
+		<>
 			{showBadge && isUnread && (
-				<Badge {...({ style: { display: 'inline-flex', flexShrink: 0 } } as any)} variant={variant} title={badgeTitle}>
+				<SidebarV2ItemBadge variant={variant} title={badgeTitle}>
 					{unread + tunread?.length}
-				</Badge>
+				</SidebarV2ItemBadge>
 			)}
 			{isOmnichannelRoom(room) && <OmnichannelBadges room={room} />}
-		</Margins>
+		</>
 	);
 
 	return (
-		<SideBarItemTemplate
+		<SidebarItemTemplate
 			is='a'
 			id={id}
 			data-qa='sidebar-item'
@@ -229,7 +229,7 @@ const keys: (keyof RoomListRowProps)[] = [
 	'style',
 	'extended',
 	'selected',
-	'SideBarItemTemplate',
+	'SidebarItemTemplate',
 	'AvatarTemplate',
 	't',
 	'sidebarViewMode',
@@ -237,7 +237,7 @@ const keys: (keyof RoomListRowProps)[] = [
 ];
 
 // eslint-disable-next-line react/no-multi-comp
-export default memo(SideBarItemTemplateWithData, (prevProps, nextProps) => {
+export default memo(SidebarItemTemplateWithData, (prevProps, nextProps) => {
 	if (keys.some((key) => prevProps[key] !== nextProps[key])) {
 		return false;
 	}
diff --git a/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts b/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
index f5c2d00d4b2c..343df536c3f4 100644
--- a/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
+++ b/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
@@ -1,8 +1,8 @@
 import { useFocusManager } from '@react-aria/focus';
 import { useCallback } from 'react';
 
-const isListItem = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-item');
-const isListItemMenu = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-item__menu');
+const isListItem = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item');
+const isListItemMenu = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item__menu');
 
 /**
  * Custom hook to provide the sidebar navigation by keyboard.
diff --git a/apps/meteor/client/sidebarv2/Sidebar.tsx b/apps/meteor/client/sidebarv2/Sidebar.tsx
index 573d90dd0d23..7209f51507d9 100644
--- a/apps/meteor/client/sidebarv2/Sidebar.tsx
+++ b/apps/meteor/client/sidebarv2/Sidebar.tsx
@@ -1,5 +1,4 @@
-import { css } from '@rocket.chat/css-in-js';
-import { Box } from '@rocket.chat/fuselage';
+import { SidebarV2 } from '@rocket.chat/fuselage';
 import { useSessionStorage } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
@@ -15,31 +14,18 @@ const Sidebar = () => {
 	const [bannerDismissed, setBannerDismissed] = useSessionStorage('presence_cap_notifier', false);
 	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
 
-	const sidebarLink = css`
-		a {
-			text-decoration: none;
-		}
-	`;
-
 	return (
-		<Box
-			display='flex'
-			flexDirection='column'
-			height='100%'
-			is='nav'
-			className={[
-				'rcx-sidebar--main',
-				`rcx-sidebar rcx-sidebar--${sidebarViewMode}`,
-				sidebarHideAvatar && 'rcx-sidebar--hide-avatar',
-				sidebarLink,
-			].filter(Boolean)}
+		<SidebarV2
 			aria-label='sidebar'
+			className={['rcx-sidebar--main', `rcx-sidebar rcx-sidebar--${sidebarViewMode}`, sidebarHideAvatar && 'rcx-sidebar--hide-avatar']
+				.filter(Boolean)
+				.join(' ')}
 		>
 			<SearchSection />
 			{presenceDisabled && !bannerDismissed && <StatusDisabledSection onDismiss={() => setBannerDismissed(true)} />}
 			<SidebarRoomList />
 			<SidebarFooter />
-		</Box>
+		</SidebarV2>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/header/SearchList.tsx b/apps/meteor/client/sidebarv2/header/SearchList.tsx
index 70c666fead50..b132af80f674 100644
--- a/apps/meteor/client/sidebarv2/header/SearchList.tsx
+++ b/apps/meteor/client/sidebarv2/header/SearchList.tsx
@@ -34,7 +34,7 @@ const SearchList = ({ filterText, onEscSearch }: SearchListProps) => {
 		() => ({
 			items,
 			t,
-			SideBarItemTemplate: sideBarItemTemplate,
+			SidebarItemTemplate: sideBarItemTemplate,
 			avatarTemplate,
 			useRealName,
 			extended,
diff --git a/apps/meteor/client/sidebarv2/header/SearchSection.tsx b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
index c1f3f8cf8c21..660b8ee19cd5 100644
--- a/apps/meteor/client/sidebarv2/header/SearchSection.tsx
+++ b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
@@ -1,5 +1,5 @@
 import { css } from '@rocket.chat/css-in-js';
-import { Box, Icon, TextInput, Palette, Sidebar } from '@rocket.chat/fuselage';
+import { Box, Icon, TextInput, Palette, SidebarV2Section } from '@rocket.chat/fuselage';
 import { useMergedRefs, useOutsideClick } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useUser } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect, useRef } from 'react';
@@ -70,15 +70,7 @@ const SearchSection = () => {
 
 	return (
 		<Box className={['rcx-sidebar', isDirty && wrapperStyle]} ref={wrapperRef} role='search'>
-			<Box
-				pi={16}
-				h='x44'
-				display='flex'
-				alignItems='center'
-				className={css`
-					gap: 8px;
-				`}
-			>
+			<SidebarV2Section>
 				<TextInput
 					placeholder={t('Search')}
 					{...rest}
@@ -94,8 +86,7 @@ const SearchSection = () => {
 						<CreateRoom />
 					</>
 				)}
-			</Box>
-			<Sidebar.Divider />
+			</SidebarV2Section>
 			{isDirty && <SearchList filterText={filterText} onEscSearch={handleEscSearch} />}
 		</Box>
 	);
diff --git a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
index 478e7cce33e1..a80954c8b297 100644
--- a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
@@ -1,4 +1,4 @@
-import { Sidebar } from '@rocket.chat/fuselage';
+import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
@@ -13,7 +13,7 @@ const CreateRoom = (props: CreateRoomProps) => {
 
 	const sections = useCreateRoom();
 
-	return <GenericMenu icon='edit-rounded' sections={sections} title={t('Create_new')} is={Sidebar.TopBar.Action} {...props} />;
+	return <GenericMenu icon='edit-rounded' sections={sections} title={t('Create_new')} is={SidebarV2Action} {...props} />;
 };
 
 export default CreateRoom;
diff --git a/apps/meteor/client/sidebarv2/header/actions/Search.tsx b/apps/meteor/client/sidebarv2/header/actions/Search.tsx
deleted file mode 100644
index 06d42114d76b..000000000000
--- a/apps/meteor/client/sidebarv2/header/actions/Search.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Sidebar } from '@rocket.chat/fuselage';
-import { useEffectEvent, useOutsideClick } from '@rocket.chat/fuselage-hooks';
-import type { HTMLAttributes } from 'react';
-import React, { useState, useEffect, useRef } from 'react';
-import tinykeys from 'tinykeys';
-
-import SearchList from '../../search/SearchList';
-
-type SearchProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
-
-const Search = (props: SearchProps) => {
-	const [searchOpen, setSearchOpen] = useState(false);
-
-	const ref = useRef<HTMLElement>(null);
-	const handleCloseSearch = useEffectEvent(() => {
-		setSearchOpen(false);
-	});
-
-	useOutsideClick([ref], handleCloseSearch);
-
-	const openSearch = useEffectEvent(() => {
-		setSearchOpen(true);
-	});
-
-	useEffect(() => {
-		const unsubscribe = tinykeys(window, {
-			'$mod+K': (event) => {
-				event.preventDefault();
-				openSearch();
-			},
-			'$mod+P': (event) => {
-				event.preventDefault();
-				openSearch();
-			},
-		});
-
-		return (): void => {
-			unsubscribe();
-		};
-	}, [openSearch]);
-
-	return (
-		<>
-			<Sidebar.TopBar.Action icon='magnifier' onClick={openSearch} {...props} />
-			{searchOpen && <SearchList ref={ref} onClose={handleCloseSearch} />}
-		</>
-	);
-};
-
-export default Search;
diff --git a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
index e7f3b398e5f6..9956acf266b5 100644
--- a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
@@ -1,4 +1,4 @@
-import { Sidebar } from '@rocket.chat/fuselage';
+import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
@@ -13,9 +13,7 @@ const Sort = (props: SortProps) => {
 
 	const sections = useSortMenu();
 
-	return (
-		<GenericMenu icon='sort' sections={sections} title={t('Display')} selectionMode='multiple' is={Sidebar.TopBar.Action} {...props} />
-	);
+	return <GenericMenu icon='sort' sections={sections} title={t('Display')} selectionMode='multiple' is={SidebarV2Action} {...props} />;
 };
 
 export default Sort;
diff --git a/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx b/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
index 9fd1023a32e7..e5bf780ee5b0 100644
--- a/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
+++ b/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
@@ -18,7 +18,7 @@ export const useAvatarTemplate = (
 			return null;
 		}
 
-		const size = ((): 'x36' | 'x28' | 'x16' => {
+		const size = ((): 'x36' | 'x28' | 'x20' => {
 			switch (viewMode) {
 				case 'extended':
 					return 'x36';
@@ -26,7 +26,7 @@ export const useAvatarTemplate = (
 					return 'x28';
 				case 'condensed':
 				default:
-					return 'x16';
+					return 'x20';
 			}
 		})();
 
diff --git a/apps/meteor/client/sidebarv2/search/Row.tsx b/apps/meteor/client/sidebarv2/search/Row.tsx
index 68ceecd2ad88..f8541546ec4b 100644
--- a/apps/meteor/client/sidebarv2/search/Row.tsx
+++ b/apps/meteor/client/sidebarv2/search/Row.tsx
@@ -2,7 +2,7 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData';
+import SidebarItemTemplateWithData from '../RoomList/SidebarItemTemplateWithData';
 import UserItem from './UserItem';
 
 type RowProps = {
@@ -11,7 +11,7 @@ type RowProps = {
 };
 
 const Row = ({ item, data }: RowProps): ReactElement => {
-	const { t, SideBarItemTemplate, avatarTemplate: AvatarTemplate, useRealName, extended } = data;
+	const { t, SidebarItemTemplate, avatarTemplate: AvatarTemplate, useRealName, extended } = data;
 
 	if (item.t === 'd' && !item.u) {
 		return (
@@ -20,18 +20,18 @@ const Row = ({ item, data }: RowProps): ReactElement => {
 				useRealName={useRealName}
 				t={t}
 				item={item}
-				SideBarItemTemplate={SideBarItemTemplate}
+				SidebarItemTemplate={SidebarItemTemplate}
 				AvatarTemplate={AvatarTemplate}
 			/>
 		);
 	}
 	return (
-		<SideBarItemTemplateWithData
+		<SidebarItemTemplateWithData
 			id={`search-${item._id}`}
 			extended={extended}
 			t={t}
 			room={item}
-			SideBarItemTemplate={SideBarItemTemplate}
+			SidebarItemTemplate={SidebarItemTemplate}
 			AvatarTemplate={AvatarTemplate}
 		/>
 	);
diff --git a/apps/meteor/client/sidebarv2/search/SearchList.tsx b/apps/meteor/client/sidebarv2/search/SearchList.tsx
deleted file mode 100644
index c43fe854ac30..000000000000
--- a/apps/meteor/client/sidebarv2/search/SearchList.tsx
+++ /dev/null
@@ -1,382 +0,0 @@
-import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
-import { css } from '@rocket.chat/css-in-js';
-import { Sidebar, TextInput, Box, Icon } from '@rocket.chat/fuselage';
-import { useMutableCallback, useDebouncedValue, useAutoFocus, useUniqueId, useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useUserPreference, useUserSubscriptions, useSetting, useTranslation, useMethod } from '@rocket.chat/ui-contexts';
-import type { UseQueryResult } from '@tanstack/react-query';
-import { useQuery } from '@tanstack/react-query';
-import type {
-	ReactElement,
-	MutableRefObject,
-	SetStateAction,
-	Dispatch,
-	FormEventHandler,
-	Ref,
-	MouseEventHandler,
-	ForwardedRef,
-} from 'react';
-import React, { forwardRef, useState, useMemo, useEffect, useRef } from 'react';
-import type { VirtuosoHandle } from 'react-virtuoso';
-import { Virtuoso } from 'react-virtuoso';
-import tinykeys from 'tinykeys';
-
-import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
-import { getConfig } from '../../lib/utils/getConfig';
-import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { usePreventDefault } from '../hooks/usePreventDefault';
-import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import Row from './Row';
-
-const mobileCheck = function () {
-	let check = false;
-	(function (a: string) {
-		if (
-			/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
-				a,
-			) ||
-			/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
-				a.substr(0, 4),
-			)
-		)
-			check = true;
-	})(navigator.userAgent || navigator.vendor || window.opera || '');
-	return check;
-};
-
-declare global {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface Window {
-		opera?: string;
-	}
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface Navigator {
-		userAgentData?: {
-			mobile: boolean;
-		};
-	}
-}
-
-const shortcut = ((): string => {
-	if (navigator.userAgentData?.mobile || mobileCheck()) {
-		return '';
-	}
-	if (window.navigator.platform.toLowerCase().includes('mac')) {
-		return '(\u2318+K)';
-	}
-	return '(Ctrl+K)';
-})();
-
-const LIMIT = parseInt(String(getConfig('Sidebar_Search_Spotlight_LIMIT', 20)));
-
-const options = {
-	sort: {
-		lm: -1,
-		name: 1,
-	},
-	limit: LIMIT,
-} as const;
-
-const useSearchItems = (filterText: string): UseQueryResult<(ISubscription & IRoom)[] | undefined, Error> => {
-	const [, mention, name] = useMemo(() => filterText.match(/(@|#)?(.*)/i) || [], [filterText]);
-	const query = useMemo(() => {
-		const filterRegex = new RegExp(escapeRegExp(name), 'i');
-
-		return {
-			$or: [{ name: filterRegex }, { fname: filterRegex }],
-			...(mention && {
-				t: mention === '@' ? 'd' : { $ne: 'd' },
-			}),
-		};
-	}, [name, mention]);
-
-	const localRooms = useUserSubscriptions(query, options);
-
-	const usernamesFromClient = [...localRooms?.map(({ t, name }) => (t === 'd' ? name : null))].filter(Boolean) as string[];
-
-	const searchForChannels = mention === '#';
-	const searchForDMs = mention === '@';
-
-	const type = useMemo(() => {
-		if (searchForChannels) {
-			return { users: false, rooms: true, includeFederatedRooms: true };
-		}
-		if (searchForDMs) {
-			return { users: true, rooms: false };
-		}
-		return { users: true, rooms: true, includeFederatedRooms: true };
-	}, [searchForChannels, searchForDMs]);
-
-	const getSpotlight = useMethod('spotlight');
-
-	return useQuery(
-		['sidebar/search/spotlight', name, usernamesFromClient, type, localRooms.map(({ _id, name }) => _id + name)],
-		async () => {
-			if (localRooms.length === LIMIT) {
-				return localRooms;
-			}
-
-			const spotlight = await getSpotlight(name, usernamesFromClient, type);
-
-			const filterUsersUnique = ({ _id }: { _id: string }, index: number, arr: { _id: string }[]): boolean =>
-				index === arr.findIndex((user) => _id === user._id);
-
-			const roomFilter = (room: { t: string; uids?: string[]; _id: string; name?: string }): boolean =>
-				!localRooms.find(
-					(item) =>
-						(room.t === 'd' && room.uids && room.uids.length > 1 && room.uids?.includes(item._id)) ||
-						[item.rid, item._id].includes(room._id),
-				);
-			const usersFilter = (user: { _id: string }): boolean =>
-				!localRooms.find((room) => room.t === 'd' && room.uids && room.uids?.length === 2 && room.uids.includes(user._id));
-
-			const userMap = (user: {
-				_id: string;
-				name: string;
-				username: string;
-				avatarETag?: string;
-			}): {
-				_id: string;
-				t: string;
-				name: string;
-				fname: string;
-				avatarETag?: string;
-			} => ({
-				_id: user._id,
-				t: 'd',
-				name: user.username,
-				fname: user.name,
-				avatarETag: user.avatarETag,
-			});
-
-			type resultsFromServerType = {
-				_id: string;
-				t: string;
-				name: string;
-				teamMain?: boolean;
-				fname?: string;
-				avatarETag?: string | undefined;
-				uids?: string[] | undefined;
-			}[];
-
-			const resultsFromServer: resultsFromServerType = [];
-			resultsFromServer.push(...spotlight.users.filter(filterUsersUnique).filter(usersFilter).map(userMap));
-			resultsFromServer.push(...spotlight.rooms.filter(roomFilter));
-
-			const exact = resultsFromServer?.filter((item) => [item.name, item.fname].includes(name));
-			return Array.from(new Set([...exact, ...localRooms, ...resultsFromServer]));
-		},
-		{
-			staleTime: 60_000,
-			keepPreviousData: true,
-			placeholderData: localRooms,
-		},
-	);
-};
-
-const useInput = (initial: string): { value: string; onChange: FormEventHandler; setValue: Dispatch<SetStateAction<string>> } => {
-	const [value, setValue] = useState(initial);
-	const onChange = useMutableCallback((e) => {
-		setValue(e.currentTarget.value);
-	});
-	return { value, onChange, setValue };
-};
-
-const toggleSelectionState = (next: HTMLElement, current: HTMLElement | undefined, input: HTMLElement | undefined): void => {
-	input?.setAttribute('aria-activedescendant', next.id);
-	next.setAttribute('aria-selected', 'true');
-	next.classList.add('rcx-sidebar-item--selected');
-	if (current) {
-		current.removeAttribute('aria-selected');
-		current.classList.remove('rcx-sidebar-item--selected');
-	}
-};
-
-type SearchListProps = {
-	onClose: () => void;
-};
-
-const SearchList = forwardRef(function SearchList({ onClose }: SearchListProps, ref: ForwardedRef<any>) {
-	const listId = useUniqueId();
-	const t = useTranslation();
-	const { setValue: setFilterValue, ...filter } = useInput('');
-
-	const cursorRef = useRef<HTMLInputElement>(null);
-	const autofocus: Ref<HTMLInputElement> = useMergedRefs(useAutoFocus<HTMLInputElement>(), cursorRef);
-
-	const listRef = useRef<VirtuosoHandle>(null);
-	const boxRef = useRef<HTMLDivElement>(null);
-
-	const selectedElement: MutableRefObject<HTMLElement | null | undefined> = useRef(null);
-	const itemIndexRef = useRef(0);
-
-	const sidebarViewMode = useUserPreference('sidebarViewMode');
-	const useRealName = useSetting('UI_Use_Real_Name');
-
-	const sideBarItemTemplate = useTemplateByViewMode();
-	const avatarTemplate = useAvatarTemplate();
-
-	const extended = sidebarViewMode === 'extended';
-
-	const filterText = useDebouncedValue(filter.value, 100);
-
-	const placeholder = [t('Search'), shortcut].filter(Boolean).join(' ');
-
-	const { data: items = [], isLoading } = useSearchItems(filterText);
-
-	const itemData = useMemo(
-		() => ({
-			items,
-			t,
-			SideBarItemTemplate: sideBarItemTemplate,
-			avatarTemplate,
-			useRealName,
-			extended,
-			sidebarViewMode,
-		}),
-		[avatarTemplate, extended, items, useRealName, sideBarItemTemplate, sidebarViewMode, t],
-	);
-
-	const changeSelection = useMutableCallback((dir) => {
-		let nextSelectedElement = null;
-
-		if (dir === 'up') {
-			const potentialElement = selectedElement.current?.parentElement?.previousSibling as HTMLElement;
-			if (potentialElement) {
-				nextSelectedElement = potentialElement.querySelector('a');
-			}
-		} else {
-			const potentialElement = selectedElement.current?.parentElement?.nextSibling as HTMLElement;
-			if (potentialElement) {
-				nextSelectedElement = potentialElement.querySelector('a');
-			}
-		}
-
-		if (nextSelectedElement) {
-			toggleSelectionState(nextSelectedElement, selectedElement.current || undefined, cursorRef?.current || undefined);
-			return nextSelectedElement;
-		}
-		return selectedElement.current;
-	});
-
-	const resetCursor = useMutableCallback(() => {
-		setTimeout(() => {
-			itemIndexRef.current = 0;
-			listRef.current?.scrollToIndex({ index: itemIndexRef.current });
-			selectedElement.current = boxRef.current?.querySelector('a.rcx-sidebar-item');
-			if (selectedElement.current) {
-				toggleSelectionState(selectedElement.current, undefined, cursorRef?.current || undefined);
-			}
-		}, 0);
-	});
-
-	usePreventDefault(boxRef);
-
-	useEffect(() => {
-		resetCursor();
-	});
-
-	useEffect(() => {
-		resetCursor();
-	}, [filterText, resetCursor]);
-
-	useEffect(() => {
-		if (!cursorRef?.current) {
-			return;
-		}
-		return tinykeys(cursorRef?.current, {
-			Escape: (event) => {
-				event.preventDefault();
-				setFilterValue((value) => {
-					if (!value) {
-						onClose();
-					}
-					resetCursor();
-					return '';
-				});
-			},
-			Tab: onClose,
-			ArrowUp: () => {
-				const currentElement = changeSelection('up');
-				itemIndexRef.current = Math.max(itemIndexRef.current - 1, 0);
-				listRef.current?.scrollToIndex({ index: itemIndexRef.current });
-				selectedElement.current = currentElement;
-			},
-			ArrowDown: () => {
-				const currentElement = changeSelection('down');
-				itemIndexRef.current = Math.min(itemIndexRef.current + 1, items.length + 1);
-				listRef.current?.scrollToIndex({ index: itemIndexRef.current });
-				selectedElement.current = currentElement;
-			},
-			Enter: (event) => {
-				event.preventDefault();
-				if (selectedElement.current && items.length > 0) {
-					selectedElement.current.click();
-				} else {
-					onClose();
-				}
-			},
-		});
-	}, [cursorRef, changeSelection, items.length, onClose, resetCursor, setFilterValue]);
-
-	const handleClick: MouseEventHandler<HTMLElement> = (e): void => {
-		if (e.target instanceof Element && [e.target.tagName, e.target.parentElement?.tagName].includes('BUTTON')) {
-			return;
-		}
-		return onClose();
-	};
-
-	return (
-		<Box
-			position='absolute'
-			rcx-sidebar
-			h='full'
-			display='flex'
-			flexDirection='column'
-			zIndex={99}
-			w='full'
-			className={css`
-				left: 0;
-				top: 0;
-			`}
-			ref={ref}
-			role='search'
-		>
-			<Sidebar.TopBar.Section {...({ flexShrink: 0 } as any)} is='form'>
-				<TextInput
-					aria-owns={listId}
-					ref={autofocus}
-					{...filter}
-					placeholder={placeholder}
-					role='searchbox'
-					addon={<Icon name='cross' size='x20' onClick={onClose} />}
-				/>
-			</Sidebar.TopBar.Section>
-			<Box
-				ref={boxRef}
-				role='listbox'
-				id={listId}
-				tabIndex={-1}
-				flexShrink={1}
-				h='full'
-				w='full'
-				aria-live='polite'
-				aria-atomic='true'
-				aria-busy={isLoading}
-				onClick={handleClick}
-			>
-				<Virtuoso
-					style={{ height: '100%', width: '100%' }}
-					totalCount={items.length}
-					data={items}
-					components={{ Scroller: VirtuosoScrollbars }}
-					computeItemKey={(_, room) => room._id}
-					itemContent={(_, data): ReactElement => <Row data={itemData} item={data} />}
-					ref={listRef}
-				/>
-			</Box>
-		</Box>
-	);
-});
-
-export default SearchList;
diff --git a/apps/meteor/client/sidebarv2/search/UserItem.tsx b/apps/meteor/client/sidebarv2/search/UserItem.tsx
index 8b9667913311..9cfa97fd797c 100644
--- a/apps/meteor/client/sidebarv2/search/UserItem.tsx
+++ b/apps/meteor/client/sidebarv2/search/UserItem.tsx
@@ -1,5 +1,5 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { Sidebar } from '@rocket.chat/fuselage';
+import { SidebarV2ItemIcon } from '@rocket.chat/fuselage';
 import React, { memo } from 'react';
 
 import { ReactiveUserStatus } from '../../components/UserStatus';
@@ -13,24 +13,20 @@ type UserItemProps = {
 		t: string;
 	};
 	t: (value: string) => string;
-	SideBarItemTemplate: any;
+	SidebarItemTemplate: any;
 	AvatarTemplate: any;
 	id: string;
 	style?: CSSStyleRule;
 	useRealName?: boolean;
 };
 
-const UserItem = ({ item, id, style, t, SideBarItemTemplate, AvatarTemplate, useRealName }: UserItemProps) => {
+const UserItem = ({ item, id, style, t, SidebarItemTemplate, AvatarTemplate, useRealName }: UserItemProps) => {
 	const title = useRealName ? item.fname || item.name : item.name || item.fname;
-	const icon = (
-		<Sidebar.Item.Icon icon={'' as any}>
-			<ReactiveUserStatus uid={item._id} />
-		</Sidebar.Item.Icon>
-	);
+	const icon = <SidebarV2ItemIcon icon={<ReactiveUserStatus uid={item._id} />} />;
 	const href = roomCoordinator.getRouteLink(item.t, { name: item.name });
 
 	return (
-		<SideBarItemTemplate
+		<SidebarItemTemplate
 			is='a'
 			style={{ height: '100%', ...style }}
 			id={id}
diff --git a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
index 50367d7db3e5..a0f3245e8835 100644
--- a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
@@ -1,4 +1,4 @@
-import { SidebarBanner } from '@rocket.chat/fuselage';
+import { SidebarV2Banner } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -11,11 +11,11 @@ const StatusDisabledSection = ({ onDismiss }: StatusDisabledSectionProps) => {
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
-		<SidebarBanner
-			text={t('User_status_temporarily_disabled')}
-			description={t('Learn_more')}
+		<SidebarV2Banner
+			title={t('User_status_temporarily_disabled')}
+			linkText={t('Learn_more')}
 			onClose={onDismiss}
-			onClick={handleStatusDisabledModal}
+			linkProps={{ onClick: handleStatusDisabledModal, tabIndex: 0 }}
 		/>
 	);
 };
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e1f2eff94e07..43b62def0819 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -241,7 +241,7 @@
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
 		"@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 04b22e72aae3..5f3bb4977d7d 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 478502ebf93d..7c644744c3cf 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -66,7 +66,7 @@
     "@rocket.chat/apps-engine": "1.45.0-alpha.868",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.57.1",
+    "@rocket.chat/fuselage": "^0.59.0",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/icons": "~0.38.0",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 029dc0bfc606..8b751c895b0f 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 84868f8ccb4e..66a50ce8c8e1 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@types/babel__core": "~7.20.3",
 		"@types/react": "~17.0.69",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 97fd45a4f1b5..d9cdb9f24ade 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index f25571435fc5..55e22a79e34c 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -19,7 +19,7 @@
     "@babel/core": "~7.22.20",
     "@react-aria/toolbar": "^3.0.0-beta.1",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.57.1",
+    "@rocket.chat/fuselage": "^0.59.0",
     "@rocket.chat/icons": "~0.38.0",
     "@storybook/addon-actions": "~6.5.16",
     "@storybook/addon-docs": "~6.5.16",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index bfbb16eb682c..40253050d9bf 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 1e842208211b..d309c2d54599 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -15,7 +15,7 @@
     "@codemirror/tooltip": "^0.19.16",
     "@lezer/highlight": "^1.1.6",
     "@rocket.chat/css-in-js": "~0.31.25",
-    "@rocket.chat/fuselage": "^0.57.1",
+    "@rocket.chat/fuselage": "^0.59.0",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/yarn.lock b/yarn.lock
index 71d9ba0760ea..9197fbb0b63a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8883,7 +8883,7 @@ __metadata:
     "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/gazzodown": "workspace:^"
@@ -8944,9 +8944,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.57.1":
-  version: 0.57.1
-  resolution: "@rocket.chat/fuselage@npm:0.57.1"
+"@rocket.chat/fuselage@npm:^0.59.0":
+  version: 0.59.0
+  resolution: "@rocket.chat/fuselage@npm:0.59.0"
   dependencies:
     "@rocket.chat/css-in-js": ^0.31.25
     "@rocket.chat/css-supports": ^0.31.25
@@ -8964,7 +8964,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: ed40c4e9ec6f6294e0e7c7a3912ae7c9eca026455506f3f1983483010d3d0c41169f9e38d173e5e63ed0e9824979edd607dda3c881202bf797a97b5b76e83a34
+  checksum: 259dce5381a3c3e0d7c7f3dc7ab51346cb65a9f4906a5ca5d6a976627d05e01e7f8a3a940604d0ad1b2b4ed89c250a871ef3fb253f6bbb69d35bc931e193898d
   languageName: node
   linkType: hard
 
@@ -8975,7 +8975,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -9342,7 +9342,7 @@ __metadata:
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -10214,7 +10214,7 @@ __metadata:
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/ui-contexts": "workspace:^"
     "@types/babel__core": ~7.20.3
     "@types/react": ~17.0.69
@@ -10240,7 +10240,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10290,7 +10290,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/icons": ~0.38.0
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10385,7 +10385,7 @@ __metadata:
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10415,7 +10415,7 @@ __metadata:
     "@rocket.chat/css-in-js": ~0.31.25
     "@rocket.chat/emitter": ~0.31.25
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10464,7 +10464,7 @@ __metadata:
     "@codemirror/tooltip": ^0.19.16
     "@lezer/highlight": ^1.1.6
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0

From e0050c363bee1f0e037faefc060c0ff125e96117 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Fri, 6 Sep 2024 14:25:00 -0600
Subject: [PATCH 056/170] fix: NPS passing `startAt` as the expiration date
 when creating a banner (#33155)

---
 .changeset/nasty-tools-enjoy.md               |   5 +
 apps/meteor/server/services/nps/service.ts    |   5 +-
 .../unit/server/services/nps/spec.tests.ts    | 103 ++++++++++++++++++
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/nasty-tools-enjoy.md
 create mode 100644 apps/meteor/tests/unit/server/services/nps/spec.tests.ts

diff --git a/.changeset/nasty-tools-enjoy.md b/.changeset/nasty-tools-enjoy.md
new file mode 100644
index 000000000000..b6e8dae3785a
--- /dev/null
+++ b/.changeset/nasty-tools-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a code issue on NPS service. It was passing `startAt` as the expiration date when creating a banner.
diff --git a/apps/meteor/server/services/nps/service.ts b/apps/meteor/server/services/nps/service.ts
index 9554a472fb0a..be5b44582a5a 100644
--- a/apps/meteor/server/services/nps/service.ts
+++ b/apps/meteor/server/services/nps/service.ts
@@ -21,7 +21,10 @@ export class NPSService extends ServiceClassInternal implements INPSService {
 
 		const any = await Nps.findOne({}, { projection: { _id: 1 } });
 		if (!any) {
-			await Banner.create(getBannerForAdmins(nps.startAt));
+			if (nps.expireAt < nps.startAt || nps.expireAt < new Date()) {
+				throw new Error('NPS already expired');
+			}
+			await Banner.create(getBannerForAdmins(nps.expireAt));
 
 			await notifyAdmins(nps.startAt);
 		}
diff --git a/apps/meteor/tests/unit/server/services/nps/spec.tests.ts b/apps/meteor/tests/unit/server/services/nps/spec.tests.ts
new file mode 100644
index 000000000000..21c5ecfe7c98
--- /dev/null
+++ b/apps/meteor/tests/unit/server/services/nps/spec.tests.ts
@@ -0,0 +1,103 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import p from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	'NpsVote': {},
+	'Nps': {
+		findOne: sinon.stub(),
+		save: sinon.stub(),
+	},
+	'Settings': {
+		getValueById: sinon.stub(),
+	},
+	'@noCallThru': true,
+};
+
+const servicesMock = {
+	Banner: {
+		create: sinon.stub(),
+	},
+};
+
+const getbannerforadminsMock = sinon.stub();
+
+const { NPSService } = p('../../../../../server/services/nps/service.ts', {
+	'@rocket.chat/models': modelsMock,
+	'@rocket.chat/core-services': servicesMock,
+	'./sendNpsResults': { 'sendNpsResults': sinon.stub(), '@noCallThru': true },
+	'../../lib/logger/system': { 'SystemLogger': { error: sinon.stub() }, '@noCallThru': true },
+	'./notification': { 'notifyAdmins': sinon.stub(), 'getBannerForAdmins': getbannerforadminsMock, '@noCallThru': true },
+});
+
+describe('NPS Service', () => {
+	it('should instantiate properly', () => {
+		expect(new NPSService()).to.be.an('object');
+	});
+
+	describe('@create', () => {
+		beforeEach(() => {
+			modelsMock.Settings.getValueById.reset();
+			modelsMock.Nps.findOne.reset();
+			modelsMock.Nps.save.reset();
+			servicesMock.Banner.create.reset();
+			getbannerforadminsMock.reset();
+		});
+		it('should fail when user opted out of nps', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(false);
+
+			await expect(new NPSService().create({})).to.be.rejectedWith('Server opted-out for NPS surveys');
+		});
+		it('should fail when nps expireDate is less than nps startAt', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves(null);
+
+			await expect(new NPSService().create({ expireAt: new Date('2020-01-01'), startAt: new Date('2020-01-02') })).to.be.rejectedWith(
+				'NPS already expired',
+			);
+		});
+		it('should fail when expireDate is less than current date', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves(null);
+
+			await expect(new NPSService().create({ expireAt: new Date('2020-01-02'), startAt: new Date('2020-01-01') })).to.be.rejectedWith(
+				'NPS already expired',
+			);
+		});
+		it('should try to create a banner when theres no nps saved', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves(null);
+
+			const today = new Date();
+			const tomorrow = new Date(today.getTime() + 24 * 60 * 60 * 1000);
+
+			await new NPSService().create({
+				expireAt: tomorrow,
+				startAt: today,
+				createdBy: { _id: 'tomorrow', username: 'tomorrow' },
+				npsId: 'test',
+			});
+			expect(getbannerforadminsMock.called).to.be.true;
+			expect(getbannerforadminsMock.calledWith(tomorrow)).to.be.true;
+			expect(modelsMock.Nps.save.called).to.be.true;
+			expect(
+				modelsMock.Nps.save.calledWith(
+					sinon.match({
+						expireAt: tomorrow,
+						startAt: today,
+						status: 'open',
+						_id: 'test',
+						createdBy: { _id: 'tomorrow', username: 'tomorrow' },
+					}),
+				),
+			).to.be.true;
+		});
+		it('should fail if theres an error when saving the Nps', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves({ _id: 'test' });
+			modelsMock.Nps.save.rejects();
+			await expect(new NPSService().create({})).to.be.rejectedWith('Error creating NPS');
+		});
+	});
+});

From 06dbf725685d52c0514808b4c338e258d0571ddf Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Mon, 9 Sep 2024 12:24:02 -0300
Subject: [PATCH 057/170] feat: unknown contacts (#32865)

---
 apps/meteor/app/livechat/server/api/v1/contact.ts     |  4 ++--
 apps/meteor/app/livechat/server/lib/Contacts.ts       |  4 ++--
 apps/meteor/app/livechat/server/lib/LivechatTyped.ts  | 11 +++++++++++
 .../tests/end-to-end/api/livechat/09-visitors.ts      |  1 +
 packages/core-typings/src/ILivechatContact.ts         |  4 ++--
 packages/core-typings/src/ILivechatVisitor.ts         |  1 +
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index 94bd5ed3e11c..7e9457d2f185 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -92,7 +92,7 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['create-livechat-contact'], validateParams: isPOSTOmnichannelContactsProps },
 	{
 		async post() {
-			if (!process.env.TEST_MODE) {
+			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
 				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
 			}
 			const contactId = await createContact({ ...this.bodyParams, unknown: false });
@@ -106,7 +106,7 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['update-livechat-contact'], validateParams: isPOSTUpdateOmnichannelContactsProps },
 	{
 		async post() {
-			if (!process.env.TEST_MODE) {
+			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
 				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
 			}
 
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index 58404ce27584..f6f812ce8af8 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -44,8 +44,8 @@ type RegisterContactProps = {
 
 type CreateContactParams = {
 	name: string;
-	emails: string[];
-	phones: string[];
+	emails?: string[];
+	phones?: string[];
 	unknown: boolean;
 	customFields?: Record<string, string | unknown>;
 	contactManager?: string;
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index be79d565f6de..88f9494159a2 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -71,6 +71,7 @@ import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
 import { businessHourManager } from '../business-hour';
+import { createContact } from './Contacts';
 import { parseAgentCustomFields, updateDepartmentAgents, validateEmail, normalizeTransferredByData } from './Helper';
 import { QueueManager } from './QueueManager';
 import { RoutingManager } from './RoutingManager';
@@ -664,6 +665,16 @@ class LivechatClass {
 			}
 		}
 
+		if (process.env.TEST_MODE?.toUpperCase() === 'TRUE') {
+			const contactId = await createContact({
+				name: name ?? (visitorDataToUpdate.username as string),
+				emails: email ? [email] : [],
+				phones: phone ? [phone.number] : [],
+				unknown: true,
+			});
+			visitorDataToUpdate.contactId = contactId;
+		}
+
 		const upsertedLivechatVisitor = await LivechatVisitors.updateOneByIdOrToken(visitorDataToUpdate, {
 			upsert: true,
 			returnDocument: 'after',
diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
index 5bc961087efc..f02d9d1d1e95 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -56,6 +56,7 @@ describe('LIVECHAT - visitors', () => {
 			expect(body).to.have.property('success', true);
 			expect(body).to.have.property('visitor');
 			expect(body.visitor).to.have.property('token', 'test');
+			expect(body.visitor).to.have.property('contactId');
 
 			// Ensure all new visitors are created as online :)
 			expect(body.visitor).to.have.property('status', 'online');
diff --git a/packages/core-typings/src/ILivechatContact.ts b/packages/core-typings/src/ILivechatContact.ts
index 149dab2b88b1..1e7bd4ff5399 100644
--- a/packages/core-typings/src/ILivechatContact.ts
+++ b/packages/core-typings/src/ILivechatContact.ts
@@ -14,8 +14,8 @@ export interface ILivechatContactConflictingField {
 
 export interface ILivechatContact extends IRocketChatRecord {
 	name: string;
-	phones: string[];
-	emails: string[];
+	phones?: string[];
+	emails?: string[];
 	contactManager?: string;
 	unknown?: boolean;
 	hasConflict?: boolean;
diff --git a/packages/core-typings/src/ILivechatVisitor.ts b/packages/core-typings/src/ILivechatVisitor.ts
index 21819cc23f24..eefb4ebd720c 100644
--- a/packages/core-typings/src/ILivechatVisitor.ts
+++ b/packages/core-typings/src/ILivechatVisitor.ts
@@ -49,6 +49,7 @@ export interface ILivechatVisitor extends IRocketChatRecord {
 	};
 	activity?: string[];
 	disabled?: boolean;
+	contactId?: string;
 }
 
 export interface ILivechatVisitorDTO {

From 7c14fd1a802a2f63f3dc6796e83192b54cbd4ff2 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Mon, 9 Sep 2024 13:12:34 -0600
Subject: [PATCH 058/170] feat: Allow admins to control if visitors can close
 omnichannel conversations (#33139)

---
 .changeset/healthy-rivers-nail.md             |  8 +++
 .../imports/server/rest/appearance.ts         |  1 +
 .../app/livechat/server/api/lib/appearance.ts |  1 +
 .../app/livechat/server/api/lib/livechat.ts   |  1 +
 .../meteor/app/livechat/server/api/v1/room.ts |  4 ++
 .../app/livechat/server/lib/LivechatTyped.ts  |  1 +
 .../omnichannel/appearance/AppearanceForm.tsx | 15 ++++++
 .../omnichannel/appearance/AppearancePage.tsx |  1 +
 apps/meteor/server/settings/omnichannel.ts    |  7 +++
 .../omnichannel/omnichannel-livechat.spec.ts  | 52 +++++++++++++++++++
 .../tests/end-to-end/api/livechat/00-rooms.ts | 19 +++++++
 packages/i18n/src/locales/en.i18n.json        |  2 +
 .../livechat/src/routes/Chat/connector.tsx    |  2 +
 .../livechat/src/routes/Chat/container.js     |  4 +-
 packages/livechat/src/store/index.tsx         |  1 +
 15 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/healthy-rivers-nail.md

diff --git a/.changeset/healthy-rivers-nail.md b/.changeset/healthy-rivers-nail.md
new file mode 100644
index 000000000000..a8da9bec846e
--- /dev/null
+++ b/.changeset/healthy-rivers-nail.md
@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+"@rocket.chat/livechat": minor
+---
+
+Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
diff --git a/apps/meteor/app/livechat/imports/server/rest/appearance.ts b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
index 48863fc9e5d3..7496b6243abe 100644
--- a/apps/meteor/app/livechat/imports/server/rest/appearance.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
@@ -51,6 +51,7 @@ API.v1.addRoute(
 				'Livechat_background',
 				'Livechat_widget_position',
 				'Livechat_hide_system_messages',
+				'Omnichannel_allow_visitors_to_close_conversation',
 			];
 
 			const valid = settings.every((setting) => validSettingList.includes(setting._id));
diff --git a/apps/meteor/app/livechat/server/api/lib/appearance.ts b/apps/meteor/app/livechat/server/api/lib/appearance.ts
index 785413ead9d1..0fc7d3547b2c 100644
--- a/apps/meteor/app/livechat/server/api/lib/appearance.ts
+++ b/apps/meteor/app/livechat/server/api/lib/appearance.ts
@@ -28,6 +28,7 @@ export async function findAppearance(): Promise<{ appearance: ISetting[] }> {
 				'Livechat_background',
 				'Livechat_widget_position',
 				'Livechat_hide_system_messages',
+				'Omnichannel_allow_visitors_to_close_conversation',
 			],
 		},
 	};
diff --git a/apps/meteor/app/livechat/server/api/lib/livechat.ts b/apps/meteor/app/livechat/server/api/lib/livechat.ts
index a922edd40899..8041566d796e 100644
--- a/apps/meteor/app/livechat/server/api/lib/livechat.ts
+++ b/apps/meteor/app/livechat/server/api/lib/livechat.ts
@@ -142,6 +142,7 @@ export async function settings({ businessUnit = '' }: { businessUnit?: string }
 			hiddenSystemMessages: initSettings.Livechat_hide_system_messages,
 			livechatLogo: initSettings.Assets_livechat_widget_logo,
 			hideWatermark: initSettings.Livechat_hide_watermark || false,
+			visitorsCanCloseChat: initSettings.Omnichannel_allow_visitors_to_close_conversation,
 		},
 		theme: {
 			title: initSettings.Livechat_title,
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index 565f8e0bb3f4..7aacfacb4476 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -107,6 +107,10 @@ API.v1.addRoute(
 		async post() {
 			const { rid, token } = this.bodyParams;
 
+			if (!rcSettings.get('Omnichannel_allow_visitors_to_close_conversation')) {
+				throw new Error('error-not-allowed-to-close-conversation');
+			}
+
 			const visitor = await findGuest(token);
 			if (!visitor) {
 				throw new Error('invalid-token');
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 88f9494159a2..89d125033977 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -1079,6 +1079,7 @@ class LivechatClass {
 			'Livechat_background',
 			'Assets_livechat_widget_logo',
 			'Livechat_hide_watermark',
+			'Omnichannel_allow_visitors_to_close_conversation',
 		] as const;
 
 		type SettingTypes = (typeof validSettings)[number] | 'Livechat_Show_Connecting';
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index 4253ff023ee9..a4435398d9a9 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -52,6 +52,7 @@ const AppearanceForm = () => {
 	const livechatWidgetPositionField = useUniqueId();
 	const livechatBackgroundField = useUniqueId();
 	const livechatHideSystemMessagesField = useUniqueId();
+	const omnichannelVisitorsCanCloseConversationField = useUniqueId();
 
 	return (
 		<Accordion>
@@ -140,6 +141,20 @@ const AppearanceForm = () => {
 							/>
 						</FieldRow>
 					</Field>
+					<Field>
+						<FieldRow>
+							<FieldLabel htmlFor={omnichannelVisitorsCanCloseConversationField}>
+								{t('Omnichannel_allow_visitors_to_close_conversation')}
+							</FieldLabel>
+							<Controller
+								name='Omnichannel_allow_visitors_to_close_conversation'
+								control={control}
+								render={({ field: { value, ...field } }) => (
+									<ToggleSwitch id={omnichannelVisitorsCanCloseConversationField} {...field} checked={value} />
+								)}
+							/>
+						</FieldRow>
+					</Field>
 				</FieldGroup>
 			</Accordion.Item>
 
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
index a2cfb7b8103b..b90c32af6a7d 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
@@ -28,6 +28,7 @@ type LivechatAppearanceSettings = {
 	Livechat_conversation_finished_text: string;
 	Livechat_enable_message_character_limit: boolean;
 	Livechat_message_character_limit: number;
+	Omnichannel_allow_visitors_to_close_conversation: boolean;
 };
 
 type AppearanceSettings = Partial<LivechatAppearanceSettings>;
diff --git a/apps/meteor/server/settings/omnichannel.ts b/apps/meteor/server/settings/omnichannel.ts
index ed1daa8ce228..c86cd6674d4e 100644
--- a/apps/meteor/server/settings/omnichannel.ts
+++ b/apps/meteor/server/settings/omnichannel.ts
@@ -157,6 +157,13 @@ export const createOmniSettings = () =>
 			i18nLabel: 'Show_agent_email',
 		});
 
+		await this.add('Omnichannel_allow_visitors_to_close_conversation', true, {
+			type: 'boolean',
+			group: 'Omnichannel',
+			public: true,
+			enableQuery: omnichannelEnabledQuery,
+		});
+
 		await this.add('Livechat_request_comment_when_closing_conversation', true, {
 			type: 'boolean',
 			group: 'Omnichannel',
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
index bf14584ed89f..405e7f82e3c4 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
@@ -2,6 +2,7 @@ import { createFakeVisitor } from '../../mocks/data';
 import { createAuxContext } from '../fixtures/createAuxContext';
 import { Users } from '../fixtures/userStates';
 import { HomeOmnichannel, OmnichannelLiveChat } from '../page-objects';
+import { setSettingValueById } from '../utils';
 import { createAgent } from '../utils/omnichannel/agents';
 import { test, expect } from '../utils/test';
 
@@ -93,6 +94,57 @@ test.describe.serial('OC - Livechat', () => {
 	});
 });
 
+test.describe.serial('OC - Livechat - Visitors closing the room is disabled', () => {
+	let poLiveChat: OmnichannelLiveChat;
+	let poHomeOmnichannel: HomeOmnichannel;
+
+	test.beforeAll(async ({ api }) => {
+		await api.post('/livechat/users/agent', { username: 'user1' });
+	});
+
+	test.beforeAll(async ({ browser, api }) => {
+		const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false);
+
+		poLiveChat = new OmnichannelLiveChat(livechatPage, api);
+	});
+
+	test.beforeAll(async ({ browser, api }) => {
+		await setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', false);
+		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		poHomeOmnichannel = new HomeOmnichannel(omniPage);
+	});
+
+	test.afterAll(async ({ api }) => {
+		await setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', true);
+		await api.delete('/livechat/users/agent/user1');
+		await poLiveChat.page.close();
+	});
+
+	test('OC - Livechat - Close Chat disabled', async () => {
+		await poLiveChat.page.reload();
+		await poLiveChat.openAnyLiveChat();
+		await poLiveChat.sendMessage(firstVisitor, false);
+		await poLiveChat.onlineAgentMessage.fill('this_a_test_message_from_user');
+		await poLiveChat.btnSendMessageToOnlineAgent.click();
+
+		await test.step('expect to close a livechat conversation', async () => {
+			await expect(poLiveChat.btnOptions).not.toBeVisible();
+			await expect(poLiveChat.btnCloseChat).not.toBeVisible();
+		});
+	});
+
+	test('OC - Livechat - Close chat disabled, agents can close', async () => {
+		await poHomeOmnichannel.sidenav.openChat(firstVisitor.name);
+
+		await test.step('expect livechat conversation to be closed by agent', async () => {
+			await poHomeOmnichannel.content.btnCloseChat.click();
+			await poHomeOmnichannel.content.closeChatModal.inputComment.fill('this_is_a_test_comment');
+			await poHomeOmnichannel.content.closeChatModal.btnConfirm.click();
+			await expect(poHomeOmnichannel.toastSuccess).toBeVisible();
+		});
+	});
+});
+
 test.describe.serial('OC - Livechat - Resub after close room', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let poHomeOmnichannel: HomeOmnichannel;
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index 7142725a1d99..4388a4d24341 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -689,6 +689,25 @@ describe('LIVECHAT - rooms', () => {
 				expect(latestRoom).to.not.have.property('pdfTranscriptFileId');
 			},
 		);
+
+		describe('Special case: visitors closing is disabled', () => {
+			before(async () => {
+				await updateSetting('Omnichannel_allow_visitors_to_close_conversation', false);
+			});
+			after(async () => {
+				await updateSetting('Omnichannel_allow_visitors_to_close_conversation', true);
+			});
+			it('should not allow visitor to close a conversation', async () => {
+				const { room, visitor } = await startANewLivechatRoomAndTakeIt();
+				await request
+					.post(api('livechat/room.close'))
+					.send({
+						token: visitor.token,
+						rid: room._id,
+					})
+					.expect(400);
+			});
+		});
 	});
 
 	describe('livechat/room.forward', () => {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index ea7e31422cb1..d3324c6e749a 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -4037,6 +4037,8 @@
   "Omnichannel_Reports_Summary": "Gain insights into your operation and export your metrics.",
   "Omnichannel_max_fallback_forward_depth": "Maximum fallback forward departments depth",
   "Omnichannel_max_fallback_forward_depth_Description": "Maximum number of hops that a room being transfered will do when the target department has a Fallback Forward Department set up. When limit is reached, chat won't be transferred and process will stop. Depending on your configuration, setting a high number may cause performance issues.",
+  "Omnichannel_allow_visitors_to_close_conversation": "Allow visitors to finish conversations",
+  "Omnichannel_allow_visitors_to_close_conversation_Description": "When disabled, visitors won't be able to finish an ongoing conversation either via UI or via API.",
   "On": "On",
   "on-hold-livechat-room": "On Hold Omnichannel Room",
   "on-hold-livechat-room_description": "Permission to on hold omnichannel room",
diff --git a/packages/livechat/src/routes/Chat/connector.tsx b/packages/livechat/src/routes/Chat/connector.tsx
index 36e574b246b1..3c72f9ae88cf 100644
--- a/packages/livechat/src/routes/Chat/connector.tsx
+++ b/packages/livechat/src/routes/Chat/connector.tsx
@@ -22,6 +22,7 @@ export const ChatConnector: FunctionalComponent<{ path: string; default: boolean
 				nameFieldRegistrationForm,
 				emailFieldRegistrationForm,
 				limitTextLength,
+				visitorsCanCloseChat,
 			},
 			messages: { conversationFinishedMessage },
 			theme: { title = '' } = {},
@@ -94,6 +95,7 @@ export const ChatConnector: FunctionalComponent<{ path: string; default: boolean
 			ongoingCall={ongoingCall}
 			messageListPosition={messageListPosition}
 			theme={theme}
+			visitorsCanCloseChat={visitorsCanCloseChat}
 		/>
 	);
 };
diff --git a/packages/livechat/src/routes/Chat/container.js b/packages/livechat/src/routes/Chat/container.js
index 19172cc7fe5a..43ff281c6472 100644
--- a/packages/livechat/src/routes/Chat/container.js
+++ b/packages/livechat/src/routes/Chat/container.js
@@ -288,8 +288,8 @@ class ChatContainer extends Component {
 	};
 
 	canFinishChat = () => {
-		const { room, connecting } = this.props;
-		return room !== undefined || connecting;
+		const { room, connecting, visitorsCanCloseChat } = this.props;
+		return visitorsCanCloseChat && (room !== undefined || connecting);
 	};
 
 	canRemoveUserData = () => {
diff --git a/packages/livechat/src/store/index.tsx b/packages/livechat/src/store/index.tsx
index f8629ce693cc..e7d4b8caae17 100644
--- a/packages/livechat/src/store/index.tsx
+++ b/packages/livechat/src/store/index.tsx
@@ -59,6 +59,7 @@ export type StoreState = {
 			hideWatermark?: boolean;
 			livechatLogo?: { url: string };
 			transcript?: boolean;
+			visitorsCanCloseChat?: boolean;
 		};
 		online?: boolean;
 		departments: Department[];

From 4146c3956d6d8337b7a23232506f7796f113df17 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Mon, 9 Sep 2024 15:21:14 -0600
Subject: [PATCH 059/170] fix: Allow to use the token from `room.v` when
 requesting transcript instead of finding visitor (#33211)

---
 .changeset/four-cherries-kneel.md             |  5 +++
 .../app/livechat/server/lib/sendTranscript.ts | 17 +++----
 apps/meteor/tests/data/livechat/rooms.ts      |  4 +-
 .../end-to-end/api/livechat/11-livechat.ts    | 21 +++++++++
 .../server/lib/sendTranscript.spec.ts         | 45 +++++++++++++------
 5 files changed, 67 insertions(+), 25 deletions(-)
 create mode 100644 .changeset/four-cherries-kneel.md

diff --git a/.changeset/four-cherries-kneel.md b/.changeset/four-cherries-kneel.md
new file mode 100644
index 000000000000..095d5af0aa76
--- /dev/null
+++ b/.changeset/four-cherries-kneel.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
diff --git a/apps/meteor/app/livechat/server/lib/sendTranscript.ts b/apps/meteor/app/livechat/server/lib/sendTranscript.ts
index 74032121ee50..bc7c06e0eaae 100644
--- a/apps/meteor/app/livechat/server/lib/sendTranscript.ts
+++ b/apps/meteor/app/livechat/server/lib/sendTranscript.ts
@@ -3,12 +3,13 @@ import {
 	type IUser,
 	type MessageTypesValues,
 	type IOmnichannelSystemMessage,
+	type ILivechatVisitor,
 	isFileAttachment,
 	isFileImageAttachment,
 } from '@rocket.chat/core-typings';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { Logger } from '@rocket.chat/logger';
-import { LivechatRooms, LivechatVisitors, Messages, Uploads, Users } from '@rocket.chat/models';
+import { LivechatRooms, Messages, Uploads, Users } from '@rocket.chat/models';
 import { check } from 'meteor/check';
 import moment from 'moment-timezone';
 
@@ -41,16 +42,12 @@ export async function sendTranscript({
 
 	const room = await LivechatRooms.findOneById(rid);
 
-	const visitor = await LivechatVisitors.getVisitorByToken(token, {
-		projection: { _id: 1, token: 1, language: 1, username: 1, name: 1 },
-	});
-
-	if (!visitor) {
-		throw new Error('error-invalid-token');
+	const visitor = room?.v as ILivechatVisitor;
+	if (token !== visitor?.token) {
+		throw new Error('error-invalid-visitor');
 	}
 
-	// @ts-expect-error - Visitor typings should include language?
-	const userLanguage = visitor?.language || settings.get('Language') || 'en';
+	const userLanguage = settings.get<string>('Language') || 'en';
 	const timezone = getTimezone(user);
 	logger.debug(`Transcript will be sent using ${timezone} as timezone`);
 
@@ -59,7 +56,7 @@ export async function sendTranscript({
 	}
 
 	// allow to only user to send transcripts from their own chats
-	if (room.t !== 'l' || !room.v || room.v.token !== token) {
+	if (room.t !== 'l') {
 		throw new Error('error-invalid-room');
 	}
 
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index 9532fd4214ab..b5d89762c614 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -33,10 +33,10 @@ export const createLivechatRoom = async (visitorToken: string, extraRoomParams?:
 	return response.body.room;
 };
 
-export const createVisitor = (department?: string, visitorName?: string): Promise<ILivechatVisitor> =>
+export const createVisitor = (department?: string, visitorName?: string, customEmail?: string): Promise<ILivechatVisitor> =>
 	new Promise((resolve, reject) => {
 		const token = getRandomVisitorToken();
-		const email = `${token}@${token}.com`;
+		const email = customEmail || `${token}@${token}.com`;
 		const phone = `${Math.floor(Math.random() * 10000000000)}`;
 		void request.get(api(`livechat/visitor/${token}`)).end((err: Error, res: DummyResponse<ILivechatVisitor>) => {
 			if (!err && res && res.body && res.body.visitor) {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
index c07f7bcecc81..7ce582025538 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
@@ -283,6 +283,27 @@ describe('LIVECHAT - Utils', () => {
 				.send({ token: visitor.token, rid: room._id, email: 'visitor@notadomain.com' });
 			expect(body).to.have.property('success', true);
 		});
+		it('should allow a visitor to get a transcript even if token changed by using an old token that matches room.v', async () => {
+			const visitor = await createVisitor();
+			const room = await createLivechatRoom(visitor.token);
+			await closeOmnichannelRoom(room._id);
+			const visitor2 = await createVisitor(undefined, undefined, visitor.visitorEmails?.[0].address);
+			const room2 = await createLivechatRoom(visitor2.token);
+			await closeOmnichannelRoom(room2._id);
+
+			expect(visitor.token !== visitor2.token).to.be.true;
+			const { body } = await request
+				.post(api('livechat/transcript'))
+				.set(credentials)
+				.send({ token: visitor.token, rid: room._id, email: 'visitor@notadomain.com' });
+			expect(body).to.have.property('success', true);
+
+			const { body: body2 } = await request
+				.post(api('livechat/transcript'))
+				.set(credentials)
+				.send({ token: visitor2.token, rid: room2._id, email: 'visitor@notadomain.com' });
+			expect(body2).to.have.property('success', true);
+		});
 	});
 
 	describe('livechat/transcript/:rid', () => {
diff --git a/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts
index 64da050cfd88..ca39a64c21a9 100644
--- a/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts
+++ b/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts
@@ -6,9 +6,6 @@ const modelsMock = {
 	LivechatRooms: {
 		findOneById: sinon.stub(),
 	},
-	LivechatVisitors: {
-		getVisitorByToken: sinon.stub(),
-	},
 	Messages: {
 		findLivechatClosingMessage: sinon.stub(),
 		findVisibleByRoomIdNotContainingTypesBeforeTs: sinon.stub(),
@@ -75,7 +72,6 @@ describe('Send transcript', () => {
 	beforeEach(() => {
 		checkMock.reset();
 		modelsMock.LivechatRooms.findOneById.reset();
-		modelsMock.LivechatVisitors.getVisitorByToken.reset();
 		modelsMock.Messages.findLivechatClosingMessage.reset();
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.reset();
 		modelsMock.Users.findOneById.reset();
@@ -87,11 +83,9 @@ describe('Send transcript', () => {
 		await expect(sendTranscript({})).to.be.rejectedWith(Error);
 	});
 	it('should throw error when visitor not found', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves(null);
 		await expect(sendTranscript({ rid: 'rid', email: 'email', logger: mockLogger })).to.be.rejectedWith(Error);
 	});
 	it('should attempt to send an email when params are valid using default subject', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token' } });
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
 		tStub.returns('Conversation Transcript');
@@ -117,7 +111,6 @@ describe('Send transcript', () => {
 		).to.be.true;
 	});
 	it('should use provided subject', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token' } });
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
 
@@ -143,7 +136,6 @@ describe('Send transcript', () => {
 		).to.be.true;
 	});
 	it('should use subject from setting (when configured) when no subject provided', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token' } });
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
 		mockSettingValues.Livechat_transcript_email_subject = 'A custom subject obtained from setting.get';
@@ -170,36 +162,63 @@ describe('Send transcript', () => {
 	});
 	it('should fail if room provided is invalid', async () => {
 		modelsMock.LivechatRooms.findOneById.resolves(null);
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email', logger: mockLogger })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room provided is of different type', async () => {
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'c' });
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email' })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room is of valid type, but doesnt doesnt have `v` property', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l' });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email' })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room is of valid type, has `v` prop, but it doesnt contain `token`', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { otherProp: 'xxx' } });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email' })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room is of valid type, has `v.token`, but its different from the one on param (room from another visitor)', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'xxx' } });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email', token: 'xveasdf' })).to.be.rejectedWith(Error);
 	});
+
+	it('should throw an error when token is not the one on room.v', async () => {
+		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'xxx' } });
+
+		await expect(sendTranscript({ rid: 'rid', email: 'email', token: 'xveasdf' })).to.be.rejectedWith(Error);
+	});
+	it('should work when token matches room.v', async () => {
+		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token-123' } });
+		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
+		delete mockSettingValues.Livechat_transcript_email_subject;
+		tStub.returns('Conversation Transcript');
+
+		await sendTranscript({
+			rid: 'rid',
+			token: 'token-123',
+			email: 'email',
+			user: { _id: 'x', name: 'x', utcOffset: '-6', username: 'x' },
+		});
+
+		expect(getTimezoneMock.calledWith({ _id: 'x', name: 'x', utcOffset: '-6', username: 'x' })).to.be.true;
+		expect(modelsMock.Messages.findLivechatClosingMessage.calledWith('rid', { projection: { ts: 1 } })).to.be.true;
+		expect(modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.called).to.be.true;
+		expect(
+			mailerMock.calledWith({
+				to: 'email',
+				from: 'test@rocket.chat',
+				subject: 'Conversation Transcript',
+				replyTo: 'test@rocket.chat',
+				html: '<div> <hr></div>',
+			}),
+		).to.be.true;
+	});
 });

From 0f21fa01a3f1c9fcd533d696d001c2594ca38092 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Tue, 10 Sep 2024 16:08:43 +0530
Subject: [PATCH 060/170] feat: Option to disable 2FA for OAuth users (#32945)

---
 .changeset/tiny-geckos-kiss.md                |  6 ++
 .../app/2fa/server/code/EmailCheck.spec.ts    | 70 +++++++++++++++
 apps/meteor/app/2fa/server/code/EmailCheck.ts |  6 +-
 apps/meteor/app/2fa/server/code/index.ts      | 12 +--
 apps/meteor/app/api/server/v1/misc.ts         | 14 +--
 .../server/functions/getBaseUserFields.ts     | 34 ++++++++
 .../server/functions/getDefaultUserFields.ts  | 35 ++------
 .../account/security/AccountSecurityPage.tsx  | 12 ++-
 .../views/account/security/TwoFactorEmail.tsx |  4 +-
 apps/meteor/server/settings/accounts.ts       | 12 +++
 packages/core-typings/src/IUser.ts            | 85 +++++++++++++------
 packages/i18n/src/locales/en.i18n.json        |  2 +
 12 files changed, 217 insertions(+), 75 deletions(-)
 create mode 100644 .changeset/tiny-geckos-kiss.md
 create mode 100644 apps/meteor/app/2fa/server/code/EmailCheck.spec.ts
 create mode 100644 apps/meteor/app/utils/server/functions/getBaseUserFields.ts

diff --git a/.changeset/tiny-geckos-kiss.md b/.changeset/tiny-geckos-kiss.md
new file mode 100644
index 000000000000..d38150970310
--- /dev/null
+++ b/.changeset/tiny-geckos-kiss.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.spec.ts b/apps/meteor/app/2fa/server/code/EmailCheck.spec.ts
new file mode 100644
index 000000000000..5c3574f0b395
--- /dev/null
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.spec.ts
@@ -0,0 +1,70 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const settingsMock = sinon.stub();
+
+const { EmailCheck } = proxyquire.noCallThru().load('./EmailCheck', {
+	'@rocket.chat/models': {
+		Users: {},
+	},
+	'meteor/accounts-base': {
+		Accounts: {
+			_bcryptRounds: () => '123',
+		},
+	},
+	'../../../../server/lib/i18n': {
+		i18n: {
+			t: (key: string) => key,
+		},
+	},
+	'../../../mailer/server/api': {
+		send: () => undefined,
+	},
+	'../../../settings/server': {
+		settings: {
+			get: settingsMock,
+		},
+	},
+});
+
+const normalUserMock = { services: { email2fa: { enabled: true } }, emails: [{ email: 'abc@gmail.com', verified: true }] };
+const normalUserWithUnverifiedEmailMock = {
+	services: { email2fa: { enabled: true } },
+	emails: [{ email: 'abc@gmail.com', verified: false }],
+};
+const OAuthUserMock = { services: { google: {} }, emails: [{ email: 'abc@gmail.com', verified: true }] };
+
+describe('EmailCheck', () => {
+	let emailCheck: typeof EmailCheck;
+	beforeEach(() => {
+		settingsMock.reset();
+
+		emailCheck = new EmailCheck();
+	});
+
+	it('should return EmailCheck is enabled for a normal user', () => {
+		settingsMock.returns(true);
+
+		const isEmail2FAEnabled = emailCheck.isEnabled(normalUserMock);
+
+		expect(isEmail2FAEnabled).to.be.equal(true);
+	});
+
+	it('should return EmailCheck is not enabled for a normal user with unverified email', () => {
+		settingsMock.returns(true);
+
+		const isEmail2FAEnabled = emailCheck.isEnabled(normalUserWithUnverifiedEmailMock);
+
+		expect(isEmail2FAEnabled).to.be.equal(false);
+	});
+
+	it('should return EmailCheck is not enabled for a OAuth user with setting being false', () => {
+		settingsMock.returns(true);
+
+		const isEmail2FAEnabled = emailCheck.isEnabled(OAuthUserMock);
+
+		expect(isEmail2FAEnabled).to.be.equal(false);
+	});
+});
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts
index 123df96ee264..d947c1b30c2e 100644
--- a/apps/meteor/app/2fa/server/code/EmailCheck.ts
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts
@@ -1,4 +1,4 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import { isOAuthUser, type IUser } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import bcrypt from 'bcrypt';
@@ -24,6 +24,10 @@ export class EmailCheck implements ICodeCheck {
 			return false;
 		}
 
+		if (!settings.get('Accounts_twoFactorAuthentication_email_available_for_OAuth_users') && isOAuthUser(user)) {
+			return false;
+		}
+
 		if (!user.services?.email2fa?.enabled) {
 			return false;
 		}
diff --git a/apps/meteor/app/2fa/server/code/index.ts b/apps/meteor/app/2fa/server/code/index.ts
index 1fbe658e5682..b05157416e31 100644
--- a/apps/meteor/app/2fa/server/code/index.ts
+++ b/apps/meteor/app/2fa/server/code/index.ts
@@ -45,14 +45,10 @@ function getAvailableMethodNames(user: IUser): string[] {
 export async function getUserForCheck(userId: string): Promise<IUser | null> {
 	return Users.findOneById(userId, {
 		projection: {
-			'emails': 1,
-			'language': 1,
-			'createdAt': 1,
-			'services.totp': 1,
-			'services.email2fa': 1,
-			'services.emailCode': 1,
-			'services.password': 1,
-			'services.resume.loginTokens': 1,
+			emails: 1,
+			language: 1,
+			createdAt: 1,
+			services: 1,
 		},
 	});
 }
diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index dd4da47bff05..8348b8429e4e 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -1,6 +1,6 @@
 import crypto from 'crypto';
 
-import type { IUser } from '@rocket.chat/core-typings';
+import { isOAuthUser, type IUser } from '@rocket.chat/core-typings';
 import { Settings, Users } from '@rocket.chat/models';
 import {
 	isShieldSvgProps,
@@ -26,7 +26,7 @@ import { hasPermissionAsync } from '../../../authorization/server/functions/hasP
 import { passwordPolicy } from '../../../lib/server';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
-import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
+import { getBaseUserFields } from '../../../utils/server/functions/getBaseUserFields';
 import { isSMTPConfigured } from '../../../utils/server/functions/isSMTPConfigured';
 import { getURL } from '../../../utils/server/getURL';
 import { API } from '../api';
@@ -176,15 +176,19 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async get() {
-			const fields = getDefaultUserFields();
-			const { services, ...user } = (await Users.findOneById(this.userId, { projection: fields })) as IUser;
+			const userFields = { ...getBaseUserFields(), services: 1 };
+			const { services, ...user } = (await Users.findOneById(this.userId, { projection: userFields })) as IUser;
 
 			return API.v1.success(
 				await getUserInfo({
 					...user,
+					isOAuthUser: isOAuthUser({ ...user, services }),
 					...(services && {
 						services: {
-							...services,
+							...(services.github && { github: services.github }),
+							...(services.gitlab && { gitlab: services.gitlab }),
+							...(services.email2fa?.enabled && { email2fa: { enabled: services.email2fa.enabled } }),
+							...(services.totp?.enabled && { totp: { enabled: services.totp.enabled } }),
 							password: {
 								// The password hash shouldn't be leaked but the client may need to know if it exists.
 								exists: Boolean(services?.password?.bcrypt),
diff --git a/apps/meteor/app/utils/server/functions/getBaseUserFields.ts b/apps/meteor/app/utils/server/functions/getBaseUserFields.ts
new file mode 100644
index 000000000000..5e2a3bf2b4d7
--- /dev/null
+++ b/apps/meteor/app/utils/server/functions/getBaseUserFields.ts
@@ -0,0 +1,34 @@
+type UserFields = {
+	[k: string]: number;
+};
+
+export const getBaseUserFields = (): UserFields => ({
+	'name': 1,
+	'username': 1,
+	'nickname': 1,
+	'emails': 1,
+	'status': 1,
+	'statusDefault': 1,
+	'statusText': 1,
+	'statusConnection': 1,
+	'bio': 1,
+	'avatarOrigin': 1,
+	'utcOffset': 1,
+	'language': 1,
+	'settings': 1,
+	'enableAutoAway': 1,
+	'idleTimeLimit': 1,
+	'roles': 1,
+	'active': 1,
+	'defaultRoom': 1,
+	'customFields': 1,
+	'requirePasswordChange': 1,
+	'requirePasswordChangeReason': 1,
+	'statusLivechat': 1,
+	'banners': 1,
+	'oauth.authorizedClients': 1,
+	'_updatedAt': 1,
+	'avatarETag': 1,
+	'extension': 1,
+	'openBusinessHours': 1,
+});
diff --git a/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts b/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts
index 03d0cae77ab9..293eb8607342 100644
--- a/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts
+++ b/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts
@@ -1,39 +1,14 @@
-type DefaultUserFields = {
+import { getBaseUserFields } from './getBaseUserFields';
+
+type UserFields = {
 	[k: string]: number;
 };
 
-export const getDefaultUserFields = (): DefaultUserFields => ({
-	'name': 1,
-	'username': 1,
-	'nickname': 1,
-	'emails': 1,
-	'status': 1,
-	'statusDefault': 1,
-	'statusText': 1,
-	'statusConnection': 1,
-	'bio': 1,
-	'avatarOrigin': 1,
-	'utcOffset': 1,
-	'language': 1,
-	'settings': 1,
-	'enableAutoAway': 1,
-	'idleTimeLimit': 1,
-	'roles': 1,
-	'active': 1,
-	'defaultRoom': 1,
-	'customFields': 1,
-	'requirePasswordChange': 1,
-	'requirePasswordChangeReason': 1,
+export const getDefaultUserFields = (): UserFields => ({
+	...getBaseUserFields(),
 	'services.github': 1,
 	'services.gitlab': 1,
 	'services.password.bcrypt': 1,
 	'services.totp.enabled': 1,
 	'services.email2fa.enabled': 1,
-	'statusLivechat': 1,
-	'banners': 1,
-	'oauth.authorizedClients': 1,
-	'_updatedAt': 1,
-	'avatarETag': 1,
-	'extension': 1,
-	'openBusinessHours': 1,
 });
diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
index 536ba8a04ef7..06619f0618f5 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
@@ -1,6 +1,6 @@
 import { Box, Accordion, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation, useUser } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
@@ -15,6 +15,11 @@ const passwordDefaultValues = { password: '', confirmationPassword: '' };
 
 const AccountSecurityPage = (): ReactElement => {
 	const t = useTranslation();
+	const user = useUser();
+
+	const isEmail2FAAvailableForOAuth = useSetting('Accounts_twoFactorAuthentication_email_available_for_OAuth_users');
+	const isOAuthUser = user?.isOAuthUser;
+	const isEmail2FAAllowed = !isOAuthUser || isEmail2FAAvailableForOAuth;
 
 	const methods = useForm({
 		defaultValues: passwordDefaultValues,
@@ -30,6 +35,7 @@ const AccountSecurityPage = (): ReactElement => {
 	const twoFactorByEmailEnabled = useSetting('Accounts_TwoFactorAuthentication_By_Email_Enabled');
 	const e2eEnabled = useSetting('E2E_Enable');
 	const allowPasswordChange = useSetting('Accounts_AllowPasswordChange');
+	const showEmailTwoFactor = twoFactorByEmailEnabled && isEmail2FAAllowed;
 
 	const passwordFormId = useUniqueId();
 
@@ -48,10 +54,10 @@ const AccountSecurityPage = (): ReactElement => {
 						</FormProvider>
 					)}
 					<Accordion>
-						{(twoFactorTOTP || twoFactorByEmailEnabled) && twoFactorEnabled && (
+						{(twoFactorTOTP || showEmailTwoFactor) && twoFactorEnabled && (
 							<Accordion.Item title={t('Two Factor Authentication')}>
 								{twoFactorTOTP && <TwoFactorTOTP />}
-								{twoFactorByEmailEnabled && <TwoFactorEmail />}
+								{showEmailTwoFactor && <TwoFactorEmail />}
 							</Accordion.Item>
 						)}
 						{e2eEnabled && (
diff --git a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
index c890dc61e658..3654d17b5dec 100644
--- a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
@@ -1,11 +1,11 @@
 import { Box, Button, Margins } from '@rocket.chat/fuselage';
 import { useUser, useTranslation } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import React, { useCallback } from 'react';
 
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
-const TwoFactorEmail = (props: ComponentProps<typeof Box>): ReactElement => {
+const TwoFactorEmail = (props: ComponentProps<typeof Box>) => {
 	const t = useTranslation();
 	const user = useUser();
 
diff --git a/apps/meteor/server/settings/accounts.ts b/apps/meteor/server/settings/accounts.ts
index a744c47b2a41..b4da1cd913e9 100644
--- a/apps/meteor/server/settings/accounts.ts
+++ b/apps/meteor/server/settings/accounts.ts
@@ -31,6 +31,18 @@ export const createAccountSettings = () =>
 				public: true,
 			});
 
+			await this.add('Accounts_twoFactorAuthentication_email_available_for_OAuth_users', true, {
+				type: 'boolean',
+				enableQuery: [
+					enable2FA,
+					{
+						_id: 'Accounts_TwoFactorAuthentication_By_Email_Enabled',
+						value: true,
+					},
+				],
+				public: true,
+			});
+
 			await this.add('Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In', true, {
 				type: 'boolean',
 				enableQuery: [
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index fa411c6f7e47..d6854bef7243 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -45,7 +45,35 @@ export type ILoginUsername =
 	  };
 export type LoginUsername = string | ILoginUsername;
 
-export interface IUserServices {
+export interface IOAuthUserServices {
+	google?: any;
+	facebook?: any;
+	github?: any;
+	linkedin?: any;
+	twitter?: any;
+	gitlab?: any;
+	saml?: {
+		inResponseTo?: string;
+		provider?: string;
+		idp?: string;
+		idpSession?: string;
+		nameID?: string;
+	};
+	ldap?: {
+		id: string;
+		idAttribute?: string;
+	};
+	nextcloud?: {
+		accessToken: string;
+		refreshToken: string;
+		serverURL: string;
+	};
+	dolphin?: {
+		NickName?: string;
+	};
+}
+
+export interface IUserServices extends IOAuthUserServices {
 	password?: {
 		exists?: boolean;
 		bcrypt?: string;
@@ -62,12 +90,6 @@ export interface IUserServices {
 		refreshToken: string;
 		expiresAt: Date;
 	};
-	google?: any;
-	facebook?: any;
-	github?: any;
-	linkedin?: any;
-	twitter?: any;
-	gitlab?: any;
 	totp?: {
 		enabled: boolean;
 		hashedBackup: string[];
@@ -79,27 +101,37 @@ export interface IUserServices {
 		changedAt: Date;
 	};
 	emailCode?: IUserEmailCode;
-	saml?: {
-		inResponseTo?: string;
-		provider?: string;
-		idp?: string;
-		idpSession?: string;
-		nameID?: string;
-	};
-	ldap?: {
-		id: string;
-		idAttribute?: string;
-	};
-	nextcloud?: {
-		accessToken: string;
-		refreshToken: string;
-		serverURL: string;
-	};
-	dolphin?: {
-		NickName?: string;
-	};
 }
 
+type IUserService = keyof IUserServices;
+type IOAuthService = keyof IOAuthUserServices;
+
+const defaultOAuthKeys = [
+	'google',
+	'dolphin',
+	'facebook',
+	'github',
+	'gitlab',
+	'google',
+	'ldap',
+	'linkedin',
+	'nextcloud',
+	'saml',
+	'twitter',
+] as IOAuthService[];
+const userServiceKeys = ['emailCode', 'email2fa', 'totp', 'resume', 'password', 'passwordHistory', 'cloud', 'email'] as IUserService[];
+
+export const isUserServiceKey = (key: string): key is IUserService =>
+	userServiceKeys.includes(key as IUserService) || defaultOAuthKeys.includes(key as IOAuthService);
+
+export const isDefaultOAuthUser = (user: IUser): boolean =>
+	!!user.services && Object.keys(user.services).some((key) => defaultOAuthKeys.includes(key as IOAuthService));
+
+export const isCustomOAuthUser = (user: IUser): boolean =>
+	!!user.services && Object.keys(user.services).some((key) => !isUserServiceKey(key));
+
+export const isOAuthUser = (user: IUser): boolean => isDefaultOAuthUser(user) || isCustomOAuthUser(user);
+
 export interface IUserEmail {
 	address: string;
 	verified?: boolean;
@@ -183,6 +215,7 @@ export interface IUser extends IRocketChatRecord {
 	_pendingAvatarUrl?: string;
 	requirePasswordChange?: boolean;
 	requirePasswordChangeReason?: string;
+	isOAuthUser?: boolean; // client only field
 }
 
 export interface IRegisterUser extends IUser {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index d3324c6e749a..e6867528ad4c 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -282,6 +282,8 @@
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Time to expire the code sent via email in seconds",
   "Accounts_TwoFactorAuthentication_By_Email_Enabled": "Enable Two Factor Authentication via Email",
   "Accounts_TwoFactorAuthentication_By_Email_Enabled_Description": "Users with email verified and the option enabled in their profile page will receive an email with a temporary code to authorize certain actions like login, save the profile, etc.",
+  "Accounts_twoFactorAuthentication_email_available_for_OAuth_users": "Make two factor via email available for oAuth users",
+  "Accounts_twoFactorAuthentication_email_available_for_OAuth_users_Description": "People that use oAuth will receive an email with a temporary code to authorize actions like login, save profile, etc.",
   "Accounts_TwoFactorAuthentication_Enabled": "Enable Two Factor Authentication",
   "Accounts_TwoFactorAuthentication_Enabled_Description": "If deactivated, this setting will deactivate all Two Factor Authentication.  \nTo force users to use Two Factor Authentication, the admin has to configure the 'user' role to enforce it.",
   "Accounts_TwoFactorAuthentication_Enforce_Password_Fallback": "Enforce password fallback",

From f3e8b6b5082934c6d142df442ee42a5ce968c969 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 10 Sep 2024 18:59:26 +0000
Subject: [PATCH 061/170] Bump 6.12.1

---
 .changeset/bump-patch-1725994766358.md |  5 +++++
 yarn.lock                              | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/bump-patch-1725994766358.md

diff --git a/.changeset/bump-patch-1725994766358.md b/.changeset/bump-patch-1725994766358.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1725994766358.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/yarn.lock b/yarn.lock
index d89ba8bce628..a4da870cdb2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.6
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
-    "@rocket.chat/ui-kit": 0.36.1-rc.0
-    "@rocket.chat/ui-video-conf": 10.0.0-rc.6
+    "@rocket.chat/ui-avatar": 6.0.0
+    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-kit": 0.36.1
+    "@rocket.chat/ui-video-conf": 10.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0-rc.6
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-client": 10.0.0
+    "@rocket.chat/ui-contexts": 10.0.0
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0-rc.6
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-avatar": 6.0.0
+    "@rocket.chat/ui-contexts": 10.0.0
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0-rc.6
+    "@rocket.chat/ui-contexts": 10.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 6730a3c9117fbb196ba36d5f1e10c752bd882112 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 10 Sep 2024 21:19:10 -0300
Subject: [PATCH 062/170] chore: fix ui-playground build (#33250)

---
 packages/password-policies/tsconfig.json | 3 +--
 packages/uikit-playground/vite.config.ts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/password-policies/tsconfig.json b/packages/password-policies/tsconfig.json
index f0a66c843c50..e2be47cf5499 100644
--- a/packages/password-policies/tsconfig.json
+++ b/packages/password-policies/tsconfig.json
@@ -2,8 +2,7 @@
 	"extends": "../../tsconfig.base.client.json",
 	"compilerOptions": {
 		"rootDir": "./src",
-		"outDir": "./dist",
-		"module": "commonjs"
+		"outDir": "./dist"
 	},
 	"include": ["./src/**/*"]
 }
diff --git a/packages/uikit-playground/vite.config.ts b/packages/uikit-playground/vite.config.ts
index a18e01b590e8..61a5ab30e647 100644
--- a/packages/uikit-playground/vite.config.ts
+++ b/packages/uikit-playground/vite.config.ts
@@ -3,7 +3,7 @@ import react from '@vitejs/plugin-react';
 
 // https://vitejs.dev/config/
 export default defineConfig(() => ({
-  logLevel: 'info',
+  base: './',
   esbuild: {},
   plugins: [react()],
   optimizeDeps: {

From 79c16d315a40b3acb5135d2a334da6ab410703a3 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:20:42 -0300
Subject: [PATCH 063/170] fix: message parser being slow to process very long
 messages with too many symbols (#33227)

---
 .changeset/short-drinks-itch.md               |   6 +
 packages/message-parser/src/grammar.pegjs     | 126 ++++----
 packages/message-parser/src/utils.ts          |  36 ++-
 packages/message-parser/tests/abuse.test.ts   | 268 ++++++++++++++++++
 .../message-parser/tests/emphasis.test.ts     |  62 ++++
 packages/message-parser/tests/link.test.ts    |  24 ++
 6 files changed, 453 insertions(+), 69 deletions(-)
 create mode 100644 .changeset/short-drinks-itch.md
 create mode 100644 packages/message-parser/tests/abuse.test.ts

diff --git a/.changeset/short-drinks-itch.md b/.changeset/short-drinks-itch.md
new file mode 100644
index 000000000000..ee57330ffc86
--- /dev/null
+++ b/.changeset/short-drinks-itch.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/message-parser': patch
+'@rocket.chat/peggy-loader': patch
+---
+
+Improved the performance of the message parser
diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs
index 182653a9c664..a6cae97facbf 100644
--- a/packages/message-parser/src/grammar.pegjs
+++ b/packages/message-parser/src/grammar.pegjs
@@ -10,6 +10,7 @@
     emoji,
     emojiUnicode,
     emoticon,
+    extractFirstResult,
     heading,
     image,
     inlineCode,
@@ -33,6 +34,11 @@
     unorderedList,
     timestamp,
   } = require('./utils');
+
+let skipBold = false;
+let skipItalic = false;
+let skipStrikethrough = false;
+let skipReferences = false;
 }}
 
 Start
@@ -212,7 +218,7 @@ Inline = value:(InlineItem / Any)+ EndOfLine? { return reducePlainTexts(value);
 
 InlineItem = Whitespace
   / Timestamp
-  / References
+  / MaybeReferences
   / AutolinkedPhone
   / AutolinkedEmail
   / AutolinkedURL
@@ -240,7 +246,7 @@ References
   = "[" title:LinkTitle* "](" href:LinkRef ")" { return title.length ? link(href, reducePlainTexts(title)) : link(href); }
   / "<" href:LinkRef "|" title:LinkTitle2 ">" { return link(href, [plain(title)]); }
 
-LinkTitle = (Whitespace / EmphasisForReferences) / anyTitle:$(!("](" .) .) { return plain(anyTitle) }
+LinkTitle = (Whitespace / Emphasis) / anyTitle:$(!("](" .) .) { return plain(anyTitle) }
 
 LinkTitle2 = $([\x20-\x3B\x3D\x3F-\x60\x61-\x7B\x7D-\xFF] / NonASCII)+
 
@@ -349,14 +355,7 @@ AutoLinkURLBody =  !(Extra* (Whitespace / EndOfLine)) .
  * Emphasis
  *
 */
-Emphasis = Bold / Italic / Strikethrough
-
-/**
- *
- * Emphasis for References
- *
-*/
-EmphasisForReferences = BoldForReferences / ItalicForReferences / StrikethroughForReferences
+Emphasis = MaybeBold / MaybeItalic / MaybeStrikethrough
 
 /**
  *
@@ -365,6 +364,63 @@ EmphasisForReferences = BoldForReferences / ItalicForReferences / StrikethroughF
  *
  */
 
+// This rule is used inside expressions that have a JS code ensuring they always fail,
+// Without any pattern to match, peggy will think the rule may end up succedding without consuming any input, which could cause infinite loops
+// So this unreachable rule is added to them to satisfy peggy's requirement.
+BlockedByJavascript = 'unreachable'
+
+MaybeBold
+  = result:(
+    & {
+      if (skipBold) { return false; }
+      skipBold = true;
+      return true;
+    }
+    (
+      (text:Bold { skipBold = false; return text; })
+      / (& { skipBold = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
+MaybeStrikethrough
+  = result:(
+    & {
+      if (skipStrikethrough) { return false; }
+      skipStrikethrough = true;
+      return true;
+    }
+    (
+      (text:Strikethrough { skipStrikethrough = false; return text; })
+      / (& { skipStrikethrough = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
+MaybeItalic
+  = result:(
+    & {
+      if (skipItalic) { return false; }
+      skipItalic = true;
+      return true;
+    }
+    (
+      (text:Italic { skipItalic = false; return text; })
+      / (& { skipItalic = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
+MaybeReferences
+  = result:(
+    & {
+      if (skipReferences) { return false; }
+      skipReferences = true;
+      return true;
+    }
+    (
+      (text:References { skipReferences = false; return text; })
+      / (& { skipReferences = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
 /* Italic */
 Italic
    = value:$([a-zA-Z0-9]+ [\x5F] [\x5F]?) { return plain(value); }
@@ -384,11 +440,11 @@ ItalicContentItems = text:ItalicContentItem+ { return reducePlainTexts(text); }
 ItalicContentItem
   = Whitespace
   / InlineCode
-  / References
+  / MaybeReferences
   / UserMention
   / ChannelMention
-  / Bold
-  / Strikethrough
+  / MaybeBold
+  / MaybeStrikethrough
   / Emoji
   / Emoticon
   / AnyItalic
@@ -399,52 +455,12 @@ Bold = [\x2A] [\x2A] @BoldContent [\x2A] [\x2A] / [\x2A] @BoldContent [\x2A]
 
 BoldContent = text:BoldContentItem+ { return bold(reducePlainTexts(text)); }
 
-BoldContentItem = Whitespace / InlineCode / References / UserMention / ChannelMention / Italic / Strikethrough / Emoji / Emoticon / AnyBold / Line
+BoldContentItem = Whitespace / InlineCode / MaybeReferences / UserMention / ChannelMention / MaybeItalic / MaybeStrikethrough / Emoji / Emoticon / AnyBold / Line
 
 /* Strike */
 Strikethrough = [\x7E] [\x7E] @StrikethroughContent [\x7E] [\x7E] / [\x7E] @StrikethroughContent [\x7E]
 
-StrikethroughContent = text:(Timestamp / InlineCode / Whitespace / References / UserMention / ChannelMention / Italic / Bold / Emoji / Emoticon / AnyStrike / Line)+ {
-      return strike(reducePlainTexts(text));
-    }
-
-/* Italic for References */
-ItalicForReferences
-   = value:$([a-zA-Z0-9]+ [\x5F] [\x5F]?) { return plain(value); }
-  / [\x5F] [\x5F] i:ItalicContentItemsForReferences [\x5F] [\x5F] t:$[a-zA-Z0-9]+ {
-      return reducePlainTexts([plain('__'), ...i, plain('__'), plain(t)])[0];
-    }
-  / [\x5F] i:ItalicContentItemsForReferences [\x5F] t:$[a-zA-Z]+ {
-      return reducePlainTexts([plain('_'), ...i, plain('_'), plain(t)])[0];
-    }
-  / [\x5F] [\x5F] @ItalicContentForReferences [\x5F] [\x5F]
-  / [\x5F] @ItalicContentForReferences [\x5F]
-
-ItalicContentForReferences = text:ItalicContentItemsForReferences { return italic(text); }
-
-ItalicContentItemsForReferences = text:ItalicContentItemForReferences+ { return reducePlainTexts(text); }
-
-ItalicContentItemForReferences
-  = Whitespace
-  / UserMention
-  / ChannelMention
-  / BoldForReferences
-  / StrikethroughForReferences
-  / Emoji
-  / Emoticon
-  / AnyItalic
-  / Line
-  / InlineCode
-
-/* Bold for References */
-BoldForReferences = [\x2A] [\x2A] @BoldContentForReferences [\x2A] [\x2A] / [\x2A] @BoldContentForReferences [\x2A]
-
-BoldContentForReferences = text:(Whitespace / UserMention / ChannelMention / ItalicForReferences / StrikethroughForReferences / Emoji / Emoticon / AnyBold / Line / InlineCode)+ { return bold(reducePlainTexts(text)); }
-
-/* Strike for References */
-StrikethroughForReferences = [\x7E] [\x7E] @StrikethroughContentForReferences [\x7E] [\x7E] / [\x7E] @StrikethroughContentForReferences [\x7E]
-
-StrikethroughContentForReferences = text:(Whitespace / UserMention / ChannelMention / ItalicForReferences / BoldForReferences / Emoji / Emoticon / AnyStrike / Line / InlineCode)+ {
+StrikethroughContent = text:(Timestamp / Whitespace / InlineCode / MaybeReferences / UserMention / ChannelMention / MaybeItalic / MaybeBold / Emoji / Emoticon / AnyStrike / Line)+ {
       return strike(reducePlainTexts(text));
     }
 
diff --git a/packages/message-parser/src/utils.ts b/packages/message-parser/src/utils.ts
index 1f684b56d6ed..6c5d605c5c7a 100644
--- a/packages/message-parser/src/utils.ts
+++ b/packages/message-parser/src/utils.ts
@@ -198,21 +198,19 @@ const joinEmoji = (
 export const reducePlainTexts = (
   values: Paragraph['value']
 ): Paragraph['value'] =>
-  values
-    .flatMap((item) => item)
-    .reduce((result, item, index, values) => {
-      const next = values[index + 1];
-      const current = joinEmoji(item, values[index - 1], next);
-      const previous: Inlines = result[result.length - 1];
-
-      if (previous) {
-        if (current.type === 'PLAIN_TEXT' && current.type === previous.type) {
-          previous.value += current.value;
-          return result;
-        }
+  values.flat().reduce((result, item, index, values) => {
+    const next = values[index + 1];
+    const current = joinEmoji(item, values[index - 1], next);
+    const previous: Inlines = result[result.length - 1];
+
+    if (previous) {
+      if (current.type === 'PLAIN_TEXT' && current.type === previous.type) {
+        previous.value += current.value;
+        return result;
       }
-      return [...result, current];
-    }, [] as Paragraph['value']);
+    }
+    return [...result, current];
+  }, [] as Paragraph['value']);
 export const lineBreak = (): LineBreak => ({
   type: 'LINE_BREAK',
   value: undefined,
@@ -249,3 +247,13 @@ export const timestamp = (
     fallback: plain(`<t:${value}:${type || 't'}>`),
   };
 };
+
+export const extractFirstResult = (
+  value: Types[keyof Types]['value']
+): Types[keyof Types]['value'] => {
+  if (typeof value !== 'object' || !Array.isArray(value)) {
+    return value;
+  }
+
+  return value.filter((item) => item).shift() as Types[keyof Types]['value'];
+};
diff --git a/packages/message-parser/tests/abuse.test.ts b/packages/message-parser/tests/abuse.test.ts
new file mode 100644
index 000000000000..c280ee75b4a0
--- /dev/null
+++ b/packages/message-parser/tests/abuse.test.ts
@@ -0,0 +1,268 @@
+import { parse } from '../src';
+import { paragraph, plain, bold, italic, strike } from '../src/utils';
+
+test.each([
+  [
+    `This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. , REPEATx2 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEAT x3 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEAT x4 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEATx 5 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. , REPEAT x6 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. this can go long for some time, repeat x7 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. ,repeat x8 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some.`,
+    [
+      paragraph([
+        plain(
+          'This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&'
+        ),
+        bold([
+          plain('()'),
+          italic([
+            plain(
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+            ),
+            strike([
+              plain(
+                `, from now on we repeat some. , REPEATx2 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+              ),
+            ]),
+            plain(
+              ', from now on we repeat some. REPEAT x3 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()'
+            ),
+          ]),
+          plain(
+            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+          ),
+          strike([
+            plain(
+              ', from now on we repeat some. REPEAT x4 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()'
+            ),
+            italic([
+              plain(
+                `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEATx 5 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+              ),
+            ]),
+            plain(
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+            ),
+          ]),
+          plain(
+            `, from now on we repeat some. , REPEAT x6 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&`
+          ),
+        ]),
+        plain(
+          `()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+        ),
+        strike([
+          plain(
+            `, from now on we repeat some. this can go long for some time, repeat x7 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+          ),
+          italic([
+            plain(
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. ,repeat x8 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+            ),
+          ]),
+          plain(
+            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+          ),
+        ]),
+        plain(', from now on we repeat some.'),
+      ]),
+    ],
+  ],
+  [
+    '**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__',
+    [
+      paragraph([
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        plain('__'),
+      ]),
+    ],
+  ],
+])('parses %p', (input, output) => {
+  expect(parse(input)).toMatchObject(output);
+});
diff --git a/packages/message-parser/tests/emphasis.test.ts b/packages/message-parser/tests/emphasis.test.ts
index e8e72a5882f1..b035999204ce 100644
--- a/packages/message-parser/tests/emphasis.test.ts
+++ b/packages/message-parser/tests/emphasis.test.ts
@@ -185,6 +185,68 @@ test.each([
       ]),
     ],
   ],
+  [
+    '**bold ~~and strike~~** **not bold ~~but strike** ~~ not strike~~',
+    [
+      paragraph([
+        bold([plain('bold '), strike([plain('and strike')])]),
+        plain(' **not bold '),
+        strike([plain('but strike** ')]),
+        plain(' not strike~~'),
+      ]),
+    ],
+  ],
+  [
+    '**bold** **another bold** ~~strike~~ ~~another strike~~ **bold ~~and strike~~** **not bold ~~but strike** ~~ not strike~~',
+    [
+      paragraph([
+        bold([plain('bold')]),
+        plain(' '),
+        bold([plain('another bold')]),
+        plain(' '),
+        strike([plain('strike')]),
+        plain(' '),
+        strike([plain('another strike')]),
+        plain(' '),
+        bold([plain('bold '), strike([plain('and strike')])]),
+        plain(' **not bold '),
+        strike([plain('but strike** ')]),
+        plain(' not strike~~'),
+      ]),
+    ],
+  ],
+  [
+    'some_snake_case_text and even_more',
+    [paragraph([plain('some_snake_case_text and even_more')])],
+  ],
+  [
+    'some_snake_case_text and some __italic__ text',
+    [
+      paragraph([
+        plain('some_snake_case_text and some '),
+        italic([plain('italic')]),
+        plain(' text'),
+      ]),
+    ],
+  ],
+  [
+    'some__double__snake__case__text and even_more',
+    [paragraph([plain('some__double__snake__case__text and even_more')])],
+  ],
+  [
+    'some__double__snake__case__text and some __italic__ text',
+    [
+      paragraph([
+        plain('some__double__snake__case__text and some '),
+        italic([plain('italic')]),
+        plain(' text'),
+      ]),
+    ],
+  ],
+  [
+    'something__ __and italic__',
+    [paragraph([plain('something__ '), italic([plain('and italic')])])],
+  ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });
diff --git a/packages/message-parser/tests/link.test.ts b/packages/message-parser/tests/link.test.ts
index 1e083fde5d70..fcf371474bf2 100644
--- a/packages/message-parser/tests/link.test.ts
+++ b/packages/message-parser/tests/link.test.ts
@@ -584,6 +584,30 @@ Text after line break`,
       ]),
     ],
   ],
+  [
+    '[test **bold** and __italic__](https://rocket.chat)',
+    [
+      paragraph([
+        link('https://rocket.chat', [
+          plain('test '),
+          bold([plain('bold')]),
+          plain(' and '),
+          italic([plain('italic')]),
+        ]),
+      ]),
+    ],
+  ],
+  [
+    '[test **bold with __italic__**](https://rocket.chat)',
+    [
+      paragraph([
+        link('https://rocket.chat', [
+          plain('test '),
+          bold([plain('bold with '), italic([plain('italic')])]),
+        ]),
+      ]),
+    ],
+  ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });

From 249761607fc852dc32810d4ae965bc3a6aa714e9 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Wed, 11 Sep 2024 10:28:01 -0300
Subject: [PATCH 064/170] chore: E2EE setting warning update (#33224)

---
 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 e6867528ad4c..849582f934b7 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1800,7 +1800,7 @@
   "Markdown_SupportSchemesForLink_Description": "Comma-separated list of allowed schemes",
   "E2E_enable": "Enable E2E",
   "E2E_disable": "Disable E2E",
-  "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- The mobile apps may not support the encrypted messages (they are implementing it).<br/>- Bots may not be able to see encrypted messages until they implement support for it.<br/>- Uploads will not be encrypted in this version.",
+  "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- Bots may not be able to see encrypted messages until they implement support for it.",
   "E2E_Enable_description": "Enable option to create encrypted groups and be able to change groups and direct messages to be encrypted",
   "E2E_Enabled": "E2E Enabled",
   "E2E_Enabled_Default_DirectRooms": "Enable encryption for Direct Rooms by default",

From cbea8d492e03db406fdd32f40fb0c49843873567 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 11 Sep 2024 12:08:40 -0300
Subject: [PATCH 065/170] chore: move playground (#33260)

---
 {packages => apps}/uikit-playground/.eslintignore             | 0
 {packages => apps}/uikit-playground/.eslintrc.cjs             | 0
 {packages => apps}/uikit-playground/.gitignore                | 0
 {packages => apps}/uikit-playground/.prettierrc               | 0
 {packages => apps}/uikit-playground/CHANGELOG.md              | 0
 {packages => apps}/uikit-playground/index.html                | 0
 {packages => apps}/uikit-playground/package.json              | 0
 {packages => apps}/uikit-playground/postcss.config.js         | 0
 {packages => apps}/uikit-playground/public/vite.svg           | 0
 {packages => apps}/uikit-playground/src/App.css               | 0
 {packages => apps}/uikit-playground/src/App.tsx               | 0
 .../src/Components/CodeEditor/BlockEditor.tsx                 | 0
 .../src/Components/CodeEditor/Extensions/Extensions.ts        | 0
 .../src/Components/CodeEditor/Extensions/HighlightStyle.ts    | 0
 .../src/Components/CodeEditor/Extensions/basicSetup.ts        | 0
 .../src/Components/CodeEditor/Extensions/index.ts             | 0
 .../src/Components/CodeEditor/Extensions/jsonLinter.ts        | 0
 .../src/Components/CodeEditor/Extensions/payloadLinter.ts     | 0
 .../src/Components/CodeEditor/Extensions/theme.ts             | 0
 .../src/Components/CodeEditor/Parser/index.ts                 | 0
 .../src/Components/CodeEditor/Parser/parsePayload.ts          | 0
 .../src/Components/CodeEditor/PreviewEditor.tsx               | 0
 .../uikit-playground/src/Components/CodeEditor/index.tsx      | 0
 .../src/Components/ComponentSideBar/ScrollableSideBar.tsx     | 0
 .../src/Components/ComponentSideBar/SideBar.tsx               | 0
 .../src/Components/ComponentSideBar/SliderBtn.tsx             | 0
 .../src/Components/ComponentSideBar/index.tsx                 | 0
 .../Components/CreateNewScreen/CreateNewScreenContainer.tsx   | 0
 .../src/Components/CreateNewScreen/ScreenThumbnail.tsx        | 0
 .../uikit-playground/src/Components/CreateNewScreen/index.ts  | 0
 .../src/Components/Draggable/DraggableList.tsx                | 0
 .../src/Components/Draggable/DraggableListItem.tsx            | 0
 .../uikit-playground/src/Components/DropDown/DropDown.tsx     | 0
 .../uikit-playground/src/Components/DropDown/Items.tsx        | 0
 .../uikit-playground/src/Components/DropDown/ItemsIcon.tsx    | 0
 .../uikit-playground/src/Components/DropDown/index.tsx        | 0
 .../uikit-playground/src/Components/DropDown/itemsStyle.ts    | 0
 .../uikit-playground/src/Components/DropDown/types.ts         | 0
 .../src/Components/FlowContainer/ConnectionLine.tsx           | 0
 .../FlowContainer/ControlButtons/ControlButtons.tsx           | 0
 .../src/Components/FlowContainer/ControlButtons/index.ts      | 0
 .../src/Components/FlowContainer/FlowContainer.tsx            | 0
 .../Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss   | 0
 .../Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx    | 0
 .../src/Components/FlowContainer/UIKitWrapper/index.ts        | 0
 .../uikit-playground/src/Components/FlowContainer/index.ts    | 0
 .../uikit-playground/src/Components/FlowContainer/utils.ts    | 0
 .../src/Components/HomeContainer/HomeContainer.tsx            | 0
 .../Components/HomeContainer/ProjectsList/ProjectsList.tsx    | 0
 .../HomeContainer/ProjectsList/ProjectsThumbnail.tsx          | 0
 .../src/Components/HomeContainer/ProjectsList/index.ts        | 0
 .../uikit-playground/src/Components/HomeContainer/index.ts    | 0
 .../src/Components/NavBar/BurgerIcon/BurgerIcon.tsx           | 0
 .../src/Components/NavBar/BurgerIcon/Line.tsx                 | 0
 .../src/Components/NavBar/BurgerIcon/Wrapper.tsx              | 0
 .../src/Components/NavBar/BurgerIcon/index.tsx                | 0
 .../uikit-playground/src/Components/NavBar/Divider.tsx        | 0
 .../uikit-playground/src/Components/NavBar/Logo.tsx           | 0
 .../uikit-playground/src/Components/NavBar/NavBar.tsx         | 0
 .../uikit-playground/src/Components/NavBar/RightNavBtn.tsx    | 0
 .../uikit-playground/src/Components/NavBar/index.tsx          | 0
 .../src/Components/PersistStore/PersistStore.tsx              | 0
 .../uikit-playground/src/Components/PersistStore/index.ts     | 0
 .../src/Components/Preview/Display/Display.tsx                | 0
 .../src/Components/Preview/Display/Surface/BannerSurface.tsx  | 0
 .../Preview/Display/Surface/ContextualBarSurface.tsx          | 0
 .../src/Components/Preview/Display/Surface/MessageSurface.tsx | 0
 .../src/Components/Preview/Display/Surface/ModalSurface.tsx   | 0
 .../src/Components/Preview/Display/Surface/Reorder.ts         | 0
 .../src/Components/Preview/Display/Surface/Surface.tsx        | 0
 .../src/Components/Preview/Display/Surface/SurfaceRender.tsx  | 0
 .../src/Components/Preview/Display/Surface/constant.ts        | 0
 .../src/Components/Preview/Display/Surface/index.ts           | 0
 .../Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx  | 0
 .../Display/UiKitElementWrapper/UiKitElementWrapper.scss      | 0
 .../Display/UiKitElementWrapper/UiKitElementWrapper.tsx       | 0
 .../Components/Preview/Display/UiKitElementWrapper/index.ts   | 0
 .../uikit-playground/src/Components/Preview/Display/index.ts  | 0
 .../src/Components/Preview/Editor/ActionBlockEditor.tsx       | 0
 .../src/Components/Preview/Editor/ActionPreviewEditor.tsx     | 0
 .../src/Components/Preview/Editor/EditorPanel.tsx             | 0
 .../uikit-playground/src/Components/Preview/Editor/index.tsx  | 0
 .../src/Components/Preview/NavPanel/NavPanel.tsx              | 0
 .../src/Components/Preview/NavPanel/index.tsx                 | 0
 .../uikit-playground/src/Components/Preview/Preview.tsx       | 0
 .../Preview/SplitPlaneContainer/SplitPlaneContainer.tsx       | 0
 .../src/Components/Preview/SplitPlaneContainer/index.ts       | 0
 .../src/Components/Preview/SplitPlaneContainer/splitPlane.css | 0
 .../uikit-playground/src/Components/Preview/Wrapper.tsx       | 0
 .../uikit-playground/src/Components/Preview/index.tsx         | 0
 .../src/Components/PrototypeRender/PrototypeRender.scss       | 0
 .../src/Components/PrototypeRender/PrototypeRender.tsx        | 0
 .../uikit-playground/src/Components/PrototypeRender/index.ts  | 0
 .../src/Components/PtototypeContainer/PrototypeContainer.tsx  | 0
 .../src/Components/PtototypeContainer/index.ts                | 0
 .../src/Components/RenderPayload/RenderPayload.tsx            | 0
 .../uikit-playground/src/Components/RenderPayload/intex.ts    | 0
 .../uikit-playground/src/Components/Routes/HomeLayout.tsx     | 0
 .../src/Components/Routes/ProjectSpecificLayout.tsx           | 0
 .../src/Components/Routes/ProtectedLayout.tsx                 | 0
 .../src/Components/ScreenThumbnail/CreateNewScreenButton.tsx  | 0
 .../src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx      | 0
 .../src/Components/ScreenThumbnail/EditMenu/index.ts          | 0
 .../ScreenThumbnail/EditableLabel/EditableLabel.tsx           | 0
 .../ScreenThumbnail/EditableLabel/Editablelabel.scss          | 0
 .../src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx | 0
 .../src/Components/ScreenThumbnail/Thumbnail.scss             | 0
 .../src/Components/ScreenThumbnail/Thumbnail.tsx              | 0
 .../src/Components/SurfaceSelect/SurfaceSelect.tsx            | 0
 .../uikit-playground/src/Components/SurfaceSelect/index.ts    | 0
 .../uikit-playground/src/Components/SurfaceSelect/options.ts  | 0
 .../src/Components/Templates/Container/Container.tsx          | 0
 .../src/Components/Templates/Container/Payload.tsx            | 0
 .../src/Components/Templates/Container/Section.tsx            | 0
 .../src/Components/Templates/Container/index.ts               | 0
 .../uikit-playground/src/Components/Templates/Templates.tsx   | 0
 .../uikit-playground/src/Components/Templates/index.ts        | 0
 .../uikit-playground/src/Components/ToggleTabs/index.tsx      | 0
 .../uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx | 0
 .../uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx  | 0
 .../uikit-playground/src/Components/navMenu/Menu/index.tsx    | 0
 .../uikit-playground/src/Components/navMenu/NavMenu.tsx       | 0
 .../uikit-playground/src/Components/navMenu/index.ts          | 0
 .../src/Context/action/actionPreviewAction.ts                 | 0
 .../src/Context/action/activeProjectAction.ts                 | 0
 .../uikit-playground/src/Context/action/activeScreenAction.ts | 0
 .../src/Context/action/createNewProjectAction.ts              | 0
 .../src/Context/action/createNewScreenAction.ts               | 0
 .../src/Context/action/deleteProjectAction.ts                 | 0
 .../uikit-playground/src/Context/action/deleteScreenAction.ts | 0
 .../src/Context/action/duplicateProjectAction.ts              | 0
 .../src/Context/action/duplicateScreenAction.ts               | 0
 .../src/Context/action/editorTabsToggleAction.ts              | 0
 .../uikit-playground/src/Context/action/index.ts              | 0
 .../uikit-playground/src/Context/action/isMobileAction.ts     | 0
 .../uikit-playground/src/Context/action/isTabletAction.ts     | 0
 .../src/Context/action/navMenuToggleAction.ts                 | 0
 .../src/Context/action/openCreateNewScreenAction.ts           | 0
 .../src/Context/action/previewTabsToggleAction.ts             | 0
 .../src/Context/action/renameProjectAction.ts                 | 0
 .../uikit-playground/src/Context/action/renameScreenAction.ts | 0
 .../src/Context/action/sidebarToggleAction.ts                 | 0
 .../uikit-playground/src/Context/action/surfaceAction.ts      | 0
 .../uikit-playground/src/Context/action/tabsToggleAction.ts   | 0
 .../src/Context/action/templatesToggleAction.ts               | 0
 .../src/Context/action/updateFlowEdgesAction.ts               | 0
 .../src/Context/action/updateNodesAndViewPortAction.ts        | 0
 .../src/Context/action/updatePayloadAction.ts                 | 0
 .../uikit-playground/src/Context/action/userAction.ts         | 0
 {packages => apps}/uikit-playground/src/Context/createCtx.tsx | 0
 {packages => apps}/uikit-playground/src/Context/index.tsx     | 0
 .../uikit-playground/src/Context/initialState.ts              | 0
 {packages => apps}/uikit-playground/src/Context/reducer.ts    | 0
 {packages => apps}/uikit-playground/src/Pages/FlowDiagram.tsx | 0
 {packages => apps}/uikit-playground/src/Pages/Home.tsx        | 0
 {packages => apps}/uikit-playground/src/Pages/Playground.tsx  | 0
 {packages => apps}/uikit-playground/src/Pages/Prototype.tsx   | 0
 .../uikit-playground/src/Pages/SignInSignUp.tsx               | 0
 .../uikit-playground/src/Payload/action/checkbox.ts           | 0
 .../uikit-playground/src/Payload/action/radioButton.ts        | 0
 .../uikit-playground/src/Payload/action/timePicker.ts         | 0
 .../uikit-playground/src/Payload/action/toggleSwitch.ts       | 0
 .../uikit-playground/src/Payload/actionBlock/BlocksTree.ts    | 0
 .../uikit-playground/src/Payload/actionBlock/action/button.ts | 0
 .../src/Payload/actionBlock/action/datePicker.ts              | 0
 .../uikit-playground/src/Payload/actionBlock/action/image.ts  | 0
 .../uikit-playground/src/Payload/actionBlock/action/index.ts  | 0
 .../uikit-playground/src/Payload/actionBlock/action/input.ts  | 0
 .../src/Payload/actionBlock/action/linearScale.ts             | 0
 .../uikit-playground/src/Payload/actionBlock/action/menu.ts   | 0
 .../src/Payload/actionBlock/action/staticSelect.ts            | 0
 .../uikit-playground/src/Payload/actionBlock/context/index.ts | 0
 .../uikit-playground/src/Payload/actionBlock/divider/index.ts | 0
 .../uikit-playground/src/Payload/actionBlock/image/index.ts   | 0
 .../src/Payload/actionBlock/input/datePicker.ts               | 0
 .../uikit-playground/src/Payload/actionBlock/input/index.ts   | 0
 .../uikit-playground/src/Payload/actionBlock/input/input.ts   | 0
 .../src/Payload/actionBlock/input/linearScale.ts              | 0
 .../src/Payload/actionBlock/input/staticSelect.ts             | 0
 .../uikit-playground/src/Payload/actionBlock/preview/index.ts | 0
 .../src/Payload/actionBlock/section/button.ts                 | 0
 .../src/Payload/actionBlock/section/datePicker.ts             | 0
 .../uikit-playground/src/Payload/actionBlock/section/image.ts | 0
 .../uikit-playground/src/Payload/actionBlock/section/index.ts | 0
 .../uikit-playground/src/Payload/actionBlock/section/menu.ts  | 0
 .../uikit-playground/src/Payload/actionBlock/section/text.ts  | 0
 .../uikit-playground/src/Payload/actionPreview/container.ts   | 0
 .../src/Payload/actionPreview/generateActionPreview.ts        | 0
 .../uikit-playground/src/Payload/callout/index.ts             | 0
 {packages => apps}/uikit-playground/src/Payload/index.ts      | 0
 .../uikit-playground/src/Payload/tabNavigation/disabled.ts    | 0
 .../uikit-playground/src/Payload/tabNavigation/index.ts       | 0
 .../uikit-playground/src/Payload/tabNavigation/plain.ts       | 0
 .../uikit-playground/src/Payload/tabNavigation/selected.ts    | 0
 {packages => apps}/uikit-playground/src/Routes/Routes.ts      | 0
 {packages => apps}/uikit-playground/src/_global.css           | 0
 {packages => apps}/uikit-playground/src/cssVariables.css      | 0
 {packages => apps}/uikit-playground/src/hooks/useAuth.tsx     | 0
 .../uikit-playground/src/hooks/useCodeMirror.ts               | 0
 .../uikit-playground/src/hooks/useFormatCodeMirrorValue.ts    | 0
 .../uikit-playground/src/hooks/useHorizontalScroll.ts         | 0
 .../uikit-playground/src/hooks/useNodesAndEdges.ts            | 0
 {packages => apps}/uikit-playground/src/index.css             | 0
 {packages => apps}/uikit-playground/src/logo.svg              | 0
 {packages => apps}/uikit-playground/src/main.tsx              | 0
 {packages => apps}/uikit-playground/src/module.d.ts           | 0
 {packages => apps}/uikit-playground/src/utils/codePrettier.ts | 0
 {packages => apps}/uikit-playground/src/utils/filterEdges.ts  | 0
 {packages => apps}/uikit-playground/src/utils/formatDate.ts   | 0
 {packages => apps}/uikit-playground/src/utils/getDate.ts      | 0
 {packages => apps}/uikit-playground/src/utils/getUniqueId.ts  | 0
 {packages => apps}/uikit-playground/src/utils/intendCode.ts   | 0
 {packages => apps}/uikit-playground/src/utils/persistStore.ts | 0
 {packages => apps}/uikit-playground/src/utils/templates.ts    | 0
 .../uikit-playground/src/utils/uiKitRenderer.ts               | 0
 {packages => apps}/uikit-playground/src/vite-env.d.ts         | 0
 {packages => apps}/uikit-playground/tsconfig.json             | 0
 {packages => apps}/uikit-playground/vite.config.ts            | 0
 yarn.lock                                                     | 4 ++--
 219 files changed, 2 insertions(+), 2 deletions(-)
 rename {packages => apps}/uikit-playground/.eslintignore (100%)
 rename {packages => apps}/uikit-playground/.eslintrc.cjs (100%)
 rename {packages => apps}/uikit-playground/.gitignore (100%)
 rename {packages => apps}/uikit-playground/.prettierrc (100%)
 rename {packages => apps}/uikit-playground/CHANGELOG.md (100%)
 rename {packages => apps}/uikit-playground/index.html (100%)
 rename {packages => apps}/uikit-playground/package.json (100%)
 rename {packages => apps}/uikit-playground/postcss.config.js (100%)
 rename {packages => apps}/uikit-playground/public/vite.svg (100%)
 rename {packages => apps}/uikit-playground/src/App.css (100%)
 rename {packages => apps}/uikit-playground/src/App.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Parser/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/CodeEditor/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ComponentSideBar/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/CreateNewScreen/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Draggable/DraggableList.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Draggable/DraggableListItem.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/DropDown/DropDown.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/DropDown/Items.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/DropDown/ItemsIcon.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/DropDown/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/DropDown/itemsStyle.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/DropDown/types.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/FlowContainer/utils.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/HomeContainer/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/Divider.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/Logo.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/NavBar.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/RightNavBtn.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/NavBar/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/PersistStore/PersistStore.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/PersistStore/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Display.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/constant.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/Surface/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Display/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Editor/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/NavPanel/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Preview.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/Wrapper.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Preview/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss (100%)
 rename {packages => apps}/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/PrototypeRender/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/PtototypeContainer/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/RenderPayload/intex.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Routes/HomeLayout.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Routes/ProtectedLayout.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss (100%)
 rename {packages => apps}/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/SurfaceSelect/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/SurfaceSelect/options.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Templates/Container/Container.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Templates/Container/Payload.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Templates/Container/Section.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Templates/Container/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/Templates/Templates.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/Templates/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Components/ToggleTabs/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/navMenu/Menu/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/navMenu/NavMenu.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Components/navMenu/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/actionPreviewAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/activeProjectAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/activeScreenAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/createNewProjectAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/createNewScreenAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/deleteProjectAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/deleteScreenAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/duplicateProjectAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/duplicateScreenAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/editorTabsToggleAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/isMobileAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/isTabletAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/navMenuToggleAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/openCreateNewScreenAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/previewTabsToggleAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/renameProjectAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/renameScreenAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/sidebarToggleAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/surfaceAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/tabsToggleAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/templatesToggleAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/updateFlowEdgesAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/updatePayloadAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/action/userAction.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/createCtx.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Context/index.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Context/initialState.ts (100%)
 rename {packages => apps}/uikit-playground/src/Context/reducer.ts (100%)
 rename {packages => apps}/uikit-playground/src/Pages/FlowDiagram.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Pages/Home.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Pages/Playground.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Pages/Prototype.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Pages/SignInSignUp.tsx (100%)
 rename {packages => apps}/uikit-playground/src/Payload/action/checkbox.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/action/radioButton.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/action/timePicker.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/action/toggleSwitch.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/BlocksTree.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/button.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/datePicker.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/image.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/input.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/linearScale.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/menu.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/context/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/divider/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/image/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/input/datePicker.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/input/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/input/input.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/input/linearScale.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/preview/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/section/button.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/section/datePicker.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/section/image.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/section/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/section/menu.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionBlock/section/text.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionPreview/container.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/callout/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/tabNavigation/disabled.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/tabNavigation/index.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/tabNavigation/plain.ts (100%)
 rename {packages => apps}/uikit-playground/src/Payload/tabNavigation/selected.ts (100%)
 rename {packages => apps}/uikit-playground/src/Routes/Routes.ts (100%)
 rename {packages => apps}/uikit-playground/src/_global.css (100%)
 rename {packages => apps}/uikit-playground/src/cssVariables.css (100%)
 rename {packages => apps}/uikit-playground/src/hooks/useAuth.tsx (100%)
 rename {packages => apps}/uikit-playground/src/hooks/useCodeMirror.ts (100%)
 rename {packages => apps}/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts (100%)
 rename {packages => apps}/uikit-playground/src/hooks/useHorizontalScroll.ts (100%)
 rename {packages => apps}/uikit-playground/src/hooks/useNodesAndEdges.ts (100%)
 rename {packages => apps}/uikit-playground/src/index.css (100%)
 rename {packages => apps}/uikit-playground/src/logo.svg (100%)
 rename {packages => apps}/uikit-playground/src/main.tsx (100%)
 rename {packages => apps}/uikit-playground/src/module.d.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/codePrettier.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/filterEdges.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/formatDate.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/getDate.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/getUniqueId.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/intendCode.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/persistStore.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/templates.ts (100%)
 rename {packages => apps}/uikit-playground/src/utils/uiKitRenderer.ts (100%)
 rename {packages => apps}/uikit-playground/src/vite-env.d.ts (100%)
 rename {packages => apps}/uikit-playground/tsconfig.json (100%)
 rename {packages => apps}/uikit-playground/vite.config.ts (100%)

diff --git a/packages/uikit-playground/.eslintignore b/apps/uikit-playground/.eslintignore
similarity index 100%
rename from packages/uikit-playground/.eslintignore
rename to apps/uikit-playground/.eslintignore
diff --git a/packages/uikit-playground/.eslintrc.cjs b/apps/uikit-playground/.eslintrc.cjs
similarity index 100%
rename from packages/uikit-playground/.eslintrc.cjs
rename to apps/uikit-playground/.eslintrc.cjs
diff --git a/packages/uikit-playground/.gitignore b/apps/uikit-playground/.gitignore
similarity index 100%
rename from packages/uikit-playground/.gitignore
rename to apps/uikit-playground/.gitignore
diff --git a/packages/uikit-playground/.prettierrc b/apps/uikit-playground/.prettierrc
similarity index 100%
rename from packages/uikit-playground/.prettierrc
rename to apps/uikit-playground/.prettierrc
diff --git a/packages/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
similarity index 100%
rename from packages/uikit-playground/CHANGELOG.md
rename to apps/uikit-playground/CHANGELOG.md
diff --git a/packages/uikit-playground/index.html b/apps/uikit-playground/index.html
similarity index 100%
rename from packages/uikit-playground/index.html
rename to apps/uikit-playground/index.html
diff --git a/packages/uikit-playground/package.json b/apps/uikit-playground/package.json
similarity index 100%
rename from packages/uikit-playground/package.json
rename to apps/uikit-playground/package.json
diff --git a/packages/uikit-playground/postcss.config.js b/apps/uikit-playground/postcss.config.js
similarity index 100%
rename from packages/uikit-playground/postcss.config.js
rename to apps/uikit-playground/postcss.config.js
diff --git a/packages/uikit-playground/public/vite.svg b/apps/uikit-playground/public/vite.svg
similarity index 100%
rename from packages/uikit-playground/public/vite.svg
rename to apps/uikit-playground/public/vite.svg
diff --git a/packages/uikit-playground/src/App.css b/apps/uikit-playground/src/App.css
similarity index 100%
rename from packages/uikit-playground/src/App.css
rename to apps/uikit-playground/src/App.css
diff --git a/packages/uikit-playground/src/App.tsx b/apps/uikit-playground/src/App.tsx
similarity index 100%
rename from packages/uikit-playground/src/App.tsx
rename to apps/uikit-playground/src/App.tsx
diff --git a/packages/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx b/apps/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx
rename to apps/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/index.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/index.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/index.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Parser/index.ts b/apps/uikit-playground/src/Components/CodeEditor/Parser/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Parser/index.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Parser/index.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts b/apps/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx b/apps/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx
rename to apps/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx
diff --git a/packages/uikit-playground/src/Components/CodeEditor/index.tsx b/apps/uikit-playground/src/Components/CodeEditor/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/index.tsx
rename to apps/uikit-playground/src/Components/CodeEditor/index.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/index.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/index.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/index.tsx
diff --git a/packages/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx b/apps/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx
rename to apps/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx
diff --git a/packages/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx b/apps/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx
rename to apps/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx
diff --git a/packages/uikit-playground/src/Components/CreateNewScreen/index.ts b/apps/uikit-playground/src/Components/CreateNewScreen/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CreateNewScreen/index.ts
rename to apps/uikit-playground/src/Components/CreateNewScreen/index.ts
diff --git a/packages/uikit-playground/src/Components/Draggable/DraggableList.tsx b/apps/uikit-playground/src/Components/Draggable/DraggableList.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Draggable/DraggableList.tsx
rename to apps/uikit-playground/src/Components/Draggable/DraggableList.tsx
diff --git a/packages/uikit-playground/src/Components/Draggable/DraggableListItem.tsx b/apps/uikit-playground/src/Components/Draggable/DraggableListItem.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Draggable/DraggableListItem.tsx
rename to apps/uikit-playground/src/Components/Draggable/DraggableListItem.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/DropDown.tsx b/apps/uikit-playground/src/Components/DropDown/DropDown.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/DropDown.tsx
rename to apps/uikit-playground/src/Components/DropDown/DropDown.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/Items.tsx b/apps/uikit-playground/src/Components/DropDown/Items.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/Items.tsx
rename to apps/uikit-playground/src/Components/DropDown/Items.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/ItemsIcon.tsx b/apps/uikit-playground/src/Components/DropDown/ItemsIcon.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/ItemsIcon.tsx
rename to apps/uikit-playground/src/Components/DropDown/ItemsIcon.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/index.tsx b/apps/uikit-playground/src/Components/DropDown/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/index.tsx
rename to apps/uikit-playground/src/Components/DropDown/index.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/itemsStyle.ts b/apps/uikit-playground/src/Components/DropDown/itemsStyle.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/itemsStyle.ts
rename to apps/uikit-playground/src/Components/DropDown/itemsStyle.ts
diff --git a/packages/uikit-playground/src/Components/DropDown/types.ts b/apps/uikit-playground/src/Components/DropDown/types.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/types.ts
rename to apps/uikit-playground/src/Components/DropDown/types.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx b/apps/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx b/apps/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts b/apps/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts
rename to apps/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx b/apps/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss b/apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss
rename to apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss
diff --git a/packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx b/apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts b/apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts
rename to apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/index.ts b/apps/uikit-playground/src/Components/FlowContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/index.ts
rename to apps/uikit-playground/src/Components/FlowContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/utils.ts b/apps/uikit-playground/src/Components/FlowContainer/utils.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/utils.ts
rename to apps/uikit-playground/src/Components/FlowContainer/utils.ts
diff --git a/packages/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx b/apps/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx
rename to apps/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx
diff --git a/packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx b/apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx
rename to apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx
diff --git a/packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx b/apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx
rename to apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx
diff --git a/packages/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts b/apps/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts
rename to apps/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts
diff --git a/packages/uikit-playground/src/Components/HomeContainer/index.ts b/apps/uikit-playground/src/Components/HomeContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/index.ts
rename to apps/uikit-playground/src/Components/HomeContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/Divider.tsx b/apps/uikit-playground/src/Components/NavBar/Divider.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/Divider.tsx
rename to apps/uikit-playground/src/Components/NavBar/Divider.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/Logo.tsx b/apps/uikit-playground/src/Components/NavBar/Logo.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/Logo.tsx
rename to apps/uikit-playground/src/Components/NavBar/Logo.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/NavBar.tsx b/apps/uikit-playground/src/Components/NavBar/NavBar.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/NavBar.tsx
rename to apps/uikit-playground/src/Components/NavBar/NavBar.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/RightNavBtn.tsx b/apps/uikit-playground/src/Components/NavBar/RightNavBtn.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/RightNavBtn.tsx
rename to apps/uikit-playground/src/Components/NavBar/RightNavBtn.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/index.tsx b/apps/uikit-playground/src/Components/NavBar/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/index.tsx
rename to apps/uikit-playground/src/Components/NavBar/index.tsx
diff --git a/packages/uikit-playground/src/Components/PersistStore/PersistStore.tsx b/apps/uikit-playground/src/Components/PersistStore/PersistStore.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/PersistStore/PersistStore.tsx
rename to apps/uikit-playground/src/Components/PersistStore/PersistStore.tsx
diff --git a/packages/uikit-playground/src/Components/PersistStore/index.ts b/apps/uikit-playground/src/Components/PersistStore/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/PersistStore/index.ts
rename to apps/uikit-playground/src/Components/PersistStore/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Display.tsx b/apps/uikit-playground/src/Components/Preview/Display/Display.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Display.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Display.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts b/apps/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/constant.ts b/apps/uikit-playground/src/Components/Preview/Display/Surface/constant.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/constant.ts
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/constant.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/index.ts b/apps/uikit-playground/src/Components/Preview/Display/Surface/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/index.ts
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/index.ts b/apps/uikit-playground/src/Components/Preview/Display/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/index.ts
rename to apps/uikit-playground/src/Components/Preview/Display/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx b/apps/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx b/apps/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx b/apps/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/index.tsx b/apps/uikit-playground/src/Components/Preview/Editor/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/index.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/index.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx b/apps/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx
rename to apps/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/NavPanel/index.tsx b/apps/uikit-playground/src/Components/Preview/NavPanel/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/NavPanel/index.tsx
rename to apps/uikit-playground/src/Components/Preview/NavPanel/index.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Preview.tsx b/apps/uikit-playground/src/Components/Preview/Preview.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Preview.tsx
rename to apps/uikit-playground/src/Components/Preview/Preview.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx b/apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx
rename to apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts b/apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts
rename to apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css b/apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css
rename to apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css
diff --git a/packages/uikit-playground/src/Components/Preview/Wrapper.tsx b/apps/uikit-playground/src/Components/Preview/Wrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Wrapper.tsx
rename to apps/uikit-playground/src/Components/Preview/Wrapper.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/index.tsx b/apps/uikit-playground/src/Components/Preview/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/index.tsx
rename to apps/uikit-playground/src/Components/Preview/index.tsx
diff --git a/packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss b/apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss
rename to apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss
diff --git a/packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx b/apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx
rename to apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx
diff --git a/packages/uikit-playground/src/Components/PrototypeRender/index.ts b/apps/uikit-playground/src/Components/PrototypeRender/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/PrototypeRender/index.ts
rename to apps/uikit-playground/src/Components/PrototypeRender/index.ts
diff --git a/packages/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx b/apps/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx
rename to apps/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx
diff --git a/packages/uikit-playground/src/Components/PtototypeContainer/index.ts b/apps/uikit-playground/src/Components/PtototypeContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/PtototypeContainer/index.ts
rename to apps/uikit-playground/src/Components/PtototypeContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx b/apps/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx
rename to apps/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx
diff --git a/packages/uikit-playground/src/Components/RenderPayload/intex.ts b/apps/uikit-playground/src/Components/RenderPayload/intex.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/RenderPayload/intex.ts
rename to apps/uikit-playground/src/Components/RenderPayload/intex.ts
diff --git a/packages/uikit-playground/src/Components/Routes/HomeLayout.tsx b/apps/uikit-playground/src/Components/Routes/HomeLayout.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Routes/HomeLayout.tsx
rename to apps/uikit-playground/src/Components/Routes/HomeLayout.tsx
diff --git a/packages/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx b/apps/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx
rename to apps/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx
diff --git a/packages/uikit-playground/src/Components/Routes/ProtectedLayout.tsx b/apps/uikit-playground/src/Components/Routes/ProtectedLayout.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Routes/ProtectedLayout.tsx
rename to apps/uikit-playground/src/Components/Routes/ProtectedLayout.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts b/apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss b/apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss b/apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss
rename to apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx
diff --git a/packages/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx b/apps/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx
rename to apps/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx
diff --git a/packages/uikit-playground/src/Components/SurfaceSelect/index.ts b/apps/uikit-playground/src/Components/SurfaceSelect/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/SurfaceSelect/index.ts
rename to apps/uikit-playground/src/Components/SurfaceSelect/index.ts
diff --git a/packages/uikit-playground/src/Components/SurfaceSelect/options.ts b/apps/uikit-playground/src/Components/SurfaceSelect/options.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/SurfaceSelect/options.ts
rename to apps/uikit-playground/src/Components/SurfaceSelect/options.ts
diff --git a/packages/uikit-playground/src/Components/Templates/Container/Container.tsx b/apps/uikit-playground/src/Components/Templates/Container/Container.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/Container.tsx
rename to apps/uikit-playground/src/Components/Templates/Container/Container.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/Container/Payload.tsx b/apps/uikit-playground/src/Components/Templates/Container/Payload.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/Payload.tsx
rename to apps/uikit-playground/src/Components/Templates/Container/Payload.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/Container/Section.tsx b/apps/uikit-playground/src/Components/Templates/Container/Section.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/Section.tsx
rename to apps/uikit-playground/src/Components/Templates/Container/Section.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/Container/index.ts b/apps/uikit-playground/src/Components/Templates/Container/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/index.ts
rename to apps/uikit-playground/src/Components/Templates/Container/index.ts
diff --git a/packages/uikit-playground/src/Components/Templates/Templates.tsx b/apps/uikit-playground/src/Components/Templates/Templates.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Templates.tsx
rename to apps/uikit-playground/src/Components/Templates/Templates.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/index.ts b/apps/uikit-playground/src/Components/Templates/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/index.ts
rename to apps/uikit-playground/src/Components/Templates/index.ts
diff --git a/packages/uikit-playground/src/Components/ToggleTabs/index.tsx b/apps/uikit-playground/src/Components/ToggleTabs/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ToggleTabs/index.tsx
rename to apps/uikit-playground/src/Components/ToggleTabs/index.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx b/apps/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx
rename to apps/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx b/apps/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx
rename to apps/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/Menu/index.tsx b/apps/uikit-playground/src/Components/navMenu/Menu/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/Menu/index.tsx
rename to apps/uikit-playground/src/Components/navMenu/Menu/index.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/NavMenu.tsx b/apps/uikit-playground/src/Components/navMenu/NavMenu.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/NavMenu.tsx
rename to apps/uikit-playground/src/Components/navMenu/NavMenu.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/index.ts b/apps/uikit-playground/src/Components/navMenu/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/index.ts
rename to apps/uikit-playground/src/Components/navMenu/index.ts
diff --git a/packages/uikit-playground/src/Context/action/actionPreviewAction.ts b/apps/uikit-playground/src/Context/action/actionPreviewAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/actionPreviewAction.ts
rename to apps/uikit-playground/src/Context/action/actionPreviewAction.ts
diff --git a/packages/uikit-playground/src/Context/action/activeProjectAction.ts b/apps/uikit-playground/src/Context/action/activeProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/activeProjectAction.ts
rename to apps/uikit-playground/src/Context/action/activeProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/activeScreenAction.ts b/apps/uikit-playground/src/Context/action/activeScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/activeScreenAction.ts
rename to apps/uikit-playground/src/Context/action/activeScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/createNewProjectAction.ts b/apps/uikit-playground/src/Context/action/createNewProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/createNewProjectAction.ts
rename to apps/uikit-playground/src/Context/action/createNewProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/createNewScreenAction.ts b/apps/uikit-playground/src/Context/action/createNewScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/createNewScreenAction.ts
rename to apps/uikit-playground/src/Context/action/createNewScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/deleteProjectAction.ts b/apps/uikit-playground/src/Context/action/deleteProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/deleteProjectAction.ts
rename to apps/uikit-playground/src/Context/action/deleteProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/deleteScreenAction.ts b/apps/uikit-playground/src/Context/action/deleteScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/deleteScreenAction.ts
rename to apps/uikit-playground/src/Context/action/deleteScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/duplicateProjectAction.ts b/apps/uikit-playground/src/Context/action/duplicateProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/duplicateProjectAction.ts
rename to apps/uikit-playground/src/Context/action/duplicateProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/duplicateScreenAction.ts b/apps/uikit-playground/src/Context/action/duplicateScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/duplicateScreenAction.ts
rename to apps/uikit-playground/src/Context/action/duplicateScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/editorTabsToggleAction.ts b/apps/uikit-playground/src/Context/action/editorTabsToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/editorTabsToggleAction.ts
rename to apps/uikit-playground/src/Context/action/editorTabsToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/index.ts b/apps/uikit-playground/src/Context/action/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/index.ts
rename to apps/uikit-playground/src/Context/action/index.ts
diff --git a/packages/uikit-playground/src/Context/action/isMobileAction.ts b/apps/uikit-playground/src/Context/action/isMobileAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/isMobileAction.ts
rename to apps/uikit-playground/src/Context/action/isMobileAction.ts
diff --git a/packages/uikit-playground/src/Context/action/isTabletAction.ts b/apps/uikit-playground/src/Context/action/isTabletAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/isTabletAction.ts
rename to apps/uikit-playground/src/Context/action/isTabletAction.ts
diff --git a/packages/uikit-playground/src/Context/action/navMenuToggleAction.ts b/apps/uikit-playground/src/Context/action/navMenuToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/navMenuToggleAction.ts
rename to apps/uikit-playground/src/Context/action/navMenuToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/openCreateNewScreenAction.ts b/apps/uikit-playground/src/Context/action/openCreateNewScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/openCreateNewScreenAction.ts
rename to apps/uikit-playground/src/Context/action/openCreateNewScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/previewTabsToggleAction.ts b/apps/uikit-playground/src/Context/action/previewTabsToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/previewTabsToggleAction.ts
rename to apps/uikit-playground/src/Context/action/previewTabsToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/renameProjectAction.ts b/apps/uikit-playground/src/Context/action/renameProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/renameProjectAction.ts
rename to apps/uikit-playground/src/Context/action/renameProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/renameScreenAction.ts b/apps/uikit-playground/src/Context/action/renameScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/renameScreenAction.ts
rename to apps/uikit-playground/src/Context/action/renameScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/sidebarToggleAction.ts b/apps/uikit-playground/src/Context/action/sidebarToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/sidebarToggleAction.ts
rename to apps/uikit-playground/src/Context/action/sidebarToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/surfaceAction.ts b/apps/uikit-playground/src/Context/action/surfaceAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/surfaceAction.ts
rename to apps/uikit-playground/src/Context/action/surfaceAction.ts
diff --git a/packages/uikit-playground/src/Context/action/tabsToggleAction.ts b/apps/uikit-playground/src/Context/action/tabsToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/tabsToggleAction.ts
rename to apps/uikit-playground/src/Context/action/tabsToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/templatesToggleAction.ts b/apps/uikit-playground/src/Context/action/templatesToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/templatesToggleAction.ts
rename to apps/uikit-playground/src/Context/action/templatesToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/updateFlowEdgesAction.ts b/apps/uikit-playground/src/Context/action/updateFlowEdgesAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/updateFlowEdgesAction.ts
rename to apps/uikit-playground/src/Context/action/updateFlowEdgesAction.ts
diff --git a/packages/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts b/apps/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts
rename to apps/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts
diff --git a/packages/uikit-playground/src/Context/action/updatePayloadAction.ts b/apps/uikit-playground/src/Context/action/updatePayloadAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/updatePayloadAction.ts
rename to apps/uikit-playground/src/Context/action/updatePayloadAction.ts
diff --git a/packages/uikit-playground/src/Context/action/userAction.ts b/apps/uikit-playground/src/Context/action/userAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/userAction.ts
rename to apps/uikit-playground/src/Context/action/userAction.ts
diff --git a/packages/uikit-playground/src/Context/createCtx.tsx b/apps/uikit-playground/src/Context/createCtx.tsx
similarity index 100%
rename from packages/uikit-playground/src/Context/createCtx.tsx
rename to apps/uikit-playground/src/Context/createCtx.tsx
diff --git a/packages/uikit-playground/src/Context/index.tsx b/apps/uikit-playground/src/Context/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Context/index.tsx
rename to apps/uikit-playground/src/Context/index.tsx
diff --git a/packages/uikit-playground/src/Context/initialState.ts b/apps/uikit-playground/src/Context/initialState.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/initialState.ts
rename to apps/uikit-playground/src/Context/initialState.ts
diff --git a/packages/uikit-playground/src/Context/reducer.ts b/apps/uikit-playground/src/Context/reducer.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/reducer.ts
rename to apps/uikit-playground/src/Context/reducer.ts
diff --git a/packages/uikit-playground/src/Pages/FlowDiagram.tsx b/apps/uikit-playground/src/Pages/FlowDiagram.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/FlowDiagram.tsx
rename to apps/uikit-playground/src/Pages/FlowDiagram.tsx
diff --git a/packages/uikit-playground/src/Pages/Home.tsx b/apps/uikit-playground/src/Pages/Home.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/Home.tsx
rename to apps/uikit-playground/src/Pages/Home.tsx
diff --git a/packages/uikit-playground/src/Pages/Playground.tsx b/apps/uikit-playground/src/Pages/Playground.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/Playground.tsx
rename to apps/uikit-playground/src/Pages/Playground.tsx
diff --git a/packages/uikit-playground/src/Pages/Prototype.tsx b/apps/uikit-playground/src/Pages/Prototype.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/Prototype.tsx
rename to apps/uikit-playground/src/Pages/Prototype.tsx
diff --git a/packages/uikit-playground/src/Pages/SignInSignUp.tsx b/apps/uikit-playground/src/Pages/SignInSignUp.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/SignInSignUp.tsx
rename to apps/uikit-playground/src/Pages/SignInSignUp.tsx
diff --git a/packages/uikit-playground/src/Payload/action/checkbox.ts b/apps/uikit-playground/src/Payload/action/checkbox.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/checkbox.ts
rename to apps/uikit-playground/src/Payload/action/checkbox.ts
diff --git a/packages/uikit-playground/src/Payload/action/radioButton.ts b/apps/uikit-playground/src/Payload/action/radioButton.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/radioButton.ts
rename to apps/uikit-playground/src/Payload/action/radioButton.ts
diff --git a/packages/uikit-playground/src/Payload/action/timePicker.ts b/apps/uikit-playground/src/Payload/action/timePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/timePicker.ts
rename to apps/uikit-playground/src/Payload/action/timePicker.ts
diff --git a/packages/uikit-playground/src/Payload/action/toggleSwitch.ts b/apps/uikit-playground/src/Payload/action/toggleSwitch.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/toggleSwitch.ts
rename to apps/uikit-playground/src/Payload/action/toggleSwitch.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/BlocksTree.ts b/apps/uikit-playground/src/Payload/actionBlock/BlocksTree.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/BlocksTree.ts
rename to apps/uikit-playground/src/Payload/actionBlock/BlocksTree.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/button.ts b/apps/uikit-playground/src/Payload/actionBlock/action/button.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/button.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/button.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/datePicker.ts b/apps/uikit-playground/src/Payload/actionBlock/action/datePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/datePicker.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/datePicker.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/image.ts b/apps/uikit-playground/src/Payload/actionBlock/action/image.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/image.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/image.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/index.ts b/apps/uikit-playground/src/Payload/actionBlock/action/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/input.ts b/apps/uikit-playground/src/Payload/actionBlock/action/input.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/input.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/input.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/linearScale.ts b/apps/uikit-playground/src/Payload/actionBlock/action/linearScale.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/linearScale.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/linearScale.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/menu.ts b/apps/uikit-playground/src/Payload/actionBlock/action/menu.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/menu.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/menu.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts b/apps/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/context/index.ts b/apps/uikit-playground/src/Payload/actionBlock/context/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/context/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/context/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/divider/index.ts b/apps/uikit-playground/src/Payload/actionBlock/divider/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/divider/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/divider/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/image/index.ts b/apps/uikit-playground/src/Payload/actionBlock/image/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/image/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/image/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/datePicker.ts b/apps/uikit-playground/src/Payload/actionBlock/input/datePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/datePicker.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/datePicker.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/index.ts b/apps/uikit-playground/src/Payload/actionBlock/input/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/input.ts b/apps/uikit-playground/src/Payload/actionBlock/input/input.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/input.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/input.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/linearScale.ts b/apps/uikit-playground/src/Payload/actionBlock/input/linearScale.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/linearScale.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/linearScale.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts b/apps/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/preview/index.ts b/apps/uikit-playground/src/Payload/actionBlock/preview/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/preview/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/preview/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/button.ts b/apps/uikit-playground/src/Payload/actionBlock/section/button.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/button.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/button.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/datePicker.ts b/apps/uikit-playground/src/Payload/actionBlock/section/datePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/datePicker.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/datePicker.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/image.ts b/apps/uikit-playground/src/Payload/actionBlock/section/image.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/image.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/image.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/index.ts b/apps/uikit-playground/src/Payload/actionBlock/section/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/menu.ts b/apps/uikit-playground/src/Payload/actionBlock/section/menu.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/menu.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/menu.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/text.ts b/apps/uikit-playground/src/Payload/actionBlock/section/text.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/text.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/text.ts
diff --git a/packages/uikit-playground/src/Payload/actionPreview/container.ts b/apps/uikit-playground/src/Payload/actionPreview/container.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionPreview/container.ts
rename to apps/uikit-playground/src/Payload/actionPreview/container.ts
diff --git a/packages/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts b/apps/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts
rename to apps/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts
diff --git a/packages/uikit-playground/src/Payload/callout/index.ts b/apps/uikit-playground/src/Payload/callout/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/callout/index.ts
rename to apps/uikit-playground/src/Payload/callout/index.ts
diff --git a/packages/uikit-playground/src/Payload/index.ts b/apps/uikit-playground/src/Payload/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/index.ts
rename to apps/uikit-playground/src/Payload/index.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/disabled.ts b/apps/uikit-playground/src/Payload/tabNavigation/disabled.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/disabled.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/disabled.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/index.ts b/apps/uikit-playground/src/Payload/tabNavigation/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/index.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/index.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/plain.ts b/apps/uikit-playground/src/Payload/tabNavigation/plain.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/plain.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/plain.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/selected.ts b/apps/uikit-playground/src/Payload/tabNavigation/selected.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/selected.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/selected.ts
diff --git a/packages/uikit-playground/src/Routes/Routes.ts b/apps/uikit-playground/src/Routes/Routes.ts
similarity index 100%
rename from packages/uikit-playground/src/Routes/Routes.ts
rename to apps/uikit-playground/src/Routes/Routes.ts
diff --git a/packages/uikit-playground/src/_global.css b/apps/uikit-playground/src/_global.css
similarity index 100%
rename from packages/uikit-playground/src/_global.css
rename to apps/uikit-playground/src/_global.css
diff --git a/packages/uikit-playground/src/cssVariables.css b/apps/uikit-playground/src/cssVariables.css
similarity index 100%
rename from packages/uikit-playground/src/cssVariables.css
rename to apps/uikit-playground/src/cssVariables.css
diff --git a/packages/uikit-playground/src/hooks/useAuth.tsx b/apps/uikit-playground/src/hooks/useAuth.tsx
similarity index 100%
rename from packages/uikit-playground/src/hooks/useAuth.tsx
rename to apps/uikit-playground/src/hooks/useAuth.tsx
diff --git a/packages/uikit-playground/src/hooks/useCodeMirror.ts b/apps/uikit-playground/src/hooks/useCodeMirror.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useCodeMirror.ts
rename to apps/uikit-playground/src/hooks/useCodeMirror.ts
diff --git a/packages/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts b/apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
rename to apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
diff --git a/packages/uikit-playground/src/hooks/useHorizontalScroll.ts b/apps/uikit-playground/src/hooks/useHorizontalScroll.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useHorizontalScroll.ts
rename to apps/uikit-playground/src/hooks/useHorizontalScroll.ts
diff --git a/packages/uikit-playground/src/hooks/useNodesAndEdges.ts b/apps/uikit-playground/src/hooks/useNodesAndEdges.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useNodesAndEdges.ts
rename to apps/uikit-playground/src/hooks/useNodesAndEdges.ts
diff --git a/packages/uikit-playground/src/index.css b/apps/uikit-playground/src/index.css
similarity index 100%
rename from packages/uikit-playground/src/index.css
rename to apps/uikit-playground/src/index.css
diff --git a/packages/uikit-playground/src/logo.svg b/apps/uikit-playground/src/logo.svg
similarity index 100%
rename from packages/uikit-playground/src/logo.svg
rename to apps/uikit-playground/src/logo.svg
diff --git a/packages/uikit-playground/src/main.tsx b/apps/uikit-playground/src/main.tsx
similarity index 100%
rename from packages/uikit-playground/src/main.tsx
rename to apps/uikit-playground/src/main.tsx
diff --git a/packages/uikit-playground/src/module.d.ts b/apps/uikit-playground/src/module.d.ts
similarity index 100%
rename from packages/uikit-playground/src/module.d.ts
rename to apps/uikit-playground/src/module.d.ts
diff --git a/packages/uikit-playground/src/utils/codePrettier.ts b/apps/uikit-playground/src/utils/codePrettier.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/codePrettier.ts
rename to apps/uikit-playground/src/utils/codePrettier.ts
diff --git a/packages/uikit-playground/src/utils/filterEdges.ts b/apps/uikit-playground/src/utils/filterEdges.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/filterEdges.ts
rename to apps/uikit-playground/src/utils/filterEdges.ts
diff --git a/packages/uikit-playground/src/utils/formatDate.ts b/apps/uikit-playground/src/utils/formatDate.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/formatDate.ts
rename to apps/uikit-playground/src/utils/formatDate.ts
diff --git a/packages/uikit-playground/src/utils/getDate.ts b/apps/uikit-playground/src/utils/getDate.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/getDate.ts
rename to apps/uikit-playground/src/utils/getDate.ts
diff --git a/packages/uikit-playground/src/utils/getUniqueId.ts b/apps/uikit-playground/src/utils/getUniqueId.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/getUniqueId.ts
rename to apps/uikit-playground/src/utils/getUniqueId.ts
diff --git a/packages/uikit-playground/src/utils/intendCode.ts b/apps/uikit-playground/src/utils/intendCode.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/intendCode.ts
rename to apps/uikit-playground/src/utils/intendCode.ts
diff --git a/packages/uikit-playground/src/utils/persistStore.ts b/apps/uikit-playground/src/utils/persistStore.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/persistStore.ts
rename to apps/uikit-playground/src/utils/persistStore.ts
diff --git a/packages/uikit-playground/src/utils/templates.ts b/apps/uikit-playground/src/utils/templates.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/templates.ts
rename to apps/uikit-playground/src/utils/templates.ts
diff --git a/packages/uikit-playground/src/utils/uiKitRenderer.ts b/apps/uikit-playground/src/utils/uiKitRenderer.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/uiKitRenderer.ts
rename to apps/uikit-playground/src/utils/uiKitRenderer.ts
diff --git a/packages/uikit-playground/src/vite-env.d.ts b/apps/uikit-playground/src/vite-env.d.ts
similarity index 100%
rename from packages/uikit-playground/src/vite-env.d.ts
rename to apps/uikit-playground/src/vite-env.d.ts
diff --git a/packages/uikit-playground/tsconfig.json b/apps/uikit-playground/tsconfig.json
similarity index 100%
rename from packages/uikit-playground/tsconfig.json
rename to apps/uikit-playground/tsconfig.json
diff --git a/packages/uikit-playground/vite.config.ts b/apps/uikit-playground/vite.config.ts
similarity index 100%
rename from packages/uikit-playground/vite.config.ts
rename to apps/uikit-playground/vite.config.ts
diff --git a/yarn.lock b/yarn.lock
index 9197fbb0b63a..aa2b104e5190 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10455,9 +10455,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/uikit-playground@workspace:packages/uikit-playground":
+"@rocket.chat/uikit-playground@workspace:apps/uikit-playground":
   version: 0.0.0-use.local
-  resolution: "@rocket.chat/uikit-playground@workspace:packages/uikit-playground"
+  resolution: "@rocket.chat/uikit-playground@workspace:apps/uikit-playground"
   dependencies:
     "@codemirror/lang-javascript": ^6.1.9
     "@codemirror/lang-json": ^6.0.1

From 9ef096fd9cca048cdda31d41f113650e2c6a25a3 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 11 Sep 2024 13:42:29 -0300
Subject: [PATCH 066/170] chore: publish preview github pages (#33248)

---
 .github/workflows/ci-preview.yml          | 44 +++++++++++++++++++++++
 .gitignore                                |  2 ++
 _templates/package/new/package.json.ejs.t |  1 +
 apps/uikit-playground/package.json        |  3 +-
 turbo.json                                |  8 +++++
 5 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/ci-preview.yml

diff --git a/.github/workflows/ci-preview.yml b/.github/workflows/ci-preview.yml
new file mode 100644
index 000000000000..18b4b0bef373
--- /dev/null
+++ b/.github/workflows/ci-preview.yml
@@ -0,0 +1,44 @@
+# .github/workflows/ci-preview.yml
+name: Deploy PR previews
+concurrency: preview-${{ github.ref }}
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - closed
+  push:
+    branches:
+      - main
+      - master
+      - develop
+jobs:
+  deploy-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: rharkor/caching-for-turbo@v1.5
+        if: github.event.action != 'closed'
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        if: github.event.action != 'closed'
+        with:
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
+
+      - name: Build
+        if: github.event.action != 'closed'
+        run: |
+          yarn turbo run build-preview
+          yarn turbo run .:build-preview-move
+
+      - uses: rossjrw/pr-preview-action@v1
+        with:
+          source-dir: .preview
+          preview-branch: gh-pages
+          umbrella-dir: pr-preview
+          action: auto
diff --git a/.gitignore b/.gitignore
index 4e6e4bb29da9..dbad2c29a22c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,8 @@ yarn-error.log*
 .history
 .envrc
 
+.preview
+
 *.sublime-workspace
 
 **/.vim/
diff --git a/_templates/package/new/package.json.ejs.t b/_templates/package/new/package.json.ejs.t
index 6bee52f55927..b2827ee3fb89 100644
--- a/_templates/package/new/package.json.ejs.t
+++ b/_templates/package/new/package.json.ejs.t
@@ -19,6 +19,7 @@ to: packages/<%= name %>/package.json
 		"test": "jest",
 		"build": "rm -rf dist && tsc -p tsconfig.json",
 		"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
+		"build-preview": "mkdir -p ../../.preview && cp -r ./dist ../../.preview/<%= name.toLowerCase() %>"
 	},
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index d309c2d54599..233e71b719e5 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -5,7 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build-preview": "tsc && vite build",
+    ".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./dist ../../.preview/uikit-playground",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },
diff --git a/turbo.json b/turbo.json
index 7ce868eb3707..0ae903f9250d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -2,6 +2,14 @@
 	"$schema": "https://turborepo.org/schema.json",
 	"globalDependencies": ["tsconfig.base.json", "tsconfig.base.server.json", "tsconfig.base.client.json"],
 	"tasks": {
+		"build-preview": {
+			"dependsOn": ["^build"],
+			"outputs": ["storybook-static/**", ".storybook/**", "dist/**"]
+		},
+		".:build-preview-move": {
+			"dependsOn": ["^build-preview"],
+			"cache": false
+		},
 		"build": {
 			"dependsOn": ["^build"],
 			"outputs": ["dist/**"]

From fa8ac7aeaf5403720c2004cbae93a2ef3df51b78 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Wed, 11 Sep 2024 15:22:23 -0300
Subject: [PATCH 067/170] fix: Infinite loading when uploading a private app
 (#33181)

---
 .changeset/wet-hats-walk.md                               | 5 +++++
 .../client/views/marketplace/hooks/useInstallApp.tsx      | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/wet-hats-walk.md

diff --git a/.changeset/wet-hats-walk.md b/.changeset/wet-hats-walk.md
new file mode 100644
index 000000000000..4c3565e75523
--- /dev/null
+++ b/.changeset/wet-hats-walk.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
diff --git a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
index f10d3e989e0a..3b784e24c375 100644
--- a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
@@ -114,8 +114,11 @@ export const useInstallApp = (file: File, url: string): { install: () => void; i
 	};
 
 	const extractManifestFromAppFile = async (appFile: File) => {
-		const manifest = await getManifestFromZippedApp(appFile);
-		return manifest;
+		try {
+			return getManifestFromZippedApp(appFile);
+		} catch (error) {
+			handleInstallError(error as Error);
+		}
 	};
 
 	const install = async () => {
@@ -158,6 +161,7 @@ export const useInstallApp = (file: File, url: string): { install: () => void; i
 				handleEnableUnlimitedApps={() => {
 					openExternalLink(manageSubscriptionUrl);
 					setModal(null);
+					setInstalling(false);
 				}}
 			/>,
 		);

From 3cbb9f625292aa03fd30b48e44bd2bb8b3aaf0d9 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:15:29 +0000
Subject: [PATCH 068/170] fix: message parser being slow to process very long
 messages with too many symbols (#33254)

Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
---
 .changeset/short-drinks-itch.md               |   6 +
 packages/message-parser/src/grammar.pegjs     | 126 ++++----
 packages/message-parser/src/utils.ts          |  36 ++-
 packages/message-parser/tests/abuse.test.ts   | 268 ++++++++++++++++++
 .../message-parser/tests/emphasis.test.ts     |  62 ++++
 packages/message-parser/tests/link.test.ts    |  24 ++
 6 files changed, 453 insertions(+), 69 deletions(-)
 create mode 100644 .changeset/short-drinks-itch.md
 create mode 100644 packages/message-parser/tests/abuse.test.ts

diff --git a/.changeset/short-drinks-itch.md b/.changeset/short-drinks-itch.md
new file mode 100644
index 000000000000..ee57330ffc86
--- /dev/null
+++ b/.changeset/short-drinks-itch.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/message-parser': patch
+'@rocket.chat/peggy-loader': patch
+---
+
+Improved the performance of the message parser
diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs
index 182653a9c664..a6cae97facbf 100644
--- a/packages/message-parser/src/grammar.pegjs
+++ b/packages/message-parser/src/grammar.pegjs
@@ -10,6 +10,7 @@
     emoji,
     emojiUnicode,
     emoticon,
+    extractFirstResult,
     heading,
     image,
     inlineCode,
@@ -33,6 +34,11 @@
     unorderedList,
     timestamp,
   } = require('./utils');
+
+let skipBold = false;
+let skipItalic = false;
+let skipStrikethrough = false;
+let skipReferences = false;
 }}
 
 Start
@@ -212,7 +218,7 @@ Inline = value:(InlineItem / Any)+ EndOfLine? { return reducePlainTexts(value);
 
 InlineItem = Whitespace
   / Timestamp
-  / References
+  / MaybeReferences
   / AutolinkedPhone
   / AutolinkedEmail
   / AutolinkedURL
@@ -240,7 +246,7 @@ References
   = "[" title:LinkTitle* "](" href:LinkRef ")" { return title.length ? link(href, reducePlainTexts(title)) : link(href); }
   / "<" href:LinkRef "|" title:LinkTitle2 ">" { return link(href, [plain(title)]); }
 
-LinkTitle = (Whitespace / EmphasisForReferences) / anyTitle:$(!("](" .) .) { return plain(anyTitle) }
+LinkTitle = (Whitespace / Emphasis) / anyTitle:$(!("](" .) .) { return plain(anyTitle) }
 
 LinkTitle2 = $([\x20-\x3B\x3D\x3F-\x60\x61-\x7B\x7D-\xFF] / NonASCII)+
 
@@ -349,14 +355,7 @@ AutoLinkURLBody =  !(Extra* (Whitespace / EndOfLine)) .
  * Emphasis
  *
 */
-Emphasis = Bold / Italic / Strikethrough
-
-/**
- *
- * Emphasis for References
- *
-*/
-EmphasisForReferences = BoldForReferences / ItalicForReferences / StrikethroughForReferences
+Emphasis = MaybeBold / MaybeItalic / MaybeStrikethrough
 
 /**
  *
@@ -365,6 +364,63 @@ EmphasisForReferences = BoldForReferences / ItalicForReferences / StrikethroughF
  *
  */
 
+// This rule is used inside expressions that have a JS code ensuring they always fail,
+// Without any pattern to match, peggy will think the rule may end up succedding without consuming any input, which could cause infinite loops
+// So this unreachable rule is added to them to satisfy peggy's requirement.
+BlockedByJavascript = 'unreachable'
+
+MaybeBold
+  = result:(
+    & {
+      if (skipBold) { return false; }
+      skipBold = true;
+      return true;
+    }
+    (
+      (text:Bold { skipBold = false; return text; })
+      / (& { skipBold = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
+MaybeStrikethrough
+  = result:(
+    & {
+      if (skipStrikethrough) { return false; }
+      skipStrikethrough = true;
+      return true;
+    }
+    (
+      (text:Strikethrough { skipStrikethrough = false; return text; })
+      / (& { skipStrikethrough = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
+MaybeItalic
+  = result:(
+    & {
+      if (skipItalic) { return false; }
+      skipItalic = true;
+      return true;
+    }
+    (
+      (text:Italic { skipItalic = false; return text; })
+      / (& { skipItalic = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
+MaybeReferences
+  = result:(
+    & {
+      if (skipReferences) { return false; }
+      skipReferences = true;
+      return true;
+    }
+    (
+      (text:References { skipReferences = false; return text; })
+      / (& { skipReferences = false; return false; } BlockedByJavascript)
+    )
+  ) { return extractFirstResult(result); }
+
 /* Italic */
 Italic
    = value:$([a-zA-Z0-9]+ [\x5F] [\x5F]?) { return plain(value); }
@@ -384,11 +440,11 @@ ItalicContentItems = text:ItalicContentItem+ { return reducePlainTexts(text); }
 ItalicContentItem
   = Whitespace
   / InlineCode
-  / References
+  / MaybeReferences
   / UserMention
   / ChannelMention
-  / Bold
-  / Strikethrough
+  / MaybeBold
+  / MaybeStrikethrough
   / Emoji
   / Emoticon
   / AnyItalic
@@ -399,52 +455,12 @@ Bold = [\x2A] [\x2A] @BoldContent [\x2A] [\x2A] / [\x2A] @BoldContent [\x2A]
 
 BoldContent = text:BoldContentItem+ { return bold(reducePlainTexts(text)); }
 
-BoldContentItem = Whitespace / InlineCode / References / UserMention / ChannelMention / Italic / Strikethrough / Emoji / Emoticon / AnyBold / Line
+BoldContentItem = Whitespace / InlineCode / MaybeReferences / UserMention / ChannelMention / MaybeItalic / MaybeStrikethrough / Emoji / Emoticon / AnyBold / Line
 
 /* Strike */
 Strikethrough = [\x7E] [\x7E] @StrikethroughContent [\x7E] [\x7E] / [\x7E] @StrikethroughContent [\x7E]
 
-StrikethroughContent = text:(Timestamp / InlineCode / Whitespace / References / UserMention / ChannelMention / Italic / Bold / Emoji / Emoticon / AnyStrike / Line)+ {
-      return strike(reducePlainTexts(text));
-    }
-
-/* Italic for References */
-ItalicForReferences
-   = value:$([a-zA-Z0-9]+ [\x5F] [\x5F]?) { return plain(value); }
-  / [\x5F] [\x5F] i:ItalicContentItemsForReferences [\x5F] [\x5F] t:$[a-zA-Z0-9]+ {
-      return reducePlainTexts([plain('__'), ...i, plain('__'), plain(t)])[0];
-    }
-  / [\x5F] i:ItalicContentItemsForReferences [\x5F] t:$[a-zA-Z]+ {
-      return reducePlainTexts([plain('_'), ...i, plain('_'), plain(t)])[0];
-    }
-  / [\x5F] [\x5F] @ItalicContentForReferences [\x5F] [\x5F]
-  / [\x5F] @ItalicContentForReferences [\x5F]
-
-ItalicContentForReferences = text:ItalicContentItemsForReferences { return italic(text); }
-
-ItalicContentItemsForReferences = text:ItalicContentItemForReferences+ { return reducePlainTexts(text); }
-
-ItalicContentItemForReferences
-  = Whitespace
-  / UserMention
-  / ChannelMention
-  / BoldForReferences
-  / StrikethroughForReferences
-  / Emoji
-  / Emoticon
-  / AnyItalic
-  / Line
-  / InlineCode
-
-/* Bold for References */
-BoldForReferences = [\x2A] [\x2A] @BoldContentForReferences [\x2A] [\x2A] / [\x2A] @BoldContentForReferences [\x2A]
-
-BoldContentForReferences = text:(Whitespace / UserMention / ChannelMention / ItalicForReferences / StrikethroughForReferences / Emoji / Emoticon / AnyBold / Line / InlineCode)+ { return bold(reducePlainTexts(text)); }
-
-/* Strike for References */
-StrikethroughForReferences = [\x7E] [\x7E] @StrikethroughContentForReferences [\x7E] [\x7E] / [\x7E] @StrikethroughContentForReferences [\x7E]
-
-StrikethroughContentForReferences = text:(Whitespace / UserMention / ChannelMention / ItalicForReferences / BoldForReferences / Emoji / Emoticon / AnyStrike / Line / InlineCode)+ {
+StrikethroughContent = text:(Timestamp / Whitespace / InlineCode / MaybeReferences / UserMention / ChannelMention / MaybeItalic / MaybeBold / Emoji / Emoticon / AnyStrike / Line)+ {
       return strike(reducePlainTexts(text));
     }
 
diff --git a/packages/message-parser/src/utils.ts b/packages/message-parser/src/utils.ts
index 1f684b56d6ed..6c5d605c5c7a 100644
--- a/packages/message-parser/src/utils.ts
+++ b/packages/message-parser/src/utils.ts
@@ -198,21 +198,19 @@ const joinEmoji = (
 export const reducePlainTexts = (
   values: Paragraph['value']
 ): Paragraph['value'] =>
-  values
-    .flatMap((item) => item)
-    .reduce((result, item, index, values) => {
-      const next = values[index + 1];
-      const current = joinEmoji(item, values[index - 1], next);
-      const previous: Inlines = result[result.length - 1];
-
-      if (previous) {
-        if (current.type === 'PLAIN_TEXT' && current.type === previous.type) {
-          previous.value += current.value;
-          return result;
-        }
+  values.flat().reduce((result, item, index, values) => {
+    const next = values[index + 1];
+    const current = joinEmoji(item, values[index - 1], next);
+    const previous: Inlines = result[result.length - 1];
+
+    if (previous) {
+      if (current.type === 'PLAIN_TEXT' && current.type === previous.type) {
+        previous.value += current.value;
+        return result;
       }
-      return [...result, current];
-    }, [] as Paragraph['value']);
+    }
+    return [...result, current];
+  }, [] as Paragraph['value']);
 export const lineBreak = (): LineBreak => ({
   type: 'LINE_BREAK',
   value: undefined,
@@ -249,3 +247,13 @@ export const timestamp = (
     fallback: plain(`<t:${value}:${type || 't'}>`),
   };
 };
+
+export const extractFirstResult = (
+  value: Types[keyof Types]['value']
+): Types[keyof Types]['value'] => {
+  if (typeof value !== 'object' || !Array.isArray(value)) {
+    return value;
+  }
+
+  return value.filter((item) => item).shift() as Types[keyof Types]['value'];
+};
diff --git a/packages/message-parser/tests/abuse.test.ts b/packages/message-parser/tests/abuse.test.ts
new file mode 100644
index 000000000000..c280ee75b4a0
--- /dev/null
+++ b/packages/message-parser/tests/abuse.test.ts
@@ -0,0 +1,268 @@
+import { parse } from '../src';
+import { paragraph, plain, bold, italic, strike } from '../src/utils';
+
+test.each([
+  [
+    `This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. , REPEATx2 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEAT x3 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEAT x4 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEATx 5 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. , REPEAT x6 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. this can go long for some time, repeat x7 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. ,repeat x8 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some.`,
+    [
+      paragraph([
+        plain(
+          'This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&'
+        ),
+        bold([
+          plain('()'),
+          italic([
+            plain(
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+            ),
+            strike([
+              plain(
+                `, from now on we repeat some. , REPEATx2 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+              ),
+            ]),
+            plain(
+              ', from now on we repeat some. REPEAT x3 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()'
+            ),
+          ]),
+          plain(
+            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+          ),
+          strike([
+            plain(
+              ', from now on we repeat some. REPEAT x4 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()'
+            ),
+            italic([
+              plain(
+                `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEATx 5 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+              ),
+            ]),
+            plain(
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+            ),
+          ]),
+          plain(
+            `, from now on we repeat some. , REPEAT x6 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&`
+          ),
+        ]),
+        plain(
+          `()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+        ),
+        strike([
+          plain(
+            `, from now on we repeat some. this can go long for some time, repeat x7 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+          ),
+          italic([
+            plain(
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. ,repeat x8 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+            ),
+          ]),
+          plain(
+            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+          ),
+        ]),
+        plain(', from now on we repeat some.'),
+      ]),
+    ],
+  ],
+  [
+    '**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__**_**__',
+    [
+      paragraph([
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        italic([bold([plain('_')])]),
+        bold([italic([plain('**')]), italic([plain('**')])]),
+        plain('__'),
+      ]),
+    ],
+  ],
+])('parses %p', (input, output) => {
+  expect(parse(input)).toMatchObject(output);
+});
diff --git a/packages/message-parser/tests/emphasis.test.ts b/packages/message-parser/tests/emphasis.test.ts
index e8e72a5882f1..b035999204ce 100644
--- a/packages/message-parser/tests/emphasis.test.ts
+++ b/packages/message-parser/tests/emphasis.test.ts
@@ -185,6 +185,68 @@ test.each([
       ]),
     ],
   ],
+  [
+    '**bold ~~and strike~~** **not bold ~~but strike** ~~ not strike~~',
+    [
+      paragraph([
+        bold([plain('bold '), strike([plain('and strike')])]),
+        plain(' **not bold '),
+        strike([plain('but strike** ')]),
+        plain(' not strike~~'),
+      ]),
+    ],
+  ],
+  [
+    '**bold** **another bold** ~~strike~~ ~~another strike~~ **bold ~~and strike~~** **not bold ~~but strike** ~~ not strike~~',
+    [
+      paragraph([
+        bold([plain('bold')]),
+        plain(' '),
+        bold([plain('another bold')]),
+        plain(' '),
+        strike([plain('strike')]),
+        plain(' '),
+        strike([plain('another strike')]),
+        plain(' '),
+        bold([plain('bold '), strike([plain('and strike')])]),
+        plain(' **not bold '),
+        strike([plain('but strike** ')]),
+        plain(' not strike~~'),
+      ]),
+    ],
+  ],
+  [
+    'some_snake_case_text and even_more',
+    [paragraph([plain('some_snake_case_text and even_more')])],
+  ],
+  [
+    'some_snake_case_text and some __italic__ text',
+    [
+      paragraph([
+        plain('some_snake_case_text and some '),
+        italic([plain('italic')]),
+        plain(' text'),
+      ]),
+    ],
+  ],
+  [
+    'some__double__snake__case__text and even_more',
+    [paragraph([plain('some__double__snake__case__text and even_more')])],
+  ],
+  [
+    'some__double__snake__case__text and some __italic__ text',
+    [
+      paragraph([
+        plain('some__double__snake__case__text and some '),
+        italic([plain('italic')]),
+        plain(' text'),
+      ]),
+    ],
+  ],
+  [
+    'something__ __and italic__',
+    [paragraph([plain('something__ '), italic([plain('and italic')])])],
+  ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });
diff --git a/packages/message-parser/tests/link.test.ts b/packages/message-parser/tests/link.test.ts
index 1e083fde5d70..fcf371474bf2 100644
--- a/packages/message-parser/tests/link.test.ts
+++ b/packages/message-parser/tests/link.test.ts
@@ -584,6 +584,30 @@ Text after line break`,
       ]),
     ],
   ],
+  [
+    '[test **bold** and __italic__](https://rocket.chat)',
+    [
+      paragraph([
+        link('https://rocket.chat', [
+          plain('test '),
+          bold([plain('bold')]),
+          plain(' and '),
+          italic([plain('italic')]),
+        ]),
+      ]),
+    ],
+  ],
+  [
+    '[test **bold with __italic__**](https://rocket.chat)',
+    [
+      paragraph([
+        link('https://rocket.chat', [
+          plain('test '),
+          bold([plain('bold with '), italic([plain('italic')])]),
+        ]),
+      ]),
+    ],
+  ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });

From ed7398d93067cf92b48791b4ca5f20cb94c89131 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:34:56 +0000
Subject: [PATCH 069/170] fix: Allow to use the token from `room.v` when
 requesting transcript instead of finding visitor (#33242)

Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>
---
 .changeset/four-cherries-kneel.md             |  5 +++
 .../app/livechat/server/lib/sendTranscript.ts | 17 +++----
 apps/meteor/tests/data/livechat/rooms.ts      |  4 +-
 .../end-to-end/api/livechat/11-livechat.ts    | 21 +++++++++
 .../server/lib/sendTranscript.spec.ts         | 45 +++++++++++++------
 5 files changed, 67 insertions(+), 25 deletions(-)
 create mode 100644 .changeset/four-cherries-kneel.md

diff --git a/.changeset/four-cherries-kneel.md b/.changeset/four-cherries-kneel.md
new file mode 100644
index 000000000000..095d5af0aa76
--- /dev/null
+++ b/.changeset/four-cherries-kneel.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
diff --git a/apps/meteor/app/livechat/server/lib/sendTranscript.ts b/apps/meteor/app/livechat/server/lib/sendTranscript.ts
index 74032121ee50..bc7c06e0eaae 100644
--- a/apps/meteor/app/livechat/server/lib/sendTranscript.ts
+++ b/apps/meteor/app/livechat/server/lib/sendTranscript.ts
@@ -3,12 +3,13 @@ import {
 	type IUser,
 	type MessageTypesValues,
 	type IOmnichannelSystemMessage,
+	type ILivechatVisitor,
 	isFileAttachment,
 	isFileImageAttachment,
 } from '@rocket.chat/core-typings';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { Logger } from '@rocket.chat/logger';
-import { LivechatRooms, LivechatVisitors, Messages, Uploads, Users } from '@rocket.chat/models';
+import { LivechatRooms, Messages, Uploads, Users } from '@rocket.chat/models';
 import { check } from 'meteor/check';
 import moment from 'moment-timezone';
 
@@ -41,16 +42,12 @@ export async function sendTranscript({
 
 	const room = await LivechatRooms.findOneById(rid);
 
-	const visitor = await LivechatVisitors.getVisitorByToken(token, {
-		projection: { _id: 1, token: 1, language: 1, username: 1, name: 1 },
-	});
-
-	if (!visitor) {
-		throw new Error('error-invalid-token');
+	const visitor = room?.v as ILivechatVisitor;
+	if (token !== visitor?.token) {
+		throw new Error('error-invalid-visitor');
 	}
 
-	// @ts-expect-error - Visitor typings should include language?
-	const userLanguage = visitor?.language || settings.get('Language') || 'en';
+	const userLanguage = settings.get<string>('Language') || 'en';
 	const timezone = getTimezone(user);
 	logger.debug(`Transcript will be sent using ${timezone} as timezone`);
 
@@ -59,7 +56,7 @@ export async function sendTranscript({
 	}
 
 	// allow to only user to send transcripts from their own chats
-	if (room.t !== 'l' || !room.v || room.v.token !== token) {
+	if (room.t !== 'l') {
 		throw new Error('error-invalid-room');
 	}
 
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index 9532fd4214ab..b5d89762c614 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -33,10 +33,10 @@ export const createLivechatRoom = async (visitorToken: string, extraRoomParams?:
 	return response.body.room;
 };
 
-export const createVisitor = (department?: string, visitorName?: string): Promise<ILivechatVisitor> =>
+export const createVisitor = (department?: string, visitorName?: string, customEmail?: string): Promise<ILivechatVisitor> =>
 	new Promise((resolve, reject) => {
 		const token = getRandomVisitorToken();
-		const email = `${token}@${token}.com`;
+		const email = customEmail || `${token}@${token}.com`;
 		const phone = `${Math.floor(Math.random() * 10000000000)}`;
 		void request.get(api(`livechat/visitor/${token}`)).end((err: Error, res: DummyResponse<ILivechatVisitor>) => {
 			if (!err && res && res.body && res.body.visitor) {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
index c07f7bcecc81..7ce582025538 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
@@ -283,6 +283,27 @@ describe('LIVECHAT - Utils', () => {
 				.send({ token: visitor.token, rid: room._id, email: 'visitor@notadomain.com' });
 			expect(body).to.have.property('success', true);
 		});
+		it('should allow a visitor to get a transcript even if token changed by using an old token that matches room.v', async () => {
+			const visitor = await createVisitor();
+			const room = await createLivechatRoom(visitor.token);
+			await closeOmnichannelRoom(room._id);
+			const visitor2 = await createVisitor(undefined, undefined, visitor.visitorEmails?.[0].address);
+			const room2 = await createLivechatRoom(visitor2.token);
+			await closeOmnichannelRoom(room2._id);
+
+			expect(visitor.token !== visitor2.token).to.be.true;
+			const { body } = await request
+				.post(api('livechat/transcript'))
+				.set(credentials)
+				.send({ token: visitor.token, rid: room._id, email: 'visitor@notadomain.com' });
+			expect(body).to.have.property('success', true);
+
+			const { body: body2 } = await request
+				.post(api('livechat/transcript'))
+				.set(credentials)
+				.send({ token: visitor2.token, rid: room2._id, email: 'visitor@notadomain.com' });
+			expect(body2).to.have.property('success', true);
+		});
 	});
 
 	describe('livechat/transcript/:rid', () => {
diff --git a/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts
index 64da050cfd88..ca39a64c21a9 100644
--- a/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts
+++ b/apps/meteor/tests/unit/app/livechat/server/lib/sendTranscript.spec.ts
@@ -6,9 +6,6 @@ const modelsMock = {
 	LivechatRooms: {
 		findOneById: sinon.stub(),
 	},
-	LivechatVisitors: {
-		getVisitorByToken: sinon.stub(),
-	},
 	Messages: {
 		findLivechatClosingMessage: sinon.stub(),
 		findVisibleByRoomIdNotContainingTypesBeforeTs: sinon.stub(),
@@ -75,7 +72,6 @@ describe('Send transcript', () => {
 	beforeEach(() => {
 		checkMock.reset();
 		modelsMock.LivechatRooms.findOneById.reset();
-		modelsMock.LivechatVisitors.getVisitorByToken.reset();
 		modelsMock.Messages.findLivechatClosingMessage.reset();
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.reset();
 		modelsMock.Users.findOneById.reset();
@@ -87,11 +83,9 @@ describe('Send transcript', () => {
 		await expect(sendTranscript({})).to.be.rejectedWith(Error);
 	});
 	it('should throw error when visitor not found', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves(null);
 		await expect(sendTranscript({ rid: 'rid', email: 'email', logger: mockLogger })).to.be.rejectedWith(Error);
 	});
 	it('should attempt to send an email when params are valid using default subject', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token' } });
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
 		tStub.returns('Conversation Transcript');
@@ -117,7 +111,6 @@ describe('Send transcript', () => {
 		).to.be.true;
 	});
 	it('should use provided subject', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token' } });
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
 
@@ -143,7 +136,6 @@ describe('Send transcript', () => {
 		).to.be.true;
 	});
 	it('should use subject from setting (when configured) when no subject provided', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token' } });
 		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
 		mockSettingValues.Livechat_transcript_email_subject = 'A custom subject obtained from setting.get';
@@ -170,36 +162,63 @@ describe('Send transcript', () => {
 	});
 	it('should fail if room provided is invalid', async () => {
 		modelsMock.LivechatRooms.findOneById.resolves(null);
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email', logger: mockLogger })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room provided is of different type', async () => {
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'c' });
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email' })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room is of valid type, but doesnt doesnt have `v` property', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l' });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email' })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room is of valid type, has `v` prop, but it doesnt contain `token`', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { otherProp: 'xxx' } });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email' })).to.be.rejectedWith(Error);
 	});
 
 	it('should fail if room is of valid type, has `v.token`, but its different from the one on param (room from another visitor)', async () => {
-		modelsMock.LivechatVisitors.getVisitorByToken.resolves({ language: null });
 		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'xxx' } });
 
 		await expect(sendTranscript({ rid: 'rid', email: 'email', token: 'xveasdf' })).to.be.rejectedWith(Error);
 	});
+
+	it('should throw an error when token is not the one on room.v', async () => {
+		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'xxx' } });
+
+		await expect(sendTranscript({ rid: 'rid', email: 'email', token: 'xveasdf' })).to.be.rejectedWith(Error);
+	});
+	it('should work when token matches room.v', async () => {
+		modelsMock.LivechatRooms.findOneById.resolves({ t: 'l', v: { token: 'token-123' } });
+		modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.resolves([]);
+		delete mockSettingValues.Livechat_transcript_email_subject;
+		tStub.returns('Conversation Transcript');
+
+		await sendTranscript({
+			rid: 'rid',
+			token: 'token-123',
+			email: 'email',
+			user: { _id: 'x', name: 'x', utcOffset: '-6', username: 'x' },
+		});
+
+		expect(getTimezoneMock.calledWith({ _id: 'x', name: 'x', utcOffset: '-6', username: 'x' })).to.be.true;
+		expect(modelsMock.Messages.findLivechatClosingMessage.calledWith('rid', { projection: { ts: 1 } })).to.be.true;
+		expect(modelsMock.Messages.findVisibleByRoomIdNotContainingTypesBeforeTs.called).to.be.true;
+		expect(
+			mailerMock.calledWith({
+				to: 'email',
+				from: 'test@rocket.chat',
+				subject: 'Conversation Transcript',
+				replyTo: 'test@rocket.chat',
+				html: '<div> <hr></div>',
+			}),
+		).to.be.true;
+	});
 });

From cfc84ab29f8304e56858309e7ed14291f246634b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 11 Sep 2024 17:35:47 -0300
Subject: [PATCH 070/170] chore: add index to preview page (#33261)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 ...iew.yml => ci-deploy-gh-pages-preview.yml} |  7 +---
 .github/workflows/ci-deploy-gh-pages.yml      | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
 rename .github/workflows/{ci-preview.yml => ci-deploy-gh-pages-preview.yml} (91%)
 create mode 100644 .github/workflows/ci-deploy-gh-pages.yml

diff --git a/.github/workflows/ci-preview.yml b/.github/workflows/ci-deploy-gh-pages-preview.yml
similarity index 91%
rename from .github/workflows/ci-preview.yml
rename to .github/workflows/ci-deploy-gh-pages-preview.yml
index 18b4b0bef373..17f247ddad94 100644
--- a/.github/workflows/ci-preview.yml
+++ b/.github/workflows/ci-deploy-gh-pages-preview.yml
@@ -8,11 +8,7 @@ on:
       - reopened
       - synchronize
       - closed
-  push:
-    branches:
-      - main
-      - master
-      - develop
+
 jobs:
   deploy-preview:
     runs-on: ubuntu-latest
@@ -35,6 +31,7 @@ jobs:
         run: |
           yarn turbo run build-preview
           yarn turbo run .:build-preview-move
+          npx indexifier .preview --html  --extensions .html  > .preview/index.html
 
       - uses: rossjrw/pr-preview-action@v1
         with:
diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml
new file mode 100644
index 000000000000..b381e05ae5d8
--- /dev/null
+++ b/.github/workflows/ci-deploy-gh-pages.yml
@@ -0,0 +1,38 @@
+# .github/workflows/ci-preview-deploy.yml
+name: Deploy GitHub Pages
+concurrency: preview-deploy-${{ github.ref }}
+on:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+jobs:
+  deploy-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: rharkor/caching-for-turbo@v1.5
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        with:
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
+
+      - name: Build
+        run: |
+          yarn turbo run build-preview
+          yarn turbo run .:build-preview-move
+          npx indexifier .preview --html  --extensions .html  > .preview/index.html
+          mv .preview ${{ github.ref_name }}
+          mkdir .preview
+          mv ${{ github.ref_name }} .preview
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: .preview
+          keep_files: true

From 18b1b992a196c7ae8803380a0ddf4d67b8b08f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <43561537+rique223@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:56:50 -0300
Subject: [PATCH 071/170] refactor: Upgrade `Fuselage` and remove unnecessary
 `FieldError` styling (#33205)

---
 .../views/admin/users/AdminUserForm.tsx       |  2 +-
 packages/fuselage-ui-kit/package.json         |  8 +++----
 packages/gazzodown/package.json               |  4 ++--
 packages/ui-avatar/package.json               |  2 +-
 packages/ui-client/package.json               |  2 +-
 packages/ui-video-conf/package.json           |  4 ++--
 packages/web-ui-registration/package.json     |  2 +-
 yarn.lock                                     | 22 +++++++++----------
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 023d3df851e5..a55cc29eb648 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -237,7 +237,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							/>
 						</FieldRow>
 						{errors?.email && (
-							<FieldError aria-live='assertive' id={`${emailId}-error`} fontScale='c1' mbs={12}>
+							<FieldError aria-live='assertive' id={`${emailId}-error`}>
 								{errors.email.message}
 							</FieldError>
 						)}
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 7c644744c3cf..7277e183eae6 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0",
-    "@rocket.chat/ui-contexts": "10.0.0",
-    "@rocket.chat/ui-kit": "0.36.1",
-    "@rocket.chat/ui-video-conf": "10.0.0",
+    "@rocket.chat/ui-avatar": "*",
+    "@rocket.chat/ui-contexts": "*",
+    "@rocket.chat/ui-kit": "*",
+    "@rocket.chat/ui-video-conf": "*",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 8b751c895b0f..d4a18fb09a76 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -66,8 +66,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.29",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-client": "*",
+		"@rocket.chat/ui-contexts": "*",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 66a50ce8c8e1..42860fd8692a 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-contexts": "*",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index d9cdb9f24ade..0e969e173ca1 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-contexts": "*",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 40253050d9bf..d10c05edad2c 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-avatar": "*",
+		"@rocket.chat/ui-contexts": "*",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index e12b653ebfeb..2023641c15ab 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-contexts": "*",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index aa2b104e5190..65ebae84019b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8934,10 +8934,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0
-    "@rocket.chat/ui-contexts": 10.0.0
-    "@rocket.chat/ui-kit": 0.36.1
-    "@rocket.chat/ui-video-conf": 10.0.0
+    "@rocket.chat/ui-avatar": "*"
+    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-kit": "*"
+    "@rocket.chat/ui-video-conf": "*"
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9021,8 +9021,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 10.0.0
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-client": "*"
+    "@rocket.chat/ui-contexts": "*"
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10228,7 +10228,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-contexts": "*"
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10278,7 +10278,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-contexts": "*"
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10448,8 +10448,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-avatar": "*"
+    "@rocket.chat/ui-contexts": "*"
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10536,7 +10536,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-contexts": "*"
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 41a1816e2e997b0e47d859f20b0fc25990d31d29 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:42:32 -0300
Subject: [PATCH 072/170] fix: Retention Policy cached settings not updated
 during upgrade procedure (#33237)

---
 .changeset/pink-swans-teach.md                |  5 +++++
 apps/meteor/server/startup/migrations/xrun.ts | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/pink-swans-teach.md

diff --git a/.changeset/pink-swans-teach.md b/.changeset/pink-swans-teach.md
new file mode 100644
index 000000000000..7c85572a78d5
--- /dev/null
+++ b/.changeset/pink-swans-teach.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed retention policy max age settings not being respected after upgrade
diff --git a/apps/meteor/server/startup/migrations/xrun.ts b/apps/meteor/server/startup/migrations/xrun.ts
index 7f6c8a68ad55..0344649f9993 100644
--- a/apps/meteor/server/startup/migrations/xrun.ts
+++ b/apps/meteor/server/startup/migrations/xrun.ts
@@ -2,6 +2,7 @@ import { Settings } from '@rocket.chat/models';
 import type { UpdateResult } from 'mongodb';
 
 import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';
+import { settings } from '../../../app/settings/server';
 import { migrateDatabase, onServerVersionChange } from '../../lib/migrations';
 import { ensureCloudWorkspaceRegistered } from '../cloudRegistration';
 
@@ -23,10 +24,13 @@ const moveRetentionSetting = async () => {
 		{ _id: { $in: Array.from(maxAgeSettingMap.keys()) }, value: { $ne: -1 } },
 		{ projection: { _id: 1, value: 1 } },
 	).forEach(({ _id, value }) => {
-		if (!maxAgeSettingMap.has(_id)) {
+		const newSettingId = maxAgeSettingMap.get(_id);
+		if (!newSettingId) {
 			throw new Error(`moveRetentionSetting - Setting ${_id} equivalent does not exist`);
 		}
 
+		const newValue = convertDaysToMs(Number(value));
+
 		promises.push(
 			Settings.updateOne(
 				{
@@ -34,11 +38,17 @@ const moveRetentionSetting = async () => {
 				},
 				{
 					$set: {
-						value: convertDaysToMs(Number(value)),
+						value: newValue,
 					},
 				},
 			),
 		);
+
+		const currentCache = settings.getSetting(newSettingId);
+		if (!currentCache) {
+			return;
+		}
+		settings.set({ ...currentCache, value: newValue });
 	});
 
 	await Promise.all(promises);

From 7cb6de00336dcec878edcb223e7bb6158a848565 Mon Sep 17 00:00:00 2001
From: "Julio A." <52619625+julio-cfa@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:06:20 +0200
Subject: [PATCH 073/170] fix: imported fixes (#33246)

---
 .changeset/many-rules-shout.md                |   5 +
 .../server/functions/canDeleteMessage.ts      |  28 +-
 .../app/otr/server/methods/updateOTRAck.ts    |  38 +-
 .../tabs/AppDetails/AppDetails.tsx            |  11 +-
 .../tabs/AppReleases/AppReleasesItem.tsx      |   4 +-
 .../views/marketplace/lib/purifyOptions.ts    |  50 ++
 apps/meteor/server/models/raw/Rooms.ts        |   4 +
 apps/meteor/tests/end-to-end/api/methods.ts   | 454 ++++++++++++++++++
 packages/gazzodown/package.json               |   2 +
 .../gazzodown/src/emoji/EmojiRenderer.tsx     |  11 +-
 packages/gazzodown/src/katex/KatexBlock.tsx   |   1 +
 packages/gazzodown/src/katex/KatexElement.tsx |   1 +
 .../model-typings/src/models/IRoomsModel.ts   |   1 +
 13 files changed, 595 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/many-rules-shout.md
 create mode 100644 apps/meteor/client/views/marketplace/lib/purifyOptions.ts

diff --git a/.changeset/many-rules-shout.md b/.changeset/many-rules-shout.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/many-rules-shout.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
index 7cd953a52bb2..fea37fd1c2a5 100644
--- a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
+++ b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
@@ -1,7 +1,8 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 
 import { getValue } from '../../../settings/server/raw';
+import { canAccessRoomAsync } from './canAccessRoom';
 import { hasPermissionAsync } from './hasPermission';
 
 const elapsedTime = (ts: Date): number => {
@@ -13,6 +14,25 @@ export const canDeleteMessageAsync = async (
 	uid: string,
 	{ u, rid, ts }: { u: Pick<IUser, '_id' | 'username'>; rid: string; ts: Date },
 ): Promise<boolean> => {
+	const room = await Rooms.findOneById<Pick<IRoom, '_id' | 'ro' | 'unmuted' | 't' | 'teamId' | 'prid'>>(rid, {
+		projection: {
+			_id: 1,
+			ro: 1,
+			unmuted: 1,
+			t: 1,
+			teamId: 1,
+			prid: 1,
+		},
+	});
+
+	if (!room) {
+		return false;
+	}
+
+	if (!(await canAccessRoomAsync(room, { _id: uid }))) {
+		return false;
+	}
+
 	const forceDelete = await hasPermissionAsync(uid, 'force-delete-message', rid);
 
 	if (forceDelete) {
@@ -45,12 +65,6 @@ export const canDeleteMessageAsync = async (
 		}
 	}
 
-	const room = await Rooms.findOneById(rid, { projection: { ro: 1, unmuted: 1 } });
-
-	if (!room) {
-		return false;
-	}
-
 	if (room.ro === true && !(await hasPermissionAsync(uid, 'post-readonly', rid))) {
 		// Unless the user was manually unmuted
 		if (u.username && !(room.unmuted || []).includes(u.username)) {
diff --git a/apps/meteor/app/otr/server/methods/updateOTRAck.ts b/apps/meteor/app/otr/server/methods/updateOTRAck.ts
index 4fbd182e9d27..64e5e97fa4e5 100644
--- a/apps/meteor/app/otr/server/methods/updateOTRAck.ts
+++ b/apps/meteor/app/otr/server/methods/updateOTRAck.ts
@@ -1,8 +1,12 @@
 import { api } from '@rocket.chat/core-services';
 import type { IOTRMessage } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
+import { Rooms } from '@rocket.chat/models';
+import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { canAccessRoomAsync } from '../../../authorization/server/functions/canAccessRoom';
+
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
@@ -11,10 +15,40 @@ declare module '@rocket.chat/ddp-client' {
 }
 
 Meteor.methods<ServerMethods>({
-	updateOTRAck({ message, ack }) {
-		if (!Meteor.userId()) {
+	async updateOTRAck({ message, ack }) {
+		const uid = Meteor.userId();
+		if (!uid) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'updateOTRAck' });
 		}
+
+		check(ack, String);
+		check(message, {
+			_id: String,
+			rid: String,
+			msg: String,
+			t: String,
+			ts: Date,
+			u: {
+				_id: String,
+				username: String,
+				name: String,
+			},
+		});
+
+		if (message?.t !== 'otr') {
+			throw new Meteor.Error('error-invalid-message', 'Invalid message type', { method: 'updateOTRAck' });
+		}
+
+		const room = await Rooms.findOneByIdAndType(message.rid, 'd', { projection: { t: 1, _id: 1, uids: 1 } });
+
+		if (!room) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'updateOTRAck' });
+		}
+
+		if (!(await canAccessRoomAsync(room, { _id: uid })) || (room.uids && (!message.u._id || !room.uids.includes(message.u._id)))) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user, not in room', { method: 'updateOTRAck' });
+		}
+
 		const acknowledgeMessage: IOTRMessage = { ...message, otrAck: ack };
 		void api.broadcast('otrAckUpdate', { roomId: message.rid, acknowledgeMessage });
 	},
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 8d17f669db83..5f3e427b8391 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -2,10 +2,12 @@ import { Box, Callout, Chip, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import DOMPurify from 'dompurify';
 import React from 'react';
 
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
 import type { AppInfo } from '../../../definitions/AppInfo';
+import { purifyOptions } from '../../../lib/purifyOptions';
 import AppDetailsAPIs from './AppDetailsAPIs';
 import { normalizeUrl } from './normalizeUrl';
 
@@ -61,7 +63,14 @@ const AppDetails = ({ app }: AppDetailsProps) => {
 						<Box fontScale='h4' mbe={8} color='titles-labels'>
 							{t('Description')}
 						</Box>
-						<Box dangerouslySetInnerHTML={{ __html: isMarkdown ? detailedDescription.rendered : description }} withRichContent />
+						<Box
+							dangerouslySetInnerHTML={{
+								__html: isMarkdown
+									? DOMPurify.sanitize(detailedDescription.rendered, purifyOptions)
+									: DOMPurify.sanitize(description, purifyOptions),
+							}}
+							withRichContent
+						/>
 					</Box>
 
 					<Box is='section'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
index bc27053ea1d2..974b6d148e61 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
@@ -1,9 +1,11 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
 
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
+import { purifyOptions } from '../../../lib/purifyOptions';
 
 type IRelease = {
 	version: string;
@@ -36,7 +38,7 @@ const AppReleasesItem = ({ release, ...props }: ReleaseItemProps): ReactElement
 	return (
 		<Accordion.Item title={title} {...props}>
 			{release.detailedChangelog?.rendered ? (
-				<Box dangerouslySetInnerHTML={{ __html: release.detailedChangelog?.rendered }} color='default' />
+				<Box dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(release.detailedChangelog?.rendered, purifyOptions) }} color='default' />
 			) : (
 				<Box color='default'>{t('No_release_information_provided')}</Box>
 			)}
diff --git a/apps/meteor/client/views/marketplace/lib/purifyOptions.ts b/apps/meteor/client/views/marketplace/lib/purifyOptions.ts
new file mode 100644
index 000000000000..cef1a2c8c707
--- /dev/null
+++ b/apps/meteor/client/views/marketplace/lib/purifyOptions.ts
@@ -0,0 +1,50 @@
+export const purifyOptions = {
+	ALLOWED_TAGS: [
+		'b',
+		'i',
+		'em',
+		'strong',
+		'br',
+		'p',
+		'ul',
+		'ol',
+		'li',
+		'article',
+		'aside',
+		'figure',
+		'section',
+		'summary',
+		'h1',
+		'h2',
+		'h3',
+		'h4',
+		'h5',
+		'h6',
+		'hgroup',
+		'div',
+		'hr',
+		'span',
+		'wbr',
+		'abbr',
+		'acronym',
+		'cite',
+		'code',
+		'dfn',
+		'figcaption',
+		'mark',
+		's',
+		'samp',
+		'sub',
+		'sup',
+		'var',
+		'time',
+		'q',
+		'del',
+		'ins',
+		'rp',
+		'rt',
+		'ruby',
+		'bdi',
+		'bdo',
+	],
+};
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index 96cd5a3a3acf..ec3bd6fe8d40 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -903,6 +903,10 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.findOne(query, options);
 	}
 
+	findOneByIdAndType(roomId: IRoom['_id'], type: IRoom['t'], options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
+		return this.findOne({ _id: roomId, t: type }, options);
+	}
+
 	setCallStatus(_id: IRoom['_id'], status: IRoom['callStatus']): Promise<UpdateResult> {
 		const query: Filter<IRoom> = {
 			_id,
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index 197a71f8e8f2..08945994e438 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -2602,6 +2602,158 @@ describe('Meteor.methods', () => {
 				updateSetting('Message_AllowEditing_BlockEditInMinutes', 0),
 			]);
 		});
+
+		describe('message deletion when user is not part of the room', () => {
+			let ridTestRoom: IRoom['_id'];
+			let messageIdTestRoom: IMessage['_id'];
+			let testUser: TestUser<IUser>;
+			let testUserCredentials: Credentials;
+
+			before('create room, add new owner, and leave room', async () => {
+				testUser = await createUser();
+				testUserCredentials = await login(testUser.username, password);
+				const channelName = `methods-test-channel-${Date.now()}`;
+
+				await request
+					.post(api('groups.create'))
+					.set(testUserCredentials)
+					.send({
+						name: channelName,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('group._id');
+						expect(res.body).to.have.nested.property('group.name', channelName);
+						expect(res.body).to.have.nested.property('group.t', 'p');
+						expect(res.body).to.have.nested.property('group.msgs', 0);
+						ridTestRoom = res.body.group._id;
+					});
+
+				await request
+					.post(methodCall('sendMessage'))
+					.set(testUserCredentials)
+					.send({
+						message: JSON.stringify({
+							method: 'sendMessage',
+							params: [
+								{
+									_id: `${Date.now() + Math.random()}`,
+									rid: ridTestRoom,
+									msg: 'just a random test message',
+								},
+							],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+						const data = JSON.parse(res.body.message);
+						expect(data).to.have.a.property('result').that.is.an('object');
+						messageIdTestRoom = data.result._id;
+					});
+
+				await request
+					.post(methodCall('addUsersToRoom'))
+					.set(testUserCredentials)
+					.send({
+						message: JSON.stringify({
+							method: 'addUsersToRoom',
+							params: [
+								{
+									rid: ridTestRoom,
+									users: ['rocket.cat'],
+								},
+							],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+					});
+
+				await request
+					.post(api('groups.addOwner'))
+					.set(testUserCredentials)
+					.send({
+						roomId: ridTestRoom,
+						userId: 'rocket.cat',
+					})
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+					});
+
+				await request
+					.post(api('groups.leave'))
+					.set(testUserCredentials)
+					.send({
+						roomId: ridTestRoom,
+					})
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+					});
+			});
+
+			it('should not delete a message if the user is no longer member of the room', async () => {
+				await request
+					.post(methodCall('deleteMessage'))
+					.set(testUserCredentials)
+					.send({
+						message: JSON.stringify({
+							method: 'deleteMessage',
+							params: [{ _id: messageIdTestRoom, rid: ridTestRoom }],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+						const data = JSON.parse(res.body.message);
+						expect(data).to.have.a.property('msg', 'result');
+						expect(data).to.have.a.property('id', 'id');
+						expect(data.error).to.have.a.property('error', 'error-action-not-allowed');
+					});
+			});
+
+			it('should not delete a message if the user was never part of the room', async () => {
+				await request
+					.post(methodCall('deleteMessage'))
+					.set(credentials)
+					.send({
+						message: JSON.stringify({
+							method: 'deleteMessage',
+							params: [{ _id: messageIdTestRoom, rid: ridTestRoom }],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+						const data = JSON.parse(res.body.message);
+						expect(data).to.have.a.property('msg', 'result');
+						expect(data).to.have.a.property('id', 'id');
+						expect(data.error).to.have.a.property('error', 'error-action-not-allowed');
+					});
+			});
+
+			after(() => Promise.all([deleteRoom({ type: 'p', roomId: ridTestRoom }), deleteUser(testUser)]));
+		});
 	});
 
 	describe('[@setUserActiveStatus]', () => {
@@ -3348,6 +3500,7 @@ describe('Meteor.methods', () => {
 				.end(done);
 		});
 	});
+
 	(IS_EE ? describe : describe.skip)('[@auditGetAuditions] EE', () => {
 		let testUser: TestUser<IUser>;
 		let testUserCredentials: Credentials;
@@ -3451,4 +3604,305 @@ describe('Meteor.methods', () => {
 				});
 		});
 	});
+
+	describe('UpdateOTRAck', () => {
+		let testUser: TestUser<IUser>;
+		let testUser2: TestUser<IUser>;
+		let testUserCredentials: Credentials;
+		let dmTestId: IRoom['_id'];
+
+		before(async () => {
+			testUser = await createUser();
+			testUser2 = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+		});
+
+		before('create direct conversation between both users', (done) => {
+			void request
+				.post(methodCall('createDirectMessage'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'createDirectMessage',
+						params: [testUser2.username],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.end((_err, res) => {
+					const result = JSON.parse(res.body.message);
+					expect(result.result).to.be.an('object');
+					expect(result.result).to.have.property('rid').that.is.an('string');
+
+					dmTestId = result.result.rid;
+					done();
+				});
+		});
+
+		after(() => Promise.all([deleteRoom({ type: 'd', roomId: dmTestId }), deleteUser(testUser), deleteUser(testUser2)]));
+
+		it('should fail if required parameters are not present', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									// rid: 'test',
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', "Match error: Missing key 'rid'");
+				});
+		});
+
+		it('should fail if required parameters have a different type', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: { $ne: 'test' },
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Match error: Expected string, got object in field rid');
+				});
+		});
+
+		it('should fail if "t" is not "otr"', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: 'test',
+									msg: 'test',
+									t: 'notOTR',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid message type [error-invalid-message]');
+				});
+		});
+
+		it('should fail if room does not exist', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: 'test',
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid room [error-invalid-room]');
+				});
+		});
+
+		it('should fail if room is not a DM', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: 'GENERAL',
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid room [error-invalid-room]');
+				});
+		});
+
+		it('should fail if user is not part of DM room', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: dmTestId,
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: testUser._id,
+										username: testUser.username,
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid user, not in room [error-invalid-user]');
+				});
+		});
+
+		it('should pass if all parameters are present and user is part of DM room', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: dmTestId,
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: testUser._id,
+										username: testUser.username,
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					expect(res.body).to.have.a.property('success', true);
+				});
+		});
+	});
 });
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index d4a18fb09a76..f6c48c7f8e47 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -72,7 +72,9 @@
 		"react": "*"
 	},
 	"dependencies": {
+		"@types/dompurify": "^3.0.5",
 		"date-fns": "^3.3.1",
+		"dompurify": "^3.1.6",
 		"highlight.js": "^11.5.1",
 		"react-error-boundary": "^3.1.4"
 	},
diff --git a/packages/gazzodown/src/emoji/EmojiRenderer.tsx b/packages/gazzodown/src/emoji/EmojiRenderer.tsx
index 7a4ca5324930..84116361157c 100644
--- a/packages/gazzodown/src/emoji/EmojiRenderer.tsx
+++ b/packages/gazzodown/src/emoji/EmojiRenderer.tsx
@@ -1,5 +1,6 @@
 import { MessageEmoji, ThreadMessageEmoji } from '@rocket.chat/fuselage';
 import type * as MessageParser from '@rocket.chat/message-parser';
+import DOMPurify from 'dompurify';
 import { ReactElement, useMemo, useContext, memo } from 'react';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
@@ -14,10 +15,12 @@ const EmojiRenderer = ({ big = false, preview = false, ...emoji }: EmojiProps):
 
 	const fallback = useMemo(() => ('unicode' in emoji ? emoji.unicode : `:${emoji.shortCode ?? emoji.value.value}:`), [emoji]);
 
+	const sanitizedFallback = DOMPurify.sanitize(fallback);
+
 	const descriptors = useMemo(() => {
-		const detected = detectEmoji?.(fallback);
+		const detected = detectEmoji?.(sanitizedFallback);
 		return detected?.length !== 0 ? detected : undefined;
-	}, [detectEmoji, fallback]);
+	}, [detectEmoji, sanitizedFallback]);
 
 	return (
 		<>
@@ -34,8 +37,8 @@ const EmojiRenderer = ({ big = false, preview = false, ...emoji }: EmojiProps):
 					)}
 				</span>
 			)) ?? (
-				<span role='img' aria-label={fallback.charAt(0) === ':' ? fallback : undefined}>
-					{fallback}
+				<span role='img' aria-label={sanitizedFallback.charAt(0) === ':' ? sanitizedFallback : undefined}>
+					{sanitizedFallback}
 				</span>
 			)}
 		</>
diff --git a/packages/gazzodown/src/katex/KatexBlock.tsx b/packages/gazzodown/src/katex/KatexBlock.tsx
index 5913185d3969..267b310b3897 100644
--- a/packages/gazzodown/src/katex/KatexBlock.tsx
+++ b/packages/gazzodown/src/katex/KatexBlock.tsx
@@ -15,6 +15,7 @@ const KatexBlock = ({ code }: KatexBlockProps): ReactElement => {
 				macros: {
 					'\\href': '\\@secondoftwo',
 				},
+				maxSize: 100,
 			}),
 		[code],
 	);
diff --git a/packages/gazzodown/src/katex/KatexElement.tsx b/packages/gazzodown/src/katex/KatexElement.tsx
index 3595f698f7ae..099c2f82cf8c 100644
--- a/packages/gazzodown/src/katex/KatexElement.tsx
+++ b/packages/gazzodown/src/katex/KatexElement.tsx
@@ -15,6 +15,7 @@ const KatexElement = ({ code }: KatexElementProps): ReactElement => {
 				macros: {
 					'\\href': '\\@secondoftwo',
 				},
+				maxSize: 100,
 			}),
 		[code],
 	);
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index 498a3c6b4bbc..9097a89c1413 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -192,6 +192,7 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	setE2eKeyId(roomId: string, e2eKeyId: string, options?: FindOptions<IRoom>): Promise<UpdateResult>;
 	findOneByImportId(importId: string, options?: FindOptions<IRoom>): Promise<IRoom | null>;
 	findOneByNameAndNotId(name: string, rid: string): Promise<IRoom | null>;
+	findOneByIdAndType(roomId: IRoom['_id'], type: IRoom['t'], options?: FindOptions<IRoom>): Promise<IRoom | null>;
 	findOneByDisplayName(displayName: string, options?: FindOptions<IRoom>): Promise<IRoom | null>;
 	findOneByNameAndType(
 		name: string,

From c2d7216c1c50254f028456f175675d909084b5ab Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 15:25:17 +0000
Subject: [PATCH 074/170] fix: Retention Policy cached settings not updated
 during upgrade procedure (#33265)

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
---
 .changeset/pink-swans-teach.md                |  5 +++++
 apps/meteor/server/startup/migrations/xrun.ts | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/pink-swans-teach.md

diff --git a/.changeset/pink-swans-teach.md b/.changeset/pink-swans-teach.md
new file mode 100644
index 000000000000..7c85572a78d5
--- /dev/null
+++ b/.changeset/pink-swans-teach.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed retention policy max age settings not being respected after upgrade
diff --git a/apps/meteor/server/startup/migrations/xrun.ts b/apps/meteor/server/startup/migrations/xrun.ts
index 7f6c8a68ad55..0344649f9993 100644
--- a/apps/meteor/server/startup/migrations/xrun.ts
+++ b/apps/meteor/server/startup/migrations/xrun.ts
@@ -2,6 +2,7 @@ import { Settings } from '@rocket.chat/models';
 import type { UpdateResult } from 'mongodb';
 
 import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';
+import { settings } from '../../../app/settings/server';
 import { migrateDatabase, onServerVersionChange } from '../../lib/migrations';
 import { ensureCloudWorkspaceRegistered } from '../cloudRegistration';
 
@@ -23,10 +24,13 @@ const moveRetentionSetting = async () => {
 		{ _id: { $in: Array.from(maxAgeSettingMap.keys()) }, value: { $ne: -1 } },
 		{ projection: { _id: 1, value: 1 } },
 	).forEach(({ _id, value }) => {
-		if (!maxAgeSettingMap.has(_id)) {
+		const newSettingId = maxAgeSettingMap.get(_id);
+		if (!newSettingId) {
 			throw new Error(`moveRetentionSetting - Setting ${_id} equivalent does not exist`);
 		}
 
+		const newValue = convertDaysToMs(Number(value));
+
 		promises.push(
 			Settings.updateOne(
 				{
@@ -34,11 +38,17 @@ const moveRetentionSetting = async () => {
 				},
 				{
 					$set: {
-						value: convertDaysToMs(Number(value)),
+						value: newValue,
 					},
 				},
 			),
 		);
+
+		const currentCache = settings.getSetting(newSettingId);
+		if (!currentCache) {
+			return;
+		}
+		settings.set({ ...currentCache, value: newValue });
 	});
 
 	await Promise.all(promises);

From ec6f6a650a552f39dec4af757ebefec3dbe54782 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Thu, 12 Sep 2024 15:05:00 -0300
Subject: [PATCH 075/170] chore: moved UserAutoComplete to ui-client package
 (#33249)

---
 apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx       | 2 +-
 .../client/views/omnichannel/agents/AgentsTable/AddAgent.tsx    | 2 +-
 apps/meteor/client/views/omnichannel/managers/AddManager.tsx    | 2 +-
 .../components/UserAutoComplete/UserAutoComplete.stories.tsx    | 1 -
 .../src}/components/UserAutoComplete/UserAutoComplete.tsx       | 2 +-
 .../ui-client/src}/components/UserAutoComplete/index.ts         | 0
 packages/ui-client/src/components/index.ts                      | 1 +
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename {apps/meteor/client => packages/ui-client/src}/components/UserAutoComplete/UserAutoComplete.stories.tsx (94%)
 rename {apps/meteor/client => packages/ui-client/src}/components/UserAutoComplete/UserAutoComplete.tsx (97%)
 rename {apps/meteor/client => packages/ui-client/src}/components/UserAutoComplete/index.ts (100%)

diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
index 62adc2a0405f..76a95cf4a0e7 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
@@ -13,6 +13,7 @@ import {
 	StatesAction,
 } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
 import { useTranslation, useToastMessageDispatch, useMethod, useEndpoint, useSetModal } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
@@ -31,7 +32,6 @@ import {
 } from '../../components/GenericTable';
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../components/GenericTable/hooks/useSort';
-import UserAutoComplete from '../../components/UserAutoComplete';
 import { queryClient } from '../../lib/queryClient';
 
 const MonitorsTable = () => {
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
index 47d60b3d9958..4ad019281bbf 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
@@ -1,10 +1,10 @@
 import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
-import UserAutoComplete from '../../../../components/UserAutoComplete';
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 
 type AddAgentProps = {
diff --git a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
index e21896eef9fa..24817a03846e 100644
--- a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
@@ -1,10 +1,10 @@
 import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
-import UserAutoComplete from '../../../components/UserAutoComplete';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
 const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.stories.tsx
similarity index 94%
rename from apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
rename to packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.stories.tsx
index 757c10b35b86..b9baa3174dda 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
+++ b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.stories.tsx
@@ -1,5 +1,4 @@
 import type { ComponentMeta, ComponentStory } from '@storybook/react';
-import React from 'react';
 
 import UserAutoComplete from '.';
 
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.tsx
similarity index 97%
rename from apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
rename to packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.tsx
index 3f61f421035c..72a8eecec4d0 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.tsx
@@ -4,7 +4,7 @@ import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ComponentProps, ReactElement } from 'react';
-import React, { memo, useMemo, useState } from 'react';
+import { memo, useMemo, useState } from 'react';
 
 const query = (
 	term = '',
diff --git a/apps/meteor/client/components/UserAutoComplete/index.ts b/packages/ui-client/src/components/UserAutoComplete/index.ts
similarity index 100%
rename from apps/meteor/client/components/UserAutoComplete/index.ts
rename to packages/ui-client/src/components/UserAutoComplete/index.ts
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index 1eccad1fd234..f78c32427cdb 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -13,3 +13,4 @@ export * from './HeaderV2';
 export * from './MultiSelectCustom/MultiSelectCustom';
 export * from './FeaturePreview/FeaturePreview';
 export * from './RoomBanner';
+export { default as UserAutoComplete } from './UserAutoComplete';

From 811e2cb5762b126f6b7cb4709f822c80fd75bf54 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Thu, 12 Sep 2024 16:24:15 -0300
Subject: [PATCH 076/170] chore: move GenericMenu to ui-client package (#33247)

---
 .../NavBarPagesToolbar/NavBarItemAuditMenu.tsx       |  2 +-
 .../NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx |  2 +-
 .../NavBarPagesToolbar/hooks/useAuditMenu.tsx        |  2 +-
 .../NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx  |  2 +-
 .../NavBarItemAdministrationMenu.tsx                 |  2 +-
 .../NavBarSettingsToolbar/UserMenu/UserMenu.tsx      |  5 ++---
 .../UserMenu/hooks/useAccountItems.tsx               |  3 +--
 .../UserMenu/hooks/useStatusItems.tsx                |  2 +-
 .../UserMenu/hooks/useUserMenu.tsx                   |  2 +-
 .../hooks/useAdministrationMenu.tsx                  |  3 +--
 .../components/message/toolbar/MessageActionMenu.tsx |  3 +--
 apps/meteor/client/hooks/useAppActionButtons.ts      |  2 +-
 .../navbar/actions/NavbarAdministrationAction.tsx    |  3 +--
 .../client/navbar/actions/NavbarAuditAction.tsx      |  3 +--
 .../navbar/actions/NavbarMarketplaceAction.tsx       |  3 +--
 apps/meteor/client/sidebar/header/UserMenu.tsx       | 12 ++++++++----
 .../client/sidebar/header/actions/Administration.tsx |  2 +-
 .../client/sidebar/header/actions/CreateRoom.tsx     |  2 +-
 apps/meteor/client/sidebar/header/actions/Sort.tsx   |  2 +-
 .../header/actions/hooks/useAdministrationItems.tsx  |  3 +--
 .../header/actions/hooks/useAdministrationMenu.tsx   |  2 +-
 .../sidebar/header/actions/hooks/useAppsItems.tsx    |  2 +-
 .../sidebar/header/actions/hooks/useAuditItems.tsx   |  2 +-
 .../header/actions/hooks/useCreateRoomItems.tsx      |  2 +-
 .../header/actions/hooks/useGroupingListItems.tsx    |  3 +--
 .../actions/hooks/useMatrixFederationItems.tsx.tsx   |  2 +-
 .../header/actions/hooks/useSortModeItems.tsx        |  2 +-
 .../header/actions/hooks/useViewModeItems.tsx        |  3 +--
 .../client/sidebar/header/hooks/useAccountItems.tsx  |  3 +--
 .../client/sidebar/header/hooks/useStatusItems.tsx   |  2 +-
 .../client/sidebar/header/hooks/useUserMenu.tsx      |  2 +-
 .../client/sidebarv2/header/actions/CreateRoom.tsx   |  2 +-
 apps/meteor/client/sidebarv2/header/actions/Sort.tsx |  2 +-
 .../header/actions/hooks/useCreateRoomItems.tsx      |  2 +-
 .../header/actions/hooks/useGroupingListItems.tsx    |  3 +--
 .../header/actions/hooks/useMatrixFederationItems.ts |  2 +-
 .../header/actions/hooks/useSortModeItems.tsx        |  2 +-
 .../header/actions/hooks/useViewModeItems.tsx        |  3 +--
 .../views/admin/moderation/MessageContextFooter.tsx  |  2 +-
 .../admin/moderation/ModerationConsoleActions.tsx    |  2 +-
 .../moderation/UserReports/ModConsoleUserActions.tsx |  2 +-
 .../moderation/UserReports/UserContextFooter.tsx     |  2 +-
 .../moderation/hooks/useDeactivateUserAction.tsx     |  2 +-
 .../moderation/hooks/useDeleteMessagesAction.tsx     |  2 +-
 .../admin/moderation/hooks/useDismissUserAction.tsx  |  2 +-
 .../admin/moderation/hooks/useResetAvatarAction.tsx  |  2 +-
 apps/meteor/client/views/marketplace/AppMenu.tsx     |  2 +-
 .../views/room/Header/RoomToolbox/RoomToolbox.tsx    |  4 ++--
 .../views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx  |  4 ++--
 .../client/views/room/UserCard/UserCardWithData.tsx  |  2 +-
 .../MessageBoxActionsToolbar.tsx                     |  4 ++--
 .../hooks/useAudioMessageAction.ts                   |  2 +-
 .../hooks/useCreateDiscussionAction.tsx              |  2 +-
 .../hooks/useFileUploadAction.ts                     |  2 +-
 .../hooks/useShareLocationAction.tsx                 |  2 +-
 .../hooks/useVideoMessageAction.ts                   |  2 +-
 .../hooks/useWebdavActions.tsx                       |  2 +-
 .../FormattingToolbarDropdown.tsx                    |  4 ++--
 .../room/contextualBar/Info/RoomInfo/RoomInfo.tsx    |  2 +-
 .../contextualBar/RoomMembers/RoomMembersActions.tsx |  2 +-
 .../room/contextualBar/UserInfo/UserInfoActions.tsx  |  2 +-
 .../hooks/useUserInfoActions/useUserInfoActions.ts   |  2 +-
 .../contextualBar/channels/TeamsChannelItemMenu.tsx  |  4 ++--
 .../src}/components/GenericMenu/GenericMenu.spec.tsx |  1 -
 .../src}/components/GenericMenu/GenericMenu.tsx      |  2 +-
 .../src}/components/GenericMenu/GenericMenuItem.tsx  |  1 -
 .../GenericMenu/hooks/useHandleMenuAction.tsx        |  5 ++---
 .../ui-client/src/components/GenericMenu/index.ts    |  3 +++
 packages/ui-client/src/components/index.ts           |  1 +
 69 files changed, 83 insertions(+), 91 deletions(-)
 rename {apps/meteor/client => packages/ui-client/src}/components/GenericMenu/GenericMenu.spec.tsx (98%)
 rename {apps/meteor/client => packages/ui-client/src}/components/GenericMenu/GenericMenu.tsx (99%)
 rename {apps/meteor/client => packages/ui-client/src}/components/GenericMenu/GenericMenuItem.tsx (97%)
 rename {apps/meteor/client => packages/ui-client/src}/components/GenericMenu/hooks/useHandleMenuAction.tsx (81%)
 create mode 100644 packages/ui-client/src/components/GenericMenu/index.ts

diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
index 07936f6f4276..7c8a50338e7d 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
@@ -1,9 +1,9 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
 import { useAuditMenu } from './hooks/useAuditMenu';
 
 type NavBarItemAuditMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
index 4a2bbc916b57..85687bb12a2e 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
@@ -1,9 +1,9 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
 import { useMarketPlaceMenu } from './hooks/useMarketPlaceMenu';
 
 type NavBarItemMarketPlaceMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
index 88a2a5de31aa..97c8d7299497 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
 export const useAuditMenu = () => {
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx
index fd704ffafe1f..034ab0367e81 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx
@@ -1,8 +1,8 @@
 import { Badge, Skeleton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, usePermission, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import { useUserDropdownAppsActionButtons } from '../../../hooks/useAppActionButtons';
 import { useAppRequestStats } from '../../../views/marketplace/hooks/useAppRequestStats';
 
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
index 045b36425512..8236eec030e8 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
@@ -1,9 +1,9 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type NavBarItemAdministrationMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
index 531ff8a74b66..22895d55388f 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
@@ -1,11 +1,10 @@
 import type { IUser } from '@rocket.chat/core-typings';
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useState } from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
-import { useHandleMenuAction } from '../../../components/GenericMenu/hooks/useHandleMenuAction';
 import UserMenuButton from './UserMenuButton';
 import { useUserMenu } from './hooks/useUserMenu';
 
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
index bf1b7e55f244..82c39c5c1b10 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
@@ -1,11 +1,10 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
index 2957d22c5e32..1c9cf09e4610 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { callbacks } from '../../../../../lib/callbacks';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import MarkdownText from '../../../../components/MarkdownText';
 import { UserStatus } from '../../../../components/UserStatus';
 import { userStatuses } from '../../../../lib/userStatuses';
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index a969c853d797..85a481f3e257 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLogout, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
index 54d4818128ea..e3c4a358c7c1 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
@@ -1,7 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useAtLeastOnePermission, usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
-
 const ADMIN_PERMISSIONS = [
 	'view-statistics',
 	'run-import',
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 6c35f7b73dbd..155599c5b51d 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,11 +1,10 @@
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
 
 import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
-import GenericMenu from '../../GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../GenericMenu/GenericMenuItem';
 
 type MessageActionConfigOption = Omit<MessageActionConfig, 'condition' | 'context' | 'order' | 'action'> & {
 	action: (e?: MouseEvent<HTMLElement>) => void;
diff --git a/apps/meteor/client/hooks/useAppActionButtons.ts b/apps/meteor/client/hooks/useAppActionButtons.ts
index 5ee20f7772bf..64c46f370a1f 100644
--- a/apps/meteor/client/hooks/useAppActionButtons.ts
+++ b/apps/meteor/client/hooks/useAppActionButtons.ts
@@ -1,5 +1,6 @@
 import type { IUIActionButton, UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useStream, useToastMessageDispatch, useUserId } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
@@ -10,7 +11,6 @@ import { UiKitTriggerTimeoutError } from '../../app/ui-message/client/UiKitTrigg
 import type { MessageActionConfig, MessageActionContext } from '../../app/ui-utils/client/lib/MessageAction';
 import type { MessageBoxAction } from '../../app/ui-utils/client/lib/messageBox';
 import { Utilities } from '../../ee/lib/misc/Utilities';
-import type { GenericMenuItemProps } from '../components/GenericMenu/GenericMenuItem';
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
 import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters';
 
diff --git a/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx b/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx
index 3431b9e928ad..f3c34c333dc5 100644
--- a/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx
@@ -1,9 +1,8 @@
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import { NavbarAction } from '../../components/Navbar';
 import { useAdministrationItems } from '../../sidebar/header/actions/hooks/useAdministrationItems';
 
diff --git a/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx b/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx
index fc613be29b99..7e679faf0ab2 100644
--- a/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx
@@ -1,9 +1,8 @@
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import { NavbarAction } from '../../components/Navbar';
 import { useAuditItems } from '../../sidebar/header/actions/hooks/useAuditItems';
 
diff --git a/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx b/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx
index 8f54b8260b2b..92e3eccf592a 100644
--- a/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx
@@ -1,10 +1,9 @@
 import { IconButton } from '@rocket.chat/fuselage';
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import { NavbarAction } from '../../components/Navbar';
 import { useAppsItems } from '../../sidebar/header/actions/hooks/useAppsItems';
 
diff --git a/apps/meteor/client/sidebar/header/UserMenu.tsx b/apps/meteor/client/sidebar/header/UserMenu.tsx
index 592fc19656e9..b106caa20b16 100644
--- a/apps/meteor/client/sidebar/header/UserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenu.tsx
@@ -1,11 +1,15 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { FeaturePreview, FeaturePreviewOn, FeaturePreviewOff } from '@rocket.chat/ui-client';
+import {
+	FeaturePreview,
+	FeaturePreviewOn,
+	FeaturePreviewOff,
+	GenericMenu,
+	useHandleMenuAction,
+	type GenericMenuItemProps,
+} from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, memo } from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../components/GenericMenu/GenericMenuItem';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import UserAvatarWithStatus from './UserAvatarWithStatus';
 import UserAvatarWithStatusUnstable from './UserAvatarWithStatusUnstable';
 import { useUserMenu } from './hooks/useUserMenu';
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index fbed4afec4cb..a0016db7e75c 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type AdministrationProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
index 478e7cce33e1..3392db4ed917 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx
index e7f3b398e5f6..1fe4b947c661 100644
--- a/apps/meteor/client/sidebar/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
index 5e802c2d1851..9c74bacd23ce 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
@@ -1,7 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute, useRouter, useAtLeastOnePermission, usePermission } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 const ADMIN_PERMISSIONS = [
 	'view-statistics',
 	'run-import',
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
index 5be021cf0b7e..cf71cf4223b9 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useAdministrationItems } from './useAdministrationItems';
 import { useAppsItems } from './useAppsItems';
 import { useAuditItems } from './useAuditItems';
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx
index 3717f33fb195..f7b9cea0d56a 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx
@@ -1,8 +1,8 @@
 import { Badge, Skeleton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute, usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useUserDropdownAppsActionButtons } from '../../../../hooks/useAppActionButtons';
 import { useAppRequestStats } from '../../../../views/marketplace/hooks/useAppRequestStats';
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
index 8e2640711347..cf53f1ffef03 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute, usePermission } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 
 /**
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx
index 7b2770a60ab5..1bc64d1ba8d1 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx
@@ -1,7 +1,7 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting, useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
 
 import CreateDiscussion from '../../../../components/CreateDiscussion';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import CreateChannelWithData from '../../CreateChannel';
 import CreateDirectMessage from '../../CreateDirectMessage';
 import CreateTeam from '../../CreateTeam';
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
index 646b85c838be..5dcb53f2ad2f 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
@@ -1,9 +1,8 @@
 import { CheckBox } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useGroupingListItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
index b3ac63f13773..7e628378749d 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
index 56041ab4e571..0e2bf818a0bf 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
@@ -1,8 +1,8 @@
 import { RadioButton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import {
 	OmnichannelSortingDisclaimer,
 	useOmnichannelSortingDisclaimer,
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
index ca2855d09db5..a33230a15729 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
@@ -1,9 +1,8 @@
 import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useViewModeItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
index 1f18d826843d..2be6b2b1dea2 100644
--- a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
@@ -1,11 +1,10 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
-
 export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
diff --git a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
index 026f7c80400e..dc3fa2a3b277 100644
--- a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { callbacks } from '../../../../lib/callbacks';
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import MarkdownText from '../../../components/MarkdownText';
 import { UserStatus } from '../../../components/UserStatus';
 import { userStatuses } from '../../../lib/userStatuses';
diff --git a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
index de43d30306e9..c0c6f94a4ed8 100644
--- a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLogout, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
diff --git a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
index a80954c8b297..f12de10f19f9 100644
--- a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
@@ -1,9 +1,9 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
index 9956acf266b5..d5394c28c6e6 100644
--- a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
@@ -1,9 +1,9 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx
index 3935ad0039df..4d313975d6f5 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx
@@ -1,7 +1,7 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting, useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
 
 import CreateDiscussion from '../../../../components/CreateDiscussion';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import CreateChannelModal from '../../CreateChannelModal';
 import CreateDirectMessage from '../../CreateDirectMessage';
 import CreateTeamModal from '../../CreateTeamModal';
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
index 646b85c838be..5dcb53f2ad2f 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
@@ -1,9 +1,8 @@
 import { CheckBox } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useGroupingListItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
index b3ac63f13773..7e628378749d 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
index 56041ab4e571..0e2bf818a0bf 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
@@ -1,8 +1,8 @@
 import { RadioButton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import {
 	OmnichannelSortingDisclaimer,
 	useOmnichannelSortingDisclaimer,
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
index ca2855d09db5..a33230a15729 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
@@ -1,9 +1,8 @@
 import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useViewModeItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
index 1cbe3c7c121b..878b4d84f507 100644
--- a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
@@ -1,8 +1,8 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
 import useDismissUserAction from './hooks/useDismissUserAction';
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
index 53615ad0321c..85d081e652da 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
@@ -1,8 +1,8 @@
 // import { Menu, Option } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import type { ModerationConsoleRowProps } from './ModerationConsoleTableRow';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
index eb1ec183fcfe..13da70b48da2 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
@@ -1,7 +1,7 @@
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
 import useResetAvatarAction from '../hooks/useResetAvatarAction';
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
index 601e403e7e74..c437746ad8ef 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
@@ -1,8 +1,8 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
 import useResetAvatarAction from '../hooks/useResetAvatarAction';
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
index 2ac0eeffe131..ac046fe80633 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
@@ -1,9 +1,9 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useRouteParameter, useRouter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useDeactivateUserAction = (userId: string, isUserReport?: boolean): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
index 4d5d5690492d..3fb22dfd0c5e 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
@@ -1,8 +1,8 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useRouteParameter, useRouter, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useDeleteMessagesAction = (userId: string): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx
index 09a30358d737..72e5dc03fd95 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx
@@ -1,9 +1,9 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useRouter, useSetModal, useToastMessageDispatch, useRouteParameter } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useDismissUserAction = (userId: string, isUserReport?: boolean): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
index 377aad97b186..8e488234814b 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
@@ -1,8 +1,8 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useResetAvatarAction = (userId: string): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/marketplace/AppMenu.tsx b/apps/meteor/client/views/marketplace/AppMenu.tsx
index be1159ebd4e2..a1d3942ee304 100644
--- a/apps/meteor/client/views/marketplace/AppMenu.tsx
+++ b/apps/meteor/client/views/marketplace/AppMenu.tsx
@@ -1,9 +1,9 @@
 import type { App } from '@rocket.chat/core-typings';
 import { MenuItem, MenuItemContent, MenuSection, MenuV2, Skeleton } from '@rocket.chat/fuselage';
+import { useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import type { AppMenuOption } from './hooks/useAppMenu';
 import { useAppMenu } from './hooks/useAppMenu';
 
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
index bdda6f33f0e3..ff9880ba1e84 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
@@ -1,11 +1,11 @@
 import type { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { HeaderToolbarAction, HeaderToolbarDivider } from '../../../../components/Header';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
index 5fda368711c1..abf9b41b89da 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
@@ -1,11 +1,11 @@
 import type { Box } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { HeaderToolbarAction, HeaderToolbarDivider } from '../../../../components/Header';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index a12e9a143cc2..a26b5f31e77d 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -1,11 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useSetting, useRolesDescription, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import LocalTime from '../../../components/LocalTime';
 import { UserCard, UserCardAction, UserCardRole, UserCardSkeleton } from '../../../components/UserCard';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
index 90216f159069..38396844866b 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
@@ -1,5 +1,7 @@
 import type { IRoom, IMessage } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { MessageComposerAction, MessageComposerActionsDivider } from '@rocket.chat/ui-composer';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation, useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
@@ -8,8 +10,6 @@ import React, { memo } from 'react';
 
 import { messageBox } from '../../../../../../app/ui-utils/client';
 import { isTruthy } from '../../../../../../lib/isTruthy';
-import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../../components/GenericMenu/GenericMenuItem';
 import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons';
 import { useChat } from '../../../contexts/ChatContext';
 import { useRoom } from '../../../contexts/RoomContext';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
index 58cd7b72189b..9738f714fa97 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
@@ -1,9 +1,9 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo } from 'react';
 
 import { AudioRecorder } from '../../../../../../../app/ui/client/lib/recorderjs/AudioRecorder';
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useChat } from '../../../../contexts/ChatContext';
 import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
index 50702f6887aa..03bff48876f3 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
@@ -1,10 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting, usePermission, useSetModal } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
 import CreateDiscussion from '../../../../../../components/CreateDiscussion';
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 
 export const useCreateDiscussionAction = (room?: IRoom): GenericMenuItemProps => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
index f911b2b63b1f..f576aba9803c 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
@@ -1,7 +1,7 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useFileInput } from '../../../../../../hooks/useFileInput';
 import { useChat } from '../../../../contexts/ChatContext';
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
index bf44496b0d67..a49253c2744d 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
@@ -1,9 +1,9 @@
 import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting, useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import ShareLocationModal from '../../../../ShareLocation/ShareLocationModal';
 
 export const useShareLocationAction = (room?: IRoom, tmid?: IMessage['tmid']): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
index cd7e2c5af6fc..2608597fb202 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
@@ -1,9 +1,9 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo } from 'react';
 
 import { VideoRecorder } from '../../../../../../../app/ui/client/lib/recorderjs/videoRecorder';
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useChat } from '../../../../contexts/ChatContext';
 import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
index ae80a7407851..806bebaa65e3 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
@@ -1,9 +1,9 @@
 import type { IWebdavAccountIntegration } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetModal, useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useWebDAVAccountIntegrationsQuery } from '../../../../../../hooks/webdav/useWebDAVAccountIntegrationsQuery';
 import { useChat } from '../../../../contexts/ChatContext';
 import AddWebdavAccountModal from '../../../../webdav/AddWebdavAccountModal';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
index b2ba79792e04..d39b74c079a2 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
@@ -1,9 +1,9 @@
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
 import { isPromptButton, type FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
-import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../../components/GenericMenu/GenericMenuItem';
 import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI';
 
 type FormattingToolbarDropdownProps = {
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
index b0bf1d083a71..31f96a344677 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, IconButton } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -12,7 +13,6 @@ import {
 	ContextualbarClose,
 	ContextualbarTitle,
 } from '../../../../../components/Contextualbar';
-import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
 import {
 	InfoPanel,
 	InfoPanelActionGroup,
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index 7df7c468bb01..c265a28cb284 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -1,9 +1,9 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
 type RoomMembersActionsProps = {
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index 0b4f30fb1f29..17e8bd1470ba 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -1,11 +1,11 @@
 /* eslint-disable react/display-name, react/no-multi-comp */
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton, Skeleton } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import { UserInfoAction } from '../../../../components/UserInfo';
 import { useMemberExists } from '../../../hooks/useMemberExists';
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
index 2a70ff55ee34..c04df6b7521a 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
@@ -1,10 +1,10 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { useMemo } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
 import { useAddUserAction } from './actions/useAddUserAction';
 import { useBlockUserAction } from './actions/useBlockUserAction';
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index 97b1bdceb670..418883869a4a 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -1,10 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { CheckBox } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
similarity index 98%
rename from apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx
rename to packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
index 530bd1404dc7..bdd7f5fbda18 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
 
 import GenericMenu from './GenericMenu';
 
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
similarity index 99%
rename from apps/meteor/client/components/GenericMenu/GenericMenu.tsx
rename to packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index 294a98770523..3f65df59a6ca 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -1,7 +1,6 @@
 import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactNode } from 'react';
-import React from 'react';
 
 import type { GenericMenuItemProps } from './GenericMenuItem';
 import GenericMenuItem from './GenericMenuItem';
@@ -13,6 +12,7 @@ type GenericMenuCommonProps = {
 	disabled?: boolean;
 	callbackAction?: () => void;
 };
+
 type GenericMenuConditionalProps =
 	| {
 			sections?: {
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
similarity index 97%
rename from apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
rename to packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
index c01a64d708a0..41576a2a40a6 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
@@ -1,6 +1,5 @@
 import { MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage';
 import type { ComponentProps, MouseEvent, ReactNode } from 'react';
-import React from 'react';
 
 export type GenericMenuItemProps = {
 	id: string;
diff --git a/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx b/packages/ui-client/src/components/GenericMenu/hooks/useHandleMenuAction.tsx
similarity index 81%
rename from apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
rename to packages/ui-client/src/components/GenericMenu/hooks/useHandleMenuAction.tsx
index dd1115765194..fb423643b7c6 100644
--- a/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
+++ b/packages/ui-client/src/components/GenericMenu/hooks/useHandleMenuAction.tsx
@@ -2,12 +2,11 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 
 import type { GenericMenuItemProps } from '../GenericMenuItem';
 
-export const useHandleMenuAction = (items: GenericMenuItemProps[], callbackAction?: () => void) => {
-	return useEffectEvent((id) => {
+export const useHandleMenuAction = (items: GenericMenuItemProps[], callbackAction?: () => void) =>
+	useEffectEvent((id) => {
 		const item = items.find((item) => item.id === id && !!item.onClick);
 		if (item) {
 			item.onClick?.();
 			callbackAction?.();
 		}
 	});
-};
diff --git a/packages/ui-client/src/components/GenericMenu/index.ts b/packages/ui-client/src/components/GenericMenu/index.ts
new file mode 100644
index 000000000000..a0753e281481
--- /dev/null
+++ b/packages/ui-client/src/components/GenericMenu/index.ts
@@ -0,0 +1,3 @@
+export { default as GenericMenu } from './GenericMenu';
+export { default as GenericMenuItem, GenericMenuItemProps } from './GenericMenuItem';
+export { useHandleMenuAction } from './hooks/useHandleMenuAction';
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index f78c32427cdb..8642983229aa 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -14,3 +14,4 @@ export * from './MultiSelectCustom/MultiSelectCustom';
 export * from './FeaturePreview/FeaturePreview';
 export * from './RoomBanner';
 export { default as UserAutoComplete } from './UserAutoComplete';
+export * from './GenericMenu';

From 98b6a209013f2469deb1f405e30791c9481b145b Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Fri, 13 Sep 2024 09:01:28 -0300
Subject: [PATCH 077/170] refactor(i18n): Increase the adoption of
 `react-i18next` - Phase 1 (#33175)

---
 .../react-i18next-npm-15.0.1-0812bb73aa.patch |  99 +++++
 apps/meteor/app/2fa/server/code/EmailCheck.ts |   2 +-
 .../app/2fa/server/functions/resetTOTP.ts     |   2 +-
 .../app/lib/server/methods/addUsersToRoom.ts  |  13 +-
 .../app/lib/server/methods/sendMessage.ts     |   5 +-
 .../server/startup/mentionUserNotInChannel.ts |   8 +-
 .../modals/PlaceChatOnHoldModal.tsx           |   4 +-
 .../meteor/app/livechat/server/api/v1/room.ts |   2 +-
 apps/meteor/app/livechat/server/lib/Helper.ts |   4 +-
 .../app/livechat/server/lib/QueueManager.ts   |   4 +-
 .../messageBox/AddLinkComposerActionModal.tsx |   4 +-
 apps/meteor/app/utils/lib/i18n.ts             |   3 +-
 .../NavBarItemOmniChannelCallDialPad.tsx      |   4 +-
 .../NavBarItemOmnichannelCallToggleError.tsx  |   4 +-
 ...NavBarItemOmnichannelCallToggleLoading.tsx |   4 +-
 .../NavBarItemOmnichannelCallToggleReady.tsx  |   4 +-
 .../UserMenu/UserMenu.tsx                     |   4 +-
 .../apps/gameCenter/GameCenterContainer.tsx   |   4 +-
 .../GameCenterInvitePlayersModal.tsx          |   4 +-
 .../components/ActionManagerBusyState.tsx     |   4 +-
 .../components/AutoCompleteDepartment.tsx     |   4 +-
 .../AutoCompleteDepartmentMultiple.tsx        |   4 +-
 .../components/ConfirmOwnerChangeModal.tsx    |   4 +-
 .../Contextualbar/ContextualbarBack.tsx       |   4 +-
 .../Contextualbar/ContextualbarClose.tsx      |   4 +-
 .../meteor/client/components/FilterByText.tsx |   4 +-
 .../components/FingerprintChangeModal.tsx     |   4 +-
 .../FingerprintChangeModalConfirmation.tsx    |   4 +-
 .../components/GenericError/GenericError.tsx  |   4 +-
 .../components/GenericModal/GenericModal.tsx  |   4 +-
 .../GenericNoResults/GenericNoResults.tsx     |   4 +-
 .../hooks/useItemsPerPageLabel.ts             |   4 +-
 .../hooks/useShowingResultsLabel.ts           |  10 +-
 .../GenericUpsellModal/GenericUpsellModal.tsx |   4 +-
 .../components/ImageGallery/ImageGallery.tsx  |   4 +-
 .../ImageGallery/ImageGalleryError.tsx        |   4 +-
 .../ImageGallery/ImageGalleryLoading.tsx      |   4 +-
 .../InfoPanel/RetentionPolicyCallout.tsx      |   4 +-
 apps/meteor/client/components/LocalTime.tsx   |   4 +-
 .../meteor/client/components/MarkdownText.tsx |   4 +-
 .../modals/ReturnChatQueueModal.tsx           |   4 +-
 .../Omnichannel/modals/TranscriptModal.tsx    |   4 +-
 .../client/components/Sidebar/Header.tsx      |   4 +-
 .../Sidebar/SidebarItemsAssembler.tsx         |   6 +-
 .../SidebarToggler/SidebarTogglerButton.tsx   |   4 +-
 apps/meteor/client/components/TextCopy.tsx    |   4 +-
 .../TwoFactorModal/TwoFactorPasswordModal.tsx |   4 +-
 .../TwoFactorModal/TwoFactorTotpModal.tsx     |   4 +-
 .../client/components/UrlChangeModal.tsx      |   9 +-
 .../client/components/UserCard/UserCard.tsx   |   4 +-
 .../client/components/UserInfo/UserInfo.tsx   |   4 +-
 .../meteor/client/components/WarningModal.tsx |   4 +-
 .../components/dashboards/PeriodSelector.tsx  |   6 +-
 .../client/components/dashboards/periods.ts   |  23 +-
 .../components/dashboards/usePeriodLabel.ts   |   6 +-
 .../DeviceManagementTable.tsx                 |   4 +-
 .../deviceManagement/LoggedOutBanner.tsx      |   4 +-
 .../components/message/IgnoredContent.tsx     |   4 +-
 .../components/message/MessageHeader.tsx      |   4 +-
 .../message/ReadReceiptIndicator.tsx          |   4 +-
 .../message/content/BroadcastMetrics.tsx      |   4 +-
 .../message/content/DiscussionMetrics.tsx     |   4 +-
 .../components/message/content/Reactions.tsx  |   4 +-
 .../message/content/actions/MessageAction.tsx |   4 +-
 .../structure/AttachmentDownloadBase.tsx      |   4 +-
 .../attachments/structure/image/Load.tsx      |   4 +-
 .../attachments/structure/image/Retry.tsx     |   4 +-
 .../collapsible/CollapsibleContent.tsx        |   4 +-
 .../content/location/MapViewFallback.tsx      |   4 +-
 .../message/content/location/MapViewImage.tsx |   4 +-
 .../content/reactions/ReactionTooltip.tsx     |   4 +-
 .../content/urlPreviews/OEmbedCollapsible.tsx |   4 +-
 .../message/header/MessageRoles.tsx           |   4 +-
 .../notification/MessageNotification.tsx      |   4 +-
 .../message/toolbar/MessageActionMenu.tsx     |   4 +-
 .../message/variants/SystemMessage.tsx        |   4 +-
 .../message/variants/ThreadMessagePreview.tsx |   4 +-
 .../ThreadMessagePreviewBody.tsx              |   4 +-
 .../components/voip/room/VoipRoomForeword.tsx |   4 +-
 .../client/hooks/useDecryptedMessage.ts       |   4 +-
 .../hooks/useDownloadFromServiceWorker.ts     |   3 +-
 apps/meteor/client/hooks/useFormatDuration.ts |   4 +-
 .../meteor/client/hooks/useHighlightedCode.ts |   4 +-
 .../additionalForms/BusinessHoursMultiple.tsx |   4 +-
 .../additionalForms/ContactManager.js         |   4 +-
 .../CustomFieldsAdditionalForm.tsx            |   4 +-
 .../additionalForms/DepartmentForwarding.tsx  |   4 +-
 .../additionalForms/MaxChatsPerAgent.tsx      |   4 +-
 .../MaxChatsPerAgentDisplay.tsx               |   4 +-
 .../additionalForms/PrioritiesSelect.tsx      |   4 +-
 .../CannedResponseEditWithDepartmentData.tsx  |   4 +-
 .../cannedResponses/CannedResponseFilter.tsx  |   4 +-
 .../InsertPlaceholderDropdown.tsx             |   4 +-
 .../CannedResponse/CannedResponse.tsx         |   4 +-
 .../CannedResponse/CannedResponseList.tsx     |   4 +-
 .../contextualBar/CannedResponse/Item.tsx     |   4 +-
 .../components/RoomActivityIcon/index.tsx     |   4 +-
 .../client/omnichannel/hooks/useScopeDict.ts  |   4 +-
 .../omnichannel/monitors/MonitorsPage.tsx     |   4 +-
 .../priorities/PrioritiesResetModal.tsx       |   4 +-
 .../priorities/PrioritiesTable.tsx            |   4 +-
 .../priorities/PriorityEditFormWithData.tsx   |   4 +-
 .../omnichannel/priorities/PriorityIcon.tsx   |   4 +-
 .../omnichannel/priorities/PriorityList.tsx   |   4 +-
 .../reports/components/AgentsTable.tsx        |   4 +-
 .../components/ReportCardEmptyState.tsx       |   4 +-
 .../components/ReportCardErrorState.tsx       |   4 +-
 .../reports/hooks/useAgentsSection.tsx        |   5 +-
 .../reports/hooks/useChannelsSection.tsx      |  12 +-
 .../reports/hooks/useDefaultDownload.tsx      |   4 +-
 .../reports/hooks/useDepartmentsSection.tsx   |   5 +-
 .../reports/hooks/useStatusSection.tsx        |  10 +-
 .../reports/hooks/useTagsSection.tsx          |   5 +-
 .../reports/sections/AgentsSection.tsx        |   4 +-
 .../reports/utils/formatPeriodDescription.tsx |   6 +-
 .../tags/AutoCompleteTagsMultiple.tsx         |   4 +-
 .../sidebar/RoomList/RoomListWrapper.tsx      |   4 +-
 .../sidebar/footer/SidebarFooterWatermark.tsx |   4 +-
 .../client/sidebar/footer/voip/VoipFooter.tsx |   4 +-
 .../FederatedRoomListEmptyPlaceholder.tsx     |   4 +-
 .../FederatedRoomListErrorBoundary.tsx        |   4 +-
 .../FederatedRoomListItem.tsx                 |   4 +-
 .../MatrixFederationSearch.tsx                |   4 +-
 .../meteor/client/sidebar/header/UserMenu.tsx |   4 +-
 .../sidebar/header/actions/Administration.tsx |   4 +-
 .../sidebar/header/actions/CreateRoom.tsx     |   4 +-
 .../client/sidebar/header/actions/Sort.tsx    |   4 +-
 .../actions/hooks/useAdministrationMenu.tsx   |   4 +-
 .../hooks/useMatrixFederationItems.tsx.tsx    |   4 +-
 .../header/actions/hooks/useSortMenu.tsx      |   4 +-
 .../sidebar/sections/OverMacLimitSection.tsx  |   4 +-
 .../sections/StatusDisabledSection.tsx        |   4 +-
 .../actions/OmnichannelCallDialPad.tsx        |   4 +-
 .../actions/OmnichannelCallToggleError.tsx    |   4 +-
 .../actions/OmnichannelCallToggleLoading.tsx  |   4 +-
 .../actions/OmnichannelCallToggleReady.tsx    |   4 +-
 .../sidebarv2/RoomList/RoomListWrapper.tsx    |   4 +-
 .../footer/SidebarFooterWatermark.tsx         |   4 +-
 .../sidebarv2/footer/voip/VoipFooter.tsx      |   4 +-
 .../FederatedRoomListEmptyPlaceholder.tsx     |   4 +-
 .../FederatedRoomListErrorBoundary.tsx        |   4 +-
 .../FederatedRoomListItem.tsx                 |   4 +-
 .../MatrixFederationSearch.tsx                |   4 +-
 .../sidebarv2/header/actions/CreateRoom.tsx   |   4 +-
 .../client/sidebarv2/header/actions/Sort.tsx  |   4 +-
 .../actions/hooks/useMatrixFederationItems.ts |   4 +-
 .../header/actions/hooks/useSortMenu.tsx      |   4 +-
 .../sections/StatusDisabledSection.tsx        |   4 +-
 .../contexts/TranslationContextMock.tsx       |   3 +-
 .../DeviceManagementAccountPage.tsx           |   4 +-
 .../DeviceManagementAccountRow.tsx            |   4 +-
 .../DeviceManagementAccountTable.tsx          |   4 +-
 .../AccountFeaturePreviewBadge.tsx            |   4 +-
 .../omnichannel/PreferencesGeneral.tsx        |   4 +-
 .../views/account/preferences/MyDataModal.tsx |   4 +-
 .../PreferencesHighlightsSection.tsx          |   4 +-
 .../PreferencesMessagesSection.tsx            |   4 +-
 .../PreferencesUserPresenceSection.tsx        |   4 +-
 .../account/profile/ActionConfirmModal.tsx    |   4 +-
 .../account/security/BackupCodesModal.tsx     |   4 +-
 .../account/tokens/AccountTokensPage.tsx      |   4 +-
 .../AccountTokensTable/AccountTokensRow.tsx   |   4 +-
 .../admin/customEmoji/AddCustomEmoji.tsx      |   4 +-
 .../CustomUserActiveConnections.tsx           |   4 +-
 .../CustomUserStatusDisabledModal.tsx         |   4 +-
 .../DeviceManagementAdminTable.tsx            |   4 +-
 .../DeviceManagementInfoWithData.tsx          |   4 +-
 .../EngagementDashboardCardErrorBoundary.tsx  |   4 +-
 .../EngagementDashboardPage.tsx               |   4 +-
 .../channels/ChannelsOverview.tsx             |   9 +-
 .../messages/MessagesPerChannelSection.tsx    |   4 +-
 .../messages/MessagesSentSection.tsx          |   4 +-
 .../messages/MessagesTab.tsx                  |   4 +-
 .../users/ActiveUsersSection.tsx              |   4 +-
 .../users/BusiestChatTimesSection.tsx         |   4 +-
 .../users/ContentForHours.tsx                 |   4 +-
 .../users/NewUsersSection.tsx                 |   4 +-
 .../users/UsersByTimeOfTheDaySection.tsx      |   4 +-
 .../engagementDashboard/users/UsersTab.tsx    |   4 +-
 .../FederationDashboardPage.tsx               |   4 +-
 .../views/admin/import/PrepareChannels.tsx    |  10 +-
 .../views/admin/import/PrepareUsers.tsx       |  10 +-
 .../views/admin/integrations/NewBot.tsx       |   4 +-
 .../views/admin/integrations/NewZapier.tsx    |   4 +-
 .../outgoing/OutgoingWebhookForm.tsx          |  14 +-
 .../outgoing/history/HistoryContent.tsx       |   4 +-
 .../admin/moderation/MessageContextFooter.tsx |   4 +-
 .../moderation/ModerationConsoleActions.tsx   |   5 +-
 .../UserReports/ModConsoleUserActions.tsx     |   4 +-
 .../UserReports/UserContextFooter.tsx         |   4 +-
 .../moderation/helpers/DateRangePicker.tsx    |   4 +-
 .../moderation/helpers/ModerationFilter.tsx   |   4 +-
 .../helpers/ReportReasonCollapsible.tsx       |   4 +-
 .../permissions/CustomRoleUpsellModal.tsx     |   4 +-
 .../PermissionsTable/PermissionRow.tsx        |   7 +-
 .../PermissionsTableFilter.tsx                |   4 +-
 .../views/admin/permissions/RoleForm.tsx      |   4 +-
 .../UsersInRoleTable/UsersInRoleTableRow.tsx  |   4 +-
 .../views/admin/rooms/RoomsTableFilters.tsx   |   4 +-
 .../ResetSettingButton/ResetSettingButton.tsx |   4 +-
 .../inputs/CodeMirror/CodeMirrorBox.tsx       |   4 +-
 .../Setting/inputs/ColorSettingInput.tsx      |   4 +-
 .../inputs/MultiSelectSettingInput.tsx        |   4 +-
 .../Setting/inputs/SelectSettingInput.tsx     |   4 +-
 .../inputs/TimespanSettingInput.spec.tsx      |  11 +-
 .../Setting/inputs/TimespanSettingInput.tsx   |   8 +-
 .../SettingsSection/SettingsSection.tsx       |   4 +-
 .../OAuthGroupPage/CreateOAuthModal.tsx       |   4 +-
 .../admin/settings/groups/TabbedGroupPage.tsx |   4 +-
 .../admin/subscription/SubscriptionPage.tsx   |   2 +-
 .../admin/users/AdminUserFormWithData.tsx     |   4 +-
 .../AdminUserSetRandomPasswordRadios.tsx      |   4 +-
 .../users/SeatsCapUsage/SeatsCapUsage.tsx     |   4 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  |   4 +-
 .../views/admin/viewLogs/AnalyticsReports.tsx |   4 +-
 .../views/admin/viewLogs/ViewLogsPage.tsx     |   4 +-
 .../InstancesModal/InstancesModal.tsx         |   4 +-
 .../MessagesRoomsCard/MessagesRoomsCard.tsx   |   4 +-
 .../views/admin/workspace/WorkspacePage.tsx   |   4 +-
 .../client/views/audit/AuditLogPage.tsx       |   4 +-
 apps/meteor/client/views/audit/AuditPage.tsx  |   4 +-
 .../audit/components/AuditFiltersDisplay.tsx  |   4 +-
 .../views/audit/components/AuditForm.tsx      |   4 +-
 .../views/audit/components/AuditLogEntry.tsx  |   4 +-
 .../components/forms/DateRangePicker.tsx      |   4 +-
 .../views/audit/components/tabs/DirectTab.tsx |   4 +-
 .../audit/components/tabs/OmnichannelTab.tsx  |   4 +-
 .../views/audit/components/tabs/RoomsTab.tsx  |   4 +-
 .../views/audit/components/tabs/UsersTab.tsx  |   4 +-
 .../AudioMessageRecorder.tsx                  |   4 +-
 .../composer/EmojiPicker/EmojiCategoryRow.tsx |   4 +-
 .../EmojiPicker/EmojiPickerCategoryItem.tsx   |   4 +-
 .../composer/EmojiPicker/SearchingResult.tsx  |   4 +-
 .../client/views/directory/RoomTags.tsx       |   4 +-
 .../views/e2e/EnterE2EPasswordModal.tsx       |   4 +-
 .../client/views/e2e/SaveE2EPasswordModal.tsx |   4 +-
 .../views/home/cards/DesktopAppsCard.tsx      |   4 +-
 .../views/home/cards/DocumentationCard.tsx    |   4 +-
 .../views/home/cards/MobileAppsCard.tsx       |   4 +-
 .../AppDetailsPage/AppDetailsPageHeader.tsx   |   4 +-
 .../tabs/AppDetails/AppDetails.tsx            |   4 +-
 .../AppDetailsPage/tabs/AppLogs/AppLogs.tsx   |   4 +-
 .../tabs/AppLogs/AppLogsItem.tsx              |   4 +-
 .../tabs/AppLogs/AppLogsItemEntry.tsx         |   4 +-
 .../tabs/AppReleases/AppReleasesItem.tsx      |   4 +-
 .../tabs/AppSecurity/AppSecurity.tsx          |   4 +-
 .../tabs/AppSettings/AppSettings.tsx          |   4 +-
 .../tabs/AppStatus/AppStatusPriceDisplay.tsx  |   6 +-
 .../client/views/marketplace/AppMenu.tsx      |   4 +-
 .../marketplace/AppPermissionsReviewModal.tsx |   4 +-
 .../views/marketplace/AppUpdateModal.tsx      |   4 +-
 .../marketplace/AppsPage/AppsFilters.tsx      |   4 +-
 .../AppsPage/AppsPageConnectionError.tsx      |   4 +-
 .../AppsPage/AppsPageContentBody.tsx          |   4 +-
 .../AppsPage/FeaturedAppsSections.tsx         |   6 +-
 .../AppsPage/NoAppRequestsEmptyState.tsx      |   4 +-
 .../NoInstalledAppMatchesEmptyState.tsx       |   4 +-
 .../AppsPage/NoInstalledAppsEmptyState.tsx    |   4 +-
 ...etplaceOrInstalledAppMatchesEmptyState.tsx |   4 +-
 .../AppsPage/PrivateEmptyState.tsx            |   4 +-
 .../client/views/marketplace/BundleChips.tsx  |   4 +-
 .../client/views/marketplace/IframeModal.tsx  |   4 +-
 .../marketplace/UnlimitedAppsUpsellModal.tsx  |   4 +-
 .../AppInstallModal/AppInstallModal.tsx       |   4 +-
 .../components/AppPermissionsList.tsx         |   4 +-
 .../CategoryFilter/CategoryDropDownAnchor.tsx |   4 +-
 .../components/EnabledAppsCount.tsx           |   4 +-
 .../UninstallGrandfatheredAppModal.tsx        |   4 +-
 .../views/marketplace/hooks/useCategories.ts  |   4 +-
 .../views/notAuthorized/NotAuthorizedPage.tsx |   4 +-
 .../client/views/notFound/NotFoundPage.tsx    |   4 +-
 .../agents/AgentsTable/AgentsTable.tsx        |   4 +-
 .../omnichannel/analytics/AnalyticsPage.tsx   |   6 +-
 .../omnichannel/analytics/DateRangePicker.tsx |   4 +-
 .../appearance/AppearanceFieldLabel.tsx       |   4 +-
 .../omnichannel/appearance/AppearanceForm.tsx |   4 +-
 .../businessHours/BusinessHoursForm.tsx       |   4 +-
 .../contactHistory/ContactHistoryItem.tsx     |   4 +-
 .../contactHistory/ContactHistoryList.tsx     |   4 +-
 .../MessageList/ContactHistoryMessage.tsx     |   4 +-
 .../DepartmentAgentsTable/AgentRow.tsx        |   4 +-
 .../DepartmentAgentsTable.tsx                 |   4 +-
 .../departments/DepartmentTags.tsx            |   4 +-
 .../directory/calls/CallTableRow.tsx          |   4 +-
 .../calls/contextualBar/VoipInfo.tsx          |   4 +-
 .../contextualBar/VoipInfoCallButton.tsx      |   4 +-
 .../chats/contextualBar/DepartmentField.tsx   |   4 +-
 .../RoomEdit/RoomEditWithData.tsx             |   4 +-
 .../chats/contextualBar/VisitorClientInfo.js  |   4 +-
 .../components/CallDialpadButton.tsx          |   4 +-
 .../directory/components/PriorityField.tsx    |   4 +-
 .../directory/components/SlaField.tsx         |   4 +-
 .../directory/components/SourceField.tsx      |   4 +-
 .../contextualBar/ContactEditWithData.js      |   4 +-
 .../omnichannel/queueList/QueueListFilter.tsx |   4 +-
 .../omnichannel/queueList/QueueListPage.tsx   |   4 +-
 .../RealTimeMonitoringPage.js                 |   4 +-
 .../charts/AgentStatusChart.tsx               |   9 +-
 .../charts/ChatDurationChart.js               |   4 +-
 .../realTimeMonitoring/charts/ChatsChart.tsx  |   9 +-
 .../charts/ChatsPerAgentChart.js              |   4 +-
 .../charts/ChatsPerDepartmentChart.js         |   4 +-
 .../charts/ResponseTimesChart.js              |   4 +-
 .../charts/useUpdateChartData.ts              |   6 +-
 .../counter/CounterContainer.tsx              |   4 +-
 .../omnichannel/triggers/ConditionForm.tsx    |   4 +-
 .../triggers/actions/ActionForm.tsx           |   4 +-
 .../triggers/actions/ActionSender.tsx         |   4 +-
 .../actions/ExternalServiceActionForm.tsx     |   4 +-
 .../actions/SendMessageActionForm.tsx         |   4 +-
 .../OutlookSettingItem.tsx                    |   4 +-
 .../views/room/E2EESetup/RoomE2EESetup.tsx    |   4 +-
 .../QuickActions/QuickActionOptions.tsx       |   4 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   4 +-
 .../client/views/room/Header/RoomHeader.tsx   |   4 +-
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      |   4 +-
 .../QuickActions/QuickActionOptions.tsx       |   4 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   4 +-
 .../client/views/room/HeaderV2/RoomHeader.tsx |   4 +-
 .../client/views/room/HeaderV2/RoomLeader.tsx |   4 +-
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      |   4 +-
 .../MessageList/MessageListErrorBoundary.tsx  |   4 +-
 .../room/MessageList/MessageListItem.tsx      |   4 +-
 .../views/room/body/DropTargetOverlay.tsx     |   4 +-
 .../body/ErroredUploadProgressIndicator.tsx   |   4 +-
 .../client/views/room/body/LeaderBar.tsx      |   4 +-
 .../room/body/RetentionPolicyWarning.tsx      |   4 +-
 .../room/body/RoomForeword/RoomForeword.tsx   |   4 +-
 .../room/body/UnreadMessagesIndicator.tsx     |   4 +-
 .../room/body/UploadProgressIndicator.tsx     |   4 +-
 .../views/room/composer/ComposerArchived.tsx  |   4 +-
 .../views/room/composer/ComposerBlocked.tsx   |   4 +-
 .../views/room/composer/ComposerBoxPopup.tsx  |   4 +-
 .../composer/ComposerBoxPopupSlashCommand.tsx |   4 +-
 .../room/composer/ComposerBoxPopupUser.tsx    |   4 +-
 .../ComposerFederationDisabled.tsx            |   4 +-
 .../ComposerFederationJoinRoomDisabled.tsx    |   4 +-
 .../ComposerOmnichannelOnHold.tsx             |   4 +-
 .../ComposerUserActionIndicator.tsx           |   4 +-
 .../views/room/composer/ComposerVoIP.tsx      |   4 +-
 .../FormattingToolbarDropdown.tsx             |   4 +-
 .../MessageBoxFormattingToolbar.tsx           |   4 +-
 .../messageBox/hooks/useMediaActionTitle.ts   |   4 +-
 .../AutoTranslate/AutoTranslate.tsx           |   4 +-
 .../Discussions/DiscussionsListRow.tsx        |   4 +-
 .../components/DiscussionsListItem.tsx        |   4 +-
 .../ExportMessages/ExportMessages.tsx         |   4 +-
 .../ExportMessages/FileExport.tsx             |   4 +-
 .../ExportMessages/MailExportForm.tsx         |   4 +-
 .../ChannelToTeamConfirmation.tsx             |   4 +-
 .../ChannelToTeamSelection.tsx                |   4 +-
 .../contextualBar/Info/RoomInfo/RoomInfo.tsx  |   4 +-
 .../Info/hooks/useRoomActions.ts              |   4 +-
 .../KeyboardShortcuts/KeyboardShortcuts.tsx   |   4 +-
 .../MessageSearchTab/MessageSearchTab.tsx     |   4 +-
 .../components/MessageSearchForm.tsx          |   4 +-
 .../NotificationPreferences.tsx               |   4 +-
 .../NotificationPreferencesForm.tsx           |   4 +-
 .../views/room/contextualBar/OTR/OTR.tsx      |   4 +-
 .../OTR/components/OTREstablished.tsx         |   4 +-
 .../OTR/components/OTRStates.tsx              |   4 +-
 .../PruneMessages/PruneMessages.tsx           |   4 +-
 .../contextualBar/RoomFiles/RoomFiles.tsx     |   4 +-
 .../InviteUsers/EditInviteLink.tsx            |   4 +-
 .../RoomMembers/InviteUsers/InviteLink.tsx    |   4 +-
 .../RoomMembers/InviteUsers/InviteUsers.tsx   |   4 +-
 .../RoomMembers/RoomMembersActions.tsx        |   4 +-
 .../Threads/components/ThreadListMessage.tsx  |   4 +-
 .../Threads/components/ThreadMessageItem.tsx  |   4 +-
 .../UserInfo/UserInfoActions.tsx              |   4 +-
 .../VideoConference/VideoConfConfigModal.tsx  |   4 +-
 .../VideoConfList/VideoConfList.tsx           |   4 +-
 .../VideoConfPopup/IncomingPopup.tsx          |   4 +-
 .../VideoConfPopup/OutgoingPopup.tsx          |   4 +-
 .../VideoConfPopup/StartCallPopup.tsx         |   4 +-
 .../modals/FileUploadModal/MediaPreview.tsx   |   4 +-
 .../ReactionListModal/ReactionListModal.tsx   |   4 +-
 .../FilePickerBreadcrumbs.tsx                 |   4 +-
 .../WebdavFilePickerTable.tsx                 |   4 +-
 .../ChannelDesertionTable.tsx                 |   4 +-
 .../ModalSteps/FirstStep.tsx                  |   4 +-
 .../ModalSteps/SecondStep.tsx                 |   4 +-
 .../channels/TeamsChannelItemMenu.tsx         |   4 +-
 .../contextualBar/channels/TeamsChannels.tsx  |   4 +-
 .../ChannelDeletionTable.tsx                  |   4 +-
 .../info/DeleteTeam/DeleteTeamChannels.tsx    |   4 +-
 .../DeleteTeam/DeleteTeamConfirmation.tsx     |   4 +-
 .../LeaveTeamModal/LeaveTeamModalChannels.tsx |   4 +-
 .../LeaveTeamModalConfirmation.tsx            |   4 +-
 .../teams/contextualBar/info/TeamsInfo.tsx    |   4 +-
 .../RemoveUsersModal/RemoveUsersFirstStep.js  |   4 +-
 .../RemoveUsersModal/RemoveUsersSecondStep.js |   4 +-
 .../client/voip/modal/DialPad/DialInput.tsx   |   4 +-
 .../voip/modal/DialPad/hooks/useDialPad.tsx   |   4 +-
 apps/meteor/package.json                      |   4 +-
 .../EmailInbox/EmailInbox_Incoming.ts         |   2 +-
 .../EmailInbox/EmailInbox_Outgoing.ts         |   2 +-
 apps/meteor/server/lib/i18n.ts                |  11 -
 apps/meteor/server/lib/resetUserE2EKey.ts     |   2 +-
 .../modules/core-apps/mention.module.ts       |  44 +-
 .../services/omnichannel-analytics/service.ts |   2 +-
 package.json                                  |   3 +-
 packages/fuselage-ui-kit/package.json         |   4 +-
 packages/gazzodown/package.json               |  47 +--
 packages/gazzodown/src/elements/LinkSpan.tsx  |   4 +-
 packages/gazzodown/src/elements/PlainSpan.tsx |   4 +-
 .../src/mentions/ChannelMentionElement.tsx    |   4 +-
 .../src/mentions/UserMentionElement.tsx       |   4 +-
 packages/i18n/jest.config.ts                  |   2 +-
 packages/i18n/package.json                    |  31 +-
 packages/i18n/src/index.mjs                   |  14 +-
 packages/jest-presets/package.json            |   2 +-
 packages/livechat/package.json                |   4 +-
 packages/mock-providers/package.json          |   4 +-
 packages/ui-client/package.json               |  34 +-
 .../src/components/CustomFieldsForm.tsx       |   4 +-
 .../GenericMenu/GenericMenu.spec.tsx          |   7 +-
 .../components/GenericMenu/GenericMenu.tsx    |  10 +-
 .../MultiSelectCustomAnchor.tsx               |   4 +-
 .../MultiSelectCustomList.tsx                 |   4 +-
 .../MultiSelectCustom/useFilteredOptions.tsx  |   4 +-
 .../src/components/UserStatus/UserStatus.tsx  |   4 +-
 packages/web-ui-registration/package.json     |   8 +-
 .../src/SecretRegisterInvalidForm.tsx         |   4 +-
 yarn.lock                                     | 380 ++++++------------
 425 files changed, 1208 insertions(+), 1238 deletions(-)
 create mode 100644 .yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch

diff --git a/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch b/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch
new file mode 100644
index 000000000000..cf5a292c0253
--- /dev/null
+++ b/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch
@@ -0,0 +1,99 @@
+diff --git a/dist/amd/react-i18next.js b/dist/amd/react-i18next.js
+index 115ef3cc362e5ce38e875f9b35dfd1fe687cfd6c..2ba1b4d54295eeff49c8c650f214d7875d9219a5 100644
+--- a/dist/amd/react-i18next.js
++++ b/dist/amd/react-i18next.js
+@@ -495,7 +495,7 @@ define(['exports', 'react'], (function (exports, react) { 'use strict';
+ 	  }
+ 	  addUsedNamespaces(namespaces) {
+ 	    namespaces.forEach(ns => {
+-	      this.usedNamespaces[ns] ??= true;
++	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
+ 	    });
+ 	  }
+ 	  getUsedNamespaces() {
+diff --git a/dist/amd/react-i18next.min.js b/dist/amd/react-i18next.min.js
+index c54c9114869feb14df7855be24237f85d64fe7e4..0cc2b09d6db9bfc6f94dffff4b9e0f3fd9108510 100644
+--- a/dist/amd/react-i18next.min.js
++++ b/dist/amd/react-i18next.min.js
+@@ -1 +1 @@
+-define(["exports","react"],(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),a=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function i(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var i=e.indexOf("--\x3e");return{type:"comment",comment:-1!==i?e.slice(4,i):""}}for(var r=new RegExp(a),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],a=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=i(r);return c<0?(s.push(g),s):((p=a[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=i(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=a[c-1])&&p.children.push(t),a[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:a[c]),!u&&"<"!==m&&m)){p=-1===c?s:a[c].children;var y=e.indexOf("<",h),v=e.slice(h,-1===y?void 0:y);o.test(v)&&(v=" "),(y>-1&&c+p.length>=0||" "!==v)&&p.push({type:"text",content:v})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,v=e=>"object"==typeof e&&null!==e,x=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,b={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>b[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(x,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],C=(e,t)=>{if(!e)return"";let s="";const a=R(e),i=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return a.forEach(((e,a)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=i.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${a}></${a}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=C(c,t);s+=`<${a}>${e}</${a}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(v(e)){const{format:n,...t}=e,a=Object.keys(t);if(1===a.length){const e=n?`${a[0]}, ${n}`:a[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},T=(e,t,s,a,i,r)=>{if(""===t)return[];const o=a.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):v(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...i},h=(e,t,s)=>{const a=j(e),i=g(a,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(a)&&0===i.length||e.props?.i18nIsDynamicList?a:i},m=(e,t,s,a,i)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:a},i?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:a,ref:e.ref},i?null:t)})))},g=(t,i,c)=>{const u=R(t);return R(i).reduce(((t,i,p)=>{const d=i.children?.[0]?.content&&s.services.interpolator.interpolate(i.children[0].content,f,s.language);if("tag"===i.type){let r=u[parseInt(i.name,10)];1!==c.length||r||(r=c[0][i.name]),r||(r={});const x=0!==Object.keys(i.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:i.attrs},r):r,b=n.isValidElement(x),E=b&&S(i,!0)&&!i.voidElement,O=l&&v(x)&&x.dummy&&!b,N=v(e)&&Object.hasOwnProperty.call(e,i.name);if(y(x)){const e=s.services.interpolator.interpolate(x,f,s.language);t.push(e)}else if(S(x)||E){const e=h(x,i,c);m(x,e,t,p)}else if(O){const e=g(u,i.children,c);m(x,e,t,p)}else if(Number.isNaN(parseFloat(i.name)))if(N){const e=h(x,i,c);m(x,e,t,p,i.voidElement)}else if(a.transSupportBasicHtmlNodes&&o.indexOf(i.name)>-1)if(i.voidElement)t.push(n.createElement(i.name,{key:`${i.name}-${p}`}));else{const e=g(u,i.children,c);t.push(n.createElement(i.name,{key:`${i.name}-${p}`},e))}else if(i.voidElement)t.push(`<${i.name} />`);else{const e=g(u,i.children,c);t.push(`<${i.name}>${e}</${i.name}>`)}else if(v(x)&&!b){const e=i.children[0]?d:null;e&&t.push(e)}else m(x,d,t,p,1!==i.children.length||!d)}else if("text"===i.type){const e=a.transWrapTextNodes,o=r?a.unescape(s.services.interpolator.interpolate(i.content,f,s.language)):s.services.interpolator.interpolate(i.content,f,s.language);e?t.push(n.createElement(e,{key:`${i.name}-${p}`},o)):t.push(o)}return t}),[])},x=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(x[0])};function P(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const v=f||k();if(!v)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const x=h||v.t.bind(v)||(e=>e),b={...$(),...v.options?.react};let E=p||x.ns||v.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=C(t,b),N=c||O||b.transEmptyNodeValue||i,{hashTransKey:w}=b,I=i||(w?w(O||N):O||N);v.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...v.options.interpolation.defaultVariables}:{...v.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?x(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=T(u||t,R,v,b,j,m),L=a??b.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:a,defaultNS:i}=n.useContext(A)||{},r=s||a||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:v(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||i||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,a)=>n.useCallback(U(e,t,s,a),[e,t,s,a]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,x=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[b,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(x)})):h(r,u,(()=>{w.current&&E(x)}))),p&&N&&N!==O&&w.current&&E(x);const s=()=>{w.current&&E(x)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[b,r,p];if(I.t=b,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:a}=s,{i18n:i}=n.useContext(A)||{},r=a||i||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:a}=e;const i=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:i},a)},e.Trans=function(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},v=d||g||k(),x=f||v?.t.bind(v);return P({children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||x?.ns||y||v?.options?.defaultNS,i18n:v,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[a,i,r]=B(n,s);return t(a,{i18n:i,lng:i.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:a,...i}=t;return D(s,a),n.createElement(e,{...i})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function a(a){let{forwardedRef:i,...r}=a;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&i?u.ref=i:!t.withRef&&i&&(u.forwardedRef=i),n.createElement(s,u)}a.displayName=`withI18nextTranslation(${g(s)})`,a.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(a,Object.assign({},e,{forwardedRef:t})))):a}}}));
++define(["exports","react"],(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),a=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function i(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var i=e.indexOf("--\x3e");return{type:"comment",comment:-1!==i?e.slice(4,i):""}}for(var r=new RegExp(a),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],a=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=i(r);return c<0?(s.push(g),s):((p=a[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=i(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=a[c-1])&&p.children.push(t),a[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:a[c]),!u&&"<"!==m&&m)){p=-1===c?s:a[c].children;var y=e.indexOf("<",h),v=e.slice(h,-1===y?void 0:y);o.test(v)&&(v=" "),(y>-1&&c+p.length>=0||" "!==v)&&p.push({type:"text",content:v})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,v=e=>"object"==typeof e&&null!==e,x=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,b={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>b[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(x,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],C=(e,t)=>{if(!e)return"";let s="";const a=R(e),i=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return a.forEach(((e,a)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=i.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${a}></${a}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=C(c,t);s+=`<${a}>${e}</${a}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(v(e)){const{format:n,...t}=e,a=Object.keys(t);if(1===a.length){const e=n?`${a[0]}, ${n}`:a[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},T=(e,t,s,a,i,r)=>{if(""===t)return[];const o=a.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):v(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...i},h=(e,t,s)=>{const a=j(e),i=g(a,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(a)&&0===i.length||e.props?.i18nIsDynamicList?a:i},m=(e,t,s,a,i)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:a},i?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:a,ref:e.ref},i?null:t)})))},g=(t,i,c)=>{const u=R(t);return R(i).reduce(((t,i,p)=>{const d=i.children?.[0]?.content&&s.services.interpolator.interpolate(i.children[0].content,f,s.language);if("tag"===i.type){let r=u[parseInt(i.name,10)];1!==c.length||r||(r=c[0][i.name]),r||(r={});const x=0!==Object.keys(i.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:i.attrs},r):r,b=n.isValidElement(x),E=b&&S(i,!0)&&!i.voidElement,O=l&&v(x)&&x.dummy&&!b,N=v(e)&&Object.hasOwnProperty.call(e,i.name);if(y(x)){const e=s.services.interpolator.interpolate(x,f,s.language);t.push(e)}else if(S(x)||E){const e=h(x,i,c);m(x,e,t,p)}else if(O){const e=g(u,i.children,c);m(x,e,t,p)}else if(Number.isNaN(parseFloat(i.name)))if(N){const e=h(x,i,c);m(x,e,t,p,i.voidElement)}else if(a.transSupportBasicHtmlNodes&&o.indexOf(i.name)>-1)if(i.voidElement)t.push(n.createElement(i.name,{key:`${i.name}-${p}`}));else{const e=g(u,i.children,c);t.push(n.createElement(i.name,{key:`${i.name}-${p}`},e))}else if(i.voidElement)t.push(`<${i.name} />`);else{const e=g(u,i.children,c);t.push(`<${i.name}>${e}</${i.name}>`)}else if(v(x)&&!b){const e=i.children[0]?d:null;e&&t.push(e)}else m(x,d,t,p,1!==i.children.length||!d)}else if("text"===i.type){const e=a.transWrapTextNodes,o=r?a.unescape(s.services.interpolator.interpolate(i.content,f,s.language)):s.services.interpolator.interpolate(i.content,f,s.language);e?t.push(n.createElement(e,{key:`${i.name}-${p}`},o)):t.push(o)}return t}),[])},x=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(x[0])};function P(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const v=f||k();if(!v)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const x=h||v.t.bind(v)||(e=>e),b={...$(),...v.options?.react};let E=p||x.ns||v.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=C(t,b),N=c||O||b.transEmptyNodeValue||i,{hashTransKey:w}=b,I=i||(w?w(O||N):O||N);v.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...v.options.interpolation.defaultVariables}:{...v.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?x(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=T(u||t,R,v,b,j,m),L=a??b.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:a,defaultNS:i}=n.useContext(A)||{},r=s||a||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:v(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||i||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,a)=>n.useCallback(U(e,t,s,a),[e,t,s,a]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,x=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[b,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(x)})):h(r,u,(()=>{w.current&&E(x)}))),p&&N&&N!==O&&w.current&&E(x);const s=()=>{w.current&&E(x)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[b,r,p];if(I.t=b,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:a}=s,{i18n:i}=n.useContext(A)||{},r=a||i||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:a}=e;const i=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:i},a)},e.Trans=function(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},v=d||g||k(),x=f||v?.t.bind(v);return P({children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||x?.ns||y||v?.options?.defaultNS,i18n:v,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[a,i,r]=B(n,s);return t(a,{i18n:i,lng:i.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:a,...i}=t;return D(s,a),n.createElement(e,{...i})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function a(a){let{forwardedRef:i,...r}=a;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&i?u.ref=i:!t.withRef&&i&&(u.forwardedRef=i),n.createElement(s,u)}a.displayName=`withI18nextTranslation(${g(s)})`,a.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(a,Object.assign({},e,{forwardedRef:t})))):a}}}));
+diff --git a/dist/commonjs/context.js b/dist/commonjs/context.js
+index 5c4506e4d3424e4ffd167fd5bb696dabd67b662b..dcc11b798da72771953acce3c1368f006c3c1478 100644
+--- a/dist/commonjs/context.js
++++ b/dist/commonjs/context.js
+@@ -46,7 +46,7 @@ class ReportNamespaces {
+   }
+   addUsedNamespaces(namespaces) {
+     namespaces.forEach(ns => {
+-      this.usedNamespaces[ns] ??= true;
++      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
+     });
+   }
+   getUsedNamespaces() {
+diff --git a/dist/es/context.js b/dist/es/context.js
+index 89afe45d6cf480079598dd183521b32f28f77f06..a953078f44008ee751f51257536a31ceba2fd672 100644
+--- a/dist/es/context.js
++++ b/dist/es/context.js
+@@ -10,7 +10,7 @@ export class ReportNamespaces {
+   }
+   addUsedNamespaces(namespaces) {
+     namespaces.forEach(ns => {
+-      this.usedNamespaces[ns] ??= true;
++      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
+     });
+   }
+   getUsedNamespaces() {
+diff --git a/dist/umd/react-i18next.js b/dist/umd/react-i18next.js
+index 3723bd7c0f5762bdb09e3226ac86ff255cbf9859..9178ae9f7cdb776f51a64ff6c79eed1d18fbd836 100644
+--- a/dist/umd/react-i18next.js
++++ b/dist/umd/react-i18next.js
+@@ -499,7 +499,7 @@
+ 	  }
+ 	  addUsedNamespaces(namespaces) {
+ 	    namespaces.forEach(ns => {
+-	      this.usedNamespaces[ns] ??= true;
++	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
+ 	    });
+ 	  }
+ 	  getUsedNamespaces() {
+diff --git a/dist/umd/react-i18next.min.js b/dist/umd/react-i18next.min.js
+index 2eef624040aab6b4b9ba4699bf7e4777842bf0a2..69e17753d545df9dc26aa3411b477a4dff5e8361 100644
+--- a/dist/umd/react-i18next.min.js
++++ b/dist/umd/react-i18next.min.js
+@@ -1 +1 @@
+-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
++!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
+diff --git a/react-i18next.js b/react-i18next.js
+index 3723bd7c0f5762bdb09e3226ac86ff255cbf9859..9178ae9f7cdb776f51a64ff6c79eed1d18fbd836 100644
+--- a/react-i18next.js
++++ b/react-i18next.js
+@@ -499,7 +499,7 @@
+ 	  }
+ 	  addUsedNamespaces(namespaces) {
+ 	    namespaces.forEach(ns => {
+-	      this.usedNamespaces[ns] ??= true;
++	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
+ 	    });
+ 	  }
+ 	  getUsedNamespaces() {
+diff --git a/react-i18next.min.js b/react-i18next.min.js
+index 2eef624040aab6b4b9ba4699bf7e4777842bf0a2..69e17753d545df9dc26aa3411b477a4dff5e8361 100644
+--- a/react-i18next.min.js
++++ b/react-i18next.min.js
+@@ -1 +1 @@
+-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
++!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
+diff --git a/src/context.js b/src/context.js
+index 167af9c50f47e34f7473df03bb2bb1e369725934..9b9a5570b0b765c9d7809f912dba2db759ebb68d 100644
+--- a/src/context.js
++++ b/src/context.js
+@@ -14,7 +14,7 @@ export class ReportNamespaces {
+ 
+   addUsedNamespaces(namespaces) {
+     namespaces.forEach((ns) => {
+-      this.usedNamespaces[ns] ??= true;
++      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
+     });
+   }
+ 
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts
index d947c1b30c2e..5baf218a62bb 100644
--- a/apps/meteor/app/2fa/server/code/EmailCheck.ts
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts
@@ -38,7 +38,7 @@ export class EmailCheck implements ICodeCheck {
 	private async send2FAEmail(address: string, random: string, user: IUser): Promise<void> {
 		const language = user.language || settings.get('Language') || 'en';
 
-		const t = (s: string): string => i18n.t(s, { lng: language });
+		const t = i18n.getFixedT(language);
 
 		await Mailer.send({
 			to: address,
diff --git a/apps/meteor/app/2fa/server/functions/resetTOTP.ts b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
index 3be8ec7c8060..84426cd4f88d 100644
--- a/apps/meteor/app/2fa/server/functions/resetTOTP.ts
+++ b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
@@ -22,7 +22,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
 		return;
 	}
 
-	const t = (s: string): string => i18n.t(s, { lng: language });
+	const t = i18n.getFixedT(language);
 	const text = `
 	${t('Your_TOTP_has_been_reset')}
 
diff --git a/apps/meteor/app/lib/server/methods/addUsersToRoom.ts b/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
index 73fbf6e51a04..119071e8ece0 100644
--- a/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
+++ b/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
@@ -98,14 +98,11 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 					return;
 				}
 				void api.broadcast('notify.ephemeralMessage', userId, data.rid, {
-					msg: i18n.t(
-						'Username_is_already_in_here',
-						{
-							postProcess: 'sprintf',
-							sprintf: [newUser.username],
-						},
-						user?.language,
-					),
+					msg: i18n.t('Username_is_already_in_here', {
+						postProcess: 'sprintf',
+						sprintf: [newUser.username],
+						lng: user?.language,
+					}),
 				});
 			}
 		}),
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
index 56009f15fede..e004f2199fa0 100644
--- a/apps/meteor/app/lib/server/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -2,6 +2,7 @@ import { api } from '@rocket.chat/core-services';
 import type { AtLeast, IMessage, IUser } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Users } from '@rocket.chat/models';
+import type { TOptions } from 'i18next';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
@@ -98,9 +99,9 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 		SystemLogger.error({ msg: 'Error sending message:', err });
 
 		const errorMessage = typeof err === 'string' ? err : err.error || err.message;
-		const errorContext = err.details ?? {};
+		const errorContext: TOptions = err.details ?? {};
 		void api.broadcast('notify.ephemeralMessage', uid, message.rid, {
-			msg: i18n.t(errorMessage, errorContext, user.language),
+			msg: i18n.t(errorMessage, { ...errorContext, lng: user.language }),
 		});
 
 		if (typeof err === 'string') {
diff --git a/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts b/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
index 8a17686ba158..68d18cbfeacf 100644
--- a/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
+++ b/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
@@ -24,7 +24,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'add-users',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Add_them', undefined, lng),
+				text: i18n.t('Add_them', { lng }),
 			},
 		},
 		dismissBlock: {
@@ -35,7 +35,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'dismiss',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Do_nothing', undefined, lng),
+				text: i18n.t('Do_nothing', { lng }),
 			},
 		},
 		dmBlock: {
@@ -46,7 +46,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'share-message',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Let_them_know', undefined, lng),
+				text: i18n.t('Let_them_know', { lng }),
 			},
 		},
 	} as const;
@@ -121,7 +121,7 @@ callbacks.add(
 					type: 'section',
 					text: {
 						type: 'mrkdwn',
-						text: i18n.t(messageLabel, { mentions: mentionsText }, language),
+						text: i18n.t(messageLabel, { mentions: mentionsText, lng: language }),
 					},
 				} as const,
 				Boolean(elements.length) &&
diff --git a/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx b/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
index 41af8a22b6bb..58ede259fb45 100644
--- a/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
+++ b/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type PlaceChatOnHoldModalProps = {
 	onOnHoldChat: () => void;
@@ -9,7 +9,7 @@ type PlaceChatOnHoldModalProps = {
 };
 
 const PlaceChatOnHoldModal = ({ onCancel, onOnHoldChat, confirm = onOnHoldChat, ...props }: PlaceChatOnHoldModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal {...props} data-qa-id='on-hold-modal'>
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index 7aacfacb4476..404f576ea513 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -159,7 +159,7 @@ API.v1.addRoute(
 					const visitorEmail = visitor.visitorEmails?.[0]?.address;
 
 					const language = servingAgent.language || rcSettings.get<string>('Language') || 'en';
-					const t = (s: string): string => i18n.t(s, { lng: language });
+					const t = i18n.getFixedT(language);
 					const subject = t('Transcript_of_your_livechat_conversation');
 
 					options.emailTranscript = {
diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
index 17f21d8d7b04..017eb516a487 100644
--- a/apps/meteor/app/livechat/server/lib/Helper.ts
+++ b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -439,8 +439,8 @@ export const dispatchInquiryQueued = async (inquiry: ILivechatInquiryRecord, age
 			hasMentionToHere: false,
 			message: { _id: '', u: v, msg: '' },
 			// we should use server's language for this type of messages instead of user's
-			notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName }, language),
-			room: Object.assign(room, { name: i18n.t('New_chat_in_queue', {}, language) }),
+			notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName, lng: language }),
+			room: Object.assign(room, { name: i18n.t('New_chat_in_queue', { lng: language }) }),
 			mentionIds: [],
 		});
 	}
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index e1ea79d84163..c6728d470870 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -371,8 +371,8 @@ export class QueueManager {
 				hasMentionToHere: false,
 				message: { _id: '', u: v, msg: '' },
 				// we should use server's language for this type of messages instead of user's
-				notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName }, language),
-				room: { ...room, name: i18n.t('New_chat_in_queue', {}, language) },
+				notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName, lng: language }),
+				room: { ...room, name: i18n.t('New_chat_in_queue', { lng: language }) },
 				mentionIds: [],
 			});
 		}
diff --git a/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx b/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
index 420bf93df66d..21e502c90001 100644
--- a/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
+++ b/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
@@ -1,8 +1,8 @@
 import { Field, FieldGroup, TextInput, FieldLabel, FieldRow, Box } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../client/components/GenericModal';
 
@@ -13,7 +13,7 @@ type AddLinkComposerActionModalProps = {
 };
 
 const AddLinkComposerActionModal = ({ selectedText, onClose, onConfirm }: AddLinkComposerActionModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const textField = useUniqueId();
 	const urlField = useUniqueId();
 
diff --git a/apps/meteor/app/utils/lib/i18n.ts b/apps/meteor/app/utils/lib/i18n.ts
index b69fe6b30513..737b98666d0a 100644
--- a/apps/meteor/app/utils/lib/i18n.ts
+++ b/apps/meteor/app/utils/lib/i18n.ts
@@ -1,4 +1,5 @@
 import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
+import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import sprintf from 'i18next-sprintf-postprocessor';
 
@@ -13,7 +14,7 @@ export const addSprinfToI18n = function (t: (typeof i18n)['t']) {
 		}
 
 		if (isObject(replaces[0]) && !Array.isArray(replaces[0])) {
-			return t(key, replaces[0]);
+			return t(key, replaces[0] as TOptions);
 		}
 
 		return t(key, {
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
index af9b907df12e..2693060578ed 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
@@ -1,7 +1,7 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../contexts/CallContext';
 import { useDialModal } from '../../hooks/useDialModal';
@@ -9,7 +9,7 @@ import { useDialModal } from '../../hooks/useDialModal';
 type NavBarItemOmniChannelCallDialPadProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmniChannelCallDialPad = (props: NavBarItemOmniChannelCallDialPadProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
index cf4e7ec240b4..7f2b6adc8691 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
@@ -1,12 +1,12 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type NavBarItemOmnichannelCallToggleErrorProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleError = (props: NavBarItemOmnichannelCallToggleErrorProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <NavBarItem icon='phone' danger data-tooltip={t('Error')} disabled {...props} />;
 };
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
index c4b53acefabb..149500050402 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
@@ -1,12 +1,12 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type NavBarItemOmnichannelCallToggleLoadingProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleLoading = (props: NavBarItemOmnichannelCallToggleLoadingProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <NavBarItem icon='phone' data-tooltip={t('Loading')} aria-label={t('VoIP_Toggle')} disabled {...props} />;
 };
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
index 8b51fc6c5b57..82f1c28350cd 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
@@ -1,14 +1,14 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../contexts/CallContext';
 
 type NavBarItemOmnichannelCallToggleReadyProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleReady = (props: NavBarItemOmnichannelCallToggleReadyProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const caller = useCallerInfo();
 	const unregister = useCallUnregisterClient();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
index 22895d55388f..149ad0ea585e 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import UserMenuButton from './UserMenuButton';
 import { useUserMenu } from './hooks/useUserMenu';
@@ -11,7 +11,7 @@ import { useUserMenu } from './hooks/useUserMenu';
 type UserMenuProps = { user: IUser } & Omit<ComponentProps<typeof GenericMenu>, 'sections' | 'items' | 'title'>;
 
 const UserMenu = function UserMenu({ user, ...props }: UserMenuProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [isOpen, setIsOpen] = useState(false);
 
 	const sections = useUserMenu(user);
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
index f589dd21ed50..dbaea02ace4a 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
@@ -1,7 +1,7 @@
 import { Avatar } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarTitle,
@@ -19,7 +19,7 @@ interface IGameCenterContainerProps {
 }
 
 const GameCenterContainer = ({ handleClose, handleBack, game }: IGameCenterContainerProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
index d0dcc6fad4fe..871e82f3ff56 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
@@ -19,7 +19,7 @@ interface IGameCenterInvitePlayersModalProps {
 }
 
 const GameCenterInvitePlayersModal = ({ game, onClose }: IGameCenterInvitePlayersModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [users, setUsers] = useState<Array<Username>>([]);
 	const { name } = game;
 
diff --git a/apps/meteor/client/components/ActionManagerBusyState.tsx b/apps/meteor/client/components/ActionManagerBusyState.tsx
index 1399c045271f..932eb08ea502 100644
--- a/apps/meteor/client/components/ActionManagerBusyState.tsx
+++ b/apps/meteor/client/components/ActionManagerBusyState.tsx
@@ -1,12 +1,12 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
 
 const ActionManagerBusyState = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const actionManager = useUiKitActionManager();
 	const [busy, setBusy] = useState(false);
 
diff --git a/apps/meteor/client/components/AutoCompleteDepartment.tsx b/apps/meteor/client/components/AutoCompleteDepartment.tsx
index 6217f1d99610..0c50f2254aac 100644
--- a/apps/meteor/client/components/AutoCompleteDepartment.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartment.tsx
@@ -1,8 +1,8 @@
 import { PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
@@ -28,7 +28,7 @@ const AutoCompleteDepartment = ({
 	showArchived = false,
 	...props
 }: AutoCompleteDepartmentProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState<string>('');
 
 	const debouncedDepartmentsFilter = useDebouncedValue(departmentsFilter, 500);
diff --git a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
index 99af9a1f6a2c..c15d480f3900 100644
--- a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
@@ -1,9 +1,9 @@
 import { CheckOption, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
@@ -24,7 +24,7 @@ const AutoCompleteDepartmentMultiple = ({
 	enabled = false,
 	onChange = () => undefined,
 }: AutoCompleteDepartmentMultipleProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 
 	const debouncedDepartmentsFilter = useDebouncedValue(departmentsFilter, 500);
diff --git a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
index 349341baf003..77135fad6230 100644
--- a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
+++ b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 import RawText from './RawText';
@@ -20,7 +20,7 @@ const ConfirmOwnerChangeModal = ({
 	onConfirm,
 	onCancel,
 }: ConfirmOwnerChangeModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	let changeOwnerRooms = '';
 	if (shouldChangeOwner.length > 0) {
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
index c8e17ab88d80..dcac448b1e92 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
@@ -1,13 +1,13 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ContextualbarAction from './ContextualbarAction';
 
 type ContextualbarBackProps = Partial<ComponentProps<typeof ContextualbarAction>>;
 
 const ContextualbarBack = (props: ContextualbarBackProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <ContextualbarAction {...props} title={t('Back')} name='arrow-back' />;
 };
 
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
index 1670c9be5895..38db516476e3 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
@@ -1,13 +1,13 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ContextualbarAction from './ContextualbarAction';
 
 type ContextualbarCloseProps = Partial<ComponentProps<typeof ContextualbarAction>>;
 
 const ContextualbarClose = (props: ContextualbarCloseProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <ContextualbarAction data-qa='ContextualbarActionClose' {...props} aria-label={t('Close')} name='cross' />;
 };
 
diff --git a/apps/meteor/client/components/FilterByText.tsx b/apps/meteor/client/components/FilterByText.tsx
index 5c5a3d599e2f..25d8e225e3d8 100644
--- a/apps/meteor/client/components/FilterByText.tsx
+++ b/apps/meteor/client/components/FilterByText.tsx
@@ -1,8 +1,8 @@
 import { Box, Icon, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, FormEvent, HTMLAttributes } from 'react';
 import React, { forwardRef, memo, useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type FilterByTextProps = {
 	onChange: (filter: string) => void;
@@ -13,7 +13,7 @@ const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function Fi
 	{ placeholder, onChange: setFilter, shouldAutoFocus = false, children, ...props },
 	ref,
 ) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [text, setText] = useState('');
 	const autoFocusRef = useAutoFocus(shouldAutoFocus);
 	const mergedRefs = useMergedRefs(ref, autoFocusRef);
diff --git a/apps/meteor/client/components/FingerprintChangeModal.tsx b/apps/meteor/client/components/FingerprintChangeModal.tsx
index db4c33654a92..a45a17db8ccc 100644
--- a/apps/meteor/client/components/FingerprintChangeModal.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -12,7 +12,7 @@ type FingerprintChangeModalProps = {
 };
 
 const FingerprintChangeModal = ({ onConfirm, onCancel, onClose }: FingerprintChangeModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<GenericModal
 			variant='warning'
diff --git a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
index 77718de0f441..6acc413c82be 100644
--- a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -16,7 +16,7 @@ const FingerprintChangeModalConfirmation = ({
 	onCancel,
 	newWorkspace,
 }: FingerprintChangeModalConfirmationProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<GenericModal
 			variant='warning'
diff --git a/apps/meteor/client/components/GenericError/GenericError.tsx b/apps/meteor/client/components/GenericError/GenericError.tsx
index 22f9923dea27..15014fa162d7 100644
--- a/apps/meteor/client/components/GenericError/GenericError.tsx
+++ b/apps/meteor/client/components/GenericError/GenericError.tsx
@@ -1,7 +1,7 @@
 import { Box, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type GenericErrorProps = {
 	icon?: IconName;
@@ -11,7 +11,7 @@ type GenericErrorProps = {
 };
 
 const GenericError = ({ icon = 'magnifier', title, buttonTitle, buttonAction }: GenericErrorProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.tsx b/apps/meteor/client/components/GenericModal/GenericModal.tsx
index 5d025e05827d..d91e3c066007 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.tsx
@@ -1,9 +1,9 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode, ComponentPropsWithoutRef } from 'react';
 import React, { useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { RequiredModalProps } from './withDoNotAskAgain';
 import { withDoNotAskAgain } from './withDoNotAskAgain';
@@ -75,7 +75,7 @@ const GenericModal = ({
 	annotation,
 	...props
 }: GenericModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const genericModalId = useUniqueId();
 
 	const dismissedRef = useRef(true);
diff --git a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
index 3fcfe2b0e0ac..d21023024fb3 100644
--- a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
+++ b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
@@ -1,7 +1,7 @@
 import { Box, States, StatesIcon, StatesLink, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type LinkProps = { linkText: string; linkHref: string } | { linkText?: never; linkHref?: never };
 type ButtonProps = { buttonTitle: string; buttonAction: () => void } | { buttonTitle?: never; buttonAction?: never };
@@ -23,7 +23,7 @@ const GenericNoResults = ({
 	linkHref,
 	linkText,
 }: GenericNoResultsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
diff --git a/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
index 0a8a8deb8262..4c390041497e 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
@@ -1,7 +1,7 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useItemsPerPageLabel = (): (() => string) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return useCallback(() => t('Items_per_page:'), [t]);
 };
diff --git a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
index c610340f28bd..8ff7d2ac18cf 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
@@ -1,15 +1,19 @@
 import type { Pagination } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type Props<T extends ComponentProps<typeof Pagination>['showingResultsLabel'] = ComponentProps<typeof Pagination>['showingResultsLabel']> =
 	T extends (...args: any[]) => any ? Parameters<T> : never;
 
 export const useShowingResultsLabel = (): ((...params: Props) => string) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return useCallback(
-		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
+		({ count, current, itemsPerPage }) =>
+			t('Showing_results_of', {
+				postProcess: 'sprintf',
+				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
+			}),
 		[t],
 	);
 };
diff --git a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
index 3d68e3f4b6d3..e7ce515ac496 100644
--- a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
+++ b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
@@ -1,8 +1,8 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ReactElement, ComponentProps } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type GenericUpsellModalProps = {
 	children?: ReactNode;
@@ -35,7 +35,7 @@ const GenericUpsellModal = ({
 	annotation,
 	...props
 }: GenericUpsellModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal {...props}>
diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
index 2cabfed460bd..6db61b2ec910 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
@@ -1,10 +1,10 @@
 import type { IUpload } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, ButtonGroup, IconButton, Palette, Throbber } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useState } from 'react';
 import { FocusScope } from 'react-aria';
 import { createPortal } from 'react-dom';
+import { useTranslation } from 'react-i18next';
 import { Keyboard, Navigation, Zoom, A11y } from 'swiper';
 import type { SwiperRef } from 'swiper/react';
 import { type SwiperClass, Swiper, SwiperSlide } from 'swiper/react';
@@ -108,7 +108,7 @@ const swiperStyle = css`
 `;
 
 export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[]; onClose: () => void; loadMore?: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const swiperRef = useRef<SwiperRef>(null);
 	const [, setSwiperInst] = useState<SwiperClass>();
 	const [zoomScale, setZoomScale] = useState(1);
diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
index 97d91de95f62..8dcc55a93a48 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton, ModalBackdrop } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { createPortal } from 'react-dom';
+import { useTranslation } from 'react-i18next';
 
 import GenericError from '../GenericError/GenericError';
 
@@ -14,7 +14,7 @@ const closeButtonStyle = css`
 `;
 
 export const ImageGalleryError = ({ onClose }: { onClose: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return createPortal(
 		<ModalBackdrop display='flex' justifyContent='center' color='pure-white'>
diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
index 1c057584bd1f..588605786664 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton, ModalBackdrop, Throbber } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { createPortal } from 'react-dom';
+import { useTranslation } from 'react-i18next';
 
 const closeButtonStyle = css`
 	position: absolute;
@@ -12,7 +12,7 @@ const closeButtonStyle = css`
 `;
 
 export const ImageGalleryLoading = ({ onClose }: { onClose: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return createPortal(
 		<ModalBackdrop display='flex' justifyContent='center' color='pure-white'>
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
index cbefeb2c72c1..6f94be4ebc90 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
@@ -1,14 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { usePruneWarningMessage } from '../../hooks/usePruneWarningMessage';
 import { withErrorBoundary } from '../withErrorBoundary';
 
 const RetentionPolicyCallout = ({ room }: { room: IRoom }) => {
 	const message = usePruneWarningMessage(room);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Callout arial-label={t('Retention_policy_warning_callout')} role='alert' aria-live='polite' type='warning'>
diff --git a/apps/meteor/client/components/LocalTime.tsx b/apps/meteor/client/components/LocalTime.tsx
index 100ba2ec6a62..498b2da9711e 100644
--- a/apps/meteor/client/components/LocalTime.tsx
+++ b/apps/meteor/client/components/LocalTime.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useUTCClock } from '../hooks/useUTCClock';
 
@@ -10,7 +10,7 @@ type LocalTimeProps = {
 
 const LocalTime = ({ utcOffset }: LocalTimeProps): ReactElement => {
 	const time = useUTCClock(utcOffset);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return <>{t('Local_Time_time', { time })}</>;
 };
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index c9af942f6e1c..6426b24810ee 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -1,10 +1,10 @@
 import { Box } from '@rocket.chat/fuselage';
 import { isExternal, getBaseURI } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import dompurify from 'dompurify';
 import { marked } from 'marked';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { renderMessageEmoji } from '../lib/utils/renderMessageEmoji';
 
@@ -89,7 +89,7 @@ const MarkdownText = ({
 	...props
 }: MarkdownTextProps) => {
 	const sanitizer = dompurify.sanitize;
-	const t = useTranslation();
+	const { t } = useTranslation();
 	let markedOptions: marked.MarkedOptions;
 
 	const schemes = 'http,https,notes,ftp,ftps,tel,mailto,sms,cid';
diff --git a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
index 04fcb29eed01..b19ccfee1769 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type ReturnChatQueueModalProps = {
 	onMoveChat: () => void;
@@ -8,7 +8,7 @@ type ReturnChatQueueModalProps = {
 };
 
 const ReturnChatQueueModal = ({ onCancel, onMoveChat, ...props }: ReturnChatQueueModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal {...props} data-qa-id='return-to-queue-modal'>
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index c06b6a190465..502d0f9d1af7 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Field, Button, TextInput, Modal, Box, FieldGroup, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type TranscriptModalProps = {
 	email: string;
@@ -14,7 +14,7 @@ type TranscriptModalProps = {
 };
 
 const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, onCancel, onDiscard, ...props }: TranscriptModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const {
 		register,
diff --git a/apps/meteor/client/components/Sidebar/Header.tsx b/apps/meteor/client/components/Sidebar/Header.tsx
index e4bf5a5e7041..dcbf7f1cb505 100644
--- a/apps/meteor/client/components/Sidebar/Header.tsx
+++ b/apps/meteor/client/components/Sidebar/Header.tsx
@@ -1,7 +1,7 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type HeaderProps = {
 	children?: ReactNode;
@@ -10,7 +10,7 @@ type HeaderProps = {
 };
 
 const Header = ({ title, onClose, children, ...props }: HeaderProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' pb={16} {...props}>
diff --git a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
index 45eb6094572a..b588e223d922 100644
--- a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
@@ -1,6 +1,6 @@
 import { Divider } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Fragment, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { SidebarItem } from '../../lib/createSidebarItems';
 import { isSidebarItem } from '../../lib/createSidebarItems';
@@ -12,7 +12,7 @@ type SidebarItemsAssemblerProps = {
 };
 
 const SidebarItemsAssembler = ({ items, currentPath }: SidebarItemsAssemblerProps) => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	return (
 		<>
@@ -25,7 +25,7 @@ const SidebarItemsAssembler = ({ items, currentPath }: SidebarItemsAssemblerProp
 							icon={props.icon}
 							label={t((props.i18nLabel || props.name) as Parameters<typeof t>[0])}
 							currentPath={currentPath}
-							tag={props.tag && t.has(props.tag) ? t(props.tag) : props.tag}
+							tag={props.tag && i18n.exists(props.tag) ? t(props.tag) : props.tag}
 							externalUrl={props.externalUrl}
 							badge={props.badge}
 						/>
diff --git a/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx b/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
index cd0c25f03d86..1eefc50baabd 100644
--- a/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
+++ b/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
@@ -1,6 +1,6 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import SidebarTogglerBadge from './SidebarTogglerBadge';
 
@@ -10,7 +10,7 @@ type SideBarTogglerButtonProps = {
 };
 
 const SideBarTogglerButton = ({ badge, onClick }: SideBarTogglerButtonProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box position='relative'>
diff --git a/apps/meteor/client/components/TextCopy.tsx b/apps/meteor/client/components/TextCopy.tsx
index 467e954ddd65..f9e2ffc62284 100644
--- a/apps/meteor/client/components/TextCopy.tsx
+++ b/apps/meteor/client/components/TextCopy.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, Scrollable } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../hooks/useClipboardWithToast';
 
@@ -17,7 +17,7 @@ type TextCopyProps = {
 } & ComponentProps<typeof Box>;
 
 const TextCopy = ({ text, wrapper = defaultWrapperRenderer, ...props }: TextCopyProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { copy } = useClipboardWithToast(text);
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
index 4c91e274de68..4867d171aee8 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
@@ -1,8 +1,8 @@
 import { Box, PasswordInput, FieldGroup, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, Ref, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -15,7 +15,7 @@ type TwoFactorPasswordModalProps = {
 };
 
 const TwoFactorPasswordModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorPasswordModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus();
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index 6f36c9c8ce26..d6f167be8588 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -1,8 +1,8 @@
 import { Box, TextInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -15,7 +15,7 @@ type TwoFactorTotpModalProps = {
 };
 
 const TwoFactorTotpModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorTotpModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus<HTMLInputElement>();
 
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index 13d0523c92aa..dbc152c7fbff 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -13,14 +13,17 @@ type UrlChangeModalProps = {
 };
 
 const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<GenericModal variant='warning' title={t('Warning')} onConfirm={onConfirm} onClose={onClose} onCancel={onClose} confirmText={t('Yes')}>
 			<Box
 				is='p'
 				mbe={16}
 				dangerouslySetInnerHTML={{
-					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Site_Url'), siteUrl, currentUrl),
+					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', {
+						postProcess: 'sprintf',
+						sprintf: [t('Site_Url'), siteUrl, currentUrl],
+					}),
 				}}
 			/>
 			<p dangerouslySetInnerHTML={{ __html: t('Do_you_want_to_change_to_s_question', currentUrl) }} />
diff --git a/apps/meteor/client/components/UserCard/UserCard.tsx b/apps/meteor/client/components/UserCard/UserCard.tsx
index bf143229cf65..98e1cce2ab78 100644
--- a/apps/meteor/client/components/UserCard/UserCard.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ComponentProps } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 import MarkdownText from '../MarkdownText';
@@ -52,7 +52,7 @@ const UserCard = ({
 	nickname,
 	...props
 }: UserCardProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isLayoutEmbedded = useEmbeddedLayout();
 
 	return (
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index a7f32f82f454..ac879d21738b 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -1,9 +1,9 @@
 import type { IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../hooks/useTimeAgo';
 import { useUserCustomFields } from '../../hooks/useUserCustomFields';
@@ -72,7 +72,7 @@ const UserInfo = ({
 	reason,
 	...props
 }: UserInfoProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const timeAgo = useTimeAgo();
 	const userDisplayName = useUserDisplayName({ name, username });
 	const userCustomFields = useUserCustomFields(customFields);
diff --git a/apps/meteor/client/components/WarningModal.tsx b/apps/meteor/client/components/WarningModal.tsx
index 00ae92e1d3bd..db0697f78c0d 100644
--- a/apps/meteor/client/components/WarningModal.tsx
+++ b/apps/meteor/client/components/WarningModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type WarningModalProps = {
 	text: ReactNode;
@@ -13,7 +13,7 @@ type WarningModalProps = {
 };
 
 const WarningModal = ({ text, confirmText, close, cancel, cancelText, confirm, ...props }: WarningModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<Modal open {...props}>
 			<Modal.Header>
diff --git a/apps/meteor/client/components/dashboards/PeriodSelector.tsx b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
index 6977e3334f4f..d441fbf2f19a 100644
--- a/apps/meteor/client/components/dashboards/PeriodSelector.tsx
+++ b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
@@ -1,7 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { Period } from './periods';
 import { getPeriod } from './periods';
@@ -14,9 +14,9 @@ type PeriodSelectorProps<TPeriod extends Period['key']> = {
 };
 
 const PeriodSelector = <TPeriod extends Period['key']>({ periods, value, name, onChange }: PeriodSelectorProps<TPeriod>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
-	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(...getPeriod(period).label)]), [periods, t]);
+	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(getPeriod(period).label)]), [periods, t]);
 
 	return (
 		<Select
diff --git a/apps/meteor/client/components/dashboards/periods.ts b/apps/meteor/client/components/dashboards/periods.ts
index 784ba9c8f6a6..ff361b3136df 100644
--- a/apps/meteor/client/components/dashboards/periods.ts
+++ b/apps/meteor/client/components/dashboards/periods.ts
@@ -1,11 +1,6 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 
-const label = (
-	translationKey: TranslationKey,
-	...replacements: unknown[]
-): readonly [translationKey: TranslationKey, ...replacements: unknown[]] => [translationKey, ...replacements];
-
 const lastNDays =
 	(
 		n: number,
@@ -29,47 +24,47 @@ const lastNDays =
 const periods = [
 	{
 		key: 'today',
-		label: label('Today'),
+		label: 'Today' as TranslationKey,
 		range: lastNDays(0),
 	},
 	{
 		key: 'this week',
-		label: label('This_week'),
+		label: 'This_week' as TranslationKey,
 		range: lastNDays(7),
 	},
 	{
 		key: 'last 7 days',
-		label: label('Last_7_days'),
+		label: 'Last_7_days' as TranslationKey,
 		range: lastNDays(7),
 	},
 	{
 		key: 'last 15 days',
-		label: label('Last_15_days'),
+		label: 'Last_15_days' as TranslationKey,
 		range: lastNDays(15),
 	},
 	{
 		key: 'this month',
-		label: label('This_month'),
+		label: 'This_month' as TranslationKey,
 		range: lastNDays(30),
 	},
 	{
 		key: 'last 30 days',
-		label: label('Last_30_days'),
+		label: 'Last_30_days' as TranslationKey,
 		range: lastNDays(30),
 	},
 	{
 		key: 'last 90 days',
-		label: label('Last_90_days'),
+		label: 'Last_90_days' as TranslationKey,
 		range: lastNDays(90),
 	},
 	{
 		key: 'last 6 months',
-		label: label('Last_6_months'),
+		label: 'Last_6_months' as TranslationKey,
 		range: lastNDays(180),
 	},
 	{
 		key: 'last year',
-		label: label('Last_year'),
+		label: 'Last_year' as TranslationKey,
 		range: lastNDays(365),
 	},
 ] as const;
diff --git a/apps/meteor/client/components/dashboards/usePeriodLabel.ts b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
index 8a8845703a49..4469015def78 100644
--- a/apps/meteor/client/components/dashboards/usePeriodLabel.ts
+++ b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { Period } from './periods';
 import { getPeriod } from './periods';
 
 export const usePeriodLabel = (period: Period['key']): string => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
-	return useMemo(() => t(...getPeriod(period).label), [period, t]);
+	return useMemo(() => t(getPeriod(period).label), [period, t]);
 };
diff --git a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
index 9bc4f11fd3cd..be07673e6aa6 100644
--- a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
+++ b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
@@ -1,9 +1,9 @@
 import type { DeviceManagementSession, DeviceManagementPopulatedSession, Serialized } from '@rocket.chat/core-typings';
 import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../lib/asyncState';
 import GenericNoResults from '../../GenericNoResults/GenericNoResults';
@@ -37,7 +37,7 @@ const DeviceManagementTable = <T extends DeviceManagementSession | DeviceManagem
 	setItemsPerPage,
 	paginationProps,
 }: DeviceManagementTableProps<T>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (!data && phase === AsyncStatePhase.REJECTED) {
 		return (
diff --git a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
index fc1c8c72f65b..3dbc25180a07 100644
--- a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
+++ b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
@@ -1,10 +1,10 @@
 import { Banner, Box, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const LoggedOutBanner = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Banner variant='warning' icon={<Icon name='warning' size='x24' />}>
diff --git a/apps/meteor/client/components/message/IgnoredContent.tsx b/apps/meteor/client/components/message/IgnoredContent.tsx
index b2dd7e726667..93fa4d391fdc 100644
--- a/apps/meteor/client/components/message/IgnoredContent.tsx
+++ b/apps/meteor/client/components/message/IgnoredContent.tsx
@@ -1,14 +1,14 @@
 import { Box, Icon, MessageBody } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type IgnoredContentProps = {
 	onShowMessageIgnored: () => void;
 };
 
 const IgnoredContent = ({ onShowMessageIgnored }: IgnoredContentProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const showMessageIgnored = (event: React.SyntheticEvent): void => {
 		event.stopPropagation();
diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
index 487c390a973f..21a4d8484f8f 100644
--- a/apps/meteor/client/components/message/MessageHeader.tsx
+++ b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -7,9 +7,9 @@ import {
 	MessageStatusPrivateIndicator,
 	MessageNameContainer,
 } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../lib/getUserDisplayName';
 import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
@@ -27,7 +27,7 @@ type MessageHeaderProps = {
 };
 
 const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const formatTime = useFormatTime();
 	const formatDateAndTime = useFormatDateAndTime();
diff --git a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
index ac8ae925fbe5..9ed659b2801f 100644
--- a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
+++ b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type ReadReceiptIndicatorProps = {
 	mid: IMessage['_id'];
@@ -10,7 +10,7 @@ type ReadReceiptIndicatorProps = {
 };
 
 const ReadReceiptIndicator = ({ mid, unread }: ReadReceiptIndicatorProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box
diff --git a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
index 2868a1794778..378b998a2ee3 100644
--- a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
+++ b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageBlock, MessageMetrics, MessageMetricsReply } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useChat } from '../../../views/room/contexts/ChatContext';
 
@@ -12,7 +12,7 @@ type BroadcastMetricsProps = {
 };
 
 const BroadcastMetrics = ({ username, message }: BroadcastMetricsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const chat = useChat();
 
diff --git a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
index a14c75761de5..3d66580c0270 100644
--- a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
+++ b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
@@ -6,9 +6,9 @@ import {
 	MessageMetricsItemLabel,
 	MessageMetricsReply,
 } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
 import { useGoToRoom } from '../../../views/room/hooks/useGoToRoom';
@@ -21,7 +21,7 @@ type DiscussionMetricsProps = {
 };
 
 const DiscussionMetrics = ({ lm, count, rid, drid }: DiscussionMetricsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const format = useTimeAgo();
 
 	const goToRoom = useGoToRoom();
diff --git a/apps/meteor/client/components/message/content/Reactions.tsx b/apps/meteor/client/components/message/content/Reactions.tsx
index c71afcf3feb1..d16f6aefb22c 100644
--- a/apps/meteor/client/components/message/content/Reactions.tsx
+++ b/apps/meteor/client/components/message/content/Reactions.tsx
@@ -1,9 +1,9 @@
 import { useToolbar } from '@react-aria/toolbar';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageReactions, MessageReactionAction } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes, KeyboardEvent, ReactElement } from 'react';
 import React, { useContext, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { MessageListContext, useOpenEmojiPicker, useUserHasReacted } from '../list/MessageListContext';
 import Reaction from './reactions/Reaction';
@@ -14,7 +14,7 @@ type ReactionsProps = {
 } & HTMLAttributes<HTMLDivElement>;
 
 const Reactions = ({ message, ...props }: ReactionsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const ref = useRef(null);
 	const hasReacted = useUserHasReacted(message);
 	const openEmojiPicker = useOpenEmojiPicker(message);
diff --git a/apps/meteor/client/components/message/content/actions/MessageAction.tsx b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
index 7a787cdd7508..c5b4081dfc5e 100644
--- a/apps/meteor/client/components/message/content/actions/MessageAction.tsx
+++ b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
@@ -1,9 +1,9 @@
 import { Button } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const resolveLegacyIcon = (legacyIcon: IconName | `icon-${IconName | 'videocam'}`): IconName => {
 	if (legacyIcon === 'icon-videocam') {
@@ -23,7 +23,7 @@ type MessageActionProps = {
 };
 
 const MessageAction = ({ icon, methodId, i18nLabel, label, runAction, danger }: MessageActionProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const resolvedIcon = resolveLegacyIcon(icon);
 
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
index 284cb0cecbf2..175c41b0f76b 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
@@ -1,13 +1,13 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Action from '../../Action';
 
 type AttachmentDownloadBaseProps = Omit<ComponentProps<typeof Action>, 'icon'> & { title?: string | undefined; href: string };
 
 const AttachmentDownloadBase = ({ title, href, disabled, ...props }: AttachmentDownloadBaseProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Action
diff --git a/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx b/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
index cb61a16ced57..fbd65900413c 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
@@ -1,15 +1,15 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ImageBox from './ImageBox';
 
 type LoadProps = ComponentPropsWithoutRef<typeof Box> & { load: () => void };
 
 const Load = ({ load, ...props }: LoadProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const clickable = css`
 		cursor: pointer;
 		background: ${Palette.surface['surface-tint']};
diff --git a/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx b/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
index 6654800f9e13..fa959a1dd276 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
@@ -1,14 +1,14 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ImageBox from './ImageBox';
 
 type RetryProps = { retry: () => void };
 
 const Retry = ({ retry }: RetryProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const clickable = css`
 		cursor: pointer;
 		background: ${Palette.surface['surface-tint']};
diff --git a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
index af449db9a41c..14697087294e 100644
--- a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
+++ b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
@@ -1,13 +1,13 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Action from '../Action';
 
 type CollapsibleContentProps = Omit<ComponentProps<typeof Action>, 'icon'> & { collapsed?: boolean };
 
 const CollapsibleContent = ({ collapsed = false, ...props }: CollapsibleContentProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <Action title={collapsed ? t('Uncollapse') : t('Collapse')} icon={!collapsed ? 'chevron-down' : 'chevron-left'} {...props} />;
 };
 
diff --git a/apps/meteor/client/components/message/content/location/MapViewFallback.tsx b/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
index 3e89cb03cec7..23c0e98320ff 100644
--- a/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
+++ b/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
@@ -1,14 +1,14 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type MapViewFallbackProps = {
 	linkUrl: string;
 };
 
 const MapViewFallback = ({ linkUrl }: MapViewFallbackProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box is='span' fontScale='p2' display='inline-flex' alignItems='center' paddingBlock={4}>
diff --git a/apps/meteor/client/components/message/content/location/MapViewImage.tsx b/apps/meteor/client/components/message/content/location/MapViewImage.tsx
index 4cf33040938d..1f94006bd0db 100644
--- a/apps/meteor/client/components/message/content/location/MapViewImage.tsx
+++ b/apps/meteor/client/components/message/content/location/MapViewImage.tsx
@@ -1,6 +1,6 @@
 import { ExternalLink } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type MapViewImageProps = {
 	linkUrl: string;
@@ -8,7 +8,7 @@ type MapViewImageProps = {
 };
 
 const MapViewImage = ({ linkUrl, imageUrl }: MapViewImageProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<ExternalLink to={linkUrl}>
diff --git a/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx b/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
index a71f50a953b6..0bc8975c80f8 100644
--- a/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
+++ b/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
@@ -1,8 +1,8 @@
 import { Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useGetMessageByID } from '../../../../views/room/contextualBar/Threads/hooks/useGetMessageByID';
 import MarkdownText from '../../../MarkdownText';
@@ -37,7 +37,7 @@ const getTranslationKey = (users: string[], mine: boolean): TranslationKey => {
 };
 
 const ReactionTooltip = ({ emojiName, usernames, mine, messageId, showRealName, username }: ReactionTooltipProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const key = getTranslationKey(usernames, mine);
 
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
index 50f978e243b3..8761b60cc68f 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
@@ -1,7 +1,7 @@
 import { MessageGenericPreview } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MessageCollapsible from '../../MessageCollapsible';
 import OEmbedPreviewContent from './OEmbedPreviewContent';
@@ -10,7 +10,7 @@ import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 type OEmbedCollapsibleProps = { children?: ReactNode } & OEmbedPreviewMetadata;
 
 const OEmbedCollapsible = ({ children, ...props }: OEmbedCollapsibleProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<MessageCollapsible title={t('Link_Preview')}>
diff --git a/apps/meteor/client/components/message/header/MessageRoles.tsx b/apps/meteor/client/components/message/header/MessageRoles.tsx
index 83526f349469..26942e5d04f6 100644
--- a/apps/meteor/client/components/message/header/MessageRoles.tsx
+++ b/apps/meteor/client/components/message/header/MessageRoles.tsx
@@ -1,7 +1,7 @@
 import { MessageRole, MessageRoles as FuselageMessageRoles } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type MessageRolesProps = {
 	roles: Array<string>;
@@ -9,7 +9,7 @@ type MessageRolesProps = {
 };
 
 const MessageRoles = ({ roles, isBot }: MessageRolesProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<FuselageMessageRoles>
diff --git a/apps/meteor/client/components/message/notification/MessageNotification.tsx b/apps/meteor/client/components/message/notification/MessageNotification.tsx
index b6d8ac007347..7dd75ca5ed31 100644
--- a/apps/meteor/client/components/message/notification/MessageNotification.tsx
+++ b/apps/meteor/client/components/message/notification/MessageNotification.tsx
@@ -1,9 +1,9 @@
 import type { Palette } from '@rocket.chat/fuselage';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type MessageNotificationProps = {
 	label: TranslationKey;
@@ -11,7 +11,7 @@ type MessageNotificationProps = {
 };
 
 const MessageNotification = ({ label, bg }: MessageNotificationProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <Box width='x8' aria-label={t(label)} borderRadius='full' height='x8' bg={bg} />;
 };
 
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 155599c5b51d..5bf1d8846498 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,8 +1,8 @@
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
 
@@ -24,7 +24,7 @@ type MessageActionMenuProps = {
 };
 
 const MessageActionMenu = ({ options, onChangeMenuVisibility, context, isMessageEncrypted }: MessageActionMenuProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const id = useUniqueId();
 	const groupOptions = options
 		.map((option) => ({
diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
index eeba342c3f31..df0d62292422 100644
--- a/apps/meteor/client/components/message/variants/SystemMessage.tsx
+++ b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -13,9 +13,9 @@ import {
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, KeyboardEvent } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
@@ -40,7 +40,7 @@ type SystemMessageProps = {
 } & ComponentProps<typeof MessageSystem>;
 
 const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatTime = useFormatTime();
 	const formatDateAndTime = useFormatDateAndTime();
 	const { triggerProps, openUserCard } = useUserCard();
diff --git a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
index c423d09a9527..f7fa072a7406 100644
--- a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
+++ b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
@@ -13,9 +13,9 @@ import {
 	MessageStatusIndicatorItem,
 } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import {
@@ -42,7 +42,7 @@ const ThreadMessagePreview = ({ message, showUserAvatar, sequential, ...props }:
 	const parentMessage = useParentMessage(message.tmid);
 
 	const translated = useShowTranslated(message);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const isSelecting = useIsSelecting();
 	const toggleSelected = useToggleSelect(message._id);
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
index 33bce63745e2..3d468f57f464 100644
--- a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
+++ b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
@@ -2,9 +2,9 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { isQuoteAttachment, isE2EEMessage } from '@rocket.chat/core-typings';
 import { PreviewMarkup } from '@rocket.chat/gazzodown';
 import type { Root } from '@rocket.chat/message-parser';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GazzodownText from '../../../GazzodownText';
 
@@ -13,7 +13,7 @@ type ThreadMessagePreviewBodyProps = {
 };
 
 const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isEncryptedMessage = isE2EEMessage(message);
 
 	const getMessage = () => {
diff --git a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
index 615fee8714aa..3d6f4be8c0fc 100644
--- a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
+++ b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
@@ -1,14 +1,14 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Avatar, Box, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getUserAvatarURL } from '../../../../app/utils/client';
 import { parseOutboundPhoneNumber } from '../../../lib/voip/parseOutboundPhoneNumber';
 
 export const VoipRoomForeword = ({ room }: { room: IVoipRoom }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const avatarUrl = getUserAvatarURL(room.name) as string;
 
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.ts b/apps/meteor/client/hooks/useDecryptedMessage.ts
index ea3cf3cc62a9..aa36ba1d34fd 100644
--- a/apps/meteor/client/hooks/useDecryptedMessage.ts
+++ b/apps/meteor/client/hooks/useDecryptedMessage.ts
@@ -1,13 +1,13 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 
 export const useDecryptedMessage = (message: IMessage): string => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [decryptedMessage, setDecryptedMessage] = useSafely(useState(t('E2E_message_encrypted_placeholder')));
 
 	useEffect(() => {
diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
index 199d1507e284..c6a55716df65 100644
--- a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
+++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
@@ -1,5 +1,6 @@
 import { Emitter } from '@rocket.chat/emitter';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import type { TFunction } from 'i18next';
 import { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -17,7 +18,7 @@ if ('serviceWorker' in navigator) {
 	});
 }
 
-export const registerDownloadForUid = (uid: string, t: ReturnType<typeof useTranslation>['t'], title?: string) => {
+export const registerDownloadForUid = (uid: string, t: TFunction, title?: string) => {
 	ee.once(uid, ({ result }) => {
 		downloadAs({ data: [new Blob([result])] }, title ?? t('Download'));
 	});
diff --git a/apps/meteor/client/hooks/useFormatDuration.ts b/apps/meteor/client/hooks/useFormatDuration.ts
index 61215074dfbd..807190c63f5e 100644
--- a/apps/meteor/client/hooks/useFormatDuration.ts
+++ b/apps/meteor/client/hooks/useFormatDuration.ts
@@ -1,8 +1,8 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useFormatDuration = (): ((duration: number) => string) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return useCallback(
 		(duration) => {
diff --git a/apps/meteor/client/hooks/useHighlightedCode.ts b/apps/meteor/client/hooks/useHighlightedCode.ts
index 4e3405ca3034..e059bf3f1181 100644
--- a/apps/meteor/client/hooks/useHighlightedCode.ts
+++ b/apps/meteor/client/hooks/useHighlightedCode.ts
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import hljs, { register } from '../../app/markdown/lib/hljs';
 
 export function useHighlightedCode(language: string, text: string): string {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { isLoading } = useQuery(['register-highlight-language', language], async () => {
 		try {
 			await register(language);
diff --git a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index bba1fd135782..35af90a912d0 100644
--- a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -1,15 +1,15 @@
 import { Field, FieldLabel, FieldRow, FieldError, TextInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const BusinessHoursMultiple = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		control,
 		formState: { errors },
diff --git a/apps/meteor/client/omnichannel/additionalForms/ContactManager.js b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
index 52ab527ef841..f92c4720a213 100644
--- a/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
+++ b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
@@ -1,12 +1,12 @@
 import { Field } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../components/AutoCompleteAgent';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 export const ContactManager = ({ value: userId, handler }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
 	if (!hasLicense) {
diff --git a/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
index d6c78c3c043c..8ee9cf6ddbf9 100644
--- a/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
@@ -1,10 +1,10 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, FieldHint, ToggleSwitch, TextInput, Select } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
@@ -17,7 +17,7 @@ const checkIsOptionsValid = (value: string) => {
 };
 
 const CustomFieldsAdditionalForm = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		control,
 		watch,
diff --git a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
index 47ee87f7ee2a..e65e4da01b96 100644
--- a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
@@ -2,8 +2,8 @@ import { Field, FieldLabel, FieldRow, FieldHint, Box, PaginatedMultiSelectFilter
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useDepartmentsList } from '../../components/Omnichannel/hooks/useDepartmentsList';
 import { useRecordList } from '../../hooks/lists/useRecordList';
@@ -18,7 +18,7 @@ type DepartmentForwardingProps = {
 };
 
 export const DepartmentForwarding = ({ departmentId, value = [], handler, label }: DepartmentForwardingProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
index 75a2656dc4ea..dda85c9ff08b 100644
--- a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
@@ -1,14 +1,14 @@
 import { NumberInput, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const MaxChatsPerAgent = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { control } = useFormContext();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
index 8d68f0ec29f3..b628d2622649 100644
--- a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { InfoPanelLabel, InfoPanelText } from '../../components/InfoPanel';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const MaxChatsPerAgentDisplay = ({ maxNumberSimultaneousChat = 0 }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
 	if (!hasLicense) {
diff --git a/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
index da157e06b3f0..3ad0b25b10d6 100644
--- a/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
@@ -3,9 +3,9 @@ import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Options, Box, Option, Field, FieldLabel, FieldRow, SelectLegacy } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback, forwardRef, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import { PriorityIcon } from '../priorities/PriorityIcon';
@@ -18,7 +18,7 @@ type PrioritiesSelectProps = {
 };
 
 export const PrioritiesSelect = ({ value = '', label, options, onChange }: PrioritiesSelectProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const [sorting] = useState<Record<string, LivechatPriorityWeight>>({});
 
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
index 90dd6bd4ed32..6f57a29e116f 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelCannedResponse, Serialized } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../components/Skeleton';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
@@ -12,7 +12,7 @@ const CannedResponseEditWithDepartmentData = ({ cannedResponseData }: { cannedRe
 	const departmentId = useMemo(() => cannedResponseData?.departmentId, [cannedResponseData]) as string;
 	const { value: departmentData, phase: state, error } = useEndpointData('/v1/livechat/department/:_id', { keys: { _id: departmentId } });
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (state === AsyncStatePhase.LOADING) {
 		return <FormSkeleton />;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
index 4746e7df6bea..bb869189e1ba 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../components/AutoCompleteAgent';
 
@@ -18,7 +18,7 @@ type CannedResponsesFilterProps = {
 };
 
 const CannedResponsesFilter = ({ createdBy, setCreatedBy, sharing, setSharing, text, setText }: CannedResponsesFilterProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sharingList: SelectOption[] = [
 		['', t('All')],
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
index 54ce88cccb7e..7e59aaa7cf8e 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Divider } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, RefObject, SetStateAction } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type InsertPlaceholderDropdownProps = {
 	onChange: any;
@@ -11,7 +11,7 @@ type InsertPlaceholderDropdownProps = {
 };
 
 const InsertPlaceholderDropdown = ({ onChange, textAreaRef, setVisible }: InsertPlaceholderDropdownProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const clickable = css`
 		cursor: pointer;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
index 6bef3f10efdc..e4ed5f58ef8c 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
@@ -1,8 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEventHandler } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -37,7 +37,7 @@ const CannedResponse = ({
 	onClickEdit,
 	onClickUse,
 }: CannedResponseProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const scope = useScopeDict(dataScope, departmentName);
 
 	return (
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
index cd9907f271a5..5734cf2e93bf 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
@@ -1,9 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, ContextualbarEmptyContent, Icon, Margins, Select, TextInput } from '@rocket.chat/fuselage';
 import { useAutoFocus, useResizeObserver } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, FormEventHandler, MouseEvent, ReactElement, SetStateAction } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -54,7 +54,7 @@ const CannedResponseList = ({
 	onClickUse,
 	reload,
 }: CannedResponseListProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 
 	const { context: cannedId } = useRoomToolbox();
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
index 224e0c5dff55..29b4e4326dd1 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
@@ -1,9 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { memo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useScopeDict } from '../../../hooks/useScopeDict';
 
@@ -15,7 +15,7 @@ type ItemProps = {
 };
 
 const Item = ({ data, allowUse, onClickItem, onClickUse }: ItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const scope = useScopeDict(data.scope, data.departmentName);
 
diff --git a/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
index 749f40d28a60..df449a21f64e 100644
--- a/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
+++ b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useIsRoomOverMacLimit } from '../../../hooks/omnichannel/useIsRoomOverMacLimit';
 
@@ -11,7 +11,7 @@ type RoomActivityIconProps = {
 };
 
 export const RoomActivityIcon = ({ room }: RoomActivityIconProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isRoomOverMacLimit = useIsRoomOverMacLimit(room);
 
 	return isRoomOverMacLimit ? (
diff --git a/apps/meteor/client/omnichannel/hooks/useScopeDict.ts b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
index da8fd60b7360..ffab5d55aaf0 100644
--- a/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
+++ b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
@@ -1,8 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 export const useScopeDict = (scope: IOmnichannelCannedResponse['scope'], departmentName: ILivechatDepartment['name']): string => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const dict: Record<string, string> = {
 		global: t('Public'),
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
index dffbde494e7a..cbf2e6ec88ff 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import MonitorsTable from './MonitorsTable';
 
 const MonitorsPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page flexDirection='row'>
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
index a85dd72c868d..5d8c55d5330c 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -10,7 +10,7 @@ type PrioritiesResetModalProps = {
 };
 
 export const PrioritiesResetModal = ({ onCancel, onReset }: PrioritiesResetModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
index 7e5368d7a0a5..008147d49e1b 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
@@ -1,7 +1,7 @@
 import type { ILivechatPriority, Serialized } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../components/GenericNoResults';
 import {
@@ -22,7 +22,7 @@ type PrioritiesTableProps = {
 };
 
 export const PrioritiesTable = ({ priorities, onRowClick, isLoading }: PrioritiesTableProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const headers = (
 		<>
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
index fec79d762bcd..b0232c6076a6 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
@@ -1,7 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../components/Skeleton';
 import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo';
@@ -13,7 +13,7 @@ type PriorityEditFormWithDataProps = Omit<PriorityEditFormProps, 'data'> & {
 };
 
 function PriorityEditFormWithData({ priorityId, ...props }: PriorityEditFormWithDataProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isInitialLoading, isError } = usePriorityInfo(priorityId);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
index 7f6a486436a3..8aac2a73f85c 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
@@ -2,9 +2,9 @@ import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import { Box, Icon, Palette, StatusBullet } from '@rocket.chat/fuselage';
 import type { Keys } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
 
@@ -37,7 +37,7 @@ const PRIORITY_ICONS: Record<number, { iconName: Keys; color: string }> = {
 };
 
 export const PriorityIcon = ({ level, size = 20, showUnprioritized = false, ...props }: PriorityIconProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { iconName, color } = PRIORITY_ICONS[level] || {};
 	const { data: priorities } = useOmnichannelPriorities();
 
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
index e31fc3a44a5a..16091476d10c 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -21,7 +21,7 @@ type PriorityListProps = {
 };
 
 const PriorityList = ({ priorityId, onClose, onSave }: PriorityListProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<ContextualbarDialog>
diff --git a/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx b/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
index 90b838758234..2feb7ca01439 100644
--- a/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
@@ -1,6 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	GenericTable,
@@ -22,7 +22,7 @@ type AgentsTableProps = {
 };
 
 export const AgentsTable = memo(({ data, sortBy, sortDirection, setSort }: AgentsTableProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const onHeaderClick = useMutableCallback((id) => {
 		setSort(id, sortDirection === 'asc' ? 'desc' : 'asc');
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
index e0253f11665c..2df983140748 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
@@ -1,7 +1,7 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
 import type { Keys } from '@rocket.chat/icons';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type CardEmpryStateProps = {
 	icon?: Keys;
@@ -9,7 +9,7 @@ type CardEmpryStateProps = {
 };
 
 export const ReportCardEmptyState = ({ icon, subtitle }: CardEmpryStateProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<States width='100%' height='100%'>
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
index 023a4b5c918b..b8168e366299 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
@@ -1,14 +1,14 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type ReportCardErrorStateProps = {
 	onRetry?: () => void;
 };
 
 export const ReportCardErrorState = ({ onRetry }: ReportCardErrorStateProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<States width='100%' height='100%'>
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
index 4ca7066bbc08..23a6c21d33d8 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
@@ -1,6 +1,7 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
 import { getPeriodRange } from '../../../components/dashboards/periods';
@@ -16,7 +17,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useAgentsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-agents-period', PERIOD_OPTIONS);
 	const getConversationsByAgent = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-agent');
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'total'>('total', 'desc');
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
index ce13de2f546e..864181a6464e 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
@@ -1,8 +1,10 @@
 import { capitalize } from '@rocket.chat/string-helpers';
-import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
+import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -21,7 +23,7 @@ const TYPE_LABEL: Record<string, TranslationKey> = {
 	'api': 'Custom_Integration',
 };
 
-const formatItem = (item: { label: string; value: number }, total: number, t: TranslationContextValue['translate']): DataItem => {
+const formatItem = (item: { label: string; value: number }, total: number, t: TFunction): DataItem => {
 	const percentage = total > 0 ? round((item.value / total) * 100) : 0;
 	const label = `${t(TYPE_LABEL[item.label]) || capitalize(item.label)}`;
 	return {
@@ -32,12 +34,12 @@ const formatItem = (item: { label: string; value: number }, total: number, t: Tr
 	};
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
 	return data.map((item) => formatItem(item, total, t));
 };
 
 export const useChannelsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-channels-period', PERIOD_OPTIONS);
 	const getConversationsBySource = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-source');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
index d0cf335c09d9..f185e347e8d5 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { Period } from '../../../components/dashboards/periods';
 import { formatAttachmentName } from '../utils/formatAttachmentName';
@@ -13,7 +13,7 @@ type DefaultDownloadHookProps = {
 };
 
 export const useDefaultDownload = ({ columnName, title, period, data }: DefaultDownloadHookProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return useMemo(() => {
 		const { start, end } = formatPeriodRange(period);
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
index 0e207c3d113a..fe4bfaf7d723 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
@@ -1,6 +1,7 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -15,7 +16,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useDepartmentsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-department-period', PERIOD_OPTIONS);
 	const getConversationsByDepartment = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-department');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
index 3c725f9bc85b..d8f17dd5b79f 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
@@ -1,7 +1,9 @@
-import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
+import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -17,7 +19,7 @@ const STATUSES: Record<string, { label: TranslationKey; color: string }> = {
 	Closed: { label: 'Omnichannel_Reports_Status_Closed', color: COLORS.danger },
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
 	return data.map((item) => {
 		const status = STATUSES[item.label];
 		const percentage = total > 0 ? round((item.value / total) * 100) : 0;
@@ -33,7 +35,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 };
 
 export const useStatusSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-status-period', PERIOD_OPTIONS);
 	const getConversationsByStatus = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-status');
 	const { start, end } = getPeriodRange(period);
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
index 5688fc24c6b5..93fe56b96b8d 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
@@ -1,7 +1,8 @@
 import { Palette } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -23,7 +24,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useTagsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-tags-period', PERIOD_OPTIONS);
 	const getConversationsByTags = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-tags');
 
diff --git a/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx b/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
index 692bd1c33032..11dbecccfab7 100644
--- a/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { AgentsTable, BarChart, ReportCard } from '../components';
 import { useAgentsSection } from '../hooks';
@@ -11,7 +11,7 @@ const BREAKPOINT = 768;
 
 export const AgentsSection = () => {
 	const { data, sortBy, sortDirection, setSort, ...config } = useAgentsSection();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { ref, contentBoxSize: { inlineSize: cardWidth = 200 } = {} } = useResizeObserver<HTMLElement>();
 	const width = cardWidth * 0.9;
diff --git a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
index ab12af6af1cf..6874c551da52 100644
--- a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
+++ b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
@@ -1,8 +1,8 @@
-import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
 
 import { getPeriod, type Period } from '../../../components/dashboards/periods';
 
-export const formatPeriodDescription = (periodKey: Period['key'], t: TranslationContextValue['translate']) => {
+export const formatPeriodDescription = (periodKey: Period['key'], t: TFunction) => {
 	const { label } = getPeriod(periodKey);
-	return t(...label).toLocaleLowerCase();
+	return t(label).toLocaleLowerCase();
 };
diff --git a/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
index 9f0a21086868..4b6d6d395523 100644
--- a/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
+++ b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
@@ -1,8 +1,8 @@
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
@@ -23,7 +23,7 @@ const AutoCompleteTagsMultiple = ({
 	department,
 	viewAll = false,
 }: AutoCompleteTagsMultipleProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [tagsFilter, setTagsFilter] = useState('');
 
 	const debouncedTagsFilter = useDebouncedValue(tagsFilter, 500);
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx b/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
index 6779fb8d6c82..791c2189ec6b 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
@@ -1,12 +1,12 @@
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes, Ref } from 'react';
 import React, { forwardRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from './useSidebarListNavigation';
 
 const RoomListWrapper = forwardRef(function RoomListWrapper(props: HTMLAttributes<HTMLDivElement>, ref: Ref<HTMLDivElement>) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
 
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
index bf7736b5899a..1f66217d76e5 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useLicense, useLicenseName } from '../../hooks/useLicense';
 
 export const SidebarFooterWatermark = (): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const response = useLicense();
 
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
index 119476ecd89a..ba7bbd977e03 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -2,9 +2,9 @@ import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-t
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
@@ -50,7 +50,7 @@ export const VoipFooter = ({
 	options,
 }: VoipFooterPropsType): ReactElement => {
 	const contactLabel = useOmnichannelContactLabel(caller);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const cssClickable =
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
index 8f0a26222679..43e6be7c583d 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../components/GenericNoResults';
 
 const FederatedRoomListEmptyPlaceholder = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
index f3307436bc07..fd37aac816f4 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
+import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListErrorBoundaryProps = {
 	children?: ReactNode;
@@ -11,7 +11,7 @@ type FederatedRoomListErrorBoundaryProps = {
 };
 
 const FederatedRoomListErrorBoundary = ({ children, resetKeys }: FederatedRoomListErrorBoundaryProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<QueryErrorResetBoundary>
 			{({ reset }): ReactElement => (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
index 01cb22c2e1c5..c096c74c08a4 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
@@ -2,8 +2,8 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListItemProps = IFederationPublicRooms & {
 	disabled: boolean;
@@ -23,7 +23,7 @@ const FederatedRoomListItem = ({
 	canJoin,
 	disabled,
 }: FederatedRoomListItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const nameId = useUniqueId();
 
 	return (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
index 741eadf7bc7e..0108958e3e64 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
@@ -1,7 +1,7 @@
 import { Modal, Skeleton } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearchModalContent from './MatrixFederationSearchModalContent';
 import { useMatrixServerList } from './useMatrixServerList';
@@ -12,7 +12,7 @@ type MatrixFederationSearchProps = {
 };
 
 const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isLoading } = useMatrixServerList();
 	const titleId = useUniqueId();
 
diff --git a/apps/meteor/client/sidebar/header/UserMenu.tsx b/apps/meteor/client/sidebar/header/UserMenu.tsx
index b106caa20b16..7d964c2122bc 100644
--- a/apps/meteor/client/sidebar/header/UserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenu.tsx
@@ -7,15 +7,15 @@ import {
 	useHandleMenuAction,
 	type GenericMenuItemProps,
 } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import UserAvatarWithStatus from './UserAvatarWithStatus';
 import UserAvatarWithStatusUnstable from './UserAvatarWithStatusUnstable';
 import { useUserMenu } from './hooks/useUserMenu';
 
 const UserMenu = ({ user }: { user: IUser }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [isOpen, setIsOpen] = useState(false);
 
 	const sections = useUserMenu(user);
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index a0016db7e75c..14c9f2cc83c5 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type AdministrationProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Administration = (props: AdministrationProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sections = useAdministrationMenu();
 
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
index 3392db4ed917..3a59b0adea43 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const CreateRoom = (props: CreateRoomProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sections = useCreateRoom();
 
diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx
index 1fe4b947c661..e4d1d66cf3af 100644
--- a/apps/meteor/client/sidebar/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Sort = (props: SortProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sections = useSortMenu();
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
index cf71cf4223b9..23f71d67ebc5 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
@@ -1,12 +1,12 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import { useAdministrationItems } from './useAdministrationItems';
 import { useAppsItems } from './useAppsItems';
 import { useAuditItems } from './useAuditItems';
 
 export const useAdministrationMenu = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const administrationItems = useAdministrationItems();
 	const appItems = useAppsItems();
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
index 7e628378749d..cd0abc9bdfb2 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
@@ -1,5 +1,5 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
@@ -9,7 +9,7 @@ export const useMatrixFederationItems = ({
 }: {
 	isMatrixEnabled: string | number | boolean | null | undefined;
 }): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const searchFederatedRooms = useCreateRoomModal(MatrixFederationSearch);
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
index bea1d999997e..af6a73ce6eab 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import { useGroupingListItems } from './useGroupingListItems';
 import { useSortModeItems } from './useSortModeItems';
 import { useViewModeItems } from './useViewModeItems';
 
 export const useSortMenu = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const viewModeItems = useViewModeItems();
 	const sortModeItems = useSortModeItems();
diff --git a/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx b/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
index 53cbd0340339..c2578d076f1a 100644
--- a/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
+++ b/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
@@ -1,10 +1,10 @@
 import { Icon, SidebarBanner } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const OverMacLimitSection = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleClick = () => {
 		window.open('https://rocket.chat/pricing', '_blank');
diff --git a/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
index fb12c3e6fc3b..c8f56ffe5458 100644
--- a/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
@@ -1,11 +1,11 @@
 import { SidebarBanner } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useStatusDisabledModal } from '../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
 const StatusDisabledSection = ({ onDismiss }: { onDismiss: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
index 2cd263630da7..e0fa30ca2345 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
@@ -1,13 +1,13 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../contexts/CallContext';
 import { useDialModal } from '../../../hooks/useDialModal';
 
 export const OmniChannelCallDialPad = ({ ...props }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
index 77efcd5057e1..dd5186aeb479 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const OmnichannelCallToggleError = ({ ...props }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <Sidebar.TopBar.Action icon='phone' danger data-tooltip={t('Error')} disabled {...props} />;
 };
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
index 673a3225482c..8318e9199900 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const OmnichannelCallToggleLoading = ({ ...props }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <Sidebar.TopBar.Action icon='phone' data-tooltip={t('Loading')} aria-label={t('VoIP_Toggle')} disabled {...props} />;
 };
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
index 497e0143bfaa..8205d0287768 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
@@ -1,12 +1,12 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../../contexts/CallContext';
 
 export const OmnichannelCallToggleReady = ({ ...props }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const caller = useCallerInfo();
 	const unregister = useCallUnregisterClient();
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
index b4d4b4a44c98..09e80f12765c 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
@@ -1,14 +1,14 @@
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ForwardedRef, HTMLAttributes } from 'react';
 import React, { forwardRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from './useSidebarListNavigation';
 
 type RoomListWrapperProps = HTMLAttributes<HTMLDivElement>;
 
 const RoomListWrapper = forwardRef(function RoomListWrapper(props: RoomListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
 
diff --git a/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
index bf7736b5899a..1f66217d76e5 100644
--- a/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useLicense, useLicenseName } from '../../hooks/useLicense';
 
 export const SidebarFooterWatermark = (): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const response = useLicense();
 
diff --git a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
index 6e67baefdec8..9344ba33c9ad 100644
--- a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
@@ -2,9 +2,9 @@ import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-t
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
@@ -50,7 +50,7 @@ const VoipFooter = ({
 	options,
 }: VoipFooterProps): ReactElement => {
 	const contactLabel = useOmnichannelContactLabel(caller);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const cssClickable =
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
index 8f0a26222679..43e6be7c583d 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../components/GenericNoResults';
 
 const FederatedRoomListEmptyPlaceholder = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
index 6931c98f219e..1608058528bc 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
+import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListErrorBoundaryProps = {
 	children?: ReactNode;
@@ -11,7 +11,7 @@ type FederatedRoomListErrorBoundaryProps = {
 };
 
 const FederatedRoomListErrorBoundary = ({ children, resetKeys }: FederatedRoomListErrorBoundaryProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<QueryErrorResetBoundary>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
index dfaa79ed44de..002c8a5ac9da 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListItemProps = IFederationPublicRooms & {
 	disabled: boolean;
@@ -22,7 +22,7 @@ const FederatedRoomListItem = ({
 	canJoin,
 	disabled,
 }: FederatedRoomListItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mb={16} pi={24} is='li' display='flex' flexDirection='column' w='full' name={canonicalAlias}>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
index f3dc779d28c1..9ea119aabb18 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
@@ -1,6 +1,6 @@
 import { Modal, Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearchModalContent from './MatrixFederationSearchModalContent';
 import { useMatrixServerList } from './useMatrixServerList';
@@ -11,7 +11,7 @@ type MatrixFederationSearchProps = {
 };
 
 const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isLoading } = useMatrixServerList();
 
 	return (
diff --git a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
index f12de10f19f9..5c56b44554b8 100644
--- a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
@@ -1,15 +1,15 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const CreateRoom = (props: CreateRoomProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sections = useCreateRoom();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
index d5394c28c6e6..dcfa84dd71bc 100644
--- a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
@@ -1,15 +1,15 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Sort = (props: SortProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sections = useSortMenu();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
index 7e628378749d..cd0abc9bdfb2 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
@@ -1,5 +1,5 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
@@ -9,7 +9,7 @@ export const useMatrixFederationItems = ({
 }: {
 	isMatrixEnabled: string | number | boolean | null | undefined;
 }): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const searchFederatedRooms = useCreateRoomModal(MatrixFederationSearch);
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
index bea1d999997e..af6a73ce6eab 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import { useGroupingListItems } from './useGroupingListItems';
 import { useSortModeItems } from './useSortModeItems';
 import { useViewModeItems } from './useViewModeItems';
 
 export const useSortMenu = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const viewModeItems = useViewModeItems();
 	const sortModeItems = useSortModeItems();
diff --git a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
index a0f3245e8835..9994a0e66e77 100644
--- a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
@@ -1,13 +1,13 @@
 import { SidebarV2Banner } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useStatusDisabledModal } from '../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
 type StatusDisabledSectionProps = { onDismiss: () => void };
 
 const StatusDisabledSection = ({ onDismiss }: StatusDisabledSectionProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
diff --git a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
index ac98cd15cd89..2ecb46e44ee7 100644
--- a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
@@ -1,5 +1,6 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { TranslationContext } from '@rocket.chat/ui-contexts';
+import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import type { ContextType, ReactElement, ReactNode } from 'react';
 import React, { useContext, useMemo } from 'react';
@@ -30,7 +31,7 @@ const TranslationContextMock = ({ children }: TranslationContextMockProps): Reac
 		const translate = (key: string, ...replaces: unknown[]): string => {
 			if (typeof replaces[0] === 'object' && replaces[0] !== null) {
 				const [options] = replaces;
-				return i18next.t(key, options);
+				return i18next.t(key, options as TOptions);
 			}
 
 			if (replaces.length === 0) {
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
index 30979e2a81d8..d1af15f59711 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
@@ -1,12 +1,12 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import DeviceManagementAccountTable from './DeviceManagementAccountTable';
 
 const DeviceManagementAccountPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
index e2532d0c6623..76556a238bac 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
@@ -1,8 +1,8 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
 import DeviceIcon from '../../../../components/deviceManagement/DeviceIcon';
@@ -26,7 +26,7 @@ const DeviceManagementAccountRow = ({
 	loginAt,
 	onReload,
 }: DevicesRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index 5039521fa622..411f9ad02e6f 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -1,7 +1,7 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -17,7 +17,7 @@ const sortMapping = {
 };
 
 const DeviceManagementAccountTable = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'client' | 'os' | 'loginAt'>('loginAt');
 
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
index 95d7d2d12353..c109ca1aefb5 100644
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
+++ b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
@@ -1,10 +1,10 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useFeaturePreviewList } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const AccountFeaturePreviewBadge = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { unseenFeatures } = useFeaturePreviewList();
 
 	if (!unseenFeatures) {
diff --git a/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx b/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
index 2f58ed305be4..ca6872b0165a 100644
--- a/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
+++ b/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
@@ -1,12 +1,12 @@
 import { Field, FieldGroup, FieldHint, FieldLabel, FieldRow, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 export const PreferencesGeneral = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { register } = useFormContext();
 	const omnichannelHideAfterClosing = useUniqueId();
 
diff --git a/apps/meteor/client/views/account/preferences/MyDataModal.tsx b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
index 8889a1a44a53..75b1e67b324e 100644
--- a/apps/meteor/client/views/account/preferences/MyDataModal.tsx
+++ b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Box, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type MyDataModalProps = {
 	onCancel: () => void;
@@ -10,7 +10,7 @@ type MyDataModalProps = {
 };
 
 const MyDataModal = ({ onCancel, title, text, ...props }: MyDataModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal {...props}>
diff --git a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
index 85bfc9072b12..e987f78266b6 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
@@ -1,11 +1,11 @@
 import { Accordion, Field, FieldGroup, FieldLabel, FieldRow, FieldHint, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 const PreferencesHighlightsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { register } = useFormContext();
 
 	const highlightsId = useUniqueId();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
index b8b4366cf4ff..c7e5bdf5aece 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
@@ -1,12 +1,12 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { FieldRow, FieldLink, FieldHint, FieldLabel, Accordion, Field, Select, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 const PreferencesMessagesSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { control } = useFormContext();
 
 	const alsoSendThreadMessageToChannelOptions = useMemo(
diff --git a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
index 02a04d0b2c59..edfece178e52 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
@@ -1,11 +1,11 @@
 import { Accordion, Field, FieldLabel, FieldRow, NumberInput, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 const PreferencesUserPresenceSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { register, control } = useFormContext();
 
 	const enableAutoAwayId = useUniqueId();
diff --git a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
index 01c9e1b77fb6..d9e25d6d625e 100644
--- a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
+++ b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
@@ -1,6 +1,6 @@
 import { Box, PasswordInput, TextInput, FieldGroup, Field, FieldRow, FieldError } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
@@ -11,7 +11,7 @@ type ActionConfirmModalProps = {
 };
 
 const ActionConfirmModal = ({ isPassword, onConfirm, onCancel }: ActionConfirmModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [inputText, setInputText] = useState('');
 	const [inputError, setInputError] = useState<string | undefined>();
 
diff --git a/apps/meteor/client/views/account/security/BackupCodesModal.tsx b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
index eb97fb10cd7f..de3457902b7a 100644
--- a/apps/meteor/client/views/account/security/BackupCodesModal.tsx
+++ b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
@@ -1,6 +1,6 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import TextCopy from '../../../components/TextCopy';
 
@@ -10,7 +10,7 @@ type BackupCodesModalProps = {
 };
 
 const BackupCodesModal = ({ codes, onClose, ...props }: BackupCodesModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const codesText = useMemo(() => codes.join(' '), [codes]);
 
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
index 9885b0bd3b86..abf45ebedcb9 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
@@ -1,12 +1,12 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AccountTokensTable from './AccountTokensTable';
 
 const AccountTokensPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
index 5158d31d2470..e4e9db4a8fad 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
@@ -1,7 +1,7 @@
 import type { IPersonalAccessToken, Serialized } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
@@ -13,7 +13,7 @@ type AccountTokensRowProps = {
 } & Serialized<Pick<IPersonalAccessToken, 'name' | 'createdAt' | 'lastTokenPart' | 'bypassTwoFactor'>>;
 
 const AccountTokensRow = ({ bypassTwoFactor, createdAt, isMedium, lastTokenPart, name, onRegenerate, onRemove }: AccountTokensRowProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const handleRegenerate = useCallback(() => onRegenerate(name), [name, onRegenerate]);
 	const handleRemove = useCallback(() => onRemove(name), [name, onRemove]);
diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index 31721cb4f7ab..59da79508192 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import { useEndpointUpload } from '../../../hooks/useEndpointUpload';
@@ -13,7 +13,7 @@ type AddCustomEmojiProps = {
 };
 
 const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [name, setName] = useState('');
 	const [aliases, setAliases] = useState('');
 	const [emojiFile, setEmojiFile] = useState<Blob>();
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
index 776e04fe1f69..fa97324a5722 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage, GenericResourceUsageSkeleton } from '../../../components/GenericResourceUsage';
 import { useActiveConnections } from '../../hooks/useActiveConnections';
 
 const CustomUserActiveConnections = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const result = useActiveConnections();
 
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
index 510d2d9303f4..b54c2181d76f 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
@@ -1,12 +1,12 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
 type CustomUserStatusDisabledModalProps = { isAdmin: boolean; onConfirm: () => void; onClose: () => void };
 
 const CustomUserStatusDisabledModal = ({ isAdmin, onConfirm, onClose }: CustomUserStatusDisabledModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return isAdmin ? (
 		<GenericModal
 			title={t('User_status_disabled_learn_more')}
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index ebd1e762ff80..84037afdcab8 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -1,8 +1,8 @@
 import type { DeviceManagementPopulatedSession, DeviceManagementSession, Serialized } from '@rocket.chat/core-typings';
 import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
@@ -24,7 +24,7 @@ const isSessionPopulatedSession = (
 ): session is Serialized<DeviceManagementPopulatedSession> => '_user' in session;
 
 const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject<() => void> }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [text, setText] = useState('');
 	const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'client' | 'os' | 'username' | 'loginAt'>('username');
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
index 5f78269fca57..f884b27e0cb1 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
@@ -1,8 +1,8 @@
 import type { Serialized, DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -27,7 +27,7 @@ const convertSessionFromAPI = ({
 });
 
 const DeviceInfoWithData = ({ deviceId, onReload }: { deviceId: string; onReload: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const {
 		value: data,
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
index f95e2b009a26..0f20e716b3b1 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
@@ -1,16 +1,16 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
+import { useTranslation } from 'react-i18next';
 
 type EngagementDashboardCardErrorBoundaryProps = {
 	children?: ReactNode;
 };
 
 const EngagementDashboardCardErrorBoundary = ({ children }: EngagementDashboardCardErrorBoundaryProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [error, setError] = useState<Error>();
 	const isError = (error: unknown): error is Error => error instanceof Error;
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
index 78f1585f0f4b..95de437462a5 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
@@ -1,7 +1,7 @@
 import { Box, Select, Tabs } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
 import ChannelsTab from './channels/ChannelsTab';
@@ -14,7 +14,7 @@ type EngagementDashboardPageProps = {
 };
 
 const EngagementDashboardPage = ({ tab = 'users', onSelectTab }: EngagementDashboardPageProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const timezoneOptions = useMemo<[timezone: 'utc' | 'local', label: string][]>(
 		() => [
diff --git a/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
index a92b2c6d3295..6283d5000825 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
@@ -1,8 +1,8 @@
 import { Icon, Margins, Pagination, Skeleton, Table, TableBody, TableCell, TableHead, TableRow, Tile } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -14,7 +14,7 @@ import { useChannelsList } from './useChannelsList';
 const ChannelsOverview = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
@@ -121,7 +121,10 @@ const ChannelsOverview = (): ReactElement => {
 					itemsPerPage={itemsPerPage}
 					itemsPerPageLabel={(): string => t('Items_per_page:')}
 					showingResultsLabel={({ count, current, itemsPerPage }): string =>
-						t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count)
+						t('Showing_results_of', {
+							postProcess: 'sprintf',
+							sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
+						})
 					}
 					count={data?.total || 0}
 					onSetItemsPerPage={setItemsPerPage}
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
index 0d9f7c2e77db..88fad25990d0 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
@@ -14,9 +14,9 @@ import {
 	TableBody,
 	TableCell,
 } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -34,7 +34,7 @@ const colors = {
 const MessagesPerChannelSection = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data: messageOriginsData } = useMessageOrigins({ period });
 	const { data: topFivePopularChannelsData } = useTopFivePopularChannels({ period });
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
index 7cf46ebc476a..5eca6c046568 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, Skeleton, Palette, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -18,7 +18,7 @@ const MessagesSentSection = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 	const periodLabel = usePeriodLabel(period);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data } = useMessagesSent({ period });
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
index 1e12d982d8b6..616e63a04351 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
@@ -1,13 +1,13 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import MessagesPerChannelSection from './MessagesPerChannelSection';
 import MessagesSentSection from './MessagesSentSection';
 
 const MessagesTab = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
index 80359837b627..7ac1b7c91289 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveLine } from '@nivo/line';
 import { Box, Flex, Skeleton, Tile } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import CounterSet from '../../../../components/dataView/CounterSet';
@@ -101,7 +101,7 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement
 	}, [data, utc]);
 
 	const formatDate = useFormatDate();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
index f70acde3a8e4..4af3d8f9200a 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
@@ -1,7 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import ContentForDays from './ContentForDays';
@@ -14,7 +14,7 @@ type BusiestChatTimesSectionProps = {
 };
 
 const BusiestChatTimesSection = ({ timezone }: BusiestChatTimesSectionProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [timeUnit, setTimeUnit] = useState<TimeUnit>('hours');
 	const timeUnitOptions = useMemo<[timeUnit: TimeUnit, label: string][]>(
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
index 2114bd9208d9..83753769cc91 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
@@ -2,10 +2,10 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Button, Chevron, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useHourlyChatActivity } from './useHourlyChatActivity';
 
@@ -20,7 +20,7 @@ const ContentForHours = ({ displacement, onPreviousDateClick, onNextDateClick, t
 	const utc = timezone === 'utc';
 	const { data } = useHourlyChatActivity({ displacement, utc });
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isLgScreen = useBreakpoints().includes('lg');
 
 	const values = useMemo(() => {
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
index 36f9c3de2cc2..0498d0451ab9 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
@@ -2,10 +2,10 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -29,7 +29,7 @@ const NewUsersSection = ({ timezone }: NewUsersSectionProps): ReactElement => {
 	const utc = timezone === 'utc';
 	const { data } = useNewUsers({ period, utc });
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const formatDate = useFormatDate();
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
index 007e75f95474..c5f7d2044129 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveHeatMapCanvas } from '@nivo/heatmap';
 import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -23,7 +23,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp
 
 	const { data, isLoading } = useUsersByTimeOfTheDay({ period, utc });
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [dates, values] = useMemo(() => {
 		if (!data || isLoading) {
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
index b79d0b9c9a69..238cc0e40d29 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
@@ -1,8 +1,8 @@
 import { Box, Flex } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import ActiveUsersSection from './ActiveUsersSection';
@@ -15,7 +15,7 @@ type UsersTabProps = {
 };
 
 const UsersTab = ({ timezone }: UsersTabProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const isXxlScreen = useBreakpoints().includes('xxl');
 
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
index 126a385e6ceb..14dc96283f86 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
@@ -1,14 +1,14 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import OverviewSection from './OverviewSection';
 import ServersSection from './ServersSection';
 
 function FederationDashboardPage(): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/admin/import/PrepareChannels.tsx b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
index 494f1f2b9b78..9f868d391ede 100644
--- a/apps/meteor/client/views/admin/import/PrepareChannels.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
@@ -1,7 +1,7 @@
 import { CheckBox, Table, Tag, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { ChannelDescriptor } from './ChannelDescriptor';
 
@@ -13,11 +13,15 @@ type PrepareChannelsProps = {
 
 // TODO: review inner logic
 const PrepareChannels = ({ channels, channelsCount, setChannels }: PrepareChannelsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
 	const showingResultsLabel = useCallback(
-		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
+		({ count, current, itemsPerPage }) =>
+			t('Showing_results_of', {
+				postProcess: 'sprintf',
+				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
+			}),
 		[t],
 	);
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), [t]);
diff --git a/apps/meteor/client/views/admin/import/PrepareUsers.tsx b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
index 72e5d66127cf..ff6b4752bb2c 100644
--- a/apps/meteor/client/views/admin/import/PrepareUsers.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
@@ -1,7 +1,7 @@
 import { CheckBox, Table, Tag, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { UserDescriptor } from './UserDescriptor';
 
@@ -13,11 +13,15 @@ type PrepareUsersProps = {
 
 // TODO: review inner logic
 const PrepareUsers = ({ usersCount, users, setUsers }: PrepareUsersProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
 	const showingResultsLabel = useCallback(
-		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
+		({ count, current, itemsPerPage }) =>
+			t('Showing_results_of', {
+				postProcess: 'sprintf',
+				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
+			}),
 		[t],
 	);
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), [t]);
diff --git a/apps/meteor/client/views/admin/integrations/NewBot.tsx b/apps/meteor/client/views/admin/integrations/NewBot.tsx
index bd4bdbac1303..65c44aca65bc 100644
--- a/apps/meteor/client/views/admin/integrations/NewBot.tsx
+++ b/apps/meteor/client/views/admin/integrations/NewBot.tsx
@@ -1,9 +1,9 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const NewBot = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return <Box pb={20} fontScale='h4' key='bots' dangerouslySetInnerHTML={{ __html: t('additional_integrations_Bots') }} />;
 };
diff --git a/apps/meteor/client/views/admin/integrations/NewZapier.tsx b/apps/meteor/client/views/admin/integrations/NewZapier.tsx
index 8313ee4a5029..e2f5c1d597a8 100644
--- a/apps/meteor/client/views/admin/integrations/NewZapier.tsx
+++ b/apps/meteor/client/views/admin/integrations/NewZapier.tsx
@@ -1,6 +1,6 @@
 import { Box, Skeleton, Margins, Callout } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const blogSpotStyleScriptImport = (src: string) =>
 	new Promise((resolve) => {
@@ -16,7 +16,7 @@ const blogSpotStyleScriptImport = (src: string) =>
 	});
 
 const NewZapier = ({ ...props }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [script, setScript] = useState<HTMLScriptElement>();
 
 	useEffect(() => {
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index a14cdd2ada46..65c53386e6a1 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -18,9 +18,9 @@ import {
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { outgoingEvents } from '../../../../../app/integrations/lib/outgoingEvents';
 import { useHighlightedCode } from '../../../../hooks/useHighlightedCode';
@@ -52,7 +52,7 @@ type EditOutgoingWebhookPayload = Pick<
 >;
 
 const OutgoingWebhookForm = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const {
 		control,
@@ -185,7 +185,10 @@ const OutgoingWebhookForm = () => {
 								<FieldHint
 									id={`${channelField}-hint-2`}
 									dangerouslySetInnerHTML={{
-										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
+										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
+											postProcess: 'sprintf',
+											sprintf: ['@', '#', '@john', '#general'],
+										}),
 									}}
 								/>
 								<FieldHint id={`${channelField}-hint-3`} dangerouslySetInnerHTML={{ __html: t('Integrations_for_all_channels') }} />
@@ -229,7 +232,10 @@ const OutgoingWebhookForm = () => {
 								<FieldHint
 									id={`${targetRoomField}-hint-2`}
 									dangerouslySetInnerHTML={{
-										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
+										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
+											postProcess: 'sprintf',
+											sprintf: ['@', '#', '@john', '#general'],
+										}),
 									}}
 								/>
 							</Field>
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
index 7d0ce037c700..a0ad98a8efb9 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
@@ -1,12 +1,12 @@
 import type { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings';
 import { Skeleton, Box, Accordion } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import HistoryItem from './HistoryItem';
 
 const HistoryContent = ({ data, isLoading }: { data: Serialized<IIntegrationHistory>[]; isLoading: boolean }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (isLoading) {
 		return (
diff --git a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
index 878b4d84f507..a78627685cc0 100644
--- a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
@@ -11,7 +11,7 @@ import useResetAvatarAction from './hooks/useResetAvatarAction';
 type MessageContextFooterProps = { userId: string; deleted: boolean };
 
 const MessageContextFooter = ({ userId, deleted }: MessageContextFooterProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const dismissUserAction = useDismissUserAction(userId);
 	const deleteMessagesAction = useDeleteMessagesAction(userId);
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
index 85d081e652da..52e0e8bcbee5 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
@@ -1,7 +1,6 @@
-// import { Menu, Option } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { ModerationConsoleRowProps } from './ModerationConsoleTableRow';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
@@ -10,7 +9,7 @@ import useDismissUserAction from './hooks/useDismissUserAction';
 import useResetAvatarAction from './hooks/useResetAvatarAction';
 
 const ModerationConsoleActions = ({ report, onClick }: Omit<ModerationConsoleRowProps, 'isDesktopOrLarger'>): JSX.Element => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { userId: uid, isUserDeleted } = report;
 
 	return (
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
index 13da70b48da2..21128ff72fd3 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
@@ -1,6 +1,6 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
@@ -8,7 +8,7 @@ import useResetAvatarAction from '../hooks/useResetAvatarAction';
 import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow';
 
 const ModConsoleUserActions = ({ report, onClick }: Omit<ModConsoleUserRowProps, 'isDesktopOrLarger'>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		reportedUser: { _id: uid },
 	} = report;
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
index c437746ad8ef..496ff07e4524 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
@@ -10,7 +10,7 @@ import useResetAvatarAction from '../hooks/useResetAvatarAction';
 type UserContextFooterProps = { userId: string; deleted: boolean };
 
 const UserContextFooter = ({ userId, deleted }: UserContextFooterProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const dismissUserAction = useDismissUserAction(userId, true);
 	const deactivateUserAction = useDeactivateUserAction(userId, true);
diff --git a/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx b/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
index 74d3f206c8ca..9da6a25ff863 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
@@ -1,8 +1,8 @@
 import { Select, Box, type SelectOption } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment, { type Moment } from 'moment';
 import React, { useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type DateRangePickerProps = {
 	onChange(range: { start: string; end: string }): void;
@@ -23,7 +23,7 @@ const getWeekRange = (daysToSubtractFromStart: number, daysToSubtractFromEnd: nu
 });
 
 const DateRangePicker = ({ onChange }: DateRangePickerProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleRange = useMutableCallback((range) => {
 		onChange(range);
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
index 5414e3d06aa5..aaad5d0c4ebd 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import DateRangePicker from './DateRangePicker';
@@ -10,7 +10,7 @@ type ModerationFilterProps = {
 };
 
 const ModerationFilter = ({ setText, setDateRange }: ModerationFilterProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<FilterByText shouldAutoFocus placeholder={t('Search')} onChange={setText}>
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx b/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
index c22062228839..13c26dc62223 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
@@ -1,12 +1,12 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const ReportReasonCollapsible = ({ children }: { children: ReactNode }) => {
 	const [isOpen, setIsOpen] = useToggle(false);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const toggle = () => setIsOpen((prev) => !prev);
 
diff --git a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
index 6d03af10c8b4..ad782e021720 100644
--- a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
+++ b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericUpsellModal from '../../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
 
 const CustomRoleUpsellModal = ({ onClose }: { onClose: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { handleManageSubscription } = useUpsellActions();
 
 	return (
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
index 300d80f4f51c..7ddd6ca9ab45 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
@@ -1,16 +1,17 @@
 import type { IRole, IPermission } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
 import type { ReactElement } from 'react';
 import React, { useState, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { CONSTANTS } from '../../../../../app/authorization/lib';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useChangeRole } from '../hooks/useChangeRole';
 import RoleCell from './RoleCell';
 
-const getName = (t: ReturnType<typeof useTranslation>, permission: IPermission): string => {
+const getName = (t: TFunction, permission: IPermission): string => {
 	if (permission.level === CONSTANTS.SETTINGS_LEVEL) {
 		let path = '';
 		if (permission.group) {
@@ -33,7 +34,7 @@ type PermissionRowProps = {
 };
 
 const PermissionRow = ({ permission, roleList, onGrant, onRemove }: PermissionRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { _id, roles } = permission;
 	const [hovered, setHovered] = useState(false);
 	const changeRole = useChangeRole({ onGrant, onRemove, permissionId: _id });
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
index 2926ef82124e..52f3a5370493 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
@@ -1,11 +1,11 @@
 import { TextInput } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const PermissionsTableFilter = ({ onChange }: { onChange: (debouncedFilter: string) => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [filter, setFilter] = useState('');
 	const debouncedFilter = useDebouncedValue(filter, 500);
 
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index 2a063ce7d05a..59ef726dcb2c 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, FieldHint, TextInput, Select, ToggleSwitch } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type RoleFormProps = {
 	className?: string;
@@ -13,7 +13,7 @@ type RoleFormProps = {
 };
 
 const RoleForm = ({ className, editing = false, isProtected = false, isDisabled = false }: RoleFormProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		register,
 		control,
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
index 4e860ca8f759..f05c708fd0fb 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
@@ -2,9 +2,9 @@ import type { IUserInRole } from '@rocket.chat/core-typings';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getUserEmailAddress } from '../../../../../../lib/getUserEmailAddress';
 import { GenericTableRow, GenericTableCell } from '../../../../../components/GenericTable';
@@ -15,7 +15,7 @@ type UsersInRoleTableRowProps = {
 };
 
 const UsersInRoleTableRow = ({ user, onRemove }: UsersInRoleTableRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { _id, name, username, avatarETag } = user;
 	const email = getUserEmailAddress(user);
 
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
index 2ec5954332f7..63192775a59e 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
@@ -1,9 +1,9 @@
 import { Box, Icon, TextInput } from '@rocket.chat/fuselage';
 import type { OptionProp } from '@rocket.chat/ui-client';
 import { MultiSelectCustom } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useMemo, useState } from 'react';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const initialRoomTypeFilterStructure = [
 	{
@@ -43,7 +43,7 @@ const initialRoomTypeFilterStructure = [
 ] as OptionProp[];
 
 const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction<any>> }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [text, setText] = useState('');
 
 	const [roomTypeSelectedOptions, setRoomTypeSelectedOptions] = useState<OptionProp[]>([]);
diff --git a/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx b/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
index c4cf47c109fc..a6dff7cc8047 100644
--- a/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
@@ -1,11 +1,11 @@
 import type { Button } from '@rocket.chat/fuselage';
 import { IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 function ResetSettingButton(props: ComponentProps<typeof Button>): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return <IconButton icon='undo' danger small title={t('Reset')} {...props} />;
 }
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
index fd96d715a837..ad62903b1cc1 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
@@ -1,12 +1,12 @@
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { createPortal } from 'react-dom';
+import { useTranslation } from 'react-i18next';
 
 const CodeMirrorBox = ({ label, children }: { label: ReactNode; children: ReactElement }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [fullScreen, toggleFullScreen] = useToggle(false);
 
 	if (fullScreen) {
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
index dab9e63f7435..bfb10a54cbf9 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
@@ -1,8 +1,8 @@
 import { FieldLabel, FieldRow, FieldHint, Flex, InputBox, Margins, TextInput, Select, Field } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -29,7 +29,7 @@ function ColorSettingInput({
 	onChangeEditor,
 	onResetButtonClick,
 }: ColorSettingInputProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleChange = useCallback(
 		(event) => {
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index a484dc1133f0..b844f496b5ba 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -1,8 +1,8 @@
 import { FieldLabel, MultiSelectFiltered, MultiSelect, Field, FieldRow } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -26,7 +26,7 @@ function MultiSelectSettingInput({
 	onResetButtonClick,
 	autocomplete,
 }: MultiSelectSettingInputProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleChange = (value: string[]): void => {
 		onChangeValue?.(value);
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
index 2ace88fda2cb..0364dcb11a4e 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
@@ -1,8 +1,8 @@
 import { Field, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -25,7 +25,7 @@ function SelectSettingInput({
 	onChangeValue,
 	onResetButtonClick,
 }: SelectSettingInputProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleChange = (value: string): void => {
 		onChangeValue?.(value);
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
index 975a3171cbbf..7c57e4c49f4e 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
@@ -1,3 +1,4 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -52,7 +53,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true },
+			{ legacyRoot: true, wrapper: mockAppRoot().build() },
 		);
 
 		const numberInput = screen.getByRole('spinbutton');
@@ -74,7 +75,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true },
+			{ legacyRoot: true, wrapper: mockAppRoot().build() },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'hours' });
@@ -99,7 +100,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true },
+			{ legacyRoot: true, wrapper: mockAppRoot().build() },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'days' });
@@ -124,7 +125,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true },
+			{ legacyRoot: true, wrapper: mockAppRoot().build() },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'hours' });
@@ -150,7 +151,7 @@ describe('TimespanSettingInput component', () => {
 				hasResetButton
 				onResetButtonClick={onResetButtonClickMock}
 			/>,
-			{ legacyRoot: true },
+			{ legacyRoot: true, wrapper: mockAppRoot().build() },
 		);
 
 		const resetButton = screen.getByTitle('Reset');
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
index b15a353995c9..c59041fa3699 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
@@ -1,7 +1,7 @@
 import { Field, FieldLabel, FieldRow, InputBox, Select } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEventHandler, ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { TIMEUNIT, timeUnitToMs, msToTimeUnit } from '../../../../../lib/convertTimeUnit';
 import ResetSettingButton from '../ResetSettingButton';
@@ -49,7 +49,7 @@ function TimespanSettingInput({
 	onResetButtonClick,
 	packageValue,
 }: TimespanSettingInputProps): ReactElement {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const [timeUnit, setTimeUnit] = useState<TIMEUNIT>(getHighestTimeUnit(Number(value)));
 	const [internalValue, setInternalValue] = useState<number>(msToTimeUnit(timeUnit, Number(value)));
@@ -71,8 +71,8 @@ function TimespanSettingInput({
 	};
 
 	const timeUnitOptions = useMemo(() => {
-		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, t.has(label) ? t(label) : label]); // todo translate
-	}, [t]);
+		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, i18n.exists(label) ? t(label) : label]); // todo translate
+	}, [i18n, t]);
 
 	const handleResetButtonClick = () => {
 		onResetButtonClick?.();
diff --git a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
index d26d80e88637..de575dbad302 100644
--- a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
@@ -2,9 +2,9 @@ import { isSetting, isSettingColor } from '@rocket.chat/core-typings';
 import { Accordion, Box, Button, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEditableSettings, useEditableSettingsDispatch } from '../../EditableSettingsContext';
 import Setting from '../Setting';
@@ -20,7 +20,7 @@ type SettingsSectionProps = {
 };
 
 function SettingsSection({ groupId, hasReset = true, sectionName, currentTab, solo, help, children }: SettingsSectionProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const editableSettings = useEditableSettings(
 		useMemo(
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 7254b5386f33..146ace1aac82 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -1,7 +1,7 @@
 import { TextInput, Field, FieldLabel, FieldRow, FieldError, Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
@@ -13,7 +13,7 @@ type CreateOAuthModalProps = {
 const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactElement => {
 	const [text, setText] = useState<string>('');
 	const [error, setError] = useState<string>('');
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleConfirm = (e: SyntheticEvent): void => {
 		e.preventDefault();
diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
index 782bf34122bc..1a3c122502cf 100644
--- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
@@ -1,8 +1,8 @@
 import { Tabs, TabsItem } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 import GenericGroupPage from './GenericGroupPage';
@@ -16,7 +16,7 @@ type TabbedGroupPageProps = {
 };
 
 function TabbedGroupPage({ _id, tabs, i18nLabel, onClickBack, ...props }: TabbedGroupPageProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [currentTab, setCurrentTab] = useState(tabs[0]);
 	const handleTabClick = useMemo(() => (tab: string) => (): void => setCurrentTab(tab), [setCurrentTab]);
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index 93792b517dcf..4c034f7c7eb0 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -107,7 +107,7 @@ const SubscriptionPage = () => {
 						</Button>
 					)}
 					<UpgradeButton target='subscription_header' action={isEnterprise ? 'manage_subscription' : 'upgrade'} primary>
-						{t(isEnterprise ? 'Manage_subscription' : 'Upgrade')}
+						{isEnterprise ? t('Manage_subscription') : t('Upgrade')}
 					</UpgradeButton>
 				</ButtonGroup>
 			</PageHeader>
diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index db51f1401f32..749b75903827 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -1,9 +1,9 @@
 import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
@@ -18,7 +18,7 @@ type AdminUserFormWithDataProps = {
 };
 
 const AdminUserFormWithData = ({ uid, onReload, context, roleData, roleError }: AdminUserFormWithDataProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isLoading, isError, refetch } = useUserInfoQuery({ userId: uid });
 
 	const handleReload = useEffectEvent(() => {
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
index bc773428608a..5d9c72f515cb 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
@@ -1,9 +1,9 @@
 import { Box, FieldHint, FieldLabel, FieldRow, RadioButton } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { Control, UseFormSetValue } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { UserFormProps } from './AdminUserForm';
 
@@ -22,7 +22,7 @@ const AdminUserSetRandomPasswordRadios = ({
 	setRandomPasswordId,
 	setValue,
 }: AdminUserSetRandomPasswordProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const setPasswordManuallyId = useUniqueId();
 
diff --git a/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx b/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
index 5a3f1bdd299a..11390b6fdd5a 100644
--- a/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
+++ b/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage } from '../../../../components/GenericResourceUsage';
 
@@ -10,7 +10,7 @@ type SeatsCapUsageProps = {
 };
 
 const SeatsCapUsage = ({ limit, members }: SeatsCapUsageProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const percentage = Math.max(0, Math.min((100 / limit) * members, 100));
 	const seatsLeft = Math.max(0, limit - members);
 
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 0d9a030f1447..c8fa1eae7704 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -3,9 +3,9 @@ import type { IRole, IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
 import type { DefaultUserInfo } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
@@ -29,7 +29,7 @@ type UsersTableRowProps = {
 };
 
 const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSeatsCapExceeded }: UsersTableRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { _id, emails, username, name, roles, status, active, avatarETag, lastLogin, type } = user;
 	const registrationStatusText = useMemo(() => {
diff --git a/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx b/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
index efd1846c09d3..836f5bbf1d22 100644
--- a/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
@@ -1,11 +1,11 @@
 import { Box, Icon, Skeleton, Scrollable } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useStatistics } from '../../hooks/useStatistics';
 
 const AnalyticsReports = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data, isLoading, isSuccess, isError } = useStatistics();
 
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
index 8d8118679235..818713898b20 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
@@ -1,14 +1,14 @@
 import { Margins, Tabs } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AnalyticsReports from './AnalyticsReports';
 import ServerLogs from './ServerLogs';
 
 const ViewLogsPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [tab, setTab] = useState('Logs');
 
 	return (
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
index e0b22e35f5f1..1394d7497ebd 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
@@ -1,7 +1,7 @@
 import { Accordion } from '@rocket.chat/fuselage';
 import type { IInstance } from '@rocket.chat/rest-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime';
@@ -14,7 +14,7 @@ type InstancesModalProps = {
 };
 
 const InstancesModal = ({ instances = [], onClose }: InstancesModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 
 	return (
diff --git a/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx b/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
index 4b3ffd819f81..b608df3ed5c5 100644
--- a/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
@@ -1,8 +1,8 @@
 import type { IStats } from '@rocket.chat/core-typings';
 import { Card } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import WorkspaceCardSection from '../components/WorkspaceCardSection';
 import WorkspaceCardTextSeparator from '../components/WorkspaceCardTextSeparator';
@@ -12,7 +12,7 @@ type MessagesRoomsCardProps = {
 };
 
 const MessagesRoomsCard = ({ statistics }: MessagesRoomsCardProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Card height='full'>
diff --git a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
index d45c01153318..b3288c1b99c5 100644
--- a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
+++ b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
@@ -1,8 +1,8 @@
 import type { IWorkspaceInfo, IStats } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Callout, CardGrid } from '@rocket.chat/fuselage';
 import type { IInstance } from '@rocket.chat/rest-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
@@ -30,7 +30,7 @@ const WorkspacePage = ({
 	onClickRefreshButton,
 	onClickDownloadInfo,
 }: WorkspaceStatusPageProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data } = useIsEnterprise();
 
diff --git a/apps/meteor/client/views/audit/AuditLogPage.tsx b/apps/meteor/client/views/audit/AuditLogPage.tsx
index 10b9d439ff09..95fbc39abca8 100644
--- a/apps/meteor/client/views/audit/AuditLogPage.tsx
+++ b/apps/meteor/client/views/audit/AuditLogPage.tsx
@@ -1,12 +1,12 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import AuditLogTable from './components/AuditLogTable';
 
 const AuditLogPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/audit/AuditPage.tsx b/apps/meteor/client/views/audit/AuditPage.tsx
index ca379883224e..3dce9be56a8e 100644
--- a/apps/meteor/client/views/audit/AuditPage.tsx
+++ b/apps/meteor/client/views/audit/AuditPage.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, Margins, States, StatesIcon, StatesSubtitle, StatesTitle, Tabs } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
 import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
@@ -15,7 +15,7 @@ const AuditPage = () => {
 	const [type, setType] = useAuditTab();
 	const [selectedRoom, setSelectedRoom] = useState<IRoom | undefined>();
 	const auditMutation = useAuditMutation(type);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page background='room'>
diff --git a/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx b/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
index 276d8c355c9b..39d50edea62a 100644
--- a/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
+++ b/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
@@ -1,8 +1,8 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatDate } from '../../../hooks/useFormatDate';
 
@@ -16,7 +16,7 @@ type AuditFiltersDisplayProps = {
 
 const AuditFiltersDisplay = ({ users, room, startDate, endDate, filters }: AuditFiltersDisplayProps): ReactElement => {
 	const formatDate = useFormatDate();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' alignItems='stretch' withTruncatedText>
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index 343fbeff0138..f616ebed5174 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -1,8 +1,8 @@
 import type { IAuditLog, IRoom } from '@rocket.chat/core-typings';
 import { Box, Field, FieldLabel, FieldRow, FieldError, TextInput, Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useController } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { AuditFields } from '../hooks/useAuditForm';
 import { useAuditForm } from '../hooks/useAuditForm';
@@ -20,7 +20,7 @@ type AuditFormProps = {
 };
 
 const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const form = useAuditForm();
 	const { control, handleSubmit, register } = form;
diff --git a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
index 8e3f9788880b..c6c4e204a682 100644
--- a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
+++ b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
@@ -2,9 +2,9 @@ import type { IAuditLog } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
@@ -14,7 +14,7 @@ type AuditLogEntryProps = { value: IAuditLog };
 
 const AuditLogEntry = ({ value: { u, results, ts, _id, fields } }: AuditLogEntryProps): ReactElement => {
 	const formatDateAndTime = useFormatDateAndTime();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { username, name, avatarETag } = u;
 
diff --git a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
index c0399d402349..7eecf145865d 100644
--- a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
+++ b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
@@ -1,9 +1,9 @@
 import { Box, InputBox, Menu, Margins, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement, ComponentProps, SetStateAction } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { DateRange } from '../../utils/dateRange';
 
@@ -138,7 +138,7 @@ const DateRangePicker = ({ value, onChange, ...props }: DateRangePickerProps): R
 	const minEndDate = startDate;
 	const maxEndDate = useMemo(() => formatToDateInput(new Date()), []);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const presets = useMemo(
 		() =>
diff --git a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
index 1eb5e1aaf99d..540f97ebaea8 100644
--- a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -13,7 +13,7 @@ type DirectTabProps = {
 };
 
 const DirectTab = ({ form: { control } }: DirectTabProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { field: usersField, fieldState: usersFieldState } = useController({
 		name: 'users',
diff --git a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
index 5381376eb57f..8fbeb800ec24 100644
--- a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../../components/AutoCompleteAgent';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -14,7 +14,7 @@ type OmnichannelTabProps = {
 };
 
 const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { field: visitorField, fieldState: visitorFieldState } = useController({
 		name: 'visitor',
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index 3a3c0ab2c3d5..bc5de9ae780b 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import RoomAutoComplete from '../../../../components/RoomAutoComplete';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -14,7 +14,7 @@ type RoomsTabProps = {
 };
 
 const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { field: ridField, fieldState: ridFieldState } = useController({ name: 'rid', control, rules: { required: true } });
 
diff --git a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
index c1ed01e1c4d3..48ff06b1c699 100644
--- a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -13,7 +13,7 @@ type UsersTabProps = {
 };
 
 const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { field: usersField, fieldState: usersFieldState } = useController({
 		name: 'users',
diff --git a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
index a8da354cbbfb..d3b1e7b342cf 100644
--- a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
+++ b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { AudioRecorder } from '../../../../app/ui/client/lib/recorderjs/AudioRecorder';
 import type { ChatAPI } from '../../../lib/chats/ChatAPI';
@@ -19,7 +19,7 @@ type AudioMessageRecorderProps = {
 };
 
 const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMessageRecorderProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [state, setState] = useState<'loading' | 'recording'>('recording');
 	const [time, setTime] = useState('00:00');
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
index 2ee6ebb3f2c3..10f0ed565584 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { EmojiPickerLoadMore, EmojiPickerNotFound, EmojiPickerCategoryWrapper } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, MutableRefObject } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { CUSTOM_CATEGORY } from '../../../../app/emoji/client';
 import type { EmojiByCategory, EmojiCategoryPosition } from '../../../../app/emoji/client';
@@ -26,7 +26,7 @@ const EmojiCategoryRow = ({
 	handleLoadMore,
 	handleSelectEmoji,
 }: EmojiCategoryRowProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const categoryRowStyle = css`
 		button {
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
index 701a3eb3872e..3a8dc80be6de 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
@@ -1,7 +1,7 @@
 import { IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { EmojiCategory } from '../../../../app/emoji/client';
 
@@ -47,7 +47,7 @@ const mapCategoryIcon = (category: string) => {
 };
 
 const EmojiPickerCategoryItem = ({ category, index, active, handleGoToCategory, ...props }: EmojiPickerCategoryItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const icon = mapCategoryIcon(category.key);
 
diff --git a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
index a42e1b0580b3..152d13bae5de 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
@@ -1,7 +1,7 @@
 import { EmojiPickerNotFound } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 import type { VirtuosoGridHandle } from 'react-virtuoso';
 import { VirtuosoGrid } from 'react-virtuoso';
 
@@ -21,7 +21,7 @@ type SearchingResultProps = {
 };
 
 const SearchingResult = ({ searchResults, handleSelectEmoji }: SearchingResultProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const ref = useRef<VirtuosoGridHandle>(null);
 
 	if (searchResults.length === 0) {
diff --git a/apps/meteor/client/views/directory/RoomTags.tsx b/apps/meteor/client/views/directory/RoomTags.tsx
index 780b554bd8fb..d73c12f2cb62 100644
--- a/apps/meteor/client/views/directory/RoomTags.tsx
+++ b/apps/meteor/client/views/directory/RoomTags.tsx
@@ -1,11 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const RoomTags = ({ room }: { room: IRoom }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mi={4} alignItems='center' display='flex' withTruncatedText>
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
index 711b5a6d21a1..5b5e42651847 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
@@ -1,8 +1,8 @@
 import { Box, PasswordInput, Field, FieldGroup, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -15,7 +15,7 @@ const EnterE2EPasswordModal = ({
 	onClose: () => void;
 	onCancel: () => void;
 }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [password, setPassword] = useState('');
 	const [passwordError, setPasswordError] = useState<string | undefined>();
 
diff --git a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
index b16837bc3d17..a777ca5b4d99 100644
--- a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
@@ -1,9 +1,9 @@
 import { Box, CodeSnippet } from '@rocket.chat/fuselage';
 import { useClipboard } from '@rocket.chat/fuselage-hooks';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -17,7 +17,7 @@ type SaveE2EPasswordModalProps = {
 const DOCS_URL = 'https://go.rocket.chat/i/e2ee-guide';
 
 const SaveE2EPasswordModal = ({ randomPassword, onClose, onCancel, onConfirm }: SaveE2EPasswordModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { copy, hasCopied } = useClipboard(randomPassword);
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
index bd3b46c6adbd..345d8914fd7b 100644
--- a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -11,7 +11,7 @@ const LINUX_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-linux';
 const MAC_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-mac';
 
 const DesktopAppsCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/DocumentationCard.tsx b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
index fc50e0aefa3e..c047006b77fd 100644
--- a/apps/meteor/client/views/home/cards/DocumentationCard.tsx
+++ b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -9,7 +9,7 @@ import { useExternalLink } from '../../../hooks/useExternalLink';
 const DOCS_URL = 'https://go.rocket.chat/i/hp-documentation';
 
 const DocumentationCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
index fdb3d4044a7d..47117c448a13 100644
--- a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -10,7 +10,7 @@ const GOOGLE_PLAY_URL = 'https://go.rocket.chat/i/hp-mobile-app-google';
 const APP_STORE_URL = 'https://go.rocket.chat/i/hp-mobile-app-apple';
 
 const MobileAppsCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
index a4a65f061252..f1cc36f9dabe 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
@@ -1,10 +1,10 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box, Tag } from '@rocket.chat/fuselage';
 import { AppAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AppMenu from '../AppMenu';
 import BundleChips from '../BundleChips';
@@ -18,7 +18,7 @@ const versioni18nKey = (app: App): string => {
 };
 
 const AppDetailsPageHeader = ({ app }: { app: App }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		iconFileData,
 		name,
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 5f3e427b8391..5d20900078a4 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -1,9 +1,9 @@
 import { Box, Callout, Chip, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import DOMPurify from 'dompurify';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
 import type { AppInfo } from '../../../definitions/AppInfo';
@@ -19,7 +19,7 @@ type AppDetailsProps = {
 };
 
 const AppDetails = ({ app }: AppDetailsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		author: { homepage, support } = {},
 		detailedDescription,
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
index a653a22478a8..278a72345dda 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -1,7 +1,7 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import AccordionLoading from '../../../components/AccordionLoading';
@@ -9,7 +9,7 @@ import { useLogs } from '../../../hooks/useLogs';
 import AppLogsItem from './AppLogsItem';
 
 const AppLogs = ({ id }: { id: string }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const { data, isSuccess, isError, isLoading } = useLogs(id);
 
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
index dbbf4bf5b67a..d1d258006a12 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
@@ -1,7 +1,7 @@
 import type { ILogEntry } from '@rocket.chat/core-typings';
 import { Box, Accordion } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AppLogsItemEntry from './AppLogsItemEntry';
 
@@ -12,7 +12,7 @@ type AppLogsItemProps = {
 };
 
 const AppLogsItem = ({ entries, instanceId, title, ...props }: AppLogsItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Accordion.Item title={title} {...props}>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
index 986d2eec9686..ee16fe1b5756 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useHighlightedCode } from '../../../../../hooks/useHighlightedCode';
 
@@ -12,7 +12,7 @@ type AppLogsItemEntryProps = {
 };
 
 const AppLogsItemEntry = ({ severity, timestamp, caller, args }: AppLogsItemEntryProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box color='default'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
index 974b6d148e61..3269c1113d0d 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
@@ -1,8 +1,8 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
 import { purifyOptions } from '../../../lib/purifyOptions';
@@ -21,7 +21,7 @@ type ReleaseItemProps = {
 };
 
 const AppReleasesItem = ({ release, ...props }: ReleaseItemProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const title = (
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
index baaf65356a8e..5554bde2651c 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
@@ -1,8 +1,8 @@
 import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AppPermissionsList from '../../../components/AppPermissionsList';
 import AppSecurityLabel from './AppSecurityLabel';
@@ -15,7 +15,7 @@ type AppSecurityProps = {
 };
 
 const AppSecurity = ({ privacyPolicySummary, appPermissions, tosLink, privacyLink }: AppSecurityProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box maxWidth='x640' w='full' marginInline='auto' color='default'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
index 00dc564ed05d..59080c7f3237 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
@@ -1,12 +1,12 @@
 import { Box, FieldGroup } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { ISettings } from '../../../../../apps/@types/IOrchestrator';
 import AppSetting from './AppSetting';
 
 const AppSettings = ({ settings }: { settings: ISettings }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
index 6981d1b6a810..00621bdbdc90 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
@@ -1,7 +1,7 @@
 import type { AppPricingPlan, PurchaseType } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { formatPriceAndPurchaseType } from '../../../helpers/formatPriceAndPurchaseType';
 
@@ -14,7 +14,7 @@ type AppStatusPriceDisplayProps = {
 };
 
 const AppStatusPriceDisplay = ({ purchaseType, pricingPlans, price, showType = true }: AppStatusPriceDisplayProps) => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const { type, price: formattedPrice } = useMemo(
 		() => formatPriceAndPurchaseType(purchaseType, pricingPlans, price),
@@ -24,7 +24,7 @@ const AppStatusPriceDisplay = ({ purchaseType, pricingPlans, price, showType = t
 	return (
 		<Margins inline={4}>
 			<Tag>
-				{showType && <Box color='default'>{t.has(type) ? t(type) : type}</Box>}
+				{showType && <Box color='default'>{i18n.exists(type) ? t(type) : type}</Box>}
 				<Box>{!showType && type === 'Free' ? t(type) : formattedPrice}</Box>
 			</Tag>
 		</Margins>
diff --git a/apps/meteor/client/views/marketplace/AppMenu.tsx b/apps/meteor/client/views/marketplace/AppMenu.tsx
index a1d3942ee304..9f49b7d75a5b 100644
--- a/apps/meteor/client/views/marketplace/AppMenu.tsx
+++ b/apps/meteor/client/views/marketplace/AppMenu.tsx
@@ -1,8 +1,8 @@
 import type { App } from '@rocket.chat/core-typings';
 import { MenuItem, MenuItemContent, MenuSection, MenuV2, Skeleton } from '@rocket.chat/fuselage';
 import { useHandleMenuAction } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { AppMenuOption } from './hooks/useAppMenu';
 import { useAppMenu } from './hooks/useAppMenu';
@@ -13,7 +13,7 @@ type AppMenuProps = {
 };
 
 const AppMenu = ({ app, isAppDetailsPage }: AppMenuProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { isLoading, isAdminUser, sections } = useAppMenu(app, isAppDetailsPage);
 
diff --git a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
index d9090cd7dc7b..d06c6bc9f2f5 100644
--- a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
@@ -1,7 +1,7 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import AppPermissionsList from './components/AppPermissionsList';
@@ -13,7 +13,7 @@ export type AppPermissionsReviewModalProps = {
 };
 
 const AppPermissionsReviewModal = ({ appPermissions, onCancel, onConfirm }: AppPermissionsReviewModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/marketplace/AppUpdateModal.tsx b/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
index 4eb2bcf6da2b..848e789fa83c 100644
--- a/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type AppUpdateModalProps = {
 	confirm: () => void;
@@ -8,7 +8,7 @@ type AppUpdateModalProps = {
 };
 
 const AppUpdateModal = ({ confirm, cancel, ...props }: AppUpdateModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleCloseButtonClick = (): void => {
 		cancel();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
index a1f486395dbb..098833ea6e2a 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
@@ -1,8 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../components/FilterByText';
 import CategoryDropDown from '../components/CategoryFilter/CategoryDropDown';
@@ -43,7 +43,7 @@ const AppsFilters = ({
 	statusFilterOnSelected,
 	context,
 }: AppsFiltersProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const isPrivateAppsPage = context === 'private';
 	const breakpoints = useBreakpoints();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
index 1f3f27c7fedd..2729dafafe86 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
@@ -1,10 +1,10 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const AppsPageContentError = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
index 56c3ca26f9a7..5f55d1d1f07e 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
@@ -2,8 +2,8 @@ import type { App } from '@rocket.chat/core-typings';
 import { Box, Pagination } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AppsList from '../AppsList';
 import FeaturedAppsSections from './FeaturedAppsSections';
@@ -34,7 +34,7 @@ const AppsPageContentBody = ({
 	paginationProps,
 	noErrorsOcurred,
 }: AppsPageContentBodyProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const scrollableRef = useRef<HTMLDivElement>(null);
 	const appsListId = useUniqueId();
 
diff --git a/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx b/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
index 71d9ac62fcc0..fbc3c99ef483 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
@@ -1,7 +1,7 @@
 import type { App } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AppsList from '../AppsList';
 import normalizeFeaturedApps from '../helpers/normalizeFeaturedApps';
@@ -13,7 +13,7 @@ type FeaturedSectionsProps = {
 };
 
 const FeaturedAppsSections = ({ appsResult, appsListId }: FeaturedSectionsProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const featuredApps = useFeaturedApps();
 
 	if (featuredApps.isSuccess) {
@@ -24,7 +24,7 @@ const FeaturedAppsSections = ({ appsResult, appsListId }: FeaturedSectionsProps)
 						appsListId={`${appsListId + index}`}
 						key={section.slug}
 						apps={normalizeFeaturedApps(section.apps, appsResult)}
-						title={t.has(section.i18nLabel) ? t(section.i18nLabel) : section.i18nLabel}
+						title={i18n.exists(section.i18nLabel) ? t(section.i18nLabel) : section.i18nLabel}
 					/>
 				))}
 			</>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
index dc7d77e64a73..2bdc8608ac14 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
@@ -1,9 +1,9 @@
 import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const NoAppRequestsEmptyState = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mbs='24px'>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
index 9403a2443733..65d0ae1e68fc 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
@@ -9,9 +9,9 @@ import {
 	StatesActions,
 	StatesAction,
 } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type NoInstalledAppMatchesEmptyStateProps = {
 	shouldShowSearchText: boolean;
@@ -24,7 +24,7 @@ const NoInstalledAppMatchesEmptyState = ({
 	text,
 	onButtonClick,
 }: NoInstalledAppMatchesEmptyStateProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
index a1bdeb90edce..375f2156e61d 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
@@ -1,10 +1,10 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const NoInstalledAppsEmptyState = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
index 0dc7e471aee4..bbce0eb71bed 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
@@ -9,9 +9,9 @@ import {
 	StatesSuggestionText,
 	StatesTitle,
 } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type NoMarketplaceOrInstalledAppMatchesEmptyStateProps = { shouldShowSearchText: boolean; text: string };
 
@@ -19,7 +19,7 @@ const NoMarketplaceOrInstalledAppMatchesEmptyState = ({
 	shouldShowSearchText,
 	text,
 }: NoMarketplaceOrInstalledAppMatchesEmptyStateProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
index b7fec778401a..daee8c070471 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const PrivateEmptyState = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box mbs='24px'>
diff --git a/apps/meteor/client/views/marketplace/BundleChips.tsx b/apps/meteor/client/views/marketplace/BundleChips.tsx
index b3110832145d..d20f1eacfa35 100644
--- a/apps/meteor/client/views/marketplace/BundleChips.tsx
+++ b/apps/meteor/client/views/marketplace/BundleChips.tsx
@@ -1,7 +1,7 @@
 import { Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { App } from './types';
 
@@ -14,7 +14,7 @@ type BundleChipsProps = {
 };
 
 const BundleChips = ({ bundledIn }: BundleChipsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handlePlanName = (label: string): string => {
 		if (label === 'Enterprise') {
diff --git a/apps/meteor/client/views/marketplace/IframeModal.tsx b/apps/meteor/client/views/marketplace/IframeModal.tsx
index 44616c1f6874..fdf407228628 100644
--- a/apps/meteor/client/views/marketplace/IframeModal.tsx
+++ b/apps/meteor/client/views/marketplace/IframeModal.tsx
@@ -1,7 +1,7 @@
 import { Box, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const iframeMsgListener = (confirm: (data: any) => void, cancel: () => void) => (e: MessageEvent<any>) => {
 	let data;
@@ -22,7 +22,7 @@ type IframeModalProps = {
 } & ComponentProps<typeof Modal>;
 
 const IframeModal = ({ url, confirm, cancel, wrapperHeight = 'x360', ...props }: IframeModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	useEffect(() => {
 		const listener = iframeMsgListener(confirm, cancel);
diff --git a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
index 33eb6a4960c8..2707c05562a9 100644
--- a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
+++ b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericUpsellModal from '../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../components/GenericUpsellModal/hooks';
 
 const UnlimitedAppsUpsellModal = ({ onClose }: { onClose: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { handleManageSubscription, cloudWorkspaceHadTrial } = useUpsellActions();
 
 	return (
diff --git a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
index bf9533c81074..2e25a0a9e1e5 100644
--- a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
+++ b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery';
@@ -24,7 +24,7 @@ const AppInstallationModal = ({
 	handleConfirm,
 	handleEnableUnlimitedApps,
 }: AppsInstallationModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getTitle = () => {
 		if (enabled === limit) {
diff --git a/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx b/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
index 0675295a2595..4e52d996dff1 100644
--- a/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
+++ b/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
@@ -1,9 +1,9 @@
 import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const defaultPermissions = [
 	'user.read',
@@ -36,7 +36,7 @@ const defaultPermissions = [
 ];
 
 const AppPermissionsList = ({ appPermissions }: { appPermissions: AppPermission[] | undefined }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleAppPermissions = (permission: string): string => t(`Apps_Permissions_${permission.replace('.', '_')}` as TranslationKey);
 
 	if (appPermissions?.length) {
diff --git a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
index b3e43fda942f..7593323c4a91 100644
--- a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
+++ b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
@@ -1,9 +1,9 @@
 import type { Button } from '@rocket.chat/fuselage';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import colorTokens from '@rocket.chat/fuselage-tokens/colors.json';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEventHandler } from 'react';
 import React, { forwardRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type CategoryDropDownAnchorProps = { selectedCategoriesCount: number; onClick?: MouseEventHandler<HTMLElement> } & ComponentProps<
 	typeof Button
@@ -13,7 +13,7 @@ const CategoryDropDownAnchor = forwardRef<HTMLElement, CategoryDropDownAnchorPro
 	{ onClick, selectedCategoriesCount, ...props },
 	ref,
 ) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box
diff --git a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
index 9578d49961c8..46e8bd64b55c 100644
--- a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
+++ b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage } from '../../../components/GenericResourceUsage';
 
@@ -17,7 +17,7 @@ const EnabledAppsCount = ({
 	enabled: number;
 	context: 'private' | 'explore' | 'installed' | 'premium' | 'requested';
 }): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericResourceUsage
diff --git a/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx b/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
index ce87f0d4673a..81a2afd21e1e 100644
--- a/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
+++ b/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery';
@@ -14,7 +14,7 @@ type UninstallGrandfatheredAppModalProps = {
 };
 
 const UninstallGrandfatheredAppModal = ({ context, limit, appName, handleUninstall, handleClose }: UninstallGrandfatheredAppModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/marketplace/hooks/useCategories.ts b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
index 2a6b612470b5..17a7c878e6e4 100644
--- a/apps/meteor/client/views/marketplace/hooks/useCategories.ts
+++ b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import type {
@@ -14,7 +14,7 @@ import { useCategoryFlatList } from './useCategoryFlatList';
 import { useCategoryToggle } from './useCategoryToggle';
 
 export const useCategories = (): [CategoryDropDownGroups, selectedCategoriesList, selectedCategoriesList, CategoryOnSelected] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [categories, setCategories] = useState<CategoryDropDownListProps['categories']>([]);
 
 	const fetchCategories = useCallback(async (): Promise<void> => {
diff --git a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
index b5a156b56bf4..31697eaf460d 100644
--- a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
+++ b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageContent } from '../../components/Page';
 
 const NotAuthorizedPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/notFound/NotFoundPage.tsx b/apps/meteor/client/views/notFound/NotFoundPage.tsx
index b6c01f05be98..d9fbbe593de1 100644
--- a/apps/meteor/client/views/notFound/NotFoundPage.tsx
+++ b/apps/meteor/client/views/notFound/NotFoundPage.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import NotFoundState from '../../components/NotFoundState';
 
 const NotFoundPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <NotFoundState title={t('Page_not_found')} subtitle={t('Page_not_exist_or_not_permission')} />;
 };
 
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
index 13e1498d7422..6c2c8663f0d4 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
@@ -1,8 +1,8 @@
 import { Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
@@ -22,7 +22,7 @@ import AgentsTableRow from './AgentsTableRow';
 
 // TODO: missing error state
 const AgentsTable = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [filter, setFilter] = useState('');
 
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'statusLivechat'>('name');
diff --git a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
index 61f952e6f3c3..986221840005 100644
--- a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
@@ -1,7 +1,7 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Select, Margins, Field, FieldLabel, FieldRow, Label, Option } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
@@ -11,7 +11,7 @@ import InterchangeableChart from './InterchangeableChart';
 import Overview from './Overview';
 
 const useOptions = (type: string): SelectOption[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return useMemo(() => {
 		if (type === 'Conversations') {
 			return [
@@ -30,7 +30,7 @@ const useOptions = (type: string): SelectOption[] => {
 };
 
 const AnalyticsPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [type, setType] = useState('Conversations');
 	const [department, setDepartment] = useState<string | null>(null);
 	const [dateRange, setDateRange] = useState({ start: '', end: '' });
diff --git a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
index 40c32f4d6980..d3fd6b8d857a 100644
--- a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
@@ -1,10 +1,10 @@
 import { Box, InputBox, Menu, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Moment } from 'moment';
 import moment from 'moment';
 import type { ComponentProps } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 moment.locale('en');
 
@@ -27,7 +27,7 @@ const getWeekRange = (daysToSubtractFromStart: number, daysToSubtractFromEnd: nu
 });
 
 const DateRangePicker = ({ onChange = () => undefined, ...props }: DateRangePickerProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [range, setRange] = useState({ start: '', end: '' });
 
 	const { start, end } = range;
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
index 9bca1e6589c4..18cfb2e9ce56 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
@@ -1,7 +1,7 @@
 import { FieldLabel as BaseFieldLabel, Box, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
@@ -11,7 +11,7 @@ type FieldLabelProps = ComponentProps<typeof BaseFieldLabel> & {
 };
 
 const FieldLabel = ({ children: label, premium = false }: FieldLabelProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const shouldDisableEnterprise = premium && !hasLicense;
 
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index a4435398d9a9..92bcfc4c5d30 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -13,17 +13,17 @@ import {
 	FieldHint,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import FieldLabel from './AppearanceFieldLabel';
 
 const AppearanceForm = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isEnterprise = useHasLicenseModule('livechat-enterprise');
 
 	const { control, watch } = useFormContext();
diff --git a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
index 2156babf230d..4f53823aca3f 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
@@ -2,9 +2,9 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { InputBox, Field, MultiSelect, FieldGroup, Box, Select, FieldLabel, FieldRow, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller, useFieldArray } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useTimezoneNameList } from '../../../hooks/useTimezoneNameList';
 import { BusinessHoursMultiple } from '../additionalForms';
@@ -38,7 +38,7 @@ export type BusinessHoursFormData = {
 // TODO: add time validation for start and finish not be equal on UI
 // TODO: add time validation for start not be higher than finish on UI
 const BusinessHoursForm = ({ type }: { type?: 'default' | 'custom' }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const timeZones = useTimezoneNameList();
 	const timeZonesOptions: SelectOption[] = useMemo(() => timeZones.map((name) => [name, t(name as TranslationKey)]), [t, timeZones]);
 	const daysOptions: SelectOption[] = useMemo(() => DAYS_OF_WEEK.map((day) => [day, t(day as TranslationKey)]), [t]);
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
index 2bfc10ef0dfe..9296ec2713f7 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
@@ -9,9 +9,9 @@ import {
 } from '@rocket.chat/fuselage';
 import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 import { clickableItem } from '../../../lib/clickableItem';
@@ -22,7 +22,7 @@ type ContactHistoryItemProps = {
 };
 
 function ContactHistoryItem({ history, setChatId, ...props }: ContactHistoryItemProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDate = useFormatDateAndTime();
 	const username = history.servedBy?.username;
 	const hasClosingMessage = !!history.closingMessage?.msg?.trim();
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
index ba25d511e1a8..5a1cd52eab3c 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
@@ -1,7 +1,7 @@
 import { Box, Margins, TextInput, Icon, Throbber, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -21,7 +21,7 @@ import { useHistoryList } from './useHistoryList';
 
 const ContactHistoryList = ({ setChatId, close }: { setChatId: Dispatch<SetStateAction<string>>; close: () => void }): ReactElement => {
 	const [text, setText] = useState('');
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useOmnichannelRoom();
 	const { itemsList: historyList, loadMoreItems } = useHistoryList(
 		useMemo(() => ({ roomId: room._id, filter: text, visitorId: room.v._id }), [room, text]),
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index 3c6079c08fd6..2915e4907c7d 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -18,8 +18,8 @@ import {
 	MessageSystemTimestamp,
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
 import MessageContentBody from '../../../../components/message/MessageContentBody';
@@ -38,7 +38,7 @@ type ContactHistoryMessageProps = {
 };
 
 const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }: ContactHistoryMessageProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { triggerProps, openUserCard } = useUserCard();
 
 	const format = useFormatDate();
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
index 27312b9e9fac..eeca3fb4930d 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
@@ -1,7 +1,7 @@
 import { NumberInput } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 import type { UseFormRegister } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import type { FormValues, IDepartmentAgent } from '../EditDepartment';
@@ -16,7 +16,7 @@ type AgentRowProps = {
 };
 
 const AgentRow = ({ index, agent, register, onRemove }: AgentRowProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericTableRow key={agent.agentId} tabIndex={0} role='link' action qa-user-id={agent.agentId}>
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
index c4e4c7acb7c6..a81e9ffc8584 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
@@ -1,8 +1,8 @@
 import { Pagination } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import type { Control, UseFormRegister } from 'react-hook-form';
 import { useWatch, useFieldArray } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableBody, GenericTableHeader, GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -16,7 +16,7 @@ type DepartmentAgentsTableProps = {
 };
 
 function DepartmentAgentsTable({ control, register }: DepartmentAgentsTableProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { fields, append, remove } = useFieldArray({ control, name: 'agentList' });
 	const agentList = useWatch({ control, name: 'agentList' });
 
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
index 53c1afeb4ba7..c90f3ebe3ee0 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
@@ -1,7 +1,7 @@
 import { Button, Chip, FieldRow, TextInput } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FormEvent } from 'react';
 import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type DepartmentTagsProps = {
 	error: string;
@@ -10,7 +10,7 @@ type DepartmentTagsProps = {
 } & ComponentProps<typeof TextInput>;
 
 const DepartmentTags = ({ error, value: tags, onChange, ...props }: DepartmentTagsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [tagText, setTagText] = useState('');
 
 	const handleAddTag = useCallback(() => {
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
index 616baee2b531..3b01379f18b6 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
@@ -1,8 +1,8 @@
 import type { IVoipRoom, Serialized } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useIsCallReady } from '../../../../contexts/CallContext';
@@ -15,7 +15,7 @@ type CallTableRowProps = {
 };
 
 export const CallTableRow = ({ room, onRowClick }: CallTableRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isCallReady = useIsCallReady();
 
 	const { _id, fname, callStarted, queue, callDuration = 0, v, direction } = room;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
index dab51528dc49..75f6d1d5c3bd 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
@@ -1,10 +1,10 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Box, Icon, Chip, ButtonGroup } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarIcon,
@@ -30,7 +30,7 @@ type VoipInfoPropsType = {
 };
 
 export const VoipInfo = ({ room, onClickClose /* , onClickReport  */ }: VoipInfoPropsType): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isCallReady = useIsCallReady();
 
 	const { servedBy, queue, v, fname, name, callDuration, callTotalHoldTime, closedAt, callWaitingTime, tags, lastMessage } = room;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
index 294a508fbc4f..5af57d8e4366 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../../../contexts/CallContext';
 import { useDialModal } from '../../../../../hooks/useDialModal';
@@ -14,7 +14,7 @@ type VoipInfoCallButtonProps = Exclude<
 };
 
 export const VoipInfoCallButton = ({ phoneNumber, ...props }: VoipInfoCallButtonProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
index a12bba236965..d04330aa57b3 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
@@ -1,6 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Field from '../../../components/Field';
 import Info from '../../../components/Info';
@@ -12,7 +12,7 @@ type DepartmentFieldProps = {
 };
 
 const DepartmentField = ({ departmentId }: DepartmentFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isLoading, isError } = useDepartmentInfo(departmentId);
 
 	return (
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
index aeca1de73202..e2c053fe90ab 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../../components';
 import { useOmnichannelRoomInfo } from '../../../hooks/useOmnichannelRoomInfo';
@@ -15,7 +15,7 @@ type RoomEditWithDataProps = {
 };
 
 function RoomEditWithData({ id: roomId, reload, reloadInfo, onClose }: RoomEditWithDataProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data: room, isLoading: isRoomLoading, isError: isRoomError } = useOmnichannelRoomInfo(roomId);
 	const { _id: visitorId } = room?.v ?? {};
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
index d2a17d53be7e..e3745e576a72 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import UAParser from 'ua-parser-js';
 
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
@@ -10,7 +10,7 @@ import Label from '../../../components/Label';
 import { FormSkeleton } from '../../components/FormSkeleton';
 
 const VisitorClientInfo = ({ uid }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		value: userData,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
index a250a005e243..4c68389a9604 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../../contexts/CallContext';
 import { useDialModal } from '../../../../hooks/useDialModal';
@@ -14,7 +14,7 @@ const rcxCallDialButton = css`
 `;
 
 export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { outBoundCallsAllowed, outBoundCallsEnabledForUser } = useVoipOutboundStates();
 	const { openDialModal } = useDialModal();
diff --git a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
index 9aedf67ab3c9..86ca44762d44 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Field from '../../components/Field';
 import Info from '../../components/Info';
@@ -13,7 +13,7 @@ type PriorityFieldProps = {
 };
 
 const PriorityField = ({ id }: PriorityFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isInitialLoading, isError } = usePriorityInfo(id);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
index 9d0a768579af..7b029d73403a 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Field from '../../components/Field';
 import Info from '../../components/Info';
@@ -13,7 +13,7 @@ type SlaFieldProps = {
 };
 
 const SlaField = ({ id }: SlaFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { data, isInitialLoading, isError } = useSlaInfo(id);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
index 235f4f95d1fa..ca3f703abd1d 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { OmnichannelRoomIcon } from '../../../../components/RoomIcon/OmnichannelRoomIcon';
 import Field from '../../components/Field';
@@ -13,7 +13,7 @@ type SourceFieldProps = {
 };
 
 const SourceField = ({ room }: SourceFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const roomSource = room.source.alias || room.source.id || room.source.type;
 
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
index 90ba81d5bf80..297ced9eed53 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
@@ -1,6 +1,6 @@
 import { Box, ContextualbarContent } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
@@ -8,7 +8,7 @@ import { FormSkeleton } from '../../components/FormSkeleton';
 import ContactNewEdit from './ContactNewEdit';
 
 function ContactEditWithData({ id, close }) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		value: data,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
index 0d6c9fb406ec..597d3d66dbd4 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
@@ -1,8 +1,8 @@
 import { Box, Select, Label } from '@rocket.chat/fuselage';
 import { useMutableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../components/AutoCompleteAgent';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
@@ -12,7 +12,7 @@ type QueueListFilterProps = {
 };
 
 export const QueueListFilter = ({ setFilter, ...props }: QueueListFilterProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const statusOptions: [string, string][] = [
 		['online', t('Online')],
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
index 677b8a201990..63b62b85e642 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import QueueListTable from './QueueListTable';
 
 const QueueListPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
index b6e29530b5e7..9b506727def3 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
@@ -1,7 +1,7 @@
 import { Box, Select, Margins, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useState, useMemo, useEffect, Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
@@ -27,7 +27,7 @@ const randomizeKeys = (keys) => {
 const dateRange = getDateRange();
 
 const RealTimeMonitoringPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const keys = useRef([...Array(10).keys()]);
 
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
index f1b2d0eed337..cc5566e04c4b 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
@@ -1,9 +1,10 @@
 import type { OperationParams } from '@rocket.chat/rest-typings';
-import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import type { Chart as ChartType } from 'chart.js';
+import type { TFunction } from 'i18next';
 import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -20,7 +21,7 @@ const initialData = {
 	offline: 0,
 };
 
-const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']): Promise<ChartType> =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TFunction): Promise<ChartType> =>
 	drawDoughnutChart(
 		canvas,
 		t('Agents'),
@@ -35,7 +36,7 @@ type AgentStatusChartsProps = {
 };
 
 const AgentStatusChart = ({ params, reloadRef, ...props }: AgentStatusChartsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
 	const context: MutableRefObject<ChartType | undefined> = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
index b4e155394f68..c684f907052d 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
@@ -33,7 +33,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatDurationChart = ({ params, reloadRef, ...props }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
index b84dfe6918a2..dc3c495de32f 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
@@ -1,9 +1,10 @@
 import type { OperationParams } from '@rocket.chat/rest-typings';
-import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import type { Chart as ChartType } from 'chart.js';
+import type { TFunction } from 'i18next';
 import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -20,7 +21,7 @@ const initialData = {
 	closed: 0,
 };
 
-const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']) =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TFunction) =>
 	drawDoughnutChart(
 		canvas,
 		t('Chats'),
@@ -35,7 +36,7 @@ type ChatsChartProps = {
 };
 
 const ChatsChart = ({ params, reloadRef, ...props }: ChatsChartProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
 	const context: MutableRefObject<ChartType | undefined> = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
index 48b0bdbf655e..4fd204b0e907 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -20,7 +20,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatsPerAgentChart = ({ params, reloadRef, ...props }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
index fbfe91695626..57189f447317 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -19,7 +19,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatsPerDepartmentChart = ({ params, reloadRef, ...props }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
index cfc33687c8fc..2fa04de26313 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
@@ -34,7 +34,7 @@ const init = (canvas, context, t) =>
 	);
 
 const ResponseTimesChart = ({ params, reloadRef, ...props }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
index d942b93a4223..c1c632e06c0c 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
@@ -1,6 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 import { type Chart } from 'chart.js';
+import type { TFunction } from 'i18next';
 import { type MutableRefObject } from 'react';
 
 import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler';
@@ -8,8 +8,8 @@ import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler
 type UseUpdateChartDataOptions = {
 	context: MutableRefObject<Chart | undefined>;
 	canvas: MutableRefObject<HTMLCanvasElement | null>;
-	init: (canvas: HTMLCanvasElement, context: undefined, t: TranslationContextValue['translate']) => Promise<Chart>;
-	t: TranslationContextValue['translate'];
+	init: (canvas: HTMLCanvasElement, context: undefined, t: TFunction) => Promise<Chart>;
+	t: TFunction;
 };
 
 export const useUpdateChartData = ({ context: contextRef, canvas: canvasRef, init, t }: UseUpdateChartDataOptions) =>
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
index f10909e19f01..0c244993dea7 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
@@ -1,7 +1,7 @@
 import { Skeleton } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import CounterItem from './CounterItem';
@@ -23,7 +23,7 @@ type CounterContainerProps = {
 };
 
 const CounterContainer = ({ data, state, initialData, ...props }: CounterContainerProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [displayData, setDisplayData] = useState<DataType>(initialData);
 
diff --git a/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
index 1073c8e702cc..0033d345423f 100644
--- a/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
@@ -1,11 +1,11 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldGroup, FieldLabel, FieldRow, NumberInput, Select, TextInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from './EditTrigger';
 
@@ -16,7 +16,7 @@ type ConditionFormType = ComponentProps<typeof Field> & {
 
 export const ConditionForm = ({ control, index, ...props }: ConditionFormType) => {
 	const conditionFieldId = useUniqueId();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const conditionName = useWatch({ control, name: `conditions.${index}.name` });
 
 	const placeholders: { [conditionName: string]: string } = useMemo(
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
index b09ea937b1cd..5ef1fd876642 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
@@ -12,11 +12,11 @@ import {
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback, useMemo } from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 import { type TriggersPayload } from '../EditTrigger';
@@ -35,7 +35,7 @@ const ACTION_HINTS: Record<string, TranslationKey> = {
 const PREMIUM_ACTIONS = ['use-external-service'];
 
 export const ActionForm = ({ control, trigger, index, ...props }: SendMessageFormType) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const actionFieldId = useUniqueId();
 	const actionFieldName = `actions.${index}.name` as const;
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
index 7b6d9b9b4ed5..4dcd071fdd7d 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
@@ -1,10 +1,10 @@
 import { FieldRow, Select, TextInput, type SelectOption, Field, FieldLabel } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 
@@ -15,7 +15,7 @@ type ActionSenderType = ComponentProps<typeof Field> & {
 };
 
 export const ActionSender = ({ control, index, disabled, ...props }: ActionSenderType) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const senderFieldId = useUniqueId();
 	const senderFieldName = `actions.${index}.params.sender` as const;
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
index 24ebe2aa5500..c684a2b2744b 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
@@ -1,10 +1,10 @@
 import { FieldError, Field, FieldHint, FieldLabel, FieldRow, NumberInput, TextAreaInput, FieldGroup } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FocusEvent } from 'react';
 import React from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 import type { TriggersPayload } from '../EditTrigger';
@@ -19,7 +19,7 @@ type SendMessageActionFormType = ComponentProps<typeof Field> & {
 };
 
 export const ExternalServiceActionForm = ({ control, trigger, index, ...props }: SendMessageActionFormType) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
index 83154648971f..e267f873135d 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
@@ -1,10 +1,10 @@
 import { Field, FieldError, FieldLabel, FieldRow, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 import { useFieldError } from '../hooks';
@@ -16,7 +16,7 @@ type SendMessageActionFormType = ComponentProps<typeof Field> & {
 };
 
 export const SendMessageActionForm = ({ control, index, ...props }: SendMessageActionFormType) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const messageFieldId = useUniqueId();
 	const name = `actions.${index}.params.msg` as const;
 	const [messageError] = useFieldError({ control, name });
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
index 791841ed3ab5..bd05e95d83fd 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
@@ -1,7 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Palette } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type OutlookSettingItemProps = {
 	id: string;
@@ -12,7 +12,7 @@ type OutlookSettingItemProps = {
 };
 
 const OutlookSettingItem = ({ id, title, subTitle, enabled, handleEnable }: OutlookSettingItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const hovered = css`
 		&:hover,
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
index 71604da54b67..d89321346256 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../../../app/e2e/client';
 import { E2EEState } from '../../../../app/e2e/client/E2EEState';
@@ -16,7 +16,7 @@ const RoomE2EESetup = () => {
 	const e2eeState = useE2EEState();
 	const e2eRoomState = useE2EERoomState(room._id);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const randomPassword = window.localStorage.getItem('e2e.randomPassword');
 
 	const onSavePassword = useCallback(() => {
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
index b1da1323df65..36941e2c829e 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box, Dropdown, Option } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../../components/Header';
 import { useDropdownVisibility } from '../../../../../sidebar/header/hooks/useDropdownVisibility';
@@ -14,7 +14,7 @@ type QuickActionOptionsProps = {
 };
 
 const QuickActionOptions = ({ options, room, action, ...props }: QuickActionOptionsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const reference = useRef(null);
 	const target = useRef(null);
 	const { isVisible, toggle } = useDropdownVisibility({ reference, target });
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
index 13805850a13d..f3b7ef7562d6 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
 import { useOmnichannelRoom } from '../../../contexts/RoomContext';
@@ -13,7 +13,7 @@ type QuickActionsProps = {
 };
 
 const QuickActions = ({ className }: QuickActionsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useOmnichannelRoom();
 	const { quickActions, actionDefault } = useQuickActions();
 
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 2e38e2110bbe..5d98d4a33f8d 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Suspense } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header';
 import MarkdownText from '../../../components/MarkdownText';
@@ -34,7 +34,7 @@ export type RoomHeaderProps = {
 };
 
 const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Header>
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
index 58e1f9f59ef7..d8125feff06e 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,6 +1,6 @@
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 import { roomActionHooksForE2EESetup } from '../../../../ui';
@@ -10,7 +10,7 @@ import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import { getRoomGroup } from '../../lib/getRoomGroup';
 
 const RoomToolboxE2EESetup = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const toolbox = useRoomToolbox();
 	const room = useRoom();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
index b1da1323df65..36941e2c829e 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box, Dropdown, Option } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../../components/Header';
 import { useDropdownVisibility } from '../../../../../sidebar/header/hooks/useDropdownVisibility';
@@ -14,7 +14,7 @@ type QuickActionOptionsProps = {
 };
 
 const QuickActionOptions = ({ options, room, action, ...props }: QuickActionOptionsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const reference = useRef(null);
 	const target = useRef(null);
 	const { isVisible, toggle } = useDropdownVisibility({ reference, target });
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
index 13805850a13d..f3b7ef7562d6 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
 import { useOmnichannelRoom } from '../../../contexts/RoomContext';
@@ -13,7 +13,7 @@ type QuickActionsProps = {
 };
 
 const QuickActions = ({ className }: QuickActionsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useOmnichannelRoom();
 	const { quickActions, actionDefault } = useQuickActions();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
index 8ef21aecf0cd..a99265368dee 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Suspense } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
@@ -32,7 +32,7 @@ export type RoomHeaderProps = {
 };
 
 const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Header>
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
index cfe1f620afbf..424cfeab7714 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
@@ -2,9 +2,9 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { UIEvent } from 'react';
 import React, { useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderSubtitle } from '../../../components/Header';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
@@ -18,7 +18,7 @@ type RoomLeaderProps = {
 };
 
 const RoomLeader = ({ _id, name, username }: RoomLeaderProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { openUserCard, triggerProps } = useUserCard();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
index 9c6afa33fc27..12caba1f3801 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,6 +1,6 @@
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 import { roomActionHooksForE2EESetup } from '../../../../ui';
@@ -8,7 +8,7 @@ import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext'
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
 const RoomToolboxE2EESetup = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const toolbox = useRoomToolbox();
 
 	const { tab } = toolbox;
diff --git a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
index dbd1f0fa57c7..7865f7dcbe85 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
@@ -1,13 +1,13 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
+import { useTranslation } from 'react-i18next';
 
 import { useRoom } from '../contexts/RoomContext';
 
 const MessageListErrorBoundary = ({ children }: { children: ReactNode }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useRoom();
 
 	return (
diff --git a/apps/meteor/client/views/room/MessageList/MessageListItem.tsx b/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
index ecd0978c9fc0..0304be656121 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
@@ -1,7 +1,7 @@
 import { isThreadMessage, type IMessage, type ISubscription } from '@rocket.chat/core-typings';
 import { Box, Bubble, MessageDivider } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import RoomMessage from '../../../components/message/variants/RoomMessage';
 import SystemMessage from '../../../components/message/variants/SystemMessage';
@@ -31,7 +31,7 @@ export const MessageListItem = ({
 	subscription,
 	system,
 }: MessageListItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDate = useFormatDate();
 
 	const ref = useDateRef();
diff --git a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
index 8a9b1ae77dbd..2e9e16ef3201 100644
--- a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
+++ b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { DragEvent, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 
@@ -16,7 +16,7 @@ type DropTargetOverlayProps = {
 };
 
 function DropTargetOverlay({ enabled, reason, onFileDrop, visible = true, onDismiss }: DropTargetOverlayProps): ReactElement | null {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleDragLeave = useMutableCallback((event: DragEvent) => {
 		event.stopPropagation();
diff --git a/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
index cdddc8b482cd..6923528e33b9 100644
--- a/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { Upload } from '../../../lib/chats/Upload';
 
@@ -11,7 +11,7 @@ type ErroredUploadProgressIndicatorProps = {
 };
 
 const ErroredUploadProgressIndicator = ({ id, error, onClose }: ErroredUploadProgressIndicatorProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleCloseClick = useCallback(() => {
 		onClose?.(id);
diff --git a/apps/meteor/client/views/room/body/LeaderBar.tsx b/apps/meteor/client/views/room/body/LeaderBar.tsx
index b54d37ed5df9..6c637eb84d8e 100644
--- a/apps/meteor/client/views/room/body/LeaderBar.tsx
+++ b/apps/meteor/client/views/room/body/LeaderBar.tsx
@@ -2,10 +2,10 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, UIEvent } from 'react';
 import React, { memo, useCallback, useMemo } from 'react';
 import type { AriaButtonProps } from 'react-aria';
+import { useTranslation } from 'react-i18next';
 
 import { isTruthy } from '../../../../lib/isTruthy';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
@@ -23,7 +23,7 @@ type LeaderBarProps = {
  * @deprecated on newNavigation feature. Remove after full migration.
  */
 const LeaderBar = ({ _id, name, username, visible, onAvatarClick, triggerProps }: LeaderBarProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const chatNowLink = useMemo(() => roomCoordinator.getRouteLink('d', { name: username }) || undefined, [username]);
 
diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
index 4629b812bbff..f9c612ce9a9a 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
@@ -1,14 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Bubble } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { withErrorBoundary } from '../../../components/withErrorBoundary';
 import { usePruneWarningMessage } from '../../../hooks/usePruneWarningMessage';
 
 const RetentionPolicyWarning = ({ room }: { room: IRoom }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const message = usePruneWarningMessage(room);
 
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
index a765407ad6d4..7629fc14c508 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
@@ -2,9 +2,9 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { isVoipRoom, isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { Flex, Box } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword';
 import RoomForewordUsernameList from './RoomForewordUsernameList';
@@ -12,7 +12,7 @@ import RoomForewordUsernameList from './RoomForewordUsernameList';
 type RoomForewordProps = { user: IUser | null; room: IRoom };
 
 const RoomForeword = ({ user, room }: RoomForewordProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (isVoipRoom(room)) {
 		return <VoipRoomForeword room={room} />;
diff --git a/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx b/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
index e72a263ae8e6..842929376cf7 100644
--- a/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Bubble } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type UnreadMessagesIndicatorProps = {
 	count: number;
@@ -18,7 +18,7 @@ const indicatorStyle = css`
 `;
 
 const UnreadMessagesIndicator = ({ count, onJumpButtonClick, onMarkAsReadButtonClick }: UnreadMessagesIndicatorProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box className={indicatorStyle} mbs={8}>
diff --git a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
index 001e84de2401..3c9a9b0a809d 100644
--- a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { Upload } from '../../../lib/chats/Upload';
 import ErroredUploadProgressIndicator from './ErroredUploadProgressIndicator';
@@ -14,7 +14,7 @@ type UploadProgressIndicatorProps = {
 };
 
 const UploadProgressIndicator = ({ id, name, percentage, error, onClose }: UploadProgressIndicatorProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleCloseClick = useCallback(() => {
 		onClose?.(id);
diff --git a/apps/meteor/client/views/room/composer/ComposerArchived.tsx b/apps/meteor/client/views/room/composer/ComposerArchived.tsx
index d8e269f9986c..e32d4310e451 100644
--- a/apps/meteor/client/views/room/composer/ComposerArchived.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerArchived.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const ComposerReadOnly = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<MessageFooterCallout>
diff --git a/apps/meteor/client/views/room/composer/ComposerBlocked.tsx b/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
index c5edb077c39f..c1a7aaca35ee 100644
--- a/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const ComposerBlocked = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <MessageFooterCallout>{t('room_is_blocked')}</MessageFooterCallout>;
 };
 
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
index 523c0e44af86..cdac8d6d4daf 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
@@ -1,9 +1,9 @@
 import { Box, Option, OptionSkeleton, Tile } from '@rocket.chat/fuselage';
 import { useUniqueId, useContentBoxSize } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useEffect, memo, useMemo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export type ComposerBoxPopupProps<
 	T extends {
@@ -32,7 +32,7 @@ function ComposerBoxPopup<
 	select,
 	renderItem = ({ item }: { item: T }) => <>{JSON.stringify(item)}</>,
 }: ComposerBoxPopupProps<T>): ReactElement | null {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const id = useUniqueId();
 	const composerBoxPopupRef = useRef<HTMLElement>(null);
 	const popupSizes = useContentBoxSize(composerBoxPopupRef);
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
index fe69136c3d26..70c18a9dae57 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
@@ -1,6 +1,6 @@
 import { OptionColumn, OptionContent, OptionDescription, OptionInput } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export type ComposerBoxPopupSlashCommandProps = {
 	_id: string;
@@ -10,7 +10,7 @@ export type ComposerBoxPopupSlashCommandProps = {
 };
 
 function ComposerBoxPopupSlashCommand({ _id, description, params, disabled }: ComposerBoxPopupSlashCommandProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
index a32168799158..ef38f61cdf6c 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
@@ -1,7 +1,7 @@
 import { OptionAvatar, OptionColumn, OptionContent, OptionInput } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ReactiveUserStatus from '../../../components/UserStatus/ReactiveUserStatus';
 
@@ -19,7 +19,7 @@ export type ComposerBoxPopupUserProps = {
 };
 
 function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, suggestion, variant }: ComposerBoxPopupUserProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
index e20c00a0d1eb..0bcfa22790a9 100644
--- a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const ComposerFederationDisabled = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return <MessageFooterCallout>{t('Federation_Matrix_Federated_Description_disabled')}</MessageFooterCallout>;
 };
diff --git a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
index 94d578d6fc2d..59337376026f 100644
--- a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const ComposerFederationJoinRoomDisabled = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return <MessageFooterCallout>{t('Federation_Matrix_join_public_rooms_is_premium')}</MessageFooterCallout>;
 };
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
index ecae4417db7b..74ee27dac24f 100644
--- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
@@ -1,7 +1,7 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import { useResumeChatOnHoldMutation } from './hooks/useResumeChatOnHoldMutation';
@@ -11,7 +11,7 @@ export const ComposerOmnichannelOnHold = (): ReactElement => {
 
 	const room = useOmnichannelRoom();
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<MessageFooterCallout>
diff --git a/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx b/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
index e2d5c1f03fe0..f2965f63c26f 100644
--- a/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { UserAction } from '../../../../../app/ui/client/lib/UserAction';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
@@ -9,7 +9,7 @@ import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 const maxUsernames = 5;
 
 const ComposerUserActionIndicator = ({ rid, tmid }: { rid: string; tmid?: string }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const actions = useReactiveValue(
 		useCallback(() => {
 			const roomAction = UserAction.get(tmid || rid) || {};
diff --git a/apps/meteor/client/views/room/composer/ComposerVoIP.tsx b/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
index 98670bd45a15..399e0d32baa7 100644
--- a/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const ComposerVoIP = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return <MessageFooterCallout>{t('Composer_not_available_phone_calls')}</MessageFooterCallout>;
 };
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
index d39b74c079a2..2010a589edc6 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
@@ -1,7 +1,7 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { isPromptButton, type FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI';
@@ -13,7 +13,7 @@ type FormattingToolbarDropdownProps = {
 };
 
 const FormattingToolbarDropdown = ({ composer, items, disabled }: FormattingToolbarDropdownProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const formattingItems: GenericMenuItemProps[] = items.map((formatter) => {
 		const handleFormattingAction = () => {
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
index 7a4f7da20825..c5b1f06dd9b8 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
@@ -1,6 +1,6 @@
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import { isPromptButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
@@ -15,7 +15,7 @@ type MessageBoxFormattingToolbarProps = {
 };
 
 const MessageBoxFormattingToolbar = ({ items, variant = 'large', composer, disabled }: MessageBoxFormattingToolbarProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (variant === 'small') {
 		const collapsedItems = [...items];
diff --git a/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts b/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
index e298f86a1e0b..e0923c268fe8 100644
--- a/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useMediaActionTitle = (
 	media: 'audio' | 'video',
@@ -8,7 +8,7 @@ export const useMediaActionTitle = (
 	isMediaEnabled: boolean,
 	isAllowed: boolean,
 ) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getMediaActionTitle = useMemo(() => {
 		if (isPermissionDenied) {
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
index d6e94f4f45ac..e5272e749a17 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
@@ -1,8 +1,8 @@
 import { Callout, FieldGroup, Field, FieldLabel, FieldRow, ToggleSwitch, Select } from '@rocket.chat/fuselage';
 import type { SelectOption } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarClose,
@@ -30,7 +30,7 @@ const AutoTranslate = ({
 	handleChangeLanguage,
 	handleClose,
 }: AutoTranslateProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useRoom();
 
 	return (
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
index 5395fb95f467..352f7e46ce6a 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
@@ -1,6 +1,6 @@
 import type { IDiscussionMessage, IUser } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 import { normalizeThreadMessage } from '../../../../lib/normalizeThreadMessage';
@@ -14,7 +14,7 @@ type DiscussionListRowProps = {
 };
 
 function DiscussionListRow({ discussion, showRealNames, userId, onClick }: DiscussionListRowProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const msg = normalizeThreadMessage(discussion);
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
index 6fabbaff4a1a..a0c4fa09ffae 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
@@ -1,9 +1,9 @@
 import type { IDiscussionMessage } from '@rocket.chat/core-typings';
 import { Box, Message } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Emoji from '../../../../../components/Emoji';
 import { clickableItem } from '../../../../../lib/clickableItem';
@@ -33,7 +33,7 @@ const DiscussionListItem = ({
 	emoji,
 	...props
 }: DiscussionListItemProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<Box is={Message} {...props} className={className} pbs={16} pbe={8}>
 			<Message.LeftContainer>
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index 57aa18c7bb66..4fbd060bef67 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../components/Contextualbar';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
@@ -23,7 +23,7 @@ export type MailExportFormValues = {
 };
 
 const ExportMessages = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useRoom();
 
 	const { closeTab } = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
index 9f52085e7bd2..7344926ec646 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, Select, ButtonGroup, Button, FieldGroup, InputBox } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
 import type { MailExportFormValues } from './ExportMessages';
@@ -18,7 +18,7 @@ type FileExportProps = {
 };
 
 const FileExport = ({ formId, rid, exportOptions, onCancel }: FileExportProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { control, handleSubmit } = useFormContext<MailExportFormValues>();
 	const roomExportMutation = useRoomExportMutation();
 	const formFocus = useAutoFocus<HTMLFormElement>();
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
index 39e043bb9c0b..41b6c33fec6c 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -17,9 +17,9 @@ import {
 	Select,
 } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useContext } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { validateEmail } from '../../../../../lib/emailValidator';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
@@ -36,7 +36,7 @@ type MailExportFormProps = {
 };
 
 const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportFormProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formFocus = useAutoFocus<HTMLFormElement>();
 
 	const {
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
index 459557bde32a..84c93e307cb1 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
@@ -10,7 +10,7 @@ type ChannelToTeamConfirmationProps = {
 };
 
 const ChannelToTeamConfirmation = ({ onCancel, onConfirm }: ChannelToTeamConfirmationProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
index a1e088b158f3..ea7335bbbf45 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import TeamAutocomplete from '../../../../teams/contextualBar/TeamAutocomplete';
@@ -14,7 +14,7 @@ type ChannelToTeamSelectionProps = {
 };
 
 const ChannelToTeamSelection = ({ teamId, onCancel, onChange, onConfirm }: ChannelToTeamSelectionProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
index 31f96a344677..cbbaad6427d1 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, IconButton } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -41,7 +41,7 @@ type RoomInfoProps = {
 };
 
 const RoomInfo = ({ room, icon, onClickBack, onClickClose, onClickEnterRoom, onClickEdit, resetState }: RoomInfoProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { name, fname, description, topic, archived, broadcast, announcement } = room;
 	const roomTitle = fname || name;
 	const isDiscussion = 'prid' in room;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
index 302a2c476e9d..512fb83fa153 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
@@ -1,6 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom';
 import { useRoomConvertToTeam } from './actions/useRoomConvertToTeam';
@@ -17,7 +17,7 @@ type UseRoomActionsOptions = {
 export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 	const { onClickEnterRoom, onClickEdit, resetState } = options;
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleHide = useRoomHide(room);
 	const handleLeave = useRoomLeave(room);
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload: resetState });
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
index 505a7cbc8590..6dab532b27c6 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
@@ -1,6 +1,6 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -12,7 +12,7 @@ import {
 import KeyboardShortcutSection from './KeyboardShortcutSection';
 
 const KeyboardShortcuts = ({ handleClose }: { handleClose: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
index e61bd736768b..6a3c74fd3fa4 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
@@ -1,6 +1,6 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarClose,
@@ -22,7 +22,7 @@ const MessageSearchTab = () => {
 
 	const [{ searchText, globalSearch }, handleSearch] = useState({ searchText: '', globalSearch: false });
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
index b9c076e36781..e59ed2cdf780 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
@@ -2,9 +2,9 @@ import type { IMessageSearchProvider } from '@rocket.chat/core-typings';
 import { Box, Field, FieldLabel, FieldHint, Icon, TextInput, ToggleSwitch, Callout } from '@rocket.chat/fuselage';
 import { useDebouncedCallback, useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { getRoomTypeTranslation } from '../../../../../lib/getRoomTypeTranslation';
 import { useRoom } from '../../../contexts/RoomContext';
@@ -45,7 +45,7 @@ const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
 	const globalSearchEnabled = provider.settings.GlobalSearchEnabled;
 	const globalSearchToggleId = useUniqueId();
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box is='form' onSubmit={submitHandler} w='full'>
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
index 5066825d8311..c7ccb8b61232 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -30,7 +30,7 @@ const NotificationPreferences = ({
 	notificationOptions,
 	handlePlaySound,
 }: NotificationPreferencesProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		formState: { isDirty, isSubmitting },
 	} = useFormContext();
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
index dcf1522197ee..b9b54af27c08 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { FieldGroup, IconButton, Margins } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import NotificationByDevice from './components/NotificationByDevice';
 import NotificationPreference from './components/NotificationPreference';
@@ -16,7 +16,7 @@ type NotificationPreferencesFormProps = {
 };
 
 const NotificationPreferencesForm = ({ notificationOptions, handlePlaySound }: NotificationPreferencesFormProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { watch, control } = useFormContext();
 
 	const { showCounter } = watch();
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
index aaf119e703ff..89c82fd966ec 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Button, Callout, Throbber } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEventHandler, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import {
@@ -27,7 +27,7 @@ type OTRProps = {
 };
 
 const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh, otrState, peerUsername }: OTRProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useRoom();
 
 	const renderOTRState = (): ReactElement => {
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
index e74dbb5c54f6..21be67e28011 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type OTREstablishedProps = {
 	onClickRefresh: () => void;
@@ -9,7 +9,7 @@ type OTREstablishedProps = {
 };
 
 const OTREstablished = ({ onClickRefresh, onClickEnd }: OTREstablishedProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<ButtonGroup stretch>
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
index 0794c829b58a..67f3e62d1592 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
@@ -1,8 +1,8 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type OTRStatesProps = {
 	title: string;
@@ -12,7 +12,7 @@ type OTRStatesProps = {
 };
 
 const OTRStates = ({ title, description, icon, onClickStart }: OTRStatesProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<States>
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
index 17242ed06daa..88b979dc8bc3 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, ButtonGroup, Button, CheckBox, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -25,7 +25,7 @@ type PruneMessagesProps = {
 };
 
 const PruneMessages = ({ callOutText, validateText, onClickClose, onClickPrune }: PruneMessagesProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { control, register } = useFormContext();
 
 	const inclusiveCheckboxId = useUniqueId();
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
index be479ffe77bd..e699ee6f6c77 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
@@ -1,9 +1,9 @@
 import type { IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ContextualbarSection } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -42,7 +42,7 @@ const RoomFiles = ({
 	onClickClose,
 	onClickDelete,
 }: RoomFilesProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const options: SelectOption[] = useMemo(
 		() => [
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
index 59a06fdb4251..1dc2a4c57191 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Field, FieldLabel, FieldRow, Select, Button } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type EditInviteLinkProps = {
 	daysAndMaxUses: { days: string; maxUses: string };
@@ -11,7 +11,7 @@ type EditInviteLinkProps = {
 };
 
 const EditInviteLink = ({ daysAndMaxUses, onClickNewLink }: EditInviteLinkProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		handleSubmit,
 		formState: { isDirty, isSubmitting },
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
index cd2fb2a22a4b..e5aabea4a688 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
@@ -1,7 +1,7 @@
 import { Box, Field, FieldLabel, FieldRow, UrlInput, Icon, Button, InputBox } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../../../../../hooks/useClipboardWithToast';
 
@@ -12,7 +12,7 @@ type InviteLinkProps = {
 };
 
 const InviteLink = ({ linkText, captionText, onClickEdit }: InviteLinkProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { copy } = useClipboardWithToast(linkText);
 
 	return (
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
index fa7a915a7285..1ae82e75681a 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
@@ -1,7 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -38,7 +38,7 @@ const InviteUsers = ({
 	linkText,
 	error,
 }: InviteUsersProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index c265a28cb284..453f55fc71a3 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -1,8 +1,8 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
@@ -15,7 +15,7 @@ type RoomMembersActionsProps = {
 };
 
 const RoomMembersActions = ({ username, _id, name, rid, reload }: RoomMembersActionsProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { menuActions: menuOptions } = useUserInfoActions({ _id, username, name }, rid, reload, 0, true);
 	if (!menuOptions) {
 		return null;
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
index 03a80c496028..4a0e71746417 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
@@ -1,9 +1,9 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Message, Box, IconButton } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import Emoji from '../../../../../components/Emoji';
 import { followStyle, anchor } from '../../../../../components/message/helpers/followSyle';
@@ -47,7 +47,7 @@ const ThreadListMessage = ({
 	emoji,
 	...props
 }: ThreadListMessageProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const button = !following ? 'bell-off' : 'bell';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
index 4e151bab4bec..3245b1c03010 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
@@ -1,7 +1,7 @@
 import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typings';
 import { Box, Bubble, MessageDivider } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import SystemMessage from '../../../../../components/message/variants/SystemMessage';
 import ThreadMessage from '../../../../../components/message/variants/ThreadMessage';
@@ -27,7 +27,7 @@ export const ThreadMessageItem = ({
 	firstUnread,
 	system,
 }: ThreadMessageProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDate = useFormatDate();
 	const ref = useDateRef();
 
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index 17e8bd1470ba..b60bcb749f5b 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -2,9 +2,9 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton, Skeleton } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { UserInfoAction } from '../../../../components/UserInfo';
 import { useMemberExists } from '../../../hooks/useMemberExists';
@@ -17,7 +17,7 @@ type UserInfoActionsProps = {
 };
 
 const UserInfoActions = ({ user, rid, backToList }: UserInfoActionsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const {
 		data: isMemberData,
 		refetch,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
index 41a980dccf31..89aecda07fdc 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
@@ -1,7 +1,7 @@
 import { Modal, Button, Box, Callout, Margins } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type VideoConfConfigModalProps = {
 	onClose: () => void;
@@ -10,7 +10,7 @@ type VideoConfConfigModalProps = {
 };
 
 const VideoConfConfigModal = ({ onClose, onConfirm, isAdmin }: VideoConfConfigModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
index b9da11fcd67d..c8c7b6a59e3b 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
@@ -1,9 +1,9 @@
 import type { VideoConference } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Throbber } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -29,7 +29,7 @@ type VideoConfListProps = {
 };
 
 const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loadMoreItems }: VideoConfListProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { ref, contentBoxSize: { inlineSize = 378, blockSize = 1 } = {} } = useResizeObserver<HTMLElement>({
 		debounceDelay: 200,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
index 44727aae98c9..09ddfb51b3a2 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
@@ -1,7 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupContent,
@@ -16,6 +15,7 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVideoConfSetPreferences } from '../../../../../../contexts/VideoConfContext';
 import { AsyncStatePhase } from '../../../../../../hooks/useAsyncState';
@@ -32,7 +32,7 @@ type IncomingPopupProps = {
 };
 
 const IncomingPopup = ({ id, room, position, onClose, onMute, onConfirm }: IncomingPopupProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { controllersConfig, handleToggleMic, handleToggleCam } = useVideoConfControllers();
 	const setPreferences = useVideoConfSetPreferences();
 
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
index 92f30c0c1cea..eaf82c5a301e 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
@@ -1,5 +1,4 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupContent,
@@ -14,6 +13,7 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
@@ -25,7 +25,7 @@ type OutgoingPopupProps = {
 };
 
 const OutgoingPopup = ({ room, onClose, id }: OutgoingPopupProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const videoConfPreferences = useVideoConfPreferences();
 	const { controllersConfig } = useVideoConfControllers(videoConfPreferences);
 	const capabilities = useVideoConfCapabilities();
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
index d1bc3a29231b..a9fcb8527767 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
@@ -1,6 +1,5 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useOutsideClick, useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupHeader,
@@ -15,6 +14,7 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useVideoConfSetPreferences, useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import { useVideoConfRoomName } from '../../hooks/useVideoConfRoomName';
@@ -29,7 +29,7 @@ type StartCallPopupProps = {
 };
 
 const StartCallPopup = ({ id, loading, room, onClose, onConfirm }: StartCallPopupProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const ref = useRef(null);
 	useOutsideClick([ref], !loading ? onClose : () => undefined);
 
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
index 6b48a47a79ef..ff96e220723a 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
@@ -1,7 +1,7 @@
 import { AudioPlayer, Box, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useState, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 import { FilePreviewType } from './FilePreview';
@@ -38,7 +38,7 @@ type MediaPreviewProps = {
 
 const MediaPreview = ({ file, fileType }: MediaPreviewProps): ReactElement => {
 	const [loaded, url] = useFileAsDataURL(file);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (!loaded) {
 		return <PreviewSkeleton />;
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
index 70a91df0e555..cd309923ffd4 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import Reactions from './Reactions';
@@ -12,7 +12,7 @@ type ReactionListModalProps = {
 };
 
 const ReactionListModal = ({ reactions, onClose }: ReactionListModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal variant='info' title={t('Users_reacted')} onClose={onClose} onConfirm={onClose} confirmText={t('Close')}>
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
index 827e16b1ac60..3f152db142e9 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
@@ -1,7 +1,7 @@
 import { Box, Icon, IconButton, Tag } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type FilePickerBreadcrumbsProps = {
 	parentFolders: string[];
@@ -10,7 +10,7 @@ type FilePickerBreadcrumbsProps = {
 };
 
 const FilePickerBreadcrumbs = ({ parentFolders, handleBreadcrumb, handleBack }: FilePickerBreadcrumbsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' alignItems='center' overflowX='auto' mie={8}>
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
index e85248fca0e9..32b379eca432 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
@@ -1,8 +1,8 @@
 import type { IWebdavNode } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
@@ -36,7 +36,7 @@ const WebdavFilePickerTable = ({
 	onNodeClick,
 	isLoading,
 }: WebdavFilePickerTableProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' overflowY='hidden' height='x256'>
diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
index f7f14bc8199d..2bb54f1fc69c 100644
--- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
+++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
@@ -1,8 +1,8 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableHeader, GenericTableBody } from '../../../components/GenericTable';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
@@ -29,7 +29,7 @@ const ChannelDesertionTable = ({
 }: ChannelDesertionTableProps) => {
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'ts'>('name');
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const selectedRoomsLength = Object.values(selectedRooms).filter(Boolean).length;
 
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
index ae5b30609d78..a4aba906e7d9 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import ChannelDesertionTable from '../../ChannelDesertionTable';
@@ -28,7 +28,7 @@ const FirstStep = ({
 	eligibleRoomsLength,
 	...props
 }: FirstStepProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
index 118149591d01..27b4a9c7d772 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
@@ -16,7 +16,7 @@ type SecondStepsProps = {
 };
 
 const SecondStep = ({ onClose, onCancel, onConfirm, deletedRooms = {}, rooms = [], ...props }: SecondStepsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index 418883869a4a..aae1d604dba0 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -2,15 +2,15 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { CheckBox } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
 
 const TeamsChannelItemMenu = ({ room, mainRoom, reload }: { room: IRoom; mainRoom: IRoom; reload?: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { handleRemoveRoom, canRemoveTeamChannel } = useRemoveRoomFromTeam(room, { reload });
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload });
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
index b1847825ffab..288604727ef6 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback, useAutoFocus, useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, Dispatch, SetStateAction, SyntheticEvent } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -54,7 +54,7 @@ const TeamsChannels = ({
 	onClickView,
 	reload,
 }: TeamsChannelsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 
 	const options: SelectOption[] = useMemo(
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
index 4bd85aed663c..24555a1fc9e0 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableBody, GenericTableHeader } from '../../../../../../components/GenericTable';
 import { useSort } from '../../../../../../components/GenericTable/hooks/useSort';
@@ -15,7 +15,7 @@ type ChannelDeletionTableProps = {
 };
 
 const ChannelDeletionTable = ({ rooms, onChangeRoomSelection, selectedRooms, onToggleAllRooms }: ChannelDeletionTableProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'usersCount'>('name');
 
 	const selectedRoomsLength = Object.values(selectedRooms).filter(Boolean).length;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
index 0a02e1243431..e87eb5825af6 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import ChannelDeletionTable from './ChannelDeletionTable';
@@ -23,7 +23,7 @@ const DeleteTeamChannels = ({
 	onConfirm,
 	onChangeRoomSelection,
 }: DeleteTeamChannelsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
index d7c711cf2d42..4eed097a4a3e 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
@@ -1,6 +1,6 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import RoomLinkList from './RoomLinkList';
@@ -14,7 +14,7 @@ type DeleteTeamConfirmationProps = {
 };
 
 const DeleteTeamConfirmation = ({ deletedRooms, keptRooms, onConfirm, onReturn, onCancel }: DeleteTeamConfirmationProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const roomIds = Object.values(deletedRooms).map(({ _id }) => _id);
 
 	return (
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
index 0a4b0fbe6af3..230828ef6795 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../../ChannelDesertionTable';
@@ -27,7 +27,7 @@ const LeaveTeamModalChannels = ({
 	eligibleRoomsLength,
 	selectedRooms,
 }: LeaveTeamModalChannelsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
index 36ef2c54f4bc..0fd32323bfff 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 
@@ -15,7 +15,7 @@ type LeaveTeamModalConfirmationProps = {
 };
 
 const LeaveTeamModalConfirmation = ({ selectedRooms, onConfirm, onCancel, onClose }: LeaveTeamModalConfirmationProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index f28f4c8b5742..a5e554ca6f05 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Button, Callout, Option, Menu } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -50,7 +50,7 @@ const TeamsInfo = ({
 	onClickViewChannels,
 	onClickConvertToChannel,
 }: TeamsInfoProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const retentionPolicy = useRetentionPolicy(room);
 
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
index 9657ea153a78..d467b6957e0f 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../ChannelDesertionTable';
@@ -21,7 +21,7 @@ const RemoveUsersFirstStep = ({
 	eligibleRoomsLength,
 	...props
 }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
index be5258e0c097..8fe67f29fbb2 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
@@ -1,11 +1,11 @@
 import { Icon } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
 const RemoveUsersSecondStep = ({ onClose, onCancel, onConfirm, deletedRooms = {}, username, rooms = [], ...props }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/voip/modal/DialPad/DialInput.tsx b/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
index cf96f4e26507..36a81d47ec8f 100644
--- a/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
+++ b/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
@@ -1,7 +1,7 @@
 import { IconButton, TextInput } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, FocusEvent } from 'react';
 import React, { forwardRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type DialInputProps = {
 	inputName: string;
@@ -16,7 +16,7 @@ export const DialInput = forwardRef<HTMLInputElement, DialInputProps>(function D
 	{ handleBackspaceClick, handleOnChange, isButtonDisabled, inputError, inputName },
 	ref,
 ) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<TextInput
diff --git a/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx b/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
index 8c94ad238ddc..b3b92609d1a5 100644
--- a/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
+++ b/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
@@ -1,7 +1,7 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, RefCallback } from 'react';
 import { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useDialModal } from '../../../../hooks/useDialModal';
 import { useOutboundDialer } from '../../../../hooks/useOutboundDialer';
@@ -25,7 +25,7 @@ type DialPadProps = {
 };
 
 export const useDialPad = ({ initialValue, initialErrorMessage }: DialPadProps): DialPadStateHandlers => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const outboundClient = useOutboundDialer();
 	const { closeDialModal } = useDialModal();
 
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 43b62def0819..df12721c5261 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -183,7 +183,7 @@
 		"eslint-plugin-testing-library": "~6.2.2",
 		"eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0",
 		"fast-glob": "^3.2.12",
-		"i18next": "~23.4.9",
+		"i18next": "~23.14.0",
 		"jest": "~29.7.0",
 		"jsdom-global": "^3.0.2",
 		"mocha": "^9.2.2",
@@ -408,7 +408,7 @@
 		"react-dom": "~17.0.2",
 		"react-error-boundary": "^3.1.4",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~13.2.2",
+		"react-i18next": "~15.0.1",
 		"react-keyed-flatten-children": "^1.3.0",
 		"react-virtuoso": "^4.7.1",
 		"redis": "^4.0.6",
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
index 0797d896f22d..7ecb8f309b29 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
@@ -22,7 +22,7 @@ import { logger } from './logger';
 type FileAttachment = VideoAttachmentProps & ImageAttachmentProps & AudioAttachmentProps;
 
 const language = settings.get<string>('Language') || 'en';
-const t = (s: string): string => i18n.t(s, { lng: language });
+const t = i18n.getFixedT(language);
 
 async function getGuestByEmail(email: string, name: string, department = ''): Promise<ILivechatVisitor | null> {
 	const guest = await LivechatVisitors.findOneGuestByEmailAddress(email);
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
index 51718e4937d8..44a9e2cd6a15 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
@@ -20,7 +20,7 @@ const livechatQuoteRegExp = /^\[\s\]\(https?:\/\/.+\/live\/.+\?msg=(?<id>.+?)\)\
 const getRocketCatUser = async (): Promise<IUser | null> => Users.findOneById('rocket.cat');
 
 const language = settings.get<string>('Language') || 'en';
-const t = (s: string): string => i18n.t(s, { lng: language });
+const t = i18n.getFixedT(language);
 
 // TODO: change these messages with room notifications
 const sendErrorReplyMessage = async (error: string, options: any) => {
diff --git a/apps/meteor/server/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts
index bc3ed6184937..28ba6cec6dad 100644
--- a/apps/meteor/server/lib/i18n.ts
+++ b/apps/meteor/server/lib/i18n.ts
@@ -1,6 +1,4 @@
-import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
 import i18nDict from '@rocket.chat/i18n';
-import type { TOptions } from 'i18next';
 
 import { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces, i18n } from '../../app/utils/lib/i18n';
 
@@ -18,13 +16,4 @@ void i18n.init({
 	initImmediate: false,
 });
 
-declare module 'i18next' {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface TFunction {
-		(key: RocketchatI18nKeys, options?: TOptions): string;
-		(key: RocketchatI18nKeys, ...options: unknown[]): string;
-		<T>(key: T extends string ? (T extends RocketchatI18nKeys ? T : never) : never, options?: TOptions): string;
-	}
-}
-
 export { i18n };
diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts
index 85da6e59cf60..26ac78f30ad6 100644
--- a/apps/meteor/server/lib/resetUserE2EKey.ts
+++ b/apps/meteor/server/lib/resetUserE2EKey.ts
@@ -20,7 +20,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
 		return;
 	}
 
-	const t = (s: string): string => i18n.t(s, { lng: language });
+	const t = i18n.getFixedT(language);
 	const text = `
 	${t('Your_e2e_key_has_been_reset')}
 
diff --git a/apps/meteor/server/modules/core-apps/mention.module.ts b/apps/meteor/server/modules/core-apps/mention.module.ts
index ac615def8a5a..76d3a22ea53b 100644
--- a/apps/meteor/server/modules/core-apps/mention.module.ts
+++ b/apps/meteor/server/modules/core-apps/mention.module.ts
@@ -44,13 +44,10 @@ export class MentionModule implements IUiKitCoreApp {
 
 		if (actionId === 'dismiss') {
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t(
-					'You_mentioned___mentions__but_theyre_not_in_this_room',
-					{
-						mentions: joinedUsernames,
-					},
-					payload.user.language,
-				),
+				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
+					mentions: joinedUsernames,
+					lng: payload.user.language,
+				}),
 				_id: payload.message,
 				tmid: message.tmid,
 				mentions,
@@ -61,13 +58,10 @@ export class MentionModule implements IUiKitCoreApp {
 		if (actionId === 'add-users') {
 			void addUsersToRoomMethod(payload.user._id, { rid: payload.room, users: usernames as string[] }, payload.user);
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t(
-					'You_mentioned___mentions__but_theyre_not_in_this_room',
-					{
-						mentions: joinedUsernames,
-					},
-					payload.user.language,
-				),
+				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
+					mentions: joinedUsernames,
+					lng: payload.user.language,
+				}),
 				tmid: message.tmid,
 				_id: payload.message,
 				mentions,
@@ -87,13 +81,10 @@ export class MentionModule implements IUiKitCoreApp {
 				throw new Error('Mention bot - Failed to retrieve path to room');
 			}
 
-			const messageText = i18n.t(
-				'Youre_not_a_part_of__channel__and_I_mentioned_you_there',
-				{
-					channel: `#${sub.name}`,
-				},
-				payload.user.language,
-			);
+			const messageText = i18n.t('Youre_not_a_part_of__channel__and_I_mentioned_you_there', {
+				channel: `#${sub.name}`,
+				lng: payload.user.language,
+			});
 
 			const link = new URL(Meteor.absoluteUrl(roomPath));
 			link.searchParams.set('msg', message._id);
@@ -109,13 +100,10 @@ export class MentionModule implements IUiKitCoreApp {
 			);
 
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t(
-					'You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm',
-					{
-						mentions: joinedUsernames,
-					},
-					payload.user.language,
-				),
+				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm', {
+					mentions: joinedUsernames,
+					lng: payload.user.language,
+				}),
 				tmid: message.tmid,
 				_id: payload.message,
 				mentions,
diff --git a/apps/meteor/server/services/omnichannel-analytics/service.ts b/apps/meteor/server/services/omnichannel-analytics/service.ts
index 4f479d83acdd..8b27ed4b9f57 100644
--- a/apps/meteor/server/services/omnichannel-analytics/service.ts
+++ b/apps/meteor/server/services/omnichannel-analytics/service.ts
@@ -160,7 +160,7 @@ export class OmnichannelAnalyticsService extends ServiceClassInternal implements
 			return;
 		}
 
-		const t = (s: string) => i18n.t(s, { lng: language });
+		const t = i18n.getFixedT(language);
 
 		const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
 		return this.overview.callAction(name, from, to, departmentId, timezone, t, extraQuery);
diff --git a/package.json b/package.json
index 60ec7b46f62f..405686417d28 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,8 @@
 		"@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0": "patch:@storybook/react-docgen-typescript-plugin@npm%3A1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0#./.yarn/patches/@storybook-react-docgen-typescript-plugin-npm-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0-b31cc57c40.patch",
 		"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
 		"@rocket.chat/forked-matrix-sdk-crypto-nodejs": "0.1.0-beta.13",
-		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch"
+		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch",
+		"react-i18next@~15.0.1": "patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch"
 	},
 	"dependencies": {
 		"node-gyp": "^9.4.1"
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 7277e183eae6..43a79f90b9ed 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -95,14 +95,14 @@
     "babel-loader": "~8.2.5",
     "cross-env": "^7.0.3",
     "eslint": "~8.45.0",
-    "i18next": "^23.10.1",
+    "i18next": "~23.14.0",
     "jest": "~29.7.0",
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "~2.8.8",
     "react-docgen-typescript-plugin": "~1.0.5",
     "react-dom": "^17.0.2",
-    "react-i18next": "^14.1.0",
+    "react-i18next": "~15.0.1",
     "rimraf": "^3.0.2",
     "storybook-dark-mode": "~3.0.1",
     "tslib": "^2.5.3",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index f6c48c7f8e47..babdc60161da 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -2,6 +2,28 @@
 	"name": "@rocket.chat/gazzodown",
 	"version": "10.0.0",
 	"private": true,
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"scripts": {
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"build-storybook": "build-storybook",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"storybook": "start-storybook -p 6006",
+		"test": "jest",
+		"testunit": "jest",
+		"typecheck": "tsc --noEmit"
+	},
+	"dependencies": {
+		"date-fns": "^3.3.1",
+		"dompurify": "^3.1.6",
+		"highlight.js": "^11.5.1",
+		"react-error-boundary": "^3.1.4"
+	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/core-typings": "workspace:^",
@@ -23,6 +45,7 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
 		"@testing-library/react": "~16.0.0",
+		"@types/dompurify": "^3.0.5",
 		"@types/jest": "~29.5.12",
 		"@types/katex": "~0.16.5",
 		"@types/react": "~17.0.69",
@@ -41,24 +64,9 @@
 		"outdent": "^0.8.0",
 		"react-docgen-typescript-plugin": "~1.0.5",
 		"react-dom": "~17.0.2",
+		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
 	},
-	"scripts": {
-		"build": "rm -rf dist && tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-		"typecheck": "tsc --noEmit",
-		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"testunit": "jest",
-		"test": "jest",
-		"storybook": "start-storybook -p 6006",
-		"build-storybook": "build-storybook"
-	},
-	"main": "./dist/index.js",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
 	"peerDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "*",
@@ -71,13 +79,6 @@
 		"katex": "*",
 		"react": "*"
 	},
-	"dependencies": {
-		"@types/dompurify": "^3.0.5",
-		"date-fns": "^3.3.1",
-		"dompurify": "^3.1.6",
-		"highlight.js": "^11.5.1",
-		"react-error-boundary": "^3.1.4"
-	},
 	"volta": {
 		"extends": "../../package.json"
 	}
diff --git a/packages/gazzodown/src/elements/LinkSpan.tsx b/packages/gazzodown/src/elements/LinkSpan.tsx
index 5472c12e6d63..6ac649768db6 100644
--- a/packages/gazzodown/src/elements/LinkSpan.tsx
+++ b/packages/gazzodown/src/elements/LinkSpan.tsx
@@ -1,7 +1,7 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { getBaseURI, isExternal } from '@rocket.chat/ui-client';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { ReactElement, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import BoldSpan from './BoldSpan';
 import ItalicSpan from './ItalicSpan';
@@ -14,7 +14,7 @@ type LinkSpanProps = {
 };
 
 const LinkSpan = ({ href, label }: LinkSpanProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const children = useMemo(() => {
 		const labelArray = Array.isArray(label) ? label : [label];
 
diff --git a/packages/gazzodown/src/elements/PlainSpan.tsx b/packages/gazzodown/src/elements/PlainSpan.tsx
index 582490207717..06460c348652 100644
--- a/packages/gazzodown/src/elements/PlainSpan.tsx
+++ b/packages/gazzodown/src/elements/PlainSpan.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { Fragment, memo, ReactElement, useContext, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -8,7 +8,7 @@ type PlainSpanProps = {
 };
 
 const PlainSpan = ({ text }: PlainSpanProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { highlightRegex, markRegex } = useContext(MarkupInteractionContext);
 
 	const content = useMemo(() => {
diff --git a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
index 6b8e8518a422..54f22ccca7d8 100644
--- a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
+++ b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
@@ -1,6 +1,6 @@
 import { Message } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo, ReactElement, useContext, useMemo, KeyboardEvent } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -11,7 +11,7 @@ type ChannelMentionElementProps = {
 const handleChannelMention = (mention: string, withSymbol: boolean | undefined): string => (withSymbol ? `#${mention}` : mention);
 
 const ChannelMentionElement = ({ mention }: ChannelMentionElementProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { resolveChannelMention, onChannelMentionClick, showMentionSymbol } = useContext(MarkupInteractionContext);
 
 	const resolved = useMemo(() => resolveChannelMention?.(mention), [mention, resolveChannelMention]);
diff --git a/packages/gazzodown/src/mentions/UserMentionElement.tsx b/packages/gazzodown/src/mentions/UserMentionElement.tsx
index a9ba5567541f..6f52a16a5482 100644
--- a/packages/gazzodown/src/mentions/UserMentionElement.tsx
+++ b/packages/gazzodown/src/mentions/UserMentionElement.tsx
@@ -1,6 +1,6 @@
 import { Message } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo, ReactElement, useContext, useMemo, KeyboardEvent } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -12,7 +12,7 @@ const handleUserMention = (mention: string | undefined, withSymbol: boolean | un
 	withSymbol ? `@${mention}` : mention;
 
 const UserMentionElement = ({ mention }: UserMentionElementProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { resolveUserMention, onUserMentionClick, ownUserId, useRealName, showMentionSymbol, triggerProps } =
 		useContext(MarkupInteractionContext);
 
diff --git a/packages/i18n/jest.config.ts b/packages/i18n/jest.config.ts
index eb3d5fd797e5..652cb006f406 100644
--- a/packages/i18n/jest.config.ts
+++ b/packages/i18n/jest.config.ts
@@ -4,6 +4,6 @@ import type { Config } from 'jest';
 export default {
 	preset: server.preset,
 	testMatch: ['<rootDir>/src/**/*.spec.(ts|js|mjs)'],
-	transformIgnorePatterns: ['<rootDir>/node_modules/@babel', '<rootDir>/node_modules/@jest', 'signal-exit'],
+	transformIgnorePatterns: ['<rootDir>/node_modules/@babel', '<rootDir>/node_modules/@jest', 'signal-exit', 'is-typedarray'],
 	collectCoverage: false,
 } satisfies Config;
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 958a1b2cca90..7c66e102d578 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -2,13 +2,13 @@
 	"name": "@rocket.chat/i18n",
 	"version": "0.7.0",
 	"private": true,
-	"devDependencies": {
-		"@rocket.chat/jest-presets": "workspace:~",
-		"eslint": "~8.45.0",
-		"jest": "~29.7.0",
-		"tsup": "^6.7.0",
-		"typescript": "~5.5.4"
-	},
+	"type": "module",
+	"main": "./dist/index.js",
+	"module": "./dist/index.mjs",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
 	"scripts": {
 		"build": "node ./src/index.mjs",
 		"lint": "eslint --ext .mjs,.js,.jsx,.ts,.tsx .",
@@ -16,13 +16,16 @@
 		"test": "jest",
 		"testunit": "jest"
 	},
-	"main": "./dist/index.js",
-	"module": "./dist/index.mjs",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
-	"type": "module",
+	"devDependencies": {
+		"@rocket.chat/jest-presets": "workspace:~",
+		"eslint": "~8.45.0",
+		"i18next": "~23.14.0",
+		"jest": "~29.7.0",
+		"typescript": "~5.5.4"
+	},
+	"peerDependencies": {
+		"i18next": "*"
+	},
 	"volta": {
 		"extends": "../../package.json"
 	}
diff --git a/packages/i18n/src/index.mjs b/packages/i18n/src/index.mjs
index c952cac7de07..f39d4df9860d 100644
--- a/packages/i18n/src/index.mjs
+++ b/packages/i18n/src/index.mjs
@@ -84,7 +84,9 @@ const cjs = `module.exports = {
 
 const keys = Object.keys(JSON.parse(fs.readFileSync(`./src/locales/en.i18n.json`, 'utf8')));
 
-const tds = `export interface RocketchatI18n {
+const tds = `import 'i18next';
+
+export interface RocketchatI18n {
 	${keys.map((key) => `${JSON.stringify(key)}: string;`).join('\n\t')}
 }
 
@@ -94,6 +96,16 @@ const dict: {
 
 export type RocketchatI18nKeys = keyof RocketchatI18n;
 
+declare module 'i18next' {
+	interface TFunction {
+		<TKey extends keyof RocketchatI18n>(key: TKey, options?: TOptions): string;
+		<TKey extends \`\${string}_\$\{'one' | 'other' | 'zero' | 'few' | 'many' | 'two' | 'three' | 'four'}\`>(
+			key: TKey,
+			options?: TOptions,
+		): string;
+	}
+}
+
 export = dict;
 `;
 
diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json
index 5fb2e26389a0..078d19289d34 100644
--- a/packages/jest-presets/package.json
+++ b/packages/jest-presets/package.json
@@ -13,7 +13,7 @@
 		"/server"
 	],
 	"dependencies": {
-		"@swc/core": "~1.7.4",
+		"@swc/core": "~1.7.23",
 		"@swc/jest": "~0.2.36",
 		"@testing-library/jest-dom": "~6.4.8",
 		"@types/jest-axe": "~3.5.9",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 7223a7913ca5..5887c40028c4 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -106,7 +106,7 @@
 		"date-fns": "^2.15.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
-		"i18next": "~23.4.9",
+		"i18next": "~23.14.0",
 		"markdown-it": "^11.0.1",
 		"mem": "^6.1.1",
 		"mitt": "^2.1.0",
@@ -115,7 +115,7 @@
 		"preact-router": "^3.2.1",
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~13.2.2",
+		"react-i18next": "~15.0.1",
 		"storybook-dark-mode": "~3.0.1",
 		"whatwg-fetch": "^3.6.19"
 	},
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 7b279b565ab8..fa8c98cfbc5c 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -5,8 +5,8 @@
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/i18n": "workspace:~",
-		"i18next": "~23.4.9",
-		"react-i18next": "~13.2.2",
+		"i18next": "~23.14.0",
+		"react-i18next": "~15.0.1",
 		"use-sync-external-store": "~1.2.2"
 	},
 	"devDependencies": {
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 0e969e173ca1..a2b916b68241 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -2,6 +2,21 @@
 	"name": "@rocket.chat/ui-client",
 	"version": "10.0.0",
 	"private": true,
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"scripts": {
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"storybook": "start-storybook -p 6006",
+		"test": "jest",
+		"testunit": "jest",
+		"typecheck": "tsc --noEmit"
+	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
@@ -37,23 +52,9 @@
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
+		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
 	},
-	"scripts": {
-		"build": "rm -rf dist && tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-		"typecheck": "tsc --noEmit",
-		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"test": "jest",
-		"testunit": "jest",
-		"storybook": "start-storybook -p 6006"
-	},
-	"main": "./dist/index.js",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
 	"peerDependencies": {
 		"@react-aria/toolbar": "*",
 		"@rocket.chat/css-in-js": "*",
@@ -61,7 +62,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/ui-contexts": "*",
-		"react": "~17.0.2"
+		"react": "*",
+		"react-i18next": "*"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/ui-client/src/components/CustomFieldsForm.tsx b/packages/ui-client/src/components/CustomFieldsForm.tsx
index 3a9c66014e4d..dc464fcd23c2 100644
--- a/packages/ui-client/src/components/CustomFieldsForm.tsx
+++ b/packages/ui-client/src/components/CustomFieldsForm.tsx
@@ -3,10 +3,10 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, Select, TextInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useMemo } from 'react';
 import type { Control, FieldValues, FieldError as RHFFieldError } from 'react-hook-form';
 import { Controller, useFormState, get } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type CustomFieldFormProps<T extends FieldValues> = {
 	metadata: CustomFieldMetadata[];
@@ -34,7 +34,7 @@ const CustomField = <T extends FieldValues>({
 	options = [],
 	...props
 }: CustomFieldProps<T>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { errors } = useFormState({ control });
 	const fieldId = useUniqueId();
 
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
index bdd7f5fbda18..a67baa11e700 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
@@ -1,3 +1,4 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -30,7 +31,7 @@ const sections = [regular, danger];
 
 describe('Room Actions Menu', () => {
 	it('should render kebab menu with the list content', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
 
 		await userEvent.click(screen.getByRole('button'));
 
@@ -39,7 +40,7 @@ describe('Room Actions Menu', () => {
 	});
 
 	it('should have two different sections, regular and danger', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
 
 		await userEvent.click(screen.getByRole('button'));
 
@@ -48,7 +49,7 @@ describe('Room Actions Menu', () => {
 	});
 
 	it('should call the action when item clicked', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
 
 		await userEvent.click(screen.getByRole('button'));
 		await userEvent.click(screen.getAllByRole('menuitem')[0]);
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index 3f65df59a6ca..ddd9efe142ce 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -1,6 +1,6 @@
 import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { GenericMenuItemProps } from './GenericMenuItem';
 import GenericMenuItem from './GenericMenuItem';
@@ -30,7 +30,7 @@ type GenericMenuConditionalProps =
 type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof MenuV2>, 'children'>;
 
 const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, ...props }: GenericMenuProps) => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const sections = 'sections' in props && props.sections;
 	const items = 'items' in props && props.items;
@@ -55,14 +55,14 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 			{sections && (
 				<MenuV2
 					icon={icon}
-					title={t.has(title) ? t(title) : title}
+					title={i18n.exists(title) ? t(title) : title}
 					onAction={onAction || handleAction}
 					{...(disabledKeys && { disabledKeys })}
 					{...props}
 				>
 					{sections.map(({ title, items }, key) => (
 						<MenuSection
-							title={typeof title === 'string' && t.has(title) ? t(title) : title}
+							title={typeof title === 'string' && i18n.exists(title) ? t(title) : title}
 							items={handleItems(items)}
 							key={`${title}-${key}`}
 						>
@@ -78,7 +78,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 			{items && (
 				<MenuV2
 					icon={icon}
-					title={t.has(title) ? t(title) : title}
+					title={i18n.exists(title) ? t(title) : title}
 					onAction={onAction || handleAction}
 					{...(disabledKeys && { disabledKeys })}
 					{...props}
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
index acd1e1eb8d6b..e28c0a7ad452 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { forwardRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type MultiSelectCustomAnchorProps = {
 	collapsed: boolean;
@@ -17,7 +17,7 @@ const MultiSelectCustomAnchor = forwardRef<HTMLElement, MultiSelectCustomAnchorP
 	{ className, collapsed, selectedOptionsCount, selectedOptionsTitle, defaultTitle, maxCount, ...props },
 	ref,
 ) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const customStyle = css`
 		&:hover {
 			cursor: pointer;
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index d73d9ce6b88b..fb8c68d49f46 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -1,8 +1,8 @@
 import { Box, CheckBox, Icon, Option, SearchInput, Tile } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import { Fragment, useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { type OptionProp } from './MultiSelectCustom';
 import { useFilteredOptions } from './useFilteredOptions';
@@ -16,7 +16,7 @@ const MultiSelectCustomList = ({
 	onSelected: (item: OptionProp, e?: FormEvent<HTMLElement>) => void;
 	searchBarText?: string;
 }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [text, setText] = useState('');
 
diff --git a/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx b/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
index 341c26179198..9b65b9ad37a6 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
@@ -1,10 +1,10 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import type { OptionProp } from './MultiSelectCustom';
 
 export const useFilteredOptions = (optionSearch: string | undefined, options: OptionProp[]) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (!optionSearch) return options;
 
diff --git a/packages/ui-client/src/components/UserStatus/UserStatus.tsx b/packages/ui-client/src/components/UserStatus/UserStatus.tsx
index 92513498247b..35db49297724 100644
--- a/packages/ui-client/src/components/UserStatus/UserStatus.tsx
+++ b/packages/ui-client/src/components/UserStatus/UserStatus.tsx
@@ -1,14 +1,14 @@
 import { StatusBullet } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export type UserStatusProps = {
 	small?: boolean;
 } & ComponentProps<typeof StatusBullet>;
 
 function UserStatus({ small, status, ...props }: UserStatusProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const size = small ? 'small' : 'large';
 
 	switch (status) {
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 2023641c15ab..71e015bb82c0 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -9,11 +9,11 @@
 		"/dist"
 	],
 	"scripts": {
+		"build": "tsc -p tsconfig.build.json",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"storybook": "start-storybook -p 6006 --no-version-updates",
-		"build": "tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput"
+		"storybook": "start-storybook -p 6006 --no-version-updates"
 	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,7 +40,7 @@
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~13.2.2",
+		"react-i18next": "~15.0.1",
 		"storybook-dark-mode": "~3.0.1",
 		"typescript": "~5.5.4"
 	},
diff --git a/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx b/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
index 60cfef030dc3..d1fa2df3d4b3 100644
--- a/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
+++ b/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
@@ -1,10 +1,10 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import VerticalTemplate from './template/VerticalTemplate';
 
 const SecretRegisterInvalidForm = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<VerticalTemplate>
diff --git a/yarn.lock b/yarn.lock
index 65ebae84019b..cd440c92c40f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2937,7 +2937,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.24.4
   resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
@@ -2946,6 +2946,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.24.8":
+  version: 7.25.6
+  resolution: "@babel/runtime@npm:7.25.6"
+  dependencies:
+    regenerator-runtime: ^0.14.0
+  checksum: ee1a69d3ac7802803f5ee6a96e652b78b8addc28c6a38c725a4ad7d61a059d9e6cb9f6550ed2f63cce67a1bd82e0b1ef66a1079d895be6bfb536a5cfbd9ccc32
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:~7.22.15":
   version: 7.22.15
   resolution: "@babel/runtime@npm:7.22.15"
@@ -8913,14 +8922,14 @@ __metadata:
     babel-loader: ~8.2.5
     cross-env: ^7.0.3
     eslint: ~8.45.0
-    i18next: ^23.10.1
+    i18next: ~23.14.0
     jest: ~29.7.0
     normalize.css: ^8.0.1
     npm-run-all: ^4.1.5
     prettier: ~2.8.8
     react-docgen-typescript-plugin: ~1.0.5
     react-dom: ^17.0.2
-    react-i18next: ^14.1.0
+    react-i18next: ~15.0.1
     rimraf: ^3.0.2
     storybook-dark-mode: ~3.0.1
     tslib: ^2.5.3
@@ -8992,6 +9001,7 @@ __metadata:
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
     "@testing-library/react": ~16.0.0
+    "@types/dompurify": ^3.0.5
     "@types/jest": ~29.5.12
     "@types/katex": ~0.16.5
     "@types/react": ~17.0.69
@@ -9000,6 +9010,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     babel-loader: ^8.3.0
     date-fns: ^3.3.1
+    dompurify: ^3.1.6
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
@@ -9013,6 +9024,7 @@ __metadata:
     react-docgen-typescript-plugin: ~1.0.5
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
+    react-i18next: ~15.0.1
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -9034,9 +9046,11 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     eslint: ~8.45.0
+    i18next: ~23.14.0
     jest: ~29.7.0
-    tsup: ^6.7.0
     typescript: ~5.5.4
+  peerDependencies:
+    i18next: "*"
   languageName: unknown
   linkType: soft
 
@@ -9065,7 +9079,7 @@ __metadata:
   resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets"
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
-    "@swc/core": ~1.7.4
+    "@swc/core": ~1.7.23
     "@swc/jest": ~0.2.36
     "@testing-library/jest-dom": ~6.4.8
     "@types/identity-obj-proxy": ^3
@@ -9177,7 +9191,7 @@ __metadata:
     history: ~5.3.0
     html-webpack-plugin: ^5.5.3
     husky: ^4.3.8
-    i18next: ~23.4.9
+    i18next: ~23.14.0
     if-env: ^1.0.4
     image-webpack-loader: ~8.1.0
     lorem-ipsum: ^2.0.8
@@ -9200,7 +9214,7 @@ __metadata:
     query-string: ^7.1.3
     react-dom: ~17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~13.2.2
+    react-i18next: ~15.0.1
     rimraf: ^3.0.2
     sass: ~1.62.1
     sass-loader: ~10.4.1
@@ -9558,7 +9572,7 @@ __metadata:
     hljs9: "npm:highlight.js@^9.18.5"
     http-proxy-agent: ^5.0.0
     human-interval: ^2.0.1
-    i18next: ~23.4.9
+    i18next: ~23.14.0
     i18next-http-backend: ^1.4.5
     i18next-sprintf-postprocessor: ^0.2.2
     iconv-lite: ^0.6.3
@@ -9635,7 +9649,7 @@ __metadata:
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
     react-hook-form: ~7.45.4
-    react-i18next: ~13.2.2
+    react-i18next: ~15.0.1
     react-keyed-flatten-children: ^1.3.0
     react-virtuoso: ^4.7.1
     redis: ^4.0.6
@@ -9696,9 +9710,9 @@ __metadata:
     "@tanstack/react-query": ^4.16.1
     "@types/use-sync-external-store": ^0.0.5
     eslint: ~8.45.0
-    i18next: ~23.4.9
+    i18next: ~23.14.0
     react: ~17.0.2
-    react-i18next: ~13.2.2
+    react-i18next: ~15.0.1
     typescript: ~5.5.4
     use-sync-external-store: ~1.2.2
   peerDependencies:
@@ -10271,6 +10285,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-hook-form: ~7.45.4
+    react-i18next: ~15.0.1
     typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -10279,7 +10294,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/ui-contexts": "*"
-    react: ~17.0.2
+    react: "*"
+    react-i18next: "*"
   languageName: unknown
   linkType: soft
 
@@ -10530,7 +10546,7 @@ __metadata:
     eslint: ~8.45.0
     react: ~17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~13.2.2
+    react-i18next: ~15.0.1
     storybook-dark-mode: ~3.0.1
     typescript: ~5.5.4
   peerDependencies:
@@ -12402,90 +12418,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-darwin-arm64@npm:1.7.4"
+"@swc/core-darwin-arm64@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-darwin-arm64@npm:1.7.23"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-darwin-x64@npm:1.7.4"
+"@swc/core-darwin-x64@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-darwin-x64@npm:1.7.23"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.4"
+"@swc/core-linux-arm-gnueabihf@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.23"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.4"
+"@swc/core-linux-arm64-gnu@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.23"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.4"
+"@swc/core-linux-arm64-musl@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-linux-arm64-musl@npm:1.7.23"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.4"
+"@swc/core-linux-x64-gnu@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-linux-x64-gnu@npm:1.7.23"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.4"
+"@swc/core-linux-x64-musl@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-linux-x64-musl@npm:1.7.23"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.4"
+"@swc/core-win32-arm64-msvc@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.23"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.4"
+"@swc/core-win32-ia32-msvc@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.23"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.4"
+"@swc/core-win32-x64-msvc@npm:1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core-win32-x64-msvc@npm:1.7.23"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:~1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core@npm:1.7.4"
-  dependencies:
-    "@swc/core-darwin-arm64": 1.7.4
-    "@swc/core-darwin-x64": 1.7.4
-    "@swc/core-linux-arm-gnueabihf": 1.7.4
-    "@swc/core-linux-arm64-gnu": 1.7.4
-    "@swc/core-linux-arm64-musl": 1.7.4
-    "@swc/core-linux-x64-gnu": 1.7.4
-    "@swc/core-linux-x64-musl": 1.7.4
-    "@swc/core-win32-arm64-msvc": 1.7.4
-    "@swc/core-win32-ia32-msvc": 1.7.4
-    "@swc/core-win32-x64-msvc": 1.7.4
+"@swc/core@npm:~1.7.23":
+  version: 1.7.23
+  resolution: "@swc/core@npm:1.7.23"
+  dependencies:
+    "@swc/core-darwin-arm64": 1.7.23
+    "@swc/core-darwin-x64": 1.7.23
+    "@swc/core-linux-arm-gnueabihf": 1.7.23
+    "@swc/core-linux-arm64-gnu": 1.7.23
+    "@swc/core-linux-arm64-musl": 1.7.23
+    "@swc/core-linux-x64-gnu": 1.7.23
+    "@swc/core-linux-x64-musl": 1.7.23
+    "@swc/core-win32-arm64-msvc": 1.7.23
+    "@swc/core-win32-ia32-msvc": 1.7.23
+    "@swc/core-win32-x64-msvc": 1.7.23
     "@swc/counter": ^0.1.3
     "@swc/types": ^0.1.12
   peerDependencies:
@@ -12514,7 +12530,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: 1b2231fcb6a2a63171e34e80f0d43cd459d259b0a2fa269a129456291dc11b95a716aed60f61e5fcafd039a217916ece375876b02d125d88cdc7927382805e55
+  checksum: a21e9a67d305ad9b49b6def9f9698b374db6c15b2ded5e5cf29390221181fc6b91bfa317b53fd41d9cca989d85b79bbbca5ab27635df1e0232cad4681f618fa5
   languageName: node
   linkType: hard
 
@@ -13382,6 +13398,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/dompurify@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@types/dompurify@npm:3.0.5"
+  dependencies:
+    "@types/trusted-types": "*"
+  checksum: ffc34eca6a4536e1c8c16a47cce2623c5a118a9785492e71230052d92933ff096d14326ff449031e8dfaac509413222372d8f2b28786a13159de6241df716185
+  languageName: node
+  linkType: hard
+
 "@types/ejson@npm:^2.2.1":
   version: 2.2.1
   resolution: "@types/ejson@npm:2.2.1"
@@ -15952,13 +15977,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"any-promise@npm:^1.0.0":
-  version: 1.3.0
-  resolution: "any-promise@npm:1.3.0"
-  checksum: 0ee8a9bdbe882c90464d75d1f55cf027f5458650c4bd1f0467e65aec38ccccda07ca5844969ee77ed46d04e7dded3eaceb027e8d32f385688523fe305fa7e1de
-  languageName: node
-  linkType: hard
-
 "anymatch@npm:^2.0.0":
   version: 2.0.0
   resolution: "anymatch@npm:2.0.0"
@@ -17861,17 +17879,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bundle-require@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "bundle-require@npm:4.0.1"
-  dependencies:
-    load-tsconfig: ^0.2.3
-  peerDependencies:
-    esbuild: ">=0.17"
-  checksum: 737217e37b72d7bee431b5d839b86ba604430f3ec346f073071de2ce65f0915189d4394ddd4685e0366b2930f38c95742b58c7101b8c53d9a8381d453f0b3b8a
-  languageName: node
-  linkType: hard
-
 "busboy@npm:^1.6.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
@@ -17940,13 +17947,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.7.12":
-  version: 6.7.14
-  resolution: "cac@npm:6.7.14"
-  checksum: 45a2496a9443abbe7f52a49b22fbe51b1905eff46e03fd5e6c98e3f85077be3f8949685a1849b1a9cd2bc3e5567dfebcf64f01ce01847baf918f1b37c839791a
-  languageName: node
-  linkType: hard
-
 "cacache@npm:^12.0.2":
   version: 12.0.4
   resolution: "cacache@npm:12.0.4"
@@ -19112,7 +19112,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^4.0.0, commander@npm:^4.1.1":
+"commander@npm:^4.1.1":
   version: 4.1.1
   resolution: "commander@npm:4.1.1"
   checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977
@@ -21370,6 +21370,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dompurify@npm:^3.1.6":
+  version: 3.1.6
+  resolution: "dompurify@npm:3.1.6"
+  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
+  languageName: node
+  linkType: hard
+
 "domutils@npm:^1.7.0":
   version: 1.7.0
   resolution: "domutils@npm:1.7.0"
@@ -22090,7 +22097,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.17.5, esbuild@npm:^0.17.6":
+"esbuild@npm:^0.17.5":
   version: 0.17.19
   resolution: "esbuild@npm:0.17.19"
   dependencies:
@@ -24735,20 +24742,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.1.6":
-  version: 7.1.6
-  resolution: "glob@npm:7.1.6"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.0.4
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 351d549dd90553b87c2d3f90ce11aed9e1093c74130440e7ae0592e11bbcd2ce7f0ebb8ba6bfe63aaf9b62166a7f4c80cb84490ae5d78408bb2572bf7d4ee0a6
-  languageName: node
-  linkType: hard
-
 "glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
@@ -24843,7 +24836,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.0, globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.1.0":
+"globby@npm:^11.0.0, globby@npm:^11.0.2, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
@@ -26005,7 +25998,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:>=17.0.11, i18next@npm:^23.10.1":
+"i18next@npm:>=17.0.11":
   version: 23.10.1
   resolution: "i18next@npm:23.10.1"
   dependencies:
@@ -26023,12 +26016,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:~23.4.9":
-  version: 23.4.9
-  resolution: "i18next@npm:23.4.9"
+"i18next@npm:~23.14.0":
+  version: 23.14.0
+  resolution: "i18next@npm:23.14.0"
   dependencies:
-    "@babel/runtime": ^7.22.5
-  checksum: 46ac2415dc817c0e25e1c5e64332249825cd63b5fb9a5d42e3a2329d4ecd098c0f15a243f56b53e03db02e2e9931ca9bb4447370b2436f9ad6556de40ce981cf
+    "@babel/runtime": ^7.23.2
+  checksum: 4239843691181907d0570eabebf53b81499f54733c87b7554432022b0eeb2ff38df21d03dd907bc3baab8432d746e0fd16949507bbf3c7ccf5b2071e474d5f52
   languageName: node
   linkType: hard
 
@@ -28350,7 +28343,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"joycon@npm:^3.0.1, joycon@npm:^3.1.1":
+"joycon@npm:^3.1.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
   checksum: 8003c9c3fc79c5c7602b1c7e9f7a2df2e9916f046b0dbad862aa589be78c15734d11beb9fe846f5e06138df22cb2ad29961b6a986ba81c4920ce2b15a7f11067
@@ -29225,13 +29218,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"load-tsconfig@npm:^0.2.3":
-  version: 0.2.5
-  resolution: "load-tsconfig@npm:0.2.5"
-  checksum: 631740833c4a7157bb7b6eeae6e1afb6a6fac7416b7ba91bd0944d5c5198270af2d68bf8347af3cc2ba821adc4d83ef98f66278bd263bc284c863a09ec441503
-  languageName: node
-  linkType: hard
-
 "load-yaml-file@npm:^0.2.0":
   version: 0.2.0
   resolution: "load-yaml-file@npm:0.2.0"
@@ -29478,13 +29464,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.sortby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.sortby@npm:4.7.0"
-  checksum: db170c9396d29d11fe9a9f25668c4993e0c1331bcb941ddbd48fb76f492e732add7f2a47cfdf8e9d740fa59ac41bbfaf931d268bc72aab3ab49e9f89354d718c
-  languageName: node
-  linkType: hard
-
 "lodash.startcase@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.startcase@npm:4.4.0"
@@ -31148,17 +31127,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mz@npm:^2.7.0":
-  version: 2.7.0
-  resolution: "mz@npm:2.7.0"
-  dependencies:
-    any-promise: ^1.0.0
-    object-assign: ^4.0.1
-    thenify-all: ^1.0.0
-  checksum: 8427de0ece99a07e9faed3c0c6778820d7543e3776f9a84d22cf0ec0a8eb65f6e9aee9c9d353ff9a105ff62d33a9463c6ca638974cc652ee8140cd1e35951c87
-  languageName: node
-  linkType: hard
-
 "nan@npm:^2.12.1, nan@npm:^2.13.2, nan@npm:^2.14.0":
   version: 2.17.0
   resolution: "nan@npm:2.17.0"
@@ -33722,7 +33690,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-load-config@npm:^3.0.1, postcss-load-config@npm:^3.1.4":
+"postcss-load-config@npm:^3.1.4":
   version: 3.1.4
   resolution: "postcss-load-config@npm:3.1.4"
   dependencies:
@@ -35380,11 +35348,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-i18next@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "react-i18next@npm:14.1.0"
+"react-i18next@npm:15.0.1":
+  version: 15.0.1
+  resolution: "react-i18next@npm:15.0.1"
   dependencies:
-    "@babel/runtime": ^7.23.9
+    "@babel/runtime": ^7.24.8
     html-parse-stringify: ^3.0.1
   peerDependencies:
     i18next: ">= 23.2.3"
@@ -35394,15 +35362,15 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 96fbc4b0919b9f0c639f9f3eb35eecac528174aa97e3b1af469cfdbff4b34e40ae8969c26c0b737691a5fa9b56bb13093524cfca79b93cbd58f1319530da31b2
+  checksum: fdff560f1a7988677fbccab2934d5d253515f5b07ea33d9a6dff8852be4df5cd72a41235d412be7016cbc96c0a33c8471e5ff7e02ee1e149654918082ea43827
   languageName: node
   linkType: hard
 
-"react-i18next@npm:~13.2.2":
-  version: 13.2.2
-  resolution: "react-i18next@npm:13.2.2"
+"react-i18next@patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch::locator=rocket.chat%40workspace%3A.":
+  version: 15.0.1
+  resolution: "react-i18next@patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch::version=15.0.1&hash=90570d&locator=rocket.chat%40workspace%3A."
   dependencies:
-    "@babel/runtime": ^7.22.5
+    "@babel/runtime": ^7.24.8
     html-parse-stringify: ^3.0.1
   peerDependencies:
     i18next: ">= 23.2.3"
@@ -35412,7 +35380,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 2b85bfb347af1a00add1c02901025706f7d2037fade4e8aa08159287ddf012e8cf35626eb9f5c578b9d1c24c065c69f2ad4b5a3087fb5cdbea540f8bc18c0f59
+  checksum: 76bda74c294a66e3330edd217dcd453b48f3e76fe4a89c411a8c1d31fdff932f7c314a1aa5f83bd948b233ded958a6c66674e12ccb399dc6f7790f2c325742b2
   languageName: node
   linkType: hard
 
@@ -36760,7 +36728,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"rollup@npm:^3.2.5, rollup@npm:^3.21.0":
+"rollup@npm:^3.21.0":
   version: 3.28.1
   resolution: "rollup@npm:3.28.1"
   dependencies:
@@ -37959,15 +37927,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:0.8.0-beta.0":
-  version: 0.8.0-beta.0
-  resolution: "source-map@npm:0.8.0-beta.0"
-  dependencies:
-    whatwg-url: ^7.0.0
-  checksum: e94169be6461ab0ac0913313ad1719a14c60d402bd22b0ad96f4a6cffd79130d91ab5df0a5336a326b04d2df131c1409f563c9dc0d21a6ca6239a44b6c8dbd92
-  languageName: node
-  linkType: hard
-
 "source-map@npm:^0.5.0, source-map@npm:^0.5.6":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
@@ -38983,24 +38942,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sucrase@npm:^3.20.3":
-  version: 3.34.0
-  resolution: "sucrase@npm:3.34.0"
-  dependencies:
-    "@jridgewell/gen-mapping": ^0.3.2
-    commander: ^4.0.0
-    glob: 7.1.6
-    lines-and-columns: ^1.1.6
-    mz: ^2.7.0
-    pirates: ^4.0.1
-    ts-interface-checker: ^0.1.9
-  bin:
-    sucrase: bin/sucrase
-    sucrase-node: bin/sucrase-node
-  checksum: 61860063bdf6103413698e13247a3074d25843e91170825a9752e4af7668ffadd331b6e99e92fc32ee5b3c484ee134936f926fa9039d5711fafff29d017a2110
-  languageName: node
-  linkType: hard
-
 "superagent@npm:^8.0.0":
   version: 8.0.0
   resolution: "superagent@npm:8.0.0"
@@ -39547,24 +39488,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thenify-all@npm:^1.0.0":
-  version: 1.6.0
-  resolution: "thenify-all@npm:1.6.0"
-  dependencies:
-    thenify: ">= 3.1.0 < 4"
-  checksum: dba7cc8a23a154cdcb6acb7f51d61511c37a6b077ec5ab5da6e8b874272015937788402fd271fdfc5f187f8cb0948e38d0a42dcc89d554d731652ab458f5343e
-  languageName: node
-  linkType: hard
-
-"thenify@npm:>= 3.1.0 < 4":
-  version: 3.3.1
-  resolution: "thenify@npm:3.3.1"
-  dependencies:
-    any-promise: ^1.0.0
-  checksum: 84e1b804bfec49f3531215f17b4a6e50fd4397b5f7c1bccc427b9c656e1ecfb13ea79d899930184f78bc2f57285c54d9a50a590c8868f4f0cef5c1d9f898b05e
-  languageName: node
-  linkType: hard
-
 "thread-stream@npm:^2.0.0":
   version: 2.1.0
   resolution: "thread-stream@npm:2.1.0"
@@ -39854,15 +39777,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "tr46@npm:1.0.1"
-  dependencies:
-    punycode: ^2.1.0
-  checksum: 96d4ed46bc161db75dbf9247a236ea0bfcaf5758baae6749e92afab0bc5a09cb59af21788ede7e55080f2bf02dce3e4a8f2a484cc45164e29f4b5e68f7cbcc1a
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^2.1.0":
   version: 2.1.0
   resolution: "tr46@npm:2.1.0"
@@ -39888,15 +39802,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tree-kill@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "tree-kill@npm:1.2.2"
-  bin:
-    tree-kill: cli.js
-  checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7
-  languageName: node
-  linkType: hard
-
 "trim-newlines@npm:^1.0.0":
   version: 1.0.0
   resolution: "trim-newlines@npm:1.0.0"
@@ -39971,13 +39876,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-interface-checker@npm:^0.1.9":
-  version: 0.1.13
-  resolution: "ts-interface-checker@npm:0.1.13"
-  checksum: 20c29189c2dd6067a8775e07823ddf8d59a33e2ffc47a1bd59a5cb28bb0121a2969a816d5e77eda2ed85b18171aa5d1c4005a6b88ae8499ec7cc49f78571cb5e
-  languageName: node
-  linkType: hard
-
 "ts-jest@npm:~29.1.1":
   version: 29.1.5
   resolution: "ts-jest@npm:29.1.5"
@@ -40141,42 +40039,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsup@npm:^6.7.0":
-  version: 6.7.0
-  resolution: "tsup@npm:6.7.0"
-  dependencies:
-    bundle-require: ^4.0.0
-    cac: ^6.7.12
-    chokidar: ^3.5.1
-    debug: ^4.3.1
-    esbuild: ^0.17.6
-    execa: ^5.0.0
-    globby: ^11.0.3
-    joycon: ^3.0.1
-    postcss-load-config: ^3.0.1
-    resolve-from: ^5.0.0
-    rollup: ^3.2.5
-    source-map: 0.8.0-beta.0
-    sucrase: ^3.20.3
-    tree-kill: ^1.2.2
-  peerDependencies:
-    "@swc/core": ^1
-    postcss: ^8.4.12
-    typescript: ">=4.1.0"
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    postcss:
-      optional: true
-    typescript:
-      optional: true
-  bin:
-    tsup: dist/cli-default.js
-    tsup-node: dist/cli-node.js
-  checksum: 91ff179f0b9828a6880b6decaa8603fd7af0311f46a38d3a93647a2497298750d676810aeff533a335443a01a7b340dbba7c76523bcd7a87d7b05b7677742901
-  languageName: node
-  linkType: hard
-
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
@@ -41830,13 +41692,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "webidl-conversions@npm:4.0.2"
-  checksum: c93d8dfe908a0140a4ae9c0ebc87a33805b416a33ee638a605b551523eec94a9632165e54632f6d57a39c5f948c4bab10e0e066525e9a4b87a79f0d04fbca374
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -42352,17 +42207,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "whatwg-url@npm:7.1.0"
-  dependencies:
-    lodash.sortby: ^4.7.0
-    tr46: ^1.0.1
-    webidl-conversions: ^4.0.2
-  checksum: fecb07c87290b47d2ec2fb6d6ca26daad3c9e211e0e531dd7566e7ff95b5b3525a57d4f32640ad4adf057717e0c215731db842ad761e61d947e81010e05cf5fd
-  languageName: node
-  linkType: hard
-
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"

From 4aeb619227b3330ac3a9bc508deafb52cc154d3f Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 12:35:41 +0000
Subject: [PATCH 078/170] fix: imported fixes (#33268)

Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
---
 .changeset/many-rules-shout.md                |   5 +
 .../server/functions/canDeleteMessage.ts      |  28 +-
 .../app/otr/server/methods/updateOTRAck.ts    |  38 +-
 .../tabs/AppDetails/AppDetails.tsx            |  11 +-
 .../tabs/AppReleases/AppReleasesItem.tsx      |   4 +-
 .../views/marketplace/lib/purifyOptions.ts    |  50 ++
 apps/meteor/server/models/raw/Rooms.ts        |   4 +
 apps/meteor/tests/end-to-end/api/methods.ts   | 454 ++++++++++++++++++
 packages/gazzodown/package.json               |   2 +
 .../gazzodown/src/emoji/EmojiRenderer.tsx     |  11 +-
 packages/gazzodown/src/katex/KatexBlock.tsx   |   1 +
 packages/gazzodown/src/katex/KatexElement.tsx |   1 +
 .../model-typings/src/models/IRoomsModel.ts   |   1 +
 13 files changed, 595 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/many-rules-shout.md
 create mode 100644 apps/meteor/client/views/marketplace/lib/purifyOptions.ts

diff --git a/.changeset/many-rules-shout.md b/.changeset/many-rules-shout.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/many-rules-shout.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
index 7cd953a52bb2..fea37fd1c2a5 100644
--- a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
+++ b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
@@ -1,7 +1,8 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 
 import { getValue } from '../../../settings/server/raw';
+import { canAccessRoomAsync } from './canAccessRoom';
 import { hasPermissionAsync } from './hasPermission';
 
 const elapsedTime = (ts: Date): number => {
@@ -13,6 +14,25 @@ export const canDeleteMessageAsync = async (
 	uid: string,
 	{ u, rid, ts }: { u: Pick<IUser, '_id' | 'username'>; rid: string; ts: Date },
 ): Promise<boolean> => {
+	const room = await Rooms.findOneById<Pick<IRoom, '_id' | 'ro' | 'unmuted' | 't' | 'teamId' | 'prid'>>(rid, {
+		projection: {
+			_id: 1,
+			ro: 1,
+			unmuted: 1,
+			t: 1,
+			teamId: 1,
+			prid: 1,
+		},
+	});
+
+	if (!room) {
+		return false;
+	}
+
+	if (!(await canAccessRoomAsync(room, { _id: uid }))) {
+		return false;
+	}
+
 	const forceDelete = await hasPermissionAsync(uid, 'force-delete-message', rid);
 
 	if (forceDelete) {
@@ -45,12 +65,6 @@ export const canDeleteMessageAsync = async (
 		}
 	}
 
-	const room = await Rooms.findOneById(rid, { projection: { ro: 1, unmuted: 1 } });
-
-	if (!room) {
-		return false;
-	}
-
 	if (room.ro === true && !(await hasPermissionAsync(uid, 'post-readonly', rid))) {
 		// Unless the user was manually unmuted
 		if (u.username && !(room.unmuted || []).includes(u.username)) {
diff --git a/apps/meteor/app/otr/server/methods/updateOTRAck.ts b/apps/meteor/app/otr/server/methods/updateOTRAck.ts
index 4fbd182e9d27..64e5e97fa4e5 100644
--- a/apps/meteor/app/otr/server/methods/updateOTRAck.ts
+++ b/apps/meteor/app/otr/server/methods/updateOTRAck.ts
@@ -1,8 +1,12 @@
 import { api } from '@rocket.chat/core-services';
 import type { IOTRMessage } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
+import { Rooms } from '@rocket.chat/models';
+import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { canAccessRoomAsync } from '../../../authorization/server/functions/canAccessRoom';
+
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
@@ -11,10 +15,40 @@ declare module '@rocket.chat/ddp-client' {
 }
 
 Meteor.methods<ServerMethods>({
-	updateOTRAck({ message, ack }) {
-		if (!Meteor.userId()) {
+	async updateOTRAck({ message, ack }) {
+		const uid = Meteor.userId();
+		if (!uid) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'updateOTRAck' });
 		}
+
+		check(ack, String);
+		check(message, {
+			_id: String,
+			rid: String,
+			msg: String,
+			t: String,
+			ts: Date,
+			u: {
+				_id: String,
+				username: String,
+				name: String,
+			},
+		});
+
+		if (message?.t !== 'otr') {
+			throw new Meteor.Error('error-invalid-message', 'Invalid message type', { method: 'updateOTRAck' });
+		}
+
+		const room = await Rooms.findOneByIdAndType(message.rid, 'd', { projection: { t: 1, _id: 1, uids: 1 } });
+
+		if (!room) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'updateOTRAck' });
+		}
+
+		if (!(await canAccessRoomAsync(room, { _id: uid })) || (room.uids && (!message.u._id || !room.uids.includes(message.u._id)))) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user, not in room', { method: 'updateOTRAck' });
+		}
+
 		const acknowledgeMessage: IOTRMessage = { ...message, otrAck: ack };
 		void api.broadcast('otrAckUpdate', { roomId: message.rid, acknowledgeMessage });
 	},
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 8d17f669db83..5f3e427b8391 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -2,10 +2,12 @@ import { Box, Callout, Chip, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import DOMPurify from 'dompurify';
 import React from 'react';
 
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
 import type { AppInfo } from '../../../definitions/AppInfo';
+import { purifyOptions } from '../../../lib/purifyOptions';
 import AppDetailsAPIs from './AppDetailsAPIs';
 import { normalizeUrl } from './normalizeUrl';
 
@@ -61,7 +63,14 @@ const AppDetails = ({ app }: AppDetailsProps) => {
 						<Box fontScale='h4' mbe={8} color='titles-labels'>
 							{t('Description')}
 						</Box>
-						<Box dangerouslySetInnerHTML={{ __html: isMarkdown ? detailedDescription.rendered : description }} withRichContent />
+						<Box
+							dangerouslySetInnerHTML={{
+								__html: isMarkdown
+									? DOMPurify.sanitize(detailedDescription.rendered, purifyOptions)
+									: DOMPurify.sanitize(description, purifyOptions),
+							}}
+							withRichContent
+						/>
 					</Box>
 
 					<Box is='section'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
index bc27053ea1d2..974b6d148e61 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
@@ -1,9 +1,11 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
 
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
+import { purifyOptions } from '../../../lib/purifyOptions';
 
 type IRelease = {
 	version: string;
@@ -36,7 +38,7 @@ const AppReleasesItem = ({ release, ...props }: ReleaseItemProps): ReactElement
 	return (
 		<Accordion.Item title={title} {...props}>
 			{release.detailedChangelog?.rendered ? (
-				<Box dangerouslySetInnerHTML={{ __html: release.detailedChangelog?.rendered }} color='default' />
+				<Box dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(release.detailedChangelog?.rendered, purifyOptions) }} color='default' />
 			) : (
 				<Box color='default'>{t('No_release_information_provided')}</Box>
 			)}
diff --git a/apps/meteor/client/views/marketplace/lib/purifyOptions.ts b/apps/meteor/client/views/marketplace/lib/purifyOptions.ts
new file mode 100644
index 000000000000..cef1a2c8c707
--- /dev/null
+++ b/apps/meteor/client/views/marketplace/lib/purifyOptions.ts
@@ -0,0 +1,50 @@
+export const purifyOptions = {
+	ALLOWED_TAGS: [
+		'b',
+		'i',
+		'em',
+		'strong',
+		'br',
+		'p',
+		'ul',
+		'ol',
+		'li',
+		'article',
+		'aside',
+		'figure',
+		'section',
+		'summary',
+		'h1',
+		'h2',
+		'h3',
+		'h4',
+		'h5',
+		'h6',
+		'hgroup',
+		'div',
+		'hr',
+		'span',
+		'wbr',
+		'abbr',
+		'acronym',
+		'cite',
+		'code',
+		'dfn',
+		'figcaption',
+		'mark',
+		's',
+		'samp',
+		'sub',
+		'sup',
+		'var',
+		'time',
+		'q',
+		'del',
+		'ins',
+		'rp',
+		'rt',
+		'ruby',
+		'bdi',
+		'bdo',
+	],
+};
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index 8f0c71623a96..8d2805becb3b 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -912,6 +912,10 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.findOne(query, options);
 	}
 
+	findOneByIdAndType(roomId: IRoom['_id'], type: IRoom['t'], options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
+		return this.findOne({ _id: roomId, t: type }, options);
+	}
+
 	setCallStatus(_id: IRoom['_id'], status: IRoom['callStatus']): Promise<UpdateResult> {
 		const query: Filter<IRoom> = {
 			_id,
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index 197a71f8e8f2..08945994e438 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -2602,6 +2602,158 @@ describe('Meteor.methods', () => {
 				updateSetting('Message_AllowEditing_BlockEditInMinutes', 0),
 			]);
 		});
+
+		describe('message deletion when user is not part of the room', () => {
+			let ridTestRoom: IRoom['_id'];
+			let messageIdTestRoom: IMessage['_id'];
+			let testUser: TestUser<IUser>;
+			let testUserCredentials: Credentials;
+
+			before('create room, add new owner, and leave room', async () => {
+				testUser = await createUser();
+				testUserCredentials = await login(testUser.username, password);
+				const channelName = `methods-test-channel-${Date.now()}`;
+
+				await request
+					.post(api('groups.create'))
+					.set(testUserCredentials)
+					.send({
+						name: channelName,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('group._id');
+						expect(res.body).to.have.nested.property('group.name', channelName);
+						expect(res.body).to.have.nested.property('group.t', 'p');
+						expect(res.body).to.have.nested.property('group.msgs', 0);
+						ridTestRoom = res.body.group._id;
+					});
+
+				await request
+					.post(methodCall('sendMessage'))
+					.set(testUserCredentials)
+					.send({
+						message: JSON.stringify({
+							method: 'sendMessage',
+							params: [
+								{
+									_id: `${Date.now() + Math.random()}`,
+									rid: ridTestRoom,
+									msg: 'just a random test message',
+								},
+							],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+						const data = JSON.parse(res.body.message);
+						expect(data).to.have.a.property('result').that.is.an('object');
+						messageIdTestRoom = data.result._id;
+					});
+
+				await request
+					.post(methodCall('addUsersToRoom'))
+					.set(testUserCredentials)
+					.send({
+						message: JSON.stringify({
+							method: 'addUsersToRoom',
+							params: [
+								{
+									rid: ridTestRoom,
+									users: ['rocket.cat'],
+								},
+							],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+					});
+
+				await request
+					.post(api('groups.addOwner'))
+					.set(testUserCredentials)
+					.send({
+						roomId: ridTestRoom,
+						userId: 'rocket.cat',
+					})
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+					});
+
+				await request
+					.post(api('groups.leave'))
+					.set(testUserCredentials)
+					.send({
+						roomId: ridTestRoom,
+					})
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+					});
+			});
+
+			it('should not delete a message if the user is no longer member of the room', async () => {
+				await request
+					.post(methodCall('deleteMessage'))
+					.set(testUserCredentials)
+					.send({
+						message: JSON.stringify({
+							method: 'deleteMessage',
+							params: [{ _id: messageIdTestRoom, rid: ridTestRoom }],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+						const data = JSON.parse(res.body.message);
+						expect(data).to.have.a.property('msg', 'result');
+						expect(data).to.have.a.property('id', 'id');
+						expect(data.error).to.have.a.property('error', 'error-action-not-allowed');
+					});
+			});
+
+			it('should not delete a message if the user was never part of the room', async () => {
+				await request
+					.post(methodCall('deleteMessage'))
+					.set(credentials)
+					.send({
+						message: JSON.stringify({
+							method: 'deleteMessage',
+							params: [{ _id: messageIdTestRoom, rid: ridTestRoom }],
+							id: 'id',
+							msg: 'method',
+						}),
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', true);
+						expect(res.body).to.have.a.property('message').that.is.a('string');
+						const data = JSON.parse(res.body.message);
+						expect(data).to.have.a.property('msg', 'result');
+						expect(data).to.have.a.property('id', 'id');
+						expect(data.error).to.have.a.property('error', 'error-action-not-allowed');
+					});
+			});
+
+			after(() => Promise.all([deleteRoom({ type: 'p', roomId: ridTestRoom }), deleteUser(testUser)]));
+		});
 	});
 
 	describe('[@setUserActiveStatus]', () => {
@@ -3348,6 +3500,7 @@ describe('Meteor.methods', () => {
 				.end(done);
 		});
 	});
+
 	(IS_EE ? describe : describe.skip)('[@auditGetAuditions] EE', () => {
 		let testUser: TestUser<IUser>;
 		let testUserCredentials: Credentials;
@@ -3451,4 +3604,305 @@ describe('Meteor.methods', () => {
 				});
 		});
 	});
+
+	describe('UpdateOTRAck', () => {
+		let testUser: TestUser<IUser>;
+		let testUser2: TestUser<IUser>;
+		let testUserCredentials: Credentials;
+		let dmTestId: IRoom['_id'];
+
+		before(async () => {
+			testUser = await createUser();
+			testUser2 = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+		});
+
+		before('create direct conversation between both users', (done) => {
+			void request
+				.post(methodCall('createDirectMessage'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'createDirectMessage',
+						params: [testUser2.username],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.end((_err, res) => {
+					const result = JSON.parse(res.body.message);
+					expect(result.result).to.be.an('object');
+					expect(result.result).to.have.property('rid').that.is.an('string');
+
+					dmTestId = result.result.rid;
+					done();
+				});
+		});
+
+		after(() => Promise.all([deleteRoom({ type: 'd', roomId: dmTestId }), deleteUser(testUser), deleteUser(testUser2)]));
+
+		it('should fail if required parameters are not present', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									// rid: 'test',
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', "Match error: Missing key 'rid'");
+				});
+		});
+
+		it('should fail if required parameters have a different type', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: { $ne: 'test' },
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Match error: Expected string, got object in field rid');
+				});
+		});
+
+		it('should fail if "t" is not "otr"', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: 'test',
+									msg: 'test',
+									t: 'notOTR',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid message type [error-invalid-message]');
+				});
+		});
+
+		it('should fail if room does not exist', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: 'test',
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid room [error-invalid-room]');
+				});
+		});
+
+		it('should fail if room is not a DM', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: 'GENERAL',
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: 'test',
+										username: 'test',
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid room [error-invalid-room]');
+				});
+		});
+
+		it('should fail if user is not part of DM room', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: dmTestId,
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: testUser._id,
+										username: testUser.username,
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error');
+					expect(data.error).to.have.a.property('message', 'Invalid user, not in room [error-invalid-user]');
+				});
+		});
+
+		it('should pass if all parameters are present and user is part of DM room', async () => {
+			await request
+				.post(methodCall('updateOTRAck'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'updateOTRAck',
+						params: [
+							{
+								message: {
+									_id: 'czjFdkFab7H5bWxYq',
+									rid: dmTestId,
+									msg: 'test',
+									t: 'otr',
+									ts: { $date: 1725447664093 },
+									u: {
+										_id: testUser._id,
+										username: testUser.username,
+										name: 'test',
+									},
+								},
+								ack: 'test',
+							},
+						],
+						id: '18',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('message');
+					expect(res.body).to.have.a.property('success', true);
+				});
+		});
+	});
 });
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 909be2dd192c..ec97461077f1 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -72,7 +72,9 @@
 		"react": "*"
 	},
 	"dependencies": {
+		"@types/dompurify": "^3.0.5",
 		"date-fns": "^3.3.1",
+		"dompurify": "^3.1.6",
 		"highlight.js": "^11.5.1",
 		"react-error-boundary": "^3.1.4"
 	},
diff --git a/packages/gazzodown/src/emoji/EmojiRenderer.tsx b/packages/gazzodown/src/emoji/EmojiRenderer.tsx
index 7a4ca5324930..84116361157c 100644
--- a/packages/gazzodown/src/emoji/EmojiRenderer.tsx
+++ b/packages/gazzodown/src/emoji/EmojiRenderer.tsx
@@ -1,5 +1,6 @@
 import { MessageEmoji, ThreadMessageEmoji } from '@rocket.chat/fuselage';
 import type * as MessageParser from '@rocket.chat/message-parser';
+import DOMPurify from 'dompurify';
 import { ReactElement, useMemo, useContext, memo } from 'react';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
@@ -14,10 +15,12 @@ const EmojiRenderer = ({ big = false, preview = false, ...emoji }: EmojiProps):
 
 	const fallback = useMemo(() => ('unicode' in emoji ? emoji.unicode : `:${emoji.shortCode ?? emoji.value.value}:`), [emoji]);
 
+	const sanitizedFallback = DOMPurify.sanitize(fallback);
+
 	const descriptors = useMemo(() => {
-		const detected = detectEmoji?.(fallback);
+		const detected = detectEmoji?.(sanitizedFallback);
 		return detected?.length !== 0 ? detected : undefined;
-	}, [detectEmoji, fallback]);
+	}, [detectEmoji, sanitizedFallback]);
 
 	return (
 		<>
@@ -34,8 +37,8 @@ const EmojiRenderer = ({ big = false, preview = false, ...emoji }: EmojiProps):
 					)}
 				</span>
 			)) ?? (
-				<span role='img' aria-label={fallback.charAt(0) === ':' ? fallback : undefined}>
-					{fallback}
+				<span role='img' aria-label={sanitizedFallback.charAt(0) === ':' ? sanitizedFallback : undefined}>
+					{sanitizedFallback}
 				</span>
 			)}
 		</>
diff --git a/packages/gazzodown/src/katex/KatexBlock.tsx b/packages/gazzodown/src/katex/KatexBlock.tsx
index 5913185d3969..267b310b3897 100644
--- a/packages/gazzodown/src/katex/KatexBlock.tsx
+++ b/packages/gazzodown/src/katex/KatexBlock.tsx
@@ -15,6 +15,7 @@ const KatexBlock = ({ code }: KatexBlockProps): ReactElement => {
 				macros: {
 					'\\href': '\\@secondoftwo',
 				},
+				maxSize: 100,
 			}),
 		[code],
 	);
diff --git a/packages/gazzodown/src/katex/KatexElement.tsx b/packages/gazzodown/src/katex/KatexElement.tsx
index 3595f698f7ae..099c2f82cf8c 100644
--- a/packages/gazzodown/src/katex/KatexElement.tsx
+++ b/packages/gazzodown/src/katex/KatexElement.tsx
@@ -15,6 +15,7 @@ const KatexElement = ({ code }: KatexElementProps): ReactElement => {
 				macros: {
 					'\\href': '\\@secondoftwo',
 				},
+				maxSize: 100,
 			}),
 		[code],
 	);
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index fab810ccd30c..57a03631c1f0 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -195,6 +195,7 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	setE2eKeyId(roomId: string, e2eKeyId: string, options?: FindOptions<IRoom>): Promise<UpdateResult>;
 	findOneByImportId(importId: string, options?: FindOptions<IRoom>): Promise<IRoom | null>;
 	findOneByNameAndNotId(name: string, rid: string): Promise<IRoom | null>;
+	findOneByIdAndType(roomId: IRoom['_id'], type: IRoom['t'], options?: FindOptions<IRoom>): Promise<IRoom | null>;
 	findOneByDisplayName(displayName: string, options?: FindOptions<IRoom>): Promise<IRoom | null>;
 	findOneByNameAndType(
 		name: string,

From e22ea8f18a26aff15a1280cb6dce99510497b5ff Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 13 Sep 2024 15:15:24 +0000
Subject: [PATCH 079/170] Release 6.12.1

[no ci]
---
 .changeset/bump-patch-1725994766358.md        |  5 ---
 .changeset/four-cherries-kneel.md             |  5 ---
 .changeset/many-rules-shout.md                |  5 ---
 .changeset/pink-swans-teach.md                |  5 ---
 .changeset/short-drinks-itch.md               |  6 ---
 apps/meteor/CHANGELOG.md                      | 41 +++++++++++++++++++
 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 +-
 ee/apps/account-service/CHANGELOG.md          | 13 ++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 +++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 +++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 ++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++
 ee/packages/license/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           | 12 ++++++
 packages/core-services/package.json           |  2 +-
 packages/core-typings/CHANGELOG.md            |  9 ++++
 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/fuselage-ui-kit/CHANGELOG.md         | 13 ++++++
 packages/fuselage-ui-kit/package.json         |  8 ++--
 packages/gazzodown/CHANGELOG.md               | 12 ++++++
 packages/gazzodown/package.json               |  8 ++--
 packages/instance-status/CHANGELOG.md         |  9 ++++
 packages/instance-status/package.json         |  2 +-
 packages/livechat/CHANGELOG.md                | 10 +++++
 packages/livechat/package.json                |  2 +-
 packages/message-parser/CHANGELOG.md          |  6 +++
 packages/message-parser/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/peggy-loader/CHANGELOG.md            |  6 +++
 packages/peggy-loader/package.json            |  2 +-
 packages/rest-typings/CHANGELOG.md            | 10 +++++
 packages/rest-typings/package.json            |  2 +-
 packages/ui-avatar/CHANGELOG.md               |  9 ++++
 packages/ui-avatar/package.json               |  4 +-
 packages/ui-client/CHANGELOG.md               |  9 ++++
 packages/ui-client/package.json               |  4 +-
 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/uikit-playground/CHANGELOG.md        | 11 +++++
 packages/uikit-playground/package.json        |  2 +-
 packages/web-ui-registration/CHANGELOG.md     |  9 ++++
 packages/web-ui-registration/package.json     |  4 +-
 yarn.lock                                     | 18 ++++++++
 76 files changed, 460 insertions(+), 73 deletions(-)
 delete mode 100644 .changeset/bump-patch-1725994766358.md
 delete mode 100644 .changeset/four-cherries-kneel.md
 delete mode 100644 .changeset/many-rules-shout.md
 delete mode 100644 .changeset/pink-swans-teach.md
 delete mode 100644 .changeset/short-drinks-itch.md

diff --git a/.changeset/bump-patch-1725994766358.md b/.changeset/bump-patch-1725994766358.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1725994766358.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/four-cherries-kneel.md b/.changeset/four-cherries-kneel.md
deleted file mode 100644
index 095d5af0aa76..000000000000
--- a/.changeset/four-cherries-kneel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
diff --git a/.changeset/many-rules-shout.md b/.changeset/many-rules-shout.md
deleted file mode 100644
index eacb88108a0f..000000000000
--- a/.changeset/many-rules-shout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/.changeset/pink-swans-teach.md b/.changeset/pink-swans-teach.md
deleted file mode 100644
index 7c85572a78d5..000000000000
--- a/.changeset/pink-swans-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-fixed retention policy max age settings not being respected after upgrade
diff --git a/.changeset/short-drinks-itch.md b/.changeset/short-drinks-itch.md
deleted file mode 100644
index ee57330ffc86..000000000000
--- a/.changeset/short-drinks-itch.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@rocket.chat/message-parser': patch
-'@rocket.chat/peggy-loader': patch
----
-
-Improved the performance of the message parser
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 97a246abaca6..c7029b774cc0 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @rocket.chat/meteor
 
+## 6.12.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33242](https://github.com/RocketChat/Rocket.Chat/pull/33242) by [@dionisio-bot](https://github.com/dionisio-bot)) Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
+
+- ([#33268](https://github.com/RocketChat/Rocket.Chat/pull/33268) by [@dionisio-bot](https://github.com/dionisio-bot)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#33265](https://github.com/RocketChat/Rocket.Chat/pull/33265) by [@dionisio-bot](https://github.com/dionisio-bot)) fixed retention policy max age settings not being respected after upgrade
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/gazzodown@10.0.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/omnichannel-services@0.3.4
+  - @rocket.chat/presence@0.2.7
+  - @rocket.chat/license@0.2.7
+  - @rocket.chat/pdf-worker@0.2.4
+  - @rocket.chat/api-client@0.2.7
+  - @rocket.chat/apps@0.1.7
+  - @rocket.chat/cron@0.1.7
+  - @rocket.chat/fuselage-ui-kit@10.0.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.4
+  - @rocket.chat/ui-theming@0.2.1
+  - @rocket.chat/ui-avatar@6.0.1
+  - @rocket.chat/ui-client@10.0.1
+  - @rocket.chat/ui-video-conf@10.0.1
+  - @rocket.chat/web-ui-registration@10.0.1
+  - @rocket.chat/instance-status@0.1.7
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index dce2b0cfa1e0..7285c1c94e10 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.0"
+	"version": "6.12.1"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 1d6e058d7597..1b9cf6109764 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 1.3.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 1.3.3
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 5535234bfaa1..3d6b7decbf5c 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": "1.3.3",
+	"version": "1.3.4",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index a5924efe23ce..5796920e8650 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": "6.12.0",
+	"version": "6.12.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 8d306d7b1c17..5897afdf4f24 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 226f531264bb..0c2dccb08bc9 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.6",
+	"version": "0.4.7",
 	"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 494c052e8cf8..0d505da757a9 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index e614742754fe..7c4f3d8abafd 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.6",
+	"version": "0.4.7",
 	"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 97565b8bde88..ebd5e0d3ce93 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  - @rocket.chat/instance-status@0.1.7
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 5b620add788a..8af959506d40 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.6",
+	"version": "0.3.7",
 	"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 21fc879f9fd9..885b7746b929 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/omnichannel-services@0.3.4
+  - @rocket.chat/pdf-worker@0.2.4
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 057b8b2911bb..fb995abe4083 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.6",
+	"version": "0.4.7",
 	"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 a1ed37bb6fde..9af1812bbfb6 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/presence@0.2.7
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 94854d45cb40..1069cb43c155 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.6",
+	"version": "0.4.7",
 	"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 16dc2590f38b..ae79b6e2e5d4 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/omnichannel-services@0.3.4
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 01ffc2cb4aa0..574b06ec6dcf 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.6",
+	"version": "0.4.7",
 	"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 ccbb83e7de0b..98e7bcecc2e2 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 5f96b74cab8b..c74b037c256f 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.6",
+	"version": "0.4.7",
 	"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 181b6dfb0e7f..dacd1671ba3e 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 35dfc7f8dc7a..cf95c63a7327 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index f54493a31cd1..946060b52dd9 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.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/pdf-worker@0.2.4
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 2110c254bf06..2678bb9a09da 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.3",
+	"version": "0.3.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 ccc01c92e84f..92f2a8e72554 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.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index cf96d08efc8b..1a47e3c09395 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.3",
+	"version": "0.2.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index a4effccb5f2b..2628fcd41103 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index cce1869e562f..4b6f39759dd5 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 3f40f1d4ac3b..9be25273f5e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.0",
+	"version": "6.12.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 50096d81e901..211a2eba796d 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 1ea3011a0010..3756f8526acf 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.6",
+	"version": "0.2.7",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index adb1b989bad0..ce7fc6c17d43 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 8b26679f7d5c..5a8bd648729e 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index a73f804408ba..093ce016595e 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/core-services
 
+## 0.6.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 4de22804d3d0..09d63653d1cb 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index ac2c861590c0..7c513ef0bdd5 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/core-typings
 
+## 6.12.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 9dddf874ed40..0970df8d81e4 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.0",
+	"version": "6.12.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 9c0c43c6f16e..dd7e8a5734d8 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 015ae8280045..472f88b8a84d 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 29e062a1374d..3844c4431e8e 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/api-client@0.2.7
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 55c2d748bec4..8241a0a5e515 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.6",
+	"version": "0.3.7",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 41cc87932393..6c5e6c9bbdd0 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/gazzodown@10.0.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-avatar@6.0.1
+  - @rocket.chat/ui-video-conf@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index d84b1b595335..0dfb8ea74aa2 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "6.0.0",
-    "@rocket.chat/ui-contexts": "10.0.0",
+    "@rocket.chat/ui-avatar": "6.0.1",
+    "@rocket.chat/ui-contexts": "10.0.1",
     "@rocket.chat/ui-kit": "0.36.1",
-    "@rocket.chat/ui-video-conf": "10.0.0",
+    "@rocket.chat/ui-video-conf": "10.0.1",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 74cd44cc291c..1437387ad146 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/gazzodown
 
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-client@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index ec97461077f1..622bfdc35c36 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0",
+	"version": "10.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -64,10 +64,10 @@
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-tokens": "*",
-		"@rocket.chat/message-parser": "0.31.29",
+		"@rocket.chat/message-parser": "0.31.30",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.0",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-client": "10.0.1",
+		"@rocket.chat/ui-contexts": "10.0.1",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index bebd0fd56b85..71a1ba83c2ca 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 686d4c710b1d..e95b6ef11489 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.6",
+	"version": "0.1.7",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 598fae50d68d..05ad7808e1b2 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/livechat Change Log
 
+## 1.19.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/gazzodown@10.0.1
+  </details>
+
 ## 1.19.3
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 564746ae9923..814913801dc5 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3",
+	"version": "1.19.4",
 	"files": [
 		"/build"
 	],
diff --git a/packages/message-parser/CHANGELOG.md b/packages/message-parser/CHANGELOG.md
index 39c82e350b58..a00ffd3db882 100644
--- a/packages/message-parser/CHANGELOG.md
+++ b/packages/message-parser/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.31.30
+
+### Patch Changes
+
+- ([#33254](https://github.com/RocketChat/Rocket.Chat/pull/33254) by [@dionisio-bot](https://github.com/dionisio-bot)) Improved the performance of the message parser
+
 ## 0.31.29
 
 ### Patch Changes
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index fd7e88dc1d86..c566e6b2c5c7 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/message-parser",
   "description": "Rocket.Chat parser for messages",
-  "version": "0.31.29",
+  "version": "0.31.30",
   "author": {
     "name": "Rocket.Chat",
     "url": "https://rocket.chat/"
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index b743a1132b48..4ae90df8e0c8 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.7.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 4819a451c82f..011fa9339812 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0",
+	"version": "0.7.1",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.3",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 1238c213ec4f..8a3f24035b14 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.2.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index b3060782e983..6ff93a6c8e05 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/peggy-loader/CHANGELOG.md b/packages/peggy-loader/CHANGELOG.md
index 0c1ace99d7d4..8fdec959414f 100644
--- a/packages/peggy-loader/CHANGELOG.md
+++ b/packages/peggy-loader/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.31.26
+
+### Patch Changes
+
+- ([#33254](https://github.com/RocketChat/Rocket.Chat/pull/33254) by [@dionisio-bot](https://github.com/dionisio-bot)) Improved the performance of the message parser
+
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index 5fa014da7f29..fab7c3c8f15a 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/peggy-loader",
-  "version": "0.31.25",
+  "version": "0.31.26",
   "description": "Peggy loader for webpack",
   "keywords": [
     "peggy",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 7cce8dcc6e99..0fde816d5729 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/rest-typings
 
+## 6.12.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 833326e26599..5817b2b515a7 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.0",
+	"version": "6.12.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.12",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index a9fa21cf7195..8c6aa8a5674c 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 6.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  </details>
+
 ## 6.0.0
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 3bed718fbba5..047d59aef489 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-contexts": "10.0.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 1d172fe1054f..f18e81b029f1 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 7ee4ded9bfee..e353242c849a 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0",
+	"version": "10.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -60,7 +60,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-contexts": "10.0.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index aa0f00bc0e83..fe429e751642 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/ddp-client@0.3.7
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 854e12deff93..180a945c020f 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0",
+	"version": "10.0.1",
 	"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 0ebba8028576..46936bc366cf 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-avatar@6.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index ea97ec39ba58..68cc0e679087 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": "10.0.0",
+	"version": "10.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,8 +40,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.0",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-avatar": "6.0.1",
+		"@rocket.chat/ui-contexts": "10.0.1",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md
index 63a8eb47d7c6..2c569add2627 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.4.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-avatar@6.0.1
+  </details>
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index e3a029e181ec..228484c2b3d6 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 601f9aa63494..73164cdb6722 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 7daa6e21e68d..618603e021b5 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": "10.0.0",
+	"version": "10.0.1",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.0",
+		"@rocket.chat/ui-contexts": "10.0.1",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index a4da870cdb2e..430ef4b66e99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8992,6 +8992,7 @@ __metadata:
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
     "@testing-library/react": ~16.0.0
+    "@types/dompurify": ^3.0.5
     "@types/jest": ~29.5.12
     "@types/katex": ~0.16.5
     "@types/react": ~17.0.69
@@ -9000,6 +9001,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     babel-loader: ^8.3.0
     date-fns: ^3.3.1
+    dompurify: ^3.1.6
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
@@ -13375,6 +13377,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/dompurify@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@types/dompurify@npm:3.0.5"
+  dependencies:
+    "@types/trusted-types": "*"
+  checksum: ffc34eca6a4536e1c8c16a47cce2623c5a118a9785492e71230052d92933ff096d14326ff449031e8dfaac509413222372d8f2b28786a13159de6241df716185
+  languageName: node
+  linkType: hard
+
 "@types/ejson@npm:^2.2.1":
   version: 2.2.1
   resolution: "@types/ejson@npm:2.2.1"
@@ -21363,6 +21374,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dompurify@npm:^3.1.6":
+  version: 3.1.6
+  resolution: "dompurify@npm:3.1.6"
+  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
+  languageName: node
+  linkType: hard
+
 "domutils@npm:^1.7.0":
   version: 1.7.0
   resolution: "domutils@npm:1.7.0"

From 399fb732236e01a9e56788349109023c7a5ce5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <43561537+rique223@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:33:15 -0300
Subject: [PATCH 080/170] i18n: Required fields text to "{Field} required"
 format (#33077)

---
 .../CreateDiscussion/CreateDiscussion.tsx     |  4 +-
 .../Omnichannel/modals/CloseChatModal.tsx     | 18 +----
 .../Omnichannel/modals/TranscriptModal.tsx    |  4 +-
 .../additionalForms/BusinessHoursMultiple.tsx |  2 +-
 .../components/cannedResponseForm.tsx         |  6 +-
 .../priorities/PriorityEditForm.tsx           |  4 +-
 .../omnichannel/slaPolicies/SlaEdit.tsx       |  6 +-
 .../client/omnichannel/tags/TagEdit.tsx       |  2 +-
 .../client/omnichannel/units/UnitEdit.tsx     |  8 +-
 .../CreateChannel/CreateChannelModal.tsx      |  2 +-
 .../header/CreateTeam/CreateTeamModal.tsx     |  2 +-
 .../sidebarv2/header/CreateChannelModal.tsx   |  2 +-
 .../sidebarv2/header/CreateTeamModal.tsx      |  2 +-
 .../integrations/AccountIntegrationsPage.tsx  | 30 +++----
 .../account/profile/AccountProfileForm.tsx    | 11 ++-
 .../account/security/AccountSecurityPage.tsx  |  2 +-
 .../views/account/security/ChangePassword.tsx | 16 ++--
 .../views/account/security/EndToEnd.tsx       | 79 +++++++++++++------
 .../admin/customEmoji/AddCustomEmoji.tsx      | 11 +--
 .../admin/customEmoji/EditCustomEmoji.tsx     |  2 +-
 .../admin/customSounds/AddCustomSound.tsx     | 15 ++--
 .../views/admin/customSounds/EditSound.tsx    |  8 +-
 .../customUserStatus/CustomUserStatusForm.tsx | 13 +--
 .../views/admin/emailInbox/EmailInboxForm.tsx | 25 +++---
 .../incoming/IncomingWebhookForm.tsx          |  4 +-
 .../outgoing/OutgoingWebhookForm.tsx          |  6 +-
 .../client/views/admin/mailer/MailerPage.tsx  |  7 +-
 .../views/admin/oauthApps/EditOauthApp.tsx    |  5 +-
 .../views/admin/oauthApps/OAuthAddApp.tsx     |  6 +-
 .../views/admin/permissions/RoleForm.tsx      |  8 +-
 .../UsersInRole/UsersInRolePage.tsx           |  4 +-
 .../client/views/admin/rooms/EditRoom.tsx     |  2 +-
 .../OAuthGroupPage/CreateOAuthModal.tsx       |  2 +-
 .../views/admin/users/AdminUserForm.tsx       | 10 +--
 .../AdminUserSetRandomPasswordContent.tsx     |  4 +-
 .../views/audit/components/AuditForm.tsx      |  2 +-
 .../views/audit/components/tabs/DirectTab.tsx |  2 +-
 .../audit/components/tabs/OmnichannelTab.tsx  |  6 +-
 .../views/audit/components/tabs/RoomsTab.tsx  |  2 +-
 .../views/audit/components/tabs/UsersTab.tsx  |  4 +-
 .../customFields/EditCustomFields.tsx         |  4 +-
 .../departments/EditDepartment.tsx            |  6 +-
 .../contacts/contextualBar/ContactNewEdit.tsx |  2 +-
 .../omnichannel/triggers/EditTrigger.tsx      |  2 +-
 .../actions/ActionExternalServiceUrl.tsx      |  2 +-
 .../actions/ExternalServiceActionForm.tsx     |  2 +-
 .../actions/SendMessageActionForm.tsx         |  2 +-
 .../Info/EditRoomInfo/EditRoomInfo.tsx        |  2 +-
 .../UserInfo/ReportUserModal.tsx              | 18 +++--
 .../FileUploadModal/FileUploadModal.tsx       |  6 +-
 .../room/webdav/AddWebdavAccountModal.tsx     | 21 +++--
 .../views/room/webdav/SaveToWebdavModal.tsx   |  6 +-
 .../root/MainLayout/RegisterUsername.tsx      |  5 +-
 .../omnichannel-contact-center.spec.ts        |  2 +-
 .../omnichannel-departaments.spec.ts          |  4 +-
 .../omnichannel-priorities.spec.ts            |  2 +-
 .../omnichannel-sla-policies.spec.ts          |  4 +-
 packages/i18n/src/locales/af.i18n.json        |  1 -
 packages/i18n/src/locales/ar.i18n.json        |  3 +-
 packages/i18n/src/locales/az.i18n.json        |  3 +-
 packages/i18n/src/locales/be-BY.i18n.json     |  3 +-
 packages/i18n/src/locales/bg.i18n.json        |  3 +-
 packages/i18n/src/locales/bs.i18n.json        |  3 +-
 packages/i18n/src/locales/ca.i18n.json        |  3 +-
 packages/i18n/src/locales/cs.i18n.json        |  3 +-
 packages/i18n/src/locales/cy.i18n.json        |  3 +-
 packages/i18n/src/locales/da.i18n.json        |  3 +-
 packages/i18n/src/locales/de-AT.i18n.json     |  3 +-
 packages/i18n/src/locales/de-IN.i18n.json     |  3 +-
 packages/i18n/src/locales/de.i18n.json        |  3 +-
 packages/i18n/src/locales/el.i18n.json        |  3 +-
 packages/i18n/src/locales/en.i18n.json        |  6 +-
 packages/i18n/src/locales/eo.i18n.json        |  3 +-
 packages/i18n/src/locales/es.i18n.json        |  3 +-
 packages/i18n/src/locales/fa.i18n.json        |  1 -
 packages/i18n/src/locales/fi.i18n.json        |  3 +-
 packages/i18n/src/locales/fr.i18n.json        |  3 +-
 packages/i18n/src/locales/he.i18n.json        |  3 +-
 packages/i18n/src/locales/hi-IN.i18n.json     |  4 +-
 packages/i18n/src/locales/hr.i18n.json        |  1 -
 packages/i18n/src/locales/hu.i18n.json        |  3 +-
 packages/i18n/src/locales/id.i18n.json        |  1 -
 packages/i18n/src/locales/it.i18n.json        |  3 +-
 packages/i18n/src/locales/ja.i18n.json        |  3 +-
 packages/i18n/src/locales/ka-GE.i18n.json     |  1 -
 packages/i18n/src/locales/km.i18n.json        |  3 +-
 packages/i18n/src/locales/ko.i18n.json        |  3 +-
 packages/i18n/src/locales/ku.i18n.json        |  3 +-
 packages/i18n/src/locales/lo.i18n.json        |  3 +-
 packages/i18n/src/locales/lt.i18n.json        |  3 +-
 packages/i18n/src/locales/lv.i18n.json        |  3 +-
 packages/i18n/src/locales/mn.i18n.json        |  3 +-
 packages/i18n/src/locales/ms-MY.i18n.json     |  3 +-
 packages/i18n/src/locales/nl.i18n.json        |  3 +-
 packages/i18n/src/locales/no.i18n.json        |  3 +-
 packages/i18n/src/locales/pl.i18n.json        |  3 +-
 packages/i18n/src/locales/pt-BR.i18n.json     |  3 +-
 packages/i18n/src/locales/pt.i18n.json        |  3 +-
 packages/i18n/src/locales/ro.i18n.json        |  3 +-
 packages/i18n/src/locales/ru.i18n.json        |  3 +-
 packages/i18n/src/locales/sk-SK.i18n.json     |  3 +-
 packages/i18n/src/locales/sl-SI.i18n.json     |  3 +-
 packages/i18n/src/locales/sq.i18n.json        |  3 +-
 packages/i18n/src/locales/sr.i18n.json        |  3 +-
 packages/i18n/src/locales/sv.i18n.json        |  3 +-
 packages/i18n/src/locales/ta-IN.i18n.json     |  1 -
 packages/i18n/src/locales/th-TH.i18n.json     |  3 +-
 packages/i18n/src/locales/tr.i18n.json        |  3 +-
 packages/i18n/src/locales/ug.i18n.json        |  3 +-
 packages/i18n/src/locales/uk.i18n.json        |  3 +-
 packages/i18n/src/locales/vi-VN.i18n.json     |  3 +-
 packages/i18n/src/locales/zh-HK.i18n.json     |  3 +-
 packages/i18n/src/locales/zh-TW.i18n.json     |  3 +-
 packages/i18n/src/locales/zh.i18n.json        |  3 +-
 .../src/components/CustomFieldsForm.tsx       |  2 +-
 .../web-ui-registration/src/LoginForm.tsx     |  4 +-
 .../web-ui-registration/src/RegisterForm.tsx  | 12 +--
 .../src/ResetPasswordForm.tsx                 |  2 +-
 118 files changed, 308 insertions(+), 313 deletions(-)

diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index cd39a187cd89..b1dcb9d8dfbc 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -120,7 +120,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 								<Controller
 									control={control}
 									name='parentRoom'
-									rules={{ required: t('error-the-field-is-required', { field: t('Discussion_target_channel') }) }}
+									rules={{ required: t('Required_field', { field: t('Discussion_target_channel') }) }}
 									render={({ field: { name, onBlur, onChange, value } }) => (
 										<RoomAutoComplete
 											name={name}
@@ -152,7 +152,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 							<Controller
 								name='name'
 								control={control}
-								rules={{ required: t('Field_required') }}
+								rules={{ required: t('Required_field', { field: t('Name') }) }}
 								render={({ field }) => (
 									<TextInput
 										id={discussionNameId}
diff --git a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
index 7c028fb5c876..489eb4a04602 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
@@ -84,11 +84,11 @@ const CloseChatModal = ({
 			const requestData = transcriptEmail && visitorEmail ? { email: visitorEmail, subject } : undefined;
 
 			if (!comment?.trim() && commentRequired) {
-				setError('comment', { type: 'custom', message: t('The_field_is_required', t('Comment')) });
+				setError('comment', { type: 'custom', message: t('Required_field', { field: t('Comment') }) });
 			}
 
 			if (transcriptEmail && !subject) {
-				setError('subject', { type: 'custom', message: t('The_field_is_required', t('Subject')) });
+				setError('subject', { type: 'custom', message: t('Required_field', { field: t('Subject') }) });
 			}
 
 			if (!tags?.length && tagRequired) {
@@ -154,12 +154,7 @@ const CloseChatModal = ({
 							<FieldRow>
 								<TextInput
 									{...register('comment')}
-									error={
-										errors.comment &&
-										t('error-the-field-is-required', {
-											field: t('Comment'),
-										})
-									}
+									error={errors.comment && t('Required_field', { field: t('Comment') })}
 									flexGrow={1}
 									placeholder={t('Please_add_a_comment')}
 								/>
@@ -206,12 +201,7 @@ const CloseChatModal = ({
 														<TextInput
 															{...register('subject', { required: true })}
 															className='active'
-															error={
-																errors.subject &&
-																t('error-the-field-is-required', {
-																	field: t('Subject'),
-																})
-															}
+															error={errors.subject && t('Required_field', { field: t('Subject') })}
 															flexGrow={1}
 														/>
 													</FieldRow>
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index 502d0f9d1af7..de13ee3aa9a4 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -74,7 +74,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
 								disabled={!!emailDefault || !!transcriptRequest}
 								error={errors.email?.message}
 								flexGrow={1}
-								{...register('email', { required: t('The_field_is_required', t('Email')) })}
+								{...register('email', { required: t('Required_field', { field: t('Email') }) })}
 							/>
 						</FieldRow>
 						<FieldError>{errors.email?.message}</FieldError>
@@ -86,7 +86,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
 								disabled={!!transcriptRequest}
 								error={errors.subject?.message}
 								flexGrow={1}
-								{...register('subject', { required: t('The_field_is_required', t('Subject')) })}
+								{...register('subject', { required: t('Required_field', { field: t('Subject') }) })}
 							/>
 						</FieldRow>
 						<FieldError>{errors.subject?.message}</FieldError>
diff --git a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index 35af90a912d0..640dbd375288 100644
--- a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -44,7 +44,7 @@ const BusinessHoursMultiple = ({ className }: { className?: ComponentProps<typeo
 					<Controller
 						name='name'
 						control={control}
-						rules={{ required: t('error-the-field-is-required', { field: t('Name') }) }}
+						rules={{ required: t('Required_field', { field: t('Name') }) }}
 						render={({ field }) => <TextInput id={nameField} {...field} aria-describedby={`${departmentsField}-error`} />}
 					/>
 				</FieldRow>
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
index 51c993d2542f..e2bc979f3f4d 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
@@ -43,7 +43,7 @@ const CannedResponseForm = () => {
 				<Controller
 					name='shortcut'
 					control={control}
-					rules={{ required: t('The_field_is_required', t('Shortcut')) }}
+					rules={{ required: t('Required_field', { field: t('Shortcut') }) }}
 					render={({ field }) => (
 						<TextInput
 							{...field}
@@ -76,7 +76,7 @@ const CannedResponseForm = () => {
 					<Controller
 						name='text'
 						control={control}
-						rules={{ required: t('The_field_is_required', t('Message')) }}
+						rules={{ required: t('Required_field', { field: t('Message') }) }}
 						render={({ field: { value, onChange, name, onBlur } }) => (
 							<CannedResponsesComposer
 								id={messageField}
@@ -168,7 +168,7 @@ const CannedResponseForm = () => {
 								<Controller
 									name='departmentId'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Department')) }}
+									rules={{ required: t('Required_field', { field: t('Department') }) }}
 									render={({ field: { value, onChange } }) => (
 										<AutoCompleteDepartment
 											{...(hasMonitorPermission && { onlyMyDepartments: hasMonitorPermission })}
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
index 592cd6b0f932..09bfda04fe28 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
@@ -47,7 +47,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
 		const { name } = getValues();
 
 		if (!isValid) {
-			return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
+			return dispatchToastMessage({ type: 'error', message: t('Required_field', { field: t('Name') }) });
 		}
 
 		try {
@@ -77,7 +77,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
 				<Controller
 					name='name'
 					control={control}
-					rules={{ required: t('The_field_is_required', t('Name')), validate: (v) => v?.trim() !== '' }}
+					rules={{ required: t('Required_field', { field: t('Name') }), validate: (v) => v?.trim() !== '' }}
 					render={({ field: { value, onChange } }): ReactElement => (
 						<StringSettingInput
 							_id=''
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
index 0b4ab02791da..0585cbcf4959 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
@@ -37,7 +37,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
 	const { field: nameField } = useController({
 		control,
 		name: 'name',
-		rules: { required: t('The_field_is_required', t('Name')) },
+		rules: { required: t('Required_field', { field: t('Name') }) },
 	});
 
 	const { field: dueTimeField } = useController({
@@ -45,7 +45,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
 		name: 'dueTimeInMinutes',
 		rules: {
 			validate(value) {
-				return Number(value || 0) <= 0 ? t('The_field_is_required', t('Estimated_wait_time_in_minutes')) : true;
+				return Number(value || 0) <= 0 ? t('Required_field', { field: t('Estimated_wait_time_in_minutes') }) : true;
 			},
 		},
 	});
@@ -56,7 +56,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
 		const { name, description, dueTimeInMinutes } = getValues();
 
 		if (!isValid || !name || dueTimeInMinutes === undefined) {
-			return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
+			return dispatchToastMessage({ type: 'error', message: t('Required_field') });
 		}
 
 		try {
diff --git a/apps/meteor/client/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
index 767b56e91675..215fe33cdbd1 100644
--- a/apps/meteor/client/omnichannel/tags/TagEdit.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
@@ -88,7 +88,7 @@ const TagEdit = ({ tagData, currentDepartments }: TagEditProps) => {
 								<Controller
 									name='name'
 									control={control}
-									rules={{ required: t('The_field_is_required', 'name') }}
+									rules={{ required: t('Required_field', { field: t('Name') }) }}
 									render={({ field }) => <TextInput {...field} error={errors?.name?.message} aria-describedby={`${nameField}-error`} />}
 								/>
 							</FieldRow>
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index e71e8e2a94d0..b2feb1db8a8f 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -168,7 +168,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='name'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Name')) }}
+									rules={{ required: t('Required_field', { field: t('Name') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={nameField}
@@ -195,7 +195,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='visibility'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Visibility')) }}
+									rules={{ required: t('Required_field', { field: t('Visibility') }) }}
 									render={({ field }) => (
 										<Select
 											id={visibilityField}
@@ -220,7 +220,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='departments'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Departments')) }}
+									rules={{ required: t('Required_field', { field: t('Departments') }) }}
 									render={({ field: { name, value, onChange, onBlur } }) => (
 										<PaginatedMultiSelectFiltered
 											id={departmentsField}
@@ -267,7 +267,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='monitors'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Monitors')) }}
+									rules={{ required: t('Required_field', { field: t('Monitors') }) }}
 									render={({ field: { name, value, onChange, onBlur } }) => (
 										<PaginatedMultiSelectFiltered
 											id={monitorsField}
diff --git a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
index 27ad314b2ab8..03e1122da773 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -222,7 +222,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
 								id={nameId}
 								data-qa-type='channel-name-input'
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateChannelName(value),
 								})}
 								error={errors.name?.message}
diff --git a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
index ad1abdcbf399..3543234bca96 100644
--- a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
@@ -181,7 +181,7 @@ const CreateTeamModal = ({ onClose }: { onClose: () => void }): ReactElement =>
 								id={nameId}
 								aria-invalid={errors.name ? 'true' : 'false'}
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateTeamName(value),
 								})}
 								addon={<Icon size='x20' name={isPrivate ? 'team-lock' : 'team'} />}
diff --git a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
index 38a1df5a5ec8..2ff468f4f72b 100644
--- a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
@@ -222,7 +222,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
 								id={nameId}
 								data-qa-type='channel-name-input'
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateChannelName(value),
 								})}
 								error={errors.name?.message}
diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
index e907558ce278..a7e7b506de0f 100644
--- a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
@@ -183,7 +183,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 								id={nameId}
 								aria-invalid={errors.name ? 'true' : 'false'}
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateTeamName(value),
 								})}
 								addon={<Icon size='x20' name={isPrivate ? 'team-lock' : 'team'} />}
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
index 2c11b7a384cd..ce9fad8591fa 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
@@ -1,6 +1,6 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
-import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
-import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
@@ -13,7 +13,11 @@ import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebD
 const AccountIntegrationsPage = () => {
 	const { data: webdavAccountIntegrations } = useWebDAVAccountIntegrationsQuery();
 
-	const { handleSubmit, control } = useForm<{ accountSelected: string }>();
+	const {
+		handleSubmit,
+		control,
+		formState: { errors },
+	} = useForm<{ accountSelected: string }>();
 
 	const options: SelectOption[] = useMemo(
 		() => webdavAccountIntegrations?.map(({ _id, ...current }) => [_id, getWebdavServerName(current)]) ?? [],
@@ -36,6 +40,8 @@ const AccountIntegrationsPage = () => {
 		removeMutation.mutate({ accountSelected });
 	});
 
+	const accountSelectedId = useUniqueId();
+
 	return (
 		<Page>
 			<PageHeader title={t('Integrations')} />
@@ -47,22 +53,18 @@ const AccountIntegrationsPage = () => {
 							<Controller
 								control={control}
 								name='accountSelected'
-								rules={{ required: true }}
-								render={({ field: { onChange, value, name, ref } }) => (
-									<SelectLegacy
-										ref={ref}
-										name={name}
-										options={options}
-										onChange={onChange}
-										value={value}
-										placeholder={t('Select_an_option')}
-									/>
-								)}
+								rules={{ required: t('Required_field', { field: t('WebDAV_Accounts') }) }}
+								render={({ field }) => <SelectLegacy {...field} options={options} placeholder={t('Select_an_option')} />}
 							/>
 							<Button type='submit' danger>
 								{t('Remove')}
 							</Button>
 						</FieldRow>
+						{errors?.accountSelected && (
+							<FieldError aria-live='assertive' id={`${accountSelectedId}-error`}>
+								{errors.accountSelected.message}
+							</FieldError>
+						)}
 					</Field>
 				</Box>
 			</PageScrollableContentWithShadow>
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index 0de462cd5bd3..95398b352049 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -166,7 +166,9 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 							<Controller
 								control={control}
 								name='name'
-								rules={{ validate: (name) => (requireName && name === '' ? t('error-the-field-is-required', { field: t('Name') }) : true) }}
+								rules={{
+									required: requireName && t('Required_field', { field: t('Name') }),
+								}}
 								render={({ field }) => (
 									<TextInput
 										{...field}
@@ -196,7 +198,7 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 								control={control}
 								name='username'
 								rules={{
-									required: t('error-the-field-is-required', { field: t('Username') }),
+									required: t('Required_field', { field: t('Username') }),
 									validate: (username) => validateUsername(username),
 								}}
 								render={({ field }) => (
@@ -305,7 +307,10 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 						<Controller
 							control={control}
 							name='email'
-							rules={{ validate: { validateEmail: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')) } }}
+							rules={{
+								required: t('Required_field', { field: t('Email') }),
+								validate: { validateEmail: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')) },
+							}}
 							render={({ field }) => (
 								<TextInput
 									{...field}
diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
index 06619f0618f5..81435536e981 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
@@ -23,7 +23,7 @@ const AccountSecurityPage = (): ReactElement => {
 
 	const methods = useForm({
 		defaultValues: passwordDefaultValues,
-		mode: 'onBlur',
+		mode: 'all',
 	});
 	const {
 		reset,
diff --git a/apps/meteor/client/views/account/security/ChangePassword.tsx b/apps/meteor/client/views/account/security/ChangePassword.tsx
index c70d9e166175..e5cb61e34547 100644
--- a/apps/meteor/client/views/account/security/ChangePassword.tsx
+++ b/apps/meteor/client/views/account/security/ChangePassword.tsx
@@ -53,13 +53,13 @@ const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
 							control={control}
 							name='password'
 							rules={{
+								required: t('Required_field', { field: t('New_password') }),
 								validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
 							}}
-							render={({ field: { onChange, value } }) => (
+							render={({ field }) => (
 								<PasswordInput
+									{...field}
 									id={passwordId}
-									onChange={onChange}
-									value={value}
 									error={errors.password?.message}
 									flexGrow={1}
 									addon={<Icon name='key' size='x20' />}
@@ -84,12 +84,14 @@ const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
 						<Controller
 							control={control}
 							name='confirmationPassword'
-							rules={{ validate: (confirmationPassword) => (password !== confirmationPassword ? t('Passwords_do_not_match') : true) }}
-							render={({ field: { onChange, value } }) => (
+							rules={{
+								required: t('Required_field', { field: t('Confirm_password') }),
+								validate: (confirmationPassword) => (password !== confirmationPassword ? t('Passwords_do_not_match') : true),
+							}}
+							render={({ field }) => (
 								<PasswordInput
+									{...field}
 									id={confirmPasswordId}
-									onChange={onChange}
-									value={value}
 									error={errors.confirmationPassword?.message}
 									flexGrow={1}
 									addon={<Icon name='key' size='x20' />}
diff --git a/apps/meteor/client/views/account/security/EndToEnd.tsx b/apps/meteor/client/views/account/security/EndToEnd.tsx
index 72213f3202ba..b2fb982ebb9b 100644
--- a/apps/meteor/client/views/account/security/EndToEnd.tsx
+++ b/apps/meteor/client/views/account/security/EndToEnd.tsx
@@ -1,8 +1,9 @@
 import { Box, Margins, PasswordInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, Button } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useMethod, useTranslation, useLogout } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useCallback, useEffect } from 'react';
-import { useForm } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
 
 import { e2e } from '../../../../app/e2e/client/rocketchat.e2e';
 
@@ -17,17 +18,17 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
 	const resetE2eKey = useMethod('e2e.resetOwnE2EKey');
 
 	const {
-		register,
 		handleSubmit,
 		watch,
 		resetField,
 		formState: { errors, isValid },
+		control,
 	} = useForm({
 		defaultValues: {
 			password: '',
 			passwordConfirm: '',
 		},
-		mode: 'onChange',
+		mode: 'all',
 	});
 
 	const { password } = watch();
@@ -64,37 +65,71 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
 		}
 	}, [password, resetField]);
 
+	const passwordId = useUniqueId();
+	const e2ePasswordExplanationId = useUniqueId();
+	const passwordConfirmId = useUniqueId();
+
 	return (
 		<Box display='flex' flexDirection='column' alignItems='flex-start' mbs={16} {...props}>
 			<Margins blockEnd={8}>
 				<Box fontScale='h4'>{t('E2E_Encryption_Password_Change')}</Box>
-				<Box dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
+				<Box id={e2ePasswordExplanationId} dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
 				<FieldGroup w='full'>
 					<Field>
-						<FieldLabel id='New_encryption_password'>{t('New_encryption_password')}</FieldLabel>
+						<FieldLabel htmlFor={passwordId}>{t('New_encryption_password')}</FieldLabel>
 						<FieldRow>
-							<PasswordInput
-								{...register('password', { required: true })}
-								placeholder={t('New_Password_Placeholder')}
-								disabled={!keysExist}
-								aria-labelledby='New_encryption_password'
+							<Controller
+								control={control}
+								name='password'
+								rules={{ required: t('Required_field', { field: t('New_encryption_password') }) }}
+								render={({ field }) => (
+									<PasswordInput
+										{...field}
+										id={passwordId}
+										error={errors.password?.message}
+										placeholder={t('New_Password_Placeholder')}
+										disabled={!keysExist}
+										aria-describedby={`${e2ePasswordExplanationId} ${passwordId}-hint ${passwordId}-error`}
+										aria-invalid={errors.password ? 'true' : 'false'}
+									/>
+								)}
 							/>
 						</FieldRow>
-						{!keysExist && <FieldHint>{t('EncryptionKey_Change_Disabled')}</FieldHint>}
+						{!keysExist && <FieldHint id={`${passwordId}-hint`}>{t('EncryptionKey_Change_Disabled')}</FieldHint>}
+						{errors?.password && (
+							<FieldError aria-live='assertive' id={`${passwordId}-error`}>
+								{errors.password.message}
+							</FieldError>
+						)}
 					</Field>
 					{hasTypedPassword && (
 						<Field>
-							<FieldLabel id='Confirm_new_encryption_password'>{t('Confirm_new_encryption_password')}</FieldLabel>
-							<PasswordInput
-								error={errors.passwordConfirm?.message}
-								{...register('passwordConfirm', {
-									required: true,
-									validate: (value: string) => (password !== value ? 'Your passwords do no match' : true),
-								})}
-								placeholder={t('Confirm_New_Password_Placeholder')}
-								aria-labelledby='Confirm_new_encryption_password'
-							/>
-							{errors.passwordConfirm && <FieldError>{errors.passwordConfirm.message}</FieldError>}
+							<FieldLabel htmlFor={passwordConfirmId}>{t('Confirm_new_encryption_password')}</FieldLabel>
+							<FieldRow>
+								<Controller
+									control={control}
+									name='passwordConfirm'
+									rules={{
+										required: t('Required_field', { field: t('Confirm_new_encryption_password') }),
+										validate: (value: string) => (password !== value ? 'Your passwords do no match' : true),
+									}}
+									render={({ field }) => (
+										<PasswordInput
+											{...field}
+											id={passwordConfirmId}
+											error={errors.passwordConfirm?.message}
+											placeholder={t('Confirm_New_Password_Placeholder')}
+											aria-describedby={`${passwordConfirmId}-error`}
+											aria-invalid={errors.password ? 'true' : 'false'}
+										/>
+									)}
+								/>
+							</FieldRow>
+							{errors.passwordConfirm && (
+								<FieldError aria-live='assertive' id={`${passwordConfirmId}-error`}>
+									{errors.passwordConfirm.message}
+								</FieldError>
+							)}
 						</Field>
 					)}
 				</FieldGroup>
diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index 59da79508192..f6f52507d33a 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
+import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, IconButton } from '@rocket.chat/fuselage';
 import type { ReactElement, ChangeEvent } from 'react';
 import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -82,7 +82,7 @@ const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): Rea
 					<FieldRow>
 						<TextInput value={name} onChange={handleChangeName} placeholder={t('Name')} />
 					</FieldRow>
-					{errors.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+					{errors.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Aliases')}</FieldLabel>
@@ -94,12 +94,9 @@ const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): Rea
 				<Field>
 					<FieldLabel alignSelf='stretch' display='flex' justifyContent='space-between' alignItems='center'>
 						{t('Custom_Emoji')}
-						{/* FIXME: replace to IconButton */}
-						<Button square onClick={clickUpload}>
-							<Icon name='upload' size='x20' />
-						</Button>
+						<IconButton secondary small icon='upload' onClick={clickUpload} />
 					</FieldLabel>
-					{errors.emoji && <FieldError>{t('error-the-field-is-required', { field: t('Custom_Emoji') })}</FieldError>}
+					{errors.emoji && <FieldError>{t('Required_field', { field: t('Custom_Emoji') })}</FieldError>}
 					{newEmojiPreview && (
 						<Box display='flex' flexDirection='row' mi='neg-x4' justifyContent='center'>
 							<Margins inline={4}>
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
index 8f63b2ac7b48..49ee12b69dd0 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
@@ -150,7 +150,7 @@ const EditCustomEmoji = ({ close, onChange, data, ...props }: EditCustomEmojiPro
 						<FieldRow>
 							<TextInput value={name} onChange={handleChangeName} placeholder={t('Name')} />
 						</FieldRow>
-						{errors.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+						{errors.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Aliases')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
index 82f668a2d7d5..430d05ceaa53 100644
--- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
@@ -1,4 +1,4 @@
-import { Field, FieldLabel, FieldRow, TextInput, Box, Icon, Margins, Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { Field, FieldLabel, FieldRow, TextInput, Box, Margins, Button, ButtonGroup, IconButton } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEvent } from 'react';
 import React, { useState, useCallback } from 'react';
@@ -34,8 +34,8 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
 			const soundData = createSoundData(soundFile, name);
 			const validation = validate(soundData, soundFile) as Array<Parameters<typeof t>[0]>;
 
-			validation.forEach((error) => {
-				throw new Error(t('error-the-field-is-required', { field: t(error) }));
+			validation.forEach((invalidFieldName) => {
+				throw new Error(t('Required_field', { field: t(invalidFieldName) }));
 			});
 
 			try {
@@ -97,12 +97,9 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
 				</Field>
 				<Field>
 					<FieldLabel alignSelf='stretch'>{t('Sound_File_mp3')}</FieldLabel>
-					<Box display='flex' flexDirection='row' mbs='none'>
+					<Box display='flex' flexDirection='row' mbs='none' alignItems='center'>
 						<Margins inline={4}>
-							{/* FIXME: replace to IconButton */}
-							<Button square onClick={clickUpload}>
-								<Icon name='upload' size='x20' />
-							</Button>
+							<IconButton secondary small icon='upload' onClick={clickUpload} />
 							{sound?.name || t('None')}
 						</Margins>
 					</Box>
@@ -111,7 +108,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
 					<Button onClick={close}>{t('Cancel')}</Button>
-					<Button primary onClick={handleSave} disabled={name === ''}>
+					<Button primary onClick={handleSave}>
 						{t('Save')}
 					</Button>
 				</ButtonGroup>
diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
index b358d0bb7c84..1274e9deda35 100644
--- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
@@ -76,10 +76,10 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
 				}
 			}
 
-			validation.forEach((error) =>
+			validation.forEach((invalidFieldName) =>
 				dispatchToastMessage({
 					type: 'error',
-					message: t('error-the-field-is-required', { field: t(error) }),
+					message: t('Required_field', { field: t(invalidFieldName) }),
 				}),
 			);
 		},
@@ -131,9 +131,9 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
 				</Field>
 				<Field>
 					<FieldLabel alignSelf='stretch'>{t('Sound_File_mp3')}</FieldLabel>
-					<Box display='flex' flexDirection='row' mbs='none'>
+					<Box display='flex' flexDirection='row' mbs='none' alignItems='center'>
 						<Margins inline={4}>
-							<IconButton icon='upload' secondary onClick={clickUpload} />
+							<IconButton secondary small icon='upload' onClick={clickUpload} />
 							{sound?.name || 'none'}
 						</Margins>
 					</Box>
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
index 78c2618b4c53..07376208aaef 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
@@ -28,9 +28,10 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 		register,
 		control,
 		handleSubmit,
-		formState: { isDirty, errors },
+		formState: { errors },
 	} = useForm({
 		defaultValues: { name: status?.name ?? '', statusType: status?.statusType ?? '' },
+		mode: 'all',
 	});
 
 	const saveStatus = useEndpoint('POST', _id ? '/v1/custom-user-status.update' : '/v1/custom-user-status.create');
@@ -94,9 +95,9 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 					<Field>
 						<FieldLabel>{t('Name')}</FieldLabel>
 						<FieldRow>
-							<TextInput {...register('name', { required: true })} placeholder={t('Name')} />
+							<TextInput {...register('name', { required: t('Required_field', { field: t('Name') }) })} placeholder={t('Name')} />
 						</FieldRow>
-						{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+						{errors.name && <FieldError>{errors.name.message}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Presence')}</FieldLabel>
@@ -104,18 +105,18 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 							<Controller
 								name='statusType'
 								control={control}
-								rules={{ required: true }}
+								rules={{ required: t('Required_field', { field: t('Presence') }) }}
 								render={({ field }): ReactElement => <Select {...field} placeholder={t('Presence')} options={presenceOptions} />}
 							/>
 						</FieldRow>
-						{errors?.statusType && <FieldError>{t('error-the-field-is-required', { field: t('Presence') })}</FieldError>}
+						{errors.statusType && <FieldError>{errors.statusType.message}</FieldError>}
 					</Field>
 				</FieldGroup>
 			</ContextualbarScrollableContent>
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
 					<Button onClick={onClose}>{t('Cancel')}</Button>
-					<Button form={formId} primary type='submit' disabled={!isDirty}>
+					<Button form={formId} primary type='submit'>
 						{t('Save')}
 					</Button>
 				</ButtonGroup>
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
index c5cbd6f6aa1d..3537eddf9cc5 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
@@ -66,6 +66,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 			imapSecure: inboxData?.imap.secure ?? false,
 			imapRetries: inboxData?.imap.maxRetries ?? 10,
 		},
+		mode: 'all',
 	});
 
 	const handleDelete = useMutableCallback(() => {
@@ -153,7 +154,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 		}
 
 		if (!validateEmail(email)) {
-			return t('Validate_email_address');
+			return t('error-invalid-email-address');
 		}
 
 		const { emailInbox } = await emailAlreadyExistsAction({ email });
@@ -211,7 +212,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='name'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Name') }) }}
+										rules={{ required: t('Required_field', { field: t('Name') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={nameField}
@@ -239,7 +240,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 										name='email'
 										control={control}
 										rules={{
-											required: t('error-the-field-is-required', { field: t('Email') }),
+											required: t('Required_field', { field: t('Email') }),
 											validate: (value) => checkEmailExists(value),
 										}}
 										render={({ field }) => (
@@ -313,7 +314,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpServer'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Server') }) }}
+										rules={{ required: t('Required_field', { field: t('Server') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={smtpServerField}
@@ -340,7 +341,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpPort'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Port') }) }}
+										rules={{ required: t('Required_field', { field: t('Port') }) }}
 										render={({ field }) => (
 											<NumberInput
 												id={smtpPortField}
@@ -367,7 +368,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpUsername'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Username') }) }}
+										rules={{ required: t('Required_field', { field: t('Username') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={smtpUsernameField}
@@ -394,7 +395,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpPassword'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Password') }) }}
+										rules={{ required: t('Required_field', { field: t('Password') }) }}
 										render={({ field }) => (
 											<PasswordInput
 												id={smtpPasswordField}
@@ -435,7 +436,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapServer'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Server') }) }}
+										rules={{ required: t('Required_field', { field: t('Server') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={imapServerField}
@@ -462,7 +463,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapPort'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Port') }) }}
+										rules={{ required: t('Required_field', { field: t('Port') }) }}
 										render={({ field }) => (
 											<NumberInput
 												id={imapPortField}
@@ -489,7 +490,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapUsername'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Username') }) }}
+										rules={{ required: t('Required_field', { field: t('Username') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={imapUsernameField}
@@ -516,7 +517,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapPassword'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Password') }) }}
+										rules={{ required: t('Required_field', { field: t('Password') }) }}
 										render={({ field }) => (
 											<PasswordInput
 												id={imapPasswordField}
@@ -543,7 +544,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapRetries'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Max_Retry') }) }}
+										rules={{ required: t('Required_field', { field: t('Max_Retry') }) }}
 										render={({ field }) => (
 											<NumberInput
 												id={imapRetriesField}
diff --git a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
index bd43c76b2138..c463324b42cc 100644
--- a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
@@ -167,7 +167,7 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
 								<Controller
 									name='channel'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Post_to_Channel')) }}
+									rules={{ required: t('Required_field', { field: t('Post_to_Channel') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={channelField}
@@ -201,7 +201,7 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
 								<Controller
 									name='username'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Post_to_Channel')) }}
+									rules={{ required: t('Required_field', { field: t('Post_to_Channel') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={usernameField}
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index 65c53386e6a1..d6cebbc0c651 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -248,7 +248,7 @@ const OutgoingWebhookForm = () => {
 								<Controller
 									name='urls'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('URLs')) }}
+									rules={{ required: t('Required_field', { field: t('URLs') }) }}
 									render={({ field }) => (
 										<TextAreaInput
 											id={urlsField}
@@ -286,7 +286,7 @@ const OutgoingWebhookForm = () => {
 								<Controller
 									name='username'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Post_as')) }}
+									rules={{ required: t('Required_field', { field: t('Post_as') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={usernameField}
@@ -373,7 +373,7 @@ const OutgoingWebhookForm = () => {
 								<Controller
 									name='token'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Token')) }}
+									rules={{ required: t('Required_field', { field: t('Token') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={tokenField}
diff --git a/apps/meteor/client/views/admin/mailer/MailerPage.tsx b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
index 9f0c8e7627ad..19e6424ea9e9 100644
--- a/apps/meteor/client/views/admin/mailer/MailerPage.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
@@ -84,7 +84,8 @@ const MailerPage = () => {
 									id={fromEmailId}
 									placeholder={t('Type_your_email')}
 									{...register('fromEmail', {
-										validate: (fromEmail) => (!validateEmail(fromEmail) ? t('Invalid_email') : true),
+										required: t('Required_field', { field: t('From') }),
+										validate: (fromEmail) => (validateEmail(fromEmail) ? undefined : t('error-invalid-email-address')),
 									})}
 									error={errors.fromEmail?.message}
 									aria-required='true'
@@ -138,7 +139,7 @@ const MailerPage = () => {
 							<FieldRow>
 								<TextInput
 									id={subjectId}
-									{...register('subject', { required: t('error-the-field-is-required', { field: t('Subject') }) })}
+									{...register('subject', { required: t('Required_field', { field: t('Subject') }) })}
 									aria-describedby={`${subjectId}-error`}
 									error={errors.subject?.message}
 									aria-required='true'
@@ -159,7 +160,7 @@ const MailerPage = () => {
 								<TextAreaInput
 									id={emailBodyId}
 									{...register('emailBody', {
-										required: t('error-the-field-is-required', { field: t('Email_body') }),
+										required: t('Required_field', { field: t('Email_body') }),
 										validate: (emailBody) => (emailBody?.indexOf('[unsubscribe]') === -1 ? t('error-missing-unsubscribe-link') : true),
 									})}
 									rows={10}
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
index 79d2fbe11140..2d9cb51e848f 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
@@ -48,6 +48,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 			active: data.active,
 			redirectUri: Array.isArray(data.redirectUri) ? data.redirectUri.join('\n') : data.redirectUri,
 		},
+		mode: 'all',
 	});
 
 	const setModal = useSetModal();
@@ -118,7 +119,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 						<TextInput {...register('name', { required: true })} />
 					</FieldRow>
 					<FieldHint>{t('Give_the_application_a_name_This_will_be_seen_by_your_users')}</FieldHint>
-					{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+					{errors?.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Redirect_URI')}</FieldLabel>
@@ -126,7 +127,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 						<TextAreaInput rows={5} {...register('redirectUri', { required: true })} />
 					</FieldRow>
 					<FieldHint>{t('After_OAuth2_authentication_users_will_be_redirected_to_this_URL')}</FieldHint>
-					{errors?.redirectUri && <FieldError>{t('error-the-field-is-required', { field: t('Redirect_URI') })}</FieldError>}
+					{errors?.redirectUri && <FieldError>{t('Required_field', { field: t('Redirect_URI') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Client_ID')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
index 9a66e46e6b39..0982a99ccd92 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
@@ -69,10 +69,10 @@ const OAuthAddApp = (): ReactElement => {
 				<Field>
 					<FieldLabel>{t('Application_Name')}</FieldLabel>
 					<FieldRow>
-						<TextInput {...register('name', { required: true })} />
+						<TextInput {...register('name', { required: t('Required_field', { field: t('Name') }) })} />
 					</FieldRow>
 					<FieldHint>{t('Give_the_application_a_name_This_will_be_seen_by_your_users')}</FieldHint>
-					{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+					{errors?.name && <FieldError>{errors.name.message}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Redirect_URI')}</FieldLabel>
@@ -80,7 +80,7 @@ const OAuthAddApp = (): ReactElement => {
 						<TextAreaInput rows={5} {...register('redirectUri', { required: true })} />
 					</FieldRow>
 					<FieldHint>{t('After_OAuth2_authentication_users_will_be_redirected_to_this_URL')}</FieldHint>
-					{errors?.redirectUri && <FieldError>{t('error-the-field-is-required', { field: t('Redirect_URI') })}</FieldError>}
+					{errors?.redirectUri && <FieldError>{t('Required_field', { field: t('Redirect_URI') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldRow>
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index 59ef726dcb2c..bba5dfe95e38 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -33,9 +33,13 @@ const RoleForm = ({ className, editing = false, isProtected = false, isDisabled
 			<Field className={className}>
 				<FieldLabel>{t('Role')}</FieldLabel>
 				<FieldRow>
-					<TextInput disabled={editing || isDisabled} placeholder={t('Role')} {...register('name', { required: true })} />
+					<TextInput
+						disabled={editing || isDisabled}
+						placeholder={t('Role')}
+						{...register('name', { required: t('Required_field', { field: t('Role') }) })}
+					/>
 				</FieldRow>
-				{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Role') })}</FieldError>}
+				{errors?.name && <FieldError>{errors.name.message}</FieldError>}
 			</Field>
 			<Field className={className}>
 				<FieldLabel>{t('Description')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index 4bfb2afc81d3..3e3c6988e6cf 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -70,7 +70,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 									<Controller
 										control={control}
 										name='rid'
-										rules={{ required: t('error-the-field-is-required', { field: t('Room') }) }}
+										rules={{ required: t('Required_field', { field: t('Room') }) }}
 										render={({ field: { onChange, value } }) => (
 											<RoomAutoComplete
 												id={roomFieldId}
@@ -98,7 +98,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 								<Controller
 									control={control}
 									name='users'
-									rules={{ required: t('error-the-field-is-required', { field: t('Users') }) }}
+									rules={{ required: t('Required_field', { field: t('Users') }) }}
 									render={({ field: { onChange, value } }) => (
 										<UserAutoCompleteMultiple
 											id={usersFieldId}
diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
index 1a993979eec8..fa40f74cfadb 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
@@ -156,7 +156,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
 					<FieldRow>
 						<Controller
 							name='roomName'
-							rules={{ required: t('The_field_is_required', t('Name')) }}
+							rules={{ required: t('Required_field', { field: t('Name') }) }}
 							control={control}
 							render={({ field }) => (
 								<TextInput
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 146ace1aac82..98357b149383 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -18,7 +18,7 @@ const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactE
 	const handleConfirm = (e: SyntheticEvent): void => {
 		e.preventDefault();
 		if (!text.length) {
-			setError(t('Name_cant_be_empty'));
+			setError(t('Required_field', { field: t('Name') }));
 			return;
 		}
 		onConfirm(text);
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index a55cc29eb648..a0ee877af551 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -221,8 +221,8 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 								control={control}
 								name='email'
 								rules={{
-									required: t('Email_is_required'),
-									validate: (email) => (validateEmail(email) ? undefined : t('ensure_email_address_valid')),
+									required: t('Required_field', { field: t('Email') }),
+									validate: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')),
 								}}
 								render={({ field }) => (
 									<TextInput
@@ -286,7 +286,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							<Controller
 								control={control}
 								name='name'
-								rules={{ required: t('The_field_is_required', t('Name')) }}
+								rules={{ required: t('Required_field', { field: t('Name') }) }}
 								render={({ field }) => (
 									<TextInput
 										{...field}
@@ -311,7 +311,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							<Controller
 								control={control}
 								name='username'
-								rules={{ required: t('The_field_is_required', t('Username')) }}
+								rules={{ required: t('Required_field', { field: t('Username') }) }}
 								render={({ field }) => (
 									<TextInput
 										{...field}
@@ -366,7 +366,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 								<Controller
 									control={control}
 									name='roles'
-									rules={{ required: t('The_field_is_required', t('Roles')) }}
+									rules={{ required: t('Required_field', { field: t('Roles') }) }}
 									render={({ field: { onChange, value } }) => (
 										<MultiSelectFiltered
 											id={rolesId}
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
index 25d7a52a6ad4..034d7d2efb0f 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
@@ -57,7 +57,7 @@ const AdminUserSetRandomPasswordContent = ({
 					name='password'
 					rules={{
 						validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
-						required: isNewUserPage && t('The_field_is_required', t('Password')),
+						required: isNewUserPage && t('Required_field', { field: t('Password') }),
 					}}
 					render={({ field }) => (
 						<PasswordInput
@@ -83,7 +83,7 @@ const AdminUserSetRandomPasswordContent = ({
 						control={control}
 						name='passwordConfirmation'
 						rules={{
-							required: isNewUserPage && t('The_field_is_required', t('Confirm_password')),
+							required: isNewUserPage && t('Required_field', { field: t('Confirm_password') }),
 							deps: ['password'],
 							validate: (confirmationPassword) => (password !== confirmationPassword ? t('Invalid_confirm_pass') : true),
 						}}
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index f616ebed5174..dffaf959f3cd 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -50,7 +50,7 @@ const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
 					<FieldLabel>{t('Date')}</FieldLabel>
 					<FieldRow>
 						<DateRangePicker value={dateRangeField.value} onChange={dateRangeField.onChange} display='flex' flexGrow={1} />
-						{dateRangeFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Date'))}</FieldError>}
+						{dateRangeFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Date') })}</FieldError>}
 						{dateRangeFieldState.error?.type === 'validate' && <FieldError>{dateRangeFieldState.error.message}</FieldError>}
 					</FieldRow>
 				</Field>
diff --git a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
index 540f97ebaea8..ce2b7e044d3a 100644
--- a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
@@ -39,7 +39,7 @@ const DirectTab = ({ form: { control } }: DirectTabProps): ReactElement => {
 					placeholder={t('Username_Placeholder')}
 				/>
 			</FieldRow>
-			{usersFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Users'))}</FieldError>}
+			{usersFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Users') })}</FieldError>}
 			{usersFieldState.error?.type === 'validate' && <FieldError>{usersFieldState.error.message}</FieldError>}
 		</Field>
 	);
diff --git a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
index 8fbeb800ec24..c756b372488c 100644
--- a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
@@ -39,7 +39,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
 						placeholder={t('Username_Placeholder')}
 					/>
 				</FieldRow>
-				{visitorFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Visitor'))}</FieldError>}
+				{visitorFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Visitor') })}</FieldError>}
 				{visitorFieldState.error?.type === 'validate' && <FieldError>{visitorFieldState.error.message}</FieldError>}
 			</Field>
 			<Field flexShrink={1} marginInlineStart={8}>
@@ -48,7 +48,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
 					<AutoCompleteAgent
 						error={(() => {
 							if (agentFieldState.error?.type === 'required') {
-								return t('The_field_is_required', t('Agent'));
+								return t('Required_field', { field: t('Agent') });
 							}
 
 							return agentFieldState.error?.message;
@@ -58,7 +58,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
 						placeholder={t('Username_Placeholder')}
 					/>
 				</FieldRow>
-				{agentFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Agent'))}</FieldError>}
+				{agentFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Agent') })}</FieldError>}
 				{agentFieldState.error?.type === 'validate' && <FieldError>{agentFieldState.error.message}</FieldError>}
 			</Field>
 		</>
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index bc5de9ae780b..d58cc3ccb70d 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -34,7 +34,7 @@ const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
 					}
 				/>
 			</FieldRow>
-			{ridFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Channel_name'))}</FieldError>}
+			{ridFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Channel_name') })}</FieldError>}
 			{ridFieldState.error?.type === 'validate' && <FieldError>{ridFieldState.error.message}</FieldError>}
 		</Field>
 	);
diff --git a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
index 48ff06b1c699..652f7a739a66 100644
--- a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
@@ -22,7 +22,7 @@ const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
 			required: true,
 			validate: (value) => {
 				if (value.length < 1) {
-					return t('The_field_is_required', t('Users'));
+					return t('Required_field', { field: t('Users') });
 				}
 			},
 		},
@@ -39,7 +39,7 @@ const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
 					placeholder={t('Username_Placeholder')}
 				/>
 			</FieldRow>
-			{usersFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Users'))}</FieldError>}
+			{usersFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Users') })}</FieldError>}
 			{usersFieldState.error?.type === 'validate' && <FieldError>{usersFieldState.error.message}</FieldError>}
 		</Field>
 	);
diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
index 2e01ffc802cd..7d48b657aae8 100644
--- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
@@ -112,7 +112,7 @@ const EditCustomFields = ({ customFieldData }: { customFieldData?: Serialized<IL
 										name='field'
 										control={control}
 										rules={{
-											required: t('The_field_is_required', t('Field')),
+											required: t('Required_field', { field: t('Field') }),
 											validate: (value) => (!/^[0-9a-zA-Z-_]+$/.test(value) ? t('error-invalid-custom-field-name') : undefined),
 										}}
 										render={({ field }) => (
@@ -141,7 +141,7 @@ const EditCustomFields = ({ customFieldData }: { customFieldData?: Serialized<IL
 									<Controller
 										name='label'
 										control={control}
-										rules={{ required: t('The_field_is_required', t('Label')) }}
+										rules={{ required: t('Required_field', { field: t('Label') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={labelField}
diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
index c1aed1dbe7ae..52bb159b2e04 100644
--- a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
@@ -258,7 +258,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
 									flexGrow={1}
 									error={errors.name?.message as string}
 									placeholder={t('Name')}
-									{...register('name', { required: t('The_field_is_required', 'name') })}
+									{...register('name', { required: t('Required_field', { field: t('Name') }) })}
 								/>
 							</FieldRow>
 							{errors.name && (
@@ -296,7 +296,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
 									addon={<Icon name='mail' size='x20' />}
 									placeholder={t('Email')}
 									{...register('email', {
-										required: t('The_field_is_required', 'email'),
+										required: t('Required_field', { field: t('Email') }),
 										validate: (email) => validateEmail(email) || t('error-invalid-email-address'),
 									})}
 									aria-describedby={`${emailField}-error`}
@@ -442,7 +442,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
 								<Controller
 									control={control}
 									name='chatClosingTags'
-									rules={{ required: t('The_field_is_required', 'tags') }}
+									rules={{ required: t('Required_field', 'tags') }}
 									render={({ field: { value, onChange } }) => (
 										<DepartmentTags
 											id={chatClosingTagsField}
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
index 4d025f1f25b5..f4d2e8119c39 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
@@ -122,7 +122,7 @@ const ContactNewEdit = ({ id, data, close }: ContactNewEditProps): ReactElement
 		return !contact || contact._id === id;
 	};
 
-	const validateName = (v: string): string | boolean => (!v.trim() ? t('The_field_is_required', t('Name')) : true);
+	const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
 
 	const handleContactManagerChange = async (userId: string): Promise<void> => {
 		setUserId(userId);
diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
index 60124362e97b..6545d859a9f8 100644
--- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
@@ -169,7 +169,7 @@ const EditTrigger = ({ triggerData }: { triggerData?: Serialized<ILivechatTrigge
 								<Controller
 									name='name'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Name')) }}
+									rules={{ required: t('Required_field', { field: t('Name') }) }}
 									render={({ field }) => (
 										<TextInput
 											{...field}
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
index 16c98520bc38..6b8f11b9203e 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
@@ -69,7 +69,7 @@ export const ActionExternalServiceUrl = ({ control, trigger, index, disabled, ..
 					control={control}
 					defaultValue=''
 					rules={{
-						required: t('The_field_is_required', t('External_service_url')),
+						required: t('Required_field', { field: t('External_service_url') }),
 						validate: testExternalService,
 						deps: serviceTimeoutFieldName,
 					}}
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
index c684a2b2744b..c53cd1e076ab 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
@@ -46,7 +46,7 @@ export const ExternalServiceActionForm = ({ control, trigger, index, ...props }:
 						name={timeoutFieldName}
 						defaultValue={10000}
 						rules={{
-							required: t('The_field_is_required', t('Timeout_in_miliseconds')),
+							required: t('Required_field', { field: t('Timeout_in_miliseconds') }),
 							min: { value: 0, message: t('Timeout_in_miliseconds_cant_be_negative_number') },
 						}}
 						render={({ field }) => {
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
index e267f873135d..c48083054e40 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
@@ -34,7 +34,7 @@ export const SendMessageActionForm = ({ control, index, ...props }: SendMessageA
 						control={control}
 						name={name}
 						defaultValue=''
-						rules={{ required: t('The_field_is_required', t('Message')) }}
+						rules={{ required: t('Required_field', { field: t('Message') }) }}
 						render={({ field }) => (
 							<TextAreaInput
 								error={messageError?.message}
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index b49ddb845cdd..b2aac49927a1 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -256,7 +256,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 									name='roomName'
 									control={control}
 									rules={{
-										required: t('error-the-field-is-required', { field: t('Name') }),
+										required: t('Required_field', { field: t('Name') }),
 										validate: (value) => validateName(value),
 									}}
 									render={({ field }) => (
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
index d62ebb96befa..5f94f7c407b0 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
@@ -1,4 +1,5 @@
 import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { ComponentProps } from 'react';
 import React from 'react';
@@ -8,14 +9,14 @@ import { useTranslation } from 'react-i18next';
 import GenericModal from '../../../../components/GenericModal/GenericModal';
 
 type ReportUserModalProps = {
-	onConfirm: (description: string) => void;
+	onConfirm: (reasonForReport: string) => void;
 	onClose: () => void;
 	displayName: string;
 	username: string;
 };
 
 type ReportUserModalsFields = {
-	description: string;
+	reasonForReport: string;
 };
 
 const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUserModalProps) => {
@@ -25,16 +26,18 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 		formState: { errors },
 	} = useForm<ReportUserModalsFields>({
 		defaultValues: {
-			description: '',
+			reasonForReport: '',
 		},
 	});
 
 	const { t } = useTranslation();
 
+	const reasonForReportId = useUniqueId();
+
 	return (
 		<GenericModal
 			wrapperFunction={(props: ComponentProps<typeof Box>) => (
-				<Box is='form' onSubmit={handleSubmit(({ description }) => onConfirm(description))} {...props} />
+				<Box is='form' onSubmit={handleSubmit(({ reasonForReport }) => onConfirm(reasonForReport))} {...props} />
 			)}
 			variant='danger'
 			title={t('Report_User')}
@@ -44,7 +47,7 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 		>
 			<FieldGroup>
 				<Field>
-					<FieldLabel>
+					<FieldLabel htmlFor={reasonForReportId}>
 						<Box mbe='x12' display='flex' alignItems='center'>
 							<UserAvatar username={username} />
 							<Box mis='x12' fontScale='p1' fontWeight='700'>
@@ -56,12 +59,13 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 						<TextAreaInput
 							rows={3}
 							placeholder={t('Why_do_you_want_to_report_question_mark')}
-							{...register('description', { required: t('Please_fill_out_reason_for_report') })}
+							{...register('reasonForReport', { required: t('Required_field', { field: t('Reason_for_report') }) })}
 							width='full'
 							mbe='x4'
+							aria-label={t('Reason_for_report')}
 						/>
 					</FieldRow>
-					{errors.description && <FieldError>{errors.description.message}</FieldError>}
+					{errors.reasonForReport && <FieldError>{errors.reasonForReport.message}</FieldError>}
 				</Field>
 			</FieldGroup>
 		</GenericModal>
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
index 312776397b32..23135d9b961e 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
@@ -47,7 +47,7 @@ const FileUploadModal = ({
 		if (!name) {
 			return dispatchToastMessage({
 				type: 'error',
-				message: t('error-the-field-is-required', { field: t('Name') }),
+				message: t('Required_field', { field: t('Upload_file_name') }),
 			});
 		}
 
@@ -99,7 +99,7 @@ const FileUploadModal = ({
 							<FieldRow>
 								<TextInput value={name} onChange={handleName} />
 							</FieldRow>
-							{!name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+							{!name && <FieldError>{t('Required_field', { field: t('Upload_file_name') })}</FieldError>}
 						</Field>
 						{showDescription && (
 							<Field>
@@ -116,7 +116,7 @@ const FileUploadModal = ({
 						<Button secondary onClick={onClose}>
 							{t('Cancel')}
 						</Button>
-						<Button primary type='submit' disabled={!name}>
+						<Button primary type='submit'>
 							{t('Send')}
 						</Button>
 					</Modal.FooterControllers>
diff --git a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
index 7e003f79a208..63ebaecc5eb6 100644
--- a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
+++ b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
@@ -55,23 +55,32 @@ const AddWebdavAccountModal = ({ onClose, onConfirm }: AddWebdavAccountModalProp
 					<Field>
 						<FieldLabel>{t('Webdav_Server_URL')}</FieldLabel>
 						<FieldRow>
-							<TextInput placeholder={t('Webdav_Server_URL')} {...register('serverURL', { required: true })} />
+							<TextInput
+								placeholder={t('Webdav_Server_URL')}
+								{...register('serverURL', { required: t('Required_field', { field: t('Webdav_Server_URL') }) })}
+							/>
 						</FieldRow>
-						{errors.serverURL && <FieldError>{t('error-the-field-is-required', { field: t('Webdav_Server_URL') })}</FieldError>}
+						{errors.serverURL && <FieldError>{errors.serverURL.message}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Username')}</FieldLabel>
 						<FieldRow>
-							<TextInput placeholder={t('Username')} {...register('username', { required: true })} />
+							<TextInput
+								placeholder={t('Username')}
+								{...register('username', { required: t('Required_field', { field: t('Username') }) })}
+							/>
 						</FieldRow>
-						{errors.username && <FieldError>{t('error-the-field-is-required', { field: t('Username') })}</FieldError>}
+						{errors.username && <FieldError>{errors.username.message}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Password')}</FieldLabel>
 						<FieldRow>
-							<PasswordInput placeholder={t('Password')} {...register('password', { required: true })} />
+							<PasswordInput
+								placeholder={t('Password')}
+								{...register('password', { required: t('Required_field', { field: t('Password') }) })}
+							/>
 						</FieldRow>
-						{errors.password && <FieldError>{t('error-the-field-is-required', { field: t('Password') })}</FieldError>}
+						{errors.password && <FieldError>{errors.password.message}</FieldError>}
 					</Field>
 				</FieldGroup>
 			</Modal.Content>
diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
index c51763bee733..e64a4e33c1bb 100644
--- a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
+++ b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
@@ -30,7 +30,7 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
 		control,
 		handleSubmit,
 		formState: { errors },
-	} = useForm<{ accountId: string }>();
+	} = useForm<{ accountId: string }>({ mode: 'all' });
 
 	const enabled = useSetting<boolean>('Webdav_Integration_Enabled', false);
 
@@ -98,13 +98,13 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
 								<Controller
 									name='accountId'
 									control={control}
-									rules={{ required: true }}
+									rules={{ required: t('Required_field', { field: t('Select_a_webdav_server') }) }}
 									render={({ field }): ReactElement => (
 										<Select {...field} options={accountsOptions} id={accountIdField} placeholder={t('Select_an_option')} />
 									)}
 								/>
 							</FieldRow>
-							{errors.accountId && <FieldError>{t('Field_required')}</FieldError>}
+							{errors.accountId && <FieldError>{errors.accountId.message}</FieldError>}
 						</Field>
 					</FieldGroup>
 				)}
diff --git a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
index bfbbce5d37e1..fd1691bcb16d 100644
--- a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
+++ b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
@@ -105,7 +105,10 @@ const RegisterUsername = () => {
 							<Field>
 								<FieldLabel id='username-label'>{t('Username')}</FieldLabel>
 								<FieldRow>
-									<TextInput aria-labelledby='username-label' {...register('username', { required: t('Username_cant_be_empty') })} />
+									<TextInput
+										aria-labelledby='username-label'
+										{...register('username', { required: t('Required_field', { field: t('Username') }) })}
+									/>
 								</FieldRow>
 								{errors.username && (
 									<FieldError>
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
index d0e7b7133423..d3c667e20f82 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
@@ -42,7 +42,7 @@ const URL = {
 };
 
 const ERROR = {
-	nameRequired: 'The field Name is required.',
+	nameRequired: 'Name required',
 	invalidEmail: 'Invalid email address',
 	existingEmail: 'Email already exists',
 	existingPhone: 'Phone already exists',
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
index 872eafdfb2a2..023d11de4757 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
@@ -8,8 +8,8 @@ import { createDepartment, deleteDepartment } from '../utils/omnichannel/departm
 import { test, expect } from '../utils/test';
 
 const ERROR = {
-	requiredName: 'The field name is required.',
-	requiredEmail: 'The field email is required.',
+	requiredName: 'Name required',
+	requiredEmail: 'Email required',
 	invalidEmail: 'Invalid email address',
 };
 
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
index 1da1837572e5..9ee1d8d99fd9 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
@@ -8,7 +8,7 @@ import { test, expect } from '../utils/test';
 const PRIORITY_NAME = faker.person.firstName();
 
 const ERROR = {
-	fieldNameRequired: 'The field Name is required.',
+	fieldNameRequired: 'Name required',
 };
 
 test.skip(!IS_EE, 'Omnichannel Priorities > Enterprise Only');
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
index 35a371c61ba6..d5b5544e9ace 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
@@ -6,8 +6,8 @@ import { OmnichannelSlaPolicies } from '../page-objects/omnichannel-sla-policies
 import { test, expect } from '../utils/test';
 
 const ERROR = {
-	nameRequired: 'The field Name is required.',
-	estimatedWaitTimeRequired: 'The field Estimated wait time (time in minutes) is required.',
+	nameRequired: 'Name required',
+	estimatedWaitTimeRequired: 'Estimated wait time (time in minutes) required',
 };
 
 const INITIAL_SLA = {
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index 40ab367489b6..661360c109b2 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -2367,7 +2367,6 @@
   "The_application_name_is_required": "Die aansoek naam is nodig",
   "The_channel_name_is_required": "Die kanaal naam is nodig",
   "The_emails_are_being_sent": "Die e-posse word gestuur.",
-  "The_field_is_required": "Die veld%s is nodig.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die grootte van die prentjie sal nie werk nie omdat ons ImageMagick of GraphicsMagick nie op u bediener geïnstalleer het nie.",
   "The_redirectUri_is_required": "Die redirectUri is nodig",
   "The_server_will_restart_in_s_seconds": "Die bediener sal herbegin in%s sekondes",
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index d3a86879f716..6d3d406e6c81 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -4126,8 +4126,7 @@
   "The_application_name_is_required": "اسم التطبيق مطلوب",
   "The_channel_name_is_required": "اسم القناة مطلوب",
   "The_emails_are_being_sent": "يتم إرسال رسائل البريد الإلكتروني.",
-  "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرفة الفارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",
-  "The_field_is_required": "الحقل %s مطلوب.",
+  "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرفة الفارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "لن يعمل تغيير حجم الصورة لأننا لا نستطيع اكتشاف تثبيت ImageMagick أو GraphicsMagick على الخادم الخاص بك.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "الرسالة عبارة عن مناقشة أنك لن تتمكن من استعادة الرسائل!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "تم تعطيل إشعارات الهاتف المحمول لجميع المستخدمين، انتقل إلى \"المسؤول > منبثق\" لتمكين البوابة المنبثقة مرة أخرى",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 118be4b37920..7b1c3f48fa1c 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -2366,8 +2366,7 @@
   "Thank_you_for_your_feedback": "Əlaqə üçün təşəkkür edirik",
   "The_application_name_is_required": "Ərizə adı tələb olunur",
   "The_channel_name_is_required": "Kanal adı tələb olunur",
-  "The_emails_are_being_sent": "E-poçt göndərilir.",
-  "The_field_is_required": "%s sahə tələb olunur.",
+  "The_emails_are_being_sent": "E-poçt göndərilir.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick və ya GraphicsMagick-i serverinizdə yükləməyəcəyimiz üçün şəkil ölçüsünün işləməyəcəyi.",
   "The_redirectUri_is_required": "RedirectUri tələb olunur",
   "The_server_will_restart_in_s_seconds": "Server%s saniyə ərzində yenidən başlayacaq",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index 858688468755..daea286edfed 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -2384,8 +2384,7 @@
   "Thank_you_for_your_feedback": "Дзякуй за ваш водгук",
   "The_application_name_is_required": "Імя прыкладання патрабуецца",
   "The_channel_name_is_required": "Назва канала патрабуецца",
-  "The_emails_are_being_sent": "Лісты былі адпраўленыя.",
-  "The_field_is_required": "Поле %s патрабуецца.",
+  "The_emails_are_being_sent": "Лісты былі адпраўленыя.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Змяніць памер малюнка не будзе працаваць, таму што мы не можам выявіць ImageMagick або GraphicsMagick усталяваны на вашым серверы.",
   "The_redirectUri_is_required": "RedirectUri патрабуецца",
   "The_server_will_restart_in_s_seconds": "Сервер будзе перазагружаны у %s секунд",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index ac7c8ddcd000..f7bc5ad2cf8f 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -2363,8 +2363,7 @@
   "Thank_you_for_your_feedback": "Благодарим Ви за обратната връзка",
   "The_application_name_is_required": "Името на приложението е задължително",
   "The_channel_name_is_required": "Името на канала е задължително",
-  "The_emails_are_being_sent": "Изпращат се имейлите.",
-  "The_field_is_required": "Полето %s е задължително.",
+  "The_emails_are_being_sent": "Изпращат се имейлите.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Размерът на изображението няма да работи, защото не можем да открием ImageMagick или GraphicsMagick, инсталирани на вашия сървър.",
   "The_redirectUri_is_required": "Необходимо е пренасочването",
   "The_server_will_restart_in_s_seconds": "Сървъра ще бъде рестартиран след %s секунди",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index ebe0b045c418..85e70bbb0abc 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -2360,8 +2360,7 @@
   "Thank_you_for_your_feedback": "Hvala vam na povratnim informacijama",
   "The_application_name_is_required": "Naziv aplikacije je potreban",
   "The_channel_name_is_required": "Ime sobe je potrebno",
-  "The_emails_are_being_sent": "E-mailovi su poslani.",
-  "The_field_is_required": "Polje %s je traženo.",
+  "The_emails_are_being_sent": "E-mailovi su poslani.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veličine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vašem poslužitelju.",
   "The_redirectUri_is_required": "RedirectUri je potrebno",
   "The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 3f74fc967416..f4d304e08633 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -4044,8 +4044,7 @@
   "The_application_name_is_required": "El nom de laplicació és obligatori.",
   "The_channel_name_is_required": "Es requereix el nom del canal",
   "The_emails_are_being_sent": "Els missatges de correu-e s'estan enviant.",
-  "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automàticament.",
-  "The_field_is_required": "El camp %s és obligatori.",
+  "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automàticament.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "L'ajust de mida de les imatges no funcionarà perquè no podem detectar ni ImageMagick ni GraphicsMagick al servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "El missatge és una discussió, no podrà recuperar els missatges!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notificacions mòbils es deshabilitaron per a tots els usuaris, aneu a \"Admin> Push\" per habilitar Push inici novament",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index 914d6c35d485..a74224912766 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -3413,8 +3413,7 @@
   "The_application_name_is_required": "Název aplikace je vyžadován",
   "The_channel_name_is_required": "Název místnosti je vyžadován",
   "The_emails_are_being_sent": "Tyto e-maily jsou odesílány.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Prázdná místnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstraněna.",
-  "The_field_is_required": "Pole %s je povinné.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Prázdná místnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstraněna.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Nelze změnit velikost obrázku, protože na serveru nebyl nalezen ImageMagick ani GraphicsMagick.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Zpráva je diskuse, ze které nebudete moci obnovit zprávy!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilní oznámení byla deaktivována všem uživatelům, v admin sekci \"Notifikace\" znovu aktivujte Push Gateway",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index f9c7b4d7ec87..7f63d511201f 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -2361,8 +2361,7 @@
   "Thank_you_for_your_feedback": "Diolch i chi am eich adborth",
   "The_application_name_is_required": "Mae angen enw'r cais",
   "The_channel_name_is_required": "Mae angen enw'r sianel",
-  "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",
-  "The_field_is_required": "Mae'r maes %s yn ofynnol.",
+  "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ni fydd maint y delwedd yn gweithio oherwydd na allwn ganfod ImageMagick neu GraphicsMagick ar eich gweinydd.",
   "The_redirectUri_is_required": "Mae angen y redirectUri",
   "The_server_will_restart_in_s_seconds": "Bydd y gweinydd yn ailgychwyn yn %s eiliad",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index a675ab4843c0..2aabbfcd8642 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -3521,8 +3521,7 @@
   "The_application_name_is_required": "Ansøgningsnavnet er påkrævet",
   "The_channel_name_is_required": "Kanalnavnet er påkrævet",
   "The_emails_are_being_sent": "E-mailsne bliver sendt.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",
-  "The_field_is_required": "Feltet%s er påkrævet.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Billedforstørrelsen fungerer ikke, fordi vi ikke kan opdage ImageMagick eller GraphicsMagick installeret på din server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelelsen er en diskussion og du vil derfor ikke kunne gendanne meddelelserne!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilmeddelelser blev deaktiveret for alle brugere. Tilgå \"Admin > Push\" for at aktivere Push Gateway igen",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index 0be8030f5738..bbe960596a28 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -2368,8 +2368,7 @@
   "Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung.",
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden.",
   "The_channel_name_is_required": "Ein Name für den Raum muss angegeben werden.",
-  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",
-  "The_field_is_required": "Das Feld %s ist erforderlich.",
+  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_redirectUri_is_required": "Es muss eine Weiterleitung-URL angegeben werden.",
   "The_server_will_restart_in_s_seconds": "Der Server wird in %s Sekunden neu gestartet",
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index 41da8fb3c809..edccd128e314 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -2661,8 +2661,7 @@
   "Thank_you_for_your_feedback": "Vielen Dank für Deine Rückmeldung",
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
   "The_channel_name_is_required": "Ein Name für den Kanal muss angegeben werden",
-  "The_emails_are_being_sent": "E-Mails werden gesendet",
-  "The_field_is_required": "Das Feld %s ist erforderlich",
+  "The_emails_are_being_sent": "E-Mails werden gesendet",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Du diese löschst, wirst Du die Nachrichten der Diskussion nicht mehr auffinden können.",
   "The_peer__peer__does_not_exist": "Der Peer <em>{{peer}}</ em> ist nicht vorhanden.",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index 72963c308e67..59e329014186 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -4635,8 +4635,7 @@
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
   "The_channel_name_is_required": "Ein Name für den Channel muss angegeben werden",
   "The_emails_are_being_sent": "E-Mails werden gesendet",
-  "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",
-  "The_field_is_required": "Das Feld %s ist erforderlich",
+  "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Sie diese löschen, werden Sie die Nachrichten der Diskussion nicht mehr auffinden können.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Die mobilen Benachrichtigungen wurden für alle Benutzer deaktiviert, wechseln Sie zu \"Admin > Push\", um das Push-Gateway erneut zu aktivieren",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 731a56695f7a..3e335c6638d3 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -2373,8 +2373,7 @@
   "Thank_you_for_your_feedback": "Ευχαριστούμε για τα σχόλιά σας",
   "The_application_name_is_required": "Το όνομα της εφαρμογής απαιτείται",
   "The_channel_name_is_required": "Το όνομα του καναλιού απαιτείται",
-  "The_emails_are_being_sent": "Τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",
-  "The_field_is_required": "Το πεδίο %s απαιτείται.",
+  "The_emails_are_being_sent": "Τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Το μέγεθος της εικόνας δεν θα λειτουργήσει, επειδή δεν μπορεί να ανιχνεύσει ImageMagick ή GraphicsMagick εγκατεστημένο στον server σας.",
   "The_redirectUri_is_required": "Η redirectUri απαιτείται",
   "The_server_will_restart_in_s_seconds": "Ο διακομιστής θα κάνει επανεκκίνηση στο %s δευτερόλεπτα",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 849582f934b7..796e9d0519ff 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1682,7 +1682,7 @@
   "Direct_Message": "Direct message",
   "Livechat_Facebook_Enabled": "Facebook integration enabled",
   "Direct_message_creation_description": "Select one or more people to message",
-  "Direct_message_creation_error": "Please select at least one person",
+  "Direct_message_creation_error": "Select at least one person",
   "Direct_message_creation_description_hint": "More people cannot be added once created",
   "Direct_message_someone": "Direct message someone",
   "Direct_message_you_have_joined": "You have joined a new direct message with",
@@ -4239,7 +4239,6 @@
   "Please_fill_all_the_information": "Please fill all the information",
   "Please_fill_an_email": "Please fill an email",
   "Please_fill_name_and_email": "Please fill name and email",
-  "Please_fill_out_reason_for_report": "Please fill out the reason for the report",
   "Please_select_an_user": "Please select an user",
   "Please_select_enabled_yes_or_no": "Please select an option for Enabled",
   "Please_select_visibility": "Please select a visibility",
@@ -4390,6 +4389,7 @@
   "Real_Time_Monitoring": "Real-time Monitoring",
   "RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names",
   "Reason_for_joining": "Reason for joining",
+  "Reason_for_report": "Reason for report",
   "Reason_To_Join": "Reason to Join",
   "Receive_alerts": "Receive alerts",
   "Receive_Group_Mentions": "Receive @all and @here mentions",
@@ -4583,6 +4583,7 @@
   "Robot_Instructions_File_Content": "Robots.txt File Contents",
   "Root": "Root",
   "Required_action": "Required action",
+  "Required_field": "{{field}} required",
   "Default_Referrer_Policy": "Default Referrer Policy",
   "Default_Referrer_Policy_Description": "This controls the 'referrer' header that's sent when requesting embedded media from other servers. For more information, refer to [this link from MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy). Remember, a full page refresh is required for this to take effect",
   "No_feature_to_preview": "No feature to preview",
@@ -5279,7 +5280,6 @@
   "The_channel_name_is_required": "The channel name is required",
   "The_emails_are_being_sent": "The emails are being sent.",
   "The_empty_room__roomName__will_be_removed_automatically": "The empty room <span style=\"font-weight: bold;\">{{roomName}}</span> will be removed automatically.",
-  "The_field_is_required": "The field %s is required.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The image resize will not work because we can not detect ImageMagick or GraphicsMagick installed on your server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "The message is a discussion you will not be able to recover the messages!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "The mobile notifications were disabled to all users, go to \"Admin > Push\" to enable the Push Gateway again",
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index 1558424c9445..907767a7f7da 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -2366,8 +2366,7 @@
   "Thank_you_for_your_feedback": "Dankon pro viaj sugestoj",
   "The_application_name_is_required": "La aplika nomo estas postulita",
   "The_channel_name_is_required": "La kanala nomo estas postulita",
-  "The_emails_are_being_sent": "La retpoŝtoj estas senditaj.",
-  "The_field_is_required": "La kampo%s estas postulita.",
+  "The_emails_are_being_sent": "La retpoŝtoj estas senditaj.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "La regrandigo de bildoj ne funkcios ĉar ni ne povas detekti ImageMagick aŭ GraphicsMagick instalitan sur via servilo.",
   "The_redirectUri_is_required": "La redirectUri estas postulita",
   "The_server_will_restart_in_s_seconds": "La servilo rekomencos en%s sekundoj",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index a276a3c51690..4a690dd7a4b2 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -4109,8 +4109,7 @@
   "The_application_name_is_required": "El nombre de la aplicación es obligatorio",
   "The_channel_name_is_required": "El nombre del canal es obligatorio",
   "The_emails_are_being_sent": "Los correos electrónicos se están enviando.",
-  "The_empty_room__roomName__will_be_removed_automatically": "La sala vacía <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",
-  "The_field_is_required": "El campo %s es obligatorio.",
+  "The_empty_room__roomName__will_be_removed_automatically": "La sala vacía <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "El ajuste de tamaño de las imágenes no funcionará porque no detectamos ImageMagick o GraphicsMagick instalados en tu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "El mensaje es una discusión, así que no podrás recuperar los mensajes",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Las notificaciones móviles se han deshabilitado para todos los usuarios. Ve a \"Administración\" > \"Push\" para habilitar puerta de enlace push nuevamente",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index c4850a7d30eb..b14bc31d7733 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -2702,7 +2702,6 @@
   "The_application_name_is_required": "نام نرم افزار مورد نیاز است",
   "The_channel_name_is_required": "نام کانال نیاز است",
   "The_emails_are_being_sent": "ایمیل در حال ارسال.",
-  "The_field_is_required": "زمینه به %s مورد نیاز است.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تغییر اندازه تصویر به کار نخواهد کرد زیرا ما نمی توانیم تشخیص ImageMagick را یا GraphicsMagick بر روی سرور خود نصب شده است.",
   "The_redirectUri_is_required": "redirectUri مورد نیاز است",
   "The_server_will_restart_in_s_seconds": "سرور در %s ثانیه راه اندازی مجدد خواهد",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index 17b5f65eab31..26ba8019aeb1 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -4727,8 +4727,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> voi:",
   "The_channel_name_is_required": "Kanavan nimi on pakollinen",
   "The_emails_are_being_sent": "Sähköpostiviestejä lähetetään.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",
-  "The_field_is_required": "Kenttä %s on pakollinen.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Kuvien koon muuttaminen ei toimi, koska ImageMagickia tai GraphicsMagickia ei havaittu asennettuna palvelimessa.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Viesti on keskustelu, et voi palauttaa näitä viestejä!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobiili-ilmoitukset oli poistettu käytöstä kaikilta käyttäjiltä. Ota Push Gateway uudelleen käyttöön kohdassa \"Admin > Push\"",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index 84d33eaf5330..80e4504d2085 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -4121,8 +4121,7 @@
   "The_application_name_is_required": "Le nom de l'application est requis",
   "The_channel_name_is_required": "Le nom du canal est obligatoire",
   "The_emails_are_being_sent": "Les e-mails sont en cours d'envoi.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",
-  "The_field_is_required": "Le champ %s est requis.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Le redimensionnement de l'image ne fonctionnera pas car nous n'avons pas trouvé ImageMagick ou GraphicsMagick installé sur votre serveur.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Le message est une discussion, vous ne pourrez pas récupérer les messages.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notifications mobiles ont été désactivées pour tous les utilisateurs, accédez à \"Admin > Push\" pour réactiver la passerelle Push",
diff --git a/packages/i18n/src/locales/he.i18n.json b/packages/i18n/src/locales/he.i18n.json
index 33a4b920b4b2..499e2ca41d2d 100644
--- a/packages/i18n/src/locales/he.i18n.json
+++ b/packages/i18n/src/locales/he.i18n.json
@@ -1304,8 +1304,7 @@
   "Thank_you_for_your_feedback": "תודה לך על המשוב",
   "The_application_name_is_required": "שם האפליקציה נדרש",
   "The_channel_name_is_required": "שם הערוץ נדרש",
-  "The_emails_are_being_sent": "האימיילים נשלחים.",
-  "The_field_is_required": "השדה %s הוא חובה.",
+  "The_emails_are_being_sent": "האימיילים נשלחים.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "שינוי גודל התמונה לא יעבוד כי אנחנו לא יכולים לזהות ImageMagick או GraphicsMagick מותקן על השרת שלך.",
   "The_redirectUri_is_required": "RedirectUri נדרש",
   "The_server_will_restart_in_s_seconds": "השרת יפעיל את עצמו מחדש בעוד ",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 1049d8495d86..090e081e83fa 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -4010,7 +4010,6 @@
   "Please_fill_all_the_information": "कृपया सारी जानकारी भरें",
   "Please_fill_an_email": "कृपया एक ईमेल भरें",
   "Please_fill_name_and_email": "कृपया नाम और ईमेल भरें",
-  "Please_fill_out_reason_for_report": "कृपया रिपोर्ट का कारण भरें",
   "Please_select_an_user": "कृपया एक उपयोगकर्ता चुनें",
   "Please_select_enabled_yes_or_no": "कृपया सक्षम के लिए एक विकल्प चुनें",
   "Please_select_visibility": "कृपया एक दृश्यता चुनें",
@@ -4988,8 +4987,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> यह करने में सक्षम होगा:",
   "The_channel_name_is_required": "चैनल का नाम आवश्यक है",
   "The_emails_are_being_sent": "ईमेल भेजे जा रहे हैं.",
-  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",
-  "The_field_is_required": "फ़ील्ड %s आवश्यक है.",
+  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "छवि का आकार बदलना काम नहीं करेगा क्योंकि हम आपके सर्वर पर स्थापित ImageMagick या ग्राफ़िक्सMagick का पता नहीं लगा सकते हैं।",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "संदेश एक चर्चा है आप संदेशों को पुनर्प्राप्त नहीं कर पाएंगे!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "मोबाइल सूचनाएं सभी उपयोगकर्ताओं के लिए अक्षम कर दी गई थीं, पुश गेटवे को फिर से सक्षम करने के लिए \"एडमिन > पुश\" पर जाएं",
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 84c4295d5201..c9547b1042e9 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -2501,7 +2501,6 @@
   "The_application_name_is_required": "Naziv aplikacije je potreban",
   "The_channel_name_is_required": "Ime sobe je potrebno",
   "The_emails_are_being_sent": "E-mailovi su poslani.",
-  "The_field_is_required": "Polje %s je traženo.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veličine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vašem poslužitelju.",
   "The_redirectUri_is_required": "RedirectUri je potrebno",
   "The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index f7f85536c183..a281e3b2c64b 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -4540,8 +4540,7 @@
   "The_application_name_is_required": "Az alkalmazás neve kötelező",
   "The_channel_name_is_required": "A csatorna neve kötelező",
   "The_emails_are_being_sent": "Az e-mailek elküldésre kerültek.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolítva.",
-  "The_field_is_required": "A(z) %s mező kötelező.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolítva.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "A kép átméretezése nem fog működni, mert nem észlelhető a kiszolgálóra telepített ImageMagick vagy GraphicsMagick program.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Az üzenet egy megbeszélés, nem lesz képes helyreállítani az üzeneteket!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "A mobil értesítések le lettek tiltva az összes felhasználó számára. Menjen az „Adminisztráció → Leküldés” menüponthoz a leküldéses átjáró újbóli engedélyezéséhez.",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index 1abc2fadd68c..6eb8dd75ec6e 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -2374,7 +2374,6 @@
   "The_application_name_is_required": "Nama aplikasi diperlukan",
   "The_channel_name_is_required": "Nama channel diperlukan",
   "The_emails_are_being_sent": "Email telah dikirim.",
-  "The_field_is_required": "Kolom %s wajib diisi",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Gambar resize tidak akan bekerja karena kita tidak dapat mendeteksi ImageMagick atau GraphicsMagick diinstal pada server Anda.",
   "The_redirectUri_is_required": "The redirectUri diperlukan",
   "The_server_will_restart_in_s_seconds": "server akan restart%s detik",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index 160dbe3cf40e..f4bbf05e2faf 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -2920,8 +2920,7 @@
   "Thank_you_for_your_feedback": "Grazie per il tuo feedback",
   "The_application_name_is_required": "Il nome dell'applicazione è richiesta",
   "The_channel_name_is_required": "Il nome del canale è richiesto",
-  "The_emails_are_being_sent": "Le email verranno inviate.",
-  "The_field_is_required": "Il campo %s è richiesto.",
+  "The_emails_are_being_sent": "Le email verranno inviate.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Il ridimensionamento dell'immagine non funzionerà se non rileva ImageMagick or GraphicsMagick installato sul tuo server.",
   "The_redirectUri_is_required": "Il redirectUri é richiesto",
   "The_server_will_restart_in_s_seconds": "Il server si riavvierà in %s secondi",
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index 982f9495d914..dcdf00bf7ed6 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -4070,8 +4070,7 @@
   "The_application_name_is_required": "アプリケーション名は必須です",
   "The_channel_name_is_required": "チャネル名は必須です",
   "The_emails_are_being_sent": "メールを送信中です。",
-  "The_empty_room__roomName__will_be_removed_automatically": "空のルーム<span style=\"font-weight: bold;\">{{roomName}}</span>は自動的に削除されます。",
-  "The_field_is_required": "%s 項目は、必須です。",
+  "The_empty_room__roomName__will_be_removed_automatically": "空のルーム<span style=\"font-weight: bold;\">{{roomName}}</span>は自動的に削除されます。",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "サーバーにインストールされたImageMagickまたはGraphicsMagickを検出できないため、画像のサイズ変更が機能しません。",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "このメッセージはメッセージを復元できないディスカッションです！",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "すべてのユーザーに対してモバイル通知が無効になりました。［管理］>［プッシュ］に移動して、プッシュゲートウェイを再度有効にしてください",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index 3c550632cc4c..8f2098ff495f 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -3165,7 +3165,6 @@
   "The_channel_name_is_required": "საჭიროა არხის სახელი",
   "The_emails_are_being_sent": "ელ.ფოსტა იგზავნება.",
   "The_empty_room__roomName__will_be_removed_automatically": "ცარიელი ოთახი <span style=\"font-weight: bold;\">{{roomName}}</span> ავტომატურად მოიხსნება.",
-  "The_field_is_required": "ველი %s აუცილებელია.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "სურათის ზომის შეცვლა არ იმუშავებს, რადგან ჩვენ ვერ ვპოულობთ თქვენს სერვერზე დაყენებულ ImageMagick ან GraphicsMagick-ს.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "შეტყობინება არის განხილვა და თქვენ ვერ შეძლებთ შეტყობინებების აღდგენას",
   "The_redirectUri_is_required": "გადამისამართების ლინკია საჭირო",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index 997ee66a00e7..8927c7f3335b 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -2691,8 +2691,7 @@
   "Thank_you_for_your_feedback": "សូមអរគុណសម្រាប់មតិរបស់អ្នក",
   "The_application_name_is_required": "ឈ្មោះកម្មវិធីនេះគឺត្រូវបានទាមទារ",
   "The_channel_name_is_required": "ឈ្មោះឆានែលនេះគឺត្រូវបានទាមទារ",
-  "The_emails_are_being_sent": "នេះ​អ៊ីមែល​ត្រូវ​បាន​បញ្ជូន​។",
-  "The_field_is_required": "ចន្លោះ %s ត្រូវ​បំពេញ",
+  "The_emails_are_being_sent": "នេះ​អ៊ីមែល​ត្រូវ​បាន​បញ្ជូន​។",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ប្ដូរទំហំរូបភាពនឹងមិនធ្វើការដោយសារតែយើងមិនអាចរកឃើញ ImageMagick ឬ GraphicsMagick ដែលបានដំឡើងនៅលើម៉ាស៊ីនបម្រើរបស់អ្នក។",
   "The_redirectUri_is_required": "redirectUri នេះគឺត្រូវបានទាមទារ",
   "The_server_will_restart_in_s_seconds": "ម៉ាស៊ីនបម្រើនេះនឹងចាប់ផ្ដើមឡើងវិញនៅក្នុង %s វិនាទី",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index ad5818ab9f85..5df1f0db78ba 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -3470,8 +3470,7 @@
   "The_application_name_is_required": "응용프로그램명이 필요합니다.",
   "The_channel_name_is_required": "채널명이 필요합니다.",
   "The_emails_are_being_sent": "이메일을 전송 중입니다.",
-  "The_empty_room__roomName__will_be_removed_automatically": "사용하지 않는 대화방 <span style=\"font-weight: bold;\">{{roomName}}</span>은 자동으로 제거됩니다.",
-  "The_field_is_required": "%s 필드는 필수 항목입니다.",
+  "The_empty_room__roomName__will_be_removed_automatically": "사용하지 않는 대화방 <span style=\"font-weight: bold;\">{{roomName}}</span>은 자동으로 제거됩니다.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "서버에 ImageMagick 또는 GraphicMagick이 설치되어 있지 않아 이미지 크기를 재조정할 수 없습니다.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "그 메시지는 메시지 복구가 불가능한 토론입니다.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "모바일 알림이 모든 사용자에게 사용 중지되었습니다. \"관리자> 푸시\"로 이동하여 푸시 게이트웨이를 다시 사용으로 변경하십시오.",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index 9b4a4d1aaeb2..a4c5e7108a2f 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -2360,8 +2360,7 @@
   "Thank_you_for_your_feedback": "Spas ji bo we Deng xwe",
   "The_application_name_is_required": "Navê sepanê pêwîst e",
   "The_channel_name_is_required": "The name kanala pêwîst e",
-  "The_emails_are_being_sent": "Mailan têne şandin.",
-  "The_field_is_required": "Li qadê %s tê xwestin.",
+  "The_emails_are_being_sent": "Mailan têne şandin.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Mezinahiyê image xebata wê ne ji ber ku em nikarin bi durustî .Pêşîn an GraphicsMagick li ser server te sazkirin.",
   "The_redirectUri_is_required": "The redirectUri pêwîst e",
   "The_server_will_restart_in_s_seconds": "ڕاژەکارەکە هەڵ ئەبێتەوە لە %s چرکەدا",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index d427b251e863..547e9274a6ff 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -2403,8 +2403,7 @@
   "Thank_you_for_your_feedback": "ຂໍ​ຂອບ​ໃຈ​ທ່ານ​ສໍາ​ລັບ​ການ​ຕໍາ​ນິ​ຕິ​ຊົມ​ຂອງ​ທ່ານ​",
   "The_application_name_is_required": "ຊື່ຄໍາຮ້ອງສະຫມັກແມ່ນຈໍາເປັນຕ້ອງ",
   "The_channel_name_is_required": "ຊື່ຊ່ອງທາງການຈໍາເປັນຕ້ອງ",
-  "The_emails_are_being_sent": "ອີເມວໄດ້ຖືກສົ່ງໄປແລ້ວ.",
-  "The_field_is_required": "ພາກສະຫນາມ %s ແມ່ນຕ້ອງການ.",
+  "The_emails_are_being_sent": "ອີເມວໄດ້ຖືກສົ່ງໄປແລ້ວ.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ການ resize ຮູບພາບຈະບໍ່ເຮັດວຽກເພາະວ່າພວກເຮົາບໍ່ສາມາດກວດພົບ ImageMagick ຫຼື GraphicsMagick ການຕິດຕັ້ງໃນເຄື່ອງແມ່ຂ່າຍຂອງທ່ານ.",
   "The_redirectUri_is_required": "The redirectUri ຈໍາເປັນຕ້ອງມີ",
   "The_server_will_restart_in_s_seconds": "ເຄື່ອງແມ່ຂ່າຍຂອງຈະເລີ່ມການເຮັດວຽກໃນ %s ວິນາທີ",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 88fb66dc554f..7408a8eeb762 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -2421,8 +2421,7 @@
   "Thank_you_for_your_feedback": "Dėkojame už jūsų atsiliepimus",
   "The_application_name_is_required": "Būtina nurodyti programos pavadinimą",
   "The_channel_name_is_required": "Reikalingas kanalo pavadinimas",
-  "The_emails_are_being_sent": "El. Laiškai siunčiami.",
-  "The_field_is_required": "Laukas%s reikalingas.",
+  "The_emails_are_being_sent": "El. Laiškai siunčiami.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Vaizdo dydžio keitimas neveiks, nes negalime nustatyti serverio \"ImageMagick\" ar \"GraphicsMagick\".",
   "The_redirectUri_is_required": "Reikia redirectUri",
   "The_server_will_restart_in_s_seconds": "Serveris bus paleistas iš naujo po%s sekundžių",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index 544eac3dbeb3..a9e38267b01c 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -2375,8 +2375,7 @@
   "Thank_you_for_your_feedback": "Paldies par jūsu atsauksmēm",
   "The_application_name_is_required": "Pieteikuma nosaukums ir nepieciešams",
   "The_channel_name_is_required": "Ir nepieciešams kanāla nosaukums",
-  "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",
-  "The_field_is_required": "Nepieciešams %s lauks.",
+  "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Attēla izmēru maiņa nestrādās, jo mēs nevaram atrast jūsu serverī uzinstalētu ImageMagick vai GraphicsMagick.",
   "The_redirectUri_is_required": "Nepieciešams RedirectUri ",
   "The_server_will_restart_in_s_seconds": "Serveris restartēsies pēc %s sekundēm",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index 60e18063b49f..407c86309db8 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -2361,8 +2361,7 @@
   "Thank_you_for_your_feedback": "Таны санал хүсэлтэнд баярлалаа",
   "The_application_name_is_required": "Програмын нэр шаардлагатай",
   "The_channel_name_is_required": "Сувгийн нэр шаардлагатай",
-  "The_emails_are_being_sent": "Э-мэйл илгээж байна.",
-  "The_field_is_required": "%s талбар шаардлагатай.",
+  "The_emails_are_being_sent": "Э-мэйл илгээж байна.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick эсвэл GraphicsMagick-г сервер дээрээ суулгаж чаддаггүй болохоор зургийн хэмжээг өөрчлөх боломжгүй.",
   "The_redirectUri_is_required": "RedirectUri шаардлагатай",
   "The_server_will_restart_in_s_seconds": "Сервер%s секундын дараа дахин эхлүүлэх болно",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index 524260560a3f..9e203c69baf3 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -2372,8 +2372,7 @@
   "Thank_you_for_your_feedback": "Terima kasih atas maklum balas anda",
   "The_application_name_is_required": "Nama permohonan diperlukan",
   "The_channel_name_is_required": "Nama saluran diperlukan",
-  "The_emails_are_being_sent": "E-mel yang sedang dihantar.",
-  "The_field_is_required": "Medan ini %s diperlukan",
+  "The_emails_are_being_sent": "E-mel yang sedang dihantar.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The saiz semula imej tidak akan berfungsi kerana kita tidak dapat mengesan ImageMagick atau GraphicsMagick dipasang pada pelayan anda.",
   "The_redirectUri_is_required": "The redirectUri diperlukan",
   "The_server_will_restart_in_s_seconds": "Server akan memulakan semula dalam %s saat",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index bf7f7ffb780c..9796181ae1bb 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -4109,8 +4109,7 @@
   "The_application_name_is_required": "De naam van de applicatie is vereist",
   "The_channel_name_is_required": "De naam van het kanaal is vereist",
   "The_emails_are_being_sent": "De e-mails worden verzonden.",
-  "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",
-  "The_field_is_required": "Het veld %s is vereist.",
+  "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Het wijzigen van de grootte van de afbeelding zal niet werken omdat we ImageMagick of GraphicsMagick niet kunnen detecteren die op uw server zijn geïnstalleerd.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Het bericht is een discussie, u kunt de berichten niet herstellen!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "De mobiele meldingen werden voor alle gebruikers uitgeschakeld, ga naar \"Admin > Push\" om de Push Gateway weer in te schakelen",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index 5bdbf2fb89cc..a89485a5f6c3 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -3962,8 +3962,7 @@
   "The_application_name_is_required": "Programnavnet kreves",
   "The_application_will_be_able_to": "<1>{{appName}}</1> vil kunne:",
   "The_channel_name_is_required": "Kanalnavnet er påkrevd",
-  "The_emails_are_being_sent": "E-postene blir sendt.",
-  "The_field_is_required": "Feltet%s er påkrevd.",
+  "The_emails_are_being_sent": "E-postene blir sendt.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Bildestørrelsen fungerer ikke fordi vi ikke kan oppdage ImageMagick eller GraphicsMagick installert på serveren din.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meldingen er en diskusjon, du vil ikke kunne gjenopprette meldingene!",
   "The_necessary_browser_permissions_for_location_sharing_are_not_granted": "De nødvendige nettlesertillatelsene for posisjonsdeling ble ikke gitt",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index b7d60c54ee2c..e909624ad4a9 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -4543,8 +4543,7 @@
   "The_application_name_is_required": "Wymagana jest nazwa aplikacji",
   "The_channel_name_is_required": "Wymagana jest nazwa pokoju",
   "The_emails_are_being_sent": "Wiadomości e-mail są wysyłane.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",
-  "The_field_is_required": "Pole %s jest wymagane.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmiana rozmiaru obrazu nie będzie działać, ponieważ nie możemy wykryć zainstalowanego ImageMagick lub GraphicsMagick na serwerze.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Wiadomość jest dyskusją, której nie będziesz w stanie odzyskać!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Powiadomienia mobilne zostały wyłączone dla wszystkich użytkowników, idź do \"Admin>Push\" aby uruchomić ponownie bramę push",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index dc62318cb230..b2575a190671 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -4223,8 +4223,7 @@
   "The_application_name_is_required": "O nome do aplicativo é obrigatório",
   "The_channel_name_is_required": "O nome do canal é obrigatório",
   "The_emails_are_being_sent": "Os e-mails estão sendo enviados.",
-  "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",
-  "The_field_is_required": "O campo %s é obrigatório.",
+  "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar se o ImageMagick ou GraphicsMagick está instalado no seu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, você não poderá recuperar as mensagens!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "As notificações móveis foram desativadas para todos os usuários, vá para  \"Admin > Push\" para ativar o Push Gateway novamente",
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 8f4acc81dbdd..84d840b92a53 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -2729,8 +2729,7 @@
   "Thank_you_for_your_feedback": "Obrigado pelo sua opinião",
   "The_application_name_is_required": "O nome da aplicação é obrigatório",
   "The_channel_name_is_required": "O nome do canal é obrigatório",
-  "The_emails_are_being_sent": "Os emails estão a ser enviados.",
-  "The_field_is_required": "O campo %s é obrigatório.",
+  "The_emails_are_being_sent": "Os emails estão a ser enviados.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar ImageMagick ou GraphicsMagick instalado no seu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, não poderá recuperar as mensagens!",
   "The_peer__peer__does_not_exist": "O par <em>{{peer}}</em> não existe.",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index aefc4d07065f..7266b1883386 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -2364,8 +2364,7 @@
   "Thank_you_for_your_feedback": "Vă mulțumim pentru feedback",
   "The_application_name_is_required": "Este nevoie de numele aplicației",
   "The_channel_name_is_required": "Este nevoie de numele canalului",
-  "The_emails_are_being_sent": "E-mail-urile sunt trimise.",
-  "The_field_is_required": "Este nevoie de câmpul %s.",
+  "The_emails_are_being_sent": "E-mail-urile sunt trimise.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Redimensionarea imaginii nu va funcționa, deoarece nu putem detecta ImageMagick sau GraphicsMagick instalat pe server.",
   "The_redirectUri_is_required": "URI de redirectare este necesar",
   "The_server_will_restart_in_s_seconds": "Serverul va reporni în %s secunde",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 1829f7f2eb08..6edc8030513f 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -4294,8 +4294,7 @@
   "The_application_name_is_required": "Требуется название приложения",
   "The_channel_name_is_required": "Требуется название канала",
   "The_emails_are_being_sent": "Письма отправляются.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Пустой чат <span style=\"font-weight: bold;\">{{roomName}}</span> будет удален автоматически.",
-  "The_field_is_required": "Поле %s обязательно.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Пустой чат <span style=\"font-weight: bold;\">{{roomName}}</span> будет удален автоматически.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Изменить размер изображения не получится, потому что мы не можем обнаружить установленные на вашем сервере ImageMagick или GraphicsMagick.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Сообщение обсуждения, вы не сможете восстановить сообщения!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Мобильные уведомления были отключены для всех пользователей, перейдите в \"Admin > Push\", чтобы снова включить Push Gateway",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index f5bc7bfcbc58..d6cf085ad972 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -2375,8 +2375,7 @@
   "Thank_you_for_your_feedback": "Ďakujeme vám za vašu spätnú väzbu",
   "The_application_name_is_required": "Názov aplikácie je povinný",
   "The_channel_name_is_required": "Názov kanála je povinný",
-  "The_emails_are_being_sent": "Posielajú sa e-maily.",
-  "The_field_is_required": "Je potrebné pole%s.",
+  "The_emails_are_being_sent": "Posielajú sa e-maily.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmena veľkosti obrázka nebude fungovať, pretože na vašom serveri nemôžeme nájsť aplikácie ImageMagick alebo GraphicsMagick.",
   "The_redirectUri_is_required": "Vyžaduje sa presmerovanie",
   "The_server_will_restart_in_s_seconds": "Server sa reštartuje v%s",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 668bb94dc2c5..64900b03860d 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -2355,8 +2355,7 @@
   "Thank_you_for_your_feedback": "Hvala za vaše mnenje",
   "The_application_name_is_required": "Ime aplikacije je obvezno",
   "The_channel_name_is_required": "Ime kanala je obvezno",
-  "The_emails_are_being_sent": "Pošiljanje e-poštnih sporočil.",
-  "The_field_is_required": "Polje %s je obvezno.",
+  "The_emails_are_being_sent": "Pošiljanje e-poštnih sporočil.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Velikost slike ne bo delovala, ker ne moremo zaznati ImageMagick ali GraphicsMagick, nameščenega na vašem strežniku.",
   "The_redirectUri_is_required": "Preusmeritveni uri (redirectUri) je zahtevan",
   "The_server_will_restart_in_s_seconds": "Strežnik se bo znova zagnal v %s sekundah",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index 312494da2e8d..c5fb06df9529 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -2365,8 +2365,7 @@
   "Thank_you_for_your_feedback": "Faleminderit për komentin tuaj",
   "The_application_name_is_required": "Emri i aplikimit është e nevojshme",
   "The_channel_name_is_required": "Emri kanal është e nevojshme",
-  "The_emails_are_being_sent": "Email janë duke u dërguar.",
-  "The_field_is_required": "Fusha %s është e nevojshme.",
+  "The_emails_are_being_sent": "Email janë duke u dërguar.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Imazhi resize nuk do të funksionojë, sepse ne nuk mund të zbulojë ImageMagick ose GraphicsMagick instaluar në serverin tuaj.",
   "The_redirectUri_is_required": "RedirectUri është e nevojshme",
   "The_server_will_restart_in_s_seconds": "Serveri do të rifillojë në %s sekonda",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index e26e8bd3862f..d60ff9ce80fe 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -2170,8 +2170,7 @@
   "Thank_you_for_your_feedback": "Хвала на повратним информацијама",
   "The_application_name_is_required": "Име апликације је потребно",
   "The_channel_name_is_required": "Име канала је потребно",
-  "The_emails_are_being_sent": "Е-поруке се шаљу.",
-  "The_field_is_required": "је обавезно поље %s.",
+  "The_emails_are_being_sent": "Е-поруке се шаљу.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ресизе слика неће радити, јер не можемо открити ИмагеМагицк или грапхицсмагицк инсталиран на вашем серверу.",
   "The_redirectUri_is_required": "РедирецтУри је потребна",
   "The_server_will_restart_in_s_seconds": "Сервер ће се поново покренути у %s секунди",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 4e436fe6c538..4f091bb77fa5 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -4735,8 +4735,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> kommer att kunna:",
   "The_channel_name_is_required": "Kanalnamnet krävs ",
   "The_emails_are_being_sent": "E-postmeddelandena  skickas.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",
-  "The_field_is_required": "Fältet %s krävs.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Det kommer inte att gå att ändra storlek på bilden, eftersom vi inte kan hitta ImageMagick eller GraphicsMagick på din server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelandet är en diskussion. Du kan inte återskapa meddelandena.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilaviseringar inaktiverades för alla användare. Gå till \"Administration > Push\" om du vill aktivera en gateway för pushmeddelanden igen",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 7a2c562d4fff..c4c941c40d7b 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -2366,7 +2366,6 @@
   "The_application_name_is_required": "விண்ணப்ப பெயர் தேவை",
   "The_channel_name_is_required": "சேனல் பெயர் தேவைப்படுகிறது",
   "The_emails_are_being_sent": "மின்னஞ்சல்களை அனுப்பி வைக்கப்படுகின்றனர்.",
-  "The_field_is_required": "துறையில்% கள் தேவை.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "நாங்கள் ImageMagick அல்லது GraphicsMagick உங்கள் சர்வரில் நிறுவப்பட்ட கண்டறிய முடியாது, ஏனெனில் படஅளவை இயங்காது.",
   "The_redirectUri_is_required": "redirecturi தேவை",
   "The_server_will_restart_in_s_seconds": "சர்வர் %s வினாடிகள் மீண்டும் தொடங்கும்",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index 7d393a3034fb..520f6ce3a20f 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -2359,8 +2359,7 @@
   "Thank_you_for_your_feedback": "ขอบคุณสำหรับความคิดเห็นของคุณ",
   "The_application_name_is_required": "ต้องระบุชื่อแอ็พพลิเคชัน",
   "The_channel_name_is_required": "ต้องระบุชื่อช่อง",
-  "The_emails_are_being_sent": "กำลังส่งอีเมล",
-  "The_field_is_required": "ต้องระบุฟิลด์%s",
+  "The_emails_are_being_sent": "กำลังส่งอีเมล",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "การปรับขนาดภาพจะไม่ทำงานเนื่องจากเราไม่สามารถตรวจพบ ImageMagick หรือ GraphicsMagick ที่ติดตั้งบนเซิร์ฟเวอร์ของคุณ",
   "The_redirectUri_is_required": "จำเป็นต้องมี redirectUri",
   "The_server_will_restart_in_s_seconds": "เซิร์ฟเวอร์จะรีสตาร์ทเป็น %s วินาที",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index 59b0c8927e23..c3e879031912 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -2801,8 +2801,7 @@
   "Thank_you_for_your_feedback": "Görüşleriniz için teşekkür ederiz",
   "The_application_name_is_required": "Uygulama adı gerekli",
   "The_channel_name_is_required": "Kanal adı gerekli",
-  "The_emails_are_being_sent": "E-postalar gönderiliyor.",
-  "The_field_is_required": "%s alanı gerekli.",
+  "The_emails_are_being_sent": "E-postalar gönderiliyor.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Biz ImageMagick veya GraphicsMagick sunucunuzda yüklü algılayamaz çünkü resim boyutlandırmak çalışmaz.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Bu ileti bir tartışma olduğu için iletileri geri getiremeyeceksiniz!",
   "The_peer__peer__does_not_exist": "<em>{{peer}}</em> adında bir eş yok.",
diff --git a/packages/i18n/src/locales/ug.i18n.json b/packages/i18n/src/locales/ug.i18n.json
index 78c3650e0038..b576cd5102cd 100644
--- a/packages/i18n/src/locales/ug.i18n.json
+++ b/packages/i18n/src/locales/ug.i18n.json
@@ -1045,8 +1045,7 @@
   "Thank_you_for_your_feedback": "سىزنىڭ ئىنكاسىڭىزگە كۆپتىن كۆپ رەھمەت",
   "The_application_name_is_required": "ئەپنىڭ ئىسمىنى چوقۇم تولدۇرىسىز",
   "The_channel_name_is_required": "قانالنىڭ ئىسمىنى چوقۇم تولدۇرۇڭ",
-  "The_emails_are_being_sent": "ئىلخەت يوللاندى",
-  "The_field_is_required": "چوقۇم تولدۇرۇڭ%sخەت بۆلىكى",
+  "The_emails_are_being_sent": "ئىلخەت يوللاندى",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تاپالمىدۇق.GraphicsMagickنى ياكىImageMagick رەسىمنىڭ چوڭ كىچىكلىكىنى ئۆزگەرتكىلى بولمىدى، چۈنكى بىز مۇلازىمتېردا قاچىلىنىپ بولغان",
   "The_redirectUri_is_required": "چوقۇم تولدۇرۇڭURIسەكرەپ يۆتكەلگەن",
   "The_server_will_restart_in_s_seconds": "سېكۇنتتىن كېيىن قايتىدىن قوزغىتىلىدۇ %s مۇلازىمىتېر",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index b8e27a4f8c34..eb2b8542d4e3 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -2911,8 +2911,7 @@
   "Thank_you_for_your_feedback": "Спасибі за ваш відгук",
   "The_application_name_is_required": "Ім'я програми потрібен",
   "The_channel_name_is_required": "Назва каналу потрібно",
-  "The_emails_are_being_sent": "Електронні листи відправляються.",
-  "The_field_is_required": "Поле %s потрібно.",
+  "The_emails_are_being_sent": "Електронні листи відправляються.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Зміни розміру зображення не буде працювати, тому що ми не можемо виявити ImageMagick або GraphicsMagick встановлений на вашому сервері.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Повідомлення - це обговорення яке ви не зможете відновити!",
   "The_redirectUri_is_required": "RedirectUri потрібно",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index bf073e9c6aee..e4ff1343a079 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -2465,8 +2465,7 @@
   "Thank_you_for_your_feedback": "Cảm ơn phản hồi của bạn",
   "The_application_name_is_required": "Tên ứng dụng là bắt buộc",
   "The_channel_name_is_required": "Tên kênh là bắt buộc",
-  "The_emails_are_being_sent": "Các email đang được gửi.",
-  "The_field_is_required": "Trường%s là bắt buộc.",
+  "The_emails_are_being_sent": "Các email đang được gửi.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Thay đổi kích thước hình ảnh sẽ không hoạt động vì chúng tôi không thể phát hiện ImageMagick hoặc GraphicsMagick được cài đặt trên máy chủ của bạn.",
   "The_redirectUri_is_required": "RedirectUri là bắt buộc",
   "The_server_will_restart_in_s_seconds": "Máy chủ sẽ khởi động lại trong%s giây",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index e9821173dc0c..2da4905ae336 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -2392,8 +2392,7 @@
   "Thank_you_for_your_feedback": "感谢您的反馈意见",
   "The_application_name_is_required": "应用程序名称是必需的",
   "The_channel_name_is_required": "频道名称是必需的",
-  "The_emails_are_being_sent": "电子邮件正在发送。",
-  "The_field_is_required": "字段 %s 必须填写。",
+  "The_emails_are_being_sent": "电子邮件正在发送。",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "图像大小调整不起作用，因为我们无法检测到服务器上安装的ImageMagick或GraphicsMagick。",
   "The_redirectUri_is_required": "redirectUri是必需的",
   "The_server_will_restart_in_s_seconds": "服务器将以％s秒为单位重新启动",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 741132996be6..7b8dc7495a84 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -3896,8 +3896,7 @@
   "The_application_name_is_required": "應用程式名稱是必需的",
   "The_channel_name_is_required": "頻道名稱是必需的",
   "The_emails_are_being_sent": "電子郵件傳送中",
-  "The_empty_room__roomName__will_be_removed_automatically": "空房間 <span style=\"font-weight: bold;\">{{roomName}}</span> 將自動刪除。",
-  "The_field_is_required": "欄位 %s 必填",
+  "The_empty_room__roomName__will_be_removed_automatically": "空房間 <span style=\"font-weight: bold;\">{{roomName}}</span> 將自動刪除。",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "圖片大小調整不會起作用，因為在我們偵測不到伺服器上安裝的 ImageMagick 或 GraphicsMagick 工具",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "此訊息是在論壇中您不可以復原訊息!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "所有使用者都停用了手機通知，請到“管理>推送”以再次啟用推送閘道",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index 323da5954332..f3e8c2e0fc9e 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -3556,8 +3556,7 @@
   "The_application_name_is_required": "应用名称必填",
   "The_channel_name_is_required": "频道名称为必填",
   "The_emails_are_being_sent": "邮件已发送。",
-  "The_empty_room__roomName__will_be_removed_automatically": "空房间 <span style=\"font-weight: bold;\">{{roomName}}</span> 将被自动移除。",
-  "The_field_is_required": "字段 %s 必填",
+  "The_empty_room__roomName__will_be_removed_automatically": "空房间 <span style=\"font-weight: bold;\">{{roomName}}</span> 将被自动移除。",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "无法调整图片尺寸，因为我们无法在服务器上找到已安装的 ImageMagick 或 GraphicsMagick 。",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "此消息是一个讨论你将无法恢复此消息!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "所有用户的移动端通知都已禁用。前往 “管理 > 推送” 再次启用推送网关",
diff --git a/packages/ui-client/src/components/CustomFieldsForm.tsx b/packages/ui-client/src/components/CustomFieldsForm.tsx
index dc464fcd23c2..98b9c3fdad79 100644
--- a/packages/ui-client/src/components/CustomFieldsForm.tsx
+++ b/packages/ui-client/src/components/CustomFieldsForm.tsx
@@ -52,7 +52,7 @@ const CustomField = <T extends FieldValues>({
 		(error: RHFFieldError) => {
 			switch (error?.type) {
 				case 'required':
-					return t('The_field_is_required', label || name);
+					return t('Required_field', { field: label || name });
 				case 'minLength':
 					return t('Min_length_is', props?.minLength);
 				case 'maxLength':
diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx
index d63886091fa0..6e28a443be63 100644
--- a/packages/web-ui-registration/src/LoginForm.tsx
+++ b/packages/web-ui-registration/src/LoginForm.tsx
@@ -162,7 +162,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 								<FieldRow>
 									<TextInput
 										{...register('usernameOrEmail', {
-											required: t('registration.component.form.requiredField'),
+											required: t('Required_field', { field: t('registration.component.form.emailOrUsername') }),
 										})}
 										placeholder={usernameOrEmailPlaceholder || t('registration.component.form.emailPlaceholder')}
 										error={errors.usernameOrEmail?.message}
@@ -184,7 +184,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 								<FieldRow>
 									<PasswordInput
 										{...register('password', {
-											required: t('registration.component.form.requiredField'),
+											required: t('Required_field', { field: t('registration.component.form.password') }),
 										})}
 										placeholder={passwordPlaceholder}
 										error={errors.password?.message}
diff --git a/packages/web-ui-registration/src/RegisterForm.tsx b/packages/web-ui-registration/src/RegisterForm.tsx
index 311593d8e9b7..ce7cb700d5c6 100644
--- a/packages/web-ui-registration/src/RegisterForm.tsx
+++ b/packages/web-ui-registration/src/RegisterForm.tsx
@@ -148,7 +148,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<TextInput
 								{...register('name', {
-									required: requireNameForRegister ? t('registration.component.form.requiredField') : false,
+									required: requireNameForRegister ? t('Required_field', { field: t('registration.component.form.name') }) : false,
 								})}
 								error={errors?.name?.message}
 								aria-required={requireNameForRegister}
@@ -171,7 +171,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<TextInput
 								{...register('email', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.email') }),
 									pattern: {
 										value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
 										message: t('registration.component.form.invalidEmail'),
@@ -198,7 +198,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<TextInput
 								{...register('username', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.username') }),
 								})}
 								error={errors?.username?.message}
 								aria-required='true'
@@ -221,7 +221,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<PasswordInput
 								{...register('password', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.password') }),
 									validate: () => (!passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
 								})}
 								error={errors.password?.message}
@@ -247,7 +247,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 							<FieldRow>
 								<PasswordInput
 									{...register('passwordConfirmation', {
-										required: t('registration.component.form.requiredField'),
+										required: t('Required_field', { field: t('registration.component.form.confirmPassword') }),
 										deps: ['password'],
 										validate: (val: string) => (watch('password') === val ? true : t('registration.component.form.invalidConfirmPass')),
 									})}
@@ -275,7 +275,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 							<FieldRow>
 								<TextAreaInput
 									{...register('reason', {
-										required: t('registration.component.form.requiredField'),
+										required: t('Required_field', { field: t('registration.component.form.reasonToJoin') }),
 									})}
 									error={errors?.reason?.message}
 									aria-required='true'
diff --git a/packages/web-ui-registration/src/ResetPasswordForm.tsx b/packages/web-ui-registration/src/ResetPasswordForm.tsx
index ae771c4494f7..9a807934d48c 100644
--- a/packages/web-ui-registration/src/ResetPasswordForm.tsx
+++ b/packages/web-ui-registration/src/ResetPasswordForm.tsx
@@ -56,7 +56,7 @@ export const ResetPasswordForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
 						<FieldRow>
 							<TextInput
 								{...register('email', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.email') }),
 									pattern: {
 										value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
 										message: t('registration.page.resetPassword.errors.invalidEmail'),

From c4fd29eecbd4fe4406987bae2532732541c9a3b7 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Sat, 14 Sep 2024 01:01:59 -0300
Subject: [PATCH 081/170] chore(deps): Patch dependencies (#33285)

---
 .../moleculer-npm-0.14.34-440e26767d.patch    |   13 +
 apps/meteor/ee/server/services/package.json   |   18 +-
 apps/meteor/package.json                      |  162 +-
 apps/uikit-playground/package.json            |   14 +-
 ee/apps/account-service/package.json          |   12 +-
 ee/apps/authorization-service/package.json    |   10 +-
 ee/apps/ddp-streamer/package.json             |   16 +-
 ee/apps/omnichannel-transcript/package.json   |   12 +-
 ee/apps/presence-service/package.json         |   10 +-
 ee/apps/queue-worker/package.json             |   12 +-
 ee/apps/stream-hub-service/package.json       |   12 +-
 ee/packages/license/package.json              |    6 +-
 ee/packages/omnichannel-services/package.json |    4 +-
 ee/packages/pdf-worker/package.json           |   12 +-
 ee/packages/ui-theming/package.json           |    6 +-
 package.json                                  |    9 +-
 packages/agenda/package.json                  |    4 +-
 packages/api-client/package.json              |    4 +-
 packages/core-services/package.json           |    6 +-
 packages/ddp-client/package.json              |    4 +-
 packages/eslint-config/package.json           |    4 +-
 packages/fuselage-ui-kit/package.json         |   12 +-
 packages/gazzodown/package.json               |   16 +-
 packages/jest-presets/package.json            |    8 +-
 packages/jwt/package.json                     |    2 +-
 packages/livechat/package.json                |   12 +-
 packages/log-format/package.json              |    2 +-
 packages/message-parser/package.json          |   20 +-
 packages/mock-providers/package.json          |    2 +-
 packages/model-typings/package.json           |    2 +-
 packages/models/package.json                  |    2 +-
 packages/password-policies/package.json       |    2 +-
 packages/patch-injection/package.json         |    2 +-
 packages/peggy-loader/package.json            |    4 +-
 packages/release-action/package.json          |    2 +-
 packages/release-changelog/package.json       |    2 +-
 packages/rest-typings/package.json            |    2 +-
 packages/server-fetch/package.json            |    2 +-
 packages/tools/package.json                   |    4 +-
 packages/ui-avatar/package.json               |    7 +-
 packages/ui-client/package.json               |   13 +-
 packages/ui-composer/package.json             |    9 +-
 packages/ui-contexts/package.json             |   10 +-
 packages/ui-kit/package.json                  |   16 +-
 packages/ui-video-conf/package.json           |    7 +-
 packages/web-ui-registration/package.json     |    8 +-
 yarn.lock                                     | 2133 +++++++++++------
 47 files changed, 1631 insertions(+), 1020 deletions(-)
 create mode 100644 .yarn/patches/moleculer-npm-0.14.34-440e26767d.patch

diff --git a/.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch b/.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch
new file mode 100644
index 000000000000..005ab83cfb48
--- /dev/null
+++ b/.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch
@@ -0,0 +1,13 @@
+diff --git a/index.d.ts b/index.d.ts
+index f64eda7889619f2a1e7cbd5bb5e3533fc8aaa182..3d815a3b7aaf426235aa92422129079aa5826908 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -725,7 +725,7 @@ declare namespace Moleculer {
+ 		this: T
+ 	) => void | Promise<void>;
+ 
+-	interface ServiceSchema<S = ServiceSettingSchema, T = void> {
++	interface ServiceSchema<S = ServiceSettingSchema, T = Service<S>> {
+ 		name: string;
+ 		version?: string | number;
+ 		settings?: S;
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 7c51605d4190..43659382eb67 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -30,7 +30,7 @@
 		"@rocket.chat/ui-kit": "workspace:~",
 		"ajv": "^8.11.0",
 		"bcrypt": "^5.0.1",
-		"body-parser": "^1.20.2",
+		"body-parser": "^1.20.3",
 		"colorette": "^2.0.20",
 		"cookie": "^0.5.0",
 		"cookie-parser": "^1.4.6",
@@ -40,7 +40,7 @@
 		"fibers": "^5.0.3",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.6.1",
 		"pino": "^8.15.0",
@@ -51,17 +51,17 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/icons": "~0.38.0",
-		"@types/cookie": "^0.5.3",
-		"@types/cookie-parser": "^1.4.5",
-		"@types/ejson": "^2.2.1",
-		"@types/express": "^4.17.20",
-		"@types/fibers": "^3.1.3",
+		"@types/cookie": "^0.5.4",
+		"@types/cookie-parser": "^1.4.7",
+		"@types/ejson": "^2.2.2",
+		"@types/express": "^4.17.21",
+		"@types/fibers": "^3.1.4",
 		"@types/node": "^14.18.63",
-		"@types/ws": "^8.5.8",
+		"@types/ws": "^8.5.12",
 		"npm-run-all": "^4.1.5",
 		"pino-pretty": "^7.6.1",
 		"pm2": "^5.2.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"volta": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index df12721c5261..9ee7e48d1794 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -66,7 +66,7 @@
 	"devDependencies": {
 		"@axe-core/playwright": "^4.7.3",
 		"@babel/core": "~7.22.20",
-		"@babel/eslint-parser": "~7.23.3",
+		"@babel/eslint-parser": "~7.23.10",
 		"@babel/plugin-proposal-nullish-coalescing-operator": "~7.18.6",
 		"@babel/plugin-proposal-optional-chaining": "~7.21.0",
 		"@babel/preset-env": "~7.22.20",
@@ -87,76 +87,76 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "0.0.13",
 		"@tanstack/react-query-devtools": "^4.19.1",
-		"@testing-library/react": "~16.0.0",
+		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
-		"@types/adm-zip": "^0.5.3",
+		"@types/adm-zip": "^0.5.5",
 		"@types/archiver": "^5.3.4",
-		"@types/bad-words": "^3.0.2",
-		"@types/bcrypt": "^5.0.1",
-		"@types/body-parser": "^1.19.4",
-		"@types/busboy": "^1.5.2",
-		"@types/chai": "~4.3.16",
-		"@types/chai-as-promised": "^7.1.7",
-		"@types/chai-datetime": "0.0.38",
-		"@types/chai-dom": "1.11.2",
-		"@types/chai-spies": "~1.0.5",
-		"@types/codemirror": "^5.60.12",
-		"@types/cookie-parser": "^1.4.5",
-		"@types/cors": "^2.8.15",
-		"@types/cssom": "^0.4.2",
+		"@types/bad-words": "^3.0.3",
+		"@types/bcrypt": "^5.0.2",
+		"@types/body-parser": "^1.19.5",
+		"@types/busboy": "^1.5.4",
+		"@types/chai": "~4.3.19",
+		"@types/chai-as-promised": "^7.1.8",
+		"@types/chai-datetime": "0.0.39",
+		"@types/chai-dom": "1.11.3",
+		"@types/chai-spies": "~1.0.6",
+		"@types/codemirror": "^5.60.15",
+		"@types/cookie-parser": "^1.4.7",
+		"@types/cors": "^2.8.17",
+		"@types/cssom": "^0.4.3",
 		"@types/dompurify": "^2.3.3",
-		"@types/ejson": "^2.2.1",
-		"@types/express": "^4.17.20",
+		"@types/ejson": "^2.2.2",
+		"@types/express": "^4.17.21",
 		"@types/express-rate-limit": "^5.1.3",
-		"@types/fibers": "^3.1.3",
-		"@types/google-libphonenumber": "^7.4.29",
-		"@types/gravatar": "^1.8.5",
+		"@types/fibers": "^3.1.4",
+		"@types/google-libphonenumber": "^7.4.30",
+		"@types/gravatar": "^1.8.6",
 		"@types/he": "^1.1.2",
-		"@types/i18next-sprintf-postprocessor": "^0.2.2",
-		"@types/imap": "^0.8.39",
-		"@types/jest": "~29.5.12",
+		"@types/i18next-sprintf-postprocessor": "^0.2.3",
+		"@types/imap": "^0.8.40",
+		"@types/jest": "~29.5.13",
 		"@types/jsdom": "^16.2.15",
-		"@types/jsdom-global": "^3.0.6",
-		"@types/jsrsasign": "^10.5.11",
-		"@types/later": "^1.2.8",
+		"@types/jsdom-global": "^3.0.7",
+		"@types/jsrsasign": "^10.5.14",
+		"@types/later": "^1.2.9",
 		"@types/ldapjs": "^2.2.5",
-		"@types/less": "~3.0.5",
+		"@types/less": "~3.0.6",
 		"@types/lodash.clonedeep": "^4.5.9",
-		"@types/lodash.get": "^4.4.8",
-		"@types/mailparser": "^3.4.3",
+		"@types/lodash.get": "^4.4.9",
+		"@types/mailparser": "^3.4.4",
 		"@types/marked": "^4.0.8",
 		"@types/meteor": "^2.9.8",
-		"@types/meteor-collection-hooks": "^0.8.8",
+		"@types/meteor-collection-hooks": "^0.8.9",
 		"@types/mkdirp": "^1.0.2",
 		"@types/mocha": "github:whitecolor/mocha-types",
 		"@types/moment-timezone": "^0.5.30",
 		"@types/node": "^14.18.63",
-		"@types/node-gcm": "^1.0.3",
-		"@types/node-rsa": "^1.1.3",
-		"@types/nodemailer": "^6.4.13",
-		"@types/oauth2-server": "^3.0.15",
-		"@types/parseurl": "^1.3.2",
-		"@types/prometheus-gc-stats": "^0.6.3",
-		"@types/proxyquire": "^1.3.30",
-		"@types/psl": "^1.1.2",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
-		"@types/rewire": "^2.5.29",
+		"@types/node-gcm": "^1.0.5",
+		"@types/node-rsa": "^1.1.4",
+		"@types/nodemailer": "^6.4.15",
+		"@types/oauth2-server": "^3.0.17",
+		"@types/parseurl": "^1.3.3",
+		"@types/prometheus-gc-stats": "^0.6.4",
+		"@types/proxyquire": "^1.3.31",
+		"@types/psl": "^1.1.3",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
+		"@types/rewire": "^2.5.30",
 		"@types/sanitize-html": "^2.9.3",
 		"@types/semver": "^7.3.10",
 		"@types/sharp": "^0.30.5",
 		"@types/sinon": "^10.0.20",
-		"@types/strict-uri-encode": "^2.0.1",
+		"@types/strict-uri-encode": "^2.0.2",
 		"@types/string-strip-html": "^5.0.1",
-		"@types/supertest": "^2.0.15",
-		"@types/supports-color": "~7.2.0",
-		"@types/textarea-caret": "^3.0.2",
-		"@types/ua-parser-js": "^0.7.38",
-		"@types/use-subscription": "^1.0.1",
-		"@types/use-sync-external-store": "^0.0.5",
+		"@types/supertest": "^2.0.16",
+		"@types/supports-color": "~7.2.1",
+		"@types/textarea-caret": "^3.0.3",
+		"@types/ua-parser-js": "^0.7.39",
+		"@types/use-subscription": "^1.0.2",
+		"@types/use-sync-external-store": "^0.0.6",
 		"@types/uuid": "^8.3.4",
-		"@types/xml-crypto": "~1.4.4",
-		"@types/xml-encryption": "~1.2.3",
+		"@types/xml-crypto": "~1.4.6",
+		"@types/xml-encryption": "~1.2.4",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"autoprefixer": "^9.8.8",
@@ -164,12 +164,12 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"babel-plugin-istanbul": "^6.1.1",
 		"chai": "^4.3.10",
-		"chai-as-promised": "^7.1.1",
-		"chai-datetime": "^1.8.0",
+		"chai-as-promised": "^7.1.2",
+		"chai-datetime": "^1.8.1",
 		"chai-dom": "^1.11.0",
 		"chai-spies": "~1.0.0",
 		"cross-env": "^7.0.3",
-		"docker-compose": "^0.24.3",
+		"docker-compose": "^0.24.8",
 		"emojione-assets": "^4.5.0",
 		"eslint": "~8.45.0",
 		"eslint-config-prettier": "~8.8.0",
@@ -179,7 +179,7 @@
 		"eslint-plugin-playwright": "~0.15.3",
 		"eslint-plugin-prettier": "~4.2.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-testing-library": "~6.2.2",
 		"eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0",
 		"fast-glob": "^3.2.12",
@@ -190,8 +190,8 @@
 		"nyc": "^15.1.0",
 		"outdent": "~0.8.0",
 		"pino-pretty": "^7.6.1",
-		"playwright-qase-reporter": "^1.2.1",
-		"postcss": "~8.4.31",
+		"playwright-qase-reporter": "^1.2.2",
+		"postcss": "~8.4.45",
 		"postcss-custom-properties": "^11.0.0",
 		"postcss-easy-import": "^3.0.0",
 		"postcss-load-config": "^3.1.4",
@@ -200,7 +200,7 @@
 		"postcss-url": "^10.1.3",
 		"prettier": "~2.8.8",
 		"proxyquire": "^2.1.3",
-		"react-docgen-typescript-plugin": "^1.0.5",
+		"react-docgen-typescript-plugin": "^1.0.8",
 		"rewire": "^6.0.0",
 		"sinon": "^14.0.2",
 		"source-map": "^0.7.4",
@@ -209,7 +209,7 @@
 		"supertest": "^6.2.3",
 		"supports-color": "~7.2.0",
 		"template-file": "^6.0.1",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"dependencies": {
@@ -217,7 +217,7 @@
 		"@bugsnag/js": "~7.20.2",
 		"@bugsnag/plugin-react": "~7.19.0",
 		"@google-cloud/storage": "^6.11.0",
-		"@kaciras/deasync": "^1.0.3",
+		"@kaciras/deasync": "^1.0.4",
 		"@nivo/bar": "0.84.0",
 		"@nivo/core": "0.84.0",
 		"@nivo/heatmap": "0.84.0",
@@ -252,7 +252,7 @@
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/instance-status": "workspace:^",
 		"@rocket.chat/jwt": "workspace:^",
-		"@rocket.chat/layout": "~0.31.26",
+		"@rocket.chat/layout": "~0.31.27",
 		"@rocket.chat/license": "workspace:^",
 		"@rocket.chat/log-format": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
@@ -287,15 +287,15 @@
 		"@slack/bolt": "^3.14.0",
 		"@slack/rtm-api": "^6.0.0",
 		"@tanstack/react-query": "^4.16.1",
-		"@types/cookie": "^0.5.3",
+		"@types/cookie": "^0.5.4",
 		"@types/katex": "^0.14.0",
 		"@types/lodash": "^4.14.200",
-		"@types/lodash.debounce": "^4.0.8",
-		"@types/object-path": "^0.11.3",
-		"@types/proxy-from-env": "^1.0.3",
-		"@types/speakeasy": "^2.0.9",
+		"@types/lodash.debounce": "^4.0.9",
+		"@types/object-path": "^0.11.4",
+		"@types/proxy-from-env": "^1.0.4",
+		"@types/speakeasy": "^2.0.10",
 		"@xmldom/xmldom": "^0.8.10",
-		"adm-zip": "0.5.10",
+		"adm-zip": "0.5.16",
 		"ajv": "^8.11.0",
 		"ajv-formats": "~2.1.1",
 		"apn": "2.2.0",
@@ -306,14 +306,14 @@
 		"aws-sdk": "^2.1363.0",
 		"bad-words": "^3.0.4",
 		"bcrypt": "^5.0.1",
-		"body-parser": "1.20.2",
+		"body-parser": "1.20.3",
 		"bson": "^4.6.4",
 		"busboy": "^1.6.0",
 		"bytebuffer": "5.0.1",
 		"chalk": "^4.0.0",
 		"change-case": "^4.1.2",
 		"chart.js": "^3.8.0",
-		"codemirror": "^5.65.15",
+		"codemirror": "^5.65.17",
 		"colorette": "^2.0.20",
 		"colors": "^1.4.0",
 		"connect": "^3.7.0",
@@ -321,7 +321,7 @@
 		"cookie-parser": "^1.4.6",
 		"cors": "^2.8.5",
 		"cron": "~1.8.2",
-		"css-vars-ponyfill": "^2.4.8",
+		"css-vars-ponyfill": "^2.4.9",
 		"csv-parse": "^5.2.0",
 		"date-fns": "^2.28.0",
 		"date.js": "~0.3.3",
@@ -342,7 +342,7 @@
 		"filenamify": "^4.3.0",
 		"filesize": "9.0.11",
 		"generate-password": "^1.7.1",
-		"google-libphonenumber": "^3.2.33",
+		"google-libphonenumber": "^3.2.38",
 		"gravatar": "^1.8.2",
 		"he": "^1.2.0",
 		"highlight.js": "^11.6.0",
@@ -361,7 +361,7 @@
 		"jsdom": "^16.7.0",
 		"jsrsasign": "^10.5.24",
 		"juice": "^8.0.0",
-		"katex": "~0.16.9",
+		"katex": "~0.16.11",
 		"ldap-escape": "^2.0.6",
 		"ldapjs": "^2.3.3",
 		"limax": "^3.0.0",
@@ -372,13 +372,13 @@
 		"mailparser": "^3.4.0",
 		"marked": "^4.2.5",
 		"mem": "^8.1.1",
-		"meteor-node-stubs": "^1.2.5",
+		"meteor-node-stubs": "^1.2.10",
 		"mime-db": "^1.52.0",
 		"mime-type": "^4.0.0",
 		"mkdirp": "^1.0.4",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"moment": "^2.29.4",
-		"moment-timezone": "^0.5.43",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.6.1",
@@ -402,7 +402,7 @@
 		"query-string": "^7.1.3",
 		"queue-fifo": "^0.2.6",
 		"rc-scrollbars": "^1.1.6",
-		"re-resizable": "^6.9.9",
+		"re-resizable": "^6.9.18",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "~17.0.2",
@@ -419,7 +419,7 @@
 		"sodium-native": "^3.3.0",
 		"sodium-plus": "^0.9.0",
 		"speakeasy": "^2.0.0",
-		"stream-buffers": "^3.0.2",
+		"stream-buffers": "^3.0.3",
 		"strict-uri-encode": "^2.0.0",
 		"string-strip-html": "^7.0.3",
 		"suretype": "~2.4.1",
@@ -431,15 +431,15 @@
 		"twilio": "^3.76.1",
 		"twit": "^2.2.11",
 		"typia": "~6.9.0",
-		"ua-parser-js": "^1.0.37",
-		"underscore": "^1.13.6",
+		"ua-parser-js": "^1.0.38",
+		"underscore": "^1.13.7",
 		"universal-perf-hooks": "^1.0.1",
 		"url-polyfill": "^1.1.12",
 		"use-subscription": "~1.6.0",
-		"use-sync-external-store": "^1.2.0",
+		"use-sync-external-store": "^1.2.2",
 		"uuid": "^8.3.2",
 		"vm2": "^3.9.19",
-		"webdav": "^4.11.3",
+		"webdav": "^4.11.4",
 		"xml-crypto": "~3.1.0",
 		"xml-encryption": "~3.0.2",
 		"xml2js": "~0.5.0",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 233e71b719e5..791526c46f9d 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -38,19 +38,19 @@
     "react-split-pane": "^0.1.92",
     "react-virtuoso": "^4.7.1",
     "reactflow": "^11.7.2",
-    "use-subscription": "^1.8.0"
+    "use-subscription": "^1.8.2"
   },
   "devDependencies": {
-    "@types/react": "~17.0.69",
-    "@types/react-beautiful-dnd": "^13.1.6",
-    "@types/react-dom": "~17.0.22",
-    "@types/use-subscription": "^1.0.1",
+    "@types/react": "~17.0.80",
+    "@types/react-beautiful-dnd": "^13.1.8",
+    "@types/react-dom": "~17.0.25",
+    "@types/use-subscription": "^1.0.2",
     "@typescript-eslint/eslint-plugin": "~5.60.1",
     "@typescript-eslint/parser": "~5.60.1",
     "@vitejs/plugin-react": "^4.0.0",
     "eslint": "~8.45.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.4",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.11",
     "typescript": "~5.5.4",
     "vite": "^4.3.9"
   },
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 8143df3577a7..b9e45ed14eda 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -29,9 +29,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -40,11 +40,11 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/bcrypt": "^5.0.1",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/bcrypt": "^5.0.2",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/account-service/src/service.js",
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index c4c0ec82f507..b7912b8bc94d 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -27,9 +27,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -37,10 +37,10 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/authorization-service/src/service.js",
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index be56cb76469c..87029e4b8993 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -30,33 +30,33 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
 		"polka": "^0.5.2",
 		"sharp": "^0.32.6",
-		"underscore": "^1.13.6",
+		"underscore": "^1.13.7",
 		"uuid": "^7.0.3",
 		"ws": "^8.8.1"
 	},
 	"devDependencies": {
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/ejson": "^2.2.1",
-		"@types/gc-stats": "^1.4.2",
+		"@types/ejson": "^2.2.2",
+		"@types/gc-stats": "^1.4.3",
 		"@types/meteor": "^2.9.8",
 		"@types/node": "^14.18.63",
-		"@types/polka": "^0.5.6",
+		"@types/polka": "^0.5.7",
 		"@types/sharp": "^0.30.5",
 		"@types/uuid": "^8.3.4",
-		"@types/ws": "^8.5.8",
+		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"pino-pretty": "^7.6.1",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/service.js",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 0a8ba5e9f8cc..27290070b653 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -31,10 +31,10 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
-		"moment-timezone": "^0.5.43",
+		"moleculer": "^0.14.34",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
@@ -43,10 +43,10 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/omnichannel-transcript/src/service.js",
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 5ab5a6238266..5968631341b0 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -27,9 +27,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -37,10 +37,10 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/presence-service/src/service.js",
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 7844b0c27693..b3d8b0aff94e 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -29,10 +29,10 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
-		"moment-timezone": "^0.5.43",
+		"moleculer": "^0.14.34",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
@@ -41,10 +41,10 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/queue-worker/src/service.js",
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 030371478cb2..9fd5cf0586f6 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -27,9 +27,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -38,11 +38,11 @@
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@types/bcrypt": "^5.0.1",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/bcrypt": "^5.0.2",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
+		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/stream-hub-service/src/service.js",
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 0b66c13574c2..3eceb35e27ff 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -4,9 +4,9 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/bcrypt": "^5.0.1",
-		"@types/jest": "~29.5.12",
-		"@types/ws": "^8.5.8",
+		"@types/bcrypt": "^5.0.2",
+		"@types/jest": "~29.5.13",
+		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 6df90c641375..696ac6fee640 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.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.5.4"
@@ -28,7 +28,7 @@
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
 		"mem": "^8.1.1",
-		"moment-timezone": "^0.5.43",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"pino": "^8.15.0"
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index afd5a4d8e314..234463087a4e 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -6,11 +6,11 @@
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@storybook/addon-essentials": "~6.5.16",
 		"@storybook/react": "~6.5.16",
-		"@testing-library/react": "~16.0.0",
-		"@types/emojione": "^2.2.8",
-		"@types/jest": "~29.5.12",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@testing-library/react": "~16.0.1",
+		"@types/emojione": "^2.2.9",
+		"@types/jest": "~29.5.13",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"react-dom": "~18.3.1",
@@ -38,7 +38,7 @@
 		"emoji-assets": "^7.0.1",
 		"emoji-toolkit": "^7.0.1",
 		"moment": "^2.29.4",
-		"moment-timezone": "^0.5.43",
+		"moment-timezone": "^0.5.45",
 		"react": "~18.3.1"
 	},
 	"volta": {
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 5f3bb4977d7d..d6e3e93c01a4 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -8,14 +8,14 @@
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
-		"@types/react": "~17.0.69",
+		"@types/react": "~17.0.80",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-testing-library": "^5.11.1",
 		"react": "~17.0.2",
-		"react-docgen-typescript-plugin": "~1.0.5",
+		"react-docgen-typescript-plugin": "~1.0.8",
 		"typescript": "~5.5.4"
 	},
 	"scripts": {
diff --git a/package.json b/package.json
index 405686417d28..f3e3ce3d3e91 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,10 @@
 	},
 	"devDependencies": {
 		"@changesets/cli": "^2.26.2",
-		"@types/chart.js": "^2.9.39",
-		"@types/js-yaml": "^4.0.8",
+		"@types/chart.js": "^2.9.41",
+		"@types/js-yaml": "^4.0.9",
 		"ts-node": "^10.9.2",
-		"turbo": "latest"
+		"turbo": "^2.1.2"
 	},
 	"workspaces": [
 		"apps/*",
@@ -65,7 +65,8 @@
 		"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
 		"@rocket.chat/forked-matrix-sdk-crypto-nodejs": "0.1.0-beta.13",
 		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch",
-		"react-i18next@~15.0.1": "patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch"
+		"react-i18next@~15.0.1": "patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch",
+		"moleculer@^0.14.34": "patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch"
 	},
 	"dependencies": {
 		"node-gyp": "^9.4.1"
diff --git a/packages/agenda/package.json b/packages/agenda/package.json
index f09921de6c31..2d1fc084c383 100644
--- a/packages/agenda/package.json
+++ b/packages/agenda/package.json
@@ -8,11 +8,11 @@
 		"date.js": "~0.3.3",
 		"debug": "~4.1.1",
 		"human-interval": "^2.0.1",
-		"moment-timezone": "~0.5.43",
+		"moment-timezone": "~0.5.45",
 		"mongodb": "^4.17.2"
 	},
 	"devDependencies": {
-		"@types/debug": "^4.1.10",
+		"@types/debug": "^4.1.12",
 		"eslint": "~8.45.0",
 		"typescript": "~5.5.4"
 	},
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 23e0d7233a0f..b8d9ac155144 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -3,8 +3,8 @@
 	"version": "0.2.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
-		"@types/strict-uri-encode": "^2.0.1",
+		"@types/jest": "~29.5.13",
+		"@types/strict-uri-encode": "^2.0.2",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-fetch-mock": "^3.0.3",
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 35759dbe5ee6..74250ffa8c16 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -8,9 +8,7 @@
 		"@babel/preset-typescript": "~7.22.15",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/babel__core": "^7.20.3",
-		"@types/babel__preset-env": "^7.9.4",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"babel-jest": "^29.5.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
@@ -41,7 +39,7 @@
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"@types/fibers": "^3.1.3",
+		"@types/fibers": "^3.1.4",
 		"fibers": "^5.0.3"
 	}
 }
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 6f3f29871ccf..0fc47dc9a122 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -3,8 +3,8 @@
 	"version": "0.3.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
-		"@types/ws": "^8.5.8",
+		"@types/jest": "~29.5.13",
+		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index c0fa20f58227..4915221b71ca 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -4,8 +4,8 @@
 	"description": "Rocket.Chat's JS/TS ESLint config",
 	"dependencies": {
 		"@babel/core": "^7.20.7",
-		"@babel/eslint-parser": "~7.23.3",
-		"@types/eslint": "~8.44.6",
+		"@babel/eslint-parser": "~7.23.10",
+		"@types/eslint": "~8.44.9",
 		"@types/prettier": "^2.6.3",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 43a79f90b9ed..80874491a951 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -86,12 +86,10 @@
     "@storybook/source-loader": "~6.5.16",
     "@storybook/theming": "~6.5.16",
     "@tanstack/react-query": "^4.16.1",
-    "@testing-library/react": "~16.0.0",
+    "@testing-library/react": "~16.0.1",
     "@testing-library/user-event": "~14.5.2",
-    "@types/babel__core": "^7.20.3",
-    "@types/babel__preset-env": "^7.9.4",
-    "@types/react": "~17.0.69",
-    "@types/react-dom": "~17.0.22",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "babel-loader": "~8.2.5",
     "cross-env": "^7.0.3",
     "eslint": "~8.45.0",
@@ -100,11 +98,11 @@
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "~2.8.8",
-    "react-docgen-typescript-plugin": "~1.0.5",
+    "react-docgen-typescript-plugin": "~1.0.8",
     "react-dom": "^17.0.2",
     "react-i18next": "~15.0.1",
     "rimraf": "^3.0.2",
-    "storybook-dark-mode": "~3.0.1",
+    "storybook-dark-mode": "~3.0.3",
     "tslib": "^2.5.3",
     "typescript": "~5.5.4"
   },
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index babdc60161da..c2fbf136b2d6 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -44,25 +44,25 @@
 		"@storybook/manager-webpack4": "~6.5.16",
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
-		"@testing-library/react": "~16.0.0",
+		"@testing-library/react": "~16.0.1",
 		"@types/dompurify": "^3.0.5",
-		"@types/jest": "~29.5.12",
-		"@types/katex": "~0.16.5",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@types/jest": "~29.5.13",
+		"@types/katex": "~0.16.7",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"babel-loader": "^8.3.0",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"identity-obj-proxy": "^3.0.0",
 		"jest": "~29.7.0",
-		"katex": "~0.16.9",
+		"katex": "~0.16.11",
 		"outdent": "^0.8.0",
-		"react-docgen-typescript-plugin": "~1.0.5",
+		"react-docgen-typescript-plugin": "~1.0.8",
 		"react-dom": "~17.0.2",
 		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json
index 078d19289d34..64a511b3de5c 100644
--- a/packages/jest-presets/package.json
+++ b/packages/jest-presets/package.json
@@ -13,7 +13,7 @@
 		"/server"
 	],
 	"dependencies": {
-		"@swc/core": "~1.7.23",
+		"@swc/core": "~1.7.26",
 		"@swc/jest": "~0.2.36",
 		"@testing-library/jest-dom": "~6.4.8",
 		"@types/jest-axe": "~3.5.9",
@@ -25,9 +25,9 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@types/identity-obj-proxy": "^3",
-		"@types/jest": "~29.5.12",
-		"@types/uuid": "^9",
+		"@types/identity-obj-proxy": "^3.0.2",
+		"@types/jest": "~29.5.13",
+		"@types/uuid": "^9.0.8",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.5.4"
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
index d945bd3a6f9c..7235a916385d 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.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.5.4"
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 5887c40028c4..ce7bb92d6b78 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -25,7 +25,7 @@
 		"typecheck": "tsc -p tsconfig.typecheck.json"
 	},
 	"devDependencies": {
-		"@babel/eslint-parser": "~7.23.3",
+		"@babel/eslint-parser": "~7.23.10",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
 		"@rocket.chat/core-typings": "workspace:^",
@@ -42,7 +42,7 @@
 		"@types/crypto-js": "~4.1.3",
 		"@types/markdown-it": "^14.0.1",
 		"@types/mini-css-extract-plugin": "~1.4.3",
-		"@types/webpack": "^5.28.4",
+		"@types/webpack": "^5.28.5",
 		"@types/webpack-bundle-analyzer": "^4.6.2",
 		"@types/webpack-dev-server": "~4.7.2",
 		"@types/whatwg-fetch": "~0.0.33",
@@ -57,7 +57,7 @@
 		"eslint": "~8.45.0",
 		"eslint-plugin-import": "~2.26.0",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"file-loader": "^6.2.0",
 		"gh-release": "^3.5.0",
 		"html-webpack-plugin": "^5.5.3",
@@ -102,7 +102,7 @@
 		"@rocket.chat/random": "workspace:~",
 		"@rocket.chat/sdk": "^1.0.0-alpha.42",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"css-vars-ponyfill": "^2.4.8",
+		"css-vars-ponyfill": "^2.4.9",
 		"date-fns": "^2.15.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
@@ -116,8 +116,8 @@
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~15.0.1",
-		"storybook-dark-mode": "~3.0.1",
-		"whatwg-fetch": "^3.6.19"
+		"storybook-dark-mode": "~3.0.3",
+		"whatwg-fetch": "^3.6.20"
 	},
 	"browserslist": [
 		"last 2 versions",
diff --git a/packages/log-format/package.json b/packages/log-format/package.json
index f6f7c03b6f63..a999c7d884f0 100644
--- a/packages/log-format/package.json
+++ b/packages/log-format/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@types/chalk": "^2.2.0",
-		"@types/ejson": "^2.2.1",
+		"@types/ejson": "^2.2.2",
 		"eslint": "~8.45.0",
 		"typescript": "~5.5.4"
 	},
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index 78ffd3401ff4..e58727ba38c2 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -48,29 +48,29 @@
     "docs": "typedoc"
   },
   "devDependencies": {
-    "@babel/core": "~7.21.4",
-    "@babel/eslint-parser": "~7.21.3",
-    "@babel/preset-env": "~7.21.4",
+    "@babel/core": "~7.21.8",
+    "@babel/eslint-parser": "~7.21.8",
+    "@babel/preset-env": "~7.21.5",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/jest-presets": "workspace:~",
     "@rocket.chat/peggy-loader": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/jest": "~29.5.12",
-    "@types/node": "~14.18.42",
+    "@types/jest": "~29.5.13",
+    "@types/node": "~14.18.63",
     "@typescript-eslint/parser": "~5.58.0",
-    "babel-loader": "~9.1.2",
+    "babel-loader": "~9.1.3",
     "eslint": "~8.45.0",
     "jest": "~29.7.0",
     "npm-run-all": "^4.1.5",
     "peggy": "3.0.2",
-    "prettier": "~2.8.7",
+    "prettier": "~2.8.8",
     "prettier-plugin-pegjs": "~0.5.4",
     "rimraf": "^3.0.2",
-    "ts-loader": "~9.4.2",
-    "typedoc": "~0.24.1",
+    "ts-loader": "~9.4.4",
+    "typedoc": "~0.24.8",
     "typescript": "~5.5.4",
     "webpack": "~5.78.0",
-    "webpack-cli": "~5.0.1"
+    "webpack-cli": "~5.0.2"
   },
   "dependencies": {
     "tldts": "~5.7.112"
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index fa8c98cfbc5c..f9e9b4d06ab8 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -14,7 +14,7 @@
 		"@rocket.chat/ui-contexts": "workspace:*",
 		"@storybook/react": "~6.5.16",
 		"@tanstack/react-query": "^4.16.1",
-		"@types/use-sync-external-store": "^0.0.5",
+		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"typescript": "~5.5.4"
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index e1df06d2ba3c..30144dabb49a 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -3,7 +3,7 @@
 	"version": "0.7.0",
 	"private": true,
 	"devDependencies": {
-		"@types/node-rsa": "^1.1.3",
+		"@types/node-rsa": "^1.1.4",
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
 		"typescript": "~5.5.4"
diff --git a/packages/models/package.json b/packages/models/package.json
index f64268e12a5b..e55ce8d5a0e1 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.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "^29.7.0",
 		"typescript": "~5.5.4"
diff --git a/packages/password-policies/package.json b/packages/password-policies/package.json
index a2fef4ae0543..6bfb0d6100f1 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.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.5.4"
diff --git a/packages/patch-injection/package.json b/packages/patch-injection/package.json
index 8dabf2fb3f2a..2ac35749c481 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.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.5.4"
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index f0ac6d915567..6eb584f62d24 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -44,11 +44,11 @@
   "devDependencies": {
     "@rocket.chat/eslint-config": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/node": "~14.18.42",
+    "@types/node": "~14.18.63",
     "eslint": "~8.45.0",
     "npm-run-all": "^4.1.5",
     "peggy": "3.0.2",
-    "prettier": "~2.8.7",
+    "prettier": "~2.8.8",
     "rimraf": "^3.0.2",
     "typescript": "~5.5.4",
     "webpack": "~5.78.0"
diff --git a/packages/release-action/package.json b/packages/release-action/package.json
index e633ef69d06f..0851b8b43fca 100644
--- a/packages/release-action/package.json
+++ b/packages/release-action/package.json
@@ -10,7 +10,7 @@
 	"main": "dist/index.js",
 	"packageManager": "yarn@3.5.1",
 	"devDependencies": {
-		"@types/node": "^16.18.60",
+		"@types/node": "^16.18.108",
 		"typescript": "~5.5.4"
 	},
 	"dependencies": {
diff --git a/packages/release-changelog/package.json b/packages/release-changelog/package.json
index f183d00b550b..222f7f20355a 100644
--- a/packages/release-changelog/package.json
+++ b/packages/release-changelog/package.json
@@ -16,6 +16,6 @@
 	},
 	"dependencies": {
 		"dataloader": "^1.4.0",
-		"node-fetch": "^2"
+		"node-fetch": "^2.7.0"
 	}
 }
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 61e23c4c93ce..972577210f56 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -3,7 +3,7 @@
 	"version": "6.13.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "^4.17.2",
diff --git a/packages/server-fetch/package.json b/packages/server-fetch/package.json
index 27f957758520..e09b20d1aa42 100644
--- a/packages/server-fetch/package.json
+++ b/packages/server-fetch/package.json
@@ -21,7 +21,7 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"@types/proxy-from-env": "^1.0.3",
+		"@types/proxy-from-env": "^1.0.4",
 		"http-proxy-agent": "^5.0.0",
 		"https-proxy-agent": "^5.0.1",
 		"node-fetch": "2.3.0",
diff --git a/packages/tools/package.json b/packages/tools/package.json
index 11dade3ac5c8..bb38a8c5ae4f 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.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.5.4"
@@ -24,6 +24,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"moment-timezone": "^0.5.43"
+		"moment-timezone": "^0.5.45"
 	}
 }
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 42860fd8692a..0423b68f2b43 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -6,12 +6,11 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/fuselage": "^0.59.0",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@types/babel__core": "~7.20.3",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@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.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"eslint-plugin-testing-library": "~5.11.1",
 		"react": "^17.0.2",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index a2b916b68241..a84317f37abc 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -26,6 +26,7 @@
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:^",
+		"@rocket.chat/ui-avatar": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:~",
 		"@storybook/addon-actions": "~6.5.16",
 		"@storybook/addon-docs": "~6.5.16",
@@ -37,15 +38,14 @@
 		"@storybook/manager-webpack4": "~6.5.16",
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
-		"@testing-library/react": "~16.0.0",
-		"@types/babel__core": "~7.20.3",
-		"@types/jest": "~29.5.12",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@testing-library/react": "~16.0.1",
+		"@types/jest": "~29.5.13",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"eslint-plugin-testing-library": "~5.11.1",
 		"jest": "~29.7.0",
@@ -61,6 +61,7 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
+		"@rocket.chat/ui-avatar": "*",
 		"@rocket.chat/ui-contexts": "*",
 		"react": "*",
 		"react-i18next": "*"
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 55e22a79e34c..0f97fef22508 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -28,15 +28,14 @@
     "@storybook/manager-webpack4": "~6.5.16",
     "@storybook/react": "~6.5.16",
     "@storybook/testing-library": "~0.0.13",
-    "@types/babel__core": "~7.20.3",
-    "@types/react": "~17.0.69",
-    "@types/react-dom": "~17.0.22",
+    "@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.0",
+    "eslint-plugin-react-hooks": "~4.6.2",
     "eslint-plugin-storybook": "~0.6.15",
     "react": "~17.0.2",
-    "react-docgen-typescript-plugin": "~1.0.5",
+    "react-docgen-typescript-plugin": "~1.0.8",
     "react-dom": "~17.0.2",
     "typescript": "~5.5.4"
   },
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 24c8b5de5ce2..3ef588432a7c 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -9,15 +9,15 @@
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
-		"@types/use-sync-external-store": "^0.0.5",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
+		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react-hooks": "^4.6.0",
+		"eslint-plugin-react-hooks": "^4.6.2",
 		"mongodb": "^4.17.2",
 		"react": "~17.0.2",
 		"typescript": "~5.5.4",
-		"use-sync-external-store": "^1.2.0"
+		"use-sync-external-store": "^1.2.2"
 	},
 	"peerDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index 9d39ae97ac55..ae50fbc17168 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -35,23 +35,23 @@
 		"test": "jest"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.21.4",
-		"@babel/eslint-parser": "~7.23.3",
+		"@babel/core": "~7.21.8",
+		"@babel/eslint-parser": "~7.23.10",
 		"@babel/plugin-transform-runtime": "~7.21.4",
-		"@babel/preset-env": "~7.21.4",
+		"@babel/preset-env": "~7.21.5",
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
-		"babel-loader": "~9.1.2",
+		"@types/jest": "~29.5.13",
+		"babel-loader": "~9.1.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"npm-run-all": "~4.1.5",
 		"prettier": "~2.8.8",
 		"rimraf": "~3.0.2",
-		"ts-jest": "~29.1.1",
-		"ts-loader": "~9.4.2",
-		"ts-node": "~10.9.1",
+		"ts-jest": "~29.1.5",
+		"ts-loader": "~9.4.4",
+		"ts-node": "~10.9.2",
 		"ts-patch": "~3.2.1",
 		"typescript": "~5.5.4"
 	},
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index d10c05edad2c..eb363da1ceae 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -22,16 +22,15 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
 		"@storybook/testing-react": "~1.3.0",
-		"@types/babel__core": "~7.20.3",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"@types/jest-axe": "~3.5.9",
 		"eslint": "~8.45.0",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
-		"react-docgen-typescript-plugin": "~1.0.5",
+		"react-docgen-typescript-plugin": "~1.0.8",
 		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 71e015bb82c0..ae08e05ee218 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -21,7 +21,7 @@
 		"@babel/preset-react": "~7.22.15",
 		"@babel/preset-typescript": "~7.22.15",
 		"@rocket.chat/i18n": "workspace:~",
-		"@rocket.chat/layout": "~0.31.26",
+		"@rocket.chat/layout": "~0.31.27",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/tools": "workspace:~",
 		"@rocket.chat/ui-client": "workspace:^",
@@ -34,14 +34,14 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "^0.2.2",
 		"@tanstack/react-query": "^4.16.1",
-		"@testing-library/react": "~16.0.0",
-		"@types/react": "~17.0.69",
+		"@testing-library/react": "~16.0.1",
+		"@types/react": "~17.0.80",
 		"babel-loader": "~8.3.0",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~15.0.1",
-		"storybook-dark-mode": "~3.0.1",
+		"storybook-dark-mode": "~3.0.3",
 		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index cd440c92c40f..6b1123701996 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1039,7 +1039,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:~7.21.4":
+"@babel/core@npm:~7.21.8":
   version: 7.21.8
   resolution: "@babel/core@npm:7.21.8"
   dependencies:
@@ -1062,7 +1062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/eslint-parser@npm:~7.21.3":
+"@babel/eslint-parser@npm:~7.21.8":
   version: 7.21.8
   resolution: "@babel/eslint-parser@npm:7.21.8"
   dependencies:
@@ -1076,9 +1076,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/eslint-parser@npm:~7.23.3":
-  version: 7.23.3
-  resolution: "@babel/eslint-parser@npm:7.23.3"
+"@babel/eslint-parser@npm:~7.23.10":
+  version: 7.23.10
+  resolution: "@babel/eslint-parser@npm:7.23.10"
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1
     eslint-visitor-keys: ^2.1.0
@@ -1086,7 +1086,7 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.11.0
     eslint: ^7.5.0 || ^8.0.0
-  checksum: 9573daebe21af5123c302c307be80cacf1c2bf236a9497068a14726d3944ef55e1282519d0ccf51882dfc369359a3442299c98cb22a419e209924db39d4030fd
+  checksum: 81249edee14f95720044f393b5b0a681a230ac2bde3d656b0c55b1cec4c5cb99ce0584ef6acd2e5413acc7905daee1b2e1db8e3fab18a3a74c508098a584ec9a
   languageName: node
   linkType: hard
 
@@ -2733,7 +2733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:~7.21.4":
+"@babel/preset-env@npm:~7.21.5":
   version: 7.21.5
   resolution: "@babel/preset-env@npm:7.21.5"
   dependencies:
@@ -4701,13 +4701,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kaciras/deasync@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@kaciras/deasync@npm:1.0.3"
+"@kaciras/deasync@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@kaciras/deasync@npm:1.0.4"
   dependencies:
-    follow-redirects: ^1.15.2
-    tar-fs: ^2.1.1
-  checksum: 6986db099e8676ae2c21d1122db9f60dd5b74dd4ec06eb164c7ded0f512d037146f82cd3dee189d2863b1c6064f17d33b273edf67b25d3bb71050c5a6fe1aa6b
+    follow-redirects: ^1.15.6
+    tar-fs: ^3.0.5
+  checksum: 4bb358de84731000f3576dff029f89bf6ddf8628c95fd3661c029716a796fc44eb3769445479c3f4a0990f10617caf7902bf07547df76bf239582f565d3855fc
   languageName: node
   linkType: hard
 
@@ -4858,6 +4858,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@meteorjs/crypto-browserify@npm:^3.12.1":
+  version: 3.12.1
+  resolution: "@meteorjs/crypto-browserify@npm:3.12.1"
+  dependencies:
+    browserify-cipher: ^1.0.1
+    browserify-sign: ^4.2.3
+    create-ecdh: ^4.0.4
+    create-hash: ^1.2.0
+    create-hmac: ^1.1.7
+    diffie-hellman: ^5.0.3
+    hash-base: ~3.0.4
+    inherits: ^2.0.4
+    pbkdf2: ^3.1.2
+    public-encrypt: ^4.0.3
+    randombytes: ^2.1.0
+    randomfill: ^1.0.4
+  checksum: 0e7b3528273d057587a28d5aba644638da966e0d641c9211b16327efa2ce1e69f769d1bfb385cf974eb36e2fd96e81e2a4d75ec4f43bf230df0c4326ed9cdd9e
+  languageName: node
+  linkType: hard
+
 "@mongodb-js/saslprep@npm:^1.1.0":
   version: 1.1.0
   resolution: "@mongodb-js/saslprep@npm:1.1.0"
@@ -8424,24 +8444,24 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/tools": "workspace:^"
-    "@types/bcrypt": ^5.0.1
-    "@types/gc-stats": ^1.4.2
+    "@types/bcrypt": ^5.0.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     bcrypt: ^5.0.1
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
     uuid: ^9.0.1
   languageName: unknown
@@ -8460,13 +8480,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/agenda@workspace:packages/agenda"
   dependencies:
-    "@types/debug": ^4.1.10
+    "@types/debug": ^4.1.12
     cron: ~1.8.2
     date.js: ~0.3.3
     debug: ~4.1.1
     eslint: ~8.45.0
     human-interval: ^2.0.1
-    moment-timezone: ~0.5.43
+    moment-timezone: ~0.5.45
     mongodb: ^4.17.2
     typescript: ~5.5.4
   languageName: unknown
@@ -8479,8 +8499,8 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": ~29.5.12
-    "@types/strict-uri-encode": ^2.0.1
+    "@types/jest": ~29.5.13
+    "@types/strict-uri-encode": ^2.0.2
     eslint: ~8.45.0
     filter-obj: ^3.0.0
     jest: ~29.7.0
@@ -8538,22 +8558,22 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -8600,10 +8620,8 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/babel__core": ^7.20.3
-    "@types/babel__preset-env": ^7.9.4
-    "@types/fibers": ^3.1.3
-    "@types/jest": ~29.5.12
+    "@types/fibers": ^3.1.4
+    "@types/jest": ~29.5.13
     babel-jest: ^29.5.0
     eslint: ~8.45.0
     fibers: ^5.0.3
@@ -8675,8 +8693,8 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": ~29.5.12
-    "@types/ws": ^8.5.8
+    "@types/jest": ~29.5.13
+    "@types/ws": ^8.5.12
     eslint: ~8.45.0
     jest: ~29.7.0
     jest-websocket-mock: ~2.5.0
@@ -8703,33 +8721,33 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/ejson": ^2.2.1
-    "@types/gc-stats": ^1.4.2
+    "@types/ejson": ^2.2.2
+    "@types/gc-stats": ^1.4.3
     "@types/meteor": ^2.9.8
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     "@types/sharp": ^0.30.5
     "@types/uuid": ^8.3.4
-    "@types/ws": ^8.5.8
+    "@types/ws": ^8.5.12
     colorette: ^1.4.0
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     jaeger-client: ^3.19.0
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     pino-pretty: ^7.6.1
     polka: ^0.5.2
     sharp: ^0.32.6
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
-    underscore: ^1.13.6
+    underscore: ^1.13.7
     uuid: ^7.0.3
     ws: ^8.8.1
   languageName: unknown
@@ -8747,8 +8765,8 @@ __metadata:
   resolution: "@rocket.chat/eslint-config@workspace:packages/eslint-config"
   dependencies:
     "@babel/core": ^7.20.7
-    "@babel/eslint-parser": ~7.23.3
-    "@types/eslint": ~8.44.6
+    "@babel/eslint-parser": ~7.23.10
+    "@types/eslint": ~8.44.9
     "@types/prettier": ^2.6.3
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
@@ -8913,12 +8931,10 @@ __metadata:
     "@storybook/source-loader": ~6.5.16
     "@storybook/theming": ~6.5.16
     "@tanstack/react-query": ^4.16.1
-    "@testing-library/react": ~16.0.0
+    "@testing-library/react": ~16.0.1
     "@testing-library/user-event": ~14.5.2
-    "@types/babel__core": ^7.20.3
-    "@types/babel__preset-env": ^7.9.4
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     babel-loader: ~8.2.5
     cross-env: ^7.0.3
     eslint: ~8.45.0
@@ -8927,11 +8943,11 @@ __metadata:
     normalize.css: ^8.0.1
     npm-run-all: ^4.1.5
     prettier: ~2.8.8
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     react-dom: ^17.0.2
     react-i18next: ~15.0.1
     rimraf: ^3.0.2
-    storybook-dark-mode: ~3.0.1
+    storybook-dark-mode: ~3.0.3
     tslib: ^2.5.3
     typescript: ~5.5.4
   peerDependencies:
@@ -9000,12 +9016,12 @@ __metadata:
     "@storybook/manager-webpack4": ~6.5.16
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
-    "@testing-library/react": ~16.0.0
+    "@testing-library/react": ~16.0.1
     "@types/dompurify": ^3.0.5
-    "@types/jest": ~29.5.12
-    "@types/katex": ~0.16.5
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@types/jest": ~29.5.13
+    "@types/katex": ~0.16.7
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
     babel-loader: ^8.3.0
@@ -9014,14 +9030,14 @@ __metadata:
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     highlight.js: ^11.5.1
     identity-obj-proxy: ^3.0.0
     jest: ~29.7.0
-    katex: ~0.16.9
+    katex: ~0.16.11
     outdent: ^0.8.0
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
     react-i18next: ~15.0.1
@@ -9079,13 +9095,13 @@ __metadata:
   resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets"
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
-    "@swc/core": ~1.7.23
+    "@swc/core": ~1.7.26
     "@swc/jest": ~0.2.36
     "@testing-library/jest-dom": ~6.4.8
-    "@types/identity-obj-proxy": ^3
-    "@types/jest": ~29.5.12
+    "@types/identity-obj-proxy": ^3.0.2
+    "@types/jest": ~29.5.13
     "@types/jest-axe": ~3.5.9
-    "@types/uuid": ^9
+    "@types/uuid": ^9.0.8
     eslint: ~8.45.0
     identity-obj-proxy: ~3.0.0
     jest: ~29.7.0
@@ -9102,7 +9118,7 @@ __metadata:
   resolution: "@rocket.chat/jwt@workspace:packages/jwt"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
     jose: ^4.14.4
@@ -9110,15 +9126,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/layout@npm:~0.31.26":
-  version: 0.31.26
-  resolution: "@rocket.chat/layout@npm:0.31.26"
+"@rocket.chat/layout@npm:~0.31.27":
+  version: 0.31.27
+  resolution: "@rocket.chat/layout@npm:0.31.27"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     react: 17.0.2
     react-dom: 17.0.2
     react-i18next: ~11.15.4
-  checksum: 473b3ce43f7e5c495bbbfb54c628a1da9fda672fee0aeef74a25690a462b243982749bb1ba6933130381aea8aae61fb9aed6b45d6c3ec370c7555e1ac69930ce
+  checksum: 5bf14cc2c85947c5773b9dbaeb7b79f36b770c80673f7eb5aaded80a3f8a7ebcbfb67c8d8c2f4731c630737784b375bd775cc53941f4ce8dd1b9d1a327449b02
   languageName: node
   linkType: hard
 
@@ -9130,9 +9146,9 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
-    "@types/bcrypt": ^5.0.1
-    "@types/jest": ~29.5.12
-    "@types/ws": ^8.5.8
+    "@types/bcrypt": ^5.0.2
+    "@types/jest": ~29.5.13
+    "@types/ws": ^8.5.12
     bcrypt: ^5.0.1
     eslint: ~8.45.0
     jest: ~29.7.0
@@ -9145,7 +9161,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/livechat@workspace:packages/livechat"
   dependencies:
-    "@babel/eslint-parser": ~7.23.3
+    "@babel/eslint-parser": ~7.23.10
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
     "@rocket.chat/core-typings": "workspace:^"
@@ -9167,7 +9183,7 @@ __metadata:
     "@types/crypto-js": ~4.1.3
     "@types/markdown-it": ^14.0.1
     "@types/mini-css-extract-plugin": ~1.4.3
-    "@types/webpack": ^5.28.4
+    "@types/webpack": ^5.28.5
     "@types/webpack-bundle-analyzer": ^4.6.2
     "@types/webpack-dev-server": ~4.7.2
     "@types/whatwg-fetch": ~0.0.33
@@ -9177,7 +9193,7 @@ __metadata:
     babel-loader: ^8.3.0
     cross-env: ^7.0.3
     css-loader: ^4.3.0
-    css-vars-ponyfill: ^2.4.8
+    css-vars-ponyfill: ^2.4.9
     cssnano: ^4.1.11
     date-fns: ^2.15.0
     desvg-loader: ^0.1.0
@@ -9185,7 +9201,7 @@ __metadata:
     eslint: ~8.45.0
     eslint-plugin-import: ~2.26.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     file-loader: ^6.2.0
     gh-release: ^3.5.0
     history: ~5.3.0
@@ -9219,7 +9235,7 @@ __metadata:
     sass: ~1.62.1
     sass-loader: ~10.4.1
     serve: ^11.3.2
-    storybook-dark-mode: ~3.0.1
+    storybook-dark-mode: ~3.0.3
     style-loader: ^1.2.1
     stylelint: ^14.9.1
     stylelint-order: ^5.0.0
@@ -9231,7 +9247,7 @@ __metadata:
     webpack-bundle-analyzer: ^4.9.1
     webpack-cli: ^5.1.4
     webpack-dev-server: ~4.13.3
-    whatwg-fetch: ^3.6.19
+    whatwg-fetch: ^3.6.20
   peerDependencies:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/logo": "*"
@@ -9243,7 +9259,7 @@ __metadata:
   resolution: "@rocket.chat/log-format@workspace:packages/log-format"
   dependencies:
     "@types/chalk": ^2.2.0
-    "@types/ejson": ^2.2.1
+    "@types/ejson": ^2.2.2
     chalk: ^4.0.0
     ejson: ^2.2.3
     eslint: ~8.45.0
@@ -9286,30 +9302,30 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/message-parser@workspace:packages/message-parser"
   dependencies:
-    "@babel/core": ~7.21.4
-    "@babel/eslint-parser": ~7.21.3
-    "@babel/preset-env": ~7.21.4
+    "@babel/core": ~7.21.8
+    "@babel/eslint-parser": ~7.21.8
+    "@babel/preset-env": ~7.21.5
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/peggy-loader": "workspace:~"
     "@rocket.chat/prettier-config": ~0.31.25
-    "@types/jest": ~29.5.12
-    "@types/node": ~14.18.42
+    "@types/jest": ~29.5.13
+    "@types/node": ~14.18.63
     "@typescript-eslint/parser": ~5.58.0
-    babel-loader: ~9.1.2
+    babel-loader: ~9.1.3
     eslint: ~8.45.0
     jest: ~29.7.0
     npm-run-all: ^4.1.5
     peggy: 3.0.2
-    prettier: ~2.8.7
+    prettier: ~2.8.8
     prettier-plugin-pegjs: ~0.5.4
     rimraf: ^3.0.2
     tldts: ~5.7.112
-    ts-loader: ~9.4.2
-    typedoc: ~0.24.1
+    ts-loader: ~9.4.4
+    typedoc: ~0.24.8
     typescript: ~5.5.4
     webpack: ~5.78.0
-    webpack-cli: ~5.0.1
+    webpack-cli: ~5.0.2
   languageName: unknown
   linkType: soft
 
@@ -9319,7 +9335,7 @@ __metadata:
   dependencies:
     "@axe-core/playwright": ^4.7.3
     "@babel/core": ~7.22.20
-    "@babel/eslint-parser": ~7.23.3
+    "@babel/eslint-parser": ~7.23.10
     "@babel/plugin-proposal-nullish-coalescing-operator": ~7.18.6
     "@babel/plugin-proposal-optional-chaining": ~7.21.0
     "@babel/preset-env": ~7.22.20
@@ -9330,7 +9346,7 @@ __metadata:
     "@bugsnag/plugin-react": ~7.19.0
     "@faker-js/faker": ~8.0.2
     "@google-cloud/storage": ^6.11.0
-    "@kaciras/deasync": ^1.0.3
+    "@kaciras/deasync": ^1.0.4
     "@nivo/bar": 0.84.0
     "@nivo/core": 0.84.0
     "@nivo/heatmap": 0.84.0
@@ -9368,7 +9384,7 @@ __metadata:
     "@rocket.chat/instance-status": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
-    "@rocket.chat/layout": ~0.31.26
+    "@rocket.chat/layout": ~0.31.27
     "@rocket.chat/license": "workspace:^"
     "@rocket.chat/livechat": "workspace:^"
     "@rocket.chat/log-format": "workspace:^"
@@ -9414,87 +9430,87 @@ __metadata:
     "@storybook/testing-library": 0.0.13
     "@tanstack/react-query": ^4.16.1
     "@tanstack/react-query-devtools": ^4.19.1
-    "@testing-library/react": ~16.0.0
+    "@testing-library/react": ~16.0.1
     "@testing-library/user-event": ~14.5.2
-    "@types/adm-zip": ^0.5.3
+    "@types/adm-zip": ^0.5.5
     "@types/archiver": ^5.3.4
-    "@types/bad-words": ^3.0.2
-    "@types/bcrypt": ^5.0.1
-    "@types/body-parser": ^1.19.4
-    "@types/busboy": ^1.5.2
-    "@types/chai": ~4.3.16
-    "@types/chai-as-promised": ^7.1.7
-    "@types/chai-datetime": 0.0.38
-    "@types/chai-dom": 1.11.2
-    "@types/chai-spies": ~1.0.5
-    "@types/codemirror": ^5.60.12
-    "@types/cookie": ^0.5.3
-    "@types/cookie-parser": ^1.4.5
-    "@types/cors": ^2.8.15
-    "@types/cssom": ^0.4.2
+    "@types/bad-words": ^3.0.3
+    "@types/bcrypt": ^5.0.2
+    "@types/body-parser": ^1.19.5
+    "@types/busboy": ^1.5.4
+    "@types/chai": ~4.3.19
+    "@types/chai-as-promised": ^7.1.8
+    "@types/chai-datetime": 0.0.39
+    "@types/chai-dom": 1.11.3
+    "@types/chai-spies": ~1.0.6
+    "@types/codemirror": ^5.60.15
+    "@types/cookie": ^0.5.4
+    "@types/cookie-parser": ^1.4.7
+    "@types/cors": ^2.8.17
+    "@types/cssom": ^0.4.3
     "@types/dompurify": ^2.3.3
-    "@types/ejson": ^2.2.1
-    "@types/express": ^4.17.20
+    "@types/ejson": ^2.2.2
+    "@types/express": ^4.17.21
     "@types/express-rate-limit": ^5.1.3
-    "@types/fibers": ^3.1.3
-    "@types/google-libphonenumber": ^7.4.29
-    "@types/gravatar": ^1.8.5
+    "@types/fibers": ^3.1.4
+    "@types/google-libphonenumber": ^7.4.30
+    "@types/gravatar": ^1.8.6
     "@types/he": ^1.1.2
-    "@types/i18next-sprintf-postprocessor": ^0.2.2
-    "@types/imap": ^0.8.39
-    "@types/jest": ~29.5.12
+    "@types/i18next-sprintf-postprocessor": ^0.2.3
+    "@types/imap": ^0.8.40
+    "@types/jest": ~29.5.13
     "@types/jsdom": ^16.2.15
-    "@types/jsdom-global": ^3.0.6
-    "@types/jsrsasign": ^10.5.11
+    "@types/jsdom-global": ^3.0.7
+    "@types/jsrsasign": ^10.5.14
     "@types/katex": ^0.14.0
-    "@types/later": ^1.2.8
+    "@types/later": ^1.2.9
     "@types/ldapjs": ^2.2.5
-    "@types/less": ~3.0.5
+    "@types/less": ~3.0.6
     "@types/lodash": ^4.14.200
     "@types/lodash.clonedeep": ^4.5.9
-    "@types/lodash.debounce": ^4.0.8
-    "@types/lodash.get": ^4.4.8
-    "@types/mailparser": ^3.4.3
+    "@types/lodash.debounce": ^4.0.9
+    "@types/lodash.get": ^4.4.9
+    "@types/mailparser": ^3.4.4
     "@types/marked": ^4.0.8
     "@types/meteor": ^2.9.8
-    "@types/meteor-collection-hooks": ^0.8.8
+    "@types/meteor-collection-hooks": ^0.8.9
     "@types/mkdirp": ^1.0.2
     "@types/mocha": "github:whitecolor/mocha-types"
     "@types/moment-timezone": ^0.5.30
     "@types/node": ^14.18.63
-    "@types/node-gcm": ^1.0.3
-    "@types/node-rsa": ^1.1.3
-    "@types/nodemailer": ^6.4.13
-    "@types/oauth2-server": ^3.0.15
-    "@types/object-path": ^0.11.3
-    "@types/parseurl": ^1.3.2
-    "@types/prometheus-gc-stats": ^0.6.3
-    "@types/proxy-from-env": ^1.0.3
-    "@types/proxyquire": ^1.3.30
-    "@types/psl": ^1.1.2
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
-    "@types/rewire": ^2.5.29
+    "@types/node-gcm": ^1.0.5
+    "@types/node-rsa": ^1.1.4
+    "@types/nodemailer": ^6.4.15
+    "@types/oauth2-server": ^3.0.17
+    "@types/object-path": ^0.11.4
+    "@types/parseurl": ^1.3.3
+    "@types/prometheus-gc-stats": ^0.6.4
+    "@types/proxy-from-env": ^1.0.4
+    "@types/proxyquire": ^1.3.31
+    "@types/psl": ^1.1.3
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
+    "@types/rewire": ^2.5.30
     "@types/sanitize-html": ^2.9.3
     "@types/semver": ^7.3.10
     "@types/sharp": ^0.30.5
     "@types/sinon": ^10.0.20
-    "@types/speakeasy": ^2.0.9
-    "@types/strict-uri-encode": ^2.0.1
+    "@types/speakeasy": ^2.0.10
+    "@types/strict-uri-encode": ^2.0.2
     "@types/string-strip-html": ^5.0.1
-    "@types/supertest": ^2.0.15
-    "@types/supports-color": ~7.2.0
-    "@types/textarea-caret": ^3.0.2
-    "@types/ua-parser-js": ^0.7.38
-    "@types/use-subscription": ^1.0.1
-    "@types/use-sync-external-store": ^0.0.5
+    "@types/supertest": ^2.0.16
+    "@types/supports-color": ~7.2.1
+    "@types/textarea-caret": ^3.0.3
+    "@types/ua-parser-js": ^0.7.39
+    "@types/use-subscription": ^1.0.2
+    "@types/use-sync-external-store": ^0.0.6
     "@types/uuid": ^8.3.4
-    "@types/xml-crypto": ~1.4.4
-    "@types/xml-encryption": ~1.2.3
+    "@types/xml-crypto": ~1.4.6
+    "@types/xml-encryption": ~1.2.4
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
     "@xmldom/xmldom": ^0.8.10
-    adm-zip: 0.5.10
+    adm-zip: 0.5.16
     ajv: ^8.11.0
     ajv-formats: ~2.1.1
     apn: 2.2.0
@@ -9509,19 +9525,19 @@ __metadata:
     babel-plugin-istanbul: ^6.1.1
     bad-words: ^3.0.4
     bcrypt: ^5.0.1
-    body-parser: 1.20.2
+    body-parser: 1.20.3
     bson: ^4.6.4
     busboy: ^1.6.0
     bytebuffer: 5.0.1
     chai: ^4.3.10
-    chai-as-promised: ^7.1.1
-    chai-datetime: ^1.8.0
+    chai-as-promised: ^7.1.2
+    chai-datetime: ^1.8.1
     chai-dom: ^1.11.0
     chai-spies: ~1.0.0
     chalk: ^4.0.0
     change-case: ^4.1.2
     chart.js: ^3.8.0
-    codemirror: ^5.65.15
+    codemirror: ^5.65.17
     colorette: ^2.0.20
     colors: ^1.4.0
     connect: ^3.7.0
@@ -9530,12 +9546,12 @@ __metadata:
     cors: ^2.8.5
     cron: ~1.8.2
     cross-env: ^7.0.3
-    css-vars-ponyfill: ^2.4.8
+    css-vars-ponyfill: ^2.4.9
     csv-parse: ^5.2.0
     date-fns: ^2.28.0
     date.js: ~0.3.3
     debug: ~4.1.1
-    docker-compose: ^0.24.3
+    docker-compose: ^0.24.8
     dompurify: ^2.3.8
     ejson: ^2.2.3
     emailreplyparser: ^0.0.5
@@ -9550,7 +9566,7 @@ __metadata:
     eslint-plugin-playwright: ~0.15.3
     eslint-plugin-prettier: ~4.2.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-testing-library: ~6.2.2
     eslint-plugin-you-dont-need-lodash-underscore: ~6.12.0
     eventemitter3: ^4.0.7
@@ -9565,7 +9581,7 @@ __metadata:
     filenamify: ^4.3.0
     filesize: 9.0.11
     generate-password: ^1.7.1
-    google-libphonenumber: ^3.2.33
+    google-libphonenumber: ^3.2.38
     gravatar: ^1.8.2
     he: ^1.2.0
     highlight.js: ^11.6.0
@@ -9587,7 +9603,7 @@ __metadata:
     jsdom-global: ^3.0.2
     jsrsasign: ^10.5.24
     juice: ^8.0.0
-    katex: ~0.16.9
+    katex: ~0.16.11
     ldap-escape: ^2.0.6
     ldapjs: ^2.3.3
     limax: ^3.0.0
@@ -9598,14 +9614,14 @@ __metadata:
     mailparser: ^3.4.0
     marked: ^4.2.5
     mem: ^8.1.1
-    meteor-node-stubs: ^1.2.5
+    meteor-node-stubs: ^1.2.10
     mime-db: ^1.52.0
     mime-type: ^4.0.0
     mkdirp: ^1.0.4
     mocha: ^9.2.2
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     moment: ^2.29.4
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.6.1
@@ -9624,8 +9640,8 @@ __metadata:
     pdfjs-dist: ^2.13.216
     pino: ^8.15.0
     pino-pretty: ^7.6.1
-    playwright-qase-reporter: ^1.2.1
-    postcss: ~8.4.31
+    playwright-qase-reporter: ^1.2.2
+    postcss: ~8.4.45
     postcss-custom-properties: ^11.0.0
     postcss-easy-import: ^3.0.0
     postcss-load-config: ^3.1.4
@@ -9642,10 +9658,10 @@ __metadata:
     query-string: ^7.1.3
     queue-fifo: ^0.2.6
     rc-scrollbars: ^1.1.6
-    re-resizable: ^6.9.9
+    re-resizable: ^6.9.18
     react: ~17.0.2
     react-aria: ~3.23.1
-    react-docgen-typescript-plugin: ^1.0.5
+    react-docgen-typescript-plugin: ^1.0.8
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
     react-hook-form: ~7.45.4
@@ -9663,7 +9679,7 @@ __metadata:
     sodium-plus: ^0.9.0
     source-map: ^0.7.4
     speakeasy: ^2.0.0
-    stream-buffers: ^3.0.2
+    stream-buffers: ^3.0.3
     strict-uri-encode: ^2.0.0
     string-strip-html: ^7.0.3
     stylelint: ^14.9.1
@@ -9676,21 +9692,21 @@ __metadata:
     template-file: ^6.0.1
     textarea-caret: ^3.1.0
     tinykeys: ^1.4.0
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     turndown: ^7.1.2
     twilio: ^3.76.1
     twit: ^2.2.11
     typescript: ~5.5.4
     typia: ~6.9.0
-    ua-parser-js: ^1.0.37
-    underscore: ^1.13.6
+    ua-parser-js: ^1.0.38
+    underscore: ^1.13.7
     universal-perf-hooks: ^1.0.1
     url-polyfill: ^1.1.12
     use-subscription: ~1.6.0
-    use-sync-external-store: ^1.2.0
+    use-sync-external-store: ^1.2.2
     uuid: ^8.3.2
     vm2: ^3.9.19
-    webdav: ^4.11.3
+    webdav: ^4.11.4
     xml-crypto: ~3.1.0
     xml-encryption: ~3.0.2
     xml2js: ~0.5.0
@@ -9708,7 +9724,7 @@ __metadata:
     "@rocket.chat/ui-contexts": "workspace:*"
     "@storybook/react": ~6.5.16
     "@tanstack/react-query": ^4.16.1
-    "@types/use-sync-external-store": ^0.0.5
+    "@types/use-sync-external-store": ^0.0.6
     eslint: ~8.45.0
     i18next: ~23.14.0
     react: ~17.0.2
@@ -9726,7 +9742,7 @@ __metadata:
   resolution: "@rocket.chat/model-typings@workspace:packages/model-typings"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@types/node-rsa": ^1.1.3
+    "@types/node-rsa": ^1.1.4
     eslint: ~8.45.0
     mongodb: ^4.17.2
     typescript: ~5.5.4
@@ -9739,7 +9755,7 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/model-typings": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ^29.7.0
     typescript: ~5.5.4
@@ -9771,7 +9787,7 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/tools": "workspace:^"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     "@types/node": ^14.18.63
     date-fns: ^2.28.0
     ejson: ^2.2.3
@@ -9781,7 +9797,7 @@ __metadata:
     fibers: ^5.0.3
     jest: ~29.7.0
     mem: ^8.1.1
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     pino: ^8.15.0
@@ -9804,25 +9820,25 @@ __metadata:
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
     "@rocket.chat/tools": "workspace:^"
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     emoji-toolkit: ^7.0.1
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
-    moment-timezone: ^0.5.43
+    moleculer: ^0.14.34
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -9853,7 +9869,7 @@ __metadata:
   resolution: "@rocket.chat/password-policies@workspace:packages/password-policies"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
     typescript: ~5.5.4
@@ -9865,7 +9881,7 @@ __metadata:
   resolution: "@rocket.chat/patch-injection@workspace:packages/patch-injection"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
     typescript: ~5.5.4
@@ -9882,17 +9898,17 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@storybook/addon-essentials": ~6.5.16
     "@storybook/react": ~6.5.16
-    "@testing-library/react": ~16.0.0
-    "@types/emojione": ^2.2.8
-    "@types/jest": ~29.5.12
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@testing-library/react": ~16.0.1
+    "@types/emojione": ^2.2.9
+    "@types/jest": ~29.5.13
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     emoji-assets: ^7.0.1
     emoji-toolkit: ^7.0.1
     eslint: ~8.45.0
     jest: ~29.7.0
     moment: ^2.29.4
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     react: ~18.3.1
     react-dom: ~18.3.1
     typescript: ~5.5.4
@@ -9905,11 +9921,11 @@ __metadata:
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/prettier-config": ~0.31.25
-    "@types/node": ~14.18.42
+    "@types/node": ~14.18.63
     eslint: ~8.45.0
     npm-run-all: ^4.1.5
     peggy: 3.0.2
-    prettier: ~2.8.7
+    prettier: ~2.8.8
     rimraf: ^3.0.2
     typescript: ~5.5.4
     webpack: ~5.78.0
@@ -9940,22 +9956,22 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/presence": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -10004,25 +10020,25 @@ __metadata:
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     emoji-toolkit: ^7.0.1
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
-    moment-timezone: ^0.5.43
+    moleculer: ^0.14.34
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -10052,7 +10068,7 @@ __metadata:
     "@actions/github": ^5.1.1
     "@octokit/plugin-throttling": ^6.0.0
     "@rocket.chat/eslint-config": "workspace:^"
-    "@types/node": ^16.18.60
+    "@types/node": ^16.18.108
     eslint: ~8.45.0
     mdast-util-to-string: 2.0.0
     remark-parse: 9.0.0
@@ -10072,7 +10088,7 @@ __metadata:
     "@types/node": ^14.18.63
     dataloader: ^1.4.0
     eslint: ~8.45.0
-    node-fetch: ^2
+    node-fetch: ^2.7.0
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -10086,7 +10102,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     ajv: ^8.11.0
     ajv-formats: ^2.1.1
     eslint: ~8.45.0
@@ -10123,7 +10139,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/server-fetch@workspace:packages/server-fetch"
   dependencies:
-    "@types/proxy-from-env": ^1.0.3
+    "@types/proxy-from-env": ^1.0.4
     eslint: ~8.45.0
     http-proxy-agent: ^5.0.0
     https-proxy-agent: ^5.0.1
@@ -10162,23 +10178,23 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/bcrypt": ^5.0.1
-    "@types/gc-stats": ^1.4.2
+    "@types/bcrypt": ^5.0.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -10215,27 +10231,26 @@ __metadata:
   resolution: "@rocket.chat/tools@workspace:packages/tools"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/ui-avatar@workspace:^, @rocket.chat/ui-avatar@workspace:packages/ui-avatar":
+"@rocket.chat/ui-avatar@workspace:^, @rocket.chat/ui-avatar@workspace:packages/ui-avatar, @rocket.chat/ui-avatar@workspace:~":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
     "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@types/babel__core": ~7.20.3
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@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.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     eslint-plugin-testing-library: ~5.11.1
     react: ^17.0.2
@@ -10259,6 +10274,7 @@ __metadata:
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:^"
+    "@rocket.chat/ui-avatar": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:~"
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10270,15 +10286,14 @@ __metadata:
     "@storybook/manager-webpack4": ~6.5.16
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
-    "@testing-library/react": ~16.0.0
-    "@types/babel__core": ~7.20.3
-    "@types/jest": ~29.5.12
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@testing-library/react": ~16.0.1
+    "@types/jest": ~29.5.13
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     eslint-plugin-testing-library: ~5.11.1
     jest: ~29.7.0
@@ -10293,6 +10308,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
+    "@rocket.chat/ui-avatar": "*"
     "@rocket.chat/ui-contexts": "*"
     react: "*"
     react-i18next: "*"
@@ -10315,15 +10331,14 @@ __metadata:
     "@storybook/manager-webpack4": ~6.5.16
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
-    "@types/babel__core": ~7.20.3
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@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.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     react: ~17.0.2
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     react-dom: ~17.0.2
     typescript: ~5.5.4
   peerDependencies:
@@ -10346,15 +10361,15 @@ __metadata:
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/password-policies": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
-    "@types/use-sync-external-store": ^0.0.5
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
+    "@types/use-sync-external-store": ^0.0.6
     eslint: ~8.45.0
-    eslint-plugin-react-hooks: ^4.6.0
+    eslint-plugin-react-hooks: ^4.6.2
     mongodb: ^4.17.2
     react: ~17.0.2
     typescript: ~5.5.4
-    use-sync-external-store: ^1.2.0
+    use-sync-external-store: ^1.2.2
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:^"
@@ -10371,23 +10386,23 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-kit@workspace:packages/ui-kit"
   dependencies:
-    "@babel/core": ~7.21.4
-    "@babel/eslint-parser": ~7.23.3
+    "@babel/core": ~7.21.8
+    "@babel/eslint-parser": ~7.23.10
     "@babel/plugin-transform-runtime": ~7.21.4
-    "@babel/preset-env": ~7.21.4
+    "@babel/preset-env": ~7.21.5
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
-    babel-loader: ~9.1.2
+    "@types/jest": ~29.5.13
+    babel-loader: ~9.1.3
     eslint: ~8.45.0
     jest: ~29.7.0
     npm-run-all: ~4.1.5
     prettier: ~2.8.8
     rimraf: ~3.0.2
-    ts-jest: ~29.1.1
-    ts-loader: ~9.4.2
-    ts-node: ~10.9.1
+    ts-jest: ~29.1.5
+    ts-loader: ~9.4.4
+    ts-node: ~10.9.2
     ts-patch: ~3.2.1
     typescript: ~5.5.4
     typia: ~6.9.0
@@ -10405,14 +10420,14 @@ __metadata:
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/ui-contexts": "workspace:~"
-    "@types/react": ~17.0.69
+    "@types/react": ~17.0.80
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-testing-library: ^5.11.1
     react: ~17.0.2
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
@@ -10447,16 +10462,15 @@ __metadata:
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
     "@storybook/testing-react": ~1.3.0
-    "@types/babel__core": ~7.20.3
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     "@types/jest-axe": ~3.5.9
     eslint: ~8.45.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     jest: ~29.7.0
     jest-axe: ~9.0.0
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
@@ -10491,17 +10505,17 @@ __metadata:
     "@rocket.chat/styled": ~0.31.25
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:~"
-    "@types/react": ~17.0.69
-    "@types/react-beautiful-dnd": ^13.1.6
-    "@types/react-dom": ~17.0.22
-    "@types/use-subscription": ^1.0.1
+    "@types/react": ~17.0.80
+    "@types/react-beautiful-dnd": ^13.1.8
+    "@types/react-dom": ~17.0.25
+    "@types/use-subscription": ^1.0.2
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
     "@vitejs/plugin-react": ^4.0.0
     codemirror: ^6.0.1
     eslint: ~8.45.0
-    eslint-plugin-react-hooks: ^4.6.0
-    eslint-plugin-react-refresh: ^0.4.4
+    eslint-plugin-react-hooks: ^4.6.2
+    eslint-plugin-react-refresh: ^0.4.11
     eslint4b-prebuilt: ^6.7.2
     moment: ^2.29.4
     rc-scrollbars: ^1.1.6
@@ -10513,7 +10527,7 @@ __metadata:
     react-virtuoso: ^4.7.1
     reactflow: ^11.7.2
     typescript: ~5.5.4
-    use-subscription: ^1.8.0
+    use-subscription: ^1.8.2
     vite: ^4.3.9
   languageName: unknown
   linkType: soft
@@ -10527,7 +10541,7 @@ __metadata:
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
     "@rocket.chat/i18n": "workspace:~"
-    "@rocket.chat/layout": ~0.31.26
+    "@rocket.chat/layout": ~0.31.27
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/tools": "workspace:~"
     "@rocket.chat/ui-client": "workspace:^"
@@ -10540,14 +10554,14 @@ __metadata:
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ^0.2.2
     "@tanstack/react-query": ^4.16.1
-    "@testing-library/react": ~16.0.0
-    "@types/react": ~17.0.69
+    "@testing-library/react": ~16.0.1
+    "@types/react": ~17.0.80
     babel-loader: ~8.3.0
     eslint: ~8.45.0
     react: ~17.0.2
     react-hook-form: ~7.45.4
     react-i18next: ~15.0.1
-    storybook-dark-mode: ~3.0.1
+    storybook-dark-mode: ~3.0.3
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/layout": "*"
@@ -11278,24 +11292,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:^7.0.0":
-  version: 7.3.2
-  resolution: "@storybook/api@npm:7.3.2"
-  dependencies:
-    "@storybook/client-logger": 7.3.2
-    "@storybook/manager-api": 7.3.2
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    react:
-      optional: true
-    react-dom:
-      optional: true
-  checksum: dfe5f976256fc74c82548ca35f7052b82ca87a21d44e8554c0913ecc8f5d0e0d317a57b0308057473c3b8efa95428590d4350c9c4d1ef7f7c02ee8c7c2d2e8ee
-  languageName: node
-  linkType: hard
-
 "@storybook/builder-webpack4@npm:6.5.16, @storybook/builder-webpack4@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/builder-webpack4@npm:6.5.16"
@@ -11462,6 +11458,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/channels@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/channels@npm:7.6.20"
+  dependencies:
+    "@storybook/client-logger": 7.6.20
+    "@storybook/core-events": 7.6.20
+    "@storybook/global": ^5.0.0
+    qs: ^6.10.0
+    telejson: ^7.2.0
+    tiny-invariant: ^1.3.1
+  checksum: e600949b77b8ae2c865eab8e2f4022893843932c76f9f49f2ef6d8a8f62114f979d38fe93fed2d8899fa892bb1dcd353c81e292515a7bd8fbc944629939574b0
+  languageName: node
+  linkType: hard
+
 "@storybook/client-api@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/client-api@npm:6.5.16"
@@ -11512,6 +11522,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/client-logger@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/client-logger@npm:7.6.20"
+  dependencies:
+    "@storybook/global": ^5.0.0
+  checksum: 98bf603df918a74bc5b34f344ba70356d8e2b889d8a5cbfb7a03c23dcf409029800319e5d3e0ff7e95545a2d4a989a53c2097eb7a36de808d287d466d4d92573
+  languageName: node
+  linkType: hard
+
 "@storybook/components@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/components@npm:6.5.16"
@@ -11668,6 +11687,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/core-events@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/core-events@npm:7.6.20"
+  dependencies:
+    ts-dedent: ^2.0.0
+  checksum: 284f4df326200dc0bdfc74472dccab3bbed38cf8515baebe467830b562f9ace06fb6e5640b155b4ae462288b9f3257233c6b5212fcb9b2d3024f9e4d08d28457
+  languageName: node
+  linkType: hard
+
 "@storybook/core-server@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/core-server@npm:6.5.16"
@@ -11815,6 +11843,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/csf@npm:^0.1.2":
+  version: 0.1.11
+  resolution: "@storybook/csf@npm:0.1.11"
+  dependencies:
+    type-fest: ^2.19.0
+  checksum: ba2a265f62ad82a2853b069f77e974efe31bed263a640ca1dd8e6d7e194022018a67ad4a2587ae928f33ae45aaf6ffedd5925ba3fcf3fe5b7996667a918e22eb
+  languageName: node
+  linkType: hard
+
 "@storybook/docs-tools@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/docs-tools@npm:6.5.16"
@@ -11886,6 +11923,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/manager-api@npm:^7.0.0":
+  version: 7.6.20
+  resolution: "@storybook/manager-api@npm:7.6.20"
+  dependencies:
+    "@storybook/channels": 7.6.20
+    "@storybook/client-logger": 7.6.20
+    "@storybook/core-events": 7.6.20
+    "@storybook/csf": ^0.1.2
+    "@storybook/global": ^5.0.0
+    "@storybook/router": 7.6.20
+    "@storybook/theming": 7.6.20
+    "@storybook/types": 7.6.20
+    dequal: ^2.0.2
+    lodash: ^4.17.21
+    memoizerific: ^1.11.3
+    store2: ^2.14.2
+    telejson: ^7.2.0
+    ts-dedent: ^2.0.0
+  checksum: 01a35e757b0e673570a6868fa64b9a3a258011b6c16afe6e0164ae8406896eeaf53d9a069db6862cbd4b10b64546f0c78ed96872c036a02869b2f530603e9dec
+  languageName: node
+  linkType: hard
+
 "@storybook/manager-webpack4@npm:6.5.16, @storybook/manager-webpack4@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/manager-webpack4@npm:6.5.16"
@@ -12233,6 +12292,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/router@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/router@npm:7.6.20"
+  dependencies:
+    "@storybook/client-logger": 7.6.20
+    memoizerific: ^1.11.3
+    qs: ^6.10.0
+  checksum: 67af15f4144e674dcd957fc8ae2ed6e7cbd3845c8fb1343760ec67bebf04eeb54b7088db701208c976026641373dc2287f6908dbc7e3d96da9a1c910054ba942
+  languageName: node
+  linkType: hard
+
 "@storybook/semver@npm:^7.3.2":
   version: 7.3.2
   resolution: "@storybook/semver@npm:7.3.2"
@@ -12381,6 +12451,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/theming@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/theming@npm:7.6.20"
+  dependencies:
+    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
+    "@storybook/client-logger": 7.6.20
+    "@storybook/global": ^5.0.0
+    memoizerific: ^1.11.3
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 2c3cbac759d300fb471acf4e01514f7728c48533c6e24c37b0351d9f0fcc9240dbdcf50067a81c3ff73b27a1da4227debb55a48ab2920368099871d1f49252ea
+  languageName: node
+  linkType: hard
+
 "@storybook/types@npm:7.3.2":
   version: 7.3.2
   resolution: "@storybook/types@npm:7.3.2"
@@ -12393,6 +12478,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/types@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/types@npm:7.6.20"
+  dependencies:
+    "@storybook/channels": 7.6.20
+    "@types/babel__core": ^7.0.0
+    "@types/express": ^4.7.0
+    file-system-cache: 2.3.0
+  checksum: 1e0ae196c63ace6a9a0f06a42c7294cfc840665d1ff7ae6d9fd2466ed3d78387672951aa7a9064a719384938c57d8eb25c8089657710d95c546344fbc28d8df6
+  languageName: node
+  linkType: hard
+
 "@storybook/ui@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/ui@npm:6.5.16"
@@ -12418,90 +12515,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-darwin-arm64@npm:1.7.23"
+"@swc/core-darwin-arm64@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-darwin-arm64@npm:1.7.26"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-darwin-x64@npm:1.7.23"
+"@swc/core-darwin-x64@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-darwin-x64@npm:1.7.26"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.23"
+"@swc/core-linux-arm-gnueabihf@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.23"
+"@swc/core-linux-arm64-gnu@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.23"
+"@swc/core-linux-arm64-musl@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-arm64-musl@npm:1.7.26"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.23"
+"@swc/core-linux-x64-gnu@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-x64-gnu@npm:1.7.26"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.23"
+"@swc/core-linux-x64-musl@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-x64-musl@npm:1.7.26"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.23"
+"@swc/core-win32-arm64-msvc@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.23"
+"@swc/core-win32-ia32-msvc@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.23"
+"@swc/core-win32-x64-msvc@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-win32-x64-msvc@npm:1.7.26"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:~1.7.23":
-  version: 1.7.23
-  resolution: "@swc/core@npm:1.7.23"
+"@swc/core@npm:~1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core@npm:1.7.26"
   dependencies:
-    "@swc/core-darwin-arm64": 1.7.23
-    "@swc/core-darwin-x64": 1.7.23
-    "@swc/core-linux-arm-gnueabihf": 1.7.23
-    "@swc/core-linux-arm64-gnu": 1.7.23
-    "@swc/core-linux-arm64-musl": 1.7.23
-    "@swc/core-linux-x64-gnu": 1.7.23
-    "@swc/core-linux-x64-musl": 1.7.23
-    "@swc/core-win32-arm64-msvc": 1.7.23
-    "@swc/core-win32-ia32-msvc": 1.7.23
-    "@swc/core-win32-x64-msvc": 1.7.23
+    "@swc/core-darwin-arm64": 1.7.26
+    "@swc/core-darwin-x64": 1.7.26
+    "@swc/core-linux-arm-gnueabihf": 1.7.26
+    "@swc/core-linux-arm64-gnu": 1.7.26
+    "@swc/core-linux-arm64-musl": 1.7.26
+    "@swc/core-linux-x64-gnu": 1.7.26
+    "@swc/core-linux-x64-musl": 1.7.26
+    "@swc/core-win32-arm64-msvc": 1.7.26
+    "@swc/core-win32-ia32-msvc": 1.7.26
+    "@swc/core-win32-x64-msvc": 1.7.26
     "@swc/counter": ^0.1.3
     "@swc/types": ^0.1.12
   peerDependencies:
@@ -12530,7 +12627,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: a21e9a67d305ad9b49b6def9f9698b374db6c15b2ded5e5cf29390221181fc6b91bfa317b53fd41d9cca989d85b79bbbca5ab27635df1e0232cad4681f618fa5
+  checksum: 8249f2af001f2b5b312ccace4e3a8575bf286bb0f67f029eb58ef8b144f73e37f766800859161ef87c0993e586055238c000ab17dddf9d3760edcfa63ffd22e6
   languageName: node
   linkType: hard
 
@@ -12679,9 +12776,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:~16.0.0":
-  version: 16.0.0
-  resolution: "@testing-library/react@npm:16.0.0"
+"@testing-library/react@npm:~16.0.1":
+  version: 16.0.1
+  resolution: "@testing-library/react@npm:16.0.1"
   dependencies:
     "@babel/runtime": ^7.12.5
   peerDependencies:
@@ -12695,7 +12792,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 45a35f0b5f34b5a7f4dcefdd3f1d202d5421692e5cc7a491c9bc71e6ed9dd5872a182b80b4dfefb4a56d9c1df35e50f6fa2917bcf657cc26b4bc0d2259df0027
+  checksum: 1837db473ea018cf2b5d0cbfffb7a30d0d759e5a7f23aad431441c77bcc3d2533250cd003a61878fd908267df47404cedcb5914f12d79e413002c659652b37fd
   languageName: node
   linkType: hard
 
@@ -12775,12 +12872,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/adm-zip@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "@types/adm-zip@npm:0.5.3"
+"@types/adm-zip@npm:^0.5.5":
+  version: 0.5.5
+  resolution: "@types/adm-zip@npm:0.5.5"
   dependencies:
     "@types/node": "*"
-  checksum: 995e21441cc6fe180f12ebf4e722bc6dbde0f9c765e57353018a0969a27cf15542c3f5451bfa1a82b958d5ed5e371fb3cbe55f934076dae22d8bf6a259a536bf
+  checksum: 808c25b8a1c2e1c594cf9b1514e7953105cf96e19e38aa7dc109ff2537bda7345b950ef1f4e54a6e824e5503e29d24b0ff6d0aa1ff9bd4afb79ef0ef2df9ebab
   languageName: node
   linkType: hard
 
@@ -12800,7 +12897,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.3, @types/babel__core@npm:~7.20.3":
+"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14":
   version: 7.20.3
   resolution: "@types/babel__core@npm:7.20.3"
   dependencies:
@@ -12822,13 +12919,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__preset-env@npm:^7.9.4":
-  version: 7.9.4
-  resolution: "@types/babel__preset-env@npm:7.9.4"
-  checksum: a4580b541d4fe7bdf9ecb9695cb90827f96c75e5c807e6fcf6cbca3beeb9106019dc322b2d08de03025d57c6f3f1431d80eb3ea6d9416e90bc8ee15460efa27d
-  languageName: node
-  linkType: hard
-
 "@types/babel__template@npm:*":
   version: 7.4.1
   resolution: "@types/babel__template@npm:7.4.1"
@@ -12848,23 +12938,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/bad-words@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@types/bad-words@npm:3.0.2"
-  checksum: aa40d10364b73deb5617c0b53d5a782841ddd173e6cc68bc41d48c2c95c63ac81d23e2cabeb3d686cb7d655512353ac1866135203305b820d4c60859635ba9d3
+"@types/bad-words@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@types/bad-words@npm:3.0.3"
+  checksum: 220729e6888b523477e3b1ca431b2fd01d816e9dbdd309c8a68b7a1a64ce02ed13ec44fe83bf83872f559d19b9180d4103b5f4179b7d4b1dd497306a46cb3c1d
   languageName: node
   linkType: hard
 
-"@types/bcrypt@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/bcrypt@npm:5.0.1"
+"@types/bcrypt@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@types/bcrypt@npm:5.0.2"
   dependencies:
     "@types/node": "*"
-  checksum: 2419ad2e7601b2c306ce2bd8bd8d911770f1abdea780efd4e61e9329b757e47c80fbd73fc52a925a371de47247ce92f04d11bdf24b8b44754ea0ba18d06d2202
+  checksum: b1f97532ffe6079cb57a464f28b5b37a30bc9620f43469e1f27ab9c979c8a114be5b667e7b115a5556fd5be463b65968da9bb32573c6faf74fecf6e565d8974b
   languageName: node
   linkType: hard
 
-"@types/body-parser@npm:*, @types/body-parser@npm:^1.19.4":
+"@types/body-parser@npm:*":
   version: 1.19.4
   resolution: "@types/body-parser@npm:1.19.4"
   dependencies:
@@ -12874,6 +12964,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/body-parser@npm:^1.19.5":
+  version: 1.19.5
+  resolution: "@types/body-parser@npm:1.19.5"
+  dependencies:
+    "@types/connect": "*"
+    "@types/node": "*"
+  checksum: 1e251118c4b2f61029cc43b0dc028495f2d1957fe8ee49a707fb940f86a9bd2f9754230805598278fe99958b49e9b7e66eec8ef6a50ab5c1f6b93e1ba2aaba82
+  languageName: node
+  linkType: hard
+
 "@types/bonjour@npm:^3.5.9":
   version: 3.5.10
   resolution: "@types/bonjour@npm:3.5.10"
@@ -12883,58 +12983,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/busboy@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "@types/busboy@npm:1.5.2"
+"@types/busboy@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "@types/busboy@npm:1.5.4"
   dependencies:
     "@types/node": "*"
-  checksum: d2cfa334e06ce0fbeb31bdac7b4ba051b85e508f4f46d016e55488a717c626e19285f0e2fae40d0183d0f676dd162ab9216613799f83d40430e1996fba4bfb2f
+  checksum: 56444ed1223d5c8f6340128561c25bf7d6567494f507d386241de2ed6e22f9a69de7f536d71502c2f0897f81be7e8253455522ddd791db7e3eb769db7eae9e92
   languageName: node
   linkType: hard
 
-"@types/chai-as-promised@npm:^7.1.7":
-  version: 7.1.7
-  resolution: "@types/chai-as-promised@npm:7.1.7"
+"@types/chai-as-promised@npm:^7.1.8":
+  version: 7.1.8
+  resolution: "@types/chai-as-promised@npm:7.1.8"
   dependencies:
     "@types/chai": "*"
-  checksum: 59199afbd91289588648e263d7f32f7d72fa9c0075f3c17b1e760e10fdc1a310c2170a392b0d17d96cfff2c51daca72839eed6d80142f9230c9784b8e08ba676
+  checksum: f0e5eab451b91bc1e289ed89519faf6591932e8a28d2ec9bbe95826eb73d28fe43713633e0c18706f3baa560a7d97e7c7c20dc53ce639e5d75bac46b2a50bf21
   languageName: node
   linkType: hard
 
-"@types/chai-datetime@npm:0.0.38":
-  version: 0.0.38
-  resolution: "@types/chai-datetime@npm:0.0.38"
+"@types/chai-datetime@npm:0.0.39":
+  version: 0.0.39
+  resolution: "@types/chai-datetime@npm:0.0.39"
   dependencies:
     "@types/chai": "*"
-  checksum: 2c0269e91a282ef71fe5603a94b6df4c3b784e3ded25f380ed91c0d91c26d08ac33da6bde903bc9bddfec4636455378c26810947a989ef87fe37078213e350ca
+  checksum: fc5266f839f7005b34d04d4e3f67b232ec86eb50291cf4769f4875bc81a21afd8c9a51547da71f7903e2124379019b83bfc400a1b6315c719888dedb678c760b
   languageName: node
   linkType: hard
 
-"@types/chai-dom@npm:1.11.2":
-  version: 1.11.2
-  resolution: "@types/chai-dom@npm:1.11.2"
+"@types/chai-dom@npm:1.11.3":
+  version: 1.11.3
+  resolution: "@types/chai-dom@npm:1.11.3"
   dependencies:
     "@types/chai": "*"
-  checksum: d59a90bf2b497797178d3a5bd17f242caaf6ee098563142fdc765a6c12786f94bc0a9b8e4023de37ef8c803198ce9562823651610b02c80f1e21a29f2ece80fd
+  checksum: 274afd91062b54fb56c95fc2c919d0d6d2f6b2c608f5849d27227a72f99d33ccf01b3fd59e3282e2c9626b8eba4e45d4266a742f61bb2ff506ddbfba0892d0c9
   languageName: node
   linkType: hard
 
-"@types/chai-spies@npm:~1.0.5":
-  version: 1.0.5
-  resolution: "@types/chai-spies@npm:1.0.5"
+"@types/chai-spies@npm:~1.0.6":
+  version: 1.0.6
+  resolution: "@types/chai-spies@npm:1.0.6"
   dependencies:
     "@types/chai": "*"
-  checksum: d8009e0e4bf78fdce4a6824d43a2e206ddc0c07e3869f5d55ed7a7476c5623f77d0a5f444148ce7a0b9d9f47592fe3f0c6652952e6a0f514d8603cbb2e587cd4
+  checksum: 2f4e1fd3ed4f317b6f445a4516612b2a40e25c86cf60ba093ce3569012d612d0fc05c96d69223221c26fad60d0f3af75f7c2bb1858e48b209e8da8f0a1d5fccd
   languageName: node
   linkType: hard
 
-"@types/chai@npm:*, @types/chai@npm:~4.3.16":
+"@types/chai@npm:*":
   version: 4.3.16
   resolution: "@types/chai@npm:4.3.16"
   checksum: bb5f52d1b70534ed8b4bf74bd248add003ffe1156303802ea367331607c06b494da885ffbc2b674a66b4f90c9ee88759790a5f243879f6759f124f22328f5e95
   languageName: node
   linkType: hard
 
+"@types/chai@npm:~4.3.19":
+  version: 4.3.19
+  resolution: "@types/chai@npm:4.3.19"
+  checksum: abd4d3239735054f3b6e8163e45bc6495f66469729fbcf4784c9f2b82361a6845d45ab9c518818c78eafa46d015e3a72306e9949d1333e10d7eaedf426af4261
+  languageName: node
+  linkType: hard
+
 "@types/chalk@npm:^2.2.0":
   version: 2.2.0
   resolution: "@types/chalk@npm:2.2.0"
@@ -12944,21 +13051,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/chart.js@npm:^2.9.39":
-  version: 2.9.39
-  resolution: "@types/chart.js@npm:2.9.39"
+"@types/chart.js@npm:^2.9.41":
+  version: 2.9.41
+  resolution: "@types/chart.js@npm:2.9.41"
   dependencies:
     moment: ^2.10.2
-  checksum: c19cab03143db9cabc9c7277b77a974634baa9a9554dc95a7d2996091ac88ca9d98718e701446932a4cf0b8f3c2862ad0d3f232e1deb6a9bdf72d9ef5342582d
+  checksum: 7c6b29c837d35edaa371e05850e10468d6690dec1128f247b108c3cd15903c80cafb158a3cbd6a90beb0a9e1e33b12759251e1e63d6cbfa5995a0c5dc0df58b1
   languageName: node
   linkType: hard
 
-"@types/codemirror@npm:^5.60.12":
-  version: 5.60.12
-  resolution: "@types/codemirror@npm:5.60.12"
+"@types/codemirror@npm:^5.60.15":
+  version: 5.60.15
+  resolution: "@types/codemirror@npm:5.60.15"
   dependencies:
     "@types/tern": "*"
-  checksum: dff22f32ea42ccd3f9bfcf408631f94a11ffb4614ff4fa8cc55adf7da6e7ba96650533b8dd27d037242747bdaa85141e93520f84409db7bc394862a174a10e1e
+  checksum: cfad3f569de48fba3efa44fdfeba77933e231486a52cc80cff7ce6eeeed5b447a5bc2b11e2226bc00ccee332c661e53e35a15cf14eb835f434a6a402d9462f5f
   languageName: node
   linkType: hard
 
@@ -12981,19 +13088,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cookie-parser@npm:^1.4.5":
-  version: 1.4.5
-  resolution: "@types/cookie-parser@npm:1.4.5"
+"@types/cookie-parser@npm:^1.4.7":
+  version: 1.4.7
+  resolution: "@types/cookie-parser@npm:1.4.7"
   dependencies:
     "@types/express": "*"
-  checksum: 45855721706d6a57bb0441db11fb59db407414ea83a0000a0df80d19230447cc3bcc43c436397bfb8998ec78db222265fa8083456b00c5b5054a0c03d06f0086
+  checksum: 7b87c59420598e686a57e240be6e0db53967c3c8814be9326bf86609ee2fc39c4b3b9f2263e1deba43526090121d1df88684b64c19f7b494a80a4437caf3d40b
   languageName: node
   linkType: hard
 
-"@types/cookie@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "@types/cookie@npm:0.5.3"
-  checksum: b785618f6b2fdceb6a20a17e1dfe99651b1e5c2c079f486de76dfb21b508f09d91913755e4a6dbdfe628882ea32466bb2e9318b114ce34efa5e624356494fcab
+"@types/cookie@npm:^0.5.4":
+  version: 0.5.4
+  resolution: "@types/cookie@npm:0.5.4"
+  checksum: bd9603ce5e9bcbe1c2c9fabe3d1b1da131f1db10a7fa0077b17eb06d59bf4a6192fbb890597e8e2295067a078aaf8299bc662bfe993e8c2d1ecd62f859317ece
   languageName: node
   linkType: hard
 
@@ -13004,12 +13111,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cors@npm:^2.8.15":
-  version: 2.8.15
-  resolution: "@types/cors@npm:2.8.15"
+"@types/cors@npm:^2.8.17":
+  version: 2.8.17
+  resolution: "@types/cors@npm:2.8.17"
   dependencies:
     "@types/node": "*"
-  checksum: ef7b0aba4c6a4c1fe9d459bd471ebaa891a75319682c9248daa17720003d1d0d2c59de4bdb6868630596ade9b7c3c949e652d6141b14c6fe4387ffcc520d0f3f
+  checksum: 469bd85e29a35977099a3745c78e489916011169a664e97c4c3d6538143b0a16e4cc72b05b407dc008df3892ed7bf595f9b7c0f1f4680e169565ee9d64966bde
   languageName: node
   linkType: hard
 
@@ -13020,10 +13127,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cssom@npm:^0.4.2":
-  version: 0.4.2
-  resolution: "@types/cssom@npm:0.4.2"
-  checksum: 4bcc54245b8c09c832c21465f60af412a5c2446ae5c17ab1a874dd87a9488e43951f8027594cc0eaf99d4e9a7c061882f017552a13f0a94ac25db9ac92fea837
+"@types/cssom@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@types/cssom@npm:0.4.3"
+  checksum: 3a04921a41fd353e3484962ed705385847b5aeb740988d7c773691417673d01b7cf79d0093fd2b57515d86a0e3ad76dc804b63def8be48ae6f1fdcebd2ab4cd9
   languageName: node
   linkType: hard
 
@@ -13380,12 +13487,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/debug@npm:^4.1.10":
-  version: 4.1.10
-  resolution: "@types/debug@npm:4.1.10"
+"@types/debug@npm:^4.1.12":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
   dependencies:
     "@types/ms": "*"
-  checksum: 938f79c5b610f851da9c67ecd8641a09b33ce9cb38fe4c9f4d20ee743d6bccb5d8e9a833a4cd23e0684a316622af67a0634fa706baea5a01f5219961d1976314
+  checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
   languageName: node
   linkType: hard
 
@@ -13407,17 +13514,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ejson@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "@types/ejson@npm:2.2.1"
-  checksum: 8a0e6e9d50a9b33cdb645e7fdaca5fccb5a0687be0918eaeb06c9c7f21bb8b5757881de77c9d19d84bf16e6949c10b23d098954990aef7bd26257d471f4c008f
+"@types/ejson@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "@types/ejson@npm:2.2.2"
+  checksum: 3f2eb25d98f93821156b071e647bca626563900ecb34bb81cdba33721ee7d046bb66db7d6de664312b9480821821a1d177cf5e146dc1f10adcf43cbd2e387bbe
   languageName: node
   linkType: hard
 
-"@types/emojione@npm:^2.2.8":
-  version: 2.2.8
-  resolution: "@types/emojione@npm:2.2.8"
-  checksum: 3342fd3fbcbc7e7429c7a23330f559d0f41f4fcba5a699035fddb53efba8c7c5ed3af54024011643aa338792d8fd963768766877bc115e093bef193a391abb05
+"@types/emojione@npm:^2.2.9":
+  version: 2.2.9
+  resolution: "@types/emojione@npm:2.2.9"
+  checksum: ec16f96f8d9886dc3f82bd8aa3ee34f320069771d9a82d01c3c20da9c0c13c7b07347eff2912b914caf3416e3cedea4b963ecc3331c23d743270c975a91ff4d4
   languageName: node
   linkType: hard
 
@@ -13431,7 +13538,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:*, @types/eslint@npm:~8.44.6":
+"@types/eslint@npm:*":
   version: 8.44.6
   resolution: "@types/eslint@npm:8.44.6"
   dependencies:
@@ -13441,6 +13548,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/eslint@npm:~8.44.9":
+  version: 8.44.9
+  resolution: "@types/eslint@npm:8.44.9"
+  dependencies:
+    "@types/estree": "*"
+    "@types/json-schema": "*"
+  checksum: 6f8889e94e67a5e43c15f5a2530798f864ace08c270bfb3f153cb705da4e30a80e0e9a0fc05317c8642c8dda909d528968172089eb4d52aca9f212761df25d90
+  languageName: node
+  linkType: hard
+
 "@types/estree@npm:*, @types/estree@npm:^1.0.0":
   version: 1.0.1
   resolution: "@types/estree@npm:1.0.1"
@@ -13476,7 +13593,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:^4.16.1, @types/express@npm:^4.17.13, @types/express@npm:^4.17.20, @types/express@npm:^4.17.8, @types/express@npm:^4.7.0":
+"@types/express@npm:*, @types/express@npm:^4.16.1, @types/express@npm:^4.17.13, @types/express@npm:^4.17.8, @types/express@npm:^4.7.0":
   version: 4.17.20
   resolution: "@types/express@npm:4.17.20"
   dependencies:
@@ -13500,19 +13617,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/fibers@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "@types/fibers@npm:3.1.3"
-  checksum: c4511eecea1c4e73a4b4310ff5152bb43477dfbd7c19ea8614de5ce6d604c6bd629b4552bdbc06fbd593215c684d06aee4e6d8e6681b4ab019f2b8a03838de79
+"@types/fibers@npm:^3.1.4":
+  version: 3.1.4
+  resolution: "@types/fibers@npm:3.1.4"
+  checksum: 36bb70198fb5b7f99b010c006ad0e77d473061cf03d4f63f1842040b7ecb62e8800041c9509b927ec59a1d5ac374d5e7c86b2fe0de2a9813f1538ab0248e5dea
   languageName: node
   linkType: hard
 
-"@types/gc-stats@npm:^1.4.2":
-  version: 1.4.2
-  resolution: "@types/gc-stats@npm:1.4.2"
+"@types/gc-stats@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "@types/gc-stats@npm:1.4.3"
   dependencies:
     "@types/node": "*"
-  checksum: 4039f699b497595c3ac30f221f72d798e12a764093ab5df05cec25cd501fe806005daec10c25737d2b08449772bc318ac720f01fe73d13fdb33168429e25483f
+  checksum: 983ad3841a1f62a1014e4c0becf81d258f07dc44849598079168df6f4ea293eb8abef7896b6847b9dd68e61b4628525279950b3bb4a75c045b8d461cbaaef3e9
   languageName: node
   linkType: hard
 
@@ -13533,10 +13650,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/google-libphonenumber@npm:^7.4.29":
-  version: 7.4.29
-  resolution: "@types/google-libphonenumber@npm:7.4.29"
-  checksum: 63b1d03ab6dcd877c1249251d73c54777f6b6cbd13f6b3107c8fcef70d19f8e3a768555942735318da86fa6c50ea0dcfc82d521d4defc9e9dfc1e67b4746ab96
+"@types/google-libphonenumber@npm:^7.4.30":
+  version: 7.4.30
+  resolution: "@types/google-libphonenumber@npm:7.4.30"
+  checksum: 09270ed030076a0e69965ad5bad564e672a110e1e83c9092f6d264c3e0355921631521cb9afd022018a51cddfd19ba52d0421f4682d7b68b836dbb52537320de
   languageName: node
   linkType: hard
 
@@ -13549,10 +13666,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/gravatar@npm:^1.8.5":
-  version: 1.8.5
-  resolution: "@types/gravatar@npm:1.8.5"
-  checksum: a4a5e9010e5f2caff27f360cd4e0acf4e3276be3fdf8cc4a38baed8b9ca14d187b6b5c1d30d4d3abe326b0aecf30d1b47111ea543c8f6caf8bce9a8bb147c090
+"@types/gravatar@npm:^1.8.6":
+  version: 1.8.6
+  resolution: "@types/gravatar@npm:1.8.6"
+  checksum: b690f2816321358e8528fe0b731e5c50905ed2c4859327156a87b717a59b45363a2f2c1398c3a9015fa45b17d71d86b1e828fd3df542d13ba946745d9a26094e
   languageName: node
   linkType: hard
 
@@ -13605,28 +13722,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/i18next-sprintf-postprocessor@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "@types/i18next-sprintf-postprocessor@npm:0.2.2"
+"@types/i18next-sprintf-postprocessor@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "@types/i18next-sprintf-postprocessor@npm:0.2.3"
   dependencies:
     i18next: ">=17.0.11"
-  checksum: 1029c5f896e453534a128013f9ee8a0873a2e03b82a18a530842d06618c3dd1b1f3adf0491efa3f7efd86d19c61b23af60df5c0f36306ed298a20d6d895db95e
+  checksum: d647c6bb75e2e038ee82d2e5bac762c0254d4fe31232f2fba5f35945779e8509cfa687746219280e2a126e33a647fd459641e8353cf922ddcd2a4e528a1234ba
   languageName: node
   linkType: hard
 
-"@types/identity-obj-proxy@npm:^3":
+"@types/identity-obj-proxy@npm:^3.0.2":
   version: 3.0.2
   resolution: "@types/identity-obj-proxy@npm:3.0.2"
   checksum: 77387ee587657ab24f12a1dee5c0e1386358d5c38cda5cac78bc5049340cb358e009f6254de3bbdee6a08e46f13b1552cd47a0bbd3e7a53ff469bf58a04ec6e9
   languageName: node
   linkType: hard
 
-"@types/imap@npm:^0.8.39":
-  version: 0.8.39
-  resolution: "@types/imap@npm:0.8.39"
+"@types/imap@npm:^0.8.40":
+  version: 0.8.40
+  resolution: "@types/imap@npm:0.8.40"
   dependencies:
     "@types/node": "*"
-  checksum: 403a0810dc24f035d1762d9ebc1cf548448bdbe565ab6062d2a1d1be2afd4f8ef1483723d4077c0e0e2312a39a27f393a513a40515589149c0617aa984946ae5
+  checksum: 5bd33aeeca13bd3403f685048c7c8e136502dc3f5703d732748b488193c96b79295b0901ff1dd72a5cc6b826fc33572bf7376cd6533194797903f9d58cfa8e6d
   languageName: node
   linkType: hard
 
@@ -13690,7 +13807,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:*, @types/jest@npm:~29.5.12":
+"@types/jest@npm:*":
   version: 29.5.12
   resolution: "@types/jest@npm:29.5.12"
   dependencies:
@@ -13700,6 +13817,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jest@npm:~29.5.13":
+  version: 29.5.13
+  resolution: "@types/jest@npm:29.5.13"
+  dependencies:
+    expect: ^29.0.0
+    pretty-format: ^29.0.0
+  checksum: 875ac23c2398cdcf22aa56c6ba24560f11d2afda226d4fa23936322dde6202f9fdbd2b91602af51c27ecba223d9fc3c1e33c9df7e47b3bf0e2aefc6baf13ce53
+  languageName: node
+  linkType: hard
+
 "@types/jquery@npm:*":
   version: 3.5.14
   resolution: "@types/jquery@npm:3.5.14"
@@ -13709,19 +13836,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/js-yaml@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@types/js-yaml@npm:4.0.8"
-  checksum: a5a77a5a1eac7e7fb667156c251c2b947ca4ddfdda570726369dd50bd5b2b1d0da2d0fb4273d1b10aa1782406d7b3da8923d957df4fb89dbfa1db06f43297de2
+"@types/js-yaml@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@types/js-yaml@npm:4.0.9"
+  checksum: e5e5e49b5789a29fdb1f7d204f82de11cb9e8f6cb24ab064c616da5d6e1b3ccfbf95aa5d1498a9fbd3b9e745564e69b4a20b6c530b5a8bbb2d4eb830cda9bc69
   languageName: node
   linkType: hard
 
-"@types/jsdom-global@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@types/jsdom-global@npm:3.0.6"
+"@types/jsdom-global@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@types/jsdom-global@npm:3.0.7"
   dependencies:
     "@types/jsdom": "*"
-  checksum: cb216d588d6abc583615706bbc8beab6265d7afec8e51cadea06f84dd5ba4508e583c500556b2c273d7569c80af9cd68dce19ab6042cd881567aa0fe10261cd1
+  checksum: 7b6e58419b56c69fc1b1ef4df8180f19bf171eaa06d1dcc073e87f4cdeb172538b1b2fc16bc783e9521a7630787bad3d0607f4ac66730e5b27525eb73656b86f
   languageName: node
   linkType: hard
 
@@ -13770,10 +13897,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jsrsasign@npm:^10.5.11":
-  version: 10.5.11
-  resolution: "@types/jsrsasign@npm:10.5.11"
-  checksum: c18b52af99ffb831fd84738356a49e94407e732f0a88f0f6db1e1fd55c06a47d2bab23a9e17b3b21af50fbf5f4d115e13fbe2796357204b18072929bd7b4bd5c
+"@types/jsrsasign@npm:^10.5.14":
+  version: 10.5.14
+  resolution: "@types/jsrsasign@npm:10.5.14"
+  checksum: 04e48fa2a225b6108eb6399a2485ed597fabe4dbd6cf02309abfca9da3e6028697d0fb20e4399b1ef340d7f1a70ace70746aa156ca0c2785663cb2e15797e653
   languageName: node
   linkType: hard
 
@@ -13784,10 +13911,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/katex@npm:~0.16.5":
-  version: 0.16.5
-  resolution: "@types/katex@npm:0.16.5"
-  checksum: a1ce22cd87acd9b32891931f2bc4355c3540cc0a423e161a2e5b040d3e50812cb85ce1fd09f23d42324b19f9da30ded6b1807114f215624f670d79bb46c47cc8
+"@types/katex@npm:~0.16.7":
+  version: 0.16.7
+  resolution: "@types/katex@npm:0.16.7"
+  checksum: 4fd15d93553be97c02c064e16be18d7ccbabf66ec72a9dc7fd5bfa47f0c7581da2f942f693c7cb59499de4c843c2189796e49c9647d336cbd52b777b6722a95a
   languageName: node
   linkType: hard
 
@@ -13800,10 +13927,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/later@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "@types/later@npm:1.2.8"
-  checksum: b89b391e6dc6721955b04c01b81a3e38b4ac3d4f40ebcf35bc34d694c46a81c387c028760b3fc1441b9852c46298dfd562708f61504aba65983d2484b99d6420
+"@types/later@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "@types/later@npm:1.2.9"
+  checksum: dc0db51bfbeb0caa4528e10725728349824dbe1ddbce6acd5258370bde586bb6ee67880d543e7e8dbb178c4001ba6db2e71cddfbcbdd7a1c523d49fbb26b61fb
   languageName: node
   linkType: hard
 
@@ -13816,10 +13943,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/less@npm:~3.0.5":
-  version: 3.0.5
-  resolution: "@types/less@npm:3.0.5"
-  checksum: 72d04c7877a63ef8a49e22a2aaf2e595aec41b4fcbbb48603e4d3a3d1e2d903edea6654db00bba52148ea4101a904e866b410599088b41935aa4c0733d25ef3c
+"@types/less@npm:~3.0.6":
+  version: 3.0.6
+  resolution: "@types/less@npm:3.0.6"
+  checksum: f1e5a7b7da6c0e65e0881a563d71287243f8cdeee1abb3e72ed9d449b4fb5421deee9b3bbd3bff856f17870563c2fc8cc4674c1f77632a73a9d713200dd7505a
   languageName: node
   linkType: hard
 
@@ -13839,21 +13966,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash.debounce@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@types/lodash.debounce@npm:4.0.8"
+"@types/lodash.debounce@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@types/lodash.debounce@npm:4.0.9"
   dependencies:
     "@types/lodash": "*"
-  checksum: 63f195cb053ca390135a9aca62bb60fa149ca81838519871506b60760ff4113333709becb8e4147707eaa3d916dab7eff66b0588caf4ce508cabda9bee9c5b60
+  checksum: 8183a152e01928e3b97ca773f6ae6038b8695e76493ba8bf6b743ec143948a62294fbc9d49fa4a78b52265b3ba4892ef57534e0c13d04aa0f111671b5a944feb
   languageName: node
   linkType: hard
 
-"@types/lodash.get@npm:^4.4.8":
-  version: 4.4.8
-  resolution: "@types/lodash.get@npm:4.4.8"
+"@types/lodash.get@npm:^4.4.9":
+  version: 4.4.9
+  resolution: "@types/lodash.get@npm:4.4.9"
   dependencies:
     "@types/lodash": "*"
-  checksum: fea09c12f098e5cbdc16510e8319a7f0dd4d0af49a5e6622ae4f0dcd4893f1b2c44a5d22f452d73443f50b85c8461f3fe2370c19b8d9051686265bbb0aae0ffa
+  checksum: d7e071d267e3d1bab58db14b6ce63fc51ca3c9c9697d3548cd5c0f16c08a7ce2188cff75dff1858b5623c3bd070836857211ebef4f364c53b82e31f3190fe0b4
   languageName: node
   linkType: hard
 
@@ -13864,13 +13991,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mailparser@npm:^3.4.3":
-  version: 3.4.3
-  resolution: "@types/mailparser@npm:3.4.3"
+"@types/mailparser@npm:^3.4.4":
+  version: 3.4.4
+  resolution: "@types/mailparser@npm:3.4.4"
   dependencies:
     "@types/node": "*"
     iconv-lite: ^0.6.3
-  checksum: 9374b713311b523b66429a7b509e90229dd001029e87d901ab6c756e1856eb2a8427012c016ad70ac45b39056eba1334e568f85ce9f329f5dd147986a897b691
+  checksum: c8bdb579d66756042b75c3763dd8b7b2fab6657d7e7d33504bb65bbbe6fa220b8da2ae67918dd821716c3229d8803bedffb00f2314a8946da1856396187c646a
   languageName: node
   linkType: hard
 
@@ -13907,12 +14034,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/meteor-collection-hooks@npm:^0.8.8":
-  version: 0.8.8
-  resolution: "@types/meteor-collection-hooks@npm:0.8.8"
+"@types/meteor-collection-hooks@npm:^0.8.9":
+  version: 0.8.9
+  resolution: "@types/meteor-collection-hooks@npm:0.8.9"
   dependencies:
     meteor-typings: ^1.3.1
-  checksum: bf0afc8531c836f3f7ead4aa0f8be3f69257af7a62397924a50533a20837b21b16c307777bb4fe52dc2e26753ba7269d0df6133ba6f1dad27d4075fea38a05f9
+  checksum: 7b12838587a6d411e3c44c682532cd43a4db99d4b11164867a2831a45593d2c637fb7feeede661b05eb6a63d8fa48228c0b5a0cb61e556c291e4d06f9f457892
   languageName: node
   linkType: hard
 
@@ -14012,19 +14139,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-gcm@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@types/node-gcm@npm:1.0.3"
-  checksum: 232e3d401f381fe9312343efb920892a7aa2f63457e00608ff2c3f0d1bff4a3707affe9a9e484ffead39272cfba0d1791901b7e937420233455dd047d63a4587
+"@types/node-gcm@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/node-gcm@npm:1.0.5"
+  checksum: 5448aa9de99b23700a2cc243483ed08bffd988a91d7431ed193dfbb55fc5c087c58310f728992a83f0e653b9edf9220434b62a0fabc5c7f417067ca805c1f92c
   languageName: node
   linkType: hard
 
-"@types/node-rsa@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@types/node-rsa@npm:1.1.3"
+"@types/node-rsa@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "@types/node-rsa@npm:1.1.4"
   dependencies:
     "@types/node": "*"
-  checksum: 03606729a96722623e316b1728d45ba452e008e01e886127d1d964221119dd4196be724ec062fc81be5beb28ce8e5fcc9c55109275cdae60545ddc293b89e77d
+  checksum: cd607463b7954dd0eda390e0710fa5fdc1a26e716baefd77134f54893ed57bfbf1906f3a354f43f89174aa37ac6f05fa450b708e516a4a8fa643e0d2f8e26106
   languageName: node
   linkType: hard
 
@@ -14044,21 +14171,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^14.0.10 || ^16.0.0, @types/node@npm:^14.14.20 || ^16.0.0, @types/node@npm:^16.18.60":
+"@types/node@npm:^14.0.10 || ^16.0.0, @types/node@npm:^14.14.20 || ^16.0.0":
   version: 16.18.60
   resolution: "@types/node@npm:16.18.60"
   checksum: aa0c81c3f20e663584bf17a5968e54c419277af7982ef41f9d83edd1b7ab4c8af2583a3c8a9e1cf659c6307e6f787e1be20522855121371f5a46d1d54f8a70e3
   languageName: node
   linkType: hard
 
-"@types/node@npm:^14.0.26, @types/node@npm:^14.14.37, @types/node@npm:^14.18.63, @types/node@npm:~14.18.42":
+"@types/node@npm:^14.0.26, @types/node@npm:^14.14.37, @types/node@npm:^14.18.63, @types/node@npm:~14.18.63":
   version: 14.18.63
   resolution: "@types/node@npm:14.18.63"
   checksum: be909061a54931778c71c49dc562586c32f909c4b6197e3d71e6dac726d8bd9fccb9f599c0df99f52742b68153712b5097c0f00cac4e279fa894b0ea6719a8fd
   languageName: node
   linkType: hard
 
-"@types/nodemailer@npm:*, @types/nodemailer@npm:^6.4.13":
+"@types/node@npm:^16.18.108":
+  version: 16.18.108
+  resolution: "@types/node@npm:16.18.108"
+  checksum: 5029ce7b0d247690360f2698da4fe765ef5cd5e2409b63b3a45e90bbf7bbaaf3497e769336fb7725be04a221d6e934e3a4616ec7fc205812943def3ea9d70862
+  languageName: node
+  linkType: hard
+
+"@types/nodemailer@npm:*":
   version: 6.4.13
   resolution: "@types/nodemailer@npm:6.4.13"
   dependencies:
@@ -14067,6 +14201,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/nodemailer@npm:^6.4.15":
+  version: 6.4.15
+  resolution: "@types/nodemailer@npm:6.4.15"
+  dependencies:
+    "@types/node": "*"
+  checksum: f6f9a2f8a669703ecc3ca6359c12345b16f6b2e5691b93c406b9af7de639c02092ec00133526e6fecd8c60d884890a7cd0f967d8e64bedab46d5c3d8be0882d7
+  languageName: node
+  linkType: hard
+
 "@types/normalize-package-data@npm:^2.4.0":
   version: 2.4.1
   resolution: "@types/normalize-package-data@npm:2.4.1"
@@ -14081,19 +14224,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/oauth2-server@npm:^3.0.15":
-  version: 3.0.15
-  resolution: "@types/oauth2-server@npm:3.0.15"
+"@types/oauth2-server@npm:^3.0.17":
+  version: 3.0.17
+  resolution: "@types/oauth2-server@npm:3.0.17"
   dependencies:
     "@types/express": "*"
-  checksum: b6c73ec0ba3a83e7a9cc1bf0e75fd640a76bcf57742642775abf950d851478a686e3f54ad8e24a09772e1dd89ed953742418c76ebb7df12b97b68f1cb94dae80
+  checksum: f45224356b9a3736b86f3ed1a8873f7f535e10b22af06bc7d34eefd96af4f5db83ed4b618b0103566828fe279e8bed2ee304f6644a31bd127470a5a49398ca49
   languageName: node
   linkType: hard
 
-"@types/object-path@npm:^0.11.3":
-  version: 0.11.3
-  resolution: "@types/object-path@npm:0.11.3"
-  checksum: 9c2f1ec11d9d15df1682ab1483c0f51cac3ff8c3a951662a50d15fd48824fc43a052041503d0761790a29a4100e33989eb519889948c3592d0bf6bde59d3ec79
+"@types/object-path@npm:^0.11.4":
+  version: 0.11.4
+  resolution: "@types/object-path@npm:0.11.4"
+  checksum: 7f1f5cb18b651d21e7861da176d8f87526c936ed949a8126a2692195cbe65734ed1a1a22c06a24a54afe1890483a3d6b074b402ebfca7a7567c1c287b588f563
   languageName: node
   linkType: hard
 
@@ -14125,24 +14268,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/parseurl@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "@types/parseurl@npm:1.3.2"
+"@types/parseurl@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "@types/parseurl@npm:1.3.3"
   dependencies:
     "@types/node": "*"
-  checksum: bfe0ad3222a957a1d8d21a5378a61a3ce21f0ce45ddfdd98fc727207b4bd3caf590d2a448c39d08774949e485a5f5f08429f6025a6b0123456a8a7fb9270ddb2
+  checksum: 2ea8d3b9615850fce3dd208f980aaca2c82c6cb20e033ee5705adbc773ea167fc57ee72045ba521fef0f6ad292fddaf91e398dad9edec10b9829621a8556446f
   languageName: node
   linkType: hard
 
-"@types/polka@npm:^0.5.6":
-  version: 0.5.6
-  resolution: "@types/polka@npm:0.5.6"
+"@types/polka@npm:^0.5.7":
+  version: 0.5.7
+  resolution: "@types/polka@npm:0.5.7"
   dependencies:
     "@types/express": "*"
     "@types/express-serve-static-core": "*"
     "@types/node": "*"
     "@types/trouter": "*"
-  checksum: e956629526782b722fe134a93e159774d13d58a66796f5b6f763b04cd5c426439a8556962e1da8e8a61574ed1ad6239ffbef28cd8c03b4f8828a9a4b03189dde
+  checksum: ec9bd7ae06b6cd49c972cd3af750c29dd6de28bf2aaf7e710ef2eec839636ee6efe8cf354008b80f9a865675cb3cedc60aab1bf9737bf4f5835d1c527b4f64c8
   languageName: node
   linkType: hard
 
@@ -14160,10 +14303,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prometheus-gc-stats@npm:^0.6.3":
-  version: 0.6.3
-  resolution: "@types/prometheus-gc-stats@npm:0.6.3"
-  checksum: b8ad00f21c2d7f19819b0d82b778f4919847e44f1f74a570fb52386fa7c5250af3a5e2eef5b8aa69cbf7fd8cc68f31f91bd7a002ce5b3722bb971da31af543a0
+"@types/prometheus-gc-stats@npm:^0.6.4":
+  version: 0.6.4
+  resolution: "@types/prometheus-gc-stats@npm:0.6.4"
+  checksum: 31d9c6a26c55829aa57c05ef602897926b5a068655b9e9850de92a7b7106a9c5e7971d96dc95d082817303899781cd98a319cd05699bc1ef5e9932456c23fd2a
   languageName: node
   linkType: hard
 
@@ -14181,26 +14324,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/proxy-from-env@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@types/proxy-from-env@npm:1.0.3"
+"@types/proxy-from-env@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@types/proxy-from-env@npm:1.0.4"
   dependencies:
     "@types/node": "*"
-  checksum: 3661687ae4bd90b9c41e504d3e3124b1ccd7d39d5877a7930fc3630989e37bde4e6b9055ea719d4b85c400a872bee02336ee5e187380f075cec021a4aebced44
+  checksum: cfa34200e6ddb19c78957c2c661212c8eee1f7dbc1931e918909300b47cc0336023c2a526972c494cb5409010fd35edba37bd795893796cc50e1efabd34e3969
   languageName: node
   linkType: hard
 
-"@types/proxyquire@npm:^1.3.30":
-  version: 1.3.30
-  resolution: "@types/proxyquire@npm:1.3.30"
-  checksum: e247d0afdb59aae942313112ca6429b0cbe410b0a858796c63e16ea945b3a7686f0660a03c685d79f10ed807051f645a763e13aa72d3725aeea74fd40901fdad
+"@types/proxyquire@npm:^1.3.31":
+  version: 1.3.31
+  resolution: "@types/proxyquire@npm:1.3.31"
+  checksum: 945024495fc991f6152686795ac6f2f2d0f571834e67fa41c1e84877eeb1a321a24ab8ff67fc5152d9227f5b39f6254213dced15deaf80ed7443059c2257e072
   languageName: node
   linkType: hard
 
-"@types/psl@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@types/psl@npm:1.1.2"
-  checksum: fc0a7ae56ca53157035226d964f5a37749187804c07787d25a3f8e0235130c277b52d027139d1a7058d7826014a8019d68d46e2719b0404ac8545d39d41fc43a
+"@types/psl@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@types/psl@npm:1.1.3"
+  checksum: adc24b5f0a2569563367437cbdcbb63c780e798360a4c21470043acda2adad56e510c9f357be36f297974d68534821febc38652709e5d712ac2cdd62f9a6777a
   languageName: node
   linkType: hard
 
@@ -14225,21 +14368,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-beautiful-dnd@npm:^13.1.6":
-  version: 13.1.6
-  resolution: "@types/react-beautiful-dnd@npm:13.1.6"
+"@types/react-beautiful-dnd@npm:^13.1.8":
+  version: 13.1.8
+  resolution: "@types/react-beautiful-dnd@npm:13.1.8"
   dependencies:
     "@types/react": "*"
-  checksum: 437c315cac4455fd0085150d5d163330e523e965193f642f45edf34eb56098e68a6f956d90ecb11abfcb03ce34177e5445c1489da46353ee5a6a6306414fb936
+  checksum: f71c64ba7e2e1f8480e772b45268856d2bf99adf90d12dd5f31486075dfd3e33a0b0922969851c660f01aa9593aa38b38e17ee9038eb866af9ec4327be903cb9
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:~17.0.22":
-  version: 17.0.22
-  resolution: "@types/react-dom@npm:17.0.22"
+"@types/react-dom@npm:~17.0.25":
+  version: 17.0.25
+  resolution: "@types/react-dom@npm:17.0.25"
   dependencies:
     "@types/react": ^17
-  checksum: 3c24331c0a2211370968befaad107598ee4f796c08e9b0de0b0126ee598a7c51f7bf4e0e7d9a76522a3b60d91f091d46131d136bcbe49aeb6ec3b8480dff03f9
+  checksum: d1e582682478e0848c8d54ea3e89d02047bac6d916266b85ce63731b06987575919653ea7159d98fda47ade3362b8c4d5796831549564b83088e7aa9ce8b60ed
   languageName: node
   linkType: hard
 
@@ -14264,7 +14407,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:^17, @types/react@npm:~17.0.69":
+"@types/react@npm:*, @types/react@npm:^17":
   version: 17.0.69
   resolution: "@types/react@npm:17.0.69"
   dependencies:
@@ -14275,6 +14418,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react@npm:~17.0.80":
+  version: 17.0.80
+  resolution: "@types/react@npm:17.0.80"
+  dependencies:
+    "@types/prop-types": "*"
+    "@types/scheduler": ^0.16
+    csstype: ^3.0.2
+  checksum: 1c27bfc42305d77ef0da55f8f6d4c4a3471aa02b294fcf29ea0f2cfb0bf02892e5a0a3bc7559fa4a5ba50697b2e31076cb5aa5987f69cfc2e880f6426edb8bdf
+  languageName: node
+  linkType: hard
+
 "@types/readdir-glob@npm:*":
   version: 1.1.1
   resolution: "@types/readdir-glob@npm:1.1.1"
@@ -14300,10 +14454,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/rewire@npm:^2.5.29":
-  version: 2.5.29
-  resolution: "@types/rewire@npm:2.5.29"
-  checksum: 2ad2f1134fe7c350fc88f0a9cc17eb49377f1a61776cde10b62bae0f5956dedd97adbb8da0e3ca8ddfb7034699a89fe2f9dc31af35f11727c4b38c8a089877c3
+"@types/rewire@npm:^2.5.30":
+  version: 2.5.30
+  resolution: "@types/rewire@npm:2.5.30"
+  checksum: 75f756ee068ad7f8aac697dc80f0007afa8c837e7aa211fd95ba7eeea8905043b20439e9b1c8326be77643159580aeebc49a464e626b0837ee188bd8a05dfe84
   languageName: node
   linkType: hard
 
@@ -14323,6 +14477,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/scheduler@npm:^0.16":
+  version: 0.16.8
+  resolution: "@types/scheduler@npm:0.16.8"
+  checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d
+  languageName: node
+  linkType: hard
+
 "@types/semver@npm:^7.3.10, @types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
   version: 7.5.4
   resolution: "@types/semver@npm:7.5.4"
@@ -14407,12 +14568,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/speakeasy@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@types/speakeasy@npm:2.0.9"
+"@types/speakeasy@npm:^2.0.10":
+  version: 2.0.10
+  resolution: "@types/speakeasy@npm:2.0.10"
   dependencies:
     "@types/node": "*"
-  checksum: 4f3d2217f96625c481f9220a5d16a776c7003d9025fafe728f91f07ba815ac2233db4df85cf4a721b5e042a478f793eee6e4e54c397288f3a39e3f04aa8375ac
+  checksum: 672c757a7662895a0d9eea5ecc8309b75c3925f00f0af4e7133fd3e475f3fdb1289d95ae6cf7fbab024f149703d999891b17771cc221db4e9a24c70ab1b04319
   languageName: node
   linkType: hard
 
@@ -14432,10 +14593,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/strict-uri-encode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@types/strict-uri-encode@npm:2.0.1"
-  checksum: 63d62f43d20583428d112f6a9de5a444f31f8e314a8c57b9a59523f99ae3152e41e2e39ff0fb0404171135402d2226aba21a5db64de0d0d385ec8c11d5a0f4ce
+"@types/strict-uri-encode@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@types/strict-uri-encode@npm:2.0.2"
+  checksum: e395868cc1cd49537be56d2f43b417ddc11559f807d5e1402d180870d0e2872fbe4d35765de1bbec76b939faf77cfdb13aec715d9946f6675e17073169a70dcd
   languageName: node
   linkType: hard
 
@@ -14458,16 +14619,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/supertest@npm:^2.0.15":
-  version: 2.0.15
-  resolution: "@types/supertest@npm:2.0.15"
+"@types/supertest@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "@types/supertest@npm:2.0.16"
   dependencies:
     "@types/superagent": "*"
-  checksum: 89c1983662f0ab20969b3a6c44344397fd222d0f78b282619aabbe817f7c88a64210fd2b8b8f075ea22a27084e30ebc287bc5105619cbbf9af7f008e77f6eb93
+  checksum: 2fc998ea698e0467cdbe3bea0ebce2027ea3a45a13e51a6cecb0435f44b486faecf99c34d8702d2d7fe033e6e09fdd2b374af52ecc8d0c69a1deec66b8c0dd52
   languageName: node
   linkType: hard
 
-"@types/supports-color@npm:~7.2.0":
+"@types/supports-color@npm:~7.2.1":
   version: 7.2.1
   resolution: "@types/supports-color@npm:7.2.1"
   checksum: abf7d9348deadf5386cf5faec062a4132e647a179584f52cace87435248f520be73c58ac28618cf5684e6b0ed6bb635d5a975cc71ff613af7db2d5648557ef45
@@ -14490,10 +14651,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/textarea-caret@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@types/textarea-caret@npm:3.0.2"
-  checksum: 6989477fa7be544cb84ffbb3302d5c4c2632e7900e0fcc12adf9bd78f4d0ebbf38db9392cb39c8fa791aba935013e1b14aeb1c222f328a67de6202f945331e73
+"@types/textarea-caret@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@types/textarea-caret@npm:3.0.3"
+  checksum: 61d4b08391c28f8b37236e65946457819460de1749b860a852c01cfb1093ab2ceb3fe11b54f788e7c024cb580d26984b9285438139f3cb3bb333150955413a8e
   languageName: node
   linkType: hard
 
@@ -14525,10 +14686,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ua-parser-js@npm:^0.7.38":
-  version: 0.7.38
-  resolution: "@types/ua-parser-js@npm:0.7.38"
-  checksum: 8a44887f7c782ed4c59c4d9cb254674f2ff41d8f653da0c2bd6d4ace79cc3de1ce5648b77f906e337fb97328e1114583e54c3b8882d194e1b8cb281f407a1ef7
+"@types/ua-parser-js@npm:^0.7.39":
+  version: 0.7.39
+  resolution: "@types/ua-parser-js@npm:0.7.39"
+  checksum: 81046605eb2815b098228743b7dfde887cc8990369f2ad56e71f1400b4cef5078481c7ca91ca3dddf2e8d4e183fe93224bfdeee13bfe034a1e62d55cfbac9e26
   languageName: node
   linkType: hard
 
@@ -14555,17 +14716,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/use-subscription@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@types/use-subscription@npm:1.0.1"
-  checksum: f9e3535d40dbcd606e7ef306120c52a78b9da7a94ebe0b56af8f8326984588b2db12fbc841e2b2d719728810816afa9c7d64b40a849048186a4308e2f3ff0339
+"@types/use-subscription@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@types/use-subscription@npm:1.0.2"
+  checksum: e547d8ffdf8410c985c271a30903cd754687a6514a67192378213590f707a0f516e0c11930cba10bd7e98dc4f7917e066b3b8d37a622d02b6fcf3c5df530e467
   languageName: node
   linkType: hard
 
-"@types/use-sync-external-store@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "@types/use-sync-external-store@npm:0.0.5"
-  checksum: 96a22fa059d8a6d0fe0b03e5157eb22f599ab1cc58b9441617dec4be6d8586260fcf9041912ab90e92d9c6ea6dfec5c758bae6418552aa687fc7e0bb904e68bc
+"@types/use-sync-external-store@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "@types/use-sync-external-store@npm:0.0.6"
+  checksum: a95ce330668501ad9b1c5b7f2b14872ad201e552a0e567787b8f1588b22c7040c7c3d80f142cbb9f92d13c4ea41c46af57a20f2af4edf27f224d352abcfe4049
   languageName: node
   linkType: hard
 
@@ -14576,7 +14737,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9":
+"@types/uuid@npm:^9.0.8":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
   checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
@@ -14642,14 +14803,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack@npm:^5.28.4":
-  version: 5.28.4
-  resolution: "@types/webpack@npm:5.28.4"
+"@types/webpack@npm:^5.28.5":
+  version: 5.28.5
+  resolution: "@types/webpack@npm:5.28.5"
   dependencies:
     "@types/node": "*"
     tapable: ^2.2.0
     webpack: ^5
-  checksum: 7a08e31096a05c77bb49b3830f85f2e340090fa2b19dbe4681c7eab92e49db85bdbbe7b374df7d7aa38549922ff3252f43a00d4c5c2f9fe0c2a198cdb5ddde7e
+  checksum: 14359d9ccecef7ef1ea271c00baec5337213c7fda63a34c61b9e519505b3928d0807cdbb5b1172d1994e1179920b89c57eaf2cbf64599958b67cd70720ac2a9b
   languageName: node
   linkType: hard
 
@@ -14688,7 +14849,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^8.5.1, @types/ws@npm:^8.5.5, @types/ws@npm:^8.5.8":
+"@types/ws@npm:^8.5.1, @types/ws@npm:^8.5.5":
   version: 8.5.8
   resolution: "@types/ws@npm:8.5.8"
   dependencies:
@@ -14697,22 +14858,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/xml-crypto@npm:~1.4.4":
-  version: 1.4.4
-  resolution: "@types/xml-crypto@npm:1.4.4"
+"@types/ws@npm:^8.5.12":
+  version: 8.5.12
+  resolution: "@types/ws@npm:8.5.12"
+  dependencies:
+    "@types/node": "*"
+  checksum: ddefb6ad1671f70ce73b38a5f47f471d4d493864fca7c51f002a86e5993d031294201c5dced6d5018fb8905ad46888d65c7f20dd54fc165910b69f42fba9a6d0
+  languageName: node
+  linkType: hard
+
+"@types/xml-crypto@npm:~1.4.6":
+  version: 1.4.6
+  resolution: "@types/xml-crypto@npm:1.4.6"
   dependencies:
     "@types/node": "*"
     xpath: 0.0.27
-  checksum: c19616b531b26d7f3fafee6165d7be42969bfa2ef7184f501c489c80515d483425fb97e55ae816d91cf2f92e765e81f0a7cfc97c5dedb46f829edb677b154a55
+  checksum: e53516a2f5e4e018e164eb1cb9fc922294b9a339624e567c1c00a2b1496e9f86826210473e62ceb0b45949638c9d149da088b3598f6b3acd86e933f0a2b23f2c
   languageName: node
   linkType: hard
 
-"@types/xml-encryption@npm:~1.2.3":
-  version: 1.2.3
-  resolution: "@types/xml-encryption@npm:1.2.3"
+"@types/xml-encryption@npm:~1.2.4":
+  version: 1.2.4
+  resolution: "@types/xml-encryption@npm:1.2.4"
   dependencies:
     "@types/node": "*"
-  checksum: 1f678c5cb7378702dd1bfbbe1ec3b4dd62d7b8350c225866df109d60c8c7c4e39b20d32193ead175b1c68944ce22ffcae470685371e6257bf0bfe45f7f366aec
+  checksum: 1ef957dfb47cf55b12e114755e271a2343f73eb4c59ab6c68b0b7d1b8111d7e1bd8d2bfe0601d2aea09be83c66355bc77fc59f9b71aeff9bb9e15371bcfef5d3
   languageName: node
   linkType: hard
 
@@ -16409,6 +16579,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asn1.js@npm:^4.10.1":
+  version: 4.10.1
+  resolution: "asn1.js@npm:4.10.1"
+  dependencies:
+    bn.js: ^4.0.0
+    inherits: ^2.0.1
+    minimalistic-assert: ^1.0.0
+  checksum: 9289a1a55401238755e3142511d7b8f6fc32f08c86ff68bd7100da8b6c186179dd6b14234fba2f7f6099afcd6758a816708485efe44bc5b2a6ec87d9ceeddbb5
+  languageName: node
+  linkType: hard
+
 "asn1.js@npm:^5.2.0":
   version: 5.4.1
   resolution: "asn1.js@npm:5.4.1"
@@ -16447,15 +16628,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assert@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "assert@npm:2.0.0"
+"assert@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "assert@npm:2.1.0"
   dependencies:
-    es6-object-assign: ^1.1.0
-    is-nan: ^1.2.1
-    object-is: ^1.0.1
-    util: ^0.12.0
-  checksum: bb91f181a86d10588ee16c5e09c280f9811373974c29974cbe401987ea34e966699d7989a812b0e19377b511ea0bc627f5905647ce569311824848ede382cae8
+    call-bind: ^1.0.2
+    is-nan: ^1.3.2
+    object-is: ^1.1.5
+    object.assign: ^4.1.4
+    util: ^0.12.5
+  checksum: 1ed1cabba9abe55f4109b3f7292b4e4f3cf2953aad8dc148c0b3c3bd676675c31b1abb32ef563b7d5a19d1715bf90d1e5f09fad2a4ee655199468902da80f7c2
   languageName: node
   linkType: hard
 
@@ -16784,6 +16966,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"b4a@npm:^1.6.6":
+  version: 1.6.6
+  resolution: "b4a@npm:1.6.6"
+  checksum: c46a27e3ac9c84426ae728f0fc46a6ae7703a7bc03e771fa0bef4827fd7cf3bb976d1a3d5afff54606248372ab8fdf595bd0114406690edf37f14d120630cf7f
+  languageName: node
+  linkType: hard
+
 "babel-jest@npm:^29.0.3, babel-jest@npm:^29.5.0, babel-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
@@ -16831,7 +17020,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:~9.1.2":
+"babel-loader@npm:~9.1.3":
   version: 9.1.3
   resolution: "babel-loader@npm:9.1.3"
   dependencies:
@@ -17118,6 +17307,50 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bare-events@npm:^2.0.0, bare-events@npm:^2.2.0":
+  version: 2.4.2
+  resolution: "bare-events@npm:2.4.2"
+  checksum: 6cd2b10dd32a3410787e120c091b6082fbc2df0c45ed723a7ae51d0e2f55d2a4037e1daff21dae90b671d36582f9f8d50df337875c281d10adb60df81b8cd861
+  languageName: node
+  linkType: hard
+
+"bare-fs@npm:^2.1.1":
+  version: 2.3.5
+  resolution: "bare-fs@npm:2.3.5"
+  dependencies:
+    bare-events: ^2.0.0
+    bare-path: ^2.0.0
+    bare-stream: ^2.0.0
+  checksum: 071b1dff94a213eaf0b41693953959bf10af2deade597a56ff206a5d833579d56bc8530aa4614bb88bf39fd6d52f2404f7c36af4695109ffa756a13837ac3d91
+  languageName: node
+  linkType: hard
+
+"bare-os@npm:^2.1.0":
+  version: 2.4.4
+  resolution: "bare-os@npm:2.4.4"
+  checksum: e90088a7dc0307c020350a28df8ec5564cae5a4b7a213d8509d70831d7064308e2ed31de801b68f474cb004ad3a0a66bd28c38374d270484d9025ee71af20396
+  languageName: node
+  linkType: hard
+
+"bare-path@npm:^2.0.0, bare-path@npm:^2.1.0":
+  version: 2.1.3
+  resolution: "bare-path@npm:2.1.3"
+  dependencies:
+    bare-os: ^2.1.0
+  checksum: 20301aeb05b735852a396515464908e51e896922c3bb353ef2a09ff54e81ced94e6ad857bb0a36d2ce659c42bd43dd5c3d5643edd8faaf910ee9950c4e137b88
+  languageName: node
+  linkType: hard
+
+"bare-stream@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "bare-stream@npm:2.3.0"
+  dependencies:
+    b4a: ^1.6.6
+    streamx: ^2.20.0
+  checksum: 17de9dbd5a6d70863b6e55f0acdfe1cb5d2b05f22d87e79986372cc796095eb4882a868ee6ba3dc543243085d27f618b4b81ef2bf384bc1c690dd3a557b6e30d
+  languageName: node
+  linkType: hard
+
 "base-64@npm:^1.0.0":
   version: 1.0.0
   resolution: "base-64@npm:1.0.0"
@@ -17429,6 +17662,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bn.js@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "bn.js@npm:5.2.1"
+  checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3
+  languageName: node
+  linkType: hard
+
 "bodec@npm:^0.1.0":
   version: 0.1.0
   resolution: "bodec@npm:0.1.0"
@@ -17456,7 +17696,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.2, body-parser@npm:^1.19.0, body-parser@npm:^1.20.2":
+"body-parser@npm:1.20.3, body-parser@npm:^1.20.3":
+  version: 1.20.3
+  resolution: "body-parser@npm:1.20.3"
+  dependencies:
+    bytes: 3.1.2
+    content-type: ~1.0.5
+    debug: 2.6.9
+    depd: 2.0.0
+    destroy: 1.2.0
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    on-finished: 2.4.1
+    qs: 6.13.0
+    raw-body: 2.5.2
+    type-is: ~1.6.18
+    unpipe: 1.0.0
+  checksum: 1a35c59a6be8d852b00946330141c4f142c6af0f970faa87f10ad74f1ee7118078056706a05ae3093c54dabca9cd3770fa62a170a85801da1a4324f04381167d
+  languageName: node
+  linkType: hard
+
+"body-parser@npm:^1.19.0":
   version: 1.20.2
   resolution: "body-parser@npm:1.20.2"
   dependencies:
@@ -17657,7 +17917,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4":
+"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4, browserify-aes@npm:^1.2.0":
   version: 1.2.0
   resolution: "browserify-aes@npm:1.2.0"
   dependencies:
@@ -17671,7 +17931,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-cipher@npm:^1.0.0":
+"browserify-cipher@npm:^1.0.0, browserify-cipher@npm:^1.0.1":
   version: 1.0.1
   resolution: "browserify-cipher@npm:1.0.1"
   dependencies:
@@ -17694,7 +17954,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1":
+"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1, browserify-rsa@npm:^4.1.0":
   version: 4.1.0
   resolution: "browserify-rsa@npm:4.1.0"
   dependencies:
@@ -17721,6 +17981,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserify-sign@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "browserify-sign@npm:4.2.3"
+  dependencies:
+    bn.js: ^5.2.1
+    browserify-rsa: ^4.1.0
+    create-hash: ^1.2.0
+    create-hmac: ^1.1.7
+    elliptic: ^6.5.5
+    hash-base: ~3.0
+    inherits: ^2.0.4
+    parse-asn1: ^5.1.7
+    readable-stream: ^2.3.8
+    safe-buffer: ^5.2.1
+  checksum: 403a8061d229ae31266670345b4a7c00051266761d2c9bbeb68b1a9bcb05f68143b16110cf23a171a5d6716396a1f41296282b3e73eeec0a1871c77f0ff4ee6b
+  languageName: node
+  linkType: hard
+
 "browserify-zlib@npm:^0.2.0":
   version: 0.2.0
   resolution: "browserify-zlib@npm:0.2.0"
@@ -18282,23 +18560,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chai-as-promised@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "chai-as-promised@npm:7.1.1"
+"chai-as-promised@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "chai-as-promised@npm:7.1.2"
   dependencies:
     check-error: ^1.0.2
   peerDependencies:
-    chai: ">= 2.1.2 < 5"
-  checksum: 7262868a5b51a12af4e432838ddf97a893109266a505808e1868ba63a12de7ee1166e9d43b5c501a190c377c1b11ecb9ff8e093c89f097ad96c397e8ec0f8d6a
+    chai: ">= 2.1.2 < 6"
+  checksum: 671ee980054eb23a523875c1d22929a2ac05d89b5428e1fd12800f54fc69baf41014667b87e2368e2355ee2a3140d3e3d7d5a1f8638b07cfefd7fe38a149e3f6
   languageName: node
   linkType: hard
 
-"chai-datetime@npm:^1.8.0":
-  version: 1.8.0
-  resolution: "chai-datetime@npm:1.8.0"
+"chai-datetime@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "chai-datetime@npm:1.8.1"
   dependencies:
     chai: ">1.9.0"
-  checksum: 37752addc6de4134117342609be85292dcd21cc0ec40b9ed2415c06d75c3a3b4a6d39fe6a675229a973f374abcaf5d2b9ea4c0d88d75508d1ddc641b509aafb0
+  checksum: 29d3320a18c5e809e198cc7ed20ebf053eef4081f64a43e91eb388dafe8ad6f3d560fde478d9f599f35be75a95fb33ed40ff22aa9f05f3c047b1b7df2176cb24
   languageName: node
   linkType: hard
 
@@ -18920,10 +19198,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"codemirror@npm:^5.65.15":
-  version: 5.65.15
-  resolution: "codemirror@npm:5.65.15"
-  checksum: 30e0cff9bfb2265b94fa6766e13975cb71db228e114d6d8cdcc160b495e32b0ff921ac09959715e3fef30a48c5a9d0655ffd0ff6c5fe7024656add438bb2b058
+"codemirror@npm:^5.65.17":
+  version: 5.65.17
+  resolution: "codemirror@npm:5.65.17"
+  checksum: 8bc853524c6416826364d776b012f488b3f4736899e5c8026062f43927e09de773051dd1b34e8cfd25642d7e358679ca5b113f0034fdd6a295f4193b04f8c528
   languageName: node
   linkType: hard
 
@@ -19590,7 +19868,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"create-ecdh@npm:^4.0.0":
+"create-ecdh@npm:^4.0.0, create-ecdh@npm:^4.0.4":
   version: 4.0.4
   resolution: "create-ecdh@npm:4.0.4"
   dependencies:
@@ -19764,7 +20042,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-browserify@npm:^3.11.0, crypto-browserify@npm:^3.12.0":
+"crypto-browserify@npm:^3.11.0":
   version: 3.12.0
   resolution: "crypto-browserify@npm:3.12.0"
   dependencies:
@@ -19947,13 +20225,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-vars-ponyfill@npm:^2.4.8":
-  version: 2.4.8
-  resolution: "css-vars-ponyfill@npm:2.4.8"
+"css-vars-ponyfill@npm:^2.4.9":
+  version: 2.4.9
+  resolution: "css-vars-ponyfill@npm:2.4.9"
   dependencies:
     balanced-match: ^1.0.2
     get-css-data: ^2.0.2
-  checksum: ea2e270455d039d4b9a34e7a9c0264052c0c9d832538123afce7766cfe833b7c149406d5d984a406ad401d9b7e0115fdbac029321214d49ebe88cd743d055899
+  checksum: 0535b54e42ddd9aa7fcda42db98e828c3cab58ffa6d69325d3fe794d3ec3f9bd6f03bdc870a183890a7e6f1fe2b2ef85b1e13431724a0703bb047c98ee083ffc
   languageName: node
   linkType: hard
 
@@ -21124,7 +21402,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diffie-hellman@npm:^5.0.0":
+"diffie-hellman@npm:^5.0.0, diffie-hellman@npm:^5.0.3":
   version: 5.0.3
   resolution: "diffie-hellman@npm:5.0.3"
   dependencies:
@@ -21176,12 +21454,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"docker-compose@npm:^0.24.3":
-  version: 0.24.3
-  resolution: "docker-compose@npm:0.24.3"
+"docker-compose@npm:^0.24.8":
+  version: 0.24.8
+  resolution: "docker-compose@npm:0.24.8"
   dependencies:
     yaml: ^2.2.2
-  checksum: b2149eafb6e0a37ff4595044fe63d2fac23483afab06bca71cece78df4bae6f796b0a123854957addda77cc0559f205bc03cf3984ced816161e30e7f247d88e7
+  checksum: 48f3564c46490f1f51899a144deb546b61450a76bffddb378379ac7702aa34b055e0237e0dc77507df94d7ad6f1f7daeeac27730230bce9aafe2e35efeda6b45
   languageName: node
   linkType: hard
 
@@ -21283,10 +21561,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domain-browser@npm:^4.22.0":
-  version: 4.22.0
-  resolution: "domain-browser@npm:4.22.0"
-  checksum: e7ce1c19073e17dec35cfde050a3ddaac437d3ba8b870adabf9d5682e665eab3084df05de432dedf25b34303f0a2c71ac30f1cdba61b1aea018047b10de3d988
+"domain-browser@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "domain-browser@npm:4.23.0"
+  checksum: 95b772f5fa88300240694380e06e03868573acdf86ca392a58c78602d6536dca2097ad2469a1500bd23a1329b09992de846e0b66c364cbf5711a7fee3ee5dac9
   languageName: node
   linkType: hard
 
@@ -21600,7 +21878,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elliptic@npm:^6.5.3, elliptic@npm:^6.5.4":
+"elliptic@npm:^6.5.3":
   version: 6.5.4
   resolution: "elliptic@npm:6.5.4"
   dependencies:
@@ -21615,6 +21893,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"elliptic@npm:^6.5.5, elliptic@npm:^6.5.7":
+  version: 6.5.7
+  resolution: "elliptic@npm:6.5.7"
+  dependencies:
+    bn.js: ^4.11.9
+    brorand: ^1.1.0
+    hash.js: ^1.0.0
+    hmac-drbg: ^1.0.1
+    inherits: ^2.0.4
+    minimalistic-assert: ^1.0.1
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8
+  languageName: node
+  linkType: hard
+
 "email-validator@npm:^2.0.4":
   version: 2.0.4
   resolution: "email-validator@npm:2.0.4"
@@ -22083,13 +22376,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-object-assign@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "es6-object-assign@npm:1.1.0"
-  checksum: 8d4fdf63484d78b5c64cacc2c2e1165bc7b6a64b739d2a9db6a4dc8641d99cc9efb433cdd4dc3d3d6b00bfa6ce959694e4665e3255190339945c5f33b692b5d8
-  languageName: node
-  linkType: hard
-
 "es6-shim@npm:^0.35.5":
   version: 0.35.6
   resolution: "es6-shim@npm:0.35.6"
@@ -22481,21 +22767,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.6.0, eslint-plugin-react-hooks@npm:~4.6.0":
-  version: 4.6.0
-  resolution: "eslint-plugin-react-hooks@npm:4.6.0"
+"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.2":
+  version: 4.6.2
+  resolution: "eslint-plugin-react-hooks@npm:4.6.2"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 23001801f14c1d16bf0a837ca7970d9dd94e7b560384b41db378b49b6e32dc43d6e2790de1bd737a652a86f81a08d6a91f402525061b47719328f586a57e86c3
+  checksum: 395c433610f59577cfcf3f2e42bcb130436c8a0b3777ac64f441d88c5275f4fcfc89094cedab270f2822daf29af1079151a7a6579a8e9ea8cee66540ba0384c4
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-refresh@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "eslint-plugin-react-refresh@npm:0.4.4"
+"eslint-plugin-react-refresh@npm:^0.4.11":
+  version: 0.4.11
+  resolution: "eslint-plugin-react-refresh@npm:0.4.11"
   peerDependencies:
     eslint: ">=7"
-  checksum: 6b93f43cef5f69c18751db3267ce6cc7cb88f07061df28fc12401be56d93f37134f2a794c760f51cd5f84c5e81d81b003ef761ca76e7674646808b82884aa356
+  checksum: 55c9efb14c3dadf6422bb96af8a561d3f1385f1dc68e7ca9d388cc4adc69907644e1bb509ecfbb033a8ec19ea326beb99577c82d4a2530000809d897b08bf3d4
   languageName: node
   linkType: hard
 
@@ -23260,7 +23546,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0":
+"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0, fast-fifo@npm:^1.3.2":
   version: 1.3.2
   resolution: "fast-fifo@npm:1.3.2"
   checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
@@ -23392,10 +23678,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fastest-validator@npm:^1.17.0":
-  version: 1.17.0
-  resolution: "fastest-validator@npm:1.17.0"
-  checksum: 0a6240f6dc7b544b3aadf9367410ecd64590dbfe505e6a24c339df954dd216f3a714d64a224abeef531d0a40dc348efe6cdbf59372d28954ac450cc0b212e0ec
+"fastest-validator@npm:^1.19.0":
+  version: 1.19.0
+  resolution: "fastest-validator@npm:1.19.0"
+  checksum: 93a52bcfb9cd3e6117de3ce4c975d182d9870496f2bddc2a71a53d5894ad536c21c62497f120c8d5e396b2312070b8c03acbefdfca32c081d524618ac2ee01a8
   languageName: node
   linkType: hard
 
@@ -23915,7 +24201,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.10.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.2":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.10.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
   version: 1.15.4
   resolution: "follow-redirects@npm:1.15.4"
   peerDependenciesMeta:
@@ -23925,6 +24211,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"follow-redirects@npm:^1.15.6":
+  version: 1.15.9
+  resolution: "follow-redirects@npm:1.15.9"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: 859e2bacc7a54506f2bf9aacb10d165df78c8c1b0ceb8023f966621b233717dab56e8d08baadc3ad3b9db58af290413d585c999694b7c146aaf2616340c3d2a6
+  languageName: node
+  linkType: hard
+
 "fontkit@npm:^2.0.2":
   version: 2.0.2
   resolution: "fontkit@npm:2.0.2"
@@ -24387,6 +24683,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gc-stats@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "gc-stats@npm:1.4.1"
+  dependencies:
+    nan: ^2.18.0
+    node-gyp: latest
+    node-gyp-build: ^4.8.0
+  checksum: 81d9bfc884f1cdfcb4683d940eb52a0379cafba11ec2b993946463b6ca30350dcc77e8c62694b7d1ac81f71477f25a72d865181aa1e87368eb79500ebfbdfce0
+  languageName: node
+  linkType: hard
+
 "gcp-metadata@npm:^5.0.0":
   version: 5.0.0
   resolution: "gcp-metadata@npm:5.0.0"
@@ -24917,10 +25224,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-libphonenumber@npm:^3.2.33":
-  version: 3.2.33
-  resolution: "google-libphonenumber@npm:3.2.33"
-  checksum: d029c19c7278ac9acb446028c2e304df16341732905a0cf8a105ab595cb19c01456fd57d76e48a3220038044d8ce361edc539eea2bfd924ea36fb28178cf7dbe
+"google-libphonenumber@npm:^3.2.38":
+  version: 3.2.38
+  resolution: "google-libphonenumber@npm:3.2.38"
+  checksum: 5e30ced0399b3803e61d41c0f7a69e289baf0912568381a0f2f0a5f0e5d3403dd8a26dd758ecb52e56337d83f45865fb36c0d7bfec255868286f05cc03a6b920
   languageName: node
   linkType: hard
 
@@ -25288,6 +25595,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hash-base@npm:~3.0, hash-base@npm:~3.0.4":
+  version: 3.0.4
+  resolution: "hash-base@npm:3.0.4"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 878465a0dfcc33cce195c2804135352c590d6d10980adc91a9005fd377e77f2011256c2b7cfce472e3f2e92d561d1bf3228d2da06348a9017ce9a258b3b49764
+  languageName: node
+  linkType: hard
+
 "hash.js@npm:^1.0.0, hash.js@npm:^1.0.3, hash.js@npm:^1.1.7":
   version: 1.1.7
   resolution: "hash.js@npm:1.1.7"
@@ -26613,13 +26930,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ipaddr.js@npm:^2.0.1, ipaddr.js@npm:^2.1.0":
+"ipaddr.js@npm:^2.0.1":
   version: 2.1.0
   resolution: "ipaddr.js@npm:2.1.0"
   checksum: 807a054f2bd720c4d97ee479d6c9e865c233bea21f139fb8dabd5a35c4226d2621c42e07b4ad94ff3f82add926a607d8d9d37c625ad0319f0e08f9f2bd1968e2
   languageName: node
   linkType: hard
 
+"ipaddr.js@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "ipaddr.js@npm:2.2.0"
+  checksum: 770ba8451fd9bf78015e8edac0d5abd7a708cbf75f9429ca9147a9d2f3a2d60767cd5de2aab2b1e13ca6e4445bdeff42bf12ef6f151c07a5c6cf8a44328e2859
+  languageName: node
+  linkType: hard
+
 "is-absolute-url@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-absolute-url@npm:2.1.0"
@@ -27117,7 +27441,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-nan@npm:^1.2.1":
+"is-nan@npm:^1.3.2":
   version: 1.3.2
   resolution: "is-nan@npm:1.3.2"
   dependencies:
@@ -28849,14 +29173,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"katex@npm:~0.16.9":
-  version: 0.16.9
-  resolution: "katex@npm:0.16.9"
+"katex@npm:~0.16.11":
+  version: 0.16.11
+  resolution: "katex@npm:0.16.11"
   dependencies:
     commander: ^8.3.0
   bin:
     katex: cli.js
-  checksum: 861194dfd4d86505e657f688fb73048d46ac498edafce71199502a35b03c0ecc35ba930c631be79c4a09d90a0d23476673cd52f6bc367c7a161854d64005fa95
+  checksum: 49d9340705f4922ee22aacedad45664971449e5ca65e42a70228961336c8d4746c37c3c719bcc2114b6ad21182800c7d3d8bea28fe6f951fc45fe7e8322ea3bd
   languageName: node
   linkType: hard
 
@@ -30309,35 +30633,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meteor-node-stubs@npm:^1.2.5":
-  version: 1.2.5
-  resolution: "meteor-node-stubs@npm:1.2.5"
+"meteor-node-stubs@npm:^1.2.10":
+  version: 1.2.10
+  resolution: "meteor-node-stubs@npm:1.2.10"
   dependencies:
-    assert: ^2.0.0
+    "@meteorjs/crypto-browserify": ^3.12.1
+    assert: ^2.1.0
     browserify-zlib: ^0.2.0
     buffer: ^5.7.1
     console-browserify: ^1.2.0
     constants-browserify: ^1.0.0
-    crypto-browserify: ^3.12.0
-    domain-browser: ^4.22.0
-    elliptic: ^6.5.4
+    domain-browser: ^4.23.0
+    elliptic: ^6.5.7
     events: ^3.3.0
     https-browserify: ^1.0.0
     os-browserify: ^0.3.0
-    path-browserify: ^1.0.0
+    path-browserify: ^1.0.1
     process: ^0.11.10
     punycode: ^1.4.1
     querystring-es3: ^0.2.1
-    readable-stream: ^3.6.0
+    readable-stream: ^3.6.2
     stream-browserify: ^3.0.0
     stream-http: ^3.2.0
     string_decoder: ^1.3.0
     timers-browserify: ^2.0.12
     tty-browserify: 0.0.1
-    url: ^0.11.0
-    util: ^0.12.4
+    url: ^0.11.4
+    util: ^0.12.5
     vm-browserify: ^1.1.2
-  checksum: 2529bce377342b2c01f97c397fe89490fce0149ecb37dba1b18d2f865753a25addea2c16dd212afcaa6b9aa01abec52c90721b65653d15ff59708d5bd9adef15
+  checksum: ce0e49991b2afba48dea0c5699bebb40502d8e775a486d4dca0f004432063ab56ceae2c4d22d8448d669edcb9cfcd7cb82e7a351b301b59f563ef4067daedf7c
   languageName: node
   linkType: hard
 
@@ -30869,15 +31193,104 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moleculer@npm:^0.14.31":
-  version: 0.14.31
-  resolution: "moleculer@npm:0.14.31"
+"moleculer@npm:0.14.34":
+  version: 0.14.34
+  resolution: "moleculer@npm:0.14.34"
+  dependencies:
+    args: ^5.0.3
+    eventemitter2: ^6.4.9
+    fastest-validator: ^1.19.0
+    glob: ^7.2.0
+    ipaddr.js: ^2.2.0
+    kleur: ^4.1.5
+    lodash: ^4.17.21
+    lru-cache: ^6.0.0
+    node-fetch: ^2.6.7
+    recursive-watch: ^1.1.4
+  peerDependencies:
+    amqplib: ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0
+    avsc: ^5.0.0
+    bunyan: ^1.0.0
+    cbor-x: ^0.8.3 || ^0.9.0 || ^1.2.0
+    dd-trace: ^0.33.0 || ^0.34.0 || ^0.35.0 || ^0.36.0 || >=1.0.0 <1.6.0
+    debug: ^4.0.0
+    etcd3: ^1.0.0
+    ioredis: ^4.0.0 || ^5.0.0
+    jaeger-client: ^3.0.0
+    kafka-node: ^5.0.0
+    log4js: ^6.0.0
+    mqtt: ^4.0.0 || ^5.0.0
+    msgpack5: ^5.0.0 || ^6.0.0
+    nats: ^1.0.0 || ^2.0.0
+    node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0
+    notepack.io: ^2.0.0 || ^3.0.0
+    pino: ^6.0.0 || ^7.0.0 || ^8.0.0
+    protobufjs: ^6.0.0 || ^7.0.0
+    redlock: ^4.0.0
+    rhea-promise: ^1.0.0 || ^2.0.0
+    thrift: ^0.12.0 || ^0.16.0
+    winston: ^3.0.0
+  peerDependenciesMeta:
+    amqplib:
+      optional: true
+    avsc:
+      optional: true
+    bunyan:
+      optional: true
+    cbor-x:
+      optional: true
+    dd-trace:
+      optional: true
+    debug:
+      optional: true
+    etcd3:
+      optional: true
+    ioredis:
+      optional: true
+    jaeger-client:
+      optional: true
+    kafka-node:
+      optional: true
+    log4js:
+      optional: true
+    mqtt:
+      optional: true
+    msgpack5:
+      optional: true
+    nats:
+      optional: true
+    node-nats-streaming:
+      optional: true
+    notepack.io:
+      optional: true
+    pino:
+      optional: true
+    protobufjs:
+      optional: true
+    redlock:
+      optional: true
+    rhea-promise:
+      optional: true
+    thrift:
+      optional: true
+    winston:
+      optional: true
+  bin:
+    moleculer-runner: bin/moleculer-runner.js
+    moleculer-runner-esm: bin/moleculer-runner.mjs
+  checksum: 2f20a28d4796be8b5837ee963e2323ab13dc30064f0c9126dcc04b2969586a1b43c92d875349dc9cc0b36170d8dd640ddf843d022c6b6c803bc84216ec4fa7d9
+  languageName: node
+  linkType: hard
+
+"moleculer@patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch::locator=rocket.chat%40workspace%3A.":
+  version: 0.14.34
+  resolution: "moleculer@patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch::version=0.14.34&hash=e1c8f3&locator=rocket.chat%40workspace%3A."
   dependencies:
     args: ^5.0.3
     eventemitter2: ^6.4.9
-    fastest-validator: ^1.17.0
+    fastest-validator: ^1.19.0
     glob: ^7.2.0
-    ipaddr.js: ^2.1.0
+    ipaddr.js: ^2.2.0
     kleur: ^4.1.5
     lodash: ^4.17.21
     lru-cache: ^6.0.0
@@ -30895,7 +31308,7 @@ __metadata:
     jaeger-client: ^3.0.0
     kafka-node: ^5.0.0
     log4js: ^6.0.0
-    mqtt: ^4.0.0
+    mqtt: ^4.0.0 || ^5.0.0
     msgpack5: ^5.0.0 || ^6.0.0
     nats: ^1.0.0 || ^2.0.0
     node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0
@@ -30954,11 +31367,11 @@ __metadata:
   bin:
     moleculer-runner: bin/moleculer-runner.js
     moleculer-runner-esm: bin/moleculer-runner.mjs
-  checksum: 4d6d05f98e2174b708de8c946901a4a3a1de411505f43909216a9d2ff93820e6eec7edd44b45c99ab04c6c312304a63a346288e181fead48558763fb4ec69c24
+  checksum: a5aea2d8fd0cb1b79a64bd67e3e0ebe1d023f66bf268391124968866ca48d305853b9635e92b5e64420ed4bc4625e50a70d505255eede839d4bab1734aa7db91
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:*, moment-timezone@npm:^0.5.43, moment-timezone@npm:^0.5.x, moment-timezone@npm:~0.5.43":
+"moment-timezone@npm:*, moment-timezone@npm:^0.5.x":
   version: 0.5.43
   resolution: "moment-timezone@npm:0.5.43"
   dependencies:
@@ -30967,6 +31380,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"moment-timezone@npm:^0.5.45, moment-timezone@npm:~0.5.45":
+  version: 0.5.45
+  resolution: "moment-timezone@npm:0.5.45"
+  dependencies:
+    moment: ^2.29.4
+  checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0
+  languageName: node
+  linkType: hard
+
 "moment@npm:^2.10.2, moment@npm:^2.29.1, moment@npm:^2.29.4":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
@@ -31136,6 +31558,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nan@npm:^2.18.0":
+  version: 2.20.0
+  resolution: "nan@npm:2.20.0"
+  dependencies:
+    node-gyp: latest
+  checksum: eb09286e6c238a3582db4d88c875db73e9b5ab35f60306090acd2f3acae21696c9b653368b4a0e32abcef64ee304a923d6223acaddd16169e5eaaf5c508fb533
+  languageName: node
+  linkType: hard
+
 "nanoid@npm:3.3.1":
   version: 3.3.1
   resolution: "nanoid@npm:3.3.1"
@@ -31154,6 +31585,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
+  languageName: node
+  linkType: hard
+
 "nanomatch@npm:^1.2.9":
   version: 1.2.13
   resolution: "nanomatch@npm:1.2.13"
@@ -31412,7 +31852,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7":
+"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7, node-fetch@npm:^2.7.0":
   version: 2.7.0
   resolution: "node-fetch@npm:2.7.0"
   dependencies:
@@ -31462,6 +31902,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-gyp-build@npm:^4.8.0":
+  version: 4.8.2
+  resolution: "node-gyp-build@npm:4.8.2"
+  bin:
+    node-gyp-build: bin.js
+    node-gyp-build-optional: optional.js
+    node-gyp-build-test: build-test.js
+  checksum: 1a57bba8c4c193f808bd8ad1484d4ebdd8106dd9f04a3e82554dc716e3a2d87d7e369e9503c145e0e6a7e2c663fec0d8aaf52bd8156342ec7fc388195f37824e
+  languageName: node
+  linkType: hard
+
 "node-gyp@npm:^9.4.1":
   version: 9.4.1
   resolution: "node-gyp@npm:9.4.1"
@@ -31988,7 +32439,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-is@npm:^1.0.1, object-is@npm:^1.1.5":
+"object-is@npm:^1.1.5":
   version: 1.1.6
   resolution: "object-is@npm:1.1.6"
   dependencies:
@@ -32734,6 +33185,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-asn1@npm:^5.1.7":
+  version: 5.1.7
+  resolution: "parse-asn1@npm:5.1.7"
+  dependencies:
+    asn1.js: ^4.10.1
+    browserify-aes: ^1.2.0
+    evp_bytestokey: ^1.0.3
+    hash-base: ~3.0
+    pbkdf2: ^3.1.2
+    safe-buffer: ^5.2.1
+  checksum: 93c7194c1ed63a13e0b212d854b5213ad1aca0ace41c66b311e97cca0519cf9240f79435a0306a3b412c257f0ea3f1953fd0d9549419a0952c9e995ab361fd6c
+  languageName: node
+  linkType: hard
+
 "parse-entities@npm:^2.0.0":
   version: 2.0.0
   resolution: "parse-entities@npm:2.0.0"
@@ -32859,7 +33324,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-browserify@npm:^1.0.0, path-browserify@npm:^1.0.1":
+"path-browserify@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-browserify@npm:1.0.1"
   checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699
@@ -33056,7 +33521,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pbkdf2@npm:^3.0.3":
+"pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2":
   version: 3.1.2
   resolution: "pbkdf2@npm:3.1.2"
   dependencies:
@@ -33131,6 +33596,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "picocolors@npm:1.1.0"
+  checksum: a64d653d3a188119ff45781dfcdaeedd7625583f45280aea33fcb032c7a0d3959f2368f9b192ad5e8aade75b74dbd954ffe3106c158509a45e4c18ab379a2acd
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.0, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
@@ -33325,14 +33797,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-qase-reporter@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "playwright-qase-reporter@npm:1.2.1"
+"playwright-qase-reporter@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "playwright-qase-reporter@npm:1.2.2"
   dependencies:
     chalk: ^4.1.0
     form-data: ^3.0.0
     qaseio: ^2.0.2
-  checksum: 8b4d2f5902a8d655b781e9dd6898d5d2f25739033f1fda2b600b07ac3fc7680f9a1ee917a969b7315f4f05211e36f1a6699155f9ead05a435afa695932bde9fa
+  checksum: c2d7c5e990357b5cc029d51179ca2af7b61fb7d871eeea05e78300749e7829ca5dd9eef00820ec45422b5036a06a3fa383c76b1dda052aadd490fdd66d6ffe15
   languageName: node
   linkType: hard
 
@@ -34223,7 +34695,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.23, postcss@npm:~8.4.31":
+"postcss@npm:^8.2.15, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.23":
   version: 8.4.31
   resolution: "postcss@npm:8.4.31"
   dependencies:
@@ -34234,6 +34706,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:~8.4.45":
+  version: 8.4.45
+  resolution: "postcss@npm:8.4.45"
+  dependencies:
+    nanoid: ^3.3.7
+    picocolors: ^1.0.1
+    source-map-js: ^1.2.0
+  checksum: 3223cdad4a9392c0b334ee3ee7e4e8041c631cb6160609cef83c18d2b2580e931dd8068ab13cc6000c1a254d57492ac6c38717efc397c5dcc9756d06bc9c44f3
+  languageName: node
+  linkType: hard
+
 "postis@npm:^2.2.0":
   version: 2.2.0
   resolution: "postis@npm:2.2.0"
@@ -34367,7 +34850,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.7.1, prettier@npm:^2.8.4, prettier@npm:~2.8.7, prettier@npm:~2.8.8":
+"prettier@npm:^2.7.1, prettier@npm:^2.8.4, prettier@npm:~2.8.8":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -34692,7 +35175,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"public-encrypt@npm:^4.0.0":
+"public-encrypt@npm:^4.0.0, public-encrypt@npm:^4.0.3":
   version: 4.0.3
   resolution: "public-encrypt@npm:4.0.3"
   dependencies:
@@ -34802,6 +35285,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:6.13.0, qs@npm:^6.12.3":
+  version: 6.13.0
+  resolution: "qs@npm:6.13.0"
+  dependencies:
+    side-channel: ^1.0.6
+  checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8
+  languageName: node
+  linkType: hard
+
 "qs@npm:6.9.3":
   version: 6.9.3
   resolution: "qs@npm:6.9.3"
@@ -34986,7 +35478,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"randomfill@npm:^1.0.3":
+"randomfill@npm:^1.0.3, randomfill@npm:^1.0.4":
   version: 1.0.4
   resolution: "randomfill@npm:1.0.4"
   dependencies:
@@ -35146,13 +35638,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"re-resizable@npm:^6.9.9":
-  version: 6.9.9
-  resolution: "re-resizable@npm:6.9.9"
+"re-resizable@npm:^6.9.18":
+  version: 6.9.18
+  resolution: "re-resizable@npm:6.9.18"
   peerDependencies:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
-  checksum: a2c8bfe86646fb02d5c9c624b1da26f9e6a5e2f552cd96ce4db690588bee6b21177065ce8e98646c6ca0b1a9c4ce233824b75eb346800d8248ac8a87b40f1b28
+  checksum: 46ef26f45d4bf37f4db0d0758fdc0a1b97b29398ac0e8404c556118e15b5df7f47dba2acd60f9e4a9cc66ed536b9566c71d7fc0d2f9bf939609a3016da30704d
   languageName: node
   linkType: hard
 
@@ -35219,21 +35711,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-docgen-typescript-plugin@npm:^1.0.5, react-docgen-typescript-plugin@npm:~1.0.5":
-  version: 1.0.5
-  resolution: "react-docgen-typescript-plugin@npm:1.0.5"
+"react-docgen-typescript-plugin@npm:^1.0.8, react-docgen-typescript-plugin@npm:~1.0.8":
+  version: 1.0.8
+  resolution: "react-docgen-typescript-plugin@npm:1.0.8"
   dependencies:
     debug: ^4.1.1
-    endent: ^2.0.1
     find-cache-dir: ^3.3.1
     flat-cache: ^3.0.4
     micromatch: ^4.0.2
     react-docgen-typescript: ^2.2.2
-    tslib: ^2.0.0
+    tslib: ^2.6.2
   peerDependencies:
     typescript: ">= 4.x"
     webpack: ">= 4"
-  checksum: 0f83d33c7b6dc82fef34ee820c94485c374d853774c5c26b04754ba3674fe4db2c7fc210b30fa0ca77c5033633553c12742aab6305a7f16cd263c70fedf27589
+  checksum: c4fe1ae821be97270de370257747ec4f927f8ee291599f0e67b8bb13ba343da79894ac84a2836af428f877e88d1d96edbef6ee808ed23ecdb4b230fe4f268f1e
   languageName: node
   linkType: hard
 
@@ -35833,6 +36324,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^2.3.8":
+  version: 2.3.8
+  resolution: "readable-stream@npm:2.3.8"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.3
+    isarray: ~1.0.0
+    process-nextick-args: ~2.0.0
+    safe-buffer: ~5.1.1
+    string_decoder: ~1.1.1
+    util-deprecate: ~1.0.1
+  checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
   version: 3.6.0
   resolution: "readable-stream@npm:3.6.0"
@@ -35844,6 +36350,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^3.6.2":
+  version: 3.6.2
+  resolution: "readable-stream@npm:3.6.2"
+  dependencies:
+    inherits: ^2.0.3
+    string_decoder: ^1.1.1
+    util-deprecate: ^1.0.1
+  checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:^4.0.0":
   version: 4.1.0
   resolution: "readable-stream@npm:4.1.0"
@@ -36670,11 +37187,11 @@ __metadata:
   resolution: "rocket.chat@workspace:."
   dependencies:
     "@changesets/cli": ^2.26.2
-    "@types/chart.js": ^2.9.39
-    "@types/js-yaml": ^4.0.8
+    "@types/chart.js": ^2.9.41
+    "@types/js-yaml": ^4.0.9
     node-gyp: ^9.4.1
     ts-node: ^10.9.2
-    turbo: latest
+    turbo: ^2.1.2
   languageName: unknown
   linkType: soft
 
@@ -36693,16 +37210,16 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/cookie": ^0.5.3
-    "@types/cookie-parser": ^1.4.5
-    "@types/ejson": ^2.2.1
-    "@types/express": ^4.17.20
-    "@types/fibers": ^3.1.3
+    "@types/cookie": ^0.5.4
+    "@types/cookie-parser": ^1.4.7
+    "@types/ejson": ^2.2.2
+    "@types/express": ^4.17.21
+    "@types/fibers": ^3.1.4
     "@types/node": ^14.18.63
-    "@types/ws": ^8.5.8
+    "@types/ws": ^8.5.12
     ajv: ^8.11.0
     bcrypt: ^5.0.1
-    body-parser: ^1.20.2
+    body-parser: ^1.20.3
     colorette: ^2.0.20
     cookie: ^0.5.0
     cookie-parser: ^1.4.6
@@ -36712,7 +37229,7 @@ __metadata:
     fibers: ^5.0.3
     jaeger-client: ^3.19.0
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.6.1
     npm-run-all: ^4.1.5
@@ -36721,7 +37238,7 @@ __metadata:
     pm2: ^5.2.0
     sodium-native: ^3.3.0
     sodium-plus: ^0.9.0
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     typescript: ~5.5.4
     uuid: ^8.3.2
     ws: ^8.8.1
@@ -37562,6 +38079,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"side-channel@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "side-channel@npm:1.0.6"
+  dependencies:
+    call-bind: ^1.0.7
+    es-errors: ^1.3.0
+    get-intrinsic: ^1.2.4
+    object-inspect: ^1.13.1
+  checksum: bfc1afc1827d712271453e91b7cd3878ac0efd767495fd4e594c4c2afaa7963b7b510e249572bfd54b0527e66e4a12b61b80c061389e129755f34c493aad9b97
+  languageName: node
+  linkType: hard
+
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
@@ -37877,6 +38406,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-js@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "source-map-js@npm:1.2.1"
+  checksum: 4eb0cd997cdf228bc253bcaff9340afeb706176e64868ecd20efbe6efea931465f43955612346d6b7318789e5265bdc419bc7669c1cebe3db0eb255f57efa76b
+  languageName: node
+  linkType: hard
+
 "source-map-resolve@npm:^0.5.0":
   version: 0.5.3
   resolution: "source-map-resolve@npm:0.5.3"
@@ -38282,15 +38818,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook-dark-mode@npm:~3.0.1":
-  version: 3.0.1
-  resolution: "storybook-dark-mode@npm:3.0.1"
+"storybook-dark-mode@npm:~3.0.3":
+  version: 3.0.3
+  resolution: "storybook-dark-mode@npm:3.0.3"
   dependencies:
     "@storybook/addons": ^7.0.0
-    "@storybook/api": ^7.0.0
     "@storybook/components": ^7.0.0
     "@storybook/core-events": ^7.0.0
     "@storybook/global": ^5.0.0
+    "@storybook/manager-api": ^7.0.0
     "@storybook/theming": ^7.0.0
     fast-deep-equal: ^3.1.3
     memoizerific: ^1.11.3
@@ -38302,7 +38838,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: d04213c92e8a4af0035e80eb02b75b8da725ba7b1ecbfe050eb04cb4018d91394f08c8fe7c1b106c971b2047ef5a1ba776e78050ae1f6d7563cdfdba5e701a29
+  checksum: 7db89470168e9d15f36c44554ddb80b5aeac7276664904adc7b2d1f1913a4a514b86769eb80d4fcc43070e75d4e79a53b2467e51d628298e2e35e3c47c30bc7f
   languageName: node
   linkType: hard
 
@@ -38326,10 +38862,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-buffers@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "stream-buffers@npm:3.0.2"
-  checksum: b09fdeea606e3113ebd0e07010ed0cf038608fa396130add9e45deaff5cc3ba845dc25c31ad24f8341f85907846344cb7c85f75ea52c6572e2ac646e9b6072d0
+"stream-buffers@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "stream-buffers@npm:3.0.3"
+  checksum: 3f0bdc4b1fd3ff370cef5a2103dd930b8981d42d97741eeb087a660771e27f0fc35fa8a351bb36e15bbbbce0eea00fefed60d6cdff4c6c3f527580529f183807
   languageName: node
   linkType: hard
 
@@ -38419,6 +38955,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"streamx@npm:^2.20.0":
+  version: 2.20.1
+  resolution: "streamx@npm:2.20.1"
+  dependencies:
+    bare-events: ^2.2.0
+    fast-fifo: ^1.3.2
+    queue-tick: ^1.0.1
+    text-decoder: ^1.1.0
+  dependenciesMeta:
+    bare-events:
+      optional: true
+  checksum: 48605ddd3abdd86d2e3ee945ec7c9317f36abb5303347a8fff6e4c7926a72c33ec7ac86b50734ccd1cf65602b6a38e247966e8199b24e5a7485d9cec8f5327bd
+  languageName: node
+  linkType: hard
+
 "strict-uri-encode@npm:^1.0.0":
   version: 1.1.0
   resolution: "strict-uri-encode@npm:1.1.0"
@@ -39174,7 +39725,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-fs@npm:^2.0.0, tar-fs@npm:^2.1.1":
+"tar-fs@npm:^2.0.0":
   version: 2.1.1
   resolution: "tar-fs@npm:2.1.1"
   dependencies:
@@ -39197,6 +39748,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tar-fs@npm:^3.0.5":
+  version: 3.0.6
+  resolution: "tar-fs@npm:3.0.6"
+  dependencies:
+    bare-fs: ^2.1.1
+    bare-path: ^2.1.0
+    pump: ^3.0.0
+    tar-stream: ^3.1.5
+  dependenciesMeta:
+    bare-fs:
+      optional: true
+    bare-path:
+      optional: true
+  checksum: b4fa09c70f75caf05bf5cf87369cd2862f1ac5fb75c4ddf9d25d55999f7736a94b58ad679d384196cba837c5f5ff14086e060fafccef5474a16e2d3058ffa488
+  languageName: node
+  linkType: hard
+
 "tar-stream@npm:^1.5.2, tar-stream@npm:^1.6.2":
   version: 1.6.2
   resolution: "tar-stream@npm:1.6.2"
@@ -39312,6 +39880,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"telejson@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "telejson@npm:7.2.0"
+  dependencies:
+    memoizerific: ^1.11.3
+  checksum: 55a3380c9ff3c5ad84581bb6bda28fc33c6b7c4a0c466894637da687639b8db0d21b0ff4c1bc1a7a92ae6b70662549d09e7b9e8b1ec334b2ef93078762ecdfb9
+  languageName: node
+  linkType: hard
+
 "temp-dir@npm:^1.0.0":
   version: 1.0.0
   resolution: "temp-dir@npm:1.0.0"
@@ -39467,6 +40044,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"text-decoder@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "text-decoder@npm:1.2.0"
+  dependencies:
+    b4a: ^1.6.4
+  checksum: 9f4c23900b42153af0e4a902577eba37cb70cd1d5b187732b81c74c705d3206952cf1dcecf97537794374f55aac6c547ac3860f1facc9560007ca9a06b0e309d
+  languageName: node
+  linkType: hard
+
 "text-hex@npm:1.0.x":
   version: 1.0.0
   resolution: "text-hex@npm:1.0.0"
@@ -39876,7 +40462,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:~29.1.1":
+"ts-jest@npm:~29.1.5":
   version: 29.1.5
   resolution: "ts-jest@npm:29.1.5"
   dependencies:
@@ -39912,7 +40498,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-loader@npm:~9.4.2":
+"ts-loader@npm:~9.4.4":
   version: 9.4.4
   resolution: "ts-loader@npm:9.4.4"
   dependencies:
@@ -39927,7 +40513,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^10.9.1, ts-node@npm:^10.9.2, ts-node@npm:~10.9.1":
+"ts-node@npm:^10.9.2, ts-node@npm:~10.9.2":
   version: 10.9.2
   resolution: "ts-node@npm:10.9.2"
   dependencies:
@@ -40032,6 +40618,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.6.2":
+  version: 2.7.0
+  resolution: "tslib@npm:2.7.0"
+  checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
+  languageName: node
+  linkType: hard
+
 "tsscmp@npm:^1.0.6":
   version: 1.0.6
   resolution: "tsscmp@npm:1.0.6"
@@ -40104,58 +40697,58 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-darwin-64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-darwin-64@npm:2.0.11"
+"turbo-darwin-64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-darwin-64@npm:2.1.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-darwin-arm64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-darwin-arm64@npm:2.0.11"
+"turbo-darwin-arm64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-darwin-arm64@npm:2.1.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-linux-64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-linux-64@npm:2.0.11"
+"turbo-linux-64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-linux-64@npm:2.1.2"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-linux-arm64@npm:2.0.11"
+"turbo-linux-arm64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-linux-arm64@npm:2.1.2"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-windows-64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-windows-64@npm:2.0.11"
+"turbo-windows-64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-windows-64@npm:2.1.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-windows-arm64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-windows-arm64@npm:2.0.11"
+"turbo-windows-arm64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-windows-arm64@npm:2.1.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo@npm:latest":
-  version: 2.0.11
-  resolution: "turbo@npm:2.0.11"
-  dependencies:
-    turbo-darwin-64: 2.0.11
-    turbo-darwin-arm64: 2.0.11
-    turbo-linux-64: 2.0.11
-    turbo-linux-arm64: 2.0.11
-    turbo-windows-64: 2.0.11
-    turbo-windows-arm64: 2.0.11
+"turbo@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "turbo@npm:2.1.2"
+  dependencies:
+    turbo-darwin-64: 2.1.2
+    turbo-darwin-arm64: 2.1.2
+    turbo-linux-64: 2.1.2
+    turbo-linux-arm64: 2.1.2
+    turbo-windows-64: 2.1.2
+    turbo-windows-arm64: 2.1.2
   dependenciesMeta:
     turbo-darwin-64:
       optional: true
@@ -40171,7 +40764,7 @@ __metadata:
       optional: true
   bin:
     turbo: bin/turbo
-  checksum: a2fcb17b2549102dcd912799319a5c31cbabc3fcb76241bac1d2231ee4e1911789cd4e6b4eb050f9e8548ef89143ee77be59eb35b1843cf12b42f136ef176a0c
+  checksum: ee3d12a69fa512d30b325369c49a490cd2112547a59aca7bd3c9407b12bd9bd9ffd682e801c1e2e5711669c155ef06b0a090b0bbffa84fd60ddc5df0a1c855e6
   languageName: node
   linkType: hard
 
@@ -40410,7 +41003,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typedoc@npm:~0.24.1":
+"typedoc@npm:~0.24.8":
   version: 0.24.8
   resolution: "typedoc@npm:0.24.8"
   dependencies:
@@ -40480,10 +41073,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ua-parser-js@npm:^1.0.37":
-  version: 1.0.37
-  resolution: "ua-parser-js@npm:1.0.37"
-  checksum: 4d481c720d523366d7762dc8a46a1b58967d979aacf786f9ceceb1cd767de069f64a4bdffb63956294f1c0696eb465ddb950f28ba90571709e33521b4bd75e07
+"ua-parser-js@npm:^1.0.38":
+  version: 1.0.38
+  resolution: "ua-parser-js@npm:1.0.38"
+  checksum: d0772b22b027338d806ab17d1ac2896ee7485bdf9217c526028159f3cd6bb10272bb18f6196d2f94dde83e3b36dc9d2533daf08a414764f6f4f1844842383838
   languageName: node
   linkType: hard
 
@@ -40532,10 +41125,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"underscore@npm:^1.13.6":
-  version: 1.13.6
-  resolution: "underscore@npm:1.13.6"
-  checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36
+"underscore@npm:^1.13.7":
+  version: 1.13.7
+  resolution: "underscore@npm:1.13.7"
+  checksum: 174b011af29e4fbe2c70eb2baa8bfab0d0336cf2f5654f364484967bc6264a86224d0134b9176e4235c8cceae00d11839f0fd4824268de04b11c78aca1241684
   languageName: node
   linkType: hard
 
@@ -41040,6 +41633,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url@npm:^0.11.4":
+  version: 0.11.4
+  resolution: "url@npm:0.11.4"
+  dependencies:
+    punycode: ^1.4.1
+    qs: ^6.12.3
+  checksum: c25e587723d343d5d4248892393bfa5039ded9c2c07095a9d005bc64b7cb8956d623c0d8da8d1a28f71986a7a8d80fc2e9f9cf84235e48fa435a5cb4451062c6
+  languageName: node
+  linkType: hard
+
 "use-callback-ref@npm:^1.3.0":
   version: 1.3.0
   resolution: "use-callback-ref@npm:1.3.0"
@@ -41099,14 +41702,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-subscription@npm:^1.8.0":
-  version: 1.8.0
-  resolution: "use-subscription@npm:1.8.0"
+"use-subscription@npm:^1.8.2":
+  version: 1.8.2
+  resolution: "use-subscription@npm:1.8.2"
   dependencies:
-    use-sync-external-store: ^1.2.0
+    use-sync-external-store: ^1.2.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: beac1f0ff14fe23fd6ae9c34681258936729f343bf6532bbce36caa8f4c1019ff380783e35b4aeb7f3faaec1a83af242d7833bf7e660816d24555dbdd2c934da
+  checksum: 6b17f92a75405a4e6015d7762b459a43435f34d0bb9a72e512e305d6d3a61bd170e6666c3a62c2c3c7af1b7ba0b45c5a597b7eeea54c46e1cabf8ef0f971d44e
   languageName: node
   linkType: hard
 
@@ -41128,7 +41731,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-sync-external-store@npm:^1.2.0, 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.0, use-sync-external-store@npm:~1.2.2":
   version: 1.2.2
   resolution: "use-sync-external-store@npm:1.2.2"
   peerDependencies:
@@ -41226,7 +41829,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util@npm:^0.12.0, util@npm:^0.12.4":
+"util@npm:^0.12.4, util@npm:^0.12.5":
   version: 0.12.5
   resolution: "util@npm:0.12.5"
   dependencies:
@@ -41664,9 +42267,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webdav@npm:^4.11.3":
-  version: 4.11.3
-  resolution: "webdav@npm:4.11.3"
+"webdav@npm:^4.11.4":
+  version: 4.11.4
+  resolution: "webdav@npm:4.11.4"
   dependencies:
     axios: ^0.27.2
     base-64: ^1.0.0
@@ -41681,7 +42284,7 @@ __metadata:
     path-posix: ^1.0.0
     url-join: ^4.0.1
     url-parse: ^1.5.10
-  checksum: e5bfc66149088cd857c23a3a549650d7483dd5615cf1c4b6251a5b290a4ad8fef4975bfd99fca2d5842a0eaadc056bc0044e37893e0ad5447e6ce2e2dbd81da5
+  checksum: 941a8f239d483cc283b893132675746461fe42b0932afe81ee2cad36065aeb657d722813a34966f6c6f6e95e7058453a7869e238ae1e1d1d29df9a28508dee27
   languageName: node
   linkType: hard
 
@@ -41772,7 +42375,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-cli@npm:~5.0.1":
+"webpack-cli@npm:~5.0.2":
   version: 5.0.2
   resolution: "webpack-cli@npm:5.0.2"
   dependencies:
@@ -42166,10 +42769,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-fetch@npm:^3.6.19":
-  version: 3.6.19
-  resolution: "whatwg-fetch@npm:3.6.19"
-  checksum: 2896bc9ca867ea514392c73e2a272f65d5c4916248fe0837a9df5b1b92f247047bc76cf7c29c28a01ac6c5fb4314021d2718958c8a08292a96d56f72b2f56806
+"whatwg-fetch@npm:^3.6.20":
+  version: 3.6.20
+  resolution: "whatwg-fetch@npm:3.6.20"
+  checksum: c58851ea2c4efe5c2235f13450f426824cf0253c1d45da28f45900290ae602a20aff2ab43346f16ec58917d5562e159cd691efa368354b2e82918c2146a519c5
   languageName: node
   linkType: hard
 

From 2e10a451c4756f64978a0658e7ffff68a0691774 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Sat, 14 Sep 2024 09:05:11 -0300
Subject: [PATCH 082/170] ci: Include hidden files when uploading artifacts
 (#33286)

---
 .github/actions/meteor-build/action.yml | 1 +
 .github/workflows/ci-test-e2e.yml       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.github/actions/meteor-build/action.yml b/.github/actions/meteor-build/action.yml
index 525595146700..551a57d28a7c 100644
--- a/.github/actions/meteor-build/action.yml
+++ b/.github/actions/meteor-build/action.yml
@@ -133,3 +133,4 @@ runs:
         name: build
         path: /tmp/Rocket.Chat.tar.gz
         overwrite: true
+        include-hidden-files: true
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index e6c02b7b6417..3ed6f07e725d 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -293,6 +293,7 @@ jobs:
         with:
           name: playwright-test-trace-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: ./apps/meteor/tests/e2e/.playwright*
+          include-hidden-files: true
 
       - name: Show server logs if E2E test failed
         if: failure()
@@ -326,6 +327,7 @@ jobs:
         with:
           name: e2e-api-ee-coverage-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: /tmp/coverage
+          include-hidden-files: true
 
       - name: Store e2e-ee-coverage
         if: inputs.type == 'ui' && inputs.release == 'ee'
@@ -333,3 +335,4 @@ jobs:
         with:
           name: e2e-ee-coverage-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: ./apps/meteor/coverage*
+          include-hidden-files: true

From fad7f974c0fdfc5517adb389755f64eddff7c07b Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Mon, 16 Sep 2024 10:42:54 -0300
Subject: [PATCH 083/170] feat: get contact by id endpoint (#33041)

---
 .../server/constant/permissions.ts            |  4 ++
 .../app/livechat/server/api/v1/contact.ts     | 24 ++++++-
 .../tests/end-to-end/api/livechat/contacts.ts | 63 +++++++++++++++++++
 packages/rest-typings/src/v1/omnichannel.ts   | 18 ++++++
 4 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/app/authorization/server/constant/permissions.ts b/apps/meteor/app/authorization/server/constant/permissions.ts
index e5e8f7fb05dd..46d40713bad1 100644
--- a/apps/meteor/app/authorization/server/constant/permissions.ts
+++ b/apps/meteor/app/authorization/server/constant/permissions.ts
@@ -101,6 +101,10 @@ export const permissions = [
 		_id: 'update-livechat-contact',
 		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
 	},
+	{
+		_id: 'view-livechat-contact',
+		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
+	},
 	{ _id: 'view-livechat-manager', roles: ['livechat-manager', 'livechat-monitor', 'admin'] },
 	{
 		_id: 'view-omnichannel-contact-center',
diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index 7e9457d2f185..f3fec80b23fe 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -1,5 +1,9 @@
-import { LivechatCustomField, LivechatVisitors } from '@rocket.chat/models';
-import { isPOSTOmnichannelContactsProps, isPOSTUpdateOmnichannelContactsProps } from '@rocket.chat/rest-typings';
+import { LivechatContacts, LivechatCustomField, LivechatVisitors } from '@rocket.chat/models';
+import {
+	isPOSTOmnichannelContactsProps,
+	isPOSTUpdateOmnichannelContactsProps,
+	isGETOmnichannelContactsProps,
+} from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -101,6 +105,7 @@ API.v1.addRoute(
 		},
 	},
 );
+
 API.v1.addRoute(
 	'omnichannel/contacts.update',
 	{ authRequired: true, permissionsRequired: ['update-livechat-contact'], validateParams: isPOSTUpdateOmnichannelContactsProps },
@@ -116,3 +121,18 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'omnichannel/contacts.get',
+	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsProps },
+	{
+		async get() {
+			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
+				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			}
+			const contact = await LivechatContacts.findOneById(this.queryParams.contactId);
+
+			return API.v1.success({ contact });
+		},
+	},
+);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
index 957d22ba92ae..c33ef255c25c 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -569,4 +569,67 @@ describe('LIVECHAT - contacts', () => {
 			});
 		});
 	});
+
+	describe('[GET] omnichannel/contacts.get', () => {
+		let contactId: string;
+		const contact = {
+			name: faker.person.fullName(),
+			emails: [faker.internet.email().toLowerCase()],
+			phones: [faker.phone.number()],
+			contactManager: agentUser?._id,
+		};
+
+		before(async () => {
+			await updatePermission('view-livechat-contact', ['admin']);
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({ ...contact });
+			contactId = body.contactId;
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should be able get a contact by id', async () => {
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.name).to.be.equal(contact.name);
+			expect(res.body.contact.emails).to.be.deep.equal(contact.emails);
+			expect(res.body.contact.phones).to.be.deep.equal(contact.phones);
+			expect(res.body.contact.contactManager).to.be.equal(contact.contactManager);
+		});
+
+		it('should return null if contact does not exist', async () => {
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: 'invalid' });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact).to.be.null;
+		});
+
+		it("should return an error if user doesn't have 'view-livechat-contact' permission", async () => {
+			await removePermissionFromAllRoles('view-livechat-contact');
+
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId });
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should return an error if contactId is missing', async () => {
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials);
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
+			expect(res.body.errorType).to.be.equal('invalid-params');
+		});
+	});
 });
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index 1ed249f5dd55..a1c714c013b8 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -1304,6 +1304,21 @@ const POSTUpdateOmnichannelContactsSchema = {
 
 export const isPOSTUpdateOmnichannelContactsProps = ajv.compile<POSTUpdateOmnichannelContactsProps>(POSTUpdateOmnichannelContactsSchema);
 
+type GETOmnichannelContactsProps = { contactId: string };
+
+const GETOmnichannelContactsSchema = {
+	type: 'object',
+	properties: {
+		contactId: {
+			type: 'string',
+		},
+	},
+	required: ['contactId'],
+	additionalProperties: false,
+};
+
+export const isGETOmnichannelContactsProps = ajv.compile<GETOmnichannelContactsProps>(GETOmnichannelContactsSchema);
+
 type GETOmnichannelContactProps = { contactId: string };
 
 const GETOmnichannelContactSchema = {
@@ -3748,6 +3763,9 @@ export type OmnichannelEndpoints = {
 	'/v1/omnichannel/contacts.update': {
 		POST: (params: POSTUpdateOmnichannelContactsProps) => { contact: ILivechatContact };
 	};
+	'/v1/omnichannel/contacts.get': {
+		GET: (params: GETOmnichannelContactsProps) => { contact: ILivechatContact | null };
+	};
 
 	'/v1/omnichannel/contact.search': {
 		GET: (params: GETOmnichannelContactSearchProps) => { contact: ILivechatVisitor | null };

From c6478fec74bd87a30e31b70b485bb5f659addde5 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Mon, 16 Sep 2024 12:20:47 -0600
Subject: [PATCH 084/170] ci: Add `ee` or `ce` to the playwright trace uploaded
 file (#33299)

---
 .github/workflows/ci-test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index 3ed6f07e725d..a80a40419e9f 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -291,7 +291,7 @@ jobs:
         if: inputs.type == 'ui' && always()
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-test-trace-${{ matrix.mongodb-version }}-${{ matrix.shard }}
+          name: playwright-test-trace-${{ inputs.release }}-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: ./apps/meteor/tests/e2e/.playwright*
           include-hidden-files: true
 

From b919221b475c90789f665bcd13267a05ecd64f9c Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Mon, 16 Sep 2024 14:46:24 -0600
Subject: [PATCH 085/170] fix: Federation callback not awaiting model call
 (#33298)

---
 .changeset/great-humans-live.md                              | 5 +++++
 .../meteor/app/federation/server/hooks/afterUnsetReaction.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/great-humans-live.md

diff --git a/.changeset/great-humans-live.md b/.changeset/great-humans-live.md
new file mode 100644
index 000000000000..1d97d9da23ae
--- /dev/null
+++ b/.changeset/great-humans-live.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a Federation callback not awaiting db call
diff --git a/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js b/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
index 51181d88ab9e..995146b290bf 100644
--- a/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
+++ b/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
@@ -6,7 +6,7 @@ import { getFederationDomain } from '../lib/getFederationDomain';
 import { clientLogger } from '../lib/logger';
 
 async function afterUnsetReaction(message, { user, reaction }) {
-	const room = Rooms.findOneById(message.rid, { fields: { federation: 1 } });
+	const room = await Rooms.findOneById(message.rid, { projection: { federation: 1 } });
 
 	// If there are not federated users on this room, ignore it
 	if (!hasExternalDomain(room)) {

From 636d32d78374e943cb8b416d2172f9a6c4f68917 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Tue, 17 Sep 2024 11:06:11 -0300
Subject: [PATCH 086/170] fix: correct parameter order in afterSaveMessage to
 restore outgoing webhooks and related features (#33295)

---
 .changeset/rotten-rabbits-brush.md                       | 5 +++++
 apps/meteor/app/autotranslate/server/autotranslate.ts    | 7 ++++++-
 apps/meteor/app/integrations/server/triggers.ts          | 7 ++++++-
 apps/meteor/app/irc/server/irc-bridge/index.js           | 2 +-
 apps/meteor/ee/server/lib/engagementDashboard/startup.ts | 7 ++++++-
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/rotten-rabbits-brush.md

diff --git a/.changeset/rotten-rabbits-brush.md b/.changeset/rotten-rabbits-brush.md
new file mode 100644
index 000000000000..916f4cc8034a
--- /dev/null
+++ b/.changeset/rotten-rabbits-brush.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
diff --git a/apps/meteor/app/autotranslate/server/autotranslate.ts b/apps/meteor/app/autotranslate/server/autotranslate.ts
index f3c6d9e55fdb..23e1b189a792 100644
--- a/apps/meteor/app/autotranslate/server/autotranslate.ts
+++ b/apps/meteor/app/autotranslate/server/autotranslate.ts
@@ -113,7 +113,12 @@ export class TranslationProviderRegistry {
 			return;
 		}
 
-		callbacks.add('afterSaveMessage', provider.translateMessage.bind(provider), callbacks.priority.MEDIUM, 'autotranslate');
+		callbacks.add(
+			'afterSaveMessage',
+			(message, { room }) => provider.translateMessage(message, { room }),
+			callbacks.priority.MEDIUM,
+			'autotranslate',
+		);
 	}
 }
 
diff --git a/apps/meteor/app/integrations/server/triggers.ts b/apps/meteor/app/integrations/server/triggers.ts
index cdf8acda6a21..64b95827645f 100644
--- a/apps/meteor/app/integrations/server/triggers.ts
+++ b/apps/meteor/app/integrations/server/triggers.ts
@@ -8,7 +8,12 @@ const callbackHandler = function _callbackHandler(eventType: string) {
 	};
 };
 
-callbacks.add('afterSaveMessage', callbackHandler('sendMessage'), callbacks.priority.LOW, 'integrations-sendMessage');
+callbacks.add(
+	'afterSaveMessage',
+	(message, { room }) => callbackHandler('sendMessage')(message, room),
+	callbacks.priority.LOW,
+	'integrations-sendMessage',
+);
 callbacks.add('afterCreateChannel', callbackHandler('roomCreated'), callbacks.priority.LOW, 'integrations-roomCreated');
 callbacks.add('afterCreatePrivateGroup', callbackHandler('roomCreated'), callbacks.priority.LOW, 'integrations-roomCreated');
 callbacks.add('afterCreateUser', callbackHandler('userCreated'), callbacks.priority.LOW, 'integrations-userCreated');
diff --git a/apps/meteor/app/irc/server/irc-bridge/index.js b/apps/meteor/app/irc/server/irc-bridge/index.js
index 09b7a3568362..bc5b4f0bc33f 100644
--- a/apps/meteor/app/irc/server/irc-bridge/index.js
+++ b/apps/meteor/app/irc/server/irc-bridge/index.js
@@ -209,7 +209,7 @@ class Bridge {
 		// Chatting
 		callbacks.add(
 			'afterSaveMessage',
-			this.onMessageReceived.bind(this, 'local', 'onSaveMessage'),
+			(message, { room }) => this.onMessageReceived('local', 'onSaveMessage', message, room),
 			callbacks.priority.LOW,
 			'irc-on-save-message',
 		);
diff --git a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
index 159b121f7043..415e0323d525 100644
--- a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
+++ b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
@@ -3,7 +3,12 @@ import { fillFirstDaysOfMessagesIfNeeded, handleMessagesDeleted, handleMessagesS
 import { fillFirstDaysOfUsersIfNeeded, handleUserCreated } from './users';
 
 export const attachCallbacks = (): void => {
-	callbacks.add('afterSaveMessage', handleMessagesSent, callbacks.priority.MEDIUM, 'engagementDashboard.afterSaveMessage');
+	callbacks.add(
+		'afterSaveMessage',
+		(message, { room }) => handleMessagesSent(message, { room }),
+		callbacks.priority.MEDIUM,
+		'engagementDashboard.afterSaveMessage',
+	);
 	callbacks.add('afterDeleteMessage', handleMessagesDeleted, callbacks.priority.MEDIUM, 'engagementDashboard.afterDeleteMessage');
 	callbacks.add('afterCreateUser', handleUserCreated, callbacks.priority.MEDIUM, 'engagementDashboard.afterCreateUser');
 };

From 3a161c43103433553442ef1d27ada9f2fd88d531 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 17 Sep 2024 10:39:21 -0600
Subject: [PATCH 087/170] feat: New endpoint for listing rooms & discussions
 from teams (#33177)

---
 .changeset/soft-mirrors-remember.md           |   8 +
 apps/meteor/app/api/server/v1/teams.ts        |  39 +++
 apps/meteor/server/models/raw/Rooms.ts        |  81 +++++
 apps/meteor/server/services/team/service.ts   |  39 ++-
 apps/meteor/tests/data/teams.helper.ts        |  19 +-
 apps/meteor/tests/end-to-end/api/teams.ts     | 321 ++++++++++++++++++
 .../core-services/src/types/ITeamService.ts   |  11 +-
 .../model-typings/src/models/IRoomsModel.ts   |   8 +
 .../src/v1/teams/TeamsListChildren.ts         |  36 ++
 packages/rest-typings/src/v1/teams/index.ts   |   6 +
 10 files changed, 559 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/soft-mirrors-remember.md
 create mode 100644 packages/rest-typings/src/v1/teams/TeamsListChildren.ts

diff --git a/.changeset/soft-mirrors-remember.md b/.changeset/soft-mirrors-remember.md
new file mode 100644
index 000000000000..78b005ee6b6e
--- /dev/null
+++ b/.changeset/soft-mirrors-remember.md
@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-services": minor
+"@rocket.chat/model-typings": minor
+"@rocket.chat/rest-typings": minor
+---
+
+New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
diff --git a/apps/meteor/app/api/server/v1/teams.ts b/apps/meteor/app/api/server/v1/teams.ts
index f64f8c820575..acb6cba2bac7 100644
--- a/apps/meteor/app/api/server/v1/teams.ts
+++ b/apps/meteor/app/api/server/v1/teams.ts
@@ -11,6 +11,7 @@ import {
 	isTeamsDeleteProps,
 	isTeamsLeaveProps,
 	isTeamsUpdateProps,
+	isTeamsListChildrenProps,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
@@ -375,6 +376,44 @@ API.v1.addRoute(
 	},
 );
 
+const getTeamByIdOrNameOrParentRoom = async (
+	params: { teamId: string } | { teamName: string } | { roomId: string },
+): Promise<Pick<ITeam, 'type' | 'roomId' | '_id'> | null> => {
+	if ('teamId' in params && params.teamId) {
+		return Team.getOneById<ITeam>(params.teamId, { projection: { type: 1, roomId: 1 } });
+	}
+	if ('teamName' in params && params.teamName) {
+		return Team.getOneByName(params.teamName, { projection: { type: 1, roomId: 1 } });
+	}
+	if ('roomId' in params && params.roomId) {
+		return Team.getOneByRoomId(params.roomId, { projection: { type: 1, roomId: 1 } });
+	}
+	return null;
+};
+
+// This should accept a teamId, filter (search by name on rooms collection) and sort/pagination
+// should return a list of rooms/discussions from the team. the discussions will only be returned from the main room
+API.v1.addRoute(
+	'teams.listChildren',
+	{ authRequired: true, validateParams: isTeamsListChildrenProps },
+	{
+		async get() {
+			const { offset, count } = await getPaginationItems(this.queryParams);
+			const { sort } = await this.parseJsonQuery();
+			const { filter, type } = this.queryParams;
+
+			const team = await getTeamByIdOrNameOrParentRoom(this.queryParams);
+			if (!team) {
+				return API.v1.notFound();
+			}
+
+			const data = await Team.listChildren(this.userId, team, filter, type, sort, offset, count);
+
+			return API.v1.success({ ...data, offset, count });
+		},
+	},
+);
+
 API.v1.addRoute(
 	'teams.members',
 	{ authRequired: true },
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index ec3bd6fe8d40..7d4a0a54dedf 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -2063,4 +2063,85 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 
 		return this.updateMany(query, update);
 	}
+
+	findChildrenOfTeam(
+		teamId: string,
+		teamRoomId: string,
+		userId: string,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		options?: FindOptions<IRoom>,
+	): AggregationCursor<{ totalCount: { count: number }[]; paginatedResults: IRoom[] }> {
+		const nameFilter = filter ? new RegExp(escapeRegExp(filter), 'i') : undefined;
+		return this.col.aggregate<{ totalCount: { count: number }[]; paginatedResults: IRoom[] }>([
+			{
+				$match: {
+					$and: [
+						{
+							$or: [
+								...(!type || type === 'channels' ? [{ teamId }] : []),
+								...(!type || type === 'discussions' ? [{ prid: teamRoomId }] : []),
+							],
+						},
+						...(nameFilter ? [{ $or: [{ fname: nameFilter }, { name: nameFilter }] }] : []),
+					],
+				},
+			},
+			{
+				$lookup: {
+					from: 'rocketchat_subscription',
+					let: {
+						roomId: '$_id',
+					},
+					pipeline: [
+						{
+							$match: {
+								$and: [
+									{
+										$expr: {
+											$eq: ['$rid', '$$roomId'],
+										},
+									},
+									{
+										$expr: {
+											$eq: ['$u._id', userId],
+										},
+									},
+									{
+										$expr: {
+											$ne: ['$t', 'c'],
+										},
+									},
+								],
+							},
+						},
+						{
+							$project: { _id: 1 },
+						},
+					],
+					as: 'subscription',
+				},
+			},
+			{
+				$match: {
+					$or: [
+						{ t: 'c' },
+						{
+							$expr: {
+								$ne: [{ $size: '$subscription' }, 0],
+							},
+						},
+					],
+				},
+			},
+			{ $project: { subscription: 0 } },
+			{ $sort: options?.sort || { ts: 1 } },
+			{
+				$facet: {
+					totalCount: [{ $count: 'count' }],
+					paginatedResults: [{ $skip: options?.skip || 0 }, { $limit: options?.limit || 50 }],
+				},
+			},
+		]);
+	}
 }
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 27f7af1f1b1c..f5218c88402a 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -913,8 +913,8 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		});
 	}
 
-	async getOneByRoomId(roomId: string): Promise<ITeam | null> {
-		const room = await Rooms.findOneById(roomId);
+	async getOneByRoomId(roomId: string, options?: FindOptions<ITeam>): Promise<ITeam | null> {
+		const room = await Rooms.findOneById(roomId, { projection: { teamId: 1 } });
 
 		if (!room) {
 			throw new Error('invalid-room');
@@ -924,7 +924,7 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 			throw new Error('room-not-on-team');
 		}
 
-		return Team.findOneById(room.teamId);
+		return Team.findOneById(room.teamId, options);
 	}
 
 	async addRolesToMember(teamId: string, userId: string, roles: Array<string>): Promise<boolean> {
@@ -1078,4 +1078,37 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		const parentRoom = await this.getParentRoom(team);
 		return { team, ...(parentRoom && { parentRoom }) };
 	}
+
+	// Returns the list of rooms and discussions a user has access to inside a team
+	// Rooms returned are a composition of the rooms the user is in + public rooms + discussions from the main room (if any)
+	async listChildren(
+		userId: string,
+		team: AtLeast<ITeam, '_id' | 'roomId' | 'type'>,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		sort?: Record<string, 1 | -1>,
+		skip = 0,
+		limit = 10,
+	): Promise<{ total: number; data: IRoom[] }> {
+		const mainRoom = await Rooms.findOneById(team.roomId, { projection: { _id: 1 } });
+		if (!mainRoom) {
+			throw new Error('error-invalid-team-no-main-room');
+		}
+
+		const isMember = await TeamMember.findOneByUserIdAndTeamId(userId, team._id, {
+			projection: { _id: 1 },
+		});
+
+		if (!isMember) {
+			throw new Error('error-invalid-team-not-a-member');
+		}
+
+		const [{ totalCount: [{ count: total }] = [], paginatedResults: data = [] }] =
+			(await Rooms.findChildrenOfTeam(team._id, mainRoom._id, userId, filter, type, { skip, limit, sort }).toArray()) || [];
+
+		return {
+			total,
+			data,
+		};
+	}
 }
diff --git a/apps/meteor/tests/data/teams.helper.ts b/apps/meteor/tests/data/teams.helper.ts
index 8fc60bd19fd4..f6cba25f86c9 100644
--- a/apps/meteor/tests/data/teams.helper.ts
+++ b/apps/meteor/tests/data/teams.helper.ts
@@ -2,11 +2,20 @@ import type { ITeam, TEAM_TYPE } from '@rocket.chat/core-typings';
 
 import { api, request } from './api-data';
 
-export const createTeam = async (credentials: Record<string, any>, teamName: string, type: TEAM_TYPE): Promise<ITeam> => {
-	const response = await request.post(api('teams.create')).set(credentials).send({
-		name: teamName,
-		type,
-	});
+export const createTeam = async (
+	credentials: Record<string, any>,
+	teamName: string,
+	type: TEAM_TYPE,
+	members?: string[],
+): Promise<ITeam> => {
+	const response = await request
+		.post(api('teams.create'))
+		.set(credentials)
+		.send({
+			name: teamName,
+			type,
+			...(members && { members }),
+		});
 
 	return response.body.team;
 };
diff --git a/apps/meteor/tests/end-to-end/api/teams.ts b/apps/meteor/tests/end-to-end/api/teams.ts
index ca07d3e32679..b630a97b1727 100644
--- a/apps/meteor/tests/end-to-end/api/teams.ts
+++ b/apps/meteor/tests/end-to-end/api/teams.ts
@@ -2217,4 +2217,325 @@ describe('[Teams]', () => {
 			});
 		});
 	});
+
+	describe('[teams.listChildren]', () => {
+		const teamName = `team-${Date.now()}`;
+		let testTeam: ITeam;
+		let testPrivateTeam: ITeam;
+		let testUser: IUser;
+		let testUserCredentials: Credentials;
+
+		let privateRoom: IRoom;
+		let privateRoom2: IRoom;
+		let publicRoom: IRoom;
+		let publicRoom2: IRoom;
+
+		let discussionOnPrivateRoom: IRoom;
+		let discussionOnPublicRoom: IRoom;
+		let discussionOnMainRoom: IRoom;
+
+		before('Create test team', async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+
+			const members = testUser.username ? [testUser.username] : [];
+			testTeam = await createTeam(credentials, teamName, 0, members);
+			testPrivateTeam = await createTeam(testUserCredentials, `${teamName}private`, 1, []);
+		});
+
+		before('make user owner', async () => {
+			await request
+				.post(api('teams.updateMember'))
+				.set(credentials)
+				.send({
+					teamName: testTeam.name,
+					member: {
+						userId: testUser._id,
+						roles: ['member', 'owner'],
+					},
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200);
+		});
+
+		before('create rooms', async () => {
+			privateRoom = (await createRoom({ type: 'p', name: `test-p-${Date.now()}` })).body.group;
+			privateRoom2 = (await createRoom({ type: 'p', name: `test-p2-${Date.now()}`, credentials: testUserCredentials })).body.group;
+			publicRoom = (await createRoom({ type: 'c', name: `test-c-${Date.now()}` })).body.channel;
+			publicRoom2 = (await createRoom({ type: 'c', name: `test-c2-${Date.now()}` })).body.channel;
+
+			await Promise.all([
+				request
+					.post(api('teams.addRooms'))
+					.set(credentials)
+					.send({
+						rooms: [privateRoom._id, publicRoom._id, publicRoom2._id],
+						teamId: testTeam._id,
+					})
+					.expect(200),
+				request
+					.post(api('teams.addRooms'))
+					.set(testUserCredentials)
+					.send({
+						rooms: [privateRoom2._id],
+						teamId: testTeam._id,
+					})
+					.expect(200),
+			]);
+		});
+
+		before('Create discussions', async () => {
+			discussionOnPrivateRoom = (
+				await request
+					.post(api('rooms.createDiscussion'))
+					.set(credentials)
+					.send({
+						prid: privateRoom._id,
+						t_name: `test-d-${Date.now()}`,
+					})
+			).body.discussion;
+			discussionOnPublicRoom = (
+				await request
+					.post(api('rooms.createDiscussion'))
+					.set(credentials)
+					.send({
+						prid: publicRoom._id,
+						t_name: `test-d-${Date.now()}`,
+					})
+			).body.discussion;
+			discussionOnMainRoom = (
+				await request
+					.post(api('rooms.createDiscussion'))
+					.set(credentials)
+					.send({
+						prid: testTeam.roomId,
+						t_name: `test-d-${Date.now()}`,
+					})
+			).body.discussion;
+		});
+
+		after(async () => {
+			await Promise.all([
+				deleteRoom({ type: 'p', roomId: privateRoom._id }),
+				deleteRoom({ type: 'p', roomId: privateRoom2._id }),
+				deleteRoom({ type: 'c', roomId: publicRoom._id }),
+				deleteRoom({ type: 'c', roomId: publicRoom2._id }),
+				deleteRoom({ type: 'p', roomId: discussionOnPrivateRoom._id }),
+				deleteRoom({ type: 'c', roomId: discussionOnPublicRoom._id }),
+				deleteRoom({ type: 'c', roomId: discussionOnMainRoom._id }),
+				deleteTeam(credentials, teamName),
+				deleteTeam(credentials, testPrivateTeam.name),
+				deleteUser({ _id: testUser._id }),
+			]);
+		});
+
+		it('should fail if user is not logged in', async () => {
+			await request.get(api('teams.listChildren')).expect(401);
+		});
+
+		it('should fail if teamId is not passed as queryparam', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).expect(400);
+		});
+
+		it('should fail if teamId is not valid', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamId: 'invalid' }).expect(404);
+		});
+
+		it('should fail if teamId is empty', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamId: '' }).expect(404);
+		});
+
+		it('should fail if both properties are passed', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamId: testTeam._id, teamName: testTeam.name }).expect(400);
+		});
+
+		it('should fail if teamName is empty', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamName: '' }).expect(404);
+		});
+
+		it('should fail if teamName is invalid', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamName: 'invalid' }).expect(404);
+		});
+
+		it('should fail if roomId is empty', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ roomId: '' }).expect(404);
+		});
+
+		it('should fail if roomId is invalid', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamName: 'invalid' }).expect(404);
+		});
+
+		it('should return a list of valid rooms for user', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamId: testTeam._id }).set(credentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+
+			const mainRoom = res.body.data.find((room: IRoom) => room._id === testTeam.roomId);
+			expect(mainRoom).to.be.an('object');
+
+			const publicChannel1 = res.body.data.find((room: IRoom) => room._id === publicRoom._id);
+			expect(publicChannel1).to.be.an('object');
+
+			const publicChannel2 = res.body.data.find((room: IRoom) => room._id === publicRoom2._id);
+			expect(publicChannel2).to.be.an('object');
+
+			const privateChannel1 = res.body.data.find((room: IRoom) => room._id === privateRoom._id);
+			expect(privateChannel1).to.be.an('object');
+
+			const privateChannel2 = res.body.data.find((room: IRoom) => room._id === privateRoom2._id);
+			expect(privateChannel2).to.be.undefined;
+
+			const discussionOnP = res.body.data.find((room: IRoom) => room._id === discussionOnPrivateRoom._id);
+			expect(discussionOnP).to.be.undefined;
+
+			const discussionOnC = res.body.data.find((room: IRoom) => room._id === discussionOnPublicRoom._id);
+			expect(discussionOnC).to.be.undefined;
+
+			const mainDiscussion = res.body.data.find((room: IRoom) => room._id === discussionOnMainRoom._id);
+			expect(mainDiscussion).to.be.an('object');
+		});
+
+		it('should return a valid list of rooms for non admin member too', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamName: testTeam.name }).set(testUserCredentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+
+			const mainRoom = res.body.data.find((room: IRoom) => room._id === testTeam.roomId);
+			expect(mainRoom).to.be.an('object');
+
+			const publicChannel1 = res.body.data.find((room: IRoom) => room._id === publicRoom._id);
+			expect(publicChannel1).to.be.an('object');
+
+			const publicChannel2 = res.body.data.find((room: IRoom) => room._id === publicRoom2._id);
+			expect(publicChannel2).to.be.an('object');
+
+			const privateChannel1 = res.body.data.find((room: IRoom) => room._id === privateRoom._id);
+			expect(privateChannel1).to.be.undefined;
+
+			const privateChannel2 = res.body.data.find((room: IRoom) => room._id === privateRoom2._id);
+			expect(privateChannel2).to.be.an('object');
+
+			const discussionOnP = res.body.data.find((room: IRoom) => room._id === discussionOnPrivateRoom._id);
+			expect(discussionOnP).to.be.undefined;
+
+			const discussionOnC = res.body.data.find((room: IRoom) => room._id === discussionOnPublicRoom._id);
+			expect(discussionOnC).to.be.undefined;
+
+			const mainDiscussion = res.body.data.find((room: IRoom) => room._id === discussionOnMainRoom._id);
+			expect(mainDiscussion).to.be.an('object');
+		});
+
+		it('should return a valid list of rooms for non admin member too when filtering by teams main room id', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ roomId: testTeam.roomId }).set(testUserCredentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+
+			const mainRoom = res.body.data.find((room: IRoom) => room._id === testTeam.roomId);
+			expect(mainRoom).to.be.an('object');
+
+			const publicChannel1 = res.body.data.find((room: IRoom) => room._id === publicRoom._id);
+			expect(publicChannel1).to.be.an('object');
+
+			const publicChannel2 = res.body.data.find((room: IRoom) => room._id === publicRoom2._id);
+			expect(publicChannel2).to.be.an('object');
+
+			const privateChannel1 = res.body.data.find((room: IRoom) => room._id === privateRoom._id);
+			expect(privateChannel1).to.be.undefined;
+
+			const privateChannel2 = res.body.data.find((room: IRoom) => room._id === privateRoom2._id);
+			expect(privateChannel2).to.be.an('object');
+
+			const discussionOnP = res.body.data.find((room: IRoom) => room._id === discussionOnPrivateRoom._id);
+			expect(discussionOnP).to.be.undefined;
+
+			const discussionOnC = res.body.data.find((room: IRoom) => room._id === discussionOnPublicRoom._id);
+			expect(discussionOnC).to.be.undefined;
+
+			const mainDiscussion = res.body.data.find((room: IRoom) => room._id === discussionOnMainRoom._id);
+			expect(mainDiscussion).to.be.an('object');
+		});
+
+		it('should return a list of rooms filtered by name using the filter parameter', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, filter: 'test-p' })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(1);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data[0]._id).to.be.equal(privateRoom._id);
+			expect(res.body.data.find((room: IRoom) => room._id === privateRoom2._id)).to.be.undefined;
+		});
+
+		it('should paginate results', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, offset: 1, count: 2 })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(2);
+		});
+
+		it('should return only items of type channel', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, type: 'channels' })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(4);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(4);
+			expect(res.body.data.some((room: IRoom) => !!room.prid)).to.be.false;
+		});
+
+		it('should return only items of type discussion', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, type: 'discussions' })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(1);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(1);
+			expect(res.body.data.every((room: IRoom) => !!room.prid)).to.be.true;
+		});
+
+		it('should return both when type is not passed', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamId: testTeam._id }).set(credentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+			expect(res.body.data.some((room: IRoom) => !!room.prid)).to.be.true;
+			expect(res.body.data.some((room: IRoom) => !room.prid)).to.be.true;
+		});
+
+		it('should fail if type is other than channel or discussion', async () => {
+			await request.get(api('teams.listChildren')).query({ teamId: testTeam._id, type: 'other' }).set(credentials).expect(400);
+		});
+
+		it('should properly list children of a private team', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamId: testPrivateTeam._id }).set(testUserCredentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(1);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(1);
+		});
+
+		it('should throw an error when a non member user tries to fetch info for team', async () => {
+			await request.get(api('teams.listChildren')).query({ teamId: testPrivateTeam._id }).set(credentials).expect(400);
+		});
+	});
 });
diff --git a/packages/core-services/src/types/ITeamService.ts b/packages/core-services/src/types/ITeamService.ts
index 3caa6a2e97df..132df89470ca 100644
--- a/packages/core-services/src/types/ITeamService.ts
+++ b/packages/core-services/src/types/ITeamService.ts
@@ -112,7 +112,7 @@ export interface ITeamService {
 	getOneById<P extends Document>(teamId: string, options?: FindOptions<P extends ITeam ? ITeam : P>): Promise<ITeam | P | null>;
 	getOneByName(teamName: string | RegExp, options?: FindOptions<ITeam>): Promise<ITeam | null>;
 	getOneByMainRoomId(teamId: string): Promise<Pick<ITeam, '_id'> | null>;
-	getOneByRoomId(teamId: string): Promise<ITeam | null>;
+	getOneByRoomId(teamId: string, options?: FindOptions<ITeam>): Promise<ITeam | null>;
 	getMatchingTeamRooms(teamId: string, rids: Array<string>): Promise<Array<string>>;
 	autocomplete(uid: string, name: string): Promise<ITeamAutocompleteResult[]>;
 	getAllPublicTeams(options?: FindOptions<ITeam>): Promise<Array<ITeam>>;
@@ -129,4 +129,13 @@ export interface ITeamService {
 	getRoomInfo(
 		room: AtLeast<IRoom, 'teamId' | 'teamMain' | '_id'>,
 	): Promise<{ team?: Pick<ITeam, 'name' | 'roomId' | 'type'>; parentRoom?: Pick<IRoom, 'name' | 'fname' | 't' | '_id'> }>;
+	listChildren(
+		userId: string,
+		team: AtLeast<ITeam, '_id' | 'roomId' | 'type'>,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		sort?: Record<string, 1 | -1>,
+		skip?: number,
+		limit?: number,
+	): Promise<{ total: number; data: IRoom[] }>;
 }
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index 9097a89c1413..91802f836719 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -282,4 +282,12 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	getSubscribedRoomIdsWithoutE2EKeys(uid: IUser['_id']): Promise<IRoom['_id'][]>;
 	removeUsersFromE2EEQueueByRoomId(roomId: IRoom['_id'], uids: IUser['_id'][]): Promise<Document | UpdateResult>;
 	removeUserFromE2EEQueue(uid: IUser['_id']): Promise<Document | UpdateResult>;
+	findChildrenOfTeam(
+		teamId: string,
+		teamRoomId: string,
+		userId: string,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		options?: FindOptions<IRoom>,
+	): AggregationCursor<{ totalCount: { count: number }[]; paginatedResults: IRoom[] }>;
 }
diff --git a/packages/rest-typings/src/v1/teams/TeamsListChildren.ts b/packages/rest-typings/src/v1/teams/TeamsListChildren.ts
new file mode 100644
index 000000000000..41128e18a05f
--- /dev/null
+++ b/packages/rest-typings/src/v1/teams/TeamsListChildren.ts
@@ -0,0 +1,36 @@
+import type { ITeam } from '@rocket.chat/core-typings';
+
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
+import { ajv } from '../Ajv';
+
+type GeneralProps = {
+	filter?: string;
+	type?: 'channels' | 'discussions';
+};
+
+export type TeamsListChildrenProps =
+	| PaginatedRequest<
+			{
+				teamId: ITeam['_id'];
+			} & GeneralProps
+	  >
+	| PaginatedRequest<{ teamName: ITeam['name'] } & GeneralProps>
+	| PaginatedRequest<{ roomId: ITeam['roomId'] } & GeneralProps>;
+
+const TeamsListChildrenPropsSchema = {
+	type: 'object',
+	properties: {
+		teamId: { type: 'string' },
+		teamName: { type: 'string' },
+		type: { type: 'string', enum: ['channels', 'discussions'] },
+		roomId: { type: 'string' },
+		filter: { type: 'string' },
+		offset: { type: 'number' },
+		count: { type: 'number' },
+		sort: { type: 'string' },
+	},
+	additionalProperties: false,
+	oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }, { required: ['roomId'] }],
+};
+
+export const isTeamsListChildrenProps = ajv.compile<TeamsListChildrenProps>(TeamsListChildrenPropsSchema);
diff --git a/packages/rest-typings/src/v1/teams/index.ts b/packages/rest-typings/src/v1/teams/index.ts
index d63e6da8bd8a..a4ae6c7bca0f 100644
--- a/packages/rest-typings/src/v1/teams/index.ts
+++ b/packages/rest-typings/src/v1/teams/index.ts
@@ -6,6 +6,7 @@ import type { TeamsAddMembersProps } from './TeamsAddMembersProps';
 import type { TeamsConvertToChannelProps } from './TeamsConvertToChannelProps';
 import type { TeamsDeleteProps } from './TeamsDeleteProps';
 import type { TeamsLeaveProps } from './TeamsLeaveProps';
+import type { TeamsListChildrenProps } from './TeamsListChildren';
 import type { TeamsRemoveMemberProps } from './TeamsRemoveMemberProps';
 import type { TeamsRemoveRoomProps } from './TeamsRemoveRoomProps';
 import type { TeamsUpdateMemberProps } from './TeamsUpdateMemberProps';
@@ -19,6 +20,7 @@ export * from './TeamsRemoveMemberProps';
 export * from './TeamsRemoveRoomProps';
 export * from './TeamsUpdateMemberProps';
 export * from './TeamsUpdateProps';
+export * from './TeamsListChildren';
 
 type ITeamAutocompleteResult = Pick<IRoom, '_id' | 'fname' | 'teamId' | 'name' | 't' | 'avatarETag'>;
 
@@ -184,4 +186,8 @@ export type TeamsEndpoints = {
 			room: IRoom;
 		};
 	};
+
+	'/v1/teams.listChildren': {
+		GET: (params: TeamsListChildrenProps) => PaginatedResult<{ data: IRoom[] }>;
+	};
 };

From f27092b94d5e4070a4eb74ce49b6b4eec191446e Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 17 Sep 2024 13:30:43 -0600
Subject: [PATCH 088/170] chore: Update typings on callbacks to accept less
 than a full room object (#33305)

---
 apps/meteor/app/lib/server/functions/isTheLastMessage.ts      | 4 ++--
 .../server/services/messages/hooks/BeforeFederationActions.ts | 3 ++-
 apps/meteor/server/services/messages/service.ts               | 4 ++--
 packages/core-services/src/types/IMessageService.ts           | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/isTheLastMessage.ts b/apps/meteor/app/lib/server/functions/isTheLastMessage.ts
index f8e5be94002c..f1f1fb4c1497 100644
--- a/apps/meteor/app/lib/server/functions/isTheLastMessage.ts
+++ b/apps/meteor/app/lib/server/functions/isTheLastMessage.ts
@@ -1,7 +1,7 @@
-import type { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, AtLeast } from '@rocket.chat/core-typings';
 
 import { settings } from '../../../settings/server';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export const isTheLastMessage = (room: IRoom, message: Pick<IMessage, '_id'>) =>
+export const isTheLastMessage = (room: AtLeast<IRoom, 'lastMessage'>, message: Pick<IMessage, '_id'>) =>
 	settings.get('Store_Last_Message') && (!room.lastMessage || room.lastMessage._id === message._id);
diff --git a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
index a954e4899970..19f42626c216 100644
--- a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
+++ b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
@@ -1,9 +1,10 @@
+import type { AtLeast } from '@rocket.chat/core-typings';
 import { type IMessage, type IRoom, isMessageFromMatrixFederation, isRoomFederated } from '@rocket.chat/core-typings';
 
 import { isFederationEnabled, isFederationReady } from '../../federation/utils';
 
 export class FederationActions {
-	public static shouldPerformAction(message: IMessage, room: IRoom): boolean {
+	public static shouldPerformAction(message: IMessage, room: AtLeast<IRoom, 'federated'>): boolean {
 		if (isMessageFromMatrixFederation(message) || isRoomFederated(room)) {
 			return isFederationEnabled() && isFederationReady();
 		}
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index b20b5236b7fe..85afcf394f28 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -1,6 +1,6 @@
 import type { IMessageService } from '@rocket.chat/core-services';
 import { Authorization, ServiceClassInternal } from '@rocket.chat/core-services';
-import { type IMessage, type MessageTypesValues, type IUser, type IRoom, isEditedMessage } from '@rocket.chat/core-typings';
+import { type IMessage, type MessageTypesValues, type IUser, type IRoom, isEditedMessage, type AtLeast } from '@rocket.chat/core-typings';
 import { Messages, Rooms } from '@rocket.chat/models';
 
 import { deleteMessage } from '../../../app/lib/server/functions/deleteMessage';
@@ -244,7 +244,7 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 	// 	await Room.join({ room, user });
 	// }
 
-	async beforeReacted(message: IMessage, room: IRoom) {
+	async beforeReacted(message: IMessage, room: AtLeast<IRoom, 'federated'>) {
 		if (!FederationActions.shouldPerformAction(message, room)) {
 			throw new FederationMatrixInvalidConfigurationError('Unable to react to message');
 		}
diff --git a/packages/core-services/src/types/IMessageService.ts b/packages/core-services/src/types/IMessageService.ts
index ca84f78ea677..29da139ef63c 100644
--- a/packages/core-services/src/types/IMessageService.ts
+++ b/packages/core-services/src/types/IMessageService.ts
@@ -1,4 +1,4 @@
-import type { IMessage, MessageTypesValues, IUser, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, MessageTypesValues, IUser, IRoom, AtLeast } from '@rocket.chat/core-typings';
 
 export interface IMessageService {
 	sendMessage({ fromId, rid, msg }: { fromId: string; rid: string; msg: string }): Promise<IMessage>;
@@ -21,6 +21,6 @@ export interface IMessageService {
 	deleteMessage(user: IUser, message: IMessage): Promise<void>;
 	updateMessage(message: IMessage, user: IUser, originalMsg?: IMessage): Promise<void>;
 	reactToMessage(userId: string, reaction: string, messageId: IMessage['_id'], shouldReact?: boolean): Promise<void>;
-	beforeReacted(message: IMessage, room: IRoom): Promise<void>;
+	beforeReacted(message: IMessage, room: AtLeast<IRoom, 'federated'>): Promise<void>;
 	beforeDelete(message: IMessage, room: IRoom): Promise<void>;
 }

From 4202d6570cfa870cd196a5b10bc29041fbff50eb Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Tue, 17 Sep 2024 17:56:33 -0300
Subject: [PATCH 089/170] fix: resolve avatar download issue on setUsername by
 refining service selection logic (#33193)

---
 .changeset/small-crabs-travel.md              |   5 +
 .../app/lib/server/functions/setUsername.ts   |  23 +-
 .../lib/server/functions/setUsername.spec.ts  | 271 ++++++++++++++++++
 3 files changed, 287 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/small-crabs-travel.md
 create mode 100644 apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts

diff --git a/.changeset/small-crabs-travel.md b/.changeset/small-crabs-travel.md
new file mode 100644
index 000000000000..201494a5b70f
--- /dev/null
+++ b/.changeset/small-crabs-travel.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
diff --git a/apps/meteor/app/lib/server/functions/setUsername.ts b/apps/meteor/app/lib/server/functions/setUsername.ts
index 5b2b1923da75..c4d2c47c6d9d 100644
--- a/apps/meteor/app/lib/server/functions/setUsername.ts
+++ b/apps/meteor/app/lib/server/functions/setUsername.ts
@@ -102,23 +102,22 @@ export const _setUsername = async function (userId: string, u: string, fullUser:
 	// Set new username*
 	await Users.setUsername(user._id, username);
 	user.username = username;
+
 	if (!previousUsername && settings.get('Accounts_SetDefaultAvatar') === true) {
-		// eslint-disable-next-line @typescript-eslint/ban-types
-		const avatarSuggestions = (await getAvatarSuggestionForUser(user)) as {};
-		let gravatar;
-		for await (const service of Object.keys(avatarSuggestions)) {
-			const avatarData = avatarSuggestions[+service as keyof typeof avatarSuggestions];
+		const avatarSuggestions = await getAvatarSuggestionForUser(user);
+		let avatarData;
+		let serviceName = 'gravatar';
+
+		for (const service of Object.keys(avatarSuggestions)) {
+			avatarData = avatarSuggestions[service];
 			if (service !== 'gravatar') {
-				// eslint-disable-next-line dot-notation
-				await setUserAvatar(user, avatarData['blob'], avatarData['contentType'], service);
-				gravatar = null;
+				serviceName = service;
 				break;
 			}
-			gravatar = avatarData;
 		}
-		if (gravatar != null) {
-			// eslint-disable-next-line dot-notation
-			await setUserAvatar(user, gravatar['blob'], gravatar['contentType'], 'gravatar');
+
+		if (avatarData) {
+			await setUserAvatar(user, avatarData.blob, avatarData.contentType, serviceName);
 		}
 	}
 
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts b/apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts
new file mode 100644
index 000000000000..c6b6f9a26fae
--- /dev/null
+++ b/apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts
@@ -0,0 +1,271 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+describe('setUsername', () => {
+	const userId = 'userId';
+	const username = 'validUsername';
+
+	const stubs = {
+		Users: {
+			findOneById: sinon.stub(),
+			setUsername: sinon.stub(),
+		},
+		Accounts: {
+			sendEnrollmentEmail: sinon.stub(),
+		},
+		settings: {
+			get: sinon.stub(),
+		},
+		api: {
+			broadcast: sinon.stub(),
+		},
+		Invites: {
+			findOneById: sinon.stub(),
+		},
+		callbacks: {
+			run: sinon.stub(),
+		},
+		checkUsernameAvailability: sinon.stub(),
+		validateUsername: sinon.stub(),
+		saveUserIdentity: sinon.stub(),
+		joinDefaultChannels: sinon.stub(),
+		getAvatarSuggestionForUser: sinon.stub(),
+		setUserAvatar: sinon.stub(),
+		addUserToRoom: sinon.stub(),
+		notifyOnUserChange: sinon.stub(),
+		RateLimiter: {
+			limitFunction: sinon.stub(),
+		},
+		underscore: {
+			escape: sinon.stub(),
+		},
+		SystemLogger: sinon.stub(),
+	};
+
+	const { setUsernameWithValidation, _setUsername } = proxyquire
+		.noCallThru()
+		.load('../../../../../../app/lib/server/functions/setUsername', {
+			'meteor/meteor': { Meteor: { Error } },
+			'@rocket.chat/core-services': { api: stubs.api },
+			'@rocket.chat/models': { Users: stubs.Users, Invites: stubs.Invites },
+			'meteor/accounts-base': { Accounts: stubs.Accounts },
+			'underscore': stubs.underscore,
+			'../../../settings/server': { settings: stubs.settings },
+			'../lib': { notifyOnUserChange: stubs.notifyOnUserChange, RateLimiter: stubs.RateLimiter },
+			'./addUserToRoom': { addUserToRoom: stubs.addUserToRoom },
+			'./checkUsernameAvailability': { checkUsernameAvailability: stubs.checkUsernameAvailability },
+			'./getAvatarSuggestionForUser': { getAvatarSuggestionForUser: stubs.getAvatarSuggestionForUser },
+			'./joinDefaultChannels': { joinDefaultChannels: stubs.joinDefaultChannels },
+			'./saveUserIdentity': { saveUserIdentity: stubs.saveUserIdentity },
+			'./setUserAvatar': { setUserAvatar: stubs.setUserAvatar },
+			'./validateUsername': { validateUsername: stubs.validateUsername },
+			'../../../../lib/callbacks': { callbacks: stubs.callbacks },
+			'../../../../server/lib/logger/system': { SystemLogger: stubs.SystemLogger },
+		});
+
+	afterEach(() => {
+		stubs.Users.findOneById.reset();
+		stubs.Users.setUsername.reset();
+		stubs.Accounts.sendEnrollmentEmail.reset();
+		stubs.settings.get.reset();
+		stubs.api.broadcast.reset();
+		stubs.Invites.findOneById.reset();
+		stubs.callbacks.run.reset();
+		stubs.checkUsernameAvailability.reset();
+		stubs.validateUsername.reset();
+		stubs.saveUserIdentity.reset();
+		stubs.joinDefaultChannels.reset();
+		stubs.getAvatarSuggestionForUser.reset();
+		stubs.setUserAvatar.reset();
+		stubs.addUserToRoom.reset();
+		stubs.notifyOnUserChange.reset();
+		stubs.RateLimiter.limitFunction.reset();
+		stubs.underscore.escape.reset();
+		stubs.SystemLogger.reset();
+	});
+
+	describe('setUsernameWithValidation', () => {
+		it('should throw an error if username is invalid', async () => {
+			try {
+				await setUsernameWithValidation(userId, '');
+			} catch (error: any) {
+				expect(error.message).to.equal('error-invalid-username');
+			}
+		});
+
+		it('should throw an error if user is not found', async () => {
+			stubs.Users.findOneById.withArgs(userId).returns(null);
+
+			try {
+				await setUsernameWithValidation(userId, username);
+			} catch (error: any) {
+				expect(stubs.Users.findOneById.calledOnce).to.be.true;
+				expect(error.message).to.equal('error-invalid-user');
+			}
+		});
+
+		it('should throw an error if username change is not allowed', async () => {
+			stubs.Users.findOneById.resolves({ username: 'oldUsername' });
+			stubs.settings.get.withArgs('Accounts_AllowUsernameChange').returns(false);
+
+			try {
+				await setUsernameWithValidation(userId, username);
+			} catch (error: any) {
+				expect(stubs.settings.get.calledOnce).to.be.true;
+				expect(error.message).to.equal('error-not-allowed');
+			}
+		});
+
+		it('should throw an error if username is not valid', async () => {
+			stubs.Users.findOneById.resolves({ username: null });
+			stubs.validateUsername.returns(false);
+
+			try {
+				await setUsernameWithValidation(userId, 'invalid-username');
+			} catch (error: any) {
+				expect(stubs.validateUsername.calledOnce).to.be.true;
+				expect(error.message).to.equal('username-invalid');
+			}
+		});
+
+		it('should throw an error if username is already in use', async () => {
+			stubs.Users.findOneById.resolves({ username: null });
+			stubs.validateUsername.returns(true);
+			stubs.checkUsernameAvailability.resolves(false);
+
+			try {
+				await setUsernameWithValidation(userId, 'existingUsername');
+			} catch (error: any) {
+				expect(stubs.checkUsernameAvailability.calledOnce).to.be.true;
+				expect(error.message).to.equal('error-field-unavailable');
+			}
+		});
+
+		it('should save the user identity when valid username is set', async () => {
+			stubs.Users.findOneById.resolves({ _id: userId, username: null });
+			stubs.settings.get.withArgs('Accounts_AllowUsernameChange').returns(true);
+			stubs.validateUsername.returns(true);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.saveUserIdentity.resolves(true);
+
+			await setUsernameWithValidation(userId, 'newUsername');
+
+			expect(stubs.saveUserIdentity.calledOnce).to.be.true;
+			expect(stubs.joinDefaultChannels.calledOnceWith(userId, undefined)).to.be.true;
+		});
+	});
+
+	describe('_setUsername', () => {
+		it('should return false if userId or username is missing', async () => {
+			const result = await _setUsername(null, '', {});
+			expect(result).to.be.false;
+		});
+
+		it('should return false if username is invalid', async () => {
+			stubs.validateUsername.returns(false);
+
+			const result = await _setUsername(userId, 'invalid-username', {});
+			expect(result).to.be.false;
+		});
+
+		it('should return user if username is already set', async () => {
+			stubs.validateUsername.returns(true);
+			const mockUser = { username };
+
+			const result = await _setUsername(userId, username, mockUser);
+			expect(result).to.equal(mockUser);
+		});
+
+		it('should set username when user has no previous username', async () => {
+			const mockUser = { _id: userId, emails: [{ address: 'test@example.com' }] };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.Users.setUsername.calledOnceWith(userId, username));
+			expect(stubs.checkUsernameAvailability.calledOnceWith(username));
+			expect(stubs.api.broadcast.calledOnceWith('user.autoupdate', { user: mockUser }));
+		});
+
+		it('should set username when user has and old that is different from new', async () => {
+			const mockUser = { _id: userId, username: 'oldUsername', emails: [{ address: 'test@example.com' }] };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.Users.setUsername.calledOnceWith(userId, username));
+			expect(stubs.checkUsernameAvailability.calledOnceWith(username));
+			expect(stubs.api.broadcast.calledOnceWith('user.autoupdate', { user: mockUser }));
+		});
+
+		it('should set username when user has and old that is different from new', async () => {
+			const mockUser = { _id: userId, username: 'oldUsername', emails: [{ address: 'test@example.com' }] };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.Users.setUsername.calledOnceWith(userId, username));
+			expect(stubs.checkUsernameAvailability.calledOnceWith(username));
+			expect(stubs.api.broadcast.calledOnceWith('user.autoupdate', { user: mockUser }));
+		});
+
+		it('should set avatar if Accounts_SetDefaultAvatar is enabled', async () => {
+			const mockUser = { _id: userId, username: null };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(true);
+			stubs.getAvatarSuggestionForUser.resolves({ gravatar: { blob: 'blobData', contentType: 'image/png' } });
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.setUserAvatar.calledOnceWith(mockUser, 'blobData', 'image/png', 'gravatar')).to.be.true;
+		});
+
+		it('should not set avatar if Accounts_SetDefaultAvatar is disabled', async () => {
+			const mockUser = { _id: userId, username: null };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(false);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.setUserAvatar.called).to.be.false;
+		});
+
+		it('should not set avatar if no avatar suggestions are available', async () => {
+			const mockUser = { _id: userId, username: null };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(true);
+			stubs.getAvatarSuggestionForUser.resolves({});
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.setUserAvatar.called).to.be.false;
+		});
+
+		it('should add user to room if inviteToken is present', async () => {
+			const mockUser = { _id: userId, username: null, inviteToken: 'invite token' };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(true);
+			stubs.getAvatarSuggestionForUser.resolves({ gravatar: { blob: 'blobData', contentType: 'image/png' } });
+			stubs.Invites.findOneById.resolves({ rid: 'room id' });
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.addUserToRoom.calledOnceWith('room id', mockUser)).to.be.true;
+		});
+	});
+});

From 9a38c8e13f925d88ece6955333773bce45ba7536 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:31:32 -0300
Subject: [PATCH 090/170] feat: Allow managing association to business units on
 departments' creation and update (#32682)

---
 .changeset/dirty-stingrays-beg.md             |   7 +
 .../imports/server/rest/departments.ts        |  15 +-
 .../app/livechat/server/lib/LivechatTyped.ts  |  25 +-
 .../livechat/server/methods/saveDepartment.ts |   5 +-
 .../livechat-enterprise/server/hooks/index.ts |   1 +
 .../server/hooks/manageDepartmentUnit.ts      |  53 ++
 .../ee/server/models/raw/LivechatUnit.ts      |  29 +-
 .../server/hooks/manageDepartmentUnit.spec.ts | 183 ++++++
 apps/meteor/lib/callbacks.ts                  |   2 +
 .../server/models/raw/LivechatDepartment.ts   |  12 +
 apps/meteor/tests/data/livechat/department.ts |  40 +-
 apps/meteor/tests/data/livechat/rooms.ts      |  47 +-
 apps/meteor/tests/data/livechat/units.ts      |  38 +-
 .../tests/end-to-end/api/livechat/14-units.ts | 556 +++++++++++++++++-
 .../core-typings/src/ILivechatDepartment.ts   |   1 +
 .../src/models/ILivechatDepartmentModel.ts    |   3 +
 .../src/models/ILivechatUnitModel.ts          |   2 +
 packages/rest-typings/src/v1/omnichannel.ts   |  12 +-
 18 files changed, 982 insertions(+), 49 deletions(-)
 create mode 100644 .changeset/dirty-stingrays-beg.md
 create mode 100644 apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts
 create mode 100644 apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts

diff --git a/.changeset/dirty-stingrays-beg.md b/.changeset/dirty-stingrays-beg.md
new file mode 100644
index 000000000000..cf5e3a4ca839
--- /dev/null
+++ b/.changeset/dirty-stingrays-beg.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/model-typings": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Added support for specifying a unit on departments' creation and update
diff --git a/apps/meteor/app/livechat/imports/server/rest/departments.ts b/apps/meteor/app/livechat/imports/server/rest/departments.ts
index 252a83855700..e56feeac2fa3 100644
--- a/apps/meteor/app/livechat/imports/server/rest/departments.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/departments.ts
@@ -57,10 +57,18 @@ API.v1.addRoute(
 			check(this.bodyParams, {
 				department: Object,
 				agents: Match.Maybe(Array),
+				departmentUnit: Match.Maybe({ _id: Match.Optional(String) }),
 			});
 
 			const agents = this.bodyParams.agents ? { upsert: this.bodyParams.agents } : {};
-			const department = await LivechatTs.saveDepartment(null, this.bodyParams.department as ILivechatDepartment, agents);
+			const { departmentUnit } = this.bodyParams;
+			const department = await LivechatTs.saveDepartment(
+				this.userId,
+				null,
+				this.bodyParams.department as ILivechatDepartment,
+				agents,
+				departmentUnit || {},
+			);
 
 			if (department) {
 				return API.v1.success({
@@ -112,17 +120,18 @@ API.v1.addRoute(
 			check(this.bodyParams, {
 				department: Object,
 				agents: Match.Maybe(Array),
+				departmentUnit: Match.Maybe({ _id: Match.Optional(String) }),
 			});
 
 			const { _id } = this.urlParams;
-			const { department, agents } = this.bodyParams;
+			const { department, agents, departmentUnit } = this.bodyParams;
 
 			if (!permissionToSave) {
 				throw new Error('error-not-allowed');
 			}
 
 			const agentParam = permissionToAddAgents && agents ? { upsert: agents } : {};
-			await LivechatTs.saveDepartment(_id, department, agentParam);
+			await LivechatTs.saveDepartment(this.userId, _id, department, agentParam, departmentUnit || {});
 
 			return API.v1.success({
 				department: await LivechatDepartment.findOneById(_id),
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 89d125033977..ade6726336ec 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -1789,18 +1789,37 @@ class LivechatClass {
 	 * @param {string|null} _id - The department id
 	 * @param {Partial<import('@rocket.chat/core-typings').ILivechatDepartment>} departmentData
 	 * @param {{upsert?: { agentId: string; count?: number; order?: number; }[], remove?: { agentId: string; count?: number; order?: number; }}} [departmentAgents] - The department agents
+	 * @param {{_id?: string}} [departmentUnit] - The department's unit id
 	 */
 	async saveDepartment(
+		userId: string,
 		_id: string | null,
 		departmentData: LivechatDepartmentDTO,
 		departmentAgents?: {
 			upsert?: { agentId: string; count?: number; order?: number }[];
 			remove?: { agentId: string; count?: number; order?: number };
 		},
+		departmentUnit?: { _id?: string },
 	) {
 		check(_id, Match.Maybe(String));
+		if (departmentUnit?._id !== undefined && typeof departmentUnit._id !== 'string') {
+			throw new Meteor.Error('error-invalid-department-unit', 'Invalid department unit id provided', {
+				method: 'livechat:saveDepartment',
+			});
+		}
 
-		const department = _id ? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1 } }) : null;
+		const department = _id
+			? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1, parentId: 1 } })
+			: null;
+
+		if (departmentUnit && !departmentUnit._id && department && department.parentId) {
+			const isLastDepartmentInUnit = (await LivechatDepartment.countDepartmentsInUnit(department.parentId)) === 1;
+			if (isLastDepartmentInUnit) {
+				throw new Meteor.Error('error-unit-cant-be-empty', "The last department in a unit can't be removed", {
+					method: 'livechat:saveDepartment',
+				});
+			}
+		}
 
 		if (!department && !(await isDepartmentCreationAvailable())) {
 			throw new Meteor.Error('error-max-departments-number-reached', 'Maximum number of departments reached', {
@@ -1887,6 +1906,10 @@ class LivechatClass {
 			await callbacks.run('livechat.afterDepartmentDisabled', departmentDB);
 		}
 
+		if (departmentUnit) {
+			await callbacks.run('livechat.manageDepartmentUnit', { userId, departmentId: departmentDB._id, unitId: departmentUnit._id });
+		}
+
 		return departmentDB;
 	}
 }
diff --git a/apps/meteor/app/livechat/server/methods/saveDepartment.ts b/apps/meteor/app/livechat/server/methods/saveDepartment.ts
index b4833523ab3f..659f85f49945 100644
--- a/apps/meteor/app/livechat/server/methods/saveDepartment.ts
+++ b/apps/meteor/app/livechat/server/methods/saveDepartment.ts
@@ -30,12 +30,13 @@ declare module '@rocket.chat/ddp-client' {
 						order?: number | undefined;
 				  }[]
 				| undefined,
+			departmentUnit?: { _id?: string },
 		) => ILivechatDepartment;
 	}
 }
 
 Meteor.methods<ServerMethods>({
-	async 'livechat:saveDepartment'(_id, departmentData, departmentAgents) {
+	async 'livechat:saveDepartment'(_id, departmentData, departmentAgents, departmentUnit) {
 		const uid = Meteor.userId();
 		if (!uid || !(await hasPermissionAsync(uid, 'manage-livechat-departments'))) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
@@ -43,6 +44,6 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		return Livechat.saveDepartment(_id, departmentData, { upsert: departmentAgents });
+		return Livechat.saveDepartment(uid, _id, departmentData, { upsert: departmentAgents }, departmentUnit);
 	},
 });
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
index c5bf0a5aa392..a4b66087be2e 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
@@ -26,3 +26,4 @@ import './afterInquiryQueued';
 import './sendPdfTranscriptOnClose';
 import './applyRoomRestrictions';
 import './afterTagRemoved';
+import './manageDepartmentUnit';
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts
new file mode 100644
index 000000000000..7de7ef0d6bf6
--- /dev/null
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts
@@ -0,0 +1,53 @@
+import type { ILivechatDepartment, IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
+import { LivechatDepartment, LivechatUnit } from '@rocket.chat/models';
+
+import { hasAnyRoleAsync } from '../../../../../app/authorization/server/functions/hasRole';
+import { callbacks } from '../../../../../lib/callbacks';
+import { getUnitsFromUser } from '../methods/getUnitsFromUserRoles';
+
+export const manageDepartmentUnit = async ({ userId, departmentId, unitId }: { userId: string; departmentId: string; unitId: string }) => {
+	const accessibleUnits = await getUnitsFromUser(userId);
+	const isLivechatManager = await hasAnyRoleAsync(userId, ['admin', 'livechat-manager']);
+	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'ancestors' | 'parentId'>>(departmentId, {
+		projection: { ancestors: 1, parentId: 1 },
+	});
+
+	const isDepartmentAlreadyInUnit = unitId && department?.ancestors?.includes(unitId);
+	if (!department || isDepartmentAlreadyInUnit) {
+		return;
+	}
+
+	const currentDepartmentUnitId = department.parentId;
+	const canManageNewUnit = !unitId || isLivechatManager || (Array.isArray(accessibleUnits) && accessibleUnits.includes(unitId));
+	const canManageCurrentUnit =
+		!currentDepartmentUnitId || isLivechatManager || (Array.isArray(accessibleUnits) && accessibleUnits.includes(currentDepartmentUnitId));
+	if (!canManageNewUnit || !canManageCurrentUnit) {
+		return;
+	}
+
+	if (unitId) {
+		const unit = await LivechatUnit.findOneById<Pick<IOmnichannelBusinessUnit, '_id' | 'ancestors'>>(unitId, {
+			projection: { ancestors: 1 },
+		});
+
+		if (!unit) {
+			return;
+		}
+
+		if (currentDepartmentUnitId) {
+			await LivechatUnit.decrementDepartmentsCount(currentDepartmentUnitId);
+		}
+
+		await LivechatDepartment.addDepartmentToUnit(departmentId, unitId, [unitId, ...(unit.ancestors || [])]);
+		await LivechatUnit.incrementDepartmentsCount(unitId);
+		return;
+	}
+
+	if (currentDepartmentUnitId) {
+		await LivechatUnit.decrementDepartmentsCount(currentDepartmentUnitId);
+	}
+
+	await LivechatDepartment.removeDepartmentFromUnit(departmentId);
+};
+
+callbacks.add('livechat.manageDepartmentUnit', manageDepartmentUnit, callbacks.priority.HIGH, 'livechat-manage-department-unit');
diff --git a/apps/meteor/ee/server/models/raw/LivechatUnit.ts b/apps/meteor/ee/server/models/raw/LivechatUnit.ts
index fcabf12fa4f8..c198ee04fbb0 100644
--- a/apps/meteor/ee/server/models/raw/LivechatUnit.ts
+++ b/apps/meteor/ee/server/models/raw/LivechatUnit.ts
@@ -11,7 +11,6 @@ const addQueryRestrictions = async (originalQuery: Filter<IOmnichannelBusinessUn
 
 	const units = await getUnitsFromUser();
 	if (Array.isArray(units)) {
-		query.ancestors = { $in: units };
 		const expressions = query.$and || [];
 		const condition = { $or: [{ ancestors: { $in: units } }, { _id: { $in: units } }] };
 		query.$and = [condition, ...expressions];
@@ -109,28 +108,12 @@ export class LivechatUnitRaw extends BaseRaw<IOmnichannelBusinessUnit> implement
 		// remove other departments
 		for await (const departmentId of savedDepartments) {
 			if (!departmentsToSave.includes(departmentId)) {
-				await LivechatDepartment.updateOne(
-					{ _id: departmentId },
-					{
-						$set: {
-							parentId: null,
-							ancestors: null,
-						},
-					},
-				);
+				await LivechatDepartment.removeDepartmentFromUnit(departmentId);
 			}
 		}
 
 		for await (const departmentId of departmentsToSave) {
-			await LivechatDepartment.updateOne(
-				{ _id: departmentId },
-				{
-					$set: {
-						parentId: _id,
-						ancestors,
-					},
-				},
-			);
+			await LivechatDepartment.addDepartmentToUnit(departmentId, _id, ancestors);
 		}
 
 		await LivechatRooms.associateRoomsWithDepartmentToUnit(departmentsToSave, _id);
@@ -154,6 +137,14 @@ export class LivechatUnitRaw extends BaseRaw<IOmnichannelBusinessUnit> implement
 		return this.updateMany(query, update);
 	}
 
+	incrementDepartmentsCount(_id: string): Promise<UpdateResult | Document> {
+		return this.updateOne({ _id }, { $inc: { numDepartments: 1 } });
+	}
+
+	decrementDepartmentsCount(_id: string): Promise<UpdateResult | Document> {
+		return this.updateOne({ _id }, { $inc: { numDepartments: -1 } });
+	}
+
 	async removeById(_id: string): Promise<DeleteResult> {
 		await LivechatUnitMonitors.removeByUnitId(_id);
 		await this.removeParentAndAncestorById(_id);
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts
new file mode 100644
index 000000000000..8fbf0dcf97a2
--- /dev/null
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts
@@ -0,0 +1,183 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const livechatDepartmentStub = {
+	findOneById: sinon.stub(),
+	addDepartmentToUnit: sinon.stub(),
+	removeDepartmentFromUnit: sinon.stub(),
+};
+
+const livechatUnitStub = {
+	findOneById: sinon.stub(),
+	decrementDepartmentsCount: sinon.stub(),
+	incrementDepartmentsCount: sinon.stub(),
+};
+
+const hasAnyRoleStub = sinon.stub();
+const getUnitsFromUserStub = sinon.stub();
+
+const { manageDepartmentUnit } = proxyquire
+	.noCallThru()
+	.load('../../../../../../app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts', {
+		'../methods/getUnitsFromUserRoles': {
+			getUnitsFromUser: getUnitsFromUserStub,
+		},
+		'../../../../../app/authorization/server/functions/hasRole': {
+			hasAnyRoleAsync: hasAnyRoleStub,
+		},
+		'@rocket.chat/models': {
+			LivechatDepartment: livechatDepartmentStub,
+			LivechatUnit: livechatUnitStub,
+		},
+	});
+
+describe('hooks/manageDepartmentUnit', () => {
+	beforeEach(() => {
+		livechatDepartmentStub.findOneById.reset();
+		livechatDepartmentStub.addDepartmentToUnit.reset();
+		livechatDepartmentStub.removeDepartmentFromUnit.reset();
+		livechatUnitStub.findOneById.reset();
+		livechatUnitStub.decrementDepartmentsCount.reset();
+		livechatUnitStub.incrementDepartmentsCount.reset();
+		hasAnyRoleStub.reset();
+	});
+
+	it('should not perform any operation when an invalid department is provided', async () => {
+		livechatDepartmentStub.findOneById.resolves(null);
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should not perform any operation if the provided department is already in unit', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it("should not perform any operation if user is a monitor and can't manage new unit", async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it("should not perform any operation if user is a monitor and can't manage current unit", async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['new-unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should not perform any operation if user is an admin/manager but an invalid unit is provided', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		livechatUnitStub.findOneById.resolves(undefined);
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should remove department from its current unit if user is an admin/manager', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: undefined });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.calledOnceWith('department-id')).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+
+	it('should add department to a unit if user is an admin/manager', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'unit-id', ['unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should move department to a new unit if user is an admin/manager', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'new-unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'new-unit-id', ['new-unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('new-unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+
+	it('should remove department from its current unit if user is a monitor that supervises the current unit', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: undefined });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.calledOnceWith('department-id')).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+
+	it('should add department to a unit if user is a monitor that supervises the new unit', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'unit-id', ['unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should move department to a new unit if user is a monitor that supervises the current and new units', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id', 'new-unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'new-unit-id', ['new-unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('new-unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+});
diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
index 7eaa9ed7595d..57b8527d5008 100644
--- a/apps/meteor/lib/callbacks.ts
+++ b/apps/meteor/lib/callbacks.ts
@@ -225,6 +225,7 @@ type ChainedCallbackSignatures = {
 	'unarchiveRoom': (room: IRoom) => void;
 	'roomAvatarChanged': (room: IRoom) => void;
 	'beforeGetMentions': (mentionIds: string[], teamMentions: MessageMention[]) => Promise<string[]>;
+	'livechat.manageDepartmentUnit': (params: { userId: string; departmentId: string; unitId?: string }) => void;
 };
 
 export type Hook =
@@ -247,6 +248,7 @@ export type Hook =
 	| 'livechat.offlineMessage'
 	| 'livechat.onCheckRoomApiParams'
 	| 'livechat.onLoadConfigApi'
+	| 'livechat.manageDepartmentUnit'
 	| 'loginPageStateChange'
 	| 'mapLDAPUserData'
 	| 'onCreateUser'
diff --git a/apps/meteor/server/models/raw/LivechatDepartment.ts b/apps/meteor/server/models/raw/LivechatDepartment.ts
index b8263af030a8..9ecee34df5e9 100644
--- a/apps/meteor/server/models/raw/LivechatDepartment.ts
+++ b/apps/meteor/server/models/raw/LivechatDepartment.ts
@@ -222,6 +222,14 @@ export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implemen
 		return this.updateOne({ _id }, { $set: { archived: true, enabled: false } });
 	}
 
+	addDepartmentToUnit(_id: string, unitId: string, ancestors: string[]): Promise<Document | UpdateResult> {
+		return this.updateOne({ _id }, { $set: { parentId: unitId, ancestors } });
+	}
+
+	removeDepartmentFromUnit(_id: string): Promise<Document | UpdateResult> {
+		return this.updateOne({ _id }, { $set: { parentId: null, ancestors: null } });
+	}
+
 	async createOrUpdateDepartment(
 		_id: string | null,
 		data: {
@@ -328,6 +336,10 @@ export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implemen
 		return this.find(query, options);
 	}
 
+	countDepartmentsInUnit(unitId: string): Promise<number> {
+		return this.countDocuments({ parentId: unitId });
+	}
+
 	findActiveByUnitIds(unitIds: string[], options: FindOptions<ILivechatDepartment> = {}): FindCursor<ILivechatDepartment> {
 		const query = {
 			enabled: true,
diff --git a/apps/meteor/tests/data/livechat/department.ts b/apps/meteor/tests/data/livechat/department.ts
index 72ab0af9f267..d7f22fca970b 100644
--- a/apps/meteor/tests/data/livechat/department.ts
+++ b/apps/meteor/tests/data/livechat/department.ts
@@ -42,36 +42,44 @@ const updateDepartment = async (departmentId: string, departmentData: Partial<Li
 	return response.body.department;
 };
 
-const createDepartmentWithMethod = (
-	initialAgents: { agentId: string; username: string }[] = [],
-	{
-		allowReceiveForwardOffline = false,
-		fallbackForwardDepartment,
-	}: {
-		allowReceiveForwardOffline?: boolean;
-		fallbackForwardDepartment?: string;
-	} = {},
-) =>
+export const createDepartmentWithMethod = ({
+	initialAgents = [],
+	allowReceiveForwardOffline = false,
+	fallbackForwardDepartment,
+	name,
+	departmentUnit,
+	userCredentials = credentials,
+	departmentId = '',
+}: {
+	initialAgents?: { agentId: string; username: string }[];
+	allowReceiveForwardOffline?: boolean;
+	fallbackForwardDepartment?: string;
+	name?: string;
+	departmentUnit?: { _id?: string };
+	userCredentials?: Credentials;
+	departmentId?: string;
+} = {}): Promise<ILivechatDepartment> =>
 	new Promise((resolve, reject) => {
 		void request
 			.post(methodCall('livechat:saveDepartment'))
-			.set(credentials)
+			.set(userCredentials)
 			.send({
 				message: JSON.stringify({
 					method: 'livechat:saveDepartment',
 					params: [
-						'',
+						departmentId,
 						{
 							enabled: true,
 							email: faker.internet.email(),
 							showOnRegistration: true,
 							showOnOfflineForm: true,
-							name: `new department ${Date.now()}`,
+							name: name || `new department ${Date.now()}`,
 							description: 'created from api',
 							allowReceiveForwardOffline,
 							fallbackForwardDepartment,
 						},
 						initialAgents,
+						departmentUnit,
 					],
 					id: 'id',
 					msg: 'method',
@@ -93,7 +101,7 @@ type OnlineAgent = {
 export const createDepartmentWithAnOnlineAgent = async (): Promise<{ department: ILivechatDepartment; agent: OnlineAgent }> => {
 	const { user, credentials } = await createAnOnlineAgent();
 
-	const department = (await createDepartmentWithMethod()) as ILivechatDepartment;
+	const department = await createDepartmentWithMethod();
 
 	await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true);
 
@@ -108,7 +116,7 @@ export const createDepartmentWithAnOnlineAgent = async (): Promise<{ department:
 
 export const createDepartmentWithAgent = async (agent: OnlineAgent): Promise<{ department: ILivechatDepartment; agent: OnlineAgent }> => {
 	const { user, credentials } = agent;
-	const department = (await createDepartmentWithMethod()) as ILivechatDepartment;
+	const department = await createDepartmentWithMethod();
 
 	await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true);
 
@@ -153,7 +161,7 @@ export const createDepartmentWithAnOfflineAgent = async ({
 }> => {
 	const { user, credentials } = await createAnOfflineAgent();
 
-	const department = (await createDepartmentWithMethod(undefined, {
+	const department = (await createDepartmentWithMethod({
 		allowReceiveForwardOffline,
 		fallbackForwardDepartment,
 	})) as ILivechatDepartment;
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index b5d89762c614..46e5cbe489a9 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -98,11 +98,55 @@ export const createDepartment = (
 	name?: string,
 	enabled = true,
 	opts: Record<string, any> = {},
+	departmentUnit?: { _id?: string },
+	userCredentials: Credentials = credentials,
 ): Promise<ILivechatDepartment> => {
 	return new Promise((resolve, reject) => {
 		void request
 			.post(api('livechat/department'))
-			.set(credentials)
+			.set(userCredentials)
+			.send({
+				department: {
+					name: name || `Department ${Date.now()}`,
+					enabled,
+					showOnOfflineForm: true,
+					showOnRegistration: true,
+					email: 'a@b.com',
+					...opts,
+				},
+				agents,
+				departmentUnit,
+			})
+			.end((err: Error, res: DummyResponse<ILivechatDepartment>) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(res.body.department);
+			});
+	});
+};
+
+export const updateDepartment = ({
+	departmentId,
+	userCredentials,
+	agents,
+	name,
+	enabled = true,
+	opts = {},
+	departmentUnit,
+}: {
+	departmentId: string;
+	userCredentials: Credentials;
+	agents?: { agentId: string }[];
+	name?: string;
+	enabled?: boolean;
+	opts?: Record<string, any>;
+	departmentUnit?: { _id?: string };
+}): Promise<ILivechatDepartment> => {
+	return new Promise((resolve, reject) => {
+		void request
+			.put(api(`livechat/department/${departmentId}`))
+			.set(userCredentials)
 			.send({
 				department: {
 					name: name || `Department ${Date.now()}`,
@@ -113,6 +157,7 @@ export const createDepartment = (
 					...opts,
 				},
 				agents,
+				departmentUnit,
 			})
 			.end((err: Error, res: DummyResponse<ILivechatDepartment>) => {
 				if (err) {
diff --git a/apps/meteor/tests/data/livechat/units.ts b/apps/meteor/tests/data/livechat/units.ts
index 03ea578e654d..8a2d0f5a833a 100644
--- a/apps/meteor/tests/data/livechat/units.ts
+++ b/apps/meteor/tests/data/livechat/units.ts
@@ -1,7 +1,7 @@
 import { faker } from '@faker-js/faker';
 import type { IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
 
-import { methodCall, credentials, request } from '../api-data';
+import { methodCall, credentials, request, api } from '../api-data';
 import type { DummyResponse } from './utils';
 
 export const createMonitor = async (username: string): Promise<{ _id: string; username: string }> => {
@@ -57,3 +57,39 @@ export const createUnit = async (
 			});
 	});
 };
+
+export const deleteUnit = async (unit: IOmnichannelBusinessUnit): Promise<IOmnichannelBusinessUnit> => {
+	return new Promise((resolve, reject) => {
+		void request
+			.post(methodCall(`livechat:removeUnit`))
+			.set(credentials)
+			.send({
+				message: JSON.stringify({
+					method: 'livechat:removeUnit',
+					params: [unit._id],
+					id: '101',
+					msg: 'method',
+				}),
+			})
+			.end((err: Error, res: DummyResponse<string, 'wrapped'>) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(JSON.parse(res.body.message).result);
+			});
+	});
+};
+
+export const getUnit = (unitId: string): Promise<IOmnichannelBusinessUnit> => {
+	return new Promise((resolve, reject) => {
+		void request
+			.get(api(`livechat/units/${unitId}`))
+			.set(credentials)
+			.end((err: Error, res: DummyResponse<IOmnichannelBusinessUnit, 'not-wrapped'>) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(res.body);
+			});
+	});
+};
diff --git a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
index 425c776fecdb..e0c079ece243 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
@@ -1,12 +1,14 @@
 import type { ILivechatDepartment, IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { before, after, describe, it } from 'mocha';
 
-import { getCredentials, api, request, credentials } from '../../../data/api-data';
-import { createDepartment } from '../../../data/livechat/rooms';
-import { createMonitor, createUnit } from '../../../data/livechat/units';
+import { getCredentials, api, request, credentials, methodCall } from '../../../data/api-data';
+import { deleteDepartment, getDepartmentById, createDepartmentWithMethod } from '../../../data/livechat/department';
+import { createDepartment, updateDepartment } from '../../../data/livechat/rooms';
+import { createMonitor, createUnit, deleteUnit, getUnit } from '../../../data/livechat/units';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
-import { createUser, deleteUser } from '../../../data/users.helper';
+import { password } from '../../../data/user';
+import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
 (IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Units', () => {
@@ -14,6 +16,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updatePermission('manage-livechat-departments', ['livechat-manager', 'livechat-monitor', 'admin']);
 	});
 
 	describe('[GET] livechat/units', () => {
@@ -409,4 +412,547 @@ import { IS_EE } from '../../../e2e/config/constants';
 			await deleteUser(user);
 		});
 	});
+
+	describe('[POST] livechat/department', () => {
+		let monitor1: Awaited<ReturnType<typeof createUser>>;
+		let monitor1Credentials: Awaited<ReturnType<typeof login>>;
+		let monitor2: Awaited<ReturnType<typeof createUser>>;
+		let monitor2Credentials: Awaited<ReturnType<typeof login>>;
+		let unit: IOmnichannelBusinessUnit;
+
+		before(async () => {
+			monitor1 = await createUser();
+			monitor2 = await createUser();
+			await createMonitor(monitor1.username);
+			monitor1Credentials = await login(monitor1.username, password);
+			await createMonitor(monitor2.username);
+			monitor2Credentials = await login(monitor2.username, password);
+			unit = await createUnit(monitor1._id, monitor1.username, []);
+		});
+
+		after(async () => Promise.all([deleteUser(monitor1), deleteUser(monitor2), deleteUnit(unit)]));
+
+		it('should fail creating department when providing an invalid property in the department unit object', () => {
+			return request
+				.post(api('livechat/department'))
+				.set(credentials)
+				.send({
+					department: { name: 'Fail-Test', enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: { invalidProperty: true },
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'invalid-params');
+				});
+		});
+
+		it('should fail creating a department into an existing unit that a monitor does not supervise', async () => {
+			const department = await createDepartment(undefined, undefined, undefined, undefined, { _id: unit._id }, monitor2Credentials);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 0);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
+
+			await deleteDepartment(department._id);
+		});
+
+		it('should succesfully create a department into an existing unit as an admin', async () => {
+			const department = await createDepartment(undefined, undefined, undefined, undefined, { _id: unit._id });
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+
+			await deleteDepartment(department._id);
+		});
+
+		it('should succesfully create a department into an existing unit that a monitor supervises', async () => {
+			const department = await createDepartment(undefined, undefined, undefined, undefined, { _id: unit._id }, monitor1Credentials);
+
+			// Deleting a department currently does not decrease its unit's counter. We must adjust this check when this is fixed
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+
+			await deleteDepartment(department._id);
+		});
+	});
+
+	describe('[PUT] livechat/department', () => {
+		let monitor1: Awaited<ReturnType<typeof createUser>>;
+		let monitor1Credentials: Awaited<ReturnType<typeof login>>;
+		let monitor2: Awaited<ReturnType<typeof createUser>>;
+		let monitor2Credentials: Awaited<ReturnType<typeof login>>;
+		let unit: IOmnichannelBusinessUnit;
+		let department: ILivechatDepartment;
+		let baseDepartment: ILivechatDepartment;
+
+		before(async () => {
+			monitor1 = await createUser();
+			monitor2 = await createUser();
+			await createMonitor(monitor1.username);
+			monitor1Credentials = await login(monitor1.username, password);
+			await createMonitor(monitor2.username);
+			monitor2Credentials = await login(monitor2.username, password);
+			department = await createDepartment();
+			baseDepartment = await createDepartment();
+			unit = await createUnit(monitor1._id, monitor1.username, [baseDepartment._id]);
+		});
+
+		after(async () =>
+			Promise.all([
+				deleteUser(monitor1),
+				deleteUser(monitor2),
+				deleteUnit(unit),
+				deleteDepartment(department._id),
+				deleteDepartment(baseDepartment._id),
+			]),
+		);
+
+		it("should fail updating a department's unit when providing an invalid property in the department unit object", () => {
+			const updatedName = 'updated-department-name';
+			return request
+				.put(api(`livechat/department/${department._id}`))
+				.set(credentials)
+				.send({
+					department: { name: updatedName, enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: { invalidProperty: true },
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'Match error: Unknown key in field departmentUnit.invalidProperty');
+				});
+		});
+
+		it("should fail updating a department's unit when providing an invalid _id type in the department unit object", () => {
+			const updatedName = 'updated-department-name';
+			return request
+				.put(api(`livechat/department/${department._id}`))
+				.set(credentials)
+				.send({
+					department: { name: updatedName, enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: { _id: true },
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'Match error: Expected string, got boolean in field departmentUnit._id');
+				});
+		});
+
+		it('should fail removing the last department from a unit', () => {
+			const updatedName = 'updated-department-name';
+			return request
+				.put(api(`livechat/department/${baseDepartment._id}`))
+				.set(credentials)
+				.send({
+					department: { name: updatedName, enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: {},
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-unit-cant-be-empty');
+				});
+		});
+
+		it('should succesfully add an existing department to a unit as an admin', async () => {
+			const updatedName = 'updated-department-name';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: { _id: unit._id },
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove an existing department from a unit as an admin', async () => {
+			const updatedName = 'updated-department-name';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: {},
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should fail adding a department into an existing unit that a monitor does not supervise', async () => {
+			const updatedName = 'updated-department-name2';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor2Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: { _id: unit._id },
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should succesfully add a department into an existing unit that a monitor supervises', async () => {
+			const updatedName = 'updated-department-name3';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor1Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: { _id: unit._id },
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('name', updatedName);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should fail removing a department from a unit that a monitor does not supervise', async () => {
+			const updatedName = 'updated-department-name4';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor2Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: {},
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('name', updatedName);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove a department from a unit that a monitor supervises', async () => {
+			const updatedName = 'updated-department-name5';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor1Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: {},
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('name', updatedName);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+	});
+
+	describe('[POST] livechat:saveDepartment', () => {
+		let monitor1: Awaited<ReturnType<typeof createUser>>;
+		let monitor1Credentials: Awaited<ReturnType<typeof login>>;
+		let monitor2: Awaited<ReturnType<typeof createUser>>;
+		let monitor2Credentials: Awaited<ReturnType<typeof login>>;
+		let unit: IOmnichannelBusinessUnit;
+		const departmentName = 'Test-Department-Livechat-Method';
+		let testDepartmentId = '';
+		let baseDepartment: ILivechatDepartment;
+
+		before(async () => {
+			monitor1 = await createUser();
+			monitor2 = await createUser();
+			await createMonitor(monitor1.username);
+			monitor1Credentials = await login(monitor1.username, password);
+			await createMonitor(monitor2.username);
+			monitor2Credentials = await login(monitor2.username, password);
+			baseDepartment = await createDepartment();
+			unit = await createUnit(monitor1._id, monitor1.username, [baseDepartment._id]);
+		});
+
+		after(async () =>
+			Promise.all([
+				deleteUser(monitor1),
+				deleteUser(monitor2),
+				deleteUnit(unit),
+				deleteDepartment(testDepartmentId),
+				deleteDepartment(baseDepartment._id),
+			]),
+		);
+
+		it('should fail creating department when providing an invalid _id type in the department unit object', () => {
+			return request
+				.post(methodCall('livechat:saveDepartment'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'livechat:saveDepartment',
+						params: [
+							'',
+							{ name: 'Fail-Test', enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+							[],
+							{ _id: true },
+						],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.property('error').that.is.an('object');
+					expect(data.error).to.have.property('errorType', 'Meteor.Error');
+					expect(data.error).to.have.property('error', 'error-invalid-department-unit');
+				});
+		});
+
+		it('should fail removing last department from unit', () => {
+			return request
+				.post(methodCall('livechat:saveDepartment'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'livechat:saveDepartment',
+						params: [
+							baseDepartment._id,
+							{ name: 'Fail-Test', enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+							[],
+							{},
+						],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.property('error').that.is.an('object');
+					expect(data.error).to.have.property('errorType', 'Meteor.Error');
+					expect(data.error).to.have.property('error', 'error-unit-cant-be-empty');
+				});
+		});
+
+		it('should fail creating a department into an existing unit that a monitor does not supervise', async () => {
+			const departmentName = 'Fail-Test';
+
+			const department = await createDepartmentWithMethod({
+				userCredentials: monitor2Credentials,
+				name: departmentName,
+				departmentUnit: { _id: unit._id },
+			});
+			testDepartmentId = department._id;
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
+
+			await deleteDepartment(testDepartmentId);
+		});
+
+		it('should succesfully create a department into an existing unit as an admin', async () => {
+			const testDepartment = await createDepartmentWithMethod({ name: departmentName, departmentUnit: { _id: unit._id } });
+			testDepartmentId = testDepartment._id;
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove an existing department from a unit as an admin', async () => {
+			await createDepartmentWithMethod({ name: departmentName, departmentUnit: {}, departmentId: testDepartmentId });
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should succesfully add an existing department to a unit as an admin', async () => {
+			await createDepartmentWithMethod({ name: departmentName, departmentUnit: { _id: unit._id }, departmentId: testDepartmentId });
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove a department from a unit that a monitor supervises', async () => {
+			await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: {},
+				departmentId: testDepartmentId,
+				userCredentials: monitor1Credentials,
+			});
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should succesfully add an existing department to a unit that a monitor supervises', async () => {
+			await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: { _id: unit._id },
+				departmentId: testDepartmentId,
+				userCredentials: monitor1Credentials,
+			});
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should fail removing a department from a unit that a monitor does not supervise', async () => {
+			await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: {},
+				departmentId: testDepartmentId,
+				userCredentials: monitor2Credentials,
+			});
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+
+			await deleteDepartment(testDepartmentId);
+		});
+
+		it('should succesfully create a department in a unit that a monitor supervises', async () => {
+			const testDepartment = await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: { _id: unit._id },
+				userCredentials: monitor1Credentials,
+			});
+			testDepartmentId = testDepartment._id;
+
+			// Deleting a department currently does not decrease its unit's counter. We must adjust this check when this is fixed
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 3);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+	});
 });
diff --git a/packages/core-typings/src/ILivechatDepartment.ts b/packages/core-typings/src/ILivechatDepartment.ts
index a73cf55cb235..0138a88226fb 100644
--- a/packages/core-typings/src/ILivechatDepartment.ts
+++ b/packages/core-typings/src/ILivechatDepartment.ts
@@ -16,6 +16,7 @@ export interface ILivechatDepartment {
 	archived?: boolean;
 	departmentsAllowedToForward?: string[];
 	maxNumberSimultaneousChat?: number;
+	parentId?: string;
 	ancestors?: string[];
 	allowReceiveForwardOffline?: boolean;
 	// extra optional fields
diff --git a/packages/model-typings/src/models/ILivechatDepartmentModel.ts b/packages/model-typings/src/models/ILivechatDepartmentModel.ts
index 75fe0f54b2eb..fe366256eff7 100644
--- a/packages/model-typings/src/models/ILivechatDepartmentModel.ts
+++ b/packages/model-typings/src/models/ILivechatDepartmentModel.ts
@@ -59,6 +59,7 @@ export interface ILivechatDepartmentModel extends IBaseModel<ILivechatDepartment
 	): Promise<FindCursor<ILivechatDepartment>>;
 	findOneByIdOrName(_idOrName: string, options?: FindOptions<ILivechatDepartment>): Promise<ILivechatDepartment | null>;
 	findByUnitIds(unitIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
+	countDepartmentsInUnit(unitId: string): Promise<number>;
 	findActiveByUnitIds(unitIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
 	findNotArchived(options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
 	getBusinessHoursWithDepartmentStatuses(): Promise<
@@ -73,4 +74,6 @@ export interface ILivechatDepartmentModel extends IBaseModel<ILivechatDepartment
 	findEnabledInIds(departmentsIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
 	archiveDepartment(_id: string): Promise<Document | UpdateResult>;
 	unarchiveDepartment(_id: string): Promise<Document | UpdateResult>;
+	addDepartmentToUnit(_id: string, unitId: string, ancestors: string[]): Promise<Document | UpdateResult>;
+	removeDepartmentFromUnit(_id: string): Promise<Document | UpdateResult>;
 }
diff --git a/packages/model-typings/src/models/ILivechatUnitModel.ts b/packages/model-typings/src/models/ILivechatUnitModel.ts
index 8858ee5b580e..24a482eccd0e 100644
--- a/packages/model-typings/src/models/ILivechatUnitModel.ts
+++ b/packages/model-typings/src/models/ILivechatUnitModel.ts
@@ -32,6 +32,8 @@ export interface ILivechatUnitModel extends IBaseModel<IOmnichannelBusinessUnit>
 		departments: { departmentId: string }[],
 	): Promise<Omit<IOmnichannelBusinessUnit, '_updatedAt'>>;
 	removeParentAndAncestorById(parentId: string): Promise<UpdateResult | Document>;
+	incrementDepartmentsCount(_id: string): Promise<UpdateResult | Document>;
+	decrementDepartmentsCount(_id: string): Promise<UpdateResult | Document>;
 	removeById(_id: string): Promise<DeleteResult>;
 	findOneByIdOrName(_idOrName: string, options: FindOptions<IOmnichannelBusinessUnit>): Promise<IOmnichannelBusinessUnit | null>;
 	findByMonitorId(monitorId: string): Promise<string[]>;
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index a1c714c013b8..b494e5d0e5a9 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -576,7 +576,8 @@ type POSTLivechatDepartmentProps = {
 		chatClosingTags?: string[];
 		fallbackForwardDepartment?: string;
 	};
-	agents: { agentId: string; count?: number; order?: number }[];
+	agents?: { agentId: string; count?: number; order?: number }[];
+	departmentUnit?: { _id?: string };
 };
 
 const POSTLivechatDepartmentSchema = {
@@ -645,6 +646,15 @@ const POSTLivechatDepartmentSchema = {
 			},
 			nullable: true,
 		},
+		departmentUnit: {
+			type: 'object',
+			properties: {
+				_id: {
+					type: 'string',
+				},
+			},
+			additionalProperties: false,
+		},
 	},
 	required: ['department'],
 	additionalProperties: false,

From fdde637f92928f0f59d3b089c889fdfe979100d0 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 18 Sep 2024 11:29:22 -0300
Subject: [PATCH 091/170] fix: Local avatars prioritized over external avatar
 provider and remove remnant references on client of
 `Accounts_AvatarExternalProviderUrl` (#33296)

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
---
 .changeset/strong-grapes-brake.md                  |  9 +++++++++
 apps/meteor/app/utils/client/getUserAvatarURL.ts   |  5 -----
 apps/meteor/app/utils/server/getUserAvatarURL.ts   |  5 -----
 apps/meteor/client/providers/AvatarUrlProvider.tsx |  8 ++------
 apps/meteor/server/routes/avatar/user.js           | 14 +++++++-------
 5 files changed, 18 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/strong-grapes-brake.md

diff --git a/.changeset/strong-grapes-brake.md b/.changeset/strong-grapes-brake.md
new file mode 100644
index 000000000000..c867600a8cd2
--- /dev/null
+++ b/.changeset/strong-grapes-brake.md
@@ -0,0 +1,9 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed remaining direct references to external user avatar URLs
+
+Fixed local avatars having priority over external provider
+
+It mainly corrects the behavior of E2E encryption messages and desktop notifications.
diff --git a/apps/meteor/app/utils/client/getUserAvatarURL.ts b/apps/meteor/app/utils/client/getUserAvatarURL.ts
index 1a825a44fc27..d5fdd2b2d427 100644
--- a/apps/meteor/app/utils/client/getUserAvatarURL.ts
+++ b/apps/meteor/app/utils/client/getUserAvatarURL.ts
@@ -1,11 +1,6 @@
-import { settings } from '../../settings/client';
 import { getAvatarURL } from './getAvatarURL';
 
 export const getUserAvatarURL = function (username: string, cache = ''): string | undefined {
-	const externalSource = (settings.get<string>('Accounts_AvatarExternalProviderUrl') || '').trim().replace(/\/$/, '');
-	if (externalSource !== '') {
-		return externalSource.replace('{username}', username);
-	}
 	if (username == null) {
 		return;
 	}
diff --git a/apps/meteor/app/utils/server/getUserAvatarURL.ts b/apps/meteor/app/utils/server/getUserAvatarURL.ts
index b83efea1d842..d5fdd2b2d427 100644
--- a/apps/meteor/app/utils/server/getUserAvatarURL.ts
+++ b/apps/meteor/app/utils/server/getUserAvatarURL.ts
@@ -1,11 +1,6 @@
-import { settings } from '../../settings/server';
 import { getAvatarURL } from './getAvatarURL';
 
 export const getUserAvatarURL = function (username: string, cache = ''): string | undefined {
-	const externalSource = (settings.get<string>('Accounts_AvatarExternalProviderUrl') || '').trim().replace(/\/$/, '');
-	if (externalSource !== '') {
-		return externalSource.replace('{username}', username);
-	}
 	if (username == null) {
 		return;
 	}
diff --git a/apps/meteor/client/providers/AvatarUrlProvider.tsx b/apps/meteor/client/providers/AvatarUrlProvider.tsx
index b5a92c9117f2..606da39360d5 100644
--- a/apps/meteor/client/providers/AvatarUrlProvider.tsx
+++ b/apps/meteor/client/providers/AvatarUrlProvider.tsx
@@ -1,4 +1,4 @@
-import { AvatarUrlContext, useSetting } from '@rocket.chat/ui-contexts';
+import { AvatarUrlContext } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React, { useMemo } from 'react';
 
@@ -10,19 +10,15 @@ type AvatarUrlProviderProps = {
 };
 
 const AvatarUrlProvider = ({ children }: AvatarUrlProviderProps) => {
-	const cdnAvatarUrl = String(useSetting('CDN_PREFIX') || '');
 	const contextValue = useMemo(
 		() => ({
 			getUserPathAvatar: ((): ((uid: string, etag?: string) => string) => {
-				if (cdnAvatarUrl) {
-					return (uid: string, etag?: string): string => `${cdnAvatarUrl}/avatar/${uid}${etag ? `?etag=${etag}` : ''}`;
-				}
 				return (uid: string, etag?: string): string => getURL(`/avatar/${uid}${etag ? `?etag=${etag}` : ''}`);
 			})(),
 			getRoomPathAvatar: ({ type, ...room }: any): string =>
 				roomCoordinator.getRoomDirectives(type || room.t).getAvatarPath({ username: room._id, ...room }) || '',
 		}),
-		[cdnAvatarUrl],
+		[],
 	);
 
 	return <AvatarUrlContext.Provider children={children} value={contextValue} />;
diff --git a/apps/meteor/server/routes/avatar/user.js b/apps/meteor/server/routes/avatar/user.js
index 269c2e90019a..1c92d24fe300 100644
--- a/apps/meteor/server/routes/avatar/user.js
+++ b/apps/meteor/server/routes/avatar/user.js
@@ -32,6 +32,13 @@ export const userAvatar = async function (req, res) {
 		return;
 	}
 
+	if (settings.get('Accounts_AvatarExternalProviderUrl')) {
+		const response = await fetch(settings.get('Accounts_AvatarExternalProviderUrl').replace('{username}', requestUsername));
+		response.headers.forEach((value, key) => res.setHeader(key, value));
+		response.body.pipe(res);
+		return;
+	}
+
 	const reqModifiedHeader = req.headers['if-modified-since'];
 
 	const file = await Avatars.findOneByName(requestUsername);
@@ -52,13 +59,6 @@ export const userAvatar = async function (req, res) {
 		return FileUpload.get(file, req, res);
 	}
 
-	if (settings.get('Accounts_AvatarExternalProviderUrl')) {
-		const response = await fetch(settings.get('Accounts_AvatarExternalProviderUrl').replace('{username}', requestUsername));
-		response.headers.forEach((value, key) => res.setHeader(key, value));
-		response.body.pipe(res);
-		return;
-	}
-
 	// if still using "letters fallback"
 	if (!wasFallbackModified(reqModifiedHeader, res)) {
 		res.writeHead(304);

From ba8bee484b77fd83359f95a3c9c52a33e46b667b Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Wed, 18 Sep 2024 12:21:29 -0300
Subject: [PATCH 092/170] fix: Mark as unread not working (#32939)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 .changeset/hot-balloons-travel.md             |  5 ++
 .../client/actionButton.ts                    |  4 +-
 .../RoomList/SideBarItemTemplateWithData.tsx  |  5 +-
 apps/meteor/client/sidebar/RoomMenu.tsx       | 10 ++-
 .../RoomList/SidebarItemTemplateWithData.tsx  |  3 +-
 apps/meteor/client/sidebarv2/RoomMenu.tsx     | 10 ++-
 apps/meteor/tests/e2e/mark-unread.spec.ts     | 71 +++++++++++++++++++
 .../page-objects/fragments/home-sidenav.ts    | 22 +++++-
 .../tests/e2e/page-objects/home-channel.ts    |  4 ++
 9 files changed, 125 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/hot-balloons-travel.md
 create mode 100644 apps/meteor/tests/e2e/mark-unread.spec.ts

diff --git a/.changeset/hot-balloons-travel.md b/.changeset/hot-balloons-travel.md
new file mode 100644
index 000000000000..d6154babc49d
--- /dev/null
+++ b/.changeset/hot-balloons-travel.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
diff --git a/apps/meteor/app/message-mark-as-unread/client/actionButton.ts b/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
index fc4a9d80c43c..e1e35d216029 100644
--- a/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
+++ b/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
@@ -19,7 +19,6 @@ Meteor.startup(() => {
 			const { message = messageArgs(this).msg } = props;
 
 			try {
-				await sdk.call('unreadMessages', message);
 				const subscription = ChatSubscription.findOne({
 					rid: message.rid,
 				});
@@ -27,8 +26,9 @@ Meteor.startup(() => {
 				if (subscription == null) {
 					return;
 				}
+				router.navigate('/home');
 				await LegacyRoomManager.close(subscription.t + subscription.name);
-				return router.navigate('/home');
+				await sdk.call('unreadMessages', message);
 			} catch (error) {
 				dispatchToastMessage({ type: 'error', message: error });
 			}
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
index cc7cdfbe7761..35d098151204 100644
--- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -167,7 +167,7 @@ function SideBarItemTemplateWithData({
 	const badges = (
 		<Margins inlineStart={8}>
 			{showBadge && isUnread && (
-				<Badge {...({ style: { display: 'inline-flex', flexShrink: 0 } } as any)} variant={variant} title={badgeTitle}>
+				<Badge role='status' {...({ style: { display: 'inline-flex', flexShrink: 0 } } as any)} variant={variant} title={badgeTitle}>
 					{unread + tunread?.length}
 				</Badge>
 			)}
@@ -180,6 +180,7 @@ function SideBarItemTemplateWithData({
 			is='a'
 			id={id}
 			data-qa='sidebar-item'
+			data-unread={highlighted}
 			unread={highlighted}
 			selected={selected}
 			href={href}
@@ -205,7 +206,7 @@ function SideBarItemTemplateWithData({
 						threadUnread={threadUnread}
 						rid={rid}
 						unread={!!unread}
-						roomOpen={false}
+						roomOpen={selected}
 						type={type}
 						cl={cl}
 						name={title}
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index 06b1352d2803..05f02220104b 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -13,6 +13,7 @@ import {
 	useTranslation,
 	useEndpoint,
 } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 
@@ -100,6 +101,8 @@ const RoomMenu = ({
 	const isOmnichannelRoom = type === 'l';
 	const prioritiesMenu = useOmnichannelPrioritiesMenu(rid);
 
+	const queryClient = useQueryClient();
+
 	const canLeave = ((): boolean => {
 		if (type === 'c' && !canLeaveChannel) {
 			return false;
@@ -173,17 +176,22 @@ const RoomMenu = ({
 
 	const handleToggleRead = useMutableCallback(async () => {
 		try {
+			queryClient.invalidateQueries(['sidebar/search/spotlight']);
+
 			if (isUnread) {
 				await readMessages({ rid, readThreads: true });
 				return;
 			}
-			await unreadMessages(undefined, rid);
+
 			if (subscription == null) {
 				return;
 			}
+
 			LegacyRoomManager.close(subscription.t + subscription.name);
 
 			router.navigate('/home');
+
+			await unreadMessages(undefined, rid);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
diff --git a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
index 51b8ce495af6..e1f66ba93b4e 100644
--- a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
@@ -180,6 +180,7 @@ const SidebarItemTemplateWithData = ({
 			is='a'
 			id={id}
 			data-qa='sidebar-item'
+			data-unread={highlighted}
 			unread={highlighted}
 			selected={selected}
 			href={href}
@@ -205,7 +206,7 @@ const SidebarItemTemplateWithData = ({
 						threadUnread={threadUnread}
 						rid={rid}
 						unread={!!unread}
-						roomOpen={false}
+						roomOpen={selected}
 						type={type}
 						cl={cl}
 						name={title}
diff --git a/apps/meteor/client/sidebarv2/RoomMenu.tsx b/apps/meteor/client/sidebarv2/RoomMenu.tsx
index e88225df40ca..aac68b9ef79e 100644
--- a/apps/meteor/client/sidebarv2/RoomMenu.tsx
+++ b/apps/meteor/client/sidebarv2/RoomMenu.tsx
@@ -13,6 +13,7 @@ import {
 	useTranslation,
 	useEndpoint,
 } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 
@@ -100,6 +101,8 @@ const RoomMenu = ({
 	const isOmnichannelRoom = type === 'l';
 	const prioritiesMenu = useOmnichannelPrioritiesMenu(rid);
 
+	const queryClient = useQueryClient();
+
 	const canLeave = ((): boolean => {
 		if (type === 'c' && !canLeaveChannel) {
 			return false;
@@ -173,17 +176,22 @@ const RoomMenu = ({
 
 	const handleToggleRead = useEffectEvent(async () => {
 		try {
+			queryClient.invalidateQueries(['sidebar/search/spotlight']);
+
 			if (isUnread) {
 				await readMessages({ rid, readThreads: true });
 				return;
 			}
-			await unreadMessages(undefined, rid);
+
 			if (subscription == null) {
 				return;
 			}
+
 			LegacyRoomManager.close(subscription.t + subscription.name);
 
 			router.navigate('/home');
+
+			await unreadMessages(undefined, rid);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
diff --git a/apps/meteor/tests/e2e/mark-unread.spec.ts b/apps/meteor/tests/e2e/mark-unread.spec.ts
new file mode 100644
index 000000000000..81ae93965856
--- /dev/null
+++ b/apps/meteor/tests/e2e/mark-unread.spec.ts
@@ -0,0 +1,71 @@
+import { createAuxContext } from './fixtures/createAuxContext';
+import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
+import { createTargetChannel } from './utils';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('mark-unread', () => {
+	let poHomeChannel: HomeChannel;
+	let targetChannel: string;
+
+	test.beforeEach(async ({ page, api }) => {
+		poHomeChannel = new HomeChannel(page);
+		targetChannel = await createTargetChannel(api, { members: ['user2'] });
+
+		await page.emulateMedia({ reducedMotion: 'reduce' });
+		await page.goto('/home');
+	});
+
+	test.afterEach(async ({ api }) => {
+		await api.post('/channels.delete', { roomName: targetChannel });
+	});
+
+	test.describe('Mark Unread - Sidebar Action', () => {
+		test('should not mark empty room as unread', async () => {
+			await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+
+			await expect(poHomeChannel.sidenav.getRoomBadge(targetChannel)).not.toBeVisible();
+		});
+
+		test('should mark a populated room as unread', async () => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.content.sendMessage('this is a message for reply');
+			await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+
+			await expect(poHomeChannel.sidenav.getRoomBadge(targetChannel)).toBeVisible();
+		});
+
+		test('should mark a populated room as unread - search', async () => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.content.sendMessage('this is a message for reply');
+			await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+			await poHomeChannel.sidenav.searchRoom(targetChannel);
+
+			await expect(poHomeChannel.sidenav.getSearchChannelBadge(targetChannel)).toBeVisible();
+		});
+	});
+
+	test.describe('Mark Unread - Message Action', () => {
+		let poHomeChannelUser2: HomeChannel;
+
+		test('should mark a populated room as unread', async ({ browser }) => {
+			const { page: user2Page } = await createAuxContext(browser, Users.user2);
+			poHomeChannelUser2 = new HomeChannel(user2Page);
+
+			await poHomeChannelUser2.sidenav.openChat(targetChannel);
+			await poHomeChannelUser2.content.sendMessage('this is a message for reply');
+			await user2Page.close();
+
+			await poHomeChannel.sidenav.openChat(targetChannel);
+
+			// wait for the sidebar item to be read
+			await poHomeChannel.sidenav.getSidebarItemByName(targetChannel, true).waitFor();
+			await poHomeChannel.content.openLastMessageMenu();
+			await poHomeChannel.markUnread.click();
+
+			await expect(poHomeChannel.sidenav.getRoomBadge(targetChannel)).toBeVisible();
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
index d0bdd5028010..823469d02a96 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -68,8 +68,18 @@ export class HomeSidenav {
 		return this.page.locator('role=menuitemcheckbox[name="Profile"]');
 	}
 
-	getSidebarItemByName(name: string): Locator {
-		return this.page.locator(`[data-qa="sidebar-item"][aria-label="${name}"]`);
+	// TODO: refactor getSidebarItemByName to not use data-qa
+	getSidebarItemByName(name: string, isRead?: boolean): Locator {
+		return this.page.locator(
+			['[data-qa="sidebar-item"]', `[aria-label="${name}"]`, isRead && '[data-unread="false"]'].filter(Boolean).join(''),
+		);
+	}
+
+	async selectMarkAsUnread(name: string) {
+		const sidebarItem = this.getSidebarItemByName(name);
+		await sidebarItem.focus();
+		await sidebarItem.locator('.rcx-sidebar-item__menu').click();
+		await this.page.getByRole('option', { name: 'Mark Unread' }).click();
 	}
 
 	async selectPriority(name: string, priority: string) {
@@ -170,4 +180,12 @@ export class HomeSidenav {
 		await this.checkboxEncryption.click();
 		await this.btnCreate.click();
 	}
+
+	getRoomBadge(roomName: string): Locator {
+		return this.getSidebarItemByName(roomName).getByRole('status', { exact: true });
+	}
+
+	getSearchChannelBadge(name: string): Locator {
+		return this.page.locator(`[data-qa="sidebar-item"][aria-label="${name}"]`).first().getByRole('status', { exact: true });
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/home-channel.ts b/apps/meteor/tests/e2e/page-objects/home-channel.ts
index a2784ea4c67b..ce51896eb449 100644
--- a/apps/meteor/tests/e2e/page-objects/home-channel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-channel.ts
@@ -59,4 +59,8 @@ export class HomeChannel {
 	get roomHeaderToolbar(): Locator {
 		return this.page.locator('[role=toolbar][aria-label="Primary Room actions"]');
 	}
+
+	get markUnread(): Locator {
+		return this.page.locator('role=menuitem[name="Mark Unread"]');
+	}
 }

From 6a3c25c62c33e81fb286e364dedf084c64ad8ef8 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Wed, 18 Sep 2024 10:39:21 -0600
Subject: [PATCH 093/170] refactor: Remove old `setreaction` callbacks and use
 new after/before callbacks (#33309)

---
 .../reactions/client/methods/setReaction.ts   |  4 ----
 .../app/reactions/server/setReaction.ts       |  2 --
 .../app/slackbridge/server/RocketAdapter.js   | 22 +++++++++----------
 apps/meteor/lib/callbacks.ts                  |  2 --
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/apps/meteor/app/reactions/client/methods/setReaction.ts b/apps/meteor/app/reactions/client/methods/setReaction.ts
index ed15cda9ab8e..1744d49c0ceb 100644
--- a/apps/meteor/app/reactions/client/methods/setReaction.ts
+++ b/apps/meteor/app/reactions/client/methods/setReaction.ts
@@ -3,7 +3,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import { callbacks } from '../../../../lib/callbacks';
 import { emoji } from '../../../emoji/client';
 import { Messages, ChatRoom, Subscriptions } from '../../../models/client';
 
@@ -55,10 +54,8 @@ Meteor.methods<ServerMethods>({
 			if (!message.reactions || typeof message.reactions !== 'object' || Object.keys(message.reactions).length === 0) {
 				delete message.reactions;
 				Messages.update({ _id: messageId }, { $unset: { reactions: 1 } });
-				await callbacks.run('unsetReaction', messageId, reaction);
 			} else {
 				Messages.update({ _id: messageId }, { $set: { reactions: message.reactions } });
-				await callbacks.run('setReaction', messageId, reaction);
 			}
 		} else {
 			if (!message.reactions) {
@@ -72,7 +69,6 @@ Meteor.methods<ServerMethods>({
 			message.reactions[reaction].usernames.push(user.username);
 
 			Messages.update({ _id: messageId }, { $set: { reactions: message.reactions } });
-			await callbacks.run('setReaction', messageId, reaction);
 		}
 	},
 });
diff --git a/apps/meteor/app/reactions/server/setReaction.ts b/apps/meteor/app/reactions/server/setReaction.ts
index d513c8dda6a5..8f9c24633407 100644
--- a/apps/meteor/app/reactions/server/setReaction.ts
+++ b/apps/meteor/app/reactions/server/setReaction.ts
@@ -85,7 +85,6 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 				await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			}
 		}
-		await callbacks.run('unsetReaction', message._id, reaction);
 		await callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact, oldMessage });
 
 		isReacted = false;
@@ -104,7 +103,6 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 			await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			void notifyOnRoomChangedById(room._id);
 		}
-		await callbacks.run('setReaction', message._id, reaction);
 		await callbacks.run('afterSetReaction', message, { user, reaction, shouldReact });
 
 		isReacted = true;
diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js
index f76c33fa1f81..8ba2a76dcbc2 100644
--- a/apps/meteor/app/slackbridge/server/RocketAdapter.js
+++ b/apps/meteor/app/slackbridge/server/RocketAdapter.js
@@ -45,16 +45,16 @@ export default class RocketAdapter {
 		rocketLogger.debug('Register for events');
 		callbacks.add('afterSaveMessage', this.onMessage.bind(this), callbacks.priority.LOW, 'SlackBridge_Out');
 		callbacks.add('afterDeleteMessage', this.onMessageDelete.bind(this), callbacks.priority.LOW, 'SlackBridge_Delete');
-		callbacks.add('setReaction', this.onSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_SetReaction');
-		callbacks.add('unsetReaction', this.onUnSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_UnSetReaction');
+		callbacks.add('afterSetReaction', this.onSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_SetReaction');
+		callbacks.add('afterUnsetReaction', this.onUnSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_UnSetReaction');
 	}
 
 	unregisterForEvents() {
 		rocketLogger.debug('Unregister for events');
 		callbacks.remove('afterSaveMessage', 'SlackBridge_Out');
 		callbacks.remove('afterDeleteMessage', 'SlackBridge_Delete');
-		callbacks.remove('setReaction', 'SlackBridge_SetReaction');
-		callbacks.remove('unsetReaction', 'SlackBridge_UnSetReaction');
+		callbacks.remove('afterSetReaction', 'SlackBridge_SetReaction');
+		callbacks.remove('afterUnsetReaction', 'SlackBridge_UnSetReaction');
 	}
 
 	async onMessageDelete(rocketMessageDeleted) {
@@ -72,7 +72,7 @@ export default class RocketAdapter {
 		}
 	}
 
-	async onSetReaction(rocketMsgID, reaction) {
+	async onSetReaction(rocketMsg, { reaction }) {
 		try {
 			if (!this.slackBridge.isReactionsEnabled) {
 				return;
@@ -80,12 +80,11 @@ export default class RocketAdapter {
 
 			rocketLogger.debug('onRocketSetReaction');
 
-			if (rocketMsgID && reaction) {
-				if (this.slackBridge.reactionsMap.delete(`set${rocketMsgID}${reaction}`)) {
+			if (rocketMsg._id && reaction) {
+				if (this.slackBridge.reactionsMap.delete(`set${rocketMsg._id}${reaction}`)) {
 					// This was a Slack reaction, we don't need to tell Slack about it
 					return;
 				}
-				const rocketMsg = await Messages.findOneById(rocketMsgID);
 				if (rocketMsg) {
 					for await (const slack of this.slackAdapters) {
 						const slackChannel = slack.getSlackChannel(rocketMsg.rid);
@@ -101,7 +100,7 @@ export default class RocketAdapter {
 		}
 	}
 
-	async onUnSetReaction(rocketMsgID, reaction) {
+	async onUnSetReaction(rocketMsg, { reaction }) {
 		try {
 			if (!this.slackBridge.isReactionsEnabled) {
 				return;
@@ -109,13 +108,12 @@ export default class RocketAdapter {
 
 			rocketLogger.debug('onRocketUnSetReaction');
 
-			if (rocketMsgID && reaction) {
-				if (this.slackBridge.reactionsMap.delete(`unset${rocketMsgID}${reaction}`)) {
+			if (rocketMsg._id && reaction) {
+				if (this.slackBridge.reactionsMap.delete(`unset${rocketMsg._id}${reaction}`)) {
 					// This was a Slack unset reaction, we don't need to tell Slack about it
 					return;
 				}
 
-				const rocketMsg = await Messages.findOneById(rocketMsgID);
 				if (rocketMsg) {
 					for await (const slack of this.slackAdapters) {
 						const slackChannel = slack.getSlackChannel(rocketMsg.rid);
diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
index 57b8527d5008..dcfd7a021c5e 100644
--- a/apps/meteor/lib/callbacks.ts
+++ b/apps/meteor/lib/callbacks.ts
@@ -256,10 +256,8 @@ export type Hook =
 	| 'onValidateLogin'
 	| 'openBroadcast'
 	| 'renderNotification'
-	| 'setReaction'
 	| 'streamMessage'
 	| 'streamNewMessage'
-	| 'unsetReaction'
 	| 'userAvatarSet'
 	| 'userConfirmationEmailRequested'
 	| 'userForgotPasswordEmailRequested'

From d0595a398050b55386eab8330752a24114a23bfa Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Wed, 18 Sep 2024 12:24:47 -0600
Subject: [PATCH 094/170] fix: `LivechatSessionTaken` webhook event called
 without `agent` param (#33209)

---
 .changeset/spicy-rocks-burn.md                    |  5 +++++
 .../app/livechat/server/lib/RoutingManager.ts     | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/spicy-rocks-burn.md

diff --git a/.changeset/spicy-rocks-burn.md b/.changeset/spicy-rocks-burn.md
new file mode 100644
index 000000000000..6468dbbec241
--- /dev/null
+++ b/.changeset/spicy-rocks-burn.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
diff --git a/apps/meteor/app/livechat/server/lib/RoutingManager.ts b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
index f4a2288305e5..28e5c72efc16 100644
--- a/apps/meteor/app/livechat/server/lib/RoutingManager.ts
+++ b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
@@ -265,11 +265,20 @@ export const RoutingManager: Routing = {
 
 		logger.info(`Inquiry ${inquiry._id} taken by agent ${agent.agentId}`);
 
+		// assignAgent changes the room data to add the agent serving the conversation. afterTakeInquiry expects room object to be updated
+		const inq = await this.assignAgent(inquiry as InquiryWithAgentInfo, room, agent);
+		const roomAfterUpdate = await LivechatRooms.findOneById(rid);
+
+		if (!roomAfterUpdate) {
+			// This should never happen
+			throw new Error('error-room-not-found');
+		}
+
 		callbacks.runAsync(
 			'livechat.afterTakeInquiry',
 			{
-				inquiry: await this.assignAgent(inquiry as InquiryWithAgentInfo, room, agent),
-				room,
+				inquiry: inq,
+				room: roomAfterUpdate,
 			},
 			agent,
 		);
@@ -282,7 +291,7 @@ export const RoutingManager: Routing = {
 			queuedAt: undefined,
 		});
 
-		return LivechatRooms.findOneById(rid);
+		return roomAfterUpdate;
 	},
 
 	async transferRoom(room, guest, transferData) {

From a541f64c8ca02e4448a4bfbff2699d6e96f17b69 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Sep 2024 10:42:07 -0300
Subject: [PATCH 095/170] fix: error on sendmessage stub (#33317)

---
 .changeset/cyan-ladybugs-thank.md                 | 5 +++++
 apps/meteor/app/lib/client/methods/sendMessage.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/cyan-ladybugs-thank.md

diff --git a/.changeset/cyan-ladybugs-thank.md b/.changeset/cyan-ladybugs-thank.md
new file mode 100644
index 000000000000..377a014fcb72
--- /dev/null
+++ b/.changeset/cyan-ladybugs-thank.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed error during sendmessage client stub
diff --git a/apps/meteor/app/lib/client/methods/sendMessage.ts b/apps/meteor/app/lib/client/methods/sendMessage.ts
index bdaca587493a..19220f901458 100644
--- a/apps/meteor/app/lib/client/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/client/methods/sendMessage.ts
@@ -43,7 +43,7 @@ Meteor.methods<ServerMethods>({
 
 		await onClientMessageReceived(message as IMessage).then((message) => {
 			ChatMessage.insert(message);
-			return callbacks.run('afterSaveMessage', message, room);
+			return callbacks.run('afterSaveMessage', message, { room });
 		});
 	},
 });

From 40339749b3682e0c7f804787fab6e49eb9cef080 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Sep 2024 15:34:50 -0300
Subject: [PATCH 096/170] feat: contextualbar based on chat size (#33321)

---
 .changeset/kind-llamas-grin.md                |   5 +
 .../Contextualbar/ContextualbarDialog.tsx     |   6 +-
 .../client/views/room/layout/RoomLayout.tsx   | 104 +++++++++++++-----
 3 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 .changeset/kind-llamas-grin.md

diff --git a/.changeset/kind-llamas-grin.md b/.changeset/kind-llamas-grin.md
new file mode 100644
index 000000000000..fd349e82d7f9
--- /dev/null
+++ b/.changeset/kind-llamas-grin.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Changed the contextualbar behavior based on chat size instead the viewport
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
index 23def16a94a1..4e4640270087 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
@@ -18,7 +18,7 @@ type ContextualbarDialogProps = AriaDialogProps & ComponentProps<typeof Contextu
 const ContextualbarDialog = (props: ContextualbarDialogProps) => {
 	const ref = useRef(null);
 	const { dialogProps } = useDialog({ 'aria-labelledby': 'contextualbarTitle', ...props }, ref);
-	const sizes = useLayoutSizes();
+	const { contextualBar } = useLayoutSizes();
 	const position = useLayoutContextualBarPosition();
 	const { closeTab } = useRoomToolbox();
 
@@ -42,12 +42,12 @@ const ContextualbarDialog = (props: ContextualbarDialogProps) => {
 		<FocusScope autoFocus restoreFocus>
 			<FeaturePreview feature='contextualbarResizable'>
 				<FeaturePreviewOn>
-					<ContextualbarResizable defaultWidth={sizes.contextualBar}>
+					<ContextualbarResizable defaultWidth={contextualBar}>
 						<Contextualbar ref={callbackRef} width='100%' position={position} {...dialogProps} {...props} />
 					</ContextualbarResizable>
 				</FeaturePreviewOn>
 				<FeaturePreviewOff>
-					<Contextualbar ref={callbackRef} width={sizes.contextualBar} position={position} {...dialogProps} {...props} />
+					<Contextualbar ref={callbackRef} width={contextualBar} position={position} {...dialogProps} {...props} />
 				</FeaturePreviewOff>
 			</FeaturePreview>
 		</FocusScope>
diff --git a/apps/meteor/client/views/room/layout/RoomLayout.tsx b/apps/meteor/client/views/room/layout/RoomLayout.tsx
index fd080b916b70..b5e29c05799f 100644
--- a/apps/meteor/client/views/room/layout/RoomLayout.tsx
+++ b/apps/meteor/client/views/room/layout/RoomLayout.tsx
@@ -1,7 +1,11 @@
+/* eslint-disable no-nested-ternary */
 import { Box } from '@rocket.chat/fuselage';
+import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import breakpointsDefinitions from '@rocket.chat/fuselage-tokens/breakpoints.json';
 import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
+import { LayoutContext, useLayout } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode } from 'react';
-import React, { Suspense } from 'react';
+import React, { Suspense, useMemo } from 'react';
 
 import { ContextualbarDialog } from '../../../components/Contextualbar';
 import HeaderSkeleton from '../Header/HeaderSkeleton';
@@ -14,36 +18,78 @@ type RoomLayoutProps = {
 	aside?: ReactNode;
 } & ComponentProps<typeof Box>;
 
-const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps): ReactElement => (
-	<Box h='full' display='flex' flexDirection='column' bg='room' {...props}>
-		<Suspense
-			fallback={
-				<FeaturePreview feature='newNavigation'>
-					<FeaturePreviewOff>
-						<HeaderSkeleton />
-					</FeaturePreviewOff>
-					<FeaturePreviewOn>
-						<HeaderSkeletonV2 />
-					</FeaturePreviewOn>
-				</FeaturePreview>
-			}
+const useBreakpointsElement = () => {
+	const { ref, borderBoxSize } = useResizeObserver<HTMLElement>({
+		debounceDelay: 30,
+	});
+
+	const breakpoints = useMemo(
+		() =>
+			breakpointsDefinitions
+				.filter(({ minViewportWidth }) => minViewportWidth && borderBoxSize.inlineSize && borderBoxSize.inlineSize >= minViewportWidth)
+				.map(({ name }) => name),
+		[borderBoxSize],
+	);
+
+	return {
+		ref,
+		breakpoints,
+	};
+};
+
+const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps): ReactElement => {
+	const { ref, breakpoints } = useBreakpointsElement();
+
+	const contextualbarPosition = breakpoints.includes('md') ? 'relative' : 'absolute';
+	const contextualbarSize = breakpoints.includes('sm') ? (breakpoints.includes('xl') ? '38%' : '380px') : '100%';
+
+	const layout = useLayout();
+
+	return (
+		<LayoutContext.Provider
+			value={useMemo(
+				() => ({
+					...layout,
+					contextualBarPosition: contextualbarPosition,
+					size: {
+						...layout.size,
+						contextualBar: contextualbarSize,
+					},
+				}),
+				[layout, contextualbarPosition, contextualbarSize],
+			)}
 		>
-			{header}
-		</Suspense>
-		<Box display='flex' flexGrow={1} overflow='hidden' height='full' position='relative'>
-			<Box display='flex' flexDirection='column' flexGrow={1} minWidth={0}>
-				<Box is='div' display='flex' flexDirection='column' flexGrow={1}>
-					<Suspense fallback={null}>{body}</Suspense>
+			<Box h='full' display='flex' flexDirection='column' bg='room' {...props} ref={ref}>
+				<Suspense
+					fallback={
+						<FeaturePreview feature='newNavigation'>
+							<FeaturePreviewOff>
+								<HeaderSkeleton />
+							</FeaturePreviewOff>
+							<FeaturePreviewOn>
+								<HeaderSkeletonV2 />
+							</FeaturePreviewOn>
+						</FeaturePreview>
+					}
+				>
+					{header}
+				</Suspense>
+				<Box display='flex' flexGrow={1} overflow='hidden' height='full' position='relative'>
+					<Box display='flex' flexDirection='column' flexGrow={1} minWidth={0}>
+						<Box is='div' display='flex' flexDirection='column' flexGrow={1}>
+							<Suspense fallback={null}>{body}</Suspense>
+						</Box>
+						{footer && <Suspense fallback={null}>{footer}</Suspense>}
+					</Box>
+					{aside && (
+						<ContextualbarDialog>
+							<Suspense fallback={null}>{aside}</Suspense>
+						</ContextualbarDialog>
+					)}
 				</Box>
-				{footer && <Suspense fallback={null}>{footer}</Suspense>}
 			</Box>
-			{aside && (
-				<ContextualbarDialog>
-					<Suspense fallback={null}>{aside}</Suspense>
-				</ContextualbarDialog>
-			)}
-		</Box>
-	</Box>
-);
+		</LayoutContext.Provider>
+	);
+};
 
 export default RoomLayout;

From 12d630799827e75e4b3964881e79fe28d0ad81d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Thu, 19 Sep 2024 23:24:05 +0100
Subject: [PATCH 097/170] feat: `RoomSidepanel` (#33225)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
---
 .changeset/witty-lemons-type.md               |  10 ++
 apps/meteor/app/api/server/v1/rooms.ts        |   2 +-
 .../FeaturePreviewSidePanelNavigation.tsx     |  10 ++
 .../client/hooks/useRoomInfoEndpoint.ts       |   4 +-
 .../client/hooks/useSidePanelNavigation.ts    |  14 +++
 apps/meteor/client/lib/RoomManager.ts         |  28 ++++-
 .../sidebarv2/header/CreateTeamModal.tsx      |  62 ++++++++++
 .../client/sidebarv2/header/SearchSection.tsx |  30 ++++-
 apps/meteor/client/views/room/RoomOpener.tsx  |  80 +++++++------
 .../views/room/Sidepanel/RoomSidepanel.tsx    |  66 +++++++++++
 .../Sidepanel/RoomSidepanelListWrapper.tsx    |  19 ++++
 .../room/Sidepanel/RoomSidepanelLoading.tsx   |  20 ++++
 .../SidepanelItem/RoomSidepanelItem.tsx       |  29 +++++
 .../room/Sidepanel/SidepanelItem/index.ts     |   1 +
 .../room/Sidepanel/hooks/useItemData.tsx      |  68 +++++++++++
 .../Sidepanel/hooks/useTeamslistChildren.ts   | 106 ++++++++++++++++++
 .../client/views/room/Sidepanel/index.ts      |   1 +
 .../Info/EditRoomInfo/EditRoomInfo.tsx        |  68 ++++++++++-
 .../EditRoomInfo/useEditRoomInitialValues.ts  |  18 ++-
 .../client/views/room/layout/RoomLayout.tsx   |   4 +-
 .../views/room/providers/RoomProvider.tsx     |  77 +++++++++++--
 apps/meteor/lib/publishFields.ts              |   1 +
 apps/meteor/server/services/team/service.ts   |   6 +-
 packages/core-typings/src/IRoom.ts            |   3 +
 packages/i18n/src/locales/en.i18n.json        |   4 +-
 packages/rest-typings/src/v1/rooms.ts         |   2 +-
 .../FeaturePreview/FeaturePreview.tsx         |  12 +-
 .../src/hooks/useFeaturePreviewList.ts        |   2 +-
 28 files changed, 689 insertions(+), 58 deletions(-)
 create mode 100644 .changeset/witty-lemons-type.md
 create mode 100644 apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
 create mode 100644 apps/meteor/client/hooks/useSidePanelNavigation.ts
 create mode 100644 apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
 create mode 100644 apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx
 create mode 100644 apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx
 create mode 100644 apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
 create mode 100644 apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts
 create mode 100644 apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
 create mode 100644 apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
 create mode 100644 apps/meteor/client/views/room/Sidepanel/index.ts

diff --git a/.changeset/witty-lemons-type.md b/.changeset/witty-lemons-type.md
new file mode 100644
index 000000000000..a007cbe6260e
--- /dev/null
+++ b/.changeset/witty-lemons-type.md
@@ -0,0 +1,10 @@
+---
+'@rocket.chat/core-services': minor
+'@rocket.chat/model-typings': minor
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/ui-client': minor
+'@rocket.chat/meteor': minor
+---
+
+Implemented new feature preview for Sidepanel
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index 5da59d977fb1..3dc62e462ddf 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -420,7 +420,7 @@ API.v1.addRoute(
 			const discussionParent =
 				room.prid &&
 				(await Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | 'prid' | 'u'>>(room.prid, {
-					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1 },
+					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1, sidepanel: 1 },
 				}));
 			const { team, parentRoom } = await Team.getRoomInfo(room);
 			const parent = discussionParent || parentRoom;
diff --git a/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx b/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
new file mode 100644
index 000000000000..f5d658ccb2f2
--- /dev/null
+++ b/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
@@ -0,0 +1,10 @@
+import { FeaturePreview } from '@rocket.chat/ui-client';
+import type { ReactElement } from 'react';
+import React from 'react';
+
+import { useSidePanelNavigationScreenSize } from '../hooks/useSidePanelNavigation';
+
+export const FeaturePreviewSidePanelNavigation = ({ children }: { children: ReactElement[] }) => {
+	const disabled = !useSidePanelNavigationScreenSize();
+	return <FeaturePreview feature='sidepanelNavigation' disabled={disabled} children={children} />;
+};
diff --git a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
index 47ea84af20b6..0bac1d7eb413 100644
--- a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
+++ b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
@@ -1,6 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import type { OperationResult } from '@rocket.chat/rest-typings';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserId } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { minutesToMilliseconds } from 'date-fns';
@@ -8,6 +8,7 @@ import type { Meteor } from 'meteor/meteor';
 
 export const useRoomInfoEndpoint = (rid: IRoom['_id']): UseQueryResult<OperationResult<'GET', '/v1/rooms.info'>> => {
 	const getRoomInfo = useEndpoint('GET', '/v1/rooms.info');
+	const uid = useUserId();
 	return useQuery(['/v1/rooms.info', rid], () => getRoomInfo({ roomId: rid }), {
 		cacheTime: minutesToMilliseconds(15),
 		staleTime: minutesToMilliseconds(5),
@@ -17,5 +18,6 @@ export const useRoomInfoEndpoint = (rid: IRoom['_id']): UseQueryResult<Operation
 			}
 			return true;
 		},
+		enabled: !!uid,
 	});
 };
diff --git a/apps/meteor/client/hooks/useSidePanelNavigation.ts b/apps/meteor/client/hooks/useSidePanelNavigation.ts
new file mode 100644
index 000000000000..f9714580cf06
--- /dev/null
+++ b/apps/meteor/client/hooks/useSidePanelNavigation.ts
@@ -0,0 +1,14 @@
+import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
+import { useFeaturePreview } from '@rocket.chat/ui-client';
+
+export const useSidePanelNavigation = () => {
+	const isSidepanelFeatureEnabled = useFeaturePreview('sidepanelNavigation');
+	// ["xs", "sm", "md", "lg", "xl", xxl"]
+	return useSidePanelNavigationScreenSize() && isSidepanelFeatureEnabled;
+};
+
+export const useSidePanelNavigationScreenSize = () => {
+	const breakpoints = useBreakpoints();
+	// ["xs", "sm", "md", "lg", "xl", xxl"]
+	return breakpoints.includes('lg');
+};
diff --git a/apps/meteor/client/lib/RoomManager.ts b/apps/meteor/client/lib/RoomManager.ts
index 34f64e4f4c78..840493aae406 100644
--- a/apps/meteor/client/lib/RoomManager.ts
+++ b/apps/meteor/client/lib/RoomManager.ts
@@ -55,6 +55,8 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 
 	private rooms: Map<IRoom['_id'], RoomStore> = new Map();
 
+	private parentRid?: IRoom['_id'] | undefined;
+
 	constructor() {
 		super();
 		debugRoomManager &&
@@ -78,6 +80,13 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 	}
 
 	get opened(): IRoom['_id'] | undefined {
+		return this.parentRid ?? this.rid;
+	}
+
+	get openedSecondLevel(): IRoom['_id'] | undefined {
+		if (!this.parentRid) {
+			return undefined;
+		}
 		return this.rid;
 	}
 
@@ -106,20 +115,28 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 		this.emit('changed', this.rid);
 	}
 
-	open(rid: IRoom['_id']): void {
+	private _open(rid: IRoom['_id'], parent?: IRoom['_id']): void {
 		if (rid === this.rid) {
 			return;
 		}
-
 		this.back(rid);
 		if (!this.rooms.has(rid)) {
 			this.rooms.set(rid, new RoomStore(rid));
 		}
 		this.rid = rid;
+		this.parentRid = parent;
 		this.emit('opened', this.rid);
 		this.emit('changed', this.rid);
 	}
 
+	open(rid: IRoom['_id']): void {
+		this._open(rid);
+	}
+
+	openSecondLevel(parentId: IRoom['_id'], rid: IRoom['_id']): void {
+		this._open(rid, parentId);
+	}
+
 	getStore(rid: IRoom['_id']): RoomStore | undefined {
 		return this.rooms.get(rid);
 	}
@@ -130,4 +147,11 @@ const subscribeOpenedRoom = [
 	(): IRoom['_id'] | undefined => RoomManager.opened,
 ] as const;
 
+const subscribeOpenedSecondLevelRoom = [
+	(callback: () => void): (() => void) => RoomManager.on('changed', callback),
+	(): IRoom['_id'] | undefined => RoomManager.openedSecondLevel,
+] as const;
+
 export const useOpenedRoom = (): IRoom['_id'] | undefined => useSyncExternalStore(...subscribeOpenedRoom);
+
+export const useSecondLevelOpenedRoom = (): IRoom['_id'] | undefined => useSyncExternalStore(...subscribeOpenedSecondLevelRoom);
diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
index a7e7b506de0f..9de721d8bbcd 100644
--- a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
@@ -1,3 +1,4 @@
+import type { SidepanelItem } from '@rocket.chat/core-typings';
 import {
 	Box,
 	Button,
@@ -16,6 +17,7 @@ import {
 	AccordionItem,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import {
 	useEndpoint,
 	usePermission,
@@ -40,6 +42,8 @@ type CreateTeamModalInputs = {
 	encrypted: boolean;
 	broadcast: boolean;
 	members?: string[];
+	showDiscussions?: boolean;
+	showChannels?: boolean;
 };
 
 type CreateTeamModalProps = { onClose: () => void };
@@ -50,6 +54,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms');
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
+
 	const dispatchToastMessage = useToastMessageDispatch();
 	const canCreateTeam = usePermission('create-team');
 	const canSetReadOnly = usePermissionWithScopedRoles('set-readonly', ['owner']);
@@ -94,6 +99,8 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 			encrypted: (e2eEnabledForPrivateByDefault as boolean) ?? false,
 			broadcast: false,
 			members: [],
+			showChannels: true,
+			showDiscussions: true,
 		},
 	});
 
@@ -123,7 +130,10 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 		topic,
 		broadcast,
 		encrypted,
+		showChannels,
+		showDiscussions,
 	}: CreateTeamModalInputs): Promise<void> => {
+		const sidepanelItem = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [SidepanelItem, SidepanelItem?];
 		const params = {
 			name,
 			members,
@@ -136,6 +146,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 					encrypted,
 				},
 			},
+			...((showChannels || showDiscussions) && { sidepanel: { items: sidepanelItem } }),
 		};
 
 		try {
@@ -157,6 +168,8 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 	const encryptedId = useUniqueId();
 	const broadcastId = useUniqueId();
 	const addMembersId = useUniqueId();
+	const showChannelsId = useUniqueId();
+	const showDiscussionsId = useUniqueId();
 
 	return (
 		<Modal
@@ -236,6 +249,55 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 				</FieldGroup>
 				<Accordion>
 					<AccordionItem title={t('Advanced_settings')}>
+						<FeaturePreview feature='sidepanelNavigation'>
+							<FeaturePreviewOff>{null}</FeaturePreviewOff>
+							<FeaturePreviewOn>
+								<FieldGroup>
+									<Box is='h5' fontScale='h5' color='titles-labels'>
+										{t('Navigation')}
+									</Box>
+									<Field>
+										<FieldRow>
+											<FieldLabel htmlFor={showChannelsId}>{t('Channels')}</FieldLabel>
+											<Controller
+												control={control}
+												name='showChannels'
+												render={({ field: { onChange, value, ref } }): ReactElement => (
+													<ToggleSwitch
+														aria-describedby={`${showChannelsId}-hint`}
+														id={showChannelsId}
+														onChange={onChange}
+														checked={value}
+														ref={ref}
+													/>
+												)}
+											/>
+										</FieldRow>
+										<FieldDescription id={`${showChannelsId}-hint`}>{t('Show_channels_description')}</FieldDescription>
+									</Field>
+
+									<Field>
+										<FieldRow>
+											<FieldLabel htmlFor={showDiscussionsId}>{t('Discussions')}</FieldLabel>
+											<Controller
+												control={control}
+												name='showDiscussions'
+												render={({ field: { onChange, value, ref } }): ReactElement => (
+													<ToggleSwitch
+														aria-describedby={`${showDiscussionsId}-hint`}
+														id={showDiscussionsId}
+														onChange={onChange}
+														checked={value}
+														ref={ref}
+													/>
+												)}
+											/>
+										</FieldRow>
+										<FieldDescription id={`${showDiscussionsId}-hint`}>{t('Show_discussions_description')}</FieldDescription>
+									</Field>
+								</FieldGroup>
+							</FeaturePreviewOn>
+						</FeaturePreview>
 						<FieldGroup>
 							<Box is='h5' fontScale='h5' color='titles-labels'>
 								{t('Security_and_permissions')}
diff --git a/apps/meteor/client/sidebarv2/header/SearchSection.tsx b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
index 660b8ee19cd5..71b26b2e4053 100644
--- a/apps/meteor/client/sidebarv2/header/SearchSection.tsx
+++ b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
@@ -22,6 +22,32 @@ const wrapperStyle = css`
 	background-color: ${Palette.surface['surface-sidebar']};
 `;
 
+const mobileCheck = function () {
+	let check = false;
+	(function (a: string) {
+		if (
+			/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
+				a,
+			) ||
+			/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
+				a.substr(0, 4),
+			)
+		)
+			check = true;
+	})(navigator.userAgent || navigator.vendor || window.opera || '');
+	return check;
+};
+
+const shortcut = ((): string => {
+	if (navigator.userAgentData?.mobile || mobileCheck()) {
+		return '';
+	}
+	if (window.navigator.platform.toLowerCase().includes('mac')) {
+		return '(\u2318+K)';
+	}
+	return '(Ctrl+K)';
+})();
+
 const SearchSection = () => {
 	const t = useTranslation();
 	const user = useUser();
@@ -68,11 +94,13 @@ const SearchSection = () => {
 		};
 	}, [handleEscSearch, setFocus]);
 
+	const placeholder = [t('Search'), shortcut].filter(Boolean).join(' ');
+
 	return (
 		<Box className={['rcx-sidebar', isDirty && wrapperStyle]} ref={wrapperRef} role='search'>
 			<SidebarV2Section>
 				<TextInput
-					placeholder={t('Search')}
+					placeholder={placeholder}
 					{...rest}
 					ref={mergedRefs}
 					role='searchbox'
diff --git a/apps/meteor/client/views/room/RoomOpener.tsx b/apps/meteor/client/views/room/RoomOpener.tsx
index c30acf6f0e83..f87339a67a68 100644
--- a/apps/meteor/client/views/room/RoomOpener.tsx
+++ b/apps/meteor/client/views/room/RoomOpener.tsx
@@ -1,15 +1,18 @@
 import type { RoomType } from '@rocket.chat/core-typings';
-import { States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import type { ReactElement } from 'react';
 import React, { lazy, Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation';
 import { Header } from '../../components/Header';
 import { getErrorMessage } from '../../lib/errorHandling';
 import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError';
 import { OldUrlRoomError } from '../../lib/errors/OldUrlRoomError';
 import { RoomNotFoundError } from '../../lib/errors/RoomNotFoundError';
 import RoomSkeleton from './RoomSkeleton';
+import RoomSidepanel from './Sidepanel/RoomSidepanel';
 import { useOpenRoom } from './hooks/useOpenRoom';
 
 const RoomProvider = lazy(() => import('./providers/RoomProvider'));
@@ -23,46 +26,59 @@ type RoomOpenerProps = {
 	reference: string;
 };
 
+const isDirectOrOmnichannelRoom = (type: RoomType) => type === 'd' || type === 'l';
+
 const RoomOpener = ({ type, reference }: RoomOpenerProps): ReactElement => {
 	const { data, error, isSuccess, isError, isLoading } = useOpenRoom({ type, reference });
 	const { t } = useTranslation();
 
 	return (
-		<Suspense fallback={<RoomSkeleton />}>
-			{isLoading && <RoomSkeleton />}
-			{isSuccess && (
-				<RoomProvider rid={data.rid}>
-					<Room />
-				</RoomProvider>
+		<Box display='flex' w='full' h='full'>
+			{!isDirectOrOmnichannelRoom(type) && (
+				<FeaturePreviewSidePanelNavigation>
+					<FeaturePreviewOff>{null}</FeaturePreviewOff>
+					<FeaturePreviewOn>
+						<RoomSidepanel />
+					</FeaturePreviewOn>
+				</FeaturePreviewSidePanelNavigation>
 			)}
-			{isError &&
-				(() => {
-					if (error instanceof OldUrlRoomError) {
-						return <RoomSkeleton />;
-					}
 
-					if (error instanceof RoomNotFoundError) {
-						return <RoomNotFound />;
-					}
+			<Suspense fallback={<RoomSkeleton />}>
+				{isLoading && <RoomSkeleton />}
+				{isSuccess && (
+					<RoomProvider rid={data.rid}>
+						<Room />
+					</RoomProvider>
+				)}
+				{isError &&
+					(() => {
+						if (error instanceof OldUrlRoomError) {
+							return <RoomSkeleton />;
+						}
+
+						if (error instanceof RoomNotFoundError) {
+							return <RoomNotFound />;
+						}
 
-					if (error instanceof NotAuthorizedError) {
-						return <NotAuthorizedPage />;
-					}
+						if (error instanceof NotAuthorizedError) {
+							return <NotAuthorizedPage />;
+						}
 
-					return (
-						<RoomLayout
-							header={<Header />}
-							body={
-								<States>
-									<StatesIcon name='circle-exclamation' variation='danger' />
-									<StatesTitle>{t('core.Error')}</StatesTitle>
-									<StatesSubtitle>{getErrorMessage(error)}</StatesSubtitle>
-								</States>
-							}
-						/>
-					);
-				})()}
-		</Suspense>
+						return (
+							<RoomLayout
+								header={<Header />}
+								body={
+									<States>
+										<StatesIcon name='circle-exclamation' variation='danger' />
+										<StatesTitle>{t('core.Error')}</StatesTitle>
+										<StatesSubtitle>{getErrorMessage(error)}</StatesSubtitle>
+									</States>
+								}
+							/>
+						);
+					})()}
+			</Suspense>
+		</Box>
 	);
 };
 
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
new file mode 100644
index 000000000000..27c45e2774e8
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
@@ -0,0 +1,66 @@
+/* eslint-disable react/no-multi-comp */
+import { Box, Sidepanel, SidepanelListItem } from '@rocket.chat/fuselage';
+import { useUserPreference } from '@rocket.chat/ui-contexts';
+import React, { memo } from 'react';
+import { Virtuoso } from 'react-virtuoso';
+
+import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
+import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
+import { useOpenedRoom, useSecondLevelOpenedRoom } from '../../../lib/RoomManager';
+import RoomSidepanelListWrapper from './RoomSidepanelListWrapper';
+import RoomSidepanelLoading from './RoomSidepanelLoading';
+import RoomSidepanelItem from './SidepanelItem';
+import { useTeamsListChildrenUpdate } from './hooks/useTeamslistChildren';
+
+const RoomSidepanel = () => {
+	const parentRid = useOpenedRoom();
+	const secondLevelOpenedRoom = useSecondLevelOpenedRoom() ?? parentRid;
+
+	if (!parentRid || !secondLevelOpenedRoom) {
+		return null;
+	}
+
+	return <RoomSidepanelWithData parentRid={parentRid} openedRoom={secondLevelOpenedRoom} />;
+};
+
+const RoomSidepanelWithData = ({ parentRid, openedRoom }: { parentRid: string; openedRoom: string }) => {
+	const sidebarViewMode = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode');
+
+	const roomInfo = useRoomInfoEndpoint(parentRid);
+	const sidepanelItems = roomInfo.data?.room?.sidepanel?.items || roomInfo.data?.parent?.sidepanel?.items;
+
+	const result = useTeamsListChildrenUpdate(
+		parentRid,
+		!roomInfo.data ? null : roomInfo.data.room?.teamId,
+		// eslint-disable-next-line no-nested-ternary
+		!sidepanelItems ? null : sidepanelItems?.length === 1 ? sidepanelItems[0] : undefined,
+	);
+	if (roomInfo.isSuccess && !roomInfo.data.room?.sidepanel && !roomInfo.data.parent?.sidepanel) {
+		return null;
+	}
+
+	if (roomInfo.isLoading || (roomInfo.isSuccess && result.isLoading)) {
+		return <RoomSidepanelLoading />;
+	}
+
+	if (!result.isSuccess || !roomInfo.isSuccess) {
+		return null;
+	}
+
+	return (
+		<Sidepanel>
+			<Box pb={8} h='full'>
+				<Virtuoso
+					totalCount={result.data.data.length}
+					data={result.data.data}
+					components={{ Item: SidepanelListItem, List: RoomSidepanelListWrapper, Scroller: VirtuosoScrollbars }}
+					itemContent={(_, data) => (
+						<RoomSidepanelItem openedRoom={openedRoom} room={data} parentRid={parentRid} viewMode={sidebarViewMode} />
+					)}
+				/>
+			</Box>
+		</Sidepanel>
+	);
+};
+
+export default memo(RoomSidepanel);
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx
new file mode 100644
index 000000000000..dd9e6e6ec221
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx
@@ -0,0 +1,19 @@
+import { SidepanelList } from '@rocket.chat/fuselage';
+import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ForwardedRef, HTMLAttributes } from 'react';
+import React, { forwardRef } from 'react';
+
+import { useSidebarListNavigation } from '../../../sidebar/RoomList/useSidebarListNavigation';
+
+type RoomListWrapperProps = HTMLAttributes<HTMLDivElement>;
+
+const RoomSidepanelListWrapper = forwardRef(function RoomListWrapper(props: RoomListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
+	const t = useTranslation();
+	const { sidebarListRef } = useSidebarListNavigation();
+	const mergedRefs = useMergedRefs(ref, sidebarListRef);
+
+	return <SidepanelList aria-label={t('Channels')} ref={mergedRefs} {...props} />;
+});
+
+export default RoomSidepanelListWrapper;
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx
new file mode 100644
index 000000000000..00609ae6c496
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx
@@ -0,0 +1,20 @@
+import { SidebarV2Item as SidebarItem, Sidepanel, SidepanelList, Skeleton } from '@rocket.chat/fuselage';
+import React from 'react';
+
+const RoomSidepanelLoading = () => (
+	<Sidepanel>
+		<SidepanelList>
+			<SidebarItem>
+				<Skeleton w='full' />
+			</SidebarItem>
+			<SidebarItem>
+				<Skeleton w='full' />
+			</SidebarItem>
+			<SidebarItem>
+				<Skeleton w='full' />
+			</SidebarItem>
+		</SidepanelList>
+	</Sidepanel>
+);
+
+export default RoomSidepanelLoading;
diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
new file mode 100644
index 000000000000..dceb69e1aba3
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
@@ -0,0 +1,29 @@
+import type { IRoom, ISubscription, Serialized } from '@rocket.chat/core-typings';
+import { useUserSubscription } from '@rocket.chat/ui-contexts';
+import React, { memo } from 'react';
+
+import { goToRoomById } from '../../../../lib/utils/goToRoomById';
+import { useTemplateByViewMode } from '../../../../sidebarv2/hooks/useTemplateByViewMode';
+import { useItemData } from '../hooks/useItemData';
+
+export type RoomSidepanelItemProps = {
+	openedRoom?: string;
+	room: Serialized<IRoom>;
+	parentRid: string;
+	viewMode?: 'extended' | 'medium' | 'condensed';
+};
+
+const RoomSidepanelItem = ({ room, openedRoom, viewMode }: RoomSidepanelItemProps) => {
+	const SidepanelItem = useTemplateByViewMode();
+	const subscription = useUserSubscription(room._id);
+
+	const itemData = useItemData({ ...room, ...subscription } as ISubscription & IRoom, { viewMode, openedRoom }); // as any because of divergent and overlaping timestamp types in subs and room (type Date vs type string)
+
+	if (!subscription) {
+		return <SidepanelItem onClick={goToRoomById} is='a' {...itemData} />;
+	}
+
+	return <SidepanelItem onClick={goToRoomById} {...itemData} />;
+};
+
+export default memo(RoomSidepanelItem);
diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts
new file mode 100644
index 000000000000..5cfc0da3055b
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts
@@ -0,0 +1 @@
+export { default } from './RoomSidepanelItem';
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx b/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
new file mode 100644
index 000000000000..a6de01e22084
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
@@ -0,0 +1,68 @@
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
+import { SidebarV2ItemBadge as SidebarItemBadge, SidebarV2ItemIcon as SidebarItemIcon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import React, { useMemo } from 'react';
+
+import { RoomIcon } from '../../../../components/RoomIcon';
+import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
+import { getBadgeTitle, getMessage } from '../../../../sidebarv2/RoomList/SidebarItemTemplateWithData';
+import { useAvatarTemplate } from '../../../../sidebarv2/hooks/useAvatarTemplate';
+
+export const useItemData = (
+	room: ISubscription & IRoom,
+	{ openedRoom, viewMode }: { openedRoom: string | undefined; viewMode?: 'extended' | 'medium' | 'condensed' },
+) => {
+	const t = useTranslation();
+	const AvatarTemplate = useAvatarTemplate();
+
+	const highlighted = Boolean(!room.hideUnreadStatus && (room.alert || room.unread));
+
+	const icon = useMemo(
+		() => <SidebarItemIcon highlighted={highlighted} icon={<RoomIcon room={room} placement='sidebar' size='x20' />} />,
+		[highlighted, room],
+	);
+	const time = 'lastMessage' in room ? room.lastMessage?.ts : undefined;
+	const message = viewMode === 'extended' && getMessage(room, room.lastMessage, t);
+
+	const threadUnread = Number(room.tunread?.length) > 0;
+	const isUnread = room.unread > 0 || threadUnread;
+	const showBadge =
+		!room.hideUnreadStatus || (!room.hideMentionStatus && (Boolean(room.userMentions) || Number(room.tunreadUser?.length) > 0));
+	const badgeTitle = getBadgeTitle(room.userMentions, Number(room.tunread?.length), room.groupMentions, room.unread, t);
+	const variant =
+		((room.userMentions || room.tunreadUser?.length) && 'danger') ||
+		(threadUnread && 'primary') ||
+		(room.groupMentions && 'warning') ||
+		'secondary';
+
+	const badges = useMemo(
+		() => (
+			<>
+				{showBadge && isUnread && (
+					<SidebarItemBadge variant={variant} title={badgeTitle}>
+						{room.unread + (room.tunread?.length || 0)}
+					</SidebarItemBadge>
+				)}
+			</>
+		),
+		[badgeTitle, isUnread, room.tunread?.length, room.unread, showBadge, variant],
+	);
+
+	const itemData = useMemo(
+		() => ({
+			unread: highlighted,
+			selected: room.rid === openedRoom,
+			t,
+			href: roomCoordinator.getRouteLink(room.t, room) || '',
+			title: roomCoordinator.getRoomName(room.t, room) || '',
+			icon,
+			time,
+			badges,
+			avatar: AvatarTemplate && <AvatarTemplate {...room} />,
+			subtitle: message,
+		}),
+		[AvatarTemplate, badges, highlighted, icon, message, openedRoom, room, t, time],
+	);
+
+	return itemData;
+};
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
new file mode 100644
index 000000000000..5791a6e5d547
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -0,0 +1,106 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useEffect, useMemo } from 'react';
+
+import { ChatRoom } from '../../../../../app/models/client';
+
+const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
+	if (!a.lm) {
+		return 1;
+	}
+	if (!b.lm) {
+		return -1;
+	}
+	return new Date(b.lm).toUTCString().localeCompare(new Date(a.lm).toUTCString());
+};
+
+export const useTeamsListChildrenUpdate = (
+	parentRid: string,
+	teamId?: string | null,
+	sidepanelItems?: 'channels' | 'discussions' | null,
+) => {
+	const queryClient = useQueryClient();
+
+	const query = useMemo(() => {
+		const query: Parameters<typeof ChatRoom.find>[0] = {
+			$or: [
+				{
+					_id: parentRid,
+				},
+				{
+					prid: parentRid,
+				},
+			],
+		};
+
+		if (teamId && query.$or) {
+			query.$or.push({
+				teamId,
+			});
+		}
+		return query;
+	}, [parentRid, teamId]);
+
+	const teamList = useEndpoint('GET', '/v1/teams.listChildren');
+
+	const listRoomsAndDiscussions = useEndpoint('GET', '/v1/teams.listChildren');
+	const result = useQuery({
+		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems],
+		queryFn: () =>
+			listRoomsAndDiscussions({
+				roomId: parentRid,
+				sort: JSON.stringify({ lm: -1 }),
+				type: sidepanelItems || undefined,
+			}),
+		enabled: sidepanelItems !== null && teamId !== null,
+		refetchInterval: 5 * 60 * 1000,
+		keepPreviousData: true,
+	});
+
+	const { mutate: update } = useMutation({
+		mutationFn: async (params?: { action: 'add' | 'remove' | 'update'; data: IRoom }) => {
+			queryClient.setQueryData(['sidepanel', 'list', parentRid, sidepanelItems], (data: Awaited<ReturnType<typeof teamList>> | void) => {
+				if (!data) {
+					return;
+				}
+
+				if (params?.action === 'add') {
+					data.data = [JSON.parse(JSON.stringify(params.data)), ...data.data].sort(sortRoomByLastMessage);
+				}
+
+				if (params?.action === 'remove') {
+					data.data = data.data.filter((item) => item._id !== params.data?._id);
+				}
+
+				if (params?.action === 'update') {
+					data.data = data.data
+						.map((item) => (item._id === params.data?._id ? JSON.parse(JSON.stringify(params.data)) : item))
+						.sort(sortRoomByLastMessage);
+				}
+
+				return { ...data };
+			});
+		},
+	});
+
+	useEffect(() => {
+		const liveQueryHandle = ChatRoom.find(query).observe({
+			added: (item) => {
+				queueMicrotask(() => update({ action: 'add', data: item }));
+			},
+			changed: (item) => {
+				queueMicrotask(() => update({ action: 'update', data: item }));
+			},
+			removed: (item) => {
+				queueMicrotask(() => update({ action: 'remove', data: item }));
+			},
+		});
+
+		return () => {
+			liveQueryHandle.stop();
+		};
+	}, [update, query]);
+
+	return result;
+};
diff --git a/apps/meteor/client/views/room/Sidepanel/index.ts b/apps/meteor/client/views/room/Sidepanel/index.ts
new file mode 100644
index 000000000000..c236142b8b0f
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/index.ts
@@ -0,0 +1 @@
+export { default } from './RoomSidepanel';
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index b2aac49927a1..1233768a671c 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable complexity */
-import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import type { IRoomWithRetentionPolicy, SidepanelItem } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
@@ -21,10 +21,13 @@ import {
 	Box,
 	TextAreaInput,
 	AccordionItem,
+	Divider,
 } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useTranslation, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
 import type { ChangeEvent } from 'react';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
@@ -72,11 +75,12 @@ const getRetentionSetting = (roomType: IRoomWithRetentionPolicy['t']): string =>
 };
 
 const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) => {
+	const query = useQueryClient();
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const isFederated = useMemo(() => isRoomFederated(room), [room]);
 	// eslint-disable-next-line no-nested-ternary
-	const roomType = 'prid' in room ? 'discussion' : room.teamId ? 'team' : 'channel';
+	const roomType = 'prid' in room ? 'discussion' : room.teamMain ? 'team' : 'channel';
 
 	const retentionPolicy = useRetentionPolicy(room);
 	const retentionMaxAgeDefault = msToTimeUnit(TIMEUNIT.days, Number(useSetting<number>(getRetentionSetting(room.t)))) ?? 30;
@@ -118,6 +122,8 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		retentionOverrideGlobal,
 		roomType: roomTypeP,
 		reactWhenReadOnly,
+		showChannels,
+		showDiscussions,
 	} = watch();
 
 	const {
@@ -158,13 +164,23 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 			retentionIgnoreThreads,
 			...formData
 		}) => {
-			const data = getDirtyFields(formData, dirtyFields);
+			const data = getDirtyFields<Partial<typeof defaultValues>>(formData, dirtyFields);
 			delete data.archived;
+			delete data.showChannels;
+			delete data.showDiscussions;
+
+			const sidepanelItems = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [
+				SidepanelItem,
+				SidepanelItem?,
+			];
+
+			const sidepanel = sidepanelItems.length > 0 ? { items: sidepanelItems } : null;
 
 			try {
 				await saveAction({
 					rid: room._id,
 					...data,
+					...(roomType === 'team' ? { sidepanel } : null),
 					...((data.joinCode || 'joinCodeRequired' in data) && { joinCode: joinCodeRequired ? data.joinCode : '' }),
 					...((data.systemMessages || !hideSysMes) && {
 						systemMessages: hideSysMes && data.systemMessages,
@@ -180,6 +196,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 						}),
 				});
 
+				await query.invalidateQueries(['/v1/rooms.info', room._id]);
 				dispatchToastMessage({ type: 'success', message: t('Room_updated_successfully') });
 				onClickClose();
 			} catch (error) {
@@ -224,6 +241,8 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const retentionExcludePinnedField = useUniqueId();
 	const retentionFilesOnlyField = useUniqueId();
 	const retentionIgnoreThreads = useUniqueId();
+	const showDiscussionsField = useUniqueId();
+	const showChannelsField = useUniqueId();
 
 	const showAdvancedSettings = canViewEncrypted || canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
 	const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy?.enabled;
@@ -355,6 +374,49 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 						<Accordion>
 							{showAdvancedSettings && (
 								<AccordionItem title={t('Advanced_settings')}>
+									{roomType === 'team' && (
+										<FeaturePreview feature='sidepanelNavigation'>
+											<FeaturePreviewOff>{null}</FeaturePreviewOff>
+											<FeaturePreviewOn>
+												<FieldGroup>
+													<Box is='h5' fontScale='h5' color='titles-labels'>
+														{t('Navigation')}
+													</Box>
+													<Field>
+														<FieldRow>
+															<FieldLabel htmlFor={showChannelsField}>{t('Channels')}</FieldLabel>
+															<Controller
+																control={control}
+																name='showChannels'
+																render={({ field: { value, ...field } }) => (
+																	<ToggleSwitch id={showChannelsField} checked={value} {...field} />
+																)}
+															/>
+														</FieldRow>
+														<FieldRow>
+															<FieldHint id={`${showChannelsField}-hint`}>{t('Show_channels_description')}</FieldHint>
+														</FieldRow>
+													</Field>
+													<Field>
+														<FieldRow>
+															<FieldLabel htmlFor={showDiscussionsField}>{t('Discussions')}</FieldLabel>
+															<Controller
+																control={control}
+																name='showDiscussions'
+																render={({ field: { value, ...field } }) => (
+																	<ToggleSwitch id={showDiscussionsField} checked={value} {...field} />
+																)}
+															/>
+														</FieldRow>
+														<FieldRow>
+															<FieldHint id={`${showDiscussionsField}-hint`}>{t('Show_discussions_description')}</FieldHint>
+														</FieldRow>
+													</Field>
+												</FieldGroup>
+												<Divider mb={24} />
+											</FeaturePreviewOn>
+										</FeaturePreview>
+									)}
 									<FieldGroup>
 										<Box is='h5' fontScale='h5' color='titles-labels'>
 											{t('Security_and_permissions')}
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
index 1a002727358f..b71f8e1b5bc5 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -10,7 +10,20 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 	const retentionPolicy = useRetentionPolicy(room);
 	const canEditRoomRetentionPolicy = usePermission('edit-room-retention-policy', room._id);
 
-	const { t, ro, archived, topic, description, announcement, joinCodeRequired, sysMes, encrypted, retention, reactWhenReadOnly } = room;
+	const {
+		t,
+		ro,
+		archived,
+		topic,
+		description,
+		announcement,
+		joinCodeRequired,
+		sysMes,
+		encrypted,
+		retention,
+		reactWhenReadOnly,
+		sidepanel,
+	} = room;
 
 	return useMemo(
 		() => ({
@@ -37,6 +50,8 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
 					retentionIgnoreThreads: retention?.ignoreThreads ?? retentionPolicy.ignoreThreads,
 				}),
+			showDiscussions: sidepanel?.items.includes('discussions'),
+			showChannels: sidepanel?.items.includes('channels'),
 		}),
 		[
 			announcement,
@@ -53,6 +68,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 			encrypted,
 			reactWhenReadOnly,
 			canEditRoomRetentionPolicy,
+			sidepanel,
 		],
 	);
 };
diff --git a/apps/meteor/client/views/room/layout/RoomLayout.tsx b/apps/meteor/client/views/room/layout/RoomLayout.tsx
index b5e29c05799f..3c0c4c313c99 100644
--- a/apps/meteor/client/views/room/layout/RoomLayout.tsx
+++ b/apps/meteor/client/views/room/layout/RoomLayout.tsx
@@ -59,7 +59,7 @@ const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps):
 				[layout, contextualbarPosition, contextualbarSize],
 			)}
 		>
-			<Box h='full' display='flex' flexDirection='column' bg='room' {...props} ref={ref}>
+			<Box h='full' w='full' display='flex' flexDirection='column' bg='room' {...props} ref={ref}>
 				<Suspense
 					fallback={
 						<FeaturePreview feature='newNavigation'>
@@ -82,7 +82,7 @@ const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps):
 						{footer && <Suspense fallback={null}>{footer}</Suspense>}
 					</Box>
 					{aside && (
-						<ContextualbarDialog>
+						<ContextualbarDialog position={contextualbarPosition}>
 							<Suspense fallback={null}>{aside}</Suspense>
 						</ContextualbarDialog>
 					)}
diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx
index 65c83100b1c0..d67c8566e3c6 100644
--- a/apps/meteor/client/views/room/providers/RoomProvider.tsx
+++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx
@@ -8,12 +8,15 @@ import { RoomHistoryManager } from '../../../../app/ui-utils/client';
 import { UserAction } from '../../../../app/ui/client/lib/UserAction';
 import { useReactiveQuery } from '../../../hooks/useReactiveQuery';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
+import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
+import { useSidePanelNavigation } from '../../../hooks/useSidePanelNavigation';
 import { RoomManager } from '../../../lib/RoomManager';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import ImageGalleryProvider from '../../../providers/ImageGalleryProvider';
 import RoomNotFound from '../RoomNotFound';
 import RoomSkeleton from '../RoomSkeleton';
 import { useRoomRolesManagement } from '../body/hooks/useRoomRolesManagement';
+import type { IRoomWithFederationOriginalName } from '../contexts/RoomContext';
 import { RoomContext } from '../contexts/RoomContext';
 import ComposerPopupProvider from './ComposerPopupProvider';
 import RoomToolboxProvider from './RoomToolboxProvider';
@@ -30,15 +33,17 @@ type RoomProviderProps = {
 const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 	useRoomRolesManagement(rid);
 
-	const { data: room, isSuccess } = useRoomQuery(rid);
+	const resultFromServer = useRoomInfoEndpoint(rid);
+
+	const resultFromLocal = useRoomQuery(rid);
 
 	// TODO: the following effect is a workaround while we don't have a general and definitive solution for it
 	const router = useRouter();
 	useEffect(() => {
-		if (isSuccess && !room) {
+		if (resultFromLocal.isSuccess && !resultFromLocal.data) {
 			router.navigate('/home');
 		}
-	}, [isSuccess, room, router]);
+	}, [resultFromLocal.data, resultFromLocal.isSuccess, resultFromServer, router]);
 
 	const subscriptionQuery = useReactiveQuery(['subscriptions', { rid }], () => ChatSubscription.findOne({ rid }) ?? null);
 
@@ -46,7 +51,8 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 
 	useUsersNameChanged();
 
-	const pseudoRoom = useMemo(() => {
+	const pseudoRoom: IRoomWithFederationOriginalName | null = useMemo(() => {
+		const room = resultFromLocal.data;
 		if (!room) {
 			return null;
 		}
@@ -57,7 +63,7 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 			name: roomCoordinator.getRoomName(room.t, room),
 			federationOriginalName: room.name,
 		};
-	}, [room, subscriptionQuery.data]);
+	}, [resultFromLocal.data, subscriptionQuery.data]);
 
 	const { hasMorePreviousMessages, hasMoreNextMessages, isLoadingMoreMessages } = useReactiveValue(
 		useCallback(() => {
@@ -86,12 +92,69 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 		};
 	}, [hasMoreNextMessages, hasMorePreviousMessages, isLoadingMoreMessages, pseudoRoom, rid, subscriptionQuery.data]);
 
+	const isSidepanelFeatureEnabled = useSidePanelNavigation();
+
 	useEffect(() => {
+		if (isSidepanelFeatureEnabled) {
+			if (resultFromServer.isSuccess) {
+				if (resultFromServer.data.room?.teamMain) {
+					if (
+						resultFromServer.data.room.sidepanel?.items.includes('channels') ||
+						resultFromServer.data.room?.sidepanel?.items.includes('discussions')
+					) {
+						RoomManager.openSecondLevel(rid, rid);
+					} else {
+						RoomManager.open(rid);
+					}
+					return (): void => {
+						RoomManager.back(rid);
+					};
+				}
+
+				switch (true) {
+					case resultFromServer.data.room?.prid &&
+						resultFromServer.data.parent &&
+						resultFromServer.data.parent.sidepanel?.items.includes('discussions'):
+						RoomManager.openSecondLevel(resultFromServer.data.parent._id, rid);
+						break;
+					case resultFromServer.data.team?.roomId &&
+						!resultFromServer.data.room?.teamMain &&
+						resultFromServer.data.parent?.sidepanel?.items.includes('channels'):
+						RoomManager.openSecondLevel(resultFromServer.data.team.roomId, rid);
+						break;
+
+					default:
+						if (
+							resultFromServer.data.parent?.sidepanel?.items.includes('channels') ||
+							resultFromServer.data.parent?.sidepanel?.items.includes('discussions')
+						) {
+							RoomManager.openSecondLevel(rid, rid);
+						} else {
+							RoomManager.open(rid);
+						}
+						break;
+				}
+			}
+			return (): void => {
+				RoomManager.back(rid);
+			};
+		}
+
 		RoomManager.open(rid);
 		return (): void => {
 			RoomManager.back(rid);
 		};
-	}, [rid]);
+	}, [
+		isSidepanelFeatureEnabled,
+		rid,
+		resultFromServer.data?.room?.prid,
+		resultFromServer.data?.room?.teamId,
+		resultFromServer.data?.room?.teamMain,
+		resultFromServer.isSuccess,
+		resultFromServer.data?.parent,
+		resultFromServer.data?.team?.roomId,
+		resultFromServer.data,
+	]);
 
 	const subscribed = !!subscriptionQuery.data;
 
@@ -104,7 +167,7 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 	}, [rid, subscribed]);
 
 	if (!pseudoRoom) {
-		return isSuccess && !room ? <RoomNotFound /> : <RoomSkeleton />;
+		return resultFromLocal.isSuccess && !resultFromLocal.data ? <RoomNotFound /> : <RoomSkeleton />;
 	}
 
 	return (
diff --git a/apps/meteor/lib/publishFields.ts b/apps/meteor/lib/publishFields.ts
index c1483ea86cd1..48d0f9c87d5c 100644
--- a/apps/meteor/lib/publishFields.ts
+++ b/apps/meteor/lib/publishFields.ts
@@ -74,6 +74,7 @@ export const roomFields = {
 	avatarETag: 1,
 	usersCount: 1,
 	msgs: 1,
+	sidepanel: 1,
 
 	// @TODO create an API to register this fields based on room type
 	tags: 1,
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index f5218c88402a..4be96bff9866 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -1055,8 +1055,10 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		return rooms;
 	}
 
-	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id'> | null> {
-		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id'>>(team.roomId, { projection: { name: 1, fname: 1, t: 1 } });
+	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id' | 'sidepanel'> | null> {
+		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id' | 'sidepanel'>>(team.roomId, {
+			projection: { name: 1, fname: 1, t: 1, sidepanel: 1 },
+		});
 	}
 
 	async getRoomInfo(
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index 0ce1b1041de6..95f2836da1e7 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -99,6 +99,9 @@ export const isSidepanelItem = (item: any): item is SidepanelItem => {
 };
 
 export const isValidSidepanel = (sidepanel: IRoom['sidepanel']) => {
+	if (sidepanel === null) {
+		return true;
+	}
 	if (!sidepanel?.items) {
 		return false;
 	}
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 796e9d0519ff..728ca256952d 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -6541,8 +6541,8 @@
   "Incoming_Calls": "Incoming calls",
   "Advanced_settings": "Advanced settings",
   "Security_and_permissions": "Security and permissions",
-  "Sidepanel_navigation": "Sidepanel navigation for teams",
-  "Sidepanel_navigation_description": "Option to open a sidepanel with channels and/or discussions associated with the team. This allows team owners to customize communication methods to best meet their team’s needs. This feature is only available when Enhanced navigation experience is enabled.",
+  "Sidepanel_navigation": "Secondary navigation for teams",
+  "Sidepanel_navigation_description": "Display channels and/or discussions associated with teams by default. This allows team owners to customize communication methods to best meet their team’s needs. This is currently in feature preview and will be a premium capability once fully released.",
   "Show_channels_description": "Show team channels in second sidebar",
   "Show_discussions_description": "Show team discussions in second sidebar"
 }
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index c837ba7186bd..16debe87e44c 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -626,7 +626,7 @@ export type RoomsEndpoints = {
 	'/v1/rooms.info': {
 		GET: (params: RoomsInfoProps) => {
 			room: IRoom | undefined;
-			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
+			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
 			team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 		};
 	};
diff --git a/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx b/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx
index 09ec0700cb79..c297cc839abc 100644
--- a/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx
+++ b/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx
@@ -5,8 +5,16 @@ import { Children, Suspense, cloneElement } from 'react';
 import { useFeaturePreview } from '../../hooks/useFeaturePreview';
 import { FeaturesAvailable } from '../../hooks/useFeaturePreviewList';
 
-export const FeaturePreview = ({ feature, children }: { feature: FeaturesAvailable; children: ReactElement[] }) => {
-	const featureToggleEnabled = useFeaturePreview(feature);
+export const FeaturePreview = ({
+	feature,
+	disabled = false,
+	children,
+}: {
+	disabled?: boolean;
+	feature: FeaturesAvailable;
+	children: ReactElement[];
+}) => {
+	const featureToggleEnabled = useFeaturePreview(feature) && !disabled;
 
 	const toggledChildren = Children.map(children, (child) =>
 		cloneElement(child, {
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index 172045197f8c..ff103a8d84ef 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -72,7 +72,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		description: 'Sidepanel_navigation_description',
 		group: 'Navigation',
 		value: false,
-		enabled: false,
+		enabled: true,
 		enableQuery: {
 			name: 'newNavigation',
 			value: true,

From 015c862c999517ad74710b951a7c47b2c00ed091 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Sep 2024 20:02:19 -0300
Subject: [PATCH 098/170] ci: auto candidate releases (#33325)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .github/workflows/release-candidate.yml | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/release-candidate.yml

diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
new file mode 100644
index 000000000000..4a1e67fca33a
--- /dev/null
+++ b/.github/workflows/release-candidate.yml
@@ -0,0 +1,35 @@
+name: Release candidate cut
+on:
+  schedule:
+    - cron: '28 0 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
+jobs:
+  new-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
+          token: ${{ secrets.CI_PAT }}
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        with:
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - uses: rharkor/caching-for-turbo@v1.5
+
+      - name: Build packages
+        run: yarn build
+
+      - name: 'Start release candidate'
+        uses: ./packages/release-action
+        with:
+          action: next
+          base-ref: ${{ github.ref_name }}
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CI_PAT }}

From 7faba775f0967ce745bfbe48c51561e8c1c33c48 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Thu, 19 Sep 2024 17:57:54 -0600
Subject: [PATCH 099/170] refactor: Reactions set/unset (#32994)

---
 apps/meteor/app/api/server/v1/chat.ts         |   2 +-
 .../app/reactions/server/setReaction.ts       | 109 +++--
 apps/meteor/server/models/raw/EmojiCustom.ts  |   8 +
 .../app/reactions/server/setReaction.spec.ts  | 428 ++++++++++++++++++
 .../src/models/IEmojiCustomModel.ts           |   1 +
 5 files changed, 499 insertions(+), 49 deletions(-)
 create mode 100644 apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts

diff --git a/apps/meteor/app/api/server/v1/chat.ts b/apps/meteor/app/api/server/v1/chat.ts
index 3ccc9caeafa0..d04d1a2418b5 100644
--- a/apps/meteor/app/api/server/v1/chat.ts
+++ b/apps/meteor/app/api/server/v1/chat.ts
@@ -376,7 +376,7 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-emoji-param-not-provided', 'The required "emoji" param is missing.');
 			}
 
-			await executeSetReaction(this.userId, emoji, msg._id, this.bodyParams.shouldReact);
+			await executeSetReaction(this.userId, emoji, msg, this.bodyParams.shouldReact);
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/app/reactions/server/setReaction.ts b/apps/meteor/app/reactions/server/setReaction.ts
index 8f9c24633407..be6e5aed4a54 100644
--- a/apps/meteor/app/reactions/server/setReaction.ts
+++ b/apps/meteor/app/reactions/server/setReaction.ts
@@ -4,7 +4,6 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, EmojiCustom, Rooms, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
-import _ from 'underscore';
 
 import { callbacks } from '../../../lib/callbacks';
 import { i18n } from '../../../server/lib/i18n';
@@ -12,26 +11,39 @@ import { canAccessRoomAsync } from '../../authorization/server';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { emoji } from '../../emoji/server';
 import { isTheLastMessage } from '../../lib/server/functions/isTheLastMessage';
-import { notifyOnRoomChangedById, notifyOnMessageChange } from '../../lib/server/lib/notifyListener';
+import { notifyOnMessageChange } from '../../lib/server/lib/notifyListener';
 
-const removeUserReaction = (message: IMessage, reaction: string, username: string) => {
+export const removeUserReaction = (message: IMessage, reaction: string, username: string) => {
 	if (!message.reactions) {
 		return message;
 	}
 
-	message.reactions[reaction].usernames.splice(message.reactions[reaction].usernames.indexOf(username), 1);
-	if (message.reactions[reaction].usernames.length === 0) {
+	const idx = message.reactions[reaction].usernames.indexOf(username);
+
+	// user not found in reaction array
+	if (idx === -1) {
+		return message;
+	}
+
+	message.reactions[reaction].usernames.splice(idx, 1);
+	if (!message.reactions[reaction].usernames.length) {
 		delete message.reactions[reaction];
 	}
 	return message;
 };
 
-async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction: string, shouldReact?: boolean) {
-	reaction = `:${reaction.replace(/:/g, '')}:`;
+export async function setReaction(
+	room: Pick<IRoom, '_id' | 'muted' | 'unmuted' | 'reactWhenReadOnly' | 'ro' | 'lastMessage' | 'federated'>,
+	user: IUser,
+	message: IMessage,
+	reaction: string,
+	userAlreadyReacted?: boolean,
+) {
+	await Message.beforeReacted(message, room);
 
-	if (!emoji.list[reaction] && (await EmojiCustom.findByNameOrAlias(reaction, {}).count()) === 0) {
-		throw new Meteor.Error('error-not-allowed', 'Invalid emoji provided.', {
-			method: 'setReaction',
+	if (Array.isArray(room.muted) && room.muted.includes(user.username as string)) {
+		throw new Meteor.Error('error-not-allowed', i18n.t('You_have_been_muted', { lng: user.language }), {
+			rid: room._id,
 		});
 	}
 
@@ -42,50 +54,23 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 		}
 	}
 
-	if (Array.isArray(room.muted) && room.muted.indexOf(user.username as string) !== -1) {
-		throw new Meteor.Error('error-not-allowed', i18n.t('You_have_been_muted', { lng: user.language }), {
-			rid: room._id,
-		});
-	}
-
-	// if (!('reactions' in message)) {
-	// 	return;
-	// }
-
-	await Message.beforeReacted(message, room);
-
-	const userAlreadyReacted =
-		message.reactions &&
-		Boolean(message.reactions[reaction]) &&
-		message.reactions[reaction].usernames.indexOf(user.username as string) !== -1;
-	// When shouldReact was not informed, toggle the reaction.
-	if (shouldReact === undefined) {
-		shouldReact = !userAlreadyReacted;
-	}
-
-	if (userAlreadyReacted === shouldReact) {
-		return;
-	}
-
 	let isReacted;
-
 	if (userAlreadyReacted) {
 		const oldMessage = JSON.parse(JSON.stringify(message));
 		removeUserReaction(message, reaction, user.username as string);
-		if (_.isEmpty(message.reactions)) {
+		if (Object.keys(message.reactions || {}).length === 0) {
 			delete message.reactions;
+			await Messages.unsetReactions(message._id);
 			if (isTheLastMessage(room, message)) {
 				await Rooms.unsetReactionsInLastMessage(room._id);
-				void notifyOnRoomChangedById(room._id);
 			}
-			await Messages.unsetReactions(message._id);
 		} else {
 			await Messages.setReactions(message._id, message.reactions);
 			if (isTheLastMessage(room, message)) {
 				await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			}
 		}
-		await callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact, oldMessage });
+		void callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact: false, oldMessage });
 
 		isReacted = false;
 	} else {
@@ -101,33 +86,61 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 		await Messages.setReactions(message._id, message.reactions);
 		if (isTheLastMessage(room, message)) {
 			await Rooms.setReactionsInLastMessage(room._id, message.reactions);
-			void notifyOnRoomChangedById(room._id);
 		}
-		await callbacks.run('afterSetReaction', message, { user, reaction, shouldReact });
+
+		void callbacks.run('afterSetReaction', message, { user, reaction, shouldReact: true });
 
 		isReacted = true;
 	}
 
-	await Apps.self?.triggerEvent(AppEvents.IPostMessageReacted, message, user, reaction, isReacted);
+	void Apps.self?.triggerEvent(AppEvents.IPostMessageReacted, message, user, reaction, isReacted);
 
 	void notifyOnMessageChange({
 		id: message._id,
 	});
 }
 
-export async function executeSetReaction(userId: string, reaction: string, messageId: IMessage['_id'], shouldReact?: boolean) {
-	const user = await Users.findOneById(userId);
+export async function executeSetReaction(
+	userId: string,
+	reaction: string,
+	messageParam: IMessage['_id'] | IMessage,
+	shouldReact?: boolean,
+) {
+	// Check if the emoji is valid before proceeding
+	const reactionWithoutColons = reaction.replace(/:/g, '');
+	reaction = `:${reactionWithoutColons}:`;
+
+	if (!emoji.list[reaction] && (await EmojiCustom.countByNameOrAlias(reactionWithoutColons)) === 0) {
+		throw new Meteor.Error('error-not-allowed', 'Invalid emoji provided.', {
+			method: 'setReaction',
+		});
+	}
 
+	const user = await Users.findOneById(userId);
 	if (!user) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setReaction' });
 	}
 
-	const message = await Messages.findOneById(messageId);
+	const message = typeof messageParam === 'string' ? await Messages.findOneById(messageParam) : messageParam;
 	if (!message) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}
 
-	const room = await Rooms.findOneById(message.rid);
+	const userAlreadyReacted =
+		message.reactions && Boolean(message.reactions[reaction]) && message.reactions[reaction].usernames.includes(user.username as string);
+
+	// When shouldReact was not informed, toggle the reaction.
+	if (shouldReact === undefined) {
+		shouldReact = !userAlreadyReacted;
+	}
+
+	if (userAlreadyReacted === shouldReact) {
+		return;
+	}
+
+	const room = await Rooms.findOneById<
+		Pick<IRoom, '_id' | 'ro' | 'muted' | 'reactWhenReadOnly' | 'lastMessage' | 't' | 'prid' | 'federated'>
+	>(message.rid, { projection: { _id: 1, ro: 1, muted: 1, reactWhenReadOnly: 1, lastMessage: 1, t: 1, prid: 1, federated: 1 } });
 	if (!room) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}
@@ -136,7 +149,7 @@ export async function executeSetReaction(userId: string, reaction: string, messa
 		throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'setReaction' });
 	}
 
-	return setReaction(room, user, message, reaction, shouldReact);
+	return setReaction(room, user, message, reaction, userAlreadyReacted);
 }
 
 declare module '@rocket.chat/ddp-client' {
diff --git a/apps/meteor/server/models/raw/EmojiCustom.ts b/apps/meteor/server/models/raw/EmojiCustom.ts
index 300721f60d7b..ec3c6390f64d 100644
--- a/apps/meteor/server/models/raw/EmojiCustom.ts
+++ b/apps/meteor/server/models/raw/EmojiCustom.ts
@@ -72,4 +72,12 @@ export class EmojiCustomRaw extends BaseRaw<IEmojiCustom> implements IEmojiCusto
 	create(data: InsertionModel<IEmojiCustom>): Promise<InsertOneResult<WithId<IEmojiCustom>>> {
 		return this.insertOne(data);
 	}
+
+	countByNameOrAlias(name: string): Promise<number> {
+		const query = {
+			$or: [{ name }, { aliases: name }],
+		};
+
+		return this.countDocuments(query);
+	}
 }
diff --git a/apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts b/apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts
new file mode 100644
index 000000000000..e267825a6a18
--- /dev/null
+++ b/apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts
@@ -0,0 +1,428 @@
+import { expect } from 'chai';
+import { beforeEach, describe, it } from 'mocha';
+import p from 'proxyquire';
+import sinon from 'sinon';
+
+const meteorMethodsMock = sinon.stub();
+const emojiList: Record<string, any> = {};
+const modelsMock = {
+	EmojiCustom: {
+		countByNameOrAlias: sinon.stub(),
+	},
+	Users: {
+		findOneById: sinon.stub(),
+	},
+	Messages: {
+		findOneById: sinon.stub(),
+		setReactions: sinon.stub(),
+		unsetReactions: sinon.stub(),
+	},
+	Rooms: {
+		findOneById: sinon.stub(),
+		unsetReactionsInLastMessage: sinon.stub(),
+		setReactionsInLastMessage: sinon.stub(),
+	},
+};
+const canAccessRoomAsyncMock = sinon.stub();
+const isTheLastMessageMock = sinon.stub();
+const notifyOnMessageChangeMock = sinon.stub();
+const hasPermissionAsyncMock = sinon.stub();
+const i18nMock = { t: sinon.stub() };
+const callbacksRunMock = sinon.stub();
+const meteorErrorMock = class extends Error {
+	constructor(message: string) {
+		super(message);
+	}
+};
+
+const { removeUserReaction, executeSetReaction, setReaction } = p.noCallThru().load('../../../../../app/reactions/server/setReaction.ts', {
+	'@rocket.chat/models': modelsMock,
+	'@rocket.chat/core-services': { Message: { beforeReacted: sinon.stub() } },
+	'meteor/meteor': { Meteor: { methods: meteorMethodsMock, Error: meteorErrorMock } },
+	'../../../lib/callbacks': { callbacks: { run: callbacksRunMock } },
+	'../../../server/lib/i18n': { i18n: i18nMock },
+	'../../authorization/server': { canAccessRoomAsync: canAccessRoomAsyncMock },
+	'../../authorization/server/functions/hasPermission': { hasPermissionAsync: hasPermissionAsyncMock },
+	'../../emoji/server': { emoji: { list: emojiList } },
+	'../../lib/server/functions/isTheLastMessage': { isTheLastMessage: isTheLastMessageMock },
+	'../../lib/server/lib/notifyListener': {
+		notifyOnMessageChange: notifyOnMessageChangeMock,
+	},
+});
+
+describe('Reactions', () => {
+	describe('removeUserReaction', () => {
+		it('should return the message unmodified when no reactions exist', () => {
+			const message = {};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result).to.equal(message);
+		});
+		it('should remove the reaction from a message', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test', 'test2'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result.reactions.test.usernames).to.not.include('test');
+			expect(result.reactions.test.usernames).to.include('test2');
+		});
+		it('should remove the reaction from a message when the user is the last one on the array', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result.reactions.test).to.be.undefined;
+		});
+		it('should remove username only from the reaction thats passed in', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test', 'test2'],
+					},
+					other: {
+						usernames: ['test', 'test2'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result.reactions.test.usernames).to.not.include('test');
+			expect(result.reactions.test.usernames).to.include('test2');
+			expect(result.reactions.other.usernames).to.include('test');
+			expect(result.reactions.other.usernames).to.include('test2');
+		});
+		it('should do nothing if username is not in the reaction', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test', 'test2'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test3');
+			expect(result.reactions.test.usernames).to.not.include('test3');
+			expect(result.reactions.test.usernames).to.include('test');
+			expect(result.reactions.test.usernames).to.include('test2');
+		});
+	});
+	describe('executeSetReaction', () => {
+		beforeEach(() => {
+			modelsMock.EmojiCustom.countByNameOrAlias.reset();
+		});
+		it('should throw an error if reaction is not on emojione list', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(0);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should fail if user does not exist', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-invalid-user');
+		});
+		it('should fail if message does not exist', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should return nothing if user already reacted and its trying to react again', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			expect(await executeSetReaction('test', 'test', 'test', true)).to.be.undefined;
+		});
+		it('should return nothing if user hasnt reacted and its trying to unreact', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['testxxxx'] } } });
+			expect(await executeSetReaction('test', 'test', 'test', false)).to.be.undefined;
+		});
+		it('should fail if room does not exist', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			modelsMock.Rooms.findOneById.resolves(undefined);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should fail if user doesnt have acccess to the room', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			modelsMock.Rooms.findOneById.resolves({ t: 'd' });
+			canAccessRoomAsyncMock.resolves(false);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('not-authorized');
+		});
+		it('should call setReaction with correct params', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			modelsMock.Rooms.findOneById.resolves({ t: 'c' });
+			canAccessRoomAsyncMock.resolves(true);
+
+			const res = await executeSetReaction('test', 'test', 'test');
+			expect(res).to.be.undefined;
+		});
+		it('should use the message from param when the type is not an string', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Rooms.findOneById.resolves({ t: 'c' });
+			canAccessRoomAsyncMock.resolves(true);
+
+			await executeSetReaction('test', 'test', { reactions: { ':test:': { usernames: ['test'] } } });
+			expect(modelsMock.Messages.findOneById.calledOnce).to.be.false;
+		});
+	});
+	describe('setReaction', () => {
+		beforeEach(() => {
+			canAccessRoomAsyncMock.reset();
+			hasPermissionAsyncMock.reset();
+			isTheLastMessageMock.reset();
+			modelsMock.Messages.setReactions.reset();
+			modelsMock.Rooms.setReactionsInLastMessage.reset();
+			modelsMock.Rooms.unsetReactionsInLastMessage.reset();
+			modelsMock.Messages.unsetReactions.reset();
+			callbacksRunMock.reset();
+		});
+		it('should throw an error if user is muted from the room', async () => {
+			const room = {
+				muted: ['test'],
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			await expect(setReaction(room, user, message, ':test:')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should throw an error if room is readonly and cannot be reacted when readonly and user trying doesnt have permissions and user is not unmuted from room', async () => {
+			const room = {
+				ro: true,
+				reactWhenReadOnly: false,
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			canAccessRoomAsyncMock.resolves(false);
+			await expect(setReaction(room, user, message, ':test:')).to.be.rejectedWith("You can't send messages because the room is readonly.");
+		});
+		it('should remove the user reaction if userAlreadyReacted is true and call unsetReaction if reaction is the last one on message', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.unsetReactions.calledWith(message._id)).to.be.true;
+		});
+		it('should call Rooms.unsetReactionsInLastMessage when userAlreadyReacted is true and reaction is the last one on message', async () => {
+			const room = {
+				_id: 'test',
+				lastMessage: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			isTheLastMessageMock.resolves(true);
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.unsetReactions.calledWith(message._id)).to.be.true;
+			expect(modelsMock.Rooms.unsetReactionsInLastMessage.calledWith(room._id)).to.be.true;
+		});
+		it('should update the reactions object when userAlreadyReacted is true and there is more reactions on message', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+					':test2:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test2:': { usernames: ['test'] } }))).to.be.true;
+		});
+		it('should call Rooms.setReactionsInLastMessage when userAlreadyReacted is true and reaction is not the last one on message', async () => {
+			const room = {
+				_id: 'test',
+				lastMessage: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+					':test2:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			isTheLastMessageMock.resolves(true);
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test2:': { usernames: ['test'] } }))).to.be.true;
+			expect(modelsMock.Rooms.setReactionsInLastMessage.calledWith(room._id, sinon.match({ ':test2:': { usernames: ['test'] } }))).to.be
+				.true;
+		});
+		it('should call afterUnsetReaction callback when userAlreadyReacted is true', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, true);
+			expect(
+				callbacksRunMock.calledWith(
+					'afterUnsetReaction',
+					sinon.match({ _id: 'test' }),
+					sinon.match({ user, reaction, shouldReact: false, oldMessage: message }),
+				),
+			).to.be.true;
+		});
+		it('should set reactions when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+			await setReaction(room, user, message, reaction, false);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test:': { usernames: ['test'] } }))).to.be.true;
+		});
+		it('should properly add username to the list of reactions when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test2',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, false);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test:': { usernames: ['test', 'test2'] } }))).to.be
+				.true;
+		});
+		it('should call Rooms.setReactionInLastMessage when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'x5',
+				lastMessage: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+
+			isTheLastMessageMock.resolves(true);
+
+			await setReaction(room, user, message, reaction, false);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test:': { usernames: ['test'] } }))).to.be.true;
+			expect(modelsMock.Rooms.setReactionsInLastMessage.calledWith(room._id, sinon.match({ ':test:': { usernames: ['test'] } }))).to.be
+				.true;
+		});
+		it('should call afterSetReaction callback when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, false);
+			expect(
+				callbacksRunMock.calledWith('afterSetReaction', sinon.match({ _id: 'test' }), sinon.match({ user, reaction, shouldReact: true })),
+			).to.be.true;
+		});
+		it('should return undefined on a successful reaction', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+
+			expect(await setReaction(room, user, message, reaction, false)).to.be.undefined;
+		});
+	});
+});
diff --git a/packages/model-typings/src/models/IEmojiCustomModel.ts b/packages/model-typings/src/models/IEmojiCustomModel.ts
index fba5f1c3ea10..30f0323c1ec7 100644
--- a/packages/model-typings/src/models/IEmojiCustomModel.ts
+++ b/packages/model-typings/src/models/IEmojiCustomModel.ts
@@ -10,4 +10,5 @@ export interface IEmojiCustomModel extends IBaseModel<IEmojiCustom> {
 	setAliases(_id: string, aliases: string[]): Promise<UpdateResult>;
 	setExtension(_id: string, extension: string): Promise<UpdateResult>;
 	create(data: InsertionModel<IEmojiCustom>): Promise<InsertOneResult<WithId<IEmojiCustom>>>;
+	countByNameOrAlias(name: string): Promise<number>;
 }

From 274f4f58812cc0409c62380ca4292a64b6ab04b5 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 19 Sep 2024 21:15:14 -0300
Subject: [PATCH 100/170] feat: E2EE messages mentions (#32510)

---
 .changeset/late-planes-sniff.md               |  7 ++
 .../app/lib/server/methods/updateMessage.ts   |  2 +-
 apps/meteor/app/mentions/server/Mentions.ts   | 20 ++++--
 apps/meteor/client/startup/e2e.ts             | 22 ++++++
 apps/meteor/server/settings/e2e.ts            |  6 ++
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 71 +++++++++++++++++++
 .../page-objects/fragments/home-content.ts    |  2 +-
 .../core-typings/src/IMessage/IMessage.ts     |  1 +
 packages/i18n/src/locales/en.i18n.json        |  2 +
 9 files changed, 126 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/late-planes-sniff.md

diff --git a/.changeset/late-planes-sniff.md b/.changeset/late-planes-sniff.md
new file mode 100644
index 000000000000..d702a938da78
--- /dev/null
+++ b/.changeset/late-planes-sniff.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": patch
+"@rocket.chat/i18n": patch
+---
+
+Added a new setting to enable mentions in end to end encrypted channels
diff --git a/apps/meteor/app/lib/server/methods/updateMessage.ts b/apps/meteor/app/lib/server/methods/updateMessage.ts
index 8cebe563cd23..c03208a438e9 100644
--- a/apps/meteor/app/lib/server/methods/updateMessage.ts
+++ b/apps/meteor/app/lib/server/methods/updateMessage.ts
@@ -10,7 +10,7 @@ import { hasPermissionAsync } from '../../../authorization/server/functions/hasP
 import { settings } from '../../../settings/server';
 import { updateMessage } from '../functions/updateMessage';
 
-const allowedEditedFields = ['tshow', 'alias', 'attachments', 'avatar', 'emoji', 'msg', 'customFields', 'content'];
+const allowedEditedFields = ['tshow', 'alias', 'attachments', 'avatar', 'emoji', 'msg', 'customFields', 'content', 'e2eMentions'];
 
 export async function executeUpdateMessage(
 	uid: IUser['_id'],
diff --git a/apps/meteor/app/mentions/server/Mentions.ts b/apps/meteor/app/mentions/server/Mentions.ts
index 9eda56fea21c..779af2087932 100644
--- a/apps/meteor/app/mentions/server/Mentions.ts
+++ b/apps/meteor/app/mentions/server/Mentions.ts
@@ -2,7 +2,7 @@
  * Mentions is a named function that will process Mentions
  * @param {Object} message - The message object
  */
-import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
+import { isE2EEMessage, type IMessage, type IRoom, type IUser } from '@rocket.chat/core-typings';
 
 import { type MentionsParserArgs, MentionsParser } from '../lib/MentionsParser';
 
@@ -43,8 +43,13 @@ export class MentionsServer extends MentionsParser {
 			});
 	}
 
-	async getUsersByMentions({ msg, rid, u: sender }: Pick<IMessage, 'msg' | 'rid' | 'u'>): Promise<IMessage['mentions']> {
-		const mentions = this.getUserMentions(msg);
+	async getUsersByMentions(message: IMessage): Promise<IMessage['mentions']> {
+		const { msg, rid, u: sender, e2eMentions }: Pick<IMessage, 'msg' | 'rid' | 'u' | 't' | 'e2eMentions'> = message;
+
+		const mentions =
+			isE2EEMessage(message) && e2eMentions?.e2eUserMentions && e2eMentions?.e2eUserMentions.length > 0
+				? e2eMentions?.e2eUserMentions
+				: this.getUserMentions(msg);
 		const mentionsAll: { _id: string; username: string }[] = [];
 		const userMentions = [];
 
@@ -67,8 +72,13 @@ export class MentionsServer extends MentionsParser {
 		return [...mentionsAll, ...(userMentions.length ? await this.getUsers(userMentions) : [])];
 	}
 
-	async getChannelbyMentions({ msg }: Pick<IMessage, 'msg'>) {
-		const channels = this.getChannelMentions(msg);
+	async getChannelbyMentions(message: IMessage) {
+		const { msg, e2eMentions }: Pick<IMessage, 'msg' | 't' | 'e2eMentions'> = message;
+
+		const channels =
+			isE2EEMessage(message) && e2eMentions?.e2eChannelMentions && e2eMentions?.e2eChannelMentions.length > 0
+				? e2eMentions?.e2eChannelMentions
+				: this.getChannelMentions(msg);
 		return this.getChannels(channels.map((c) => c.trim().substr(1)));
 	}
 
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index de615e8f45de..e45b62563726 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -5,6 +5,7 @@ import { Tracker } from 'meteor/tracker';
 
 import { E2EEState } from '../../app/e2e/client/E2EEState';
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
+import { MentionsParser } from '../../app/mentions/lib/MentionsParser';
 import { ChatRoom } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 import { onClientBeforeSendMessage } from '../lib/onClientBeforeSendMessage';
@@ -88,6 +89,27 @@ Meteor.startup(() => {
 				return message;
 			}
 
+			const mentionsEnabled = settings.get<boolean>('E2E_Enabled_Mentions');
+
+			if (mentionsEnabled) {
+				const me = Meteor.user()?.username || '';
+				const pattern = settings.get('UTF8_User_Names_Validation');
+				const useRealName = settings.get('UI_Use_Real_Name');
+
+				const mentions = new MentionsParser({
+					pattern: () => pattern,
+					useRealName: () => useRealName,
+					me: () => me,
+				});
+
+				const e2eMentions: IMessage['e2eMentions'] = {
+					e2eUserMentions: mentions.getUserMentions(message.msg),
+					e2eChannelMentions: mentions.getChannelMentions(message.msg),
+				};
+
+				message.e2eMentions = e2eMentions;
+			}
+
 			// Should encrypt this message.
 			return e2eRoom.encryptMessage(message);
 		});
diff --git a/apps/meteor/server/settings/e2e.ts b/apps/meteor/server/settings/e2e.ts
index 6f22784f1709..c8a69757128b 100644
--- a/apps/meteor/server/settings/e2e.ts
+++ b/apps/meteor/server/settings/e2e.ts
@@ -35,4 +35,10 @@ export const createE2ESettings = () =>
 			public: true,
 			enableQuery: { _id: 'E2E_Enable', value: true },
 		});
+
+		await this.add('E2E_Enabled_Mentions', false, {
+			type: 'boolean',
+			public: true,
+			enableQuery: { _id: 'E2E_Enable', value: true },
+		});
 	});
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 8c6297e9975d..ad98df1aaa53 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -133,11 +133,13 @@ test.describe.serial('e2e-encryption', () => {
 
 	test.beforeAll(async ({ api }) => {
 		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true })).status()).toBe(200);
+		expect((await api.post('/settings/E2E_Enabled_Mentions', { value: true })).status()).toBe(200);
 	});
 
 	test.afterAll(async ({ api }) => {
 		expect((await api.post('/settings/E2E_Enable', { value: false })).status()).toBe(200);
 		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		expect((await api.post('/settings/E2E_Enabled_Mentions', { value: false })).status()).toBe(200);
 	});
 
 	test('expect create a private channel encrypted and send an encrypted message', async ({ page }) => {
@@ -265,6 +267,75 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect create a encrypted private channel and mention user', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('hello @user1');
+
+		const userMention = await page.getByRole('button', {
+			name: 'user1',
+		});
+
+		await expect(userMention).toBeVisible();
+	});
+
+	test('expect create a encrypted private channel, mention a channel and navigate to it', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('Are you in the #general channel?');
+
+		const channelMention = await page.getByRole('button', {
+			name: 'general',
+		});
+
+		await expect(channelMention).toBeVisible();
+
+		await channelMention.click();
+
+		await expect(page).toHaveURL(`/channel/general`);
+	});
+
+	test('expect create a encrypted private channel, mention a channel and user', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('Are you in the #general channel, @user1 ?');
+
+		const channelMention = await page.getByRole('button', {
+			name: 'general',
+		});
+
+		const userMention = await page.getByRole('button', {
+			name: 'user1',
+		});
+
+		await expect(userMention).toBeVisible();
+		await expect(channelMention).toBeVisible();
+	});
+
 	test('should encrypted field be available on edit room', async ({ page }) => {
 		const channelName = faker.string.uuid();
 
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 9d5e2081ca93..519d9a4102aa 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.keyboard.press('Enter');
+		await this.page.getByLabel('Send').click();
 	}
 
 	async dispatchSlashCommand(text: string): Promise<void> {
diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts
index 205cbaccd466..6c5511966ac8 100644
--- a/packages/core-typings/src/IMessage/IMessage.ts
+++ b/packages/core-typings/src/IMessage/IMessage.ts
@@ -170,6 +170,7 @@ export interface IMessage extends IRocketChatRecord {
 	tcount?: number;
 	t?: MessageTypesValues;
 	e2e?: 'pending' | 'done';
+	e2eMentions?: { e2eUserMentions?: string[]; e2eChannelMentions?: string[] };
 	otrAck?: string;
 
 	urls?: MessageUrl[];
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 728ca256952d..8ce6bea2e117 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1805,6 +1805,8 @@
   "E2E_Enabled": "E2E Enabled",
   "E2E_Enabled_Default_DirectRooms": "Enable encryption for Direct Rooms by default",
   "E2E_Enabled_Default_PrivateRooms": "Enable encryption for Private Rooms by default",
+  "E2E_Enabled_Mentions": "Mentions",
+  "E2E_Enabled_Mentions_Description": "Notify people, and highlight user, channel, and team mentions in encrypted content.",
   "E2E_Enable_Encrypt_Files": "Encrypt files",
   "E2E_Enable_Encrypt_Files_Description": "Encrypt files sent inside encrypted rooms. Check for possible conflicts in [file upload settings.](admin/settings/FileUpload)",
   "E2E_Encryption_Password_Change": "Change Encryption Password",

From 9c119a0abd9963b5ef22f64240cb118e65498c7e Mon Sep 17 00:00:00 2001
From: csuadev <72958726+csuadev@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:16:24 -0500
Subject: [PATCH 101/170] fix: markdown inconsistency with bold and italics
 (#33157)

---
 .changeset/sweet-nails-grin.md                |  5 +
 .../client/components/MarkdownText.spec.tsx   | 92 +++++++++++++++++++
 .../meteor/client/components/MarkdownText.tsx | 14 ++-
 3 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/sweet-nails-grin.md
 create mode 100644 apps/meteor/client/components/MarkdownText.spec.tsx

diff --git a/.changeset/sweet-nails-grin.md b/.changeset/sweet-nails-grin.md
new file mode 100644
index 000000000000..de240bfc0e3f
--- /dev/null
+++ b/.changeset/sweet-nails-grin.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
diff --git a/apps/meteor/client/components/MarkdownText.spec.tsx b/apps/meteor/client/components/MarkdownText.spec.tsx
new file mode 100644
index 000000000000..86ebadad8463
--- /dev/null
+++ b/apps/meteor/client/components/MarkdownText.spec.tsx
@@ -0,0 +1,92 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render } from '@testing-library/react';
+import React from 'react';
+
+import MarkdownText from './MarkdownText';
+
+import '@testing-library/jest-dom';
+
+const normalizeHtml = (html: any) => {
+	return html.replace(/\s+/g, ' ').trim();
+};
+
+const markdownText = `
+  # Heading 1
+  **Paragraph text**: *Bold with one asterisk* **Bold with two asterisks** Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+  ## Heading 2
+  _Italic Text_: _Italic with one underscore_ __Italic with two underscores__ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+  ### Heading 3 
+  Lists, Links and elements
+  **Unordered List** 
+  - List Item 1 
+  - List Item 2 
+  - List Item 3 
+  - List Item 4
+  **Ordered List** 
+  1. List Item 1
+  2. List Item 2
+  3. List Item 3
+  4. List Item 4
+  **Links:** 
+  [Rocket.Chat](rocket.chat)
+  gabriel.engel@rocket.chat 
+  +55991999999 
+  \`Inline code\`
+  \`\`\`typescript 
+  const test = 'this is code'
+  \`\`\`
+`;
+
+it('should render html elements as expected using default parser', async () => {
+	const { container } = render(<MarkdownText content={markdownText} variant='document' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	const normalizedHtml = normalizeHtml(container.innerHTML);
+
+	expect(normalizedHtml).toContain('<h1>Heading 1</h1>');
+	expect(normalizedHtml).toContain(
+		'<strong>Paragraph text</strong>: <strong>Bold with one asterisk</strong> <strong>Bold with two asterisks</strong> Lorem ipsum dolor sit amet',
+	);
+	expect(normalizedHtml).toContain('<h2>Heading 2</h2>');
+	expect(normalizedHtml).toContain(
+		'<em>Italic Text</em>: <em>Italic with one underscore</em> <em>Italic with two underscores</em> Lorem ipsum dolor sit amet',
+	);
+	expect(normalizedHtml).toContain('<h3>Heading 3</h3>');
+	expect(normalizedHtml).toContain('<ul> <li>List Item 1 </li><li>List Item 2 </li><li>List Item 3 </li><li>List Item 4');
+	expect(normalizedHtml).toContain('<ol> <li>List Item 1</li><li>List Item 2</li><li>List Item 3</li><li>List Item 4');
+	expect(normalizedHtml).toContain('<a title="" rel="nofollow noopener noreferrer" target="_blank">Rocket.Chat</a>');
+	expect(normalizedHtml).toContain('gabriel.engel@rocket.chat');
+	expect(normalizedHtml).toContain('+55991999999');
+	expect(normalizedHtml).toContain('<code>Inline code</code>');
+	expect(normalizedHtml).toContain('<pre><code class="language-typescript">const test = \'this is code\' </code></pre>');
+});
+
+it('should render html elements as expected using inline parser', async () => {
+	const { container } = render(<MarkdownText content={markdownText} variant='inline' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	const normalizedHtml = normalizeHtml(container.innerHTML);
+
+	expect(normalizedHtml).toContain('# Heading 1');
+	expect(normalizedHtml).toContain(
+		'<strong>Bold with one asterisk</strong> <strong>Bold with two asterisks</strong> Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+	);
+	expect(normalizedHtml).toContain('## Heading 2');
+	expect(normalizedHtml).toContain(
+		'<em>Italic Text</em>: <em>Italic with one underscore</em> <em>Italic with two underscores</em> Lorem ipsum dolor sit amet',
+	);
+	expect(normalizedHtml).toContain('### Heading 3');
+	expect(normalizedHtml).toContain('<strong>Unordered List</strong> - List Item 1 - List Item 2 - List Item 3 - List Item 4');
+	expect(normalizedHtml).toContain('<strong>Ordered List</strong> 1. List Item 1 2. List Item 2 3. List Item 3 4. List Item 4');
+	expect(normalizedHtml).toContain(`<a title=\"\" rel=\"nofollow noopener noreferrer\" target=\"_blank\">Rocket.Chat</a>`);
+	expect(normalizedHtml).toContain(
+		`<a href=\"mailto:gabriel.engel@rocket.chat\" title=\"mailto:gabriel.engel@rocket.chat\" rel=\"nofollow noopener noreferrer\" target=\"_blank\">gabriel.engel@rocket.chat</a>`,
+	);
+	expect(normalizedHtml).toContain('+55991999999');
+	expect(normalizedHtml).toContain('Inline code');
+	expect(normalizedHtml).toContain(`typescript const test = 'this is code'`);
+});
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index 6426b24810ee..0b7d2efa780e 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -20,12 +20,18 @@ const documentRenderer = new marked.Renderer();
 const inlineRenderer = new marked.Renderer();
 const inlineWithoutBreaks = new marked.Renderer();
 
-marked.Lexer.rules.gfm = {
-	...marked.Lexer.rules.gfm,
-	strong: /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
-	em: /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
+const walkTokens = (token: marked.Token) => {
+	const boldPattern = /^\*[^*]+\*$|^\*\*[^*]+\*\*$/;
+	const italicPattern = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;
+	if (boldPattern.test(token.raw)) {
+		token.type = 'strong';
+	} else if (italicPattern.test(token.raw)) {
+		token.type = 'em';
+	}
 };
 
+marked.use({ walkTokens });
+
 const linkMarked = (href: string | null, _title: string | null, text: string): string =>
 	`<a href="${href}" rel="nofollow noopener noreferrer">${text}</a> `;
 const paragraphMarked = (text: string): string => text;

From 599762739a71ee6b0f3a090db571a47498876a86 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:20:48 -0300
Subject: [PATCH 102/170] fix: conference calls are shown as "not answered"
 after they end (#33179)

---
 .changeset/five-coats-rhyme.md                |  5 ++++
 apps/uikit-playground/package.json            |  1 +
 apps/uikit-playground/vite.config.ts          |  4 +--
 .../VideoConferenceBlock.tsx                  | 25 +++++++++++++------
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/five-coats-rhyme.md

diff --git a/.changeset/five-coats-rhyme.md b/.changeset/five-coats-rhyme.md
new file mode 100644
index 000000000000..c5359e3c978a
--- /dev/null
+++ b/.changeset/five-coats-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/fuselage-ui-kit': patch
+---
+
+Fixed an error that incorrectly showed conference calls as not answered after they ended
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 791526c46f9d..4cca93dc00e9 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -15,6 +15,7 @@
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/tooltip": "^0.19.16",
     "@lezer/highlight": "^1.1.6",
+    "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/css-in-js": "~0.31.25",
     "@rocket.chat/fuselage": "^0.59.0",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
diff --git a/apps/uikit-playground/vite.config.ts b/apps/uikit-playground/vite.config.ts
index 61a5ab30e647..4d382d652859 100644
--- a/apps/uikit-playground/vite.config.ts
+++ b/apps/uikit-playground/vite.config.ts
@@ -7,11 +7,11 @@ export default defineConfig(() => ({
   esbuild: {},
   plugins: [react()],
   optimizeDeps: {
-    include: ['@rocket.chat/ui-contexts', '@rocket.chat/message-parser'],
+    include: ['@rocket.chat/ui-contexts', '@rocket.chat/message-parser', '@rocket.chat/core-typings'],
   },
   build: {
     commonjsOptions: {
-      include: [/ui-contexts/, /message-parser/, /node_modules/],
+      include: [/ui-contexts/, /core-typings/, /message-parser/, /node_modules/],
     },
   },
 }));
diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
index 969ad0af1d7c..7125dbbf1bc4 100644
--- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
@@ -1,3 +1,4 @@
+import { VideoConferenceStatus } from '@rocket.chat/core-typings';
 import {
   useGoToRoom,
   useTranslation,
@@ -133,9 +134,14 @@ const VideoConferenceBlock = ({
               <VideoConfMessageButton onClick={callAgainHandler}>
                 {isUserCaller ? t('Call_again') : t('Call_back')}
               </VideoConfMessageButton>
-              <VideoConfMessageFooterText>
-                {t('Call_was_not_answered')}
-              </VideoConfMessageFooterText>
+              {[
+                VideoConferenceStatus.EXPIRED,
+                VideoConferenceStatus.DECLINED,
+              ].includes(data.status) && (
+                <VideoConfMessageFooterText>
+                  {t('Call_was_not_answered')}
+                </VideoConfMessageFooterText>
+              )}
             </>
           )}
           {data.type !== 'direct' &&
@@ -151,16 +157,21 @@ const VideoConferenceBlock = ({
                 </VideoConfMessageFooterText>
               </>
             ) : (
-              <VideoConfMessageFooterText>
-                {t('Call_was_not_answered')}
-              </VideoConfMessageFooterText>
+              [
+                VideoConferenceStatus.EXPIRED,
+                VideoConferenceStatus.DECLINED,
+              ].includes(data.status) && (
+                <VideoConfMessageFooterText>
+                  {t('Call_was_not_answered')}
+                </VideoConfMessageFooterText>
+              )
             ))}
         </VideoConfMessageFooter>
       </VideoConfMessage>
     );
   }
 
-  if (data.type === 'direct' && data.status === 0) {
+  if (data.type === 'direct' && data.status === VideoConferenceStatus.CALLING) {
     return (
       <VideoConfMessage>
         <VideoConfMessageRow>

From 027183fc3e2ffe2b2c2b0875e43dd636aed99ae4 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 20 Sep 2024 00:47:27 +0000
Subject: [PATCH 103/170] Release 6.13.0-rc.0

---
 .changeset/pre.json                           | 100 +++++++++++++++++
 apps/meteor/CHANGELOG.md                      | 101 ++++++++++++++++++
 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            |  16 +++
 apps/uikit-playground/package.json            |   2 +-
 ee/apps/account-service/CHANGELOG.md          |  13 +++
 ee/apps/account-service/package.json          |   2 +-
 ee/apps/authorization-service/CHANGELOG.md    |  13 +++
 ee/apps/authorization-service/package.json    |   2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             |  14 +++
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   |  14 +++
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/presence-service/CHANGELOG.md         |  13 +++
 ee/apps/presence-service/package.json         |   2 +-
 ee/apps/queue-worker/CHANGELOG.md             |  13 +++
 ee/apps/queue-worker/package.json             |   2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       |  12 +++
 ee/apps/stream-hub-service/package.json       |   2 +-
 ee/packages/license/CHANGELOG.md              |   9 ++
 ee/packages/license/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 +-
 ee/packages/ui-theming/CHANGELOG.md           |   6 ++
 ee/packages/ui-theming/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           |  20 ++++
 packages/core-services/package.json           |   2 +-
 packages/core-typings/CHANGELOG.md            |  17 +++
 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/fuselage-ui-kit/CHANGELOG.md         |  21 ++++
 packages/fuselage-ui-kit/package.json         |   8 +-
 packages/gazzodown/CHANGELOG.md               |  16 +++
 packages/gazzodown/package.json               |   8 +-
 packages/i18n/CHANGELOG.md                    |  14 +++
 packages/i18n/package.json                    |   2 +-
 packages/instance-status/CHANGELOG.md         |   9 ++
 packages/instance-status/package.json         |   2 +-
 packages/livechat/CHANGELOG.md                |  15 +++
 packages/livechat/package.json                |   2 +-
 packages/message-parser/CHANGELOG.md          |   6 ++
 packages/message-parser/package.json          |   2 +-
 packages/mock-providers/CHANGELOG.md          |   9 ++
 packages/mock-providers/package.json          |   2 +-
 packages/model-typings/CHANGELOG.md           |  19 ++++
 packages/model-typings/package.json           |   2 +-
 packages/models/CHANGELOG.md                  |  13 +++
 packages/models/package.json                  |   2 +-
 packages/peggy-loader/CHANGELOG.md            |   6 ++
 packages/peggy-loader/package.json            |   2 +-
 packages/rest-typings/CHANGELOG.md            |  24 +++++
 packages/rest-typings/package.json            |   2 +-
 packages/ui-avatar/CHANGELOG.md               |  13 +++
 packages/ui-avatar/package.json               |   4 +-
 packages/ui-client/CHANGELOG.md               |  18 ++++
 packages/ui-client/package.json               |   6 +-
 packages/ui-composer/CHANGELOG.md             |   6 ++
 packages/ui-composer/package.json             |   2 +-
 packages/ui-contexts/CHANGELOG.md             |  12 +++
 packages/ui-contexts/package.json             |   2 +-
 packages/ui-video-conf/CHANGELOG.md           |  14 +++
 packages/ui-video-conf/package.json           |   6 +-
 packages/web-ui-registration/CHANGELOG.md     |   9 ++
 packages/web-ui-registration/package.json     |   4 +-
 yarn.lock                                     |   1 +
 80 files changed, 727 insertions(+), 52 deletions(-)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 000000000000..6976ce2b60aa
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,100 @@
+{
+  "mode": "pre",
+  "tag": "rc",
+  "initialVersions": {
+    "@rocket.chat/meteor": "6.13.0-develop",
+    "rocketchat-services": "1.3.3",
+    "@rocket.chat/uikit-playground": "0.4.0",
+    "@rocket.chat/account-service": "0.4.6",
+    "@rocket.chat/authorization-service": "0.4.6",
+    "@rocket.chat/ddp-streamer": "0.3.6",
+    "@rocket.chat/omnichannel-transcript": "0.4.6",
+    "@rocket.chat/presence-service": "0.4.6",
+    "@rocket.chat/queue-worker": "0.4.6",
+    "@rocket.chat/stream-hub-service": "0.4.6",
+    "@rocket.chat/license": "0.2.6",
+    "@rocket.chat/omnichannel-services": "0.3.3",
+    "@rocket.chat/pdf-worker": "0.2.3",
+    "@rocket.chat/presence": "0.2.6",
+    "@rocket.chat/ui-theming": "0.2.1",
+    "@rocket.chat/account-utils": "0.0.2",
+    "@rocket.chat/agenda": "0.1.0",
+    "@rocket.chat/api-client": "0.2.6",
+    "@rocket.chat/apps": "0.1.6",
+    "@rocket.chat/base64": "1.0.13",
+    "@rocket.chat/cas-validate": "0.0.2",
+    "@rocket.chat/core-services": "0.6.0",
+    "@rocket.chat/core-typings": "6.13.0-develop",
+    "@rocket.chat/cron": "0.1.6",
+    "@rocket.chat/ddp-client": "0.3.6",
+    "@rocket.chat/eslint-config": "0.7.0",
+    "@rocket.chat/favicon": "0.0.2",
+    "@rocket.chat/fuselage-ui-kit": "10.0.0",
+    "@rocket.chat/gazzodown": "10.0.0",
+    "@rocket.chat/i18n": "0.7.0",
+    "@rocket.chat/instance-status": "0.1.6",
+    "@rocket.chat/jest-presets": "0.0.1",
+    "@rocket.chat/jwt": "0.1.1",
+    "@rocket.chat/livechat": "1.19.3",
+    "@rocket.chat/log-format": "0.0.2",
+    "@rocket.chat/logger": "0.0.2",
+    "@rocket.chat/message-parser": "0.31.29",
+    "@rocket.chat/mock-providers": "0.1.2",
+    "@rocket.chat/model-typings": "0.7.0",
+    "@rocket.chat/models": "0.2.3",
+    "@rocket.chat/poplib": "0.0.2",
+    "@rocket.chat/password-policies": "0.0.2",
+    "@rocket.chat/patch-injection": "0.0.1",
+    "@rocket.chat/peggy-loader": "0.31.25",
+    "@rocket.chat/random": "1.2.2",
+    "@rocket.chat/release-action": "2.2.3",
+    "@rocket.chat/release-changelog": "0.1.0",
+    "@rocket.chat/rest-typings": "6.13.0-develop",
+    "@rocket.chat/server-cloud-communication": "0.0.2",
+    "@rocket.chat/server-fetch": "0.0.3",
+    "@rocket.chat/sha256": "1.0.10",
+    "@rocket.chat/tools": "0.2.2",
+    "@rocket.chat/ui-avatar": "6.0.0",
+    "@rocket.chat/ui-client": "10.0.0",
+    "@rocket.chat/ui-composer": "0.2.1",
+    "@rocket.chat/ui-contexts": "10.0.0",
+    "@rocket.chat/ui-kit": "0.36.1",
+    "@rocket.chat/ui-video-conf": "10.0.0",
+    "@rocket.chat/web-ui-registration": "10.0.0"
+  },
+  "changesets": [
+    "brown-singers-appear",
+    "cyan-ladybugs-thank",
+    "dirty-stingrays-beg",
+    "five-coats-rhyme",
+    "four-cherries-kneel",
+    "great-humans-live",
+    "healthy-rivers-nail",
+    "heavy-snails-help",
+    "hot-balloons-travel",
+    "khaki-cameras-glow",
+    "kind-llamas-grin",
+    "late-planes-sniff",
+    "many-balloons-scream",
+    "many-rules-shout",
+    "mighty-drinks-hide",
+    "nasty-tools-enjoy",
+    "pink-swans-teach",
+    "quiet-cherries-punch",
+    "rich-toes-bow",
+    "rotten-rabbits-brush",
+    "short-drinks-itch",
+    "sixty-spoons-own",
+    "small-crabs-travel",
+    "soft-mirrors-remember",
+    "spicy-rocks-burn",
+    "strong-grapes-brake",
+    "stupid-pigs-share",
+    "sweet-nails-grin",
+    "tame-mayflies-press",
+    "tiny-geckos-kiss",
+    "wet-hats-walk",
+    "wise-avocados-taste",
+    "witty-lemons-type"
+  ]
+}
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 97a246abaca6..dd941b905c3c 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,106 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+- ([#32729](https://github.com/RocketChat/Rocket.Chat/pull/32729)) Implemented "omnichannel/contacts.update" endpoint to update contacts
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33114](https://github.com/RocketChat/Rocket.Chat/pull/33114)) Wraps some room settings in an accordion advanced settings section in room edit contextual bar to improve organization
+
+- ([#33160](https://github.com/RocketChat/Rocket.Chat/pull/33160)) Implemented sending email via apps
+
+- ([#32945](https://github.com/RocketChat/Rocket.Chat/pull/32945)) Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- ([#33317](https://github.com/RocketChat/Rocket.Chat/pull/33317)) Fixed error during sendmessage client stub
+
+- ([#33211](https://github.com/RocketChat/Rocket.Chat/pull/33211)) Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
+
+- ([#33298](https://github.com/RocketChat/Rocket.Chat/pull/33298)) Fixed a Federation callback not awaiting db call
+
+- ([#32939](https://github.com/RocketChat/Rocket.Chat/pull/32939)) Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
+
+- ([#33197](https://github.com/RocketChat/Rocket.Chat/pull/33197)) Fixes an issue where the retention policy warning keep displaying even if the retention is disabled inside the room
+
+- ([#33321](https://github.com/RocketChat/Rocket.Chat/pull/33321)) Changed the contextualbar behavior based on chat size instead the viewport
+
+- ([#33246](https://github.com/RocketChat/Rocket.Chat/pull/33246)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#32999](https://github.com/RocketChat/Rocket.Chat/pull/32999)) Fixes multiple selection for MultiStaticSelectElement in UiKit
+
+- ([#33155](https://github.com/RocketChat/Rocket.Chat/pull/33155)) Fixed a code issue on NPS service. It was passing `startAt` as the expiration date when creating a banner.
+
+- ([#33237](https://github.com/RocketChat/Rocket.Chat/pull/33237)) fixed retention policy max age settings not being respected after upgrade
+
+- ([#33216](https://github.com/RocketChat/Rocket.Chat/pull/33216)) Prevented uiInteraction to subscribe multiple times
+
+- ([#33295](https://github.com/RocketChat/Rocket.Chat/pull/33295)) Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
+
+- ([#33193](https://github.com/RocketChat/Rocket.Chat/pull/33193)) Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
+
+- ([#33209](https://github.com/RocketChat/Rocket.Chat/pull/33209)) Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
+
+- ([#33296](https://github.com/RocketChat/Rocket.Chat/pull/33296)) Fixed remaining direct references to external user avatar URLs
+
+  Fixed local avatars having priority over external provider
+
+  It mainly corrects the behavior of E2E encryption messages and desktop notifications.
+
+- ([#33157](https://github.com/RocketChat/Rocket.Chat/pull/33157) by [@csuadev](https://github.com/csuadev)) Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
+
+- ([#33181](https://github.com/RocketChat/Rocket.Chat/pull/33181)) Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
+
+- ([#33158](https://github.com/RocketChat/Rocket.Chat/pull/33158)) Fixes an issue where multi-step modals were closing unexpectedly
+
+- <details><summary>Updated dependencies [bb94c9c67a, 9a38c8e13f, 599762739a, 7c14fd1a80, 9eaefdc892, 274f4f5881, cd0d50016e, 78e6ba4820, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 0f21fa01a3, 12d6307998]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0-rc.0
+  - @rocket.chat/i18n@0.8.0-rc.0
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-video-conf@11.0.0-rc.0
+  - @rocket.chat/ui-composer@0.3.0-rc.0
+  - @rocket.chat/gazzodown@11.0.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/web-ui-registration@11.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.4-rc.0
+  - @rocket.chat/apps@0.1.7-rc.0
+  - @rocket.chat/presence@0.2.7-rc.0
+  - @rocket.chat/api-client@0.2.7-rc.0
+  - @rocket.chat/license@0.2.7-rc.0
+  - @rocket.chat/pdf-worker@0.2.4-rc.0
+  - @rocket.chat/cron@0.1.7-rc.0
+  - @rocket.chat/instance-status@0.1.7-rc.0
+  - @rocket.chat/server-cloud-communication@0.0.2
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index cb3ad01b882a..fc41ef05cacd 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-develop"
+	"version": "6.13.0-rc.0"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 1d6e058d7597..6d9cafc01648 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 1.3.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 1.3.3
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 43659382eb67..82a55122337e 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": "1.3.3",
+	"version": "1.3.4-rc.0",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9ee7e48d1794..a09dcb657466 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": "6.13.0-develop",
+	"version": "6.13.0-rc.0",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 63a8eb47d7c6..27cdcb061719 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [599762739a, 274f4f5881, cd0d50016e, 78e6ba4820, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 4cca93dc00e9..48c099b8d9d1 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.4.0",
+  "version": "0.5.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 8d306d7b1c17..40d597827934 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index b9e45ed14eda..8438504f62f6 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.6",
+	"version": "0.4.7-rc.0",
 	"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 494c052e8cf8..70479a00abdc 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index b7912b8bc94d..19cbbd4035cf 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.6",
+	"version": "0.4.7-rc.0",
 	"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 97565b8bde88..2e13a89d03ec 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/instance-status@0.1.7-rc.0
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 87029e4b8993..d3ae93df7264 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.6",
+	"version": "0.3.7-rc.0",
 	"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 21fc879f9fd9..b29eac976532 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.4-rc.0
+  - @rocket.chat/pdf-worker@0.2.4-rc.0
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 27290070b653..f28dd6a6d783 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.6",
+	"version": "0.4.7-rc.0",
 	"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 a1ed37bb6fde..a5ad6f38cfc5 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/presence@0.2.7-rc.0
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 5968631341b0..898de184e655 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.6",
+	"version": "0.4.7-rc.0",
 	"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 16dc2590f38b..7517afb9c624 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.4-rc.0
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index b3d8b0aff94e..c661ab840b9b 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.6",
+	"version": "0.4.7-rc.0",
 	"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 ccbb83e7de0b..3469df54a291 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 9fd5cf0586f6..aecc6e9a9e99 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.6",
+	"version": "0.4.7-rc.0",
 	"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 181b6dfb0e7f..277ae4cbed4a 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 3eceb35e27ff..4adcdae3826f 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6",
+	"version": "0.2.7-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index f54493a31cd1..9ee4cf76a087 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.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/pdf-worker@0.2.4-rc.0
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 696ac6fee640..f6d4f34e8e1a 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.3",
+	"version": "0.3.4-rc.0",
 	"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 ccc01c92e84f..aa927a7b7c26 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.4-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 234463087a4e..824f196df01c 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.3",
+	"version": "0.2.4-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index a4effccb5f2b..b4d74639e58f 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 4d599562b278..80c6afe06875 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6",
+	"version": "0.2.7-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/ee/packages/ui-theming/CHANGELOG.md b/ee/packages/ui-theming/CHANGELOG.md
index 3a4956d146c3..b25ae24af33d 100644
--- a/ee/packages/ui-theming/CHANGELOG.md
+++ b/ee/packages/ui-theming/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-theming
 
+## 0.3.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index d6e3e93c01a4..0548f235c3fd 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-theming",
-	"version": "0.2.1",
+	"version": "0.3.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
diff --git a/package.json b/package.json
index f3e3ce3d3e91..2f89cab55d2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-develop",
+	"version": "6.13.0-rc.0",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 50096d81e901..6ba6da8d6cb3 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index b8d9ac155144..7e08a4d4f4d7 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.6",
+	"version": "0.2.7-rc.0",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index adb1b989bad0..4c7d0df77a29 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index ba7d008543b7..b50ad6b74309 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6",
+	"version": "0.1.7-rc.0",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index a73f804408ba..58b5d0df4f6e 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.0
+
+### Minor Changes
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 74250ffa8c16..7326f3cd3617 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0",
+	"version": "0.7.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index ac2c861590c0..1898fe2767c1 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.0
+
+### Minor Changes
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
+- <details><summary>Updated dependencies [79c16d315a]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 86123a156e75..2c5cb3f64a2d 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-develop",
+	"version": "6.13.0-rc.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 9c0c43c6f16e..7dbf3c56c145 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index aa1226271bba..a9f6a0583f78 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6",
+	"version": "0.1.7-rc.0",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 29e062a1374d..82ccc01d5a24 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/api-client@0.2.7-rc.0
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 0fc47dc9a122..5b78e5ebf1e9 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.6",
+	"version": "0.3.7-rc.0",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 41cc87932393..085dedb33bd1 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Change Log
 
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- ([#33179](https://github.com/RocketChat/Rocket.Chat/pull/33179)) Fixed an error that incorrectly showed conference calls as not answered after they ended
+
+- ([#32999](https://github.com/RocketChat/Rocket.Chat/pull/32999)) Fixes multiple selection for MultiStaticSelectElement in UiKit
+
+- <details><summary>Updated dependencies [274f4f5881, cd0d50016e, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ui-video-conf@11.0.0-rc.0
+  - @rocket.chat/gazzodown@11.0.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 80874491a951..8fb0ca254d68 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0",
+  "version": "11.0.0-rc.0",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "*",
-    "@rocket.chat/ui-contexts": "*",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.0",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.0",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "*",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.0",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 74cd44cc291c..5216831e8365 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 274f4f5881, cd0d50016e, 79c16d315a, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index c2fbf136b2d6..47bf2782226e 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.0",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -72,10 +72,10 @@
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-tokens": "*",
-		"@rocket.chat/message-parser": "0.31.29",
+		"@rocket.chat/message-parser": "0.31.30-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-client": "11.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 8a7e4f7317b9..27bb4b471c66 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/i18n
 
+## 0.8.0-rc.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+- ([#32945](https://github.com/RocketChat/Rocket.Chat/pull/32945)) Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
+
+### Patch Changes
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 7c66e102d578..fe98e3b1f7fc 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.7.0",
+	"version": "0.8.0-rc.0",
 	"private": true,
 	"type": "module",
 	"main": "./dist/index.js",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index bebd0fd56b85..e98235550ef8 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [927710d778]:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 5ea3b2cb6e0d..d092d649c80f 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.6",
+	"version": "0.1.7-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 598fae50d68d..3c9bde71c23a 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.0
+
+### Minor Changes
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e, 79c16d315a]:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  </details>
+
 ## 1.19.3
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index ce7bb92d6b78..ab4a2a9b3a11 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3",
+	"version": "1.20.0-rc.0",
 	"files": [
 		"/build"
 	],
diff --git a/packages/message-parser/CHANGELOG.md b/packages/message-parser/CHANGELOG.md
index 39c82e350b58..f263b04e632c 100644
--- a/packages/message-parser/CHANGELOG.md
+++ b/packages/message-parser/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.31.30-rc.0
+
+### Patch Changes
+
+- ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+
 ## 0.31.29
 
 ### Patch Changes
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index e58727ba38c2..39fbb4bda5dd 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/message-parser",
   "description": "Rocket.Chat parser for messages",
-  "version": "0.31.29",
+  "version": "0.31.30-rc.0",
   "author": {
     "name": "Rocket.Chat",
     "url": "https://rocket.chat/"
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index 3a2edfdf99ff..5bd539fda340 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/mock-providers
 
+## 0.1.3-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 7c14fd1a80, 274f4f5881, 0f21fa01a3]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.0
+  </details>
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index f9e9b4d06ab8..1a7051e87ff2 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.2",
+	"version": "0.1.3-rc.0",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index b743a1132b48..f0aa631439e9 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.0
+
+### Minor Changes
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 30144dabb49a..10a2fd9b643c 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0",
+	"version": "0.8.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 1238c213ec4f..1251d75001bb 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.0
+
+### Minor Changes
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index e55ce8d5a0e1..35064171d9a6 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3",
+	"version": "0.3.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/peggy-loader/CHANGELOG.md b/packages/peggy-loader/CHANGELOG.md
index 0c1ace99d7d4..422c09e4bc9a 100644
--- a/packages/peggy-loader/CHANGELOG.md
+++ b/packages/peggy-loader/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.31.26-rc.0
+
+### Patch Changes
+
+- ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index 6eb584f62d24..464be6fdc297 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/peggy-loader",
-  "version": "0.31.25",
+  "version": "0.31.26-rc.0",
   "description": "Peggy loader for webpack",
   "keywords": [
     "peggy",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 7cce8dcc6e99..b11458549219 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.0
+
+### Minor Changes
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#32729](https://github.com/RocketChat/Rocket.Chat/pull/32729)) Implemented "omnichannel/contacts.update" endpoint to update contacts
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 79c16d315a, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 972577210f56..33aad6d64823 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-develop",
+	"version": "6.13.0-rc.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index a9fa21cf7195..cfb5f9e17d20 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 6.0.0
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 0423b68f2b43..a32a7a8be6bf 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0",
+	"version": "7.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 1d172fe1054f..5471cf97ea1b 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e]:</summary>
+
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index a84317f37abc..82705ba026cb 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.0",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-composer/CHANGELOG.md b/packages/ui-composer/CHANGELOG.md
index 757dee9a2549..20d5d6ac715d 100644
--- a/packages/ui-composer/CHANGELOG.md
+++ b/packages/ui-composer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-composer
 
+## 0.3.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 0f97fef22508..363299698bfa 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/ui-composer",
-  "version": "0.2.1",
+  "version": "0.3.0-rc.0",
   "private": true,
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index aa0f00bc0e83..21aeff09a896 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 9a38c8e13f, 7c14fd1a80, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 0f21fa01a3, 12d6307998]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ddp-client@0.3.7-rc.0
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 3ef588432a7c..37f83e96a2aa 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.0",
 	"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 0ebba8028576..fe47f06728bd 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e]:</summary>
+
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index eb363da1ceae..0f1f3e50eab8 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": "10.0.0",
+	"version": "11.0.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 601f9aa63494..0a222203fdee 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ae08e05ee218..23fd80c89842 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": "10.0.0",
+	"version": "11.0.0-rc.0",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index 6b1123701996..c0fb2733310e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10493,6 +10493,7 @@ __metadata:
     "@codemirror/lang-json": ^6.0.1
     "@codemirror/tooltip": ^0.19.16
     "@lezer/highlight": ^1.1.6
+    "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
     "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1

From 65d2a453f0f0a5236d710ae0ef0587e6aabcb19d Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 20 Sep 2024 10:56:48 -0300
Subject: [PATCH 104/170] chore: update E2EE setting text (#33226)

---
 packages/i18n/src/locales/en.i18n.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 8ce6bea2e117..9f37642263da 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1788,8 +1788,8 @@
   "Duplicated_Email_address_will_be_ignored": "Duplicated email address will be ignored.",
   "Markdown_Marked_Tables": "Enable Marked Tables",
   "duplicated-account": "Duplicated account",
-  "E2E_Allow_Unencrypted_Messages": "Unencrypted messages in encrypted rooms",
-  "E2E_Allow_Unencrypted_Messages_Description": "Allow plain text messages to be sent in encrypted rooms. These messages will not be encrypted.",
+  "E2E_Allow_Unencrypted_Messages": "Access unencrypted content in encrypted rooms",
+  "E2E_Allow_Unencrypted_Messages_Description": "Allow access to encrypted rooms to people without room encryption keys. They'll be able to see and send unencrypted messages.",
   "E2E Encryption": "E2E Encryption",
   "E2E_Encryption_enabled_for_room": "End-to-end encryption enabled for #{{roomName}}",
   "E2E_Encryption_disabled_for_room": "End-to-end encryption disabled for #{{roomName}}",

From 9bcb802fdcd2a458ae8f8cd69d94173b4f40861d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <43561537+rique223@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:58:34 -0300
Subject: [PATCH 105/170] feat: Implement proper accessbility for report user
 modal (#33294)

Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
---
 .changeset/late-hats-carry.md                 |  6 ++++
 .../UserInfo/ReportUserModal.tsx              | 31 +++++++++++--------
 packages/i18n/src/locales/en.i18n.json        |  2 ++
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/late-hats-carry.md

diff --git a/.changeset/late-hats-carry.md b/.changeset/late-hats-carry.md
new file mode 100644
index 000000000000..ec24c7cd5376
--- /dev/null
+++ b/.changeset/late-hats-carry.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Improves the accessibility of the report user modal by adding an appropriate label, description, and ARIA attributes.
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
index 5f94f7c407b0..86b4571d88d1 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
@@ -1,4 +1,4 @@
-import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput } from '@rocket.chat/fuselage';
+import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput, FieldDescription } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { ComponentProps } from 'react';
@@ -45,27 +45,32 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 			onCancel={onClose}
 			confirmText={t('Report')}
 		>
+			<Box mbe={16} display='flex' alignItems='center'>
+				<UserAvatar username={username} />
+				<Box mis={8} fontScale='p2b'>
+					{displayName}
+				</Box>
+			</Box>
 			<FieldGroup>
 				<Field>
-					<FieldLabel htmlFor={reasonForReportId}>
-						<Box mbe='x12' display='flex' alignItems='center'>
-							<UserAvatar username={username} />
-							<Box mis='x12' fontScale='p1' fontWeight='700'>
-								{displayName}
-							</Box>
-						</Box>
-					</FieldLabel>
+					<FieldLabel htmlFor={reasonForReportId}>{t('Report_reason')}</FieldLabel>
+					<FieldDescription id={`${reasonForReportId}-description`}>{t('Let_moderators_know_what_the_issue_is')}</FieldDescription>
 					<FieldRow>
 						<TextAreaInput
+							id={reasonForReportId}
 							rows={3}
-							placeholder={t('Why_do_you_want_to_report_question_mark')}
 							{...register('reasonForReport', { required: t('Required_field', { field: t('Reason_for_report') }) })}
 							width='full'
-							mbe='x4'
-							aria-label={t('Reason_for_report')}
+							mbe={4}
+							aria-required='true'
+							aria-describedby={`${reasonForReportId}-description ${reasonForReportId}-error`}
 						/>
 					</FieldRow>
-					{errors.reasonForReport && <FieldError>{errors.reasonForReport.message}</FieldError>}
+					{errors.reasonForReport && (
+						<FieldError aria-live='assertive' id={`${reasonForReportId}-error`}>
+							{errors.reasonForReport.message}
+						</FieldError>
+					)}
 				</Field>
 			</FieldGroup>
 		</GenericModal>
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 9f37642263da..0e99c1bdc1d8 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -3199,6 +3199,7 @@
   "leave-p": "Leave Private Groups",
   "leave-p_description": "Permission to leave private groups",
   "Lets_get_you_new_one_": "Let's get you a new one!",
+  "Let_moderators_know_what_the_issue_is": "Let moderators know what the issue is",
   "Let_them_know": "Let them know",
   "Left": "Left",
   "License": "License",
@@ -4490,6 +4491,7 @@
   "Report_exclamation_mark": "Report!",
   "Report_has_been_sent": "Report has been sent",
   "Report_Number": "Report Number",
+  "Report_reason": "Report reason",
   "Report_this_message_question_mark": "Report this message?",
   "Report_User": "Report user",
   "Reporting": "Reporting",

From 827850d545043896722b53d2ed81af3e4d0738b7 Mon Sep 17 00:00:00 2001
From: "Julio A." <52619625+julio-cfa@users.noreply.github.com>
Date: Mon, 23 Sep 2024 21:36:58 +0200
Subject: [PATCH 106/170] fix: imported fixes (#33330)

---
 .changeset/little-bottles-peel.md             |  5 +++
 apps/meteor/app/api/server/v1/rooms.ts        |  9 +++-
 .../lib/server/methods/cleanRoomHistory.ts    |  8 ++++
 .../content/urlPreviews/OEmbedHtmlPreview.tsx | 11 ++++-
 apps/meteor/tests/end-to-end/api/methods.ts   | 43 ++++++++++++++++++-
 apps/meteor/tests/end-to-end/api/rooms.ts     | 28 ++++++++++++
 6 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/little-bottles-peel.md

diff --git a/.changeset/little-bottles-peel.md b/.changeset/little-bottles-peel.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/little-bottles-peel.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index 3dc62e462ddf..117ae3851c43 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -40,7 +40,7 @@ import {
 	findRoomsAvailableForTeams,
 } from '../lib/rooms';
 
-async function findRoomByIdOrName({
+export async function findRoomByIdOrName({
 	params,
 	checkedArchived = true,
 }: {
@@ -365,7 +365,12 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isRoomsCleanHistoryProps },
 	{
 		async post() {
-			const { _id } = await findRoomByIdOrName({ params: this.bodyParams });
+			const room = await findRoomByIdOrName({ params: this.bodyParams });
+			const { _id } = room;
+
+			if (!room || !(await canAccessRoomAsync(room, { _id: this.userId }))) {
+				return API.v1.failure('User does not have access to the room [error-not-allowed]', 'error-not-allowed');
+			}
 
 			const {
 				latest,
diff --git a/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts b/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts
index d6136eee9131..c804128d27bd 100644
--- a/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts
+++ b/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts
@@ -2,6 +2,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { findRoomByIdOrName } from '../../../api/server/v1/rooms';
+import { canAccessRoomAsync } from '../../../authorization/server';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { cleanRoomHistory } from '../functions/cleanRoomHistory';
 
@@ -56,6 +58,12 @@ Meteor.methods<ServerMethods>({
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'cleanRoomHistory' });
 		}
 
+		const room = await findRoomByIdOrName({ params: { roomId } });
+
+		if (!room || !(await canAccessRoomAsync(room, { _id: userId }))) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'cleanRoomHistory' });
+		}
+
 		return cleanRoomHistory({
 			rid: roomId,
 			latest,
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
index e8dd4e1ddcc2..518f1ebad203 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
@@ -1,12 +1,21 @@
 import { Box } from '@rocket.chat/fuselage';
+import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 
+const purifyOptions = {
+	ADD_TAGS: ['iframe'],
+	ADD_ATTR: ['frameborder', 'allow', 'allowfullscreen', 'scrolling', 'src', 'style', 'referrerpolicy'],
+	ALLOW_UNKNOWN_PROTOCOLS: true,
+};
+
 const OEmbedHtmlPreview = ({ html, ...props }: OEmbedPreviewMetadata): ReactElement => (
-	<OEmbedCollapsible {...props}>{html && <Box withRichContent dangerouslySetInnerHTML={{ __html: html }} />}</OEmbedCollapsible>
+	<OEmbedCollapsible {...props}>
+		{html && <Box withRichContent dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(html, purifyOptions) }} />}
+	</OEmbedCollapsible>
 );
 
 export default OEmbedHtmlPreview;
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index 08945994e438..e3c42389e506 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -616,9 +616,19 @@ describe('Meteor.methods', () => {
 
 	describe('[@cleanRoomHistory]', () => {
 		let rid: IRoom['_id'];
-
+		let testUser: IUser;
+		let testUserCredentials: Credentials;
 		let channelName: string;
 
+		before('update permissions', async () => {
+			await updatePermission('clean-channel-history', ['admin', 'user']);
+		});
+
+		before('create test user', async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+		});
+
 		before('create room', (done) => {
 			channelName = `methods-test-channel-${Date.now()}`;
 			void request
@@ -676,7 +686,36 @@ describe('Meteor.methods', () => {
 				.end(done);
 		});
 
-		after(() => deleteRoom({ type: 'p', roomId: rid }));
+		after(() =>
+			Promise.all([deleteRoom({ type: 'p', roomId: rid }), deleteUser(testUser), updatePermission('clean-channel-history', ['admin'])]),
+		);
+
+		it('should throw an error if user is not part of the room', async () => {
+			await request
+				.post(methodCall('cleanRoomHistory'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'cleanRoomHistory',
+						params: [
+							{
+								roomId: rid,
+								oldest: { $date: new Date().getTime() },
+								latest: { $date: new Date().getTime() },
+							},
+						],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('success', true);
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error').that.is.an('object');
+					expect(data.error).to.have.a.property('error', 'error-not-allowed');
+				});
+		});
 
 		it('should not change the _updatedAt value when nothing is changed on the room', async () => {
 			const roomBefore = await request.get(api('groups.info')).set(credentials).query({
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index 15f85964ffff..5047af7956d8 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -1133,6 +1133,34 @@ describe('[Rooms]', () => {
 				})
 				.end(done);
 		});
+		describe('test user is not part of room', async () => {
+			beforeEach(async () => {
+				await updatePermission('clean-channel-history', ['admin', 'user']);
+			});
+
+			afterEach(async () => {
+				await updatePermission('clean-channel-history', ['admin']);
+			});
+
+			it('should return an error when the user with right privileges is not part of the room', async () => {
+				await request
+					.post(api('rooms.cleanHistory'))
+					.set(userCredentials)
+					.send({
+						roomId: privateChannel._id,
+						latest: '9999-12-31T23:59:59.000Z',
+						oldest: '0001-01-01T00:00:00.000Z',
+						limit: 2000,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('errorType', 'error-not-allowed');
+						expect(res.body).to.have.property('error', 'User does not have access to the room [error-not-allowed]');
+					});
+			});
+		});
 	});
 	describe('[/rooms.info]', () => {
 		let testChannel: IRoom;

From a6b91525a8c28a640a6e378a912abc06c4ef6bae Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 23 Sep 2024 19:00:02 -0300
Subject: [PATCH 107/170] chore: create network broker package (#33338)

---
 _templates/service/new/package.json.ejs.t     |  1 +
 _templates/service/new/service.ejs.t          |  4 +-
 .../ee/server/services/ecdh-proxy/service.ts  |  3 +-
 apps/meteor/ee/server/services/package.json   |  1 +
 apps/meteor/ee/server/startup/index.ts        |  2 +-
 apps/meteor/package.json                      |  1 +
 ee/apps/account-service/Dockerfile            |  3 ++
 ee/apps/account-service/package.json          |  1 +
 ee/apps/account-service/src/service.ts        |  2 +-
 ee/apps/authorization-service/Dockerfile      |  3 ++
 ee/apps/authorization-service/package.json    |  1 +
 ee/apps/authorization-service/src/service.ts  |  2 +-
 ee/apps/ddp-streamer/Dockerfile               |  3 ++
 ee/apps/ddp-streamer/package.json             |  1 +
 ee/apps/ddp-streamer/src/service.ts           |  2 +-
 ee/apps/omnichannel-transcript/Dockerfile     |  3 ++
 ee/apps/omnichannel-transcript/package.json   |  1 +
 ee/apps/omnichannel-transcript/src/service.ts |  2 +-
 ee/apps/presence-service/Dockerfile           |  3 ++
 ee/apps/presence-service/package.json         |  1 +
 ee/apps/presence-service/src/service.ts       |  2 +-
 ee/apps/queue-worker/Dockerfile               |  3 ++
 ee/apps/queue-worker/package.json             |  1 +
 ee/apps/queue-worker/src/service.ts           |  2 +-
 ee/apps/stream-hub-service/Dockerfile         |  3 ++
 ee/apps/stream-hub-service/package.json       |  1 +
 ee/apps/stream-hub-service/src/service.ts     |  2 +-
 ee/packages/network-broker/.eslintrc.json     |  4 ++
 ee/packages/network-broker/jest.config.ts     |  6 +++
 ee/packages/network-broker/package.json       | 39 +++++++++++++++++++
 .../network-broker/src}/EnterpriseCheck.ts    |  0
 .../network-broker/src/NetworkBroker.test.ts  |  4 +-
 .../network-broker/src}/NetworkBroker.ts      | 16 +++++---
 .../packages/network-broker/src/index.ts      |  2 +-
 ee/packages/network-broker/tsconfig.json      |  9 +++++
 yarn.lock                                     | 31 +++++++++++++++
 36 files changed, 145 insertions(+), 20 deletions(-)
 create mode 100644 ee/packages/network-broker/.eslintrc.json
 create mode 100644 ee/packages/network-broker/jest.config.ts
 create mode 100644 ee/packages/network-broker/package.json
 rename {apps/meteor/ee/server/lib => ee/packages/network-broker/src}/EnterpriseCheck.ts (100%)
 rename apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts => ee/packages/network-broker/src/NetworkBroker.test.ts (85%)
 rename {apps/meteor/ee/server => ee/packages/network-broker/src}/NetworkBroker.ts (94%)
 rename apps/meteor/ee/server/startup/broker.ts => ee/packages/network-broker/src/index.ts (98%)
 create mode 100644 ee/packages/network-broker/tsconfig.json

diff --git a/_templates/service/new/package.json.ejs.t b/_templates/service/new/package.json.ejs.t
index 2c74278d1ced..0aa1bd69e995 100644
--- a/_templates/service/new/package.json.ejs.t
+++ b/_templates/service/new/package.json.ejs.t
@@ -20,6 +20,7 @@ to: ee/apps/<%= name %>/package.json
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/emitter": "next",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
index 54080d94cf08..77f02d2b7769 100644
--- a/_templates/service/new/service.ejs.t
+++ b/_templates/service/new/service.ejs.t
@@ -1,11 +1,11 @@
 ---
 to: ee/apps/<%= name %>/src/service.ts
 ---
+import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
-import { api } from '@rocket.chat/core-services';
 
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
diff --git a/apps/meteor/ee/server/services/ecdh-proxy/service.ts b/apps/meteor/ee/server/services/ecdh-proxy/service.ts
index 7ef3e8d26dcc..a795f157c9a5 100755
--- a/apps/meteor/ee/server/services/ecdh-proxy/service.ts
+++ b/apps/meteor/ee/server/services/ecdh-proxy/service.ts
@@ -1,5 +1,4 @@
-import '../../startup/broker';
-
+import '@rocket.chat/network-broker';
 import { api } from '@rocket.chat/core-services';
 
 import { ECDHProxy } from './ECDHProxy';
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 43659382eb67..a2adb5872ad2 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -25,6 +25,7 @@
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/apps/meteor/ee/server/startup/index.ts b/apps/meteor/ee/server/startup/index.ts
index a8091f0e9a37..eb09ca6ed30f 100644
--- a/apps/meteor/ee/server/startup/index.ts
+++ b/apps/meteor/ee/server/startup/index.ts
@@ -13,7 +13,7 @@ import { isRunningMs } from '../../../server/lib/isRunningMs';
 export const registerEEBroker = async (): Promise<void> => {
 	// only starts network broker if running in micro services mode
 	if (isRunningMs()) {
-		const { broker } = await import('./broker');
+		const { broker } = await import('@rocket.chat/network-broker');
 
 		api.setBroker(broker);
 		void api.start();
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9ee7e48d1794..c7da95059475 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -262,6 +262,7 @@
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/mp3-encoder": "0.24.0",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/onboarding-ui": "~0.33.3",
 		"@rocket.chat/password-policies": "workspace:^",
diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
index acbc5b0371d2..c80d4f2eb376 100644
--- a/ee/apps/account-service/Dockerfile
+++ b/ee/apps/account-service/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index b9e45ed14eda..6f92b8eb9078 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
index f166233ca137..07ca30ed748f 100755
--- a/ee/apps/account-service/src/service.ts
+++ b/ee/apps/account-service/src/service.ts
@@ -1,10 +1,10 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3033;
 
diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
index c662d8765300..9a9e8ded922c 100644
--- a/ee/apps/authorization-service/Dockerfile
+++ b/ee/apps/authorization-service/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index b7912b8bc94d..262fb6789f9d 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
index 29162b636229..4dcd466afa60 100755
--- a/ee/apps/authorization-service/src/service.ts
+++ b/ee/apps/authorization-service/src/service.ts
@@ -1,10 +1,10 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3034;
 
diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
index f556cbde6752..32103dc3528b 100644
--- a/ee/apps/ddp-streamer/Dockerfile
+++ b/ee/apps/ddp-streamer/Dockerfile
@@ -40,6 +40,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 87029e4b8993..84859add8d7b 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -23,6 +23,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"colorette": "^1.4.0",
diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
index b5cd20f7ec02..07666a265dbe 100755
--- a/ee/apps/ddp-streamer/src/service.ts
+++ b/ee/apps/ddp-streamer/src/service.ts
@@ -1,9 +1,9 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 (async () => {
 	const db = await getConnection();
diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
index 6a93a8e5e8be..9b7e47968e68 100644
--- a/ee/apps/omnichannel-transcript/Dockerfile
+++ b/ee/apps/omnichannel-transcript/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 27290070b653..ced114bfb589 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -22,6 +22,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/pdf-worker": "workspace:^",
 		"@rocket.chat/tools": "workspace:^",
diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
index 14cbc5b8438a..66456456fb74 100644
--- a/ee/apps/omnichannel-transcript/src/service.ts
+++ b/ee/apps/omnichannel-transcript/src/service.ts
@@ -1,11 +1,11 @@
 import { api } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3036;
 
diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
index aa9c1c0bd6c9..430880d29606 100644
--- a/ee/apps/presence-service/Dockerfile
+++ b/ee/apps/presence-service/Dockerfile
@@ -40,6 +40,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 5968631341b0..d8e47cc5c5ea 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/presence": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
index b7275a29106f..0e1c97f2daa2 100755
--- a/ee/apps/presence-service/src/service.ts
+++ b/ee/apps/presence-service/src/service.ts
@@ -1,10 +1,10 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3031;
 
diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
index 6a93a8e5e8be..9b7e47968e68 100644
--- a/ee/apps/queue-worker/Dockerfile
+++ b/ee/apps/queue-worker/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index b3d8b0aff94e..4270818a6eb3 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -22,6 +22,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@types/node": "^14.18.63",
 		"ejson": "^2.2.3",
diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
index 8583257a6860..4bc6c9642913 100644
--- a/ee/apps/queue-worker/src/service.ts
+++ b/ee/apps/queue-worker/src/service.ts
@@ -1,11 +1,11 @@
 import { api } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3038;
 
diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
index c662d8765300..9a9e8ded922c 100644
--- a/ee/apps/stream-hub-service/Dockerfile
+++ b/ee/apps/stream-hub-service/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 9fd5cf0586f6..66443ebeec68 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -21,6 +21,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
 		"ejson": "^2.2.3",
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index 4975b5b306be..eade703321d2 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -1,11 +1,11 @@
 import { api } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { StreamHub } from './StreamHub';
 
diff --git a/ee/packages/network-broker/.eslintrc.json b/ee/packages/network-broker/.eslintrc.json
new file mode 100644
index 000000000000..a83aeda48e66
--- /dev/null
+++ b/ee/packages/network-broker/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+	"extends": ["@rocket.chat/eslint-config"],
+	"ignorePatterns": ["**/dist"]
+}
diff --git a/ee/packages/network-broker/jest.config.ts b/ee/packages/network-broker/jest.config.ts
new file mode 100644
index 000000000000..c18c8ae02465
--- /dev/null
+++ b/ee/packages/network-broker/jest.config.ts
@@ -0,0 +1,6 @@
+import server from '@rocket.chat/jest-presets/server';
+import type { Config } from 'jest';
+
+export default {
+	preset: server.preset,
+} satisfies Config;
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
new file mode 100644
index 000000000000..c4d3ea1b284b
--- /dev/null
+++ b/ee/packages/network-broker/package.json
@@ -0,0 +1,39 @@
+{
+	"name": "@rocket.chat/network-broker",
+	"version": "0.1.0",
+	"private": true,
+	"devDependencies": {
+		"@rocket.chat/eslint-config": "workspace:^",
+		"@types/chai": "~4.3.19",
+		"@types/ejson": "^2.2.2",
+		"@types/node": "^14.18.63",
+		"@types/sinon": "^10.0.20",
+		"chai": "^4.3.10",
+		"eslint": "~8.45.0",
+		"jest": "~29.7.0",
+		"sinon": "^14.0.2",
+		"typescript": "~5.5.4"
+	},
+	"scripts": {
+		"lint": "eslint src",
+		"lint:fix": "eslint src --fix",
+		"test": "jest",
+		"build": "tsc",
+		"testunit": "jest",
+		"typecheck": "tsc --noEmit --skipLibCheck"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"volta": {
+		"extends": "../../../package.json"
+	},
+	"dependencies": {
+		"@rocket.chat/core-services": "workspace:^",
+		"ejson": "^2.2.3",
+		"moleculer": "^0.14.34",
+		"pino": "^8.15.0"
+	}
+}
diff --git a/apps/meteor/ee/server/lib/EnterpriseCheck.ts b/ee/packages/network-broker/src/EnterpriseCheck.ts
similarity index 100%
rename from apps/meteor/ee/server/lib/EnterpriseCheck.ts
rename to ee/packages/network-broker/src/EnterpriseCheck.ts
diff --git a/apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts b/ee/packages/network-broker/src/NetworkBroker.test.ts
similarity index 85%
rename from apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts
rename to ee/packages/network-broker/src/NetworkBroker.test.ts
index 1aac9c33fc33..c79fb12e7049 100644
--- a/apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.test.ts
@@ -2,8 +2,8 @@ import { ServiceClass } from '@rocket.chat/core-services';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { BrokerMocked } from '../../../../tests/mocks/server/BrokerMocked';
-import { NetworkBroker } from '../../../server/NetworkBroker';
+import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked';
+import { NetworkBroker } from './NetworkBroker';
 
 class DelayedStopBroker extends BrokerMocked {
 	async destroyService(name: string) {
diff --git a/apps/meteor/ee/server/NetworkBroker.ts b/ee/packages/network-broker/src/NetworkBroker.ts
similarity index 94%
rename from apps/meteor/ee/server/NetworkBroker.ts
rename to ee/packages/network-broker/src/NetworkBroker.ts
index 0fed6fca542d..e326357cba0a 100644
--- a/apps/meteor/ee/server/NetworkBroker.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.ts
@@ -2,7 +2,7 @@ import { asyncLocalStorage } from '@rocket.chat/core-services';
 import type { IBroker, IBrokerNode, IServiceMetrics, IServiceClass, EventSignatures } from '@rocket.chat/core-services';
 import type { ServiceBroker, Context, ServiceSchema } from 'moleculer';
 
-import { EnterpriseCheck } from './lib/EnterpriseCheck';
+import { EnterpriseCheck } from './EnterpriseCheck';
 
 const events: { [k: string]: string } = {
 	onNodeConnected: '$node.connected',
@@ -25,7 +25,7 @@ const waitForServicesTimeout = parseInt(WAIT_FOR_SERVICES_TIMEOUT, 10) || 10000;
 export class NetworkBroker implements IBroker {
 	private broker: ServiceBroker;
 
-	private started: Promise<void>;
+	private started: Promise<boolean> = Promise.resolve(false);
 
 	metrics: IServiceMetrics;
 
@@ -36,7 +36,9 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async call(method: string, data: any): Promise<any> {
-		await this.started;
+		if (!(await this.started)) {
+			return;
+		}
 
 		const context = asyncLocalStorage.getStore();
 
@@ -54,7 +56,9 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async waitAndCall(method: string, data: any): Promise<any> {
-		await this.started;
+		if (!(await this.started)) {
+			return;
+		}
 
 		try {
 			await this.broker.waitForServices(method.split('.')[0], waitForServicesTimeout);
@@ -182,6 +186,8 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async start(): Promise<void> {
-		this.started = this.broker.start();
+		await this.broker.start();
+
+		this.started = Promise.resolve(true);
 	}
 }
diff --git a/apps/meteor/ee/server/startup/broker.ts b/ee/packages/network-broker/src/index.ts
similarity index 98%
rename from apps/meteor/ee/server/startup/broker.ts
rename to ee/packages/network-broker/src/index.ts
index daae4ace4e05..caa12890b514 100644
--- a/apps/meteor/ee/server/startup/broker.ts
+++ b/ee/packages/network-broker/src/index.ts
@@ -3,7 +3,7 @@ import EJSON from 'ejson';
 import { Errors, Serializers, ServiceBroker } from 'moleculer';
 import { pino } from 'pino';
 
-import { NetworkBroker } from '../NetworkBroker';
+import { NetworkBroker } from './NetworkBroker';
 
 const {
 	MS_NAMESPACE = '',
diff --git a/ee/packages/network-broker/tsconfig.json b/ee/packages/network-broker/tsconfig.json
new file mode 100644
index 000000000000..ada83b80ff89
--- /dev/null
+++ b/ee/packages/network-broker/tsconfig.json
@@ -0,0 +1,9 @@
+{
+	"extends": "../../../tsconfig.base.server.json",
+	"compilerOptions": {
+		"declaration": true,
+		"outDir": "./dist",
+		"rootDir": "./src",
+	},
+	"files": ["./src/index.ts"]
+}
diff --git a/yarn.lock b/yarn.lock
index 6b1123701996..a7d363694243 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8441,6 +8441,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/tools": "workspace:^"
@@ -8556,6 +8557,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/gc-stats": ^1.4.3
@@ -8719,6 +8721,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/ejson": ^2.2.2
@@ -9396,6 +9399,7 @@ __metadata:
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/mp3-encoder": 0.24.0
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/onboarding-ui": ~0.33.3
     "@rocket.chat/password-policies": "workspace:^"
@@ -9771,6 +9775,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rocket.chat/network-broker@workspace:^, @rocket.chat/network-broker@workspace:ee/packages/network-broker":
+  version: 0.0.0-use.local
+  resolution: "@rocket.chat/network-broker@workspace:ee/packages/network-broker"
+  dependencies:
+    "@rocket.chat/core-services": "workspace:^"
+    "@rocket.chat/eslint-config": "workspace:^"
+    "@types/chai": ~4.3.19
+    "@types/ejson": ^2.2.2
+    "@types/node": ^14.18.63
+    "@types/sinon": ^10.0.20
+    chai: ^4.3.10
+    ejson: ^2.2.3
+    eslint: ~8.45.0
+    jest: ~29.7.0
+    moleculer: ^0.14.34
+    pino: ^8.15.0
+    sinon: ^14.0.2
+    typescript: ~5.5.4
+  languageName: unknown
+  linkType: soft
+
 "@rocket.chat/omnichannel-services@workspace:^, @rocket.chat/omnichannel-services@workspace:ee/packages/omnichannel-services":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/omnichannel-services@workspace:ee/packages/omnichannel-services"
@@ -9817,6 +9842,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
     "@rocket.chat/tools": "workspace:^"
@@ -9954,6 +9980,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/presence": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/gc-stats": ^1.4.3
@@ -10019,6 +10046,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
@@ -10176,6 +10204,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/bcrypt": ^5.0.2
@@ -10493,6 +10522,7 @@ __metadata:
     "@codemirror/lang-json": ^6.0.1
     "@codemirror/tooltip": ^0.19.16
     "@lezer/highlight": ^1.1.6
+    "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
     "@rocket.chat/fuselage": ^0.59.0
     "@rocket.chat/fuselage-hooks": ^0.33.1
@@ -37207,6 +37237,7 @@ __metadata:
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/ui-kit": "workspace:~"

From 1f89f780bd205d36b572689e1103c860f787a13e Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Tue, 24 Sep 2024 09:54:31 -0300
Subject: [PATCH 108/170] feat: Adds new admin feature preview setting
 management (#33212)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/quick-rings-wave.md                |   7 +
 .../UserMenu/hooks/useAccountItems.tsx        |   4 +-
 .../hooks/useFeaturePreviewEnableQuery.ts     |  28 ++++
 .../sidebar/header/hooks/useAccountItems.tsx  |   4 +-
 .../AccountFeaturePreviewBadge.tsx            |  21 ---
 .../AccountFeaturePreviewPage.tsx             |  44 ++----
 .../client/views/account/sidebarItems.tsx     |   5 +-
 .../AdminFeaturePreviewPage.tsx               | 127 ++++++++++++++++++
 .../AdminFeaturePreviewRoute.tsx              |  26 ++++
 apps/meteor/client/views/admin/routes.tsx     |   9 ++
 .../meteor/client/views/admin/sidebarItems.ts |   8 ++
 .../featurePreview/enhanced-navigation.png    | Bin 0 -> 2372 bytes
 .../resizable-contextual-bar.png              | Bin 0 -> 4776 bytes
 .../images/featurePreview/timestamp.png       | Bin 0 -> 51432 bytes
 apps/meteor/server/settings/accounts.ts       |   5 +
 .../tests/end-to-end/api/miscellaneous.ts     |   1 +
 packages/i18n/src/locales/en.i18n.json        |  16 ++-
 packages/i18n/src/locales/hi-IN.i18n.json     |   6 +-
 .../FeaturePreview/FeaturePreviewBadge.tsx    |  21 +++
 .../src/components/FeaturePreview/index.ts    |   2 +
 packages/ui-client/src/components/index.ts    |   2 +-
 .../useDefaultSettingFeaturePreviewList.ts    |  12 ++
 .../ui-client/src/hooks/useFeaturePreview.ts  |   5 +-
 .../src/hooks/useFeaturePreviewList.ts        |  32 +++--
 ... usePreferenceFeaturePreviewList.spec.tsx} |  13 +-
 .../hooks/usePreferenceFeaturePreviewList.ts  |  16 +++
 packages/ui-client/src/index.ts               |   2 +
 27 files changed, 324 insertions(+), 92 deletions(-)
 create mode 100644 .changeset/quick-rings-wave.md
 create mode 100644 apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
 delete mode 100644 apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
 create mode 100644 apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
 create mode 100644 apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
 create mode 100644 apps/meteor/public/images/featurePreview/enhanced-navigation.png
 create mode 100644 apps/meteor/public/images/featurePreview/resizable-contextual-bar.png
 create mode 100644 apps/meteor/public/images/featurePreview/timestamp.png
 create mode 100644 packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
 create mode 100644 packages/ui-client/src/components/FeaturePreview/index.ts
 create mode 100644 packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
 rename packages/ui-client/src/hooks/{useFeaturePreviewList.spec.tsx => usePreferenceFeaturePreviewList.spec.tsx} (79%)
 create mode 100644 packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts

diff --git a/.changeset/quick-rings-wave.md b/.changeset/quick-rings-wave.md
new file mode 100644
index 000000000000..0ea22897ff45
--- /dev/null
+++ b/.changeset/quick-rings-wave.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+"@rocket.chat/ui-client": minor
+---
+
+Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
index 82c39c5c1b10..e54e2b72d675 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
@@ -1,7 +1,7 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
 
-	const { unseenFeatures, featurePreviewEnabled } = useFeaturePreviewList();
+	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
 
 	const handleMyAccount = useEffectEvent(() => {
 		router.navigate('/account');
diff --git a/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
new file mode 100644
index 000000000000..fd88f0237d29
--- /dev/null
+++ b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
@@ -0,0 +1,28 @@
+import type { FeaturePreviewProps } from '@rocket.chat/ui-client';
+import { useMemo } from 'react';
+
+const handleFeaturePreviewEnableQuery = (item: FeaturePreviewProps, _: any, features: FeaturePreviewProps[]) => {
+	if (item.enableQuery) {
+		const expected = item.enableQuery.value;
+		const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
+		if (expected !== received) {
+			item.disabled = true;
+			item.value = false;
+		} else {
+			item.disabled = false;
+		}
+	}
+	return item;
+};
+
+const groupFeaturePreview = (features: FeaturePreviewProps[]) =>
+	Object.entries(
+		features.reduce((result, currentValue) => {
+			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
+			return result;
+		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
+	);
+
+export const useFeaturePreviewEnableQuery = (features: FeaturePreviewProps[]) => {
+	return useMemo(() => groupFeaturePreview(features.map(handleFeaturePreviewEnableQuery)), [features]);
+};
diff --git a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
index 2be6b2b1dea2..51ab7a198a67 100644
--- a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
@@ -1,7 +1,7 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
 
-	const { unseenFeatures, featurePreviewEnabled } = useFeaturePreviewList();
+	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
 
 	const handleMyAccount = useMutableCallback(() => {
 		router.navigate('/account');
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
deleted file mode 100644
index c109ca1aefb5..000000000000
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Badge } from '@rocket.chat/fuselage';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-const AccountFeaturePreviewBadge = () => {
-	const { t } = useTranslation();
-	const { unseenFeatures } = useFeaturePreviewList();
-
-	if (!unseenFeatures) {
-		return null;
-	}
-
-	return (
-		<Badge variant='primary' aria-label={t('Unseen_features')}>
-			{unseenFeatures}
-		</Badge>
-	);
-};
-
-export default AccountFeaturePreviewBadge;
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
index dd9ab6a90959..358d2394003b 100644
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
+++ b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
@@ -1,4 +1,3 @@
-import { css } from '@rocket.chat/css-in-js';
 import {
 	ButtonGroup,
 	Button,
@@ -13,9 +12,10 @@ import {
 	FieldLabel,
 	FieldRow,
 	FieldHint,
+	Callout,
+	Margins,
 } from '@rocket.chat/fuselage';
-import type { FeaturePreviewProps } from '@rocket.chat/ui-client';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
+import { usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
@@ -23,26 +23,12 @@ import React, { useEffect, Fragment } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { useFeaturePreviewEnableQuery } from '../../../hooks/useFeaturePreviewEnableQuery';
 
-const handleEnableQuery = (features: FeaturePreviewProps[]) => {
-	return features.map((item) => {
-		if (item.enableQuery) {
-			const expected = item.enableQuery.value;
-			const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
-			if (expected !== received) {
-				item.disabled = true;
-				item.value = false;
-			} else {
-				item.disabled = false;
-			}
-		}
-		return item;
-	});
-};
 const AccountFeaturePreviewPage = () => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const { features, unseenFeatures } = useFeaturePreviewList();
+	const { features, unseenFeatures } = usePreferenceFeaturePreviewList();
 
 	const setUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 
@@ -85,12 +71,7 @@ const AccountFeaturePreviewPage = () => {
 		setValue('featuresPreview', updated, { shouldDirty: true });
 	};
 
-	const grouppedFeaturesPreview = Object.entries(
-		handleEnableQuery(featuresPreview).reduce((result, currentValue) => {
-			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
-			return result;
-		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
-	);
+	const grouppedFeaturesPreview = useFeaturePreviewEnableQuery(featuresPreview);
 
 	return (
 		<Page>
@@ -105,14 +86,11 @@ const AccountFeaturePreviewPage = () => {
 					)}
 					{featuresPreview.length > 0 && (
 						<>
-							<Box
-								className={css`
-									white-space: break-spaces;
-								`}
-								pbe={24}
-								fontScale='p1'
-							>
-								{t('Feature_preview_page_description')}
+							<Box>
+								<Margins block={24}>
+									<Box fontScale='p1'>{t('Feature_preview_page_description')}</Box>
+									<Callout>{t('Feature_preview_page_callout')}</Callout>
+								</Margins>
 							</Box>
 							<Accordion>
 								{grouppedFeaturesPreview?.map(([group, features], index) => (
diff --git a/apps/meteor/client/views/account/sidebarItems.tsx b/apps/meteor/client/views/account/sidebarItems.tsx
index ca0376be329d..fa2ab8bd5e40 100644
--- a/apps/meteor/client/views/account/sidebarItems.tsx
+++ b/apps/meteor/client/views/account/sidebarItems.tsx
@@ -1,10 +1,9 @@
-import { defaultFeaturesPreview } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, FeaturePreviewBadge } from '@rocket.chat/ui-client';
 import React from 'react';
 
 import { hasPermission, hasAtLeastOnePermission } from '../../../app/authorization/client';
 import { settings } from '../../../app/settings/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
-import AccountFeaturePreviewBadge from './featurePreview/AccountFeaturePreviewBadge';
 
 export const {
 	registerSidebarItem: registerAccountSidebarItem,
@@ -54,7 +53,7 @@ export const {
 		href: '/account/feature-preview',
 		i18nLabel: 'Feature_preview',
 		icon: 'flask',
-		badge: () => <AccountFeaturePreviewBadge />,
+		badge: () => <FeaturePreviewBadge />,
 		permissionGranted: () => settings.get('Accounts_AllowFeaturePreview') && defaultFeaturesPreview?.length > 0,
 	},
 	{
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
new file mode 100644
index 000000000000..615fd20cf5a6
--- /dev/null
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
@@ -0,0 +1,127 @@
+import {
+	ButtonGroup,
+	Button,
+	Box,
+	ToggleSwitch,
+	Accordion,
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	FieldHint,
+	Callout,
+	Margins,
+} from '@rocket.chat/fuselage';
+import { useDefaultSettingFeaturePreviewList } from '@rocket.chat/ui-client';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useTranslation, useSettingsDispatch } from '@rocket.chat/ui-contexts';
+import type { ChangeEvent } from 'react';
+import React, { Fragment } from 'react';
+import { useForm } from 'react-hook-form';
+
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { useFeaturePreviewEnableQuery } from '../../../hooks/useFeaturePreviewEnableQuery';
+import { useEditableSetting } from '../EditableSettingsContext';
+import Setting from '../settings/Setting';
+import SettingsGroupPageSkeleton from '../settings/SettingsGroupPage/SettingsGroupPageSkeleton';
+
+const AdminFeaturePreviewPage = () => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const allowFeaturePreviewSetting = useEditableSetting('Accounts_AllowFeaturePreview');
+	const { features } = useDefaultSettingFeaturePreviewList();
+
+	const {
+		watch,
+		formState: { isDirty },
+		setValue,
+		handleSubmit,
+		reset,
+	} = useForm({
+		defaultValues: { featuresPreview: features },
+	});
+	const { featuresPreview } = watch();
+	const dispatch = useSettingsDispatch();
+
+	const handleSave = async () => {
+		try {
+			const featuresToBeSaved = featuresPreview.map((feature) => ({ name: feature.name, value: feature.value }));
+
+			await dispatch([
+				{ _id: allowFeaturePreviewSetting!._id, value: allowFeaturePreviewSetting!.value },
+				{ _id: 'Accounts_Default_User_Preferences_featuresPreview', value: JSON.stringify(featuresToBeSaved) },
+			]);
+			dispatchToastMessage({ type: 'success', message: t('Preferences_saved') });
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		} finally {
+			reset({ featuresPreview });
+		}
+	};
+
+	const handleFeatures = (e: ChangeEvent<HTMLInputElement>) => {
+		const updated = featuresPreview.map((item) => (item.name === e.target.name ? { ...item, value: e.target.checked } : item));
+		setValue('featuresPreview', updated, { shouldDirty: true });
+	};
+
+	const grouppedFeaturesPreview = useFeaturePreviewEnableQuery(featuresPreview);
+
+	if (!allowFeaturePreviewSetting) {
+		// TODO: Implement FeaturePreviewSkeleton component
+		return <SettingsGroupPageSkeleton />;
+	}
+
+	return (
+		<Page>
+			<PageHeader title={t('Feature_preview')} />
+			<PageScrollableContentWithShadow>
+				<Box maxWidth='x600' w='full' alignSelf='center'>
+					<Box>
+						<Margins block={24}>
+							<Box fontScale='p1'>{t('Feature_preview_admin_page_description')}</Box>
+							<Callout>{t('Feature_preview_page_callout')}</Callout>
+							<Callout>{t('Feature_preview_admin_page_callout')}</Callout>
+							<Setting settingId='Accounts_AllowFeaturePreview' sectionChanged={allowFeaturePreviewSetting.changed} />
+						</Margins>
+					</Box>
+					<Accordion>
+						{grouppedFeaturesPreview?.map(([group, features], index) => (
+							<Accordion.Item defaultExpanded={index === 0} key={group} title={t(group as TranslationKey)}>
+								<FieldGroup>
+									{features.map((feature) => (
+										<Fragment key={feature.name}>
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={feature.name}>{t(feature.i18n)}</FieldLabel>
+													<ToggleSwitch
+														id={feature.name}
+														checked={feature.value}
+														name={feature.name}
+														onChange={handleFeatures}
+														disabled={feature.disabled || !allowFeaturePreviewSetting.value}
+													/>
+												</FieldRow>
+												{feature.description && <FieldHint mbs={12}>{t(feature.description)}</FieldHint>}
+											</Field>
+											{feature.imageUrl && <Box is='img' width='100%' height='auto' mbs={16} src={feature.imageUrl} alt='' />}
+										</Fragment>
+									))}
+								</FieldGroup>
+							</Accordion.Item>
+						))}
+					</Accordion>
+				</Box>
+			</PageScrollableContentWithShadow>
+			<PageFooter isDirty={isDirty || allowFeaturePreviewSetting.changed}>
+				<ButtonGroup>
+					<Button onClick={() => reset({ featuresPreview: features })}>{t('Cancel')}</Button>
+					<Button primary disabled={!(isDirty || allowFeaturePreviewSetting.changed)} onClick={handleSubmit(handleSave)}>
+						{t('Save_changes')}
+					</Button>
+				</ButtonGroup>
+			</PageFooter>
+		</Page>
+	);
+};
+
+export default AdminFeaturePreviewPage;
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
new file mode 100644
index 000000000000..a7d6bd77d136
--- /dev/null
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
@@ -0,0 +1,26 @@
+import { usePermission } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
+
+import SettingsProvider from '../../../providers/SettingsProvider';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
+import EditableSettingsProvider from '../settings/EditableSettingsProvider';
+import AdminFeaturePreviewPage from './AdminFeaturePreviewPage';
+
+const AdminFeaturePreviewRoute = (): ReactElement => {
+	const canViewFeaturesPreview = usePermission('manage-cloud');
+
+	if (!canViewFeaturesPreview) {
+		return <NotAuthorizedPage />;
+	}
+
+	return (
+		<SettingsProvider privileged>
+			<EditableSettingsProvider>
+				<AdminFeaturePreviewPage />
+			</EditableSettingsProvider>
+		</SettingsProvider>
+	);
+};
+
+export default memo(AdminFeaturePreviewRoute);
diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx
index f70df1625871..d244d5e2f19b 100644
--- a/apps/meteor/client/views/admin/routes.tsx
+++ b/apps/meteor/client/views/admin/routes.tsx
@@ -104,6 +104,10 @@ declare module '@rocket.chat/ui-contexts' {
 			pathname: `/admin/subscription`;
 			pattern: '/admin/subscription';
 		};
+		'admin-feature-preview': {
+			pathname: '/admin/feature-preview';
+			pattern: '/admin/feature-preview';
+		};
 	}
 }
 
@@ -237,3 +241,8 @@ registerAdminRoute('/subscription', {
 	name: 'subscription',
 	component: lazy(() => import('./subscription/SubscriptionRoute')),
 });
+
+registerAdminRoute('/feature-preview', {
+	name: 'admin-feature-preview',
+	component: lazy(() => import('./featurePreview/AdminFeaturePreviewRoute')),
+});
diff --git a/apps/meteor/client/views/admin/sidebarItems.ts b/apps/meteor/client/views/admin/sidebarItems.ts
index 013206d9e9a8..fc7d307396d4 100644
--- a/apps/meteor/client/views/admin/sidebarItems.ts
+++ b/apps/meteor/client/views/admin/sidebarItems.ts
@@ -1,3 +1,5 @@
+import { defaultFeaturesPreview } from '@rocket.chat/ui-client';
+
 import { hasPermission, hasAtLeastOnePermission, hasAllPermission } from '../../../app/authorization/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
 
@@ -129,6 +131,12 @@ export const {
 		icon: 'emoji',
 		permissionGranted: (): boolean => hasPermission('manage-emoji'),
 	},
+	{
+		href: '/admin/feature-preview',
+		i18nLabel: 'Feature_preview',
+		icon: 'flask',
+		permissionGranted: () => defaultFeaturesPreview?.length > 0,
+	},
 	{
 		href: '/admin/settings',
 		i18nLabel: 'Settings',
diff --git a/apps/meteor/public/images/featurePreview/enhanced-navigation.png b/apps/meteor/public/images/featurePreview/enhanced-navigation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4240326ba985d0a054ae5d9c8521b24c8d93e6f7
GIT binary patch
literal 2372
zcmeHIYgCg*8lKz;k(*0VynsLp8%mX01@Ra$34#GB2w8)n2Lz6kXazzALMRv_YP;xG
zVrfx?0*kHdhC)CtVh|D##7hAYg%TP_P1$fufB*?0CfSL{AKkOvo<04szxKyBGw<`h
z^UgExH}gzEL^#D}&89T~0Gp8DKq>$zF&wv8TEKSeq4Rv$;nISm(*aoTVg3*yRQGuZ
zBGRdp08rcKGzASbgB(T%puW)RWda5O%aM>k@?kbYDJ7;mXg7)%7}|_U^u0g_?-vIh
z3PLLno>;U^yRy;Ip#U%U`gz?3Q9dbXM|jd~=gzm4M_kLikKsE!!V_rWmyy}L8oj)=
zS2fb<YGu2XmmyLtmL#0Z$ReIgYI>?Im$rG8QwM!!;_UE8Rx|HP0%OX2>m!4{!$M9@
zmzycKXS|vvx3jAFOuN;#LOx%@xz-bPQB~L4+B$H!?W8hJu;wTX4KMQ=yEwA+byHJQ
z4Srntp0Hr<_>yuo%x4&B_O`IRa^*|1XD(Z^^k)!1hMgXbR43&u9)Lcv`iBcipXe%2
zq_vq)1Omaa`(22J@|`C&yL#jc-3GtCI}p2cuqKsjiPzA?P2zh4jxQVm;07eyMCq?+
zYV8fOwUa-ksVNIq0FcPLSd^mM+Od*DToGaEjy4EpBb~T5rBg*r>d@@<%gYepB7JF0
zqq_ZhTTbt4e99^Fl9eP{muC7SQ?As-T7ZUt1HXW7`egSV>XAs%dT2+~9d#BA(P*)j
z(D0-Wc6F=Xq;Ez*19MWIbzS0osT7X6ozKk>&N3dh)U{&Re&fo8P%s&w0N~{VcrIKq
z2x~}d4RQmV;DFu^gWmrCgjZEc@Ze_b(=Aoh-_d=XJZ8+v)lKA~z%BN~S8<JboQ+I_
zs+X;ssKD|<n+Q&Rh;PzNMnlW8LezzIdASX^w)%~&WNz*hecr(6x8R)xpSlZI485hy
zZfUCt2V?|k;EG^w%)WznE}iREkg9%%gOEi^`|qn5?&fH;a52|eV-2t~oC6&7lnCir
z0l`$mloWt1%=ASTn0Q0X6HEJvc0jfuJaPa$!gJja3L{cnlpRfa&@ls0>6rpYMt?0u
zFkC3)tSau`mnY25=B{g)dM3owSbf=Vw0-aZz2T~fTHkJ@F6pcLmqLRS&;Cv>BWR!I
z+RPN!dq?ck6I|axSa+4|B<B1h&T~r?ZTV$%_P@BMr(JDNe)ug@8Zd-;#K^-YdT`Gu
zs&ZIT;Sfe$Cqflp_BWry-*c>7lNzG$S`NkbWu8%wj3c6P@vb)pL!5@#dmB^TW{?vN
zBGfH=G3iH<==4p-aBGihHuu9{(zqJ-xB51NXv62_%8><?<AsN8pS<MTpJqO$J9<_a
zoO!fYf6hVK`E48q%qLbD^e%`md(r>>T@awGan@0K^3i((iN+xo%#ouHt&I7j7;gA~
zaM|kYft59-NVWnweEfy~obuR!X;>4?FtKhWk9LQc+ATc4!u|H0t|p=C4#)UkIs1b*
zU~l>r;^|xj-Rs_fd+|eK`kzi4=TVAO6y<e|-she<zjwbKAmQHscVSTgn7P<cmQg_j
zPA+f6!;(<9BP`adg%v%IyKI0=2Q9M#L6_~sP5iS<!SwJ;i9qK58vjqql(z0TD85jQ
zLjmHi>`vwsAMd7!IrRlB4EwT%Irr}B_*-~AjVn(;{-)H)yq<^yYV&jM#%$9>QVh%U
z%UJHItG`bwI}ZY}o0&klMYUn~qrAe2#ymoOtW#gr9Dz%HofNmdj`t8&#p7n_pOvuZ
z=F?L2tj|bH_{0E*<e_G!)Tfv6O4h6SEe%h*W?6xA9|5s_TKFDpeJrR87Vw$FML)^*
zD-cl7BW`g-+JQ%R(w}Sm#{V*2xQF8cu=A_edLAcQ0U3|a7V!DHpt>sl4L|c!c+jV`
zeXy-WWIHdBNTLXs_UIBMDy?(d=pS%;{K~$(^7C(zfUTgQC0m#>rkYzG!&0srmo+zP
z%uIJAf4!wl*sSe43silWOG&I~w3z|7=J<^(E=H1Jo*@0}lR+k4a4{Z+7t=?Z<-^16
z#HH**nNR$)va<ZD_<p0MuXq&q<f>bV9KteLt5UV>qWh13{~`%a65CIDvwi8xxILa6
z!t*MO@WlMq>6uJgtPOPTCQBxzspEI!d<QodT8;Z#p;kJo!W#BD*$Nupd-(y4<|wgC
zX|y|PXO4Yy96J{!xIicxS(5KO+wob-^;BZ-F_WF|;<o*ghtuYF8H5Cd2i69}=l>I!
CCsuy|

literal 0
HcmV?d00001

diff --git a/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png b/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36c7e44a29d8c27c9c035a77026f1cd7e7dabd0
GIT binary patch
literal 4776
zcmb_gc|6o>+y4y{3PqAFw469i)`&`jifq|xQrRVB8`*};U@Ub)ksQe`Y7ApZSu&Ox
z6)GY7))=y78T%}Z8PBitzUT9K&->SNp7Z=MGr#-3uj^jE_jP^0*KgviER2MAN$&yx
zK-k3C;4%R4lELS<0({`NlI6W(@Mq^8;~Rkhu>a`K55(m1FUw#jB=EA)d7!N0z%1B+
zdYm&q2LKgGf?F;-0AMfN#NZqv6hfo;Jv`tM&cE!zND54gZ$Tjr8UJp7FxeF9e>=~-
zNczd;?|U6ZGO+R3j65s?Iw<~pHX$#1*wnzw?C>E+k>1!?Q)OT2Rh}c~J?-;xh*DD@
z5&VuPfv<Q=e`j?QYu7k-3~fdRoW1BnO<ZzkZeU)}7jr_GsGRhQ86DEhU7T@YQO~Ro
zcRRgSX5`WOriJM>6;!uDa`!Y;|D_5s9QkRjaLGpz021e>yNWI*E7UP9U*uPKlu$5l
ze~mBdx$8HNP<@t@lk;O=yF-uBG)gm}vQ`FTX2=5oSi1PVK?_BPq3}?*Ii*IA>5n%v
zbWfn2Z0%VeSS;40*OG6^x`g#gc6vG+0n4xqj%>2%a|E&SDoPm@8=~J!AF?cEymsTg
zg9!IX{1QP(Ia9Y692SZ~j-v+Fzbsry_Do~5Q;7QVx)|1Hgr?kFWAI^!+ImZe`h7{@
z<7Wd?nvqU+hh0K`X#Te9Qv~+NQEfZlaS3p1E?Qj;@Lu62F^-=7@DAebv#>32$7(zZ
z#2P$QKDTo&6i`vDH*Gffd5$i%t_F_vl8F?y%}h3Z8H@yM*BiosI8lh4P_(iF1@}}?
zq{PzNEj#Cf+}E7=M~A1;!yU-VR(Iqja9E9a^KglbjG>o(CfIVWY-qIJ*IfOF9qsco
zsP|zA0FZBI-ri@#KF<q2{yOr_7&Lqgfk=XjDG89l#;tPz7;y&$dDOth4G}Ep@-Z3^
z0s#H}P-n2~^+5o1eZ1rExO_DQ)C~4Z=y<yLSJW>BojJyDX#L`1fpMw(8}=y(;Qb50
ztG4g(e21#ii+lH)f6o-y6co%37_uw9=%rOG{I07yaBXcWTt!j*qfypbuNvD_ng%1S
zswfOjww>h>)~7YAPcMAKJRN5mtgR)u*&%|zQM^a8U~`j4t7%8x1g0+hG$#bW$p^tB
zc&WljyR{;5B?77{FJK2sZ+Y5Xbn=<Min-5mQ@dKiFBuC6>6bQF;65*X%HMlHJoVhw
z6)82L1yy>U@X&1#ma6@IPERFLq98z_CBT>0j}WxM`2u5KK=^tyR#3-#w17MA|1nno
zKD<)L<Dpp!Y(XJC@Gef+{9?2|`MgUKV^>2GDvPHBG2q=DbfuxLTun%p7zwTGyA<=9
zB!nyebHtGOAm~b6YDV#ihj{|_k6cGWt<MEikxI<_<{^AtrhtC`cWfmEuI8&ahFDNl
z`-b?hgu-8rSGgB>TxFs7vUX!*wNWgREa0gb-;1oeZ2iKt*DX@2Z)*70VGVg08F*ZA
zN+mNp(=s7Jmf!Q?i^1xoFC8yoT1#hWss%)Q8AJ5+1%MCxP`1?Sl)meFbG2i$N3ZYy
zP7t`h^XCM3EB)QYgZ=YwNe|}&eD~2#Z~og?)Df-6Nzt<yDc^3d3|Shj9A(f(GDo@9
znLYBD^&>k0Y_8`~07mCBDH(F1W8Bph#ys^|#42?=rT<DSmBVJHB^Bau-5e%07XYjv
ze0W48OE^<IH?4nUty3>@YlU~u*~iG*si#l?3kX@Ir@UX9UT-FG>MBPYH$M)1rcwf_
z;mn;)0AK>};Xee7Ye)YOzvg2$uN+Y*A_Uwy0g-gp58g$BpH~COpP<fINU!=9Ljbfl
zOWz^w{K!IxG+w{fVJ6?;`>Jh^Ieh5GDu!JXulYcLtS%E|89R1ose!2gV6*o1XuQdW
zlBMFtWFVo>D8T~`o--ZUMT_o<Uyj;np)7QS&$FMTSW}#~bgYzVr-y^0_^!ur&4h&s
z+_EkJIQ<n|O<0%JwC80wnwitPWAl50s)dBZ*<`+zc14M_v!qS8m~6sUR}Z^qa&q!X
zE^V-)pdJED8UTFP3pz*FYF8WepqA$FT<&y2<kM<jJN7TvB`A%R^Swtx${LRMH-@8o
zKy2SmdWd4s6JR_B<O^z&fx}P|n?gcwZLD=#rbY$&)tssC3LCG9<WU+=6BCbVui(2O
z)yHWj@%DA+&=mk)A$;PY>#V6D@lVOpcW-O*QU4kh*j>HHph>nY<t$StYjJ)rFomk3
z|4gCc5$=iNwkqpN4>=I%_>z6m10y3;)SB_t2!g=fg5r4Cg)Ha6UgS$0${lJb;CW!A
zg>Wj}CXM5UNb@eZ-C6$(Dwua((c)p%-L<=(4RojcV>}zLLeNMpX-^jyb^q5kgp9R8
z|5yEsawWp3DYK97@r$ZlS^QH*i7G@g@1|&U=R6-6Q@Iu)-~5ei{hY!ly=SXOkY)q+
zf#ytRq>^wQ9?;HgM+!I^Z(Vvb^c8*p=&(|UYmArxy)AKR=fXBSnmXi@vNg75awqhP
zhlVzKXIZMp4Hip_339;X2g#odd2<wJUix}(Rvmt87YTT!Mb!UE(2G@ek9xiKdqza4
zE29WawTRdw3oTG((FpThe1NwiNaBb@3#I(MLO|AOhrGWn9Jh}G2fec`O#dKzMeg9i
zM;DWaOKo8Bh&ZB>1l^fk{FHI)dJ({@-}3!bAPT9gtb)?o%F}3kpFC8HXdb}#1X%B>
zF8A`Zyq^jRmXwaIf6)NM15*goeIKRSRuO*H41K}}%=(Yl5%zPq_$5T^RKA>#6Brdj
zGJi+T{=#AZL^QDv#SNuRKnClLp%H9{Q|O=&>bJxrNJly^x-S3!{hjDXYI|P|k6Y?S
zp6tn+tNzo=<$t^ut!Hqk<0oZg(CbqCq(`pQm-sQ`w<>Lh@WIC7mvAZfQYdgsdAIHe
zC8iT4t^9vh&FA@N^8Qcp0A&Ce%E(DKQN7gpVkSoip(`&hZ#LscdD7C_vX_h(1vCA`
z8b@9?l}o2`k8sBLEpZ-u%$3<0f=-)Hf|_=ynp~@2U0tM!?{wY=-Umov%auzyRORFM
z`S)-`O|bEEF3`eK%C7Hjs-#~WP_u2_{mPkQ^j9-7+gT{R)g(`%-3mOFw{z=ly`fbi
z{qB1@DLG=Qiu5~h|HhxGV_4Ive3!ePP1Af(5y*$uTgOZhoGg=c87$9xg%P3|$U*M?
z=X>5Y<VA8tR9c&mk2wnsPCs%gf9Tv$*Rrt*tqCU7O-xL<eH5;U*mD4b6CzQ$9n7Z~
zi+cANeq``vUP)UXHT`x0a&NoW`0TqyWx3X8U9+>Z0ZN|G!cgD(awmicwO9Dv`^nl1
zzjYT-L+eYT8PSo5+5)@fSFxM;O<mUV;zVZ+a_C7}-So9OMTIh0n%l{WFV-|F1-`Lj
z@APsTSM%+0S;O?eUh*ptQ?H8v&f+i&&RR}O`i*4f6k#H@m7lp*^zKSfa^hmOXkOS-
z60>2cVM#iEOcKIf?8G3O<3kV^s3C1SZEnQ`{BY};A8}$L{)cZWe-He=7IuFnmhY#4
zY4E58i;gn|BRS3+r;6+SHcPc%%tvs7XD`vC?_eAskXhq<zJ+}T8j|x@*`M^b*Po1$
zXoCh;+w}K^i6O#?Zmjo782r<yM$)RxRVp*&eHenqFWSdJb5{jh2~Dsj@+;3#|JGLB
z9032wlJoxilNr)>i@US|;p8Cu(-kNgy~rVG>ghS%FC0N}9f?~Ks%GAz6J`Z%cVO}B
zG04y@>b8#k=;z!%1hn-NM-L`XT9eg&nMqxp*7RR7oT3$9b4u=@sq`?pYiu|62LtEe
z%mc7~s>k96X5&=9)5DSQm4rx_zJbV9Ro!gHS%&KD+~VuXk+#m1%{A39Yo-Bt%80P3
zq2VTDzf#=Rmdh&?bCCx)b*_Bg4-wI3l2pChar~jmn+7izL<}=qt?9DEhX7`ApQulH
zMEj?4#;~_z$l3Lll0lC%>Vrf3=gSpgq(a-sPF?M*i6e<#oG7stWG;STlQSA38!4w~
z3fwm=Na;p^D=55k@_R@4!LT=E(c(nD&8r-6O_;~)0c9x82zM9b4Q1@Qgjqk8p)K@{
zcK3AGBaS(kU`DqS7yE$=&M+7`WhXH9jFNO9`v*QtIaJs+;+mMNJC&Z8+14tW6_(oX
z(yMp>G?90}aC_5kKK5E+LFE1gZd^6s<@360Hi!Y%5J8nXe&u1I?-_5za#YY8N2io~
z)d6Pb9A<3nGbM^mLOZxeCnBdj&>VU~+1Mc>wzZnqD$ug>jHkb)X}j!B;NxhcUt~>v
z(%iJEn2uq{z?DZ-4o!wy@AWID@3@mSA8wR2bf#TEmU@&Y3{wM7g6EWRrwA4qQ>PUk
z#mD8H|03d$wnSxHxWE;p>Ncycy(|wRkQ)4Z8pLFPlU0T4+8T_bVCjIpvpmQe=!?D-
z6hgZ<kcvb%u7ujQS2x~afIO2vhYJZG5kRRwN5s}i%4{t>FIu&I%SkgPKEF8dj#lON
z(7`duN{&<zl7C@`q$JOtnrfe8ILA;I##&J_N&%Fy29dy7806GDm-5T?SptTI(mDq;
zcDBwRHt6@{Datto5owch(Qbh;%YMV;hnhPS=X5=7SnQN2aZOurJgGNagzUp$b(!LZ
z>Q@~nOMl(JXj*jar!?fu3+B&+@XnbY{$`_o+Q$CoF`g?Fl|#K^V#e7dx4>c9L#(ge
z9RZ?he#Djbs<~Ae%4@Vry)%dBj=fmz4EWB5FSq<4?*_=p%jYiGL@lWxq96zDI2uw(
z%zGJhR(P=ZMBc=HN^Sx13>@y@XoFWtaipVNh#B;d<uMJ9eG4^=Y^6Anh=_Y>?L7F8
z6w2Jvt+Ti35do9N><QP2H-5AIF^XVOpM4bKwXk5ba<jz0e6=p8?{if=*{=1gT`JcN
zy*y5F!#aBI)x;js7!oGcg;^%@k4XxCgA?vLz@(FQH35%n`d|;#RTx1kPWy6KK&~MA
zqz!W01RYr2X*lA8iV|xGeEExIVmlw_^@+UPQ-bRO<#h|)W*wVxF@0H7rmU+yJssiS
zHm|YWVcyz$hPh~|2(>Jqh!ewVXbv?v3~a~PY^VI#70y~7uhFuj{T2(>1Z}n9=S~tg
zag~^B{YLWWt@Rd~Tn4Oex2nVkP$KB7x(Xx1wlOMix@6f)@|yvh(<D`4M#E4^L8hOo
zv)m7YBa@`!7)bYa49D=z()%O3zyH|O(P(&u#vNkmGY#}Ry<A%%{X@5yjDE*~nVg%o
z*HGJCSynsw1|=mZx;2v<Jt5U%08r?AB6xpU0?$%hWY_h@zLj??6@e<VO1L_34E#&N
z!Zai)yC;GUz5{65px0_=ki&iE9cfCaGr5+aft3d3tB!b+_Urjt*GyD1J>puJ?>s^t
zrF5E9*fYD3k)B@buYR(O7BN=6*r^bo%Eu2@Y2+IsQ8j4oA*F7yzy!hV^*~owCtKxp
a2K(3rHj$^VY%~U(889)lFep3k9Q`kU29J{f

literal 0
HcmV?d00001

diff --git a/apps/meteor/public/images/featurePreview/timestamp.png b/apps/meteor/public/images/featurePreview/timestamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7573f97db55b73e2d880af67e6705e3c4a2040c7
GIT binary patch
literal 51432
zcmY&<Wl&tv(k-sRgAMM%-Q5{9xC99<gFC@JxVw9BcMI<BgkXca!=NwsefO(+ud9yM
zK7V%a?p|y4J`rD)WzkRoC{R#PXh1nBH7F?9-~aC0kP!ZznN&h6{#}qA<#b)3pzvt^
zb3g;tsIUILgmzJrm4K?5CO-c60B0$#Bn|~tABXyC3=ai0>I;+-*YJcs>o%A*9CD*w
zN8@p~9UFmUL=UF0QoDG?@49d!Nib-d(z9o%!<t~TAV}>x8dHFgHB<K}N0MpurA>ma
z;FAdYG|=i3(lb%mv0XS<v0ZQxohtL9^eKk;lgJcA-UsfyRyMuw4ZD9-zpq`s_-#GP
zzx^)rxZHee_4c^z&NZym{-%y}xH01Y1kQWw#Mm^ua30=x@8Qg=8}`}Y`v0s7%fja_
z&!OSq(xUg0z<a?%<h3vBV_ffLhQ`{Cr9aN^u1JN?`}WW>{G%RgGwlC0G(?ag$K}WC
zMDG=9@0G`~6^a=6B`L4#ab&t}ChPwl85V{Xo1yhIBXYCzjdY<V3XY(uhg0(=t8pTa
z4ekH4%HUqki$f2E_3fWfMxE~G4_TsDeIGrlW0#?oWJuHgw~V4Ee!U--WbFU>j2D|&
zuvLN}&X!r{32CJ|wcr$e*wx;B!(V`SW>hv21aq9N4$?uqmnkjcYSjfz?si<UT(=z8
z-y+{lD%8yRfaYrn^<BA8@K?3K4rDWE+SQ`DWu9BDgMMABJq@#dLSm;PuX8gmZE5oc
z9qz481gvYBL&D+XmVn2J<8$)Zk7kME&d_j`Y9=5ZE}<n+3ztZ#2r1dea(EQHa<$b`
zv&3wlRY;FEgt+5uv>uRy+Z-~pnMmF}bi{2MnX53H^ZZyt5^F7K<_zh~a^U!QWNzKK
zK}YL~$PGB~pi0{MzjH{cjOwx%@~*^UhN-HbJ|_n?Ix;oaKP8r29dE%<+@SLW^Zl(h
z+d*pei8t4OWo%FK17xmNIf|S*QshJf>Hp$%7^V<%Ka;6d`2pT_dfrg3Vxn1mgMJ5W
zX*1DSFVEVnq%^}JFU~*DHbk$c(3)a#x2jp#$M0RYQgx+nq%$UO;9v|efVYONtva2Y
zI`2}f>~@}5r7pVFG9so~qsNkrvPQG^sm!ILFp|O?phUFvXMZRYe5m(<uvOe9moCJ$
zl+jlr@ushHE<iDoG@NlwfIa-*M8R<~LM`$FIPOi`49f27JDN$p4S7$HmxEr9<taGc
z(EZIj3##7#c)1cfi~q8pfXp!@TKB>DzzLlFQkx*jT-z*@iWRQ=9_n9hVD1T1ysPgD
z5M8p~nFKC5`Zeg`S`a6O*oIM)%&6e_D0%hV&lVrlF<0-nwmB#OUjz@Z4HrP)sl=DD
z8%`HceP<qJH)FB*>zsrDJ)bZkY(pSL^ES;IUG+TCe(8)qY}{mWnsU_6HGKLVTLGiG
zjKipn)x;knxiZ<;9@Een3e%*r?wbs_G7b4~XyItAHbVVQHomW(5`kqc<JH%XAsp|%
zz`Ha<dOMFwINf*pJ@}Abu8qVod^$yjwrdsdH^shWq14;VB!KcsHjA<Zk$pP<kv{_C
zr|fMmpilp5))w4{7Qr_1Rh<88qa^@hXJuuzx*BhmEVfxZ-$*i+WIB)Xfn=I)=FFXn
zeWG?WLYG)vrL^dousyFwfkw^?1OXBlCC4(H@tM437ZsOJt}FJw(<OKRh6Mbu;(Y%3
zwQYxX*4GxF<lC_>Jk6jU)fS@ewU%1>cOg-kuj`+mWw<ySio?t`CsTIEevXwXjP23<
zrQ^0yMLJg*y`>GRphz-T2wWQZ7@e_``dv43CCikc-McrC+&y$a+lEr8U9Ux9Czq+H
z53mSTAL&86%N(lGcVr%2-g#QtB$*ymVU0cv$vxEok(<9F){WgrOkV5%)giKhTEr*W
zbQ=Sey7DQNv-=O9!V;0mZz&P!k<78P=s5c9%8EkP$iP6^fX?dJ%+|yI#0wgR2t5D^
zpn=D|!=9qDL})Rwr|Y+-Ha6kONsSfl6fTu{fRAfZ@x8>kXuQsdAC__O_;OjAKa^hS
z3lOJ$VvbEO274{KPt!<;7UnuFBqqr5%VtO5Psc){ek^E#Z+?7aIAe9w{K8~gDF%io
zt`h4(C%D1;4mb^YDr%5PJ7a=yg+Y(`XkD?Ok=7-?*U&Weuk`1!sC_?~mpRE##htP@
z1Slqgu6q%XHg8{Z)YLN;J1u?8-d8iPbbjPWmv;2ciP<v_`;(rGevRdByJ=%LQqh>O
zxFyW9Oi$o~J0SgNVTv|gFQefNj0Z?-DO27l$R;8A0kdrhZ@jodFOaTY4oW{p{%?-2
zf@`aC(9I`$7jHLAx-4SDH*ygtU|wrL8sHv^U2hM`FQ`6O?_0zXVoKsE*4e>NZM941
zkRn^Dz-LavhV5rX{;J5<oN3#dn%K(R&bLXul<E>)YSRE_ta(eB%n9azFZgMBIvO3@
z{M^WK5)$W1MH^?GXd2(5mCQQY5InD;=>^9>$4(aGPn(XCieF%7w=0Y_sC^<aeS|q+
zdZx0GkVmqKnl$1Mjn{zCJY!V_^_H?L=SVxFdZly3WW70J_=6gu8E<~%V->$+&H)E3
z${-m;)xOf)yT3)aSw8&Jxa(qt&~7=Rcet~v8u?%^+IY*5lZ?9hqT!QXGJv36oK4@W
zM(q!}b68A&cxA@O+1XT1|6{5DGu`8LR@GZvX~91;run{BOQd{c84~7FZNC;iLk|ix
zh}ZVFm2JWI>0W>z0~B*fKu@GQi(5srs&l1H0jb?G&8&_;eK@l4nMN)fFDzt6P6lV!
z5tAZeS;e_ZiV}Zt?sci`=v==>@ZIF;6?{#k9-(w{V<8vp2eTs1@iAdny+|3W;-d6B
z?<<Dhf5daVt-C8wdmY!Xbr6A5mm_;wu|w7(dwq@(N=v&{WZYjZ;}`rMRu}>?x{F2A
zIJ^M|GSi32N7sTA2$umDqYa9|cdoB-C2k+mkE-*V9CHlTA8euVG_k&BRjN|V!A^2@
zE1LdO$LEaVM5hxAC&T-PwFjGqEF@{@b~8!g*Ov&Uo=s0kT)ngr83&J|{d(J3B2PPH
zAA$?B|Ez94pG=Jm(}(YdEbOY%0{E))GsdDU3doeTgt6*n7~*jQv)_)nmBU1B4w9uI
zT7MXZn~$Md4;*!!HNR2GQIVc2YLqX0FD2o}D5J~v+!*<UT)+4*bgpEA|CpfYU7@@o
z)Lt3F+^IMgmKyEB3h2Red`%Z1z{!n>12zwe<PeSYPDOLrgsQQ<EBv9mK#2nAv#S-i
zA3?4?x)3J(T%@LkjrVS`eAJ#Q(GG=$Qkt8{aNO~u&qcI5XcF0Po4Q?#oDBC(rKrpY
zax~F-&YtgZjBR`3Y);=uI+s<>(z(TT*<Zb+9MEvwMQ%on?0aej{TG&pNvTlip#DKE
zvX8T^zh+ZPz4n0rm=?Om*N2hiL2RxRc0w30^?fvb4wJ@K#YSspUIWwx!6nixZJ|(X
zncCu8?ugz-Q*VI;7)yAoWv(u$>_I%vij<ed!)Eg2I+Z_U;nk56J<5LUOzr{}n)6Ho
zqbQ`gQ3J)!uv10Y+$K^kT#m5;)QMLY$>SVp-OQg9LS;jD%%EZ+0bmm{;}Bl%cT^@>
zpWKXV)`-76>|p~<&RdIh(K~b!R0u8P_Q1`seP%P+F~>WrH>cI->A_16y1PwJFDZ*x
zS#Bn@N?#M6r?F;D%nPO3eph!Smk1{3zg@$M9S5=a*Bz%6_kiP}32H*dF7TVjLJXNI
zkur61BpmOS*+qx-L;tg=lH@-dke9%TetR5FFFtO({it)K8!{uK#lha1dtR%*?=M&B
zqM%(=%LW+BP6~Ss`Kv2&Au5Ud&0JJRVkmZmY>i(#L*VL?Ks?n#0&d%1UqElT6S3Ar
z>vBRU@Vkra-|>@K14gw|St@P~CdRFcK?%`3f!#J<^zkwgQoCx>CHD2nq{aOuljT(O
z+1n`Ly$g(%t51hci*BnBz&eGn7p@E%-Xrt6VeF9Z_?Jr9OXBHbLnn@{*&CeaYR!fL
z6L510i>HyA=@Cop5@NWzp3V=MCMm)ewyHe<qk)Y}Ijm|wt-iZFULV!6q1%b$++|Ve
z<8%>Fd5ih2AApw{Pv|K+yoSg7FyJRa+vV@Z>R@S)NT>5(Jj)3CY>m0^%Arg0rNep4
zGwg~g3P38`Bq-;@%`Tk$dCy^Po0taJasZvCrLW<qK{jw$l#|XOPa+pai(Cm5FJ&WP
z^_XH)MkVJnb`1K;Xu!y-dTJDgybN}lEqkp+wG4K2T%}MexYGE#1FY+hnEFf+>z^ns
zu06Rd``TQ^!q+G%*di*6O^s_3!>H+`6o@+V(T1zS6!f@M-~Y|_8rIfiX1uJCJ0a$k
zy&h6!J%26arxIJ#>yHlU-pRqlMl-vKnwf7fE!(pTH9g)SsHe!L_xF4TF?t5y$S&iw
z?+9^z;II}rnGmXD#=J}lMl4B<#Td?X6=WyWwqMiveY79x|A?Czy`;0xg!lg+#!*FG
zh(VtudQHSpGXvPg^O=-E#F^)Rd!=?^XICvv`C=Ar+&|f_5zcP^w6j+_t^8T>*+nLP
zv=<%2?unR7!BG>HDTj#0z_G6i>u%iH&VgV8q4yXYW%mcgD4MUY24Zo`;Z4C}3#MQQ
zxllC`LBdkLD{Efp#NbrS#-f9d33bGV3foUG8FIz?@*SG&e93gtNen`pD<kP)ZTug{
zeel*N2>dZBd$T3~5AtiobAp5{)w%hEy==^wm9RMnYujj0@Yd%l=HndNUrYwh;>>D=
zUBOgz2PJt#MK^~Md^m9m5eznPycMx2an`zAMt=I-?*^W^<r#@Zu8;GLY<rS`IFI$W
zmwo(*n)6~H?(KD!;{OCupdX7qLn6f%$WrRCe4oQF@@zaqr}Q8ij;Mmag*y?xRw0J(
zSgM_U62sJ)BrvKb9HbF`Me);_sn-nH*1Y$3-N&=J&^c&3RYH#9M^K>DYUEHEvVB6!
zD#Hki0Kx8R0<lLL>JXoxtf|uHcxz{s4V2x(3%ST|oX&TXFiwkP-zJ9nwLw6zQFa%m
zTyr``obU<ETe_@2JS_rm^Hhw#siJdY@!hq`iSZu1#eUkF=Yo$<aeBNO;X3V`R8T}V
zb*xl5>!1u_$Ghs`aBo(p2OvXh-cl#CHKmco%ZewKP8j{i6yd(A&CJl)h>8A=XD(ii
z?2{i7DCz0_1=z&y=b*zOv|v0YeK%OG<VQpVZT}D4>WI&(Ais&Y_C~~++=<KiklV6V
z%ZutwA2kyW5Uabyo(6@=w*yo~aBKCmn<V_^Uz<`{^k(F}+EKlr4-GcFK2?VKR1G?n
z!058f*uogHQ{%iT&2xA0@nb$fk%pI&nU;tXvH0=_7*U5^5C7z0XH+eLpT26L*ZrQZ
z;RZS(?JSSZ%SrFU$8eI9WW@IZKUf@QTpK;J#OKDKku*5%T8#2<hSAikOU}h}y*YGn
ztH+5}?Zd?rxwI1|I%1Y)#3waw`?A^oV8j#ZLB5)s0B=cwMVD%th5f4Ha^sZBz~?kR
z{Xw?L%7-CLNAYvd&?ExG>6E9{(%;`-n`NA7ZL=4n7Ggws6sPGLpIfNGHsr$qz<*~3
zE)Vk^dVd~8DJ|iO(&WH1Lfkf028aE)J!(Gc;kR^V>%2-6=?uNoulJxR`64JBdEQM_
z7FIEA2G#t8HtiidT{~<8rSG);c%h+!AE{J#ZHx&flKpbMg+MjUPXf(^V?+r2(kF2@
z1;#<2Gcj8RJE+AvmF`Y=`MT0IdgzlkmC4%ECaXnxo)zPYz0$baT1;LomGVpr2nMW#
z=!VAjNMigGOZSk=s)!nn%^z|Pu#$!LeuqW5DiPTi`6ID6!;H-HIjJ!LK8E6vJAAT%
z7ot!+_AY61akY$~HQqrpx^l>D0oXr7NB=#r$z&Jb<|H#d#a}vlB16sK8_`4z6z@ND
zTSXqEt1=L>H;6Bu$eOe+SHH+kB0$_wXv0tE1Y|P()kXbT7SgGh3#j_au;pXAX!NV3
zt!{kO&q+-psi2y>kaF_SU{vjwRsh`TFA#vDfaH=BTMvBomB%&rNPdrphc&LXU`ORk
zMWZvnVVaF%3bTMSKh>vXJ^FgFqG)EhkI2Ruef)MG>E|z^pp3B-HkM%J8stV4!WMY2
z5s{b_W3e*kY8#^bw2K;MtpL7$rI-C$7k#oe$W^=RHaXVc*ou&baUwBhS<Yz(>_I6j
z7sE$i8taeCgSCPeR)5+P)p@gbW-urVXVeS8GHKLbEx{El@6oK8b1@C__}RN?bZar~
z2V)Wq-V&R}-BO|Y{U4&t2q(UnY<aw<otnflw>xW7f`-q`{5#XBlM47fS;SrjX`&vV
z3YBQ>wYkmHeh6UwtYE010L!@N{Rux!6kp<VY8CyC79={y9U67dSRaXS1q!rO&~GPi
zbY^o*fL}v`W;p^MGeqZBVS~fYr2c8${Z?c?(T6UL9qG1+XL5W%m-wCM71u~^oFAj{
zn4KtL_j`=ZDx$(UzPw3FPXR-?{}TXxxR-5?ilmG~`AR@Vr1;3aD_!4GkRzR94Q8ZQ
ztYgG+AQpAF7pRyBOu~#nyl8Ug1QV;qTn|vPKYCC_Y?#UJJZ{~T3C3Da&^GDs@HS&@
z|A+J8264sN;9w=-kRLbjyz@QPZAf_;9++*r3cJN@0;}8j_E9f%YQW(-HtGqRf;68#
z2#%LXwNxk-*&A-5)pz7sImW)_Yti2@zCG}3VkgL1IMXK1c7B(wn5x1}e*a77GHxpg
zec(gN&u$o%H6iP5q~Y4j*Yl-Q0B5qL<V@fVRn8Qu9}WRcJ2z_C^aYe$8spnf4;D@F
zV6fc;jXgD)TIEo$cnwDHE4-d7z9da3WuqMyy>pU&l)Ar0HBSl?dVS00%ViI&(em9{
zSwhFUwi3|~ajlR}pdU%r%E3_PuYG!t!bu0$yY$;Qt5sP{%^^Ad2Y{i#NF#lWk)b~!
z{$|f0pA~7STNRi>A@k!sAX@q&blJ_ePEHc%VCPCFlg3n)slty&5a==*n_Y4fAwQoU
z!c!m?!Jgz;6)%eiVEwwAyjL`G$Sak{*g|cuVw}Ne8f=6%1R&dM#45jmM+XF7bv)h>
zSrJ_qDy4F_>RFgL12L6DU91egMrx}|`|Q4tcwl@uDzg14WpW+t9ty@!u~6!tBz*}S
z0CLi(4(RT#sj4jb`cU^v=s#phFb7uB`rHLxgV{_W&0}D>5w6uRUpmsau&O`{@U$pM
zQVr-xi%&JmyI>&=&eK;~F1J$pv73lS7JS!S#PyZ9h(&jRlDe}myOxheo67$i<Zo%u
z#~oq*(%2O-;(0C2CG=TkPjL%E+dqc4^9-Hh^^6gKyf;VbJa}t1Uyqh<7)s8zSeFJe
z@AIIZ=Z17h>7b$2?QJEz?<R1X)2vB3#d4xN*Eu$rJn1MLN9koK*~0B3ImzG5fx&3N
zbCO8AU;KoosS%CF*2)p)!tM7?K|uJ^fkn3*?4&VkkFoo`WjTIIVQ8%<1tlz{P$7Be
zh|dxy#iz8CgPLGbbCmObzhj;3x>h}Bdg2e3xo;)8wOY;Osb{r-+K7x&Djgaj?Ucc%
zvbcmKL(qW9UpDA|Bi}hHY}Myo0I)?tS$)v%q@o9F+|A6$$;r6r3vn#W2)l!JrV?h}
z6g@M58-WG4Ju`kUZ0iF{OF437Lq|Ltv2i|=<uC-<4>J7UI>PRF6J;DmLdC8%rds+L
zU%3ci=KhA*ruZp3IA}fNn9@6P=kUgLjnQ|iO0PjqB0GYXsxTUM{zM}e6G<G9kQ$GZ
z$RC-t#n9XI{RHs`rd9}y*;MpIa_j=G{b#@9ft&fFq(&4x<3^*Rc)gg3QtF{(mu!9-
z?Sggj2etYr>OropdMF~)igZ1iDtABYP1@mJa}W&LAwA6{OH%fc+)~F~tp0(pS#z|P
ztlX5s{w89^xL#_?ehL?Owus(QkHQn*vtOU%y@by+7h;W)G+F!n;|k5~`TJzF|1opq
zxqJ-aQ&&8OdRR(`*T~1s*RPHFjqPk3m^Xr5k`k&z&s+6xyEp$c6>Wyw!*SGpMdh|O
ztFkF3)OLMoBBOuEWY*bKh2%lwK@fZOcTJ4>Z!~sxhE%_z`7hLoMhcyKr2F!;>9o-{
zZBq@LY4J=#*{pTVFnL2yN)s6*XG}=|G__CPE^J3-tg{yrs$K0zVU@P5AX;)bQu21G
zR5&DYInGK^wI$M%jGqPRC2J|EeJPul=MzLtPew#hdOas=fN{zd?j1<&%BiRu)N~Q!
zO5z-3Kjso|N_IwP_!$@`jI<%e?mva1zp13_4h<p(7V8pyU`NQazv|m@t}qM6N2-`B
zjr^oBO%f95L0AP)DMzQ8=z@E@T>Y4QCq3zCR3Too2X9Yhv3zg1CI%cW)*IOWt*rzm
z<5;7F-5cV)FYs!F*p~8orb@MFA58Xvl$;`m&O!2?Q?%Ue^Ol`5#B4U3JnD%GDIisH
zRL;5|PR2ZUYkP1S(y0p0;a-_?a9VtL`kpFcN>h9Z-+}scd&IohG5BRb?hrIasg<G`
zNfU0x6b8FBb31D5HKuX__MrR4CdqG-++4;Kd;Dfx?I+xZJg{V1LKcyO2bjnk{p308
z??PnlFtkSm)=_Zk+KQz*&y2EUruT66w!UteP=}4h8`(VXC1sgEbm!+dKNhZa(=33a
zc8@ulh2@N29KU36tOgyn>0dc?@$eV;s|?mQaGE7<m2aISYWw_e8GT=i6CoUU93&iA
zlLI{Y?%Y)M;-M0mlYs+5<Jp`^rqZ*MwFC^|^j&F}YLeY$-_!NQDFL|(dGxH`rX?t%
zNQ!P51w%@IN)TTN*|muDx-#49z%y8?a*sP+bPK4T7qE9=DgYZPAmhCCY*vMZ)Hk4X
zy_`%}ap7h{-irO^aRnL5F|{sv$LoxDx0g^991dKcuYpt_%HcM<f?Tz=X~R(CsPcI@
zKL@A*GK)I@-0u9O4;Bq_HC;z!=dL!>b!QPua{x~9Nc#lSREPP7hk=H`qW8q7g7;EZ
z>R;y@<$SCW8zx@-JeC;f*WMH!U!ng;>fzWnDWy1k_jvlkCs^vV2ZkOI{rIQI=lNa1
z-ZnmNa$dZ74K;^p_JxbOMnP5&;xe-wI@T0n&CfEgb|ol=?)n*4;3g#e+Js}mSVT`2
zBeg6iBjwH&gFcPozHpmn?~T@#<~lmo+34(~$uv4~TnlM(YZI`BzZ;l_ZVVH5muebd
z*qQ`IkI*!VaVd)f%0&Sb(WfQFhL<5t%3}`3zmb*8*ZxtiT#)$!8$KP;H^)!N>+U+d
zB9BkC9oFrs*Yybl%^3+AxbhVvVF7>`P4isC{R5!BR{vF0WoHSNS%^`I`obFNZqqb6
zo)wsJGt<#a>ou~#3h+NDLQ<aX0R}li@;Fn2&+qc>aq98onruqN|G81d&w=griB6RJ
z<MQL(^7i)8pGEe|Jo;b=Z;!n+MNFpjN_x)xUEmcXJFaq2r;#+xS2cKG5+~AipIer4
zQYUSKQN&S)E02gFaxtBD%Fmkpb5ig0V9E0sc8<9iO4Jb>Vf`C@o6c*#X;FR4^??Sz
zvyd(|$Wp%NC1`UijICam`33A{?WG{i7&l{_ju!RF`&6f36SCEGz15tU!%@#xUN+(M
z7n8^9^-n(8QcDm~qb?s_4oyLk3|)uQnUw|Rn8VdN`lD;?3QQLD|K@+Iq`5G9$*Zh^
z6fV)HzGfL8hwojYNuS;!Mm1yjjejL@%-F7f{Vget&TN^&lZ)BV;3n_ATdDU+{KQ`H
zx9_{Y>tXSpzMF*xgju=DC{d2BJFGYHMp+<rda9`cp3vP3Tm9y{sKI#H6Y9?&4nr<K
zs<kS#cW+zh^DrI9Zu717+YoqEwK!DpKLjF_<~(U);v>Lx+Fl$Si1YZNrbKiD&r)yT
z!XzD<>QOy<L4LIxE`9Nhqalezx?%sqf%Y%weA5b@J^swN?kAyfAGU;dX#0_BA;)sw
z&uIlj1JTIqs~KlL!9QgJi2kG7VeVR*$CD*B#KJOft0)e{#5`_#&nU`9y2fu>n%)rA
zJaP^r^AAE8)+wu#K#2vooZ2apHD+@L5!8Bp$!%<OV~c7jsAiYa8V+B4JbwTnt`bm2
zAB=0Xlu`0~Ijo<O{si>sm=@k|G$0u&<2ONKop#Gu;xa*VLZ5rrG&<B)+5EWbP1<=9
zRiD0FxRdvzAJ@BjoCNTwnkW9EFi24m+dbpgo(h>U&Vr0FeG|3#hs?Qu9b<dR@v_Ez
zw$7Z%2)MtIRfg1~-nt0s<rDHy{x2ESd59W$`_zcsLp5P^yHIE2>A$JWj?|@3`N`Rh
ztAo~}ebOzOW^jU?H?1v|#nw;vTNKq0MshySFPN0aV)i_Sin>wT`@)c9IRP9i{}Fwp
zg!`y#6hO*B$_)yMh8z^t{Cl^Yx(;KP=%K&vc#<G$kQ9=RXxy+`#j#7y*ihLjy#At-
z&VHfn7fovJcRP&?Yl{W0IDQIkQKKr7_J-zb?mXeO&QyFL&;@NHd&LEbzGjvpm{*5D
zuqKcr$rKH!(pkDe)zRFyoW7_P{lDesmp*nx_FkuPsKXS;G8*?rz!eOuI|qIQZ{op9
z#X6V<sm%0X#{pkEo`YK}o!MhkTpHP2zfRqc(OL6$a)^<B@Ur!|+u|FJwNJB}Lbq+@
z$`O--VtS5CpJ4-6sEac01Z1-Zz_rd3>VP*;FKQ}L$guup<a*F$x<!ubhmje7X}ppV
zyX93vOm$_mO^%EwR$azz&>nYmvSQER`(u@8f%i&7aq(7W0|VaXe3vf=>5|$^T|Yln
zyQ;lV8z_Iy$p@e7fmp!nr}^yl%zv?ZB*oJM;30wnA0a~{O_m670JDUgap7?mMR81^
zzUU^Fg_~@bkj-RoX?A)$X1~G-AFKQsNjj6`b7Z3GM*A3BJ@`{g<_$dcXv|Tz?e0XR
z=g*<r9tH|X;UhuRzG*LW!EbDTR~d(w&@Mk09O3e|cEl=7^N*Z*r^VI0Z0-W+A3|7K
z>)6uZUN*V`X9k(C=0ss`Bl})+RZOT$&KUx|sT(K}!|MHXDTFy=Z(<64rMmswJKEW+
zyfThK`$0yr|Ba*1KK4t99gd}b>3nupKiPr16vA;ps<(B8u|7?v$<&m+26iTcCuQB(
zJqnGaS9!$IL_};l>%>*77{!BPA1*5i)|ES4b1|F;h8=RttfXz`yaJbwMI%g>p*l(8
z2n2pp7-lEpvfS+u^R&ko29;TwwfQ!ifxX7rX~<^t=I&p<zEKk_u;{d;M{yaNdpk95
z-*=o%D%^Nd>3=y&gpBdfAaW57jU;w~y(b!?9iUiN$EJ8#sA1|#gy`0%)+<-^U&aWR
z_wBy!+RfjZf~+O%6hQ->-a@F#lApm?@NzG#bgrrIw)(J$+a*vxlv?QS&epV@v1(Fo
zF)~Hoy@5Pi{xDk62jb=@xX#Wz&j0~J7F<m%m{QRCN7f@?dT6R7Zcf0-f{rY=*r@P(
zj<EyBKfZ{g8Yz1({Gys=`CIZ7e2B5sU}V})w2RU5{q>t(m8t7c=s>_TJJDfw6|2ak
zc7-SU>%=gLO*@5UgjvaVB~_B3Y2$&1SdlhbU41EN#!Z@ew$b~B`4wE>Fm9yN;B%F{
zX#zZ+Y(C17JS*oZ8UARuIw8aYdts69|7}~Wx3;`wJGKWQQ<r$YZ1B76kEdLCo~Bk?
zjKuzFv}Q5tF`4dmsS(_4vQBDuSz+O1tugGjP|g#vW6|$g%yG!w@AQ3X(e-stum09*
zcB%^di*?bPG&^$%S9RTfrN)5MayqwKS+?(zKT9^29X@_A=9-whCspof2TP^IA?EX8
zo_a#Mn7oIrH>t|FfdGbVXieho;T(cxqVqeYl6$+9&!@^CgAyeAl)ZI9e78J{%jh!;
z{QR2v33QF_CemN8G!4yMK{O@^N*z*;Dy4h5Isk3rG(AzpZ)+Fx@PoW`!e-W5!G}8>
zE7t^m#Ef`!Sz%4x!z+o^@xv$rnOO88I4d{Td7vdHfbk?}9<5izEq69rzH#VLVkcV$
z(R%^F4W%AePHa1EI>vY{1u04@xp#4ndUet~ac1@+8RJ{Sa-Oo;KB>Zg5h8-puK|!J
zX4fmD$h;U|T<=pMztgTJS&R2$S!2lAU_{cv({<Y966lSz@ms5HMii97{q}0>rTFbt
zPk7-Kqc%$xm28iVO+9!owjJrJeXSUp8UN<lp|&S+3g^O2UH~PX+S7RX{b!;j4+%wR
zeo!yf?j?Z&w!L|X6Y3}@zH+A-ELP;GS~?AWW|){HHAEn_I0wJqykR-kz}Qf)hsLeo
z5)Wu`UV}q<CNDn)+}DpxBY^QgkjcZ`cKhPhrAIUZ^SH`drn&`V_Ol``=`@Z9OPfEn
zE$=!mIME0nmn|&Z3;rswJy!`-I7IJ@uBP;)5M&NQZBR{T$`OkHD(~mjcJ#=^+obqT
zq6&+j17x*$H~&KX(K9umhZr|J#7$6}ffNH}6#lfi)nmHZy#cbb&#{&jxd#<MxxV+8
zT-4${zCM&KfyleMA%9z6A%8vo8uK`8CRZOqQ1LrOp{(5gjTM~w+v^uj51;D&{tD0P
zy7e%2-YDem_Q(Rgjxb&$eUgjk#0u4xx6<P)FnZYXr)6f{&qImFz<2X?nsAG@)&8$Q
z<xK3qb-Fus*|mQQSNtqBaFdVh5y)g3;VIU`%g@O;`%IdHRX-7Y&<dCDCFFcpP6(+a
z(=Hc!ycES;g5~N-V~sNwYpb1{#vl{1;(<}l`9Z~pIK^UB<DrGED);zYzHso~{fJw(
zW6p|y^Euk$K!5iWqbzCs_n#~Ew;;6~O7YlCMp-jX{L-D^$<KSDstt>t(bOl0A-kW2
zzW|LifSI~i{e5k6aBbTPHHZ*CDr?tZ=fQrk4FOdbzOIjev1xJ-gLo!i0yD`072$~)
z2J7!~!swOeHX7VwfKh6yG94e8mmH5(D45dJ{i1<kT>eG_PGlSf&{+J&b)ygmJe)o7
zvhpmR<GwY%d14LH^ef>DTZ$CMcvl;!4}Y6$2j1JmJqf_XmmPlWO5fh_sywriD`($z
zL2?=my7a8f5J#7BR7klmdjwHR$_xby5~a!WReT`7<RpyVmn%t}d|y#t1hKRFC$<Ev
zb3bnJJ73VR!@QnBGj8|3dyOxYl%MWHZa~*Dhk566X6M~PH*4XMNL7BKrKqf9h`Hwr
zGeY=6sBvqY;m<x`Q8INpL^UXr_rbJ0lzsrTp{Ui3AJ-}UXc{)P-D#?>XuC7NQb_x<
z$AayK5zezCb1a$vT$0hRk+;XcE7n{)-Sb&ey~er15BeT&i)WsXxqqR@HhO$JA<r%|
z78Bw(v7<^G`{YV6zq`+vexZ)6H9FwpY^!rN=yO`vf6@`JPNu}6uV!2MLL@l^qR1J3
zsJeC|RB|4$Ie>RaZM7)-RUjn*);p|=gzVAc{RP4GXCLLMoDn63EVwXlL??<MqG8<3
zeH%oXk)a#}*P|loC+De|Sm$Nr74w}-{CpbT^=!@oeu?u}lK_CgX3CW5dX=&5@?fK$
zKJ2}Ti9&^ophut+?$aK0OGy-!@uQnWcDDAR*9)M09fm@f6KDfWFgEQ%d%seyled{G
zlohA?eTqcQ7|?mSzLd~Y9xr#)K!J5Z9KiPeP8El6FBOOrK{n`hc0F)#{n4}~bVX*i
zgE0=TCg*fo{jEcY?O)Wq$*i!{cKP_&7qlE0ZetAm2zu3!MQ`$khB8)ZHU)~PWs&P5
zoxFy}X(fG^<29eB4y`#yaK4W@EK9f{!o3S+9pgu06$B)`N#y#TR?+o}nUMJ%6|7y#
zCRq%Mk>&|MxcQ@(j&{2LH74~rGERcUJZ!ZzyPnp474~+Qg}{_c`@F3-_URcNt$06f
z3N9oX-qZHRlhOSCE}(Dn?tQW-=l3{?^dNLFV>y$1PyKoM%YbhH?c=T@?5EylFW8JQ
z9)>y6g$F&BHgdv;!FmT930owFaXC2N5_(!_W6fyeOjh2}N)}(ilKDIfj_P6FeJ=sp
z*@P_(p5~xR>L6tpEj(c-aII5VMV&xj6RLZIMs0ImB{fszgnlngq_G|!Rkd{7R%O>p
zEh86t`MqfjrpkV>h6|y&aEs$=i_>HeXwb>-s;gAv>pu~v(i1xVaqQ_6N66|>`0LAg
zb2^UTYS>X4mX*;_FVge3vixgXVmvhX0%&fv4Wugpn9)zzC6zebwAje-l<AcHk3JS2
z3G__qKv?$E8?!yQ(H9&Qk^R%Dh}5vdkJq+ZqCLnS8QGoQQmok&60sHFrHwVy+YjU+
zWf-`qR)`pa*;GUjXCqEAQ`YNlt2IqQ_R*qZf7;Ye14SA8==RU$!JvGI(%*>*f3Jpx
z6PVohg~JXYdc<De+wN_!cfd>gA!pvjWNP2%=Y5BslRt1bkj3dgf}9R0wu0-l7_Xb%
z2Bc7<h!^mG;7-ts8$aK*GoyTsYtF7~&&5P>1lN=QjX+8N91u?`;97SYwV0uf^2fsL
zQlXJc?%5g2jt1Lu*4aMeUS0ksfQfSFZ;M^$$&t<D#ot^gqYj<ks$iUR-+sMaKsG-o
z3+$TUf=)0$zg0z9IwzI#%=|u*<Ke4K;K8A_T(a$F$*&vYBb-`O(sV=3r*z)V($qI1
zIGM&e`{gYm*mF|}TgX+wT}B=(Sw_kdv<!vsq$NrN+)aO7q?rjRI*0Tg^v-{%avKD(
z3OFk+guZcdr5Lj8V3JtPc?jmZToLU#dHrDSK^}m_BWs}&R6lqkJ`;)Ebp1WdtI$ag
z_rYmz!YTEyQ~5UhsxTt@k4d*7EGJW$1B8d^SHf8E*H0Xd`RnVXdNB^ku`dN^y0Er!
zN3ynriQ?%NDP7bxQOJ#H)_KU=kjT?Ni<M%2uXx?VL7b}DS~XRJ>W9_Sg<FxJjOY?r
zIB^9jSq|b{#H78gx2ix)*^m*G*x?ru*LNSu_-Atl0LG)J$Q-ZE>K4ds^#ObM;{|S^
zW6(AaOn*@qPhW?kL^eVGz5*TiOe2S!R3&1wSYoc$Sx^C(k~;At(fO35kl^q_XL7R9
zmv_Vmx5tpvL4{}N4MvexmLBeyHhZ=!711!rC1)Hpln{cb+uhIh+vyIsQ$*6gTh^wa
z-%4)nV_cZW+A2LJ&TTTwMGl$Y_n}M2kY?ZQa|TeLPb9{;tnw&&7bJCJ_&IGNy=P_}
zGGGbM*}E~mcyJK1P=Yi(>qQ0;b}xS2yNLrbCt%?IrM9~zoF<OkoiFC<yE4uCep4Co
z%G?m{&~tvYOeDf+|3f^jP;xR+M2S&WOF2&iI}m8_zDKB5dTDJ?!Z{MAWVvePYo%HU
z+{PGI^jt<FPK_W<EFPW~B~mJz48||HMQ11F>BVLfXw}H^ML=KrGu^LQ-)y*>!~Ulc
z>>Oo3FCF0HqvRx#^m75%2SJ6jj>o3Uu*m$t{=nBixeN=6l7A3A(SDOC7vPlM9<u%`
zkbIcSg6b73W>Ck1_u6z7IW*Q#F;q+T@(}k^pk?NwWv+;tnTg^h?|v~#Q_oKicsp#g
zh2?yhK6oX*e9ovItuo`wvFBfJyCI1-o#I(Fn-dOYm!U13gC%=uy9uJJD}OOw3xcca
zL`3ganwuALB%5-IXpg=9zqLqDn#RSgyO2NM!o2X?NgffY@eMn~WBD5X6tX#D?_`1g
zsm=_657JifgWe|mF~MfBjgNHsS-*=fHuU_@$&F6egU3cc(&X;~yL_dDHW>PDttV2L
zLyt#{a};Ys{scpdpb-3Z=b2po<$e4y1vwvC;2OHIhT>wjamv5VjE1eY*4tlUsST;2
z@4HNs;1jsQ;`uT)3&?f%>dJ{%=eZbTE*D&4R`+woPJXyD_Jsu8V`VGQaM0>4oQ8z7
zr)hCS-xGDP{#sFMES4EXe<5O2=%U&Gp_IpZ&cLIyVp4jozz&uI2oRd>MTA~6R4)>U
z4AYmVbNZyvm9|pWFCFbALm!RzOU0foGK4rxI@+#u6M`uVDREqs=_l1OjCzW=ciPpR
z72;x$^Y9($b5qXS>v84lZ=PEFr+Cq>u%Y)5kkR=<CBAYR!C5_i9Y73;%q)8-9UT!c
zfyxxMc}FQmK(d-P)?ognr8ckU+z7^o;)gw_CN~f2_PVw3f4$hBxW4aqbIm%`nHY(%
zmRFZQ6)Yhhgzc>ag$ED}z=eldzVH1kmyUSAe}-;>73!RK>#(vw^TnGt{up#yAYLpC
z5G3+`XN}GB==CXC%~-uhKmOO`guCnPw<zF+3ApO-FkChD{1e@#tXqT;a!a7=udnbO
zzx)mUD~D36AB;pKs4{R=L|<p7o73)^vC&m5Kqc>oq>^lo(Rr7z?l)4WD?>TKZ(X=*
zWJNW%G~F_dyWK8~ET*cu6G%HUd|P5)J`Wv^$MJ@`D}^*OHIQh2H3+khF0%=*RwQlX
z%_r7hU9kO3>VZfmJ&x{{C6`H;o`e{d2k)JnYKyyUutKT<9f&p@!2UddfqI^VZe2vN
z*90>nkzHA&J;zB2YBR0sgF3)LbHO{tUSm2HtY(T!J9x!|TK^|Q$bf+*7`V5wBc5un
z%b(IhBDfU#{{XhRVd4Su#0PE{umHYE)X5(+?=y37ZG*|Jcr@!q_U`&H<QG2Y6>#!D
z9RBneOd_`G!<^?YB8WA8O)|8(QCcW%>h&dQfw;}&150R^KWj`dB=}WP6_>0VZB$fj
zAz1&BAeM5olUN4ca8IfE=xaxBRw;-Jo5Hq-iU`J0ak#=PSEGJRUYr#V-hWbxMhd}Z
zIkOdm+Nq+*5xd(YZTgkQVsHbB>AQnm^#yBsG3&idtZb_(3B(&y|K=_oI~qh)EDPMW
znXY^C&Gs&vY%mqE$|OB=cKw#2nnhJzK4|J^Ac;Q`cFZ2FDQzhb$OekBYWbBAZ635J
zod`))6-qnJab^y~#iryp<+qk1(B$(}1eYo*7&uLZ?FmDg;9E-8P2F)8yzEb&LeS&r
zlD57WZBm%gR*TBfD^)l&5@M%CNJz?_x=&1+w3`Z9FEwgW;O|k5R1;Q(#u#&Y;e8I*
z{Z&hFR#w{ea7)QONqb<mo5t>I;lmSFMlq9|V9@U#tZ}D(a#G6Qr^nK9U$G@X7%vNl
zNr0kL_A+WocE;6nWQM|J7U#d?Vzc?vt0}W&)Y^Zg!N;1+U^ZFeTM=yC6xpB8o-zk|
z!|UE(=H3e%8T9Es?F--1$p*JM#?<8O;~;-k@oACsYp#wD5DKQMEicBn@ji<ij`;k`
zn}zjfoQ{TQ0EbHVa_xD@7;zPbmG7LH?``SVqWAI~L7|L?*!lP8J2aIL2;E>fa4WI-
zwU7l_3`&JlWkl?U@n7d^<om+r-oxn})SIGHx4BP%pWZRrmQYoM2r$uZ2jA!eJ*=sh
z+78;>A(vbQ;WK9wFvSOB8A)52|0DqbU%Py>Bg^cx^f#LOKoF;2_8HF?4^Z>ctpwF!
zN-4~*=KIaOaIrLo08!3Bf|pl9-B=qVXiLR%$$X9ICNNL5X{42Ywn$E`XuSk#^5=@{
zA$=DHNpUKYroyAi@pd+<4ukn4M)HdtDvIRw?!tNCtRPT&pvT7Soi+zm+S;`J@`5Ep
ze?VgwP#uvMA07{qZsW1>Os7%>xAEjOe5fIVd$G3p0|)W5x#6YUWa7UwGkV_c>#1xo
zgxd@TtQL+KqLWYNzn#dfTrPWKRf|VFcx2>f-uhvHbvjYcp+b<m0l}7LS8dUM$mh5h
zXWh9UzZSlgtXx4PGrTX>PMf<NmB*Ol!M~U|RAFWe*N2gy;V^Fyah?)i0&k4o50L#8
z|42C#4@27pSd;tNi3Yfj9KzDhHq|P;5jV{N63!L#EY0w9ud^(tf2b_aYURl2tX)E6
z#MmepfK$T+J!ZC=&^T0b8pcYZeA6&fjJEA?#kao$-=zP1`WHs1d``|Af?g{%p8P1>
z!C}>j^2luQdagF1pr6OWx#XbW$Ftmr8W#K?#TmY&%F=6HUo-yD0;y&t26cXy&pL-n
z<m22LG3wAT(Ug_}vsB9m^o8=U^`HMBR}Sp`M1|kjCM<_rIWq3~u1<g7xjj6Oq9VXQ
z5Rn_Ti$ueWac3ZMUvSG83Tcy?kAJ*p#?$JPt``C--<{oQ$+bfpE@W{wBEHIS7ZSO9
zU_tv&e+txC&tHwmvA4@Mn>(Da#IQ1opGVe>zjjDL4*tSR_n0peKu0O<)5&aQA?2p(
zJwpjSH))F>aliPk29wU&e%?hT>NI-kyJ1&8kgW)fT$#i6OZNr!x4^Eu?1nK;;+DS1
z_7qVb>mAvm4=i#?63ln@S^lT-Jwz|nxIaBTLE%>D9fuCp$DA;^7*)E48hO&S>sKRb
z1iyXzw_@Z&RMCe_F_NVr@E|R0M0B5;7fC3J*YUZs$&|p^pp2`Pya@+~7OQhsD`Qr4
z1=N6S`Pji<gm>lY4z9V43ebPl3R2T*C=e+9EoRYY_Fv`aP1^LO7(;H&Vh7{7d-zR2
zoG=Z&_Avz(v%iMWkhIII%8*<2^hKczya?4u;nNHZ)Y#EVlWH_Ix00ayQDoK@`S6oS
z>8yk4%4^|vm2MWA!}xEA9>(G;?%6l4j96-=$umT?hvbc~sR;Uj24QKlR^n<taPJi~
z!1|><VLzo75}I8p2Qea&a#x)1p@qSY|JwVMp%HL`*^U$brr1&|ObEAKHS)KIw3h-9
zW>1;94VkuLin{Ik>rSJIZm+-^xXiy7keu$oat0)b7>n3ZtsA;#q<PZTKX<qnhgpfb
z6k~Dies@1R6<l}^dPu2hgl|C7Tkt@Apn+es@`uh@_E^S<f87<>oMycHJ{^^5EKtvu
z%3I?mQ;0M@ldrGOiZ-*I^6_IMOU?s_)j#6_DauW}cD8BD)z?FdY?V<L_U|qJ2?s`j
zzD!;yPoUGXU<i?tQ6Stvx7!ORzR0bnOjQm6EW+Ewmn;()9RCSz+<ZcKS-r)Hn?Hmv
zTP0Th5qNl9O&<rborS$K=c1T{UY-5QUNgCW-$@gsV1J(hy5(UL@;))l0g@7=sgWH%
zi?zoydG#q}NS-=@xeTn#)c$-FNHUG!x1|KMj_CX%Zmk`4wVq!x7_QHemj}zOWM`;6
zq1}*@wL~~;GK#Z&rHuBcO`8t2Cd_D=RODE~GhKF1pNKboY&|ZlGw(;HOTc#xG}7Tx
z7;&{8HWGTLK><v&>e4Lh<nOU5<RL|sk+Ugz3a7-DWxysk!f*T`+}Fenl?JCZ`Lhl2
z$+{Ieh<5VKoL0cib54sgf(m)H?`|4<7S;;#<MB~(@{qY;^dpq1WPh^8lU((GQua%g
z_E|wWEqQ~V2R<?%42Hq}WX9Iqh(t!hiXU;9eE$vRNqn>yz9JI=RF^NEs8+lUxeceY
zTG<t#|I;zLY6rw-<B=ru#0#UhPuq=Qq&plsdR??<R#dWxXF*)A;#+%mFb8AvJaXNK
zH@W0uTbrYXX`N$%HQjk=%aI;{o!;rzxqGMyziTLX9NEw;a|KX}r?<?uVY;;`>kPYY
zeTub6Ul(7fG{_%X{b2(>+^_`dChAdc?DiVW3gJ_q$~*1z)@RC(Wj9lD7+Yp*=VOT{
z$e1l28;%8Ls21>$@VLDuqcmt`GX1<@*~^m0qMxS1vpd<om08O3KazT}#Gwww)&d+D
z>CyHmF927pR3~w&!U7&?x`qzESAKJZ=~|9uQ(h-TigRr5nZ8Yl^-3p+NFj*v4H?e;
zzV?*Xh;b`F#pA?buCx|&kXy-&>N3t6H$5DZym8CVsr>uNQ+ay%^J1d1q8U}z^R-d9
z1}xBl$2^+K<q<dnI^v7YP0P;^n?WX5Z1$eCm#Rv8NJ}yz4=is8><V1thj}R3m%^P6
z^a%>XRZL`8id<Z=@fTN!-23;ZX%saeTln7E@N790OpW~5pS?bg^2mMh{HIF)mqUyN
z-XAzQUTmlIt0x3q)0ky6B*%_sK%F!W@d{@)=I<()m+zL7a1i?)C>YPZBkfMpS(~1_
zT~uhoZpZ7w6?^-?4ctJD<IGhJQJt^{{HD4#c&v1aOF3IfxW{1h>g}}JL#4pXudorV
zFQj+-ySW1(RQWzzOnLE@rxX66g9@6>d~5XL-|3i7pyf)DufNfM!tj=GTd)V0a79V!
z!i<bDoL7x86eSu<&n_zNb%TA^=k4O!5YmRPk2#y2A%gX51WuhM*@<>hYWt~8*4AC*
zfv#sLu_Zx8KuU@lv8Nlii#$$)ez7pJC_;=?u0Z<orjYvRIpnmclWbeDb$cFl+<#k1
zc5h|*Gq1+So*sQFZaeln`F;=gb=+QtJUOG!$3W7b)WI)yuRW>HXby~#G69UxncU>o
z`Jn^NWo^Q!@ui9P8AMp81#j?n0(8CY4duryn8O<1g0=8g_F&qT_6<58@LP>f#(`Cw
zVee4B2stMIR5j|S4Lx%014^L)(JSxA^3xRKM5sSdCkWI=Ff@eU?LR@eoSO?;fq(n9
z9Q)34Kdmqxwen&|j*U=eDz#V)K#dXQKgRml%j^zEu#$TpU3*<_dMAM_SQD$e)$sTx
zX5agN7{Z<Pc|TqCnZ0^ncK&NnIL_3?v8VH<1qcrO2(<Dy?%n2=UYVmlCJH58d>akn
zkq)yfW(M3cY%%~-8f7BXxN<K1auT)ZD`pq%8RYq5!}gaV@dwAwpWLxY46T_MGwUa;
z_Xxc3z(1bNWo|f^Wp_DDwH>>{Y^>XF>t%cj%dqFY^}*QfKBahQfbacEK}ZN$sWpEu
zSs$k8F{bNB99@o_yo)od=ZiU_Z$wZEgv_r^L5fQzdUSL&Y0u!vN?>GTz1XlnCaE8t
zqH7Fq9d6;b`I792<&Sydu&ej`#TIcrq>kpEyz>Zv+i<WHf!wF`*qTJn-22&g7>Z9V
z3=HJGQ1U(Ye-rJEDvXt^k3r47s=^#Igf;4{lU&5j9XfH@YuqNB3qR&wOWwk)GlWz=
z6+uACO?)yg$BZBeft7j4h73GDMSt46V^`p4O-PQQdph`_<bvSg`foke-GkpsPNxtw
zLLzc*3eC)zn2l;BO1uyoZ0f(2kWFEJ$wJ;J)|JpD;rkCj1qclE8_f!&{YX|WjK8|?
z-~6(86KjFWk@x_koFShkFbSZX8y{SekEq64ra`fe8gr0GOMt>BBoRc9WZUlwJLFX{
zlqOVHs^GB}3)QWzeqzdFRqU55|3x}p|2#|V{Ftp*YZ#Q+G{*6ykmvU)nqr+@JvFyX
z6Z7-&UU7dB&#@(^mX$Hsh{+VX?o6j=P3qa{_2siN%P{hYP%M@q9d~W|_nI-Lrjj~1
zXQuAtl32N!oOlcwm*L8>F*A!hEpi-}b?=UUpf_MMgCEO~yS52b{U&`A1y`E<3iG9%
z-~YN0n8s<SA`E+SSMF-0`wMZIY&@X_1ULn9X(&c{KPt}3#xPZVTUv*HCP+oRFFF@{
z6b^ILd8|wjtGPEw0cOhhNN!IUCSDH&Lr*})l@P2r`_3SfYmGTxtSiGox~ymCsOtu^
zsTW)R`KYiBh#`b6VlX$rm8~FJ4XWUYx%b=$i}eyI*Z(V9D*OSIK$#KF8&V~CVTd;6
zKe{<>)r~uS@eASju|Ag413&-dkoZ|nio8Zj5gi-*pubh3g1q<DJsT@T5C>;0^Mrq&
z54W@*wMdJ+EH!?a;xfA20~^TPkWE!P_m#08Ery-2+Rtl3k!E6nnOLXI)pvKGCBwvu
zSXs8;Mh<ruS6WRGoaXZzk2^&@zO+T4O>2|pnKB}mveEv@GFRBAEK>!4&vq}jK=jbn
zv}4;+$m5P~lvz>4M>P4t7Ve)^{gVwUf{pLU>)_avOh-QKm+W_Ra=!n=*IRJa)ivw3
zXmBSu1ef6M8X&ksaDvOi-CcvbYjC$ka1ZY8?(VSAyWUUsz5BLy&R>{wwi<I(_5PHi
z-?=8uQ(x<tL_!L1;ob32nR5?UBwHLZJ?L51rC0}acico+C8Rd1rHxw(mmqCF0vl69
z2_^aRE%l<QmSm0+e<x5fZ4<2vSE}zcFqr5)uSV+Bjh{Y*X3%$NG=Q`BDizwjbHK~<
z&~75!!6G-rJS&6rXs63d>wIzMeTe((wM205Ctm7J;tK<_0!%AQh(IJif*d~2e(#HE
z=yk5|5L0(5Hq5YbeLiS{wE8+o=a&<!qm8v9?bAv4SI<%6n+6uWQ4_VLG)KgdQ}5*E
zCKA$9XMKGjZ&{<l$7lIuR`t_^(MpWhFxFrlx_zW{<DUqYoRH~FfX7Ta)!CjYff7<F
zSs*J0h*;(#y*PqMGXhY(>=GbSaXyZ#IKUZk6SweG+@w@)*>LRBR7*5LTxh`9fbF0V
zEbH?X{Gm(N$ww<GRkIZ_?j*D%K?8=L{pUK=T`HB4Q0p<&>Xz1>YLZn>u^hC2=KM&J
z2GZrCPOC&T8nna+U$;><qwz0&LEv6kfT)4wAoqTMrD7GL`X*BRQ*a+VaCZ$3<rDWj
zi$(Ro`f+7}OyYwZ0-Sqyyg}-R4HvGam=_r)LZ_Rmq_Bi-aJn+{e$;dG#Dvc<ET@w@
zH<ev%NwM;S+)BpJ(#Z#1zoDI-4&h;*=V<04a#V}JP=)D<?8U*%zCbpdgWH>Fi~4>P
z&A8!{kRH$&a3ZTBEpD4GgO#y9^+>y*Ji3p1i1X(IH_yPUrI5Y?jb~MUx3tBLbNR{b
z&iFVdFl(c}dDNduLEgL9)`M^@N!~>TQUA25&^ePX(si{HnFFs10SSXPR3>Pj3NB(Q
z^26@qd~4ak5Z_21e-wszNkFxidL1jt`=<M2h8Rn^Gn~Web~R1H9Cx6P0AUlTxm|Lj
z<Y01&Rn_U6__1%|gE@akhA|})PnwSab+ukQFnQ{4Op*~FnxbA~S~5juPc`|}IR|oG
zzI++K2_iW)nF(qA?(nh2yWk}YSaqoghp}jz-3;GOvtJOeN#n5IXInPD*J24gD;TbI
z@Q$^ST6jP`b?q%<*AGzJ2eHcYo_j=CQYkD-I8&)3BpUL!b^>2($)s^PEg7jM_tS|#
z)QeX8na9`bocn5G5ifBM35zpJ9q)kX3za6alrO)(d^k@W=;`P-6F5F>zK+DUZeD&Y
ze;<>C#x!*IC$NOQ8C=xvB~X~6C3k%r$mu>)oo$_VoNmF6LzJ)hz6)8Gk*c}*?zes%
zOUA75&^&mkas{3=Wlh4Kx^jvT|5P-z^dciItF^N(pP=*qR$Y?o!8CPcHDuYE3m*3r
z*d*|@GUme6EW%GE$h@F9ZTa?<RTZnyPDAtsL+GU<>##cXA{OuRM2JAH5-3Nr%4LY?
zM?Zzan@s77hq`^de;F%>d>$^6^~r^@IZ9#F(KblK(($|hAxCUvnf|LmpM`8Y>*{8=
z?215}Fce2RDr3uFludQdn7q&-dxvh+wO<`}G6v3KkK2EKmcbtqyNiZhQ;mPnMDs)}
zWcPPrP%!@Fyum(soXOTMfpN&Aat~%?ZE(+zz_phi#jCW^9u;SnkiGVGNrDe@_n>S0
zbDP1K?5q$pvvK{vCbWOLyI33s&S*bSr)&d%eyOxEMNRY<kRH4>>Uem|#+}lzsIK7k
zKH<n}XbSW(;w<1+e~E-(6ht3pI<InE@nzdxwtng5l395lywg{431&O;?a~&SqA5w(
zR8b1kZ1<xO(LuH8J0-vWI5o^Ym-v=2&(AaGD24k2H<RC7tApEwCEM1=P>{u$a&%rv
zPKr!B_no0@T=`tTy!7pSMj0rbX6bIlI9YfhP%SPrNmtvW$ObrpbkW<Q9FN8rs*p6x
zMpy(OTcS*3&k9HkZG-0(vIgY|MxsQ05_j>7`Tnm3z19}g<t)bO!&!YMy=)Q{tL%v$
zk?+_gJu*XfHfS1n%1}+M$VEIE(F=IJ?Av^bo#W?eMV}*aDu5fi!U!wUEybx=28e9$
z*KZrJ%dALj%??nKqw?QoA?!%=W~o_%4tn)2^A}wf3B>NqhWfYXqoS(6^NSLfM%3LA
z$%<UU%>YhQ0VfS4HZxVyovy%A-S)$KPuB`$7qJz5^?>?cV21WD#S{d<u?%ieC+)0`
zdPw$QvWdkvp1rc{YqE&KBK+!2oRxeG=G%{pc(X4abnVY*?0P@j$|lM5yvi7}>ADUj
z26f<<qMzzzZ5b9J((gFmWE3P+9~XPy-0u-Roiy0H_N91}+UDH7O~XW?vIxM<rW&n2
z-#;u<$`OaWagsZihfI;jf(8E}yguRLi?asCZ-c=#h<oZOY`HWtV%zdEr*UoRIzGLE
zEHz&J&8LGPL93@%Y+qGIx$hG-$N)FdkSd_liAS=Wn8}WPJYnD5*{g}{QnAXj1Jx<P
zZ|C}wl>1p{20I$vUr$mj?*Q%WA9%M6__?=oFJqz<hePBNz9mBS^8wU#Qa=|9Lx=A$
znjI4{OVUOD<*cC-fm|5IqzwDM?>@h#aWN1r$OV1tS&Yw%hj+T|!*mj-IpM()Isc75
zj;J4~r|@PJge-@_@WLq0VY|Erg@ieKW1NUEs52K%63d^n6!$b!73UtIml{X;_T(XM
zFE(!BA?8^%$b;3%e(&X?EF^G_$E4a()c19es9iN#;O7}SlR^fCY5oh#U_BaK6307;
zu(u`Q`jYLiy**)?{E(D-wtVS+Rvd>35pi`fRErV1{nzN}pu!X5sj}eFOVO8)&PX=J
z3nFg(H^I&S7)a#UG)b|z@e>QWQUFbP?BQVNuQ>o~AT|@aXErJ6p^Igp()eeDUvm4j
zhO^xu9nzz(F0%^|i$e>Pgq!7oI}|d%i8AGMGnnm!P=;5pALYJ4P!M4{$O|D&3`w>2
zHw-xlRD{Y>3Wd@m>ktSy)U)z)7Du70+Up+$k6N=)@5~Faa8_+WJ=4qEwlMHU&nERc
zuu+lEy1!;m0o&N#Sv&2=2@G$B2Wkk-<*sF-=r-LBixuJ2l8kmHv{ZC37n!e!o0yyw
zCIVvpGCNED!#Kk0{x%$HNhU|bfHtq>mIvu_t=ZR>Avwg}u4dqU?F>Hk;goZTn&<Bo
zlP|y@nYcSI9AM3D|Jp^=d|SfAfE`1(th8t8r#s?f)vuH@5RQd_8SP3zHeqAfFD*`b
z&remY<VEFY*;<U&@Q(Mg8Oj+kID*E#^9RC-y0Z>*De#FSCK|P`b@{#9b3kqr+WR$C
zo?@>`+}#Fo;A75`<ai)EVSvD+`?~N<ZyByG<*Rp&s=gj)T5-q$mLcYPN)EnP>=Xi?
znvM>kBI(tAH~0q!<{u5pP@+fpO&k?pm_F!Ln!@i2+6L)~koZgIeu_6`YAeeFkJU+(
z<p3UZ9m~XAb;=k)nk$>SSTics=r+ywxcf$O$H07NLBsb`7zwQLU#O<iB!`zU2$(-c
z1o2ZxlFMs;yVI$#TDkTQLu7C(s!pZyFvhM{R0}T{<p+y<U1^&S_00dhCXmMZW6E9c
zCHWn*l{B&_>Vqr=IP!$%Z{jqfS|_Pybnr<NcXB{o>}FtGAWCFMQ{#?X{j7l1MqkQ{
zP`W=Y)`@Q2y~nGoiFzrt;?sX<VV)&#%a7Au<8p?Vzp*y9+FOKpq%7Xnx8K7OXVmg9
zqDo<)1vAJ@+$l*N$x;xC90f`Y2st22QJfOwb5k3{ddd)as~p&D^nCjmVNFt1hp}NR
z$$(TQyy-)@d%d`*CDJq68y9n-9(YuCRhSwr&}3`%JU6X(v?W)bMZwv{Mo!&z!q1SU
z!)ptFOa2Ze5)WV*u4r5@B@g;oz0%|$9+Q`m2rKlf2UvN4q7XwP5_R1LbK-U>7x6tN
z!fK|8AGNuVM30FKh#UVTEGWtFt@tVnfARdaiDS7I*@{N(!|Y)EU*na-aC}D?A^+$g
z(~hg_S+>hU=rtcLJ(LiR<=9~qPT1mop4qSc6q*=nm_9w@m5;h6*tsee!`6wihc!RR
z%Rgl&0iuZMo2L<h9<oVp+QipFuZXz4^YGc#xV9urEv?jgh^^-h{|-23%Sw@$J0rgF
zIbLUOxvc{4-Hq?DM$v_H8$I`i=lODnBdl(10A@eB7*~``R@V1KXErCSq@)4mWA{H2
zy9U%sGxAda)o#f|j%IiD!pllEJ;kX#ObKH+G6vpvtUuXAACX@8w1(|XWrvcsSsRsp
zG)RIn4z_6-SJtlf{}Ne|-!Yt4;4=ThLfy%J`ADOaumB$KjP0xSg#mJEDqeeZtUc)z
ztPHgE4z_Xm<d4X?yykZHZEK1_y3#NTkfq%PKQtWulO4T34<6s%9WF$fvZO~8n<o!R
z-495KTgi2a+($xr(p!&+R;8%M@D}Uux<q0=vrasVupn%Yti)tU$cD7ewEZprTfOWa
z3k;&RJaf{^<FU=wj^Pr(ZFXZk-TemX2q)FStrq&lyy`PW^z)VWQsgyV)Z)m1Ff*MT
zyIt%=QR1asJ7owjl}rI(SE)W?65#ksW9x-qr5-Du`DrmEbFV&_o+UxCy&?18nxbdG
z4HbIo5yIkeAt3x6dS@zSWpJBZIg1J8Frr&!Y?nsKJINS$8cu{1x!d4jjf=<?N@O0g
ziFqTtJHN3ZMnx$7clx8%Unn@RycmIr?33=&zDI)WZr^W1Jrlw(`GB7j&FHm46~{`B
z4s&PneDanX3bJQZu1t-sYBGs`+8Tp3aW@=(dakC*w}r4e;O1X)B2T7|q@wl}Rk16e
zQ)&b}3jjyu@Nvx)zkjflu{6Hob@{%AU8cutu1Zt<)aSV&nebLS<|O>2)z{itlo-@k
z!(Q;o9e;{rCK8(1pv>}f-%i}MB2hZe4Q@x9IA?3rf66U#nPR9^?~+|yjIZ$+-ef)U
z3(E%xwZ(s4$V4q}P7Rmt+B@({v(c?EVJ@m*{t34v_9A5iDpy=;El^%wlZUE$A?q^;
z_nVv|{g#v(e}cX%^xPW9A%^F#L;_jL+l|O_Q{8pxgoJb?tk&Y3AD;CgzhXJs?@(1Z
zl7#4VGPyS^Lg33piHxI8j(Lxlzh^8@{q*sON&W_)LY~i~RH$lv*VN3E%eoOd+P#s^
z!GzNI^>b!OJbEu{ChTm<wu8p~Tb7ZQm@i!HRa4UplLv_~tEH#d^SfGaUE-Qe;isHk
zEEbt~tj;f-aoB~C-awS1v^vqJ$8Sd#joX#1uZ(!|{ZEg+Ybm}zpz^E!tL7BKsLPuA
zQQuF;idf7L`PNvv(<mVan{oIRf1x1kPc90~vXAT%g9X)v&)vTsW^rNZ;U9%MF@7I~
z4ijcp<H<*NBvB+s)<QsAuuPW9>)+wX4#2ipuKPJ~^i-we$}90Cle4H)oV(Nmee)_l
zFjNRqnM2HojFXF=u!GuGY|&5+#kd)5nwXOQeu}|whOIvG_4v4EdeFOCkTEwZ|8LY?
zB&xKKfRA?{F}6IRcr~p8Pe4*My+a5qv}*s0j3@!^;^b6W;_VNMPjiSvpr_+NC-_ZX
zQ^hE5$$h6HXsT5CDYso~mD~^&i<FM}T|ezd)RXw3^}W^fL?d<*{_Q21eYDZfl^6@k
z#<}bmEC126pg(ZJH+Q$aHYa~&gxhyKZu~DZjkhcCpVA@Q9cJ6|*LveFe#0`;Vtrdo
zbeV@Pl+O@-KyS-a4~U%Yt|*4kl?LsrSB_A|*sb!J2=tZrLEtH4bH+7h*MYGBqq;~*
zvO389)wp6D5B4wou_YI!&H3&%BRV)tKp46FcK2H;rX`e3vXci)|C#GkSaVmg@v<j<
z0;_0r>PPXvGa6X!QIxK>o%SdIY2IvOaqq8(mzkFzyTTc{?|0_WuUs4))|#(-C19WI
zCHLL*VdA;PK3P>KH97!~2CdB35p>xbl9V^@zcZdv3SpzyJoI?<o#yM3WY-KE{5kiK
z5Mum@gO~tC|6~A0UAGmOm;iF{+rWD;vRWyXclXH8%AzPS$hML8eTJOqzti<h>2*25
z9}BKWxfh)JUPh?*U(M!9wZPlh6dmEfpjsc$|L319EQr8!G_%V}l3yra6E{Ho3FMSc
zF~PBQMK0wjZ`S|-l&`89T}HV$9jmM1YaVR{hI{5vWlfstH7!1gA0x$}wicOk{fR2c
zZoeU2;ZWoB=X6Zf&m7&slgGovWmPw2O=5g<6{5d09lHziq6xH1<>6i!o`dRa_O1;A
z|62`SDGrwYis1C3l@Zpwft|a5B|TOI=61jlYz4gLkych8H<61Hcf`*kvC^G3IBnET
zxcj`iP%mgOCBx7oveW;aWsqz6q#8JXE2?rJouvffqGX~zlSut7i|CPexQN_Rfx>N8
zMVCw}!y3N1KC%J5K9QtI@|UW8r6!8>Or*mZCa8uv-K|`FT%2q$G<b1E`L_Z=fTBLE
zuQL4qt6dRx(>X0=*w6hFkrlvdtIh%6^F-70N!XYqJ=LJ}ym6yNH7zV>Q^lYPG1mFD
zb-a*~tTTc(DRSwk9EHf}nqq7%BjHzC-i*SNyH-4UtmV#b0^Kh$E@^4|wds1TB#Q;&
zm!e~U(hT#VOK5VKsh?iip7z&l)__I#Bjdg&=Jjob){X!Cg9lEQ+@O_@`Hy2Rg8m79
zV<3c0;EO*{<tq^?$KvesaVO9~F_@7}>AC|{@0U|@CU9a5|89dD>aYBGirU1lZb9K}
zy5Vwi)ZEDQ9+y{uu^YWw*g1g_UzW@@9nW;CMx<l7B@||~TVVw%jFiAiY1{R3<-p<C
za#emYK&k}V{YQ#`XUdfNqVf8KI%-DkWBo7d4l&pw>G(AZQ=uX1KD(NwE944;QYDK<
zDp*d|Ky~4Y@LYpR6GUKCZyi*Tpq&mF-)(a2opqA*Q_$X^Q&UvA`noJm)IPB?7AO7L
z+uFIRhS4N-xT;~?vFm#FCWVhSRX;o=jJ1C+y^yeAW*C?I^&5?u%xaxYkTda)m)}c_
z$Ky@%#nVES&RB`>`NP&T2r0F-OMC5hHCLlXufub^{r@W;m^j`G_-z|K!Y#F1&Q@0c
zFZ;mhUi*@A7tGY=?$=ecxgkt(DY-JLJT``VL3Y2jKb+5s3jJAc@>zIj1Joa%+#a}1
zJaM(SoGyTc8F8O{96R4b##|cGc^b$2KB2FWImC_kHo0qN1jRk^(1U&d7&_IsFzj9_
z=+UBtyhO5@CwRu6F$a8GG=`Im$u9LG?yOceU;}BHe+%x?9e2xMRGW(}#2luDwNoXi
z4zrm*`)Gm|)D45i_pdYE$d9#}SrEI#6QgXX7b6sP*$0Q5emffpa2{iQQ%%186e+oa
zm;H_@8mdUHl*p~y8prp*`8*x#*SfV`ulxURO+}-UDo%d<jXc=5%egZY$;x@%4H9h!
zBguc6^cgomne0Y9ap^QU0#+M7Zj>BgLm-~=Uw(j$7}@%+!O~{@61M*P!tjMY*e0UZ
zhjV-wGJlk~_jmOBi2p9n*m?chKpas>+miZS=tT)5Kz?1(QV9I4Dm|Xl4+G76Zb1Wn
z;6T+(Z2vUj>-~~ImMX<P2#|;`?-oqV9g&^$)g+SOqpaywAnPv7$=U0A*9Tlfd9(X<
zLW_G@E@>-RV`{LRrEZwEKRDBJvf)y0bQ#rXFdp<yQ~)0og75b=uQTqw(lv`>1DAhU
z28@2DS38cA#s9R8$s`}4tL5nVQ$!10hFR}XE-u&GxB@DOAI`nypcsRn!}%L-Zl$PS
z22Wq8=;_}SERcB*bD1U+9mtjX614c#`dqif@qfVcp+JTA;#FTUg~M-`cEiSZKP<aE
zwuIMc4xsm;v<jQ=7Z~+O(k20$zP|yfKlFui<|P#aT$!)J3<X7f%V#sJ9-+WFT$5C*
zb(CMq<nx%4l-yk2`@UC5vlM2sS+X(b>3YXdC6aSv_Dh?y^$^H)^E-Ax+2!(^GmXO^
zhD3J!9a_-Jg%tbaG>FQM7Dq~M6@Jz*n8SWJ(P7*)c2aNtcu~OSy4Lx-!V8f_0jz(W
zUw*D+ZnE3tYTNYIMx?#n>S1;n^m6snrs|$*GM|jX`K-EvbK?C_)o`#ABC98)dODWN
zzSm%Uc)sqG{%f?M&g&xE>D~LK>0EC;1)({X{>QVM-SHlDjd{6ZGSmy^p58O~J|t5Y
zE=|g(VMT4DkWE6vnvV*63)ys<501xb47w7g(Oeg%U`LM#E{LAv==X_mVV(_1Kpm0d
zEEt`S1b#Lg;rXzXPGI0hU#UeGR^J+MY2RQ>L0a_@NKq>%%b&n3CGA>^HYcFUu%VW#
zzw4=gYA1HsS+Q3UNWvF1BJ)Aqh+1bLBnT-P?0uTIGLz1+mD^QSjy;FMkW91?nx6Rw
z*B6SCO5$KN<3bAvhQg4;*!B`?XdA-D87mA(bMdH;<%)Zx$?+ap%*0|unfw4b7;q0^
zHO`i*pGz%7b?2L*$6SJ{)-gO_*~BAA(8Z==j0DPILj-c)SL(EQ!@Rv&DqwAF5&Xk<
zebzls7q$p2d{rNBZVYnH8e9EKKJHp<6TXpW+jl*^Zjo&HUVz3*_!~@FLVQ7)HP2iD
z-a?#May?_2P^&Rb!_ZxBcBya>HvwKfTmh|qyCCD@e_(wA5v!i|EU1-NFT31RxoSur
zIw+e;%bxtMjd1GO0NS5g%_tHu#-ma!@WtO_gyu2i5mx`$uqz6>6#g=qZjUD=ZxZ<9
zBKbN3V^E1TCpwzD_;!`gJaJNvm5CeEWucJc&dG9F@?XDAPU}rFz&BL{-oKDo@J8JU
z^h+SeAA(58nPs)9L?N4NFviEHny)11HX^ZR0)80B>FBCw$NXEJ-$%d}Nxsl1dG}Q(
z&-+f~LH`*(c^+}syY91~-%h`@)9aJ0DB;96{~}L&i%GD*IC?NtX)sq{b|$s8ixGb2
z=XIY<t|EVmbnVvJ`ukT@pC+%P^O&)lQST51n~f;TJU*wNa|~UgSe0@6IqD+aWNcA<
z45sbiuI!dZ*@)?$k3(Z8IYoXEBM+P9hg=lZ4^TsGL6atRmu2&uyu2vgqXu>sW^~D>
zY4qHUP{p{Hg*t5jSBvr`e}BDG#2HQ+z2=7f0*sk0$B)BaB55zn;{9ld8lH{Ui)DX-
ze4O;mauo;!`ssJb9tnt^LI}1%2&mit5dcJNNCE+5@#6X&u0R6-9~Sl2hWm1j&r6c<
zCpMT2Bg9g)#=n=sj(PlHoV{_lm?lsA#bcO1jUb1alfIoInnY#@%05Ef^MR+Nv5zYT
zxiJ^8qt~D@DLN{L|G@u)X6J)%*Wj*?k{aqBw8!R0cV~_+D!~4~?Em{2V<JW0dOvd9
zK{~|i6E2B-iqonbZHm-6beC6dZg;m=7y`b#tBP-|pl>Pn=Z_#Cry3Xi&oG-tHxlRO
z67qN3j39zQk+ET<!N0Pptvr+C@RE!Oq0XwJ!$pNQP~=F##h<|NCRm_@U*+)nu1kUC
znP!fFAmn6r7t)Qena*xL-t)~sCI!}nW3g$_{1GH}Amrqdl5<<UO&kG6G|}Ox`7hSg
zFD4;QQcr{<#cjnz#cTu35x278Y+#LppmMfNcP=4vMw6F8+kJ53lHC!B`TH0af%&-?
z%c|TM5XbuI^0Y|`*pOC(R$-WgikPv9C^f8XynLJlysH7uimdKTWMqHE|Dpu?7^Jf}
z{KB|qp^K5l(GlT~Z`8&KLpQupcEq=_mKoK>;bO)dOZlN-MHE5GFA;WblptLbnG+pC
z?lG=fMeYhoC0ezgrcXdMpj~5xg46g1X+MjsoTe>h2^U)pJmBVpSd<G;LW9|P1w{%W
z!=qvr(M|Zp1&ggD0F!w|NYvWsFtDrd#{xF&Mx;Mm_>>*Q28CKGr12$iSoHEY903-~
z$MU@Dg_<a6lGIjFOk_J!wc56wk}v)d2<CJ6<M^C)Ls9E{pI>X+4E)Wg*Q!dgEn}y(
zmLK0Abf;HLNK@cRpQ%nu0vgFJLtli!{sMJ+{<rL0k7tV?)O*n9IWzihr)?h((--O8
z9rJu>I-jTPD&Rl^Jf0Iwha$sBY50DY#nIwb$mpRpW8u*7SLkq3;tHdZklLdj;nV32
z6fK1r<eIqNdqb*_APD(6AYifnUi1cO@3Q;-jlIg|@(fjK^mx|JxsU*&moKgMpwUJX
zj<hSOTTD;HI1(bT?lK?FCu^oD#8df3_BQ^c-RH$MzJ2Df-9}?^Qn+>V58WPg@qu~R
zLuk{wR_W)xdmS7~8~VFN`qbICNPrIrreBRH6NoG1HFUcjMsmWDVL=Q#3A=)AZ{><?
zBQH%YP?As=yhjYF{p?|%BDX}E=L>|vv-jjmv0|Vq--P8=PwJIb@t!Qx!l>FKLhe={
zknSvrhu5O2V>Nwc`I~{6dPgf|?_nL0jf-uu_jzGWZDk3R6RqKzBZMP~BoL;R$kulV
z-|W1d6`RyV`LRzSVGnd?K$c%(5d31qv!my=MA$42Scm`LHUhd3r4MPlDr6V8gwTSI
zc!0gi?P3lok=E0SRC#hzW6IiDGmOZT2tR_9<q_DDJ&WD!@aFB*w=e>F#JDJDr4@6e
zHFm0wi24txLZcg##uMa#5-E!Rq3Dm`mQb(GWEN3WnRivGNqM@1eI^CH+KefC1%yip
z7e4Rgm3fz8)vH70a-+zVg(5ZIE4yhw0ipA;gAMu@V?(ruCMunA9=5)rxdo$2t*$n7
zWrqM5m3N`VVLOe1P_^8CW_veUVnTT_aAqc`i-;v6oJu0Tk7xKabEJMOKSBn?#o!7Z
z%mWL%1@+r`7J{G}t=zkm{8&bd<5qBPcC~*}Dnn=*%iZ?y8Dz?rcCvwUp(llKF@6r=
z=CTV!){vl#FK<6puvc9kni0sC!p$AtFPrqddEL8V?`-8y^TA(Wtr}1J11F_?<Lzx%
zUZ)H39Td+7rNcWKUIMs+xh5gQ+3#E|WED{JeU6$vj-QZ3y?WcMz${bSVW3Y$qFkCT
zt=5O<#oCiiXse=DD9eEh(^2A-(9+}9A6FaJJ@sdyEe%`=dnSry8LK}mh2o+F`t<i~
z?Rb=*bN8|@@-gb5kY)=4J5m@Ilv=l}$1FJPiWi@L$TG1M*_5nOz-nKG^d9%P^3Z0>
zyIxbuOcCt8WKp(A`nB&i2~SK>mvQUpb3IW?{SEIQAm7a`Ih&OJplt^IGtPu4G@HCU
zJ0FWHvHsHsNzm+@nJv3fi3^!AA(6O=dCr{nxPVDOdLbgY#azT$T=>{@zWUc2UHc`l
z>9e$E*)X?!=FIzp%hJK+7ml)(XY=OJI4R+Uc);8A86LI7Mn^lIYHziCILpW)hwQb3
z9;;_Q6YM!VixyiAoOx$<s>wb?qGWATW=ix#pT7WeFPjlXz+@f&{_b}_r`28Md^N0U
zva|PemRKGk3qq$ng72jCI$vL4s8VO1Hx+{TDLV5c=(PZdP(llEFg`NAbPt#_sk2PQ
z3m={GLr<Mydv!22vZtcA&?1CcRN7ZQznV~b<J(E;@|&G48_AbFUe3Qp6u8il)#oV>
zx=;DJs;9{-!p2FGW_d~HjzMy4OevxYJhzZ1z&*nD<FAk`RNg%FM<9Yz6{>;e@&*Z0
z^15-Xtu?)Cno#3_OP@#BNkVFY;=DZ{5t^UnacdCsl3@Wj<Ms*`K>z}d8vy&^DO44v
z<wW|#XmnyZ-dU<)WQgW<29P60H;p(PiH|aJ*y+n44(CH)Zrr6n%7&G?BZ;1l9bwLB
zNHBpBuJ;G9-RXYzghiO=xG0W5wN&8q&#Ad|R1d&!T}N=T5Ny6q&2v>Eq=)#Ls}5~c
z58pcYvh(x1?bI-K+|ppz6))!{P+Z}qEoEQ!<tVTidxe15-{yU(xSO5L(_C_H;~Ur~
z%2wazGo-yt7v?4C4*@uzGvrG7d+szy+*H_v!0e$l=BY+d?maGjA-;K37n30qDriF4
z#uv@)^t`v)s|9@Rj!5IC`LRIy=tX>abRx^h7zb})N3i`fFc+R70b(iJT<F(azq_5-
zD%_${qIv=2iCi>XfZLA}(HG|}(I%LrMhC~1hA9W^?={=!9g|jI+=<gzMSe9F(6dE!
zno53D=2{r+K8Tv#OrHN8<#@TlJm}earEz)FYvj~9+JkZN3YxdVXMl4_pe?M#EaQ~_
zvXWx?XF=qnKB8@z{q@e@Ji%>`PS2aq4c5*%MPaRD6=3BF3E@o9IM<^>Y8OmZy0?VB
z%51>V47VD)f0>fbrqs<Sf2iH@99HUPo<&!dDri%aq`EAv5V`QQ+|HO8$BSpsAq+d#
za<E(R*{SW=ACV-`cccpcy=JaiE!n6t#6eDV?G)Gl^Csi-;2*kzgAO%}46%rZ)Xigo
zJzlhGP_mVZlHms3u(q#F*XA6S4UD@2={2mmd{QHXXdtk1YdjST;vW}7sYe%A@WBzn
z@Y6Q&&ToY4da!1pM_oG1n8axLE1y_oHcUUdhn>w`cfcmD6vWu5H!hfD;djjG{jNl9
zfv+r!aG10P#Tzq1PKlb+(HM;Z75-%}_a;yda=+_!9P2%;DPoT&3VH=%R!&cL72}K-
zmIIMbe`7ptV&~bJvUf|_^Ul9xMLf+{Kw`<EU}ffZ>=Bm3t=S9*RvX1Wo9{8efYJAl
zMq&nmFrQ5u_ld66;Y6IS!gO$tU{d9e!i>o*Gf;xjJ2I`Fs<iYl&Vzg&41b9pY+$HK
zXlCHIH<>XTz(qFT=?|0rnQU5t9?AI1DMU`bArxF=lgLGhEgG!ZRk%$uNgZhA1O)7&
zNSC}p@@sY_c}5oazy$mnU&oPhd-6?j3Jo#Fr?L8lQ2Twvdj|GdOgX3x0#dlp$%j{#
zqO1L<=S!LUfQ5XLnMfLHA8Y~+O+${m1GIYQJ;uoitrp7SBdYqHiCO!0?aH?56!5;t
z?99+t|80DAbzr(4eMdT$HaYu_821aa;~fl!tEqZcRGsyP|D8hg^kAJ5{RgsjDF%+*
z_zPblO)CLpPB`}Uc~f4xWj7A+kpUCka(%a;E@#C+20VKGlkK)g1J1vW<sUQ}D?}c$
zv(l>y&H#2nR8rWw^~=}CzaHE`+HE{}=YQlK5K7TzV@r967W=oC4%!$P^nBxhTfhCY
zaOaVphb5k;#U#t_j*|<7Yh-Pr!rb0y^z0P0StQ`XA{pPq@tyzaLtY?$1oogaX}a?;
zW@r3=lVdlETI9+^DK&pG^x5!H1V8|UG0GSn{Ta4=6gc0`A0&t`u)=W`$yH1ASO1hS
z(l^-<)+jpMz!-<}rOCt#N%#2)LOwH8PKFAG=5H#3P=o$hoxoJNl80yDFpIs&(x_T=
z6{kSg3fmtqsI&Ay!w^5y7B0fGP;H20lz>iXz3X}?^CFWoc-aaa2557L<z0c!NMT~V
zr6IOqx)P4w-$((N%7nw^WG0+)5uUBh9g;=_06#j9VZj#XQN_%RpBefU-|0NBm~!l{
zwAf;3C_iH~b;MQQG~q704c4n3d}?oy7L002B4nol1hg$Rz55bER`+XT8pQlt&JbHx
zdr7B=7SS&)#%b)r`yx#nC*iK(9Z8PDxndyFMg21Uli7q8&bOoFQj~qI%Et^0i!R^~
z*EFJFroD^tma2cUaZ?Cdoj1KgT<6UvI9bXx&Ap(8YXt5(Pa2dyR>>~xRl+`-H*ne~
z0Y~Dfi>Q`=AN)qQ4pSvfn&HV{rzdr$m4nXrau0k!5g9g(IB-;kxRK44C<<rfR8&a+
z4CuCTMn^+B4X#n+LHWHINtg5IxL@LzJ)=xt*K`2Ej0(iGmlq3Mr}J?_E`yleE~m#e
zXTz<PA4uDgulQ#H^q}>xAxEVKuV(Xce4H+{r4M(4U|d4K?UpnPOWh(RxX%kBEI@rM
zcp1(gGTyQ`I10SmMROeXt^%*@7jOatsC{BaBfHP`%8}gYR#f9VaYvsglH90eeM3Lp
zdd(5Aw>-b&(;lbtlCj&^ZLKw8p4)H?{WY`e$G{nge0bCtE5L|`_)#!Bgi-K`x~5~m
zwl1c00s0@$LQL|J@j_7Vv|&QTI=)m!hc*AUIA*HPb4%EJuKnib`V2-a`T=(lpQ0|Q
z-N>!bcZx^M$36k3$GkIuRQ56Yh5t8n<D$NBHdXf;fWr=p<qI6UWA)paVCo|jqAgXU
zvIq^bjG*1`1Kf*9tHWz81}mQ%?QdC0l8g|zzmj4d5UF6A#r;cyQ8_GBAqmX-V~7F2
z>)>YO1wZw<DwVmxTg~~?+SPE_!4e5RtL5R3S}Hr8Ivq|Y1U1Dg=oZ2+7I3^S68b~r
zn8oDe*`N}?7A&_kRHHF#zYy{P+9+=BVnzv7#5JI(CKCpot+xI5)v&e-^=L4Bqwxh0
zA7P}Gtv_8C85`q#C&!VLYKDr=o!!M&uAnXF*I-bjNIVk#d>*I^zm3&B%rcNHuW1Y=
zNSqO>a>S@TxMh=dBI4^PlBTQF+BDL@PTd)K^2cc7Z=ud<Ui)+*U=LG})QmVr{p(R?
zDV5oIw1s}&q4=N4Ga%4K1&I8=%nA)$$Q3<>9Z41MwlvAnKawv<+A5S?&BZB5gXpMU
z?6H<&hZ<{0PF9$(kDQ-GNPs!{b@H^3C0HbB%qY+$I)n&^ld-25cBAOX?YI}w#Ea8?
zdm`st`h+M6-8k)A>c9{!ct@|Z8P5DI4gg6$@i0|fYc?Pc@{?$Gf*YwT?|8#zfu)Wh
zD8xsPF2L8B7+89>W?w~TK@ZZ<#EzV~GKhts(eu?izsfm&p8uW8Z6M&j1PFH0Y<$2K
zxlNQ?4KShT4$!7MT5(((h$N@H!7@cwziA3>tpUpD0xEgn(hz44kZp#o$$QpnHj<j+
z!AmiI?B#7*<c0UyczM6L&lh8S71Q$6#jj{&b1V3)URru?<4hvlFcMqH>2U2$P7Yi0
zeRqAnzPK)B(177@5ooow`g}W>q6KWh!WNv#BZl(yAq(5trXe5Ez)11)wQz+OLsr9B
zEQt7jV$9l8D>3moknH!g@Dt6P7`CfE<L+YjjS65XULhDF!Tdt{r>q^Y_}&RxpY~<|
zPT)O5-{Er@e6pd$1Y54F*j&s%*LT4kwcJ*Hd}@SRlssFJ8!9EtkN#AzL;XDI{qrfi
zZD-z>ESYO+2h!i?6dgIT*b4-@l_EUl2wW~VXgk_Hg(Nlx)i#BwUVJD!-_SBVM1Yc`
zpArnRmSB40DO}ZlYn+lIJly|1w`f8J$jeeA{d6Sze7O=Fp~V6!j!8lNBImWBpA`Dx
z*&hI%d-{$(71qU;dDP67_9ck-MV7fUZrpr&#h^R{R!YCoi#{^7)%YkAEzt((m^V?|
zjl{#5UwpbsQ-c*dXJT=&Ltd7RIIM;}p-l2IVRDN60?0?G`8-oY*GxW6dpNL1Uq&Yu
zoh32E&QPJGD@sXg7_U$&DJ@aL(ukQ|SDehT{XO;l7yDG1cI_n>bEwPpPx?NxPUGt`
zNsh;HW-WFB;Xeyz@L7(Gr3n1a@fqG(-elSvG7I1l6%`-KOl>M7rvpm%$(m4Gr=4l|
z75I%fyfG96zd}KwSPj6$S!t?jKWm@csl|>tg`UnKv7^9MF*OO!QJA|%=b5B=buJ8%
zr3~Npvt)D~h({W8q;_JW|2&yO9y%&pR7msaekt8+J~<W^<f7=R`DD0Aaa}aENASIK
zGe%Oud#+U4W>{O5Ak2;erVteppmk{JMVcygQ0%$M2%BI~-ZBwy&<&1tF-2XQ<N5Ae
zwp&MEOG&DXGvAqPZ655kPX1G;Y!2sJ<lNOJyua_Yfm!h5=BAh5Vs1}ANxRslN6AJB
z7-rrlSoeE5-jo>#Yt>Ji2hQCD^7jQ+CHV`e9{#9(yfXn8y2QVJGUi7v+1wA`6TWMe
z>}5k^9y-SMQ^(NLF~b(64{c(utaIqF1^h7l9mk??4zOMuVTxLWi%v#ew7R|TXfGg`
zPb3IDNNqFh8)0$aZx{u3yE@AV`O+7rJ$eWY?IHm+>VE!pD5t#1oOvY>Byr{1ymq&~
zQA0prnvUUy5`dfHXQ$~ELEO5`*?hl~LErv2<zED*{9%u8P4x0~C)@?^kxOSwz!yyL
z0fDw(D1eYlqZ47zc(KmD4aZqu^9HOg3Ka_7&;QK`v;K(J+tdDof=KtYt+G>^^ZqE`
z%Svm?z`o1cpG)+XdYSsrlcp0}w{tu3dV!5h5hJ+thoSBV_>MTm=tv8KgnVIO)%tY#
z#|{gHZU>RfV$i^SIxEmuFw$>J#Nz#hYg$8IOGgJ$!B;d+`0D8J*No@wq1KyB1Suyc
z)BNkqDK4{~%s|m;@gI{LSVu>&I`+mJx0w`*`uu4g+aRk0y328|j20Y}_kChwfF|K)
zax&*y+w(>rCJ(L8>C^0bnMv;DBr+Ba9aKA5koEU`U<zr>`2oGQ`{s3dPl+cb6jk&W
z!=rbg@jgGLj;sDtT(#W%ox--~oait&4WN{&D@_u9PCBh0!|59F={K6=h=ZEB!h^#L
zx%ttvzJjOTm362y&Z?05v|5^>hxxG~kx4Qe=Ex2$pJ_*oz(9V*46vf{<yrgX!a7=q
zEr`*<UY$MqAHjgH3SveRhj3=f6_K;2?7`}Pd<|>M+p*beq1q&5WjJ9X5t1D6_#g(N
z=l|+!RNUuhOw6>32$ue_yxL&EU|jjq>ij3<K971B9hal`)%U4Ggg_sca_<VxM?$-6
zRf|r5_u-p9Y9&T!7tv2W#*JBiKPSm3=$r~=`gO}znmeuGEZ#qiSP$E$*-t9?v<V?g
z5}k>`4~D<JUJe?C$^?VTfUy1B;KfB*UglgW8^@f<SrDoX!=@NNBVI{_?*8sH^584A
zzNgkSyq!!_NbH4PoXgUXQYx`8COujy_y%O{jj7hu+azCsiXeiCrM;r1&m|$`sLwV(
zKo@ud`oi24LC)49Uz!DYoS*>Va}9+nPf6*|Y>i!WnS70Y<pv___TV^OuVeOAARzT}
z(;khbWgy#NJS-~sBF?#`d(~Evr?*i+j^eNJD<3A|0T5z`jSa*ymZlV-F^GmzRtWCw
zRN%0)v`uq(a^S>r9x-X*zp=`WIZgM+#c9ZnNQe<Ku5d<Zea7X`XNm7_z^uPdT@dln
zQ3+Q4R%IVmD@J6q0OsrpESS>f5CK#2mDm=6gpm5A9OQD@k4j2xFeZo#s=XSFA{M3J
z3J2eh;%Kn8rrq_ORDS)-=UBDFbzZLdm(O9LE!q%M2z0Y|wv}wYxT8ep=qoCWsCHtU
ze}|f)XV3WZPYXZBnQZzZ;=W8|7ttj55bZFpOdM105-z+Sbc;I%sOiF3Lvk^ZxRqq2
zYeY%%0&5{-&r39IEIDWyH_S-u57O*xX#4xr>Ob{3vLOPScFooyn%(R@i?^=_9}I9e
zmSppW`3nk-B6ySK50SK~v2|6ozqE2+WMe(HGeW|z)ACH3a-~DiblD4oYl!{vOsVC%
z`p*JJ-t@0j54BuaQt(ZY2l=UqG~>=h;V3j+XqR479Km_i7Z5C?CFk$GXX!iQlN;#|
z?7+`SX1qOhMCW!qwrF1z6y1GoxtJzUba*?2GHD^54lqUhJ{2HYZlh&^S4#1BA#TkZ
z{%VXV1PFYqDvWPpLWHlAv+tl@YL+=)Oo-bhz~oPMFDQ(oa9AoaiIS9e3`$EmgA)iP
zqjQK)=cD1rvl2|-h6j3<We!sa=J#-PtP}?R*tH5-qO90E^-!fA&yaM&_o){L3#wv#
zl2hhf4@keuXZG7pfbDNC^a{EtyTTTW&FkQRIw&5D1y9qODuQ96b>C3L8)qA{s>e<2
z1#reee~i^P*~N56n}b~g2q%Nn#q)w<J*c(RrjjeQb7qKeCU<vV@Q}Oxn4fcYU&^x8
zL6*V}v1(267X%cjSU-z@a&a?3e%-!n+cfha^?`=8b%wwa(K3@RhA`w+C78XB`i5Xw
z+AapBPkZ7=sE>fCJ#5drVX+5Pw4n?;ER=0TTx2h&KVS}h+m$iWuQTh_HWT3@40XSX
zly(Ar_9dHtmNGlRKm-K@t8}Z<Jx!tLV)K0%qa6;FMBr=^#KjFyYP2@%LI(<YeP7hs
z93KdJ5AuS!%-nywf@(}Vg<M($J#AqlcE3E@oiCpwuvi@Z8Eb6E)Y>!temV=5L!nC5
zyDtPmtTM#f0bI>V5YVJd#S$~Zskih9O!B(LJe7_J>nY9xuuk!xBc2An*4DBx>Z){G
zem2&nvVGPBa3?I0iBnc7Fvgy_VrfiYOAhTNi_~ds4A4PyGJztH@M~n9P(sniiMIDB
zV}vC;J9!ottwn*SqPekZMki}U4M<773hC(fJzP?HQsDF^n*i~&>aaZsN4Qlg{~yN=
z@|IGcN?p-na6|4_9^LdI5PEH5p5CiD6l_tBz;6c%9@pZ!XL<H<19e!iz$yFz4vlIN
z9@-yf({;5;!D&3#@7PnrJrtbT_Gj}l)i`<Kuh?5R<__3}a+ZbHaOv7G4V=h)mbUPO
z+(n?&ghpo|r90|J973v`UuQ*cbF%Bgf<G8_^%Wo9XB*3<1HoFq9~E~8qy~pA>;IW+
zWH%)r5oCat_S_fu^x|qZSK!MVH^>zXqR(EoQQQ(eg<shN{O}t5wlU^{Lv2aXQUWM_
z+#gN->(Y*Gz^BX2s|1y14cZY|>Iu%u?6!mHZh(y)2ZytsHy*c7?mh@F;l>cZcz(wV
z5ZQ5pWMret%bTB1!DIOLf|Mw|#OxoQ!UGH}f;hrM;q2Krn{smp!1iamF-&O}+UFOT
z%Cx_y@#!QWbPE6&oy=wuJtT5H+_TJX`Ot<f1Ekvwy+`gVQTklQiw4?_VX$zRN-)F&
zvu$BOT1(}g!_%18^9q~^&!oSwNCL(Iq0tBtcD1nRZPjG+h#`#RBILk~fkjFybn_se
zaeyBv7{and_YGV;q4zjcMSQo=vbh5AIbhLKgwSyH68-!6;p|fyr7TWGF^cZL!X7MU
zj$(%W_+v|FMU&>8=2oM#W`GOfl1DwD6h=@$x2~uNGdlcb0q)(xM`pDUCh~~8=ro$p
zIk*4<)UJ7xZusRdW;({uTrzzszdQ>B{3V?sF*E#YkwQT+)MC^EPwLmd`vD><NtLFs
zD*i6{fUiy)xy-ekZCeuje}tY#l2<99kPD#}ko~Tw3>5>*9?gD1zdS~syMp0|#04wn
zAc($a?Gth9-%uwh<zIME`FXskOV7n`4G^Y&G<M{q7QOwgYJw;lMaZjBHbTSV;?(xG
zs)AV3$rqjIEyC0N5=!~ClP{P?ib>D7RJ5%#9N4LKBRb5u2+vO@korTERWIcU#epGR
z7@s~5uXbiF&<R&>_Zp;Hs7kO6lIq&0QNtNvf_sgwWk{?%NXw#{PB8X2&Daijl!&Px
z$m(^i;WnJu7$Dlpp20~PNjoE5ok~x87aDXBP<T3|sU?8i5Rt;jR$tR`uY#atEiu$X
zVvvz-DSfd72YY?dKp4D)R#4l0Y`qKm)C+2|Ssh1W?!<EkeDaq(eSf()mD5f|0Jk0)
zA3n07PApqC`CV)v#F58JL{&=_70x!Nf-yxogLRrJFWgY62}ER(#c%tE6AKdA+?m!f
z1A_6dz-Rl^Kx1xFnlJ?v`w_dHI>t}Zb}4^O)mIRU)Bw+|IT4w)N20k0BNb<+hAei?
z<Sr?Fd1jgTuUXS&@DH8%LRKXeGBDM7v{WdRxQU`W1*Jn&HWA}Dg3D5Mf@?fM^Wugz
zDy8tqSI+m8Ay_mP53%bFb9xN$$LHisPKKNz7K|IxX)S$Auc%!XZFyYyN#Rozz~2-z
zt86va_jT6AD#fzdo^$W43zYoDrEBw}AvO)Xktme#^XqLd^Gxhko8JdoF*fN?P!lFc
z=+A;yjly4^Gz$yxHQe3KxN>@;st>{&?(3Cs-6Oj*MfzAM{77p;vlmqfaLz0!-%+^G
zhtx^Wsk#rL{NEw>-aR)HY?hxEKTcAk9jF31RF~wPiGq)1<ca}x==BVBCEl}1>%o{b
zidx|s3j}5(YX*mt6!SQA=9&Q1$@ZvgHxf3#-yWf;2?YCf*qHM}0xQ95-n*o}54#?}
zo@w~18_km(r0Z*<{|950GD+1jN5Q%fvOfu9HGghlP?~HbjDLkXdfvQ;iYvE8Dc6#3
z@A$N;TLpL3!oh%^fJG&tfqED4i?`uHMqG@`Hh-_)QYCIQCl2cni^J*o_ZB8-Ps%>@
zb;fAW30L=+({CZTl^-iU{?*g6rFXl(KXCC`1|F}{INQ3EX5TY7dit_~TlZ%_a>LlX
zg3h7r>|(-p8DL}A@l}sNOJ>_4OFCNo8}QO>&2(i-8g}N)s7w9gl=?q=OW{KVu_|Xz
zM7p@?17!)<Uh%UK^FbHcZMFhvdy&1#hA8*-O)XZ<6Y&@;#?QvfElHskH0Q6(6A{kz
zp`5H?O4z15b*y!43iLD>a>Ke=#9f#Po7z{pw7n4sbRRRdwS}~m;4kFa#gor?$W>^%
zXotXco6EN71lWaTKE!Fam69DRp30q&Mh^n^Fhl}-l6&Ta7<y7O@LT1f*Z#pqjnHYH
z!<Yk$HY0gCx=y2i82J3PHtEjTOsMiFnCS-AbDpXY+A3KvH+J6x@XU2%Wq?TtY=%p1
zoGkP6po5G~Gf*(KdH(cZPa)^ukiX8GxVYx5Op(BEeA1`5g``wzTb`+5j1(r8>^F0A
zqGf{qNDXWZvSmZ!K#<;Uu#2H%b{Nu|4+(>qZ5)lbd*Ag0{ygOqKHmTyhg#A`1F(?j
zFyVZf<KLUb;AP)iod|yspr8;EH%~epHwmC{^H5%L<@hYKqWVDdrC&MvV51z0py()I
zG#^~*c~)T3HAFb85N$MyIU~D?`5Jp^lfgy5MjbY9aI+wxN+p=mIXX|5nU2HqjWWn{
znaJ!qD=nVITt~-+;cd3G?E8a;YMlSzDVQ6o^rs!{_x=J&;v+D<7f9mWI7YnrVf_0M
z+GqQ}5Gwysv9?%(u+Y8><<m^mg@|yFD@BRnv{S<+D#BbaJHYSBO8OcRZl6LsEzV8`
zsX`Pz#LKoRazb|5HbR#pE@eq%J`+>Rfnq5CRNybp@cV*leF}b^%dmM1*q3wJ!Wzv=
zeN2{-q8tg*QOJmo=hHYLXi*^2i|(Rs)f#LUeUYvR#%Z?v_nHahlf4FF&K@q-7dtyE
z2C#NzIKPG1tLwbbMaYQYG_1x+U05Wu=&@A@A(Wp^-sKc%g$?~(KIR79^0ri{7-b@8
z&09NhD&*nEdEAKPkCfRHMC=@#?AzD|;+K4y`d;>4J8r6>iNA-Dnwd<2CKaDW`)s5o
zMbo&v`gT#W*Jj)&lmO8B`O47N1qcjf9skt{>@fnnR@xNd6w(mCtf2Yk;eY(IK@U~P
zd6e-@v}nsN8U<$e$@5i5HE=YG89D1m%2gyLcE8)+<gZ~OvSJDkQSF_AtSGw7vAiF;
zR{+f%4N489fznDY3j78KA}X87{kS|<Vmgq1h1VNFfui}TFO}T(P@~*@7;ZF{e!Nj;
zt+7lZNttrLZD5>UP==mWV7H2rJj?h0aKni2f?Rh?36t<Ip|3lGT-=P{-DZ6<5W!31
znL;zU77DeL$kkWh95Ph7v9f;;DDS4tT-X1kD$5DHg{Ltq=%d<M3N#VK!T@$L<xT7%
zdg(97tmt`v3c}F}H%`~cEoSJ9Cs3+B@S`8%+6ann=&Mv&CbPT%_UvsWi*u^$AUkFc
zAsm*qYa%I&4i=a#I-~qrKoG5-pc=LKw>B3-ieTNx?Jr~3lSPl~Xxj-gyRGPYjXdc4
z@*HRR&mQ)02(ph9G~e#m8)o0NHE&fhT^G7>GTfGIg2`HUUgCW<U*!@*SCza<kzE<C
zzKJTsFP~B-hK?)I7yWDldFpKvOkw#Q-ptl^CMx8s+G!eOOLb7FMv+Vc+usTw=DP8;
z3+Mh6O94hXyYX<cR$G0W^5~!vNys!Jm^r^v)f}hewSHD{UdC7dwsE%g4@;~8Up5KT
zk@m8;={-Bn-g9I8dv;D73UCa!nBmZxOe1HSL}$W=cyq7MKYP8$FJl8V+_P&$imcqw
zFhX!#r3{ysrGvGpQ^Is}Qq#9}0`bB*EbkA25Jn5yHl&r7jqX}kK!1p*^P*Xdab`JX
z?9?wlF(oZzV-4U-^ID=~_fPIc7ALrt{{DYRdk5~!nnqnWX2-VG>2z${=p-H6wr$(C
zZ9D0pW81c^{dB+Yx6fL8tUb;d<J2!mo;hdLoK^RIU4v+iGfCGThZE8}kgZaMY}1gW
zT~X#<p6<1esdI1s6ARg#H`dTcDNbb+q8Ps_MazDGiCw->Z8ARvaQJ@ZNNNmSRX)9#
z&Jf+7vOPXg;^t;IJQ?2)u%CGjDAA12wHtr|W3y^@!DWT}>%zMS`C8F(o#E|HEE^}4
zl<3R8o4g9Mh!UsxfRbL><3K8vD;EJXX&P_H^DaM6g;0|CO0O9UR6oGd?>10KPCPm}
zt;Dk`e}nU@@E2q}iv&AaoB@P=e7-<rG%3%D)S6;OTt@_=wN#JMYRACwP6GRld7&3$
zq2_-3Ig^l#vxi~jPf7KKy+MN*3`M4o#^4m}IxH~UR1elCRs#!3376+pW}f)Io83)l
zQTjcPK1}(qXfqU(-Uzog)4tGSxyNLZI}rBe6Qteqg_<C@U-{pmwycwKFk)@+gZKH3
zHJ1*5)#<fa#(>mc(SI4@{m-NGMe?J-8s>KadsTwE``+!qv*!o6#34_Cthk;6xbz!?
z-nu-iSz-(WKh11_ZX%s8b=e>(oA|w7uq(Sg@D}6S#OJ*%h&ro-e1CMKIf(|U^*04c
z{X&c1eFbYt%*!!yEI)Evj2y%id%rF!=u+MFZ>Fwsv|p1MNLf{0kg~1F4^AOP3R!rF
z2BB!?dz=TTP11iPM{XZzNO&6WKJ}W%4Nd>1C&FT!sfBKZ37WdLj@!-N(@(sfgn}ni
z`nBtQ!y2?dw95Z_Rxn&LZ!WS~HZx55q6GU~h1W1RwIL9CExVfBIrbucpw*JQO88u0
z`R}C$mxf2$$HMuY>6jE^m0@;IKv)c0Cngr>X9b76uX3!<p&4^PRr=tAjHCqH=!P{v
zV8?gk7_P%^Mzmt#MOzv{Z==@>F{EF{!=<vw>U+X25#y<>VnH%l2rX4+A=Rcqaw0Nd
z!K9_1xa&GK56s-G75U3+D5YQ55N9P0ph&3v#CuIu)FzVRA9>QoP$A*9Sosp9Daf|p
zT(dOiJR}UxF6&VVrys#3g82y@EVEsBjkh=Y1A2kD#|X3l8iEY^`*5MP495>dUle0Q
z%&YT|w`}PlO&k-j<{Dx)o%|23F8h~Rt(@F6trdt;Wf}E<-xjt&Qpph|M{lnDuQnz(
zSwC<52~x7V9<yvOt)Zr?{<!P`u0xJq8iKc+<-2KZI#yQ-Cx@gU0u&W&k>zjcAw7j~
zQPMT2Ax!_ie)Q%12Eq<X@|BTWcz*-fu6W=66qMfnEhzmhlHl^bFHer~zK{OAy<HA)
z56M_VT4Enc=6ojCw>6r1Irv+5QgP1cwkdsWcRWS6|3jDG4B{d!Z?>{bp|3qgd=7dW
zMW|xlSp~fC{CVe5^ijQOB>3<?_<UM2`hw-95Dr^X<eW0{2oinIavl5T&%R0*xd#qN
zN}eKazOFitwI^3Q4Dpcyd=Sl$i?J4SJAlpW2DkH*dGmwu%dY*&%dS)Sde>X>`0{_;
z5j_Xe=|+z0rWYUgoKjRZYk#07<%?C0y3L+;uiv6IzlQoX`PP}owiOGn!2(?zHd<%H
z-?W}Lo!2*QYQ{?|XR~(O4>pegs4EjE^&}^-jV`yG*3VqPr93}CN)G?AA-I!4@xJoP
z8oo|O!kDHiU#T^dw<80zeb1qP7KA@Tg=ORQd2$3xf+kHF4r7R<{=H?Q`LM4aTPIF<
zGE$SzO<2^K_vKnvSpv>x+iZB*`<9yb#H;($n1G&@!-tFe6N5G_x!ZLn7}(bBCK>_a
z`mbHVrP1XNJZBp@l>L4sloZ%=XH@hjGR!glXWvKEK+)Arvy9Ut$RiE#@G?pEI>tQc
z@Ar36eCEcd!P`kE(zv`mE&S&*L18c!N8ZBcKaz)oW8<uFD6;WGoX_VaQaEbFTZ*nX
zMZ}`}P-MQ<^HyVPRCv;NoJj&kxP45`o(SNbj|jn~zh5-}+-|wLG*{H!ceX@KX?@Yv
zx6;L>3d}nu5pf!_Uguk8(v*3oK8r|VN<hw=jpZbs3c02;NzkD-hd>38!xWViW-l>M
z{24>|ycYPMvajQypW8h21e6%V#Na6t0{^uI(S>T6_y4&B5!ZL??X^a*TOd07lH@-T
z8{{P?odfb9l=7!`_jgoq%NHoO9H8~i<#Tmfy+?0iS#UvB6j1@T^hAMD`SS`)>FZsg
zNKr#{!k{*9Q`d!yYIMlq1}aA5W620FWx1Xcs#z)2uzl`y)(K^&Wb&07NmLm@AkzkU
zF2WD8HdpXsi3uAMj(~~4&M61;)#Qe6kE`+06YYnGy3gZRIsX4-{Tpu|CjQ5)|DuWN
zvAsHK2^NoKdk_Pd(FC*}j*H&~$Y06$A6G1gue+bjxv4J5Ic*y2EOSq(<w=KvT#$&5
zGOo4PqXl1<T=<yuPbv;kLGTsc|Cv(11O6XMz1z82_kx26*ES%gPV0RezzY$tGli<a
z=b1y}^%)Dg&JH+0=!hZgw}xK!3k4_bmV>XPj$!?OVbtF}ewOJh@R%tO{9h6EA7_?z
zPz+Lw$hRYbK@3-wV4eL!I9mDJ|1=r_7q@~&zJQe^!zEa$-)+-(n)vw_w=XmCH&dTg
z7BO?63mceBx=dd0>0sbq-<pk7`A+|@gr3D8Cqj+&q;NU51uN22n^xS%Qt>Ziv!Y>A
z%E#|T8H&CO7`_u7loA<qzyOB33kJbhUiG}`l6#%kO18a#c;kAGwDRSC^X#L*D%Ott
zjpX$(!P#ji$>hfrzmiHe!OQ8&%JBrz%EXV`&(3acV~MM!-TVjKkPj}t8#wO<xLj);
zHtS+4_)#lVA$3By6|K>z_ra@0_UAwz$LAZvzaO)Ji4%!G5Q#b?-X-dM+eBc6OXf~p
zb$oP2p6P!en-66I-T&d5Z^JWr&%L3E!68m%^p~i~RTdO9?ime{0og&Ui1YmhbH6<p
z|9H~mPXV7CCZmj`@I{$TC`wpxmS7Ko^itL)`7(e>&c?(AAUaFYNC38B5NhzYmJ_RR
zL>SGF>SN$vDeeqMfUz1WeRyOj;Ilr%cMsNSwW*xQok;wu-W~Tik;lp>_`PH^@n4S@
zXw=7}@NQjEv>_%k*v;YbU*w%TtT+7+wmo;<Pj4!Cv)qfbuTq;o{&bb9G+N~|Fd}@z
zlfS3c8;c;EWUqCNpRF{GT4+u=X#+MhnHPgPE;IJqO=n*!3xi*|Ul&yEZCMr$TeXJ|
z?<zJmTb5*@`d>YUEI<%0sv)jAOjZT)wo=d6=sickEv<XpnxFId0f$7L)3&vqt4{Tv
zuPltTgp-o>huX7{PxVy2T$f-kR=!SU=h<A*uBRlvP2$pcro1U`*5MycVwVbM7@Ss{
zv5DfY>Vj!2k5|7`y#qK1k1)5N7xjMVQ-H4!NL*;UVF=<mpOsj0iUa8PY<rl-7qQ*Q
z!4wO}R7hDEuzM{?TVz0DaAfee7p5@(;Lml#F$WkHq?1g%TbFI2eOhiC%aJLMJ1t+G
z=n2;Bpd0+<ae#mYrQQBZx_6P=pFA;5ML~|HT<E1XDh2@hvMn$3!YQzXUB+lOj}Omx
z<exZ8siGF4oh!`As`Xu)Xs<-#0QP@jBF+G=XGlwa%SwmN6^-(k&+ZTY@b0*7TQ*^{
zz4__w0Vvx514H<NUFtqw$jT!3=|m8CUklss45-L_rzPAMjrL-$;{#5;TGrQQbvHVG
z96w>FMdD!@J-yLk|D&~XB+;jk$v9i#aqNbKKbu^*4BVwni?4S&c<y1`Xfq6Vbx0b@
zY@bmd^Nn%4+R_EIggP`pvsSkSA<I|sSDpbqGjLt?tW^$@IUH;G67(q}(I_rvl#8KD
zp^J?i?kGHWD{{r?Rl+{7IW7UNx!q;etiy?43%pB^@OV6w3$TO53E#nwV70xg#%RS<
zl$JJgwG_mN*G^Suyc9NnAQybVTwcaGgLz(pYH>eH%)78Vo;3We3z>0}G(1W=Te^H+
zc3x`TUiBlCK8kjO`)Jlb4l8GuDG**g!r+l8S7}78R6^WFWuoTL;<CRe((%9(yzHE%
zp4=ond>6SIIbdQ7FC0>|Aqq~|&r=2%&UIMNuFHXGipg$|j6gaGa~R9GyX%`#=8mz&
z3F%O4WFF_ttHHFgIZ+N&G2gE5GZpX*q=o-WEO<om5a>)j_tD^PBBG=-7;r+*Q4Z2`
zd)&d#IICHLqscicjx#W19KMHf0lpyLuck>DOZN<{4le$@2=v?aU+Q|4qM*k>-V3l4
zhz_qPiX%|Uj6NG1EbPn~E(IF^otw_5K0Zsnh!>(6!|GbJjcFu}_E&iooVwdg4L;Tg
zgvRB3UbgDZ2{|RieK*w){5%dEz&s_U(5s7*4#wg50$1<-3H($4{;Ym7^$!&E6_lYf
z*4BfZ5_qKWaWv4dWpk430t3i^55*3c(8Ukv_bVAV7a(#z84gq0an27F(A2H*4Db75
ziQ2P=`Vd`>>uP4kvi=Bs0lN|rw~3n*-QSY4=d8uY8|)@WgqMZq>2;;Cy<EBI4)yZo
zPJd&w7)Weq8N7)A@(w9VStj9fji0}<)$n?gE*$7?a^?Yo_-)G{0VCS{$e0-&bSi75
zU_}H1QPo9uP6{4a_25$P13&OI#+jWd5<sqaJfu{`9OCT9#?^Nm?F!OH7T3U8W9qTb
zv!7!^8R%6-AuHqi?_hR7+!x=S-G|bD3gLP>z(o}R#s7|?Xb*2FxuR(TNhozRkI6;i
zKV-ND5n7cS)KuR3=PGsvO%nVDlMhnUVk_Qz_>=HX7A6<pT9#bJB;reldA7gRfs^Cm
zfEBc45cofl?4C&vj-}cDENUcsnS+mv?d?s^8>@#RmmB@|!RG9Y_ovVfRS7{@8n5Q6
zTwP2>0ytm%d`Sl~0RE+Z(~gIW&gOJ>$Zdl~yl|qPxCQ6YifqjhC}lzq-x`*MbDnxY
z6X%@`=;opCoAxl|$!i}hty9``$(#9N2ch%%%8E?D0?^4*pA@1%!39QxJE4!H8Ym%X
zLnYCKCu1c1-fZ)636;P86s0(JX}%CBXxfe_!TRN{FVItBs!p&af`C@3lG(C>Axw?8
z#WI65W$*}y2`%agC-7q7YkGmWpTpuoM#UvS4d3E>2<r*dnA?GXn;H9&tmQ^D^?;Yc
zeHvE_a#^Ds)CG~YDsMxx$Mp#JXrB?0Zs?;nNH`&#!RAxz`e|X2Y!c0>umvtH*JA*g
znd19VV?1e9@2OtR1~luQ!q#hzCKGejMFjj3_P`StljZ_yvDu~RnGF;wip%36cjm0#
z^i3%$wt^!^+D;#A!_lRBY6#(Mb5r`;Zu`?+MP=-h00D&kQHPY=SC1M`uU0H3G%LD5
zGE>OQDa<PNK|pqcSbm^+)i20|>JS_maeT}vRz>!lmduAeeszNL1||4yV~8)Lg#}Se
z<^M?=o8`9llaqG0di12T@@OCNmOMisOHhF8sFzLjD)*+ro!G7}DqkUv^FO{-GJA^j
z-1;()hM&|Q5p_5dI!`o*ZgQMf%R0v+M0+@GI?4tpz^o0gEyvNsk*Dx0RFWV<&)xL|
zBY_1)HeDcr<qLm@@olUS8|H&z^SH`sedsS&MQKK%5QUR8et11P^gDHbxFe6EBS8S_
zr7>)3p0>>}0qQAu-S$L)SlssV^~nQ*viu62k?@6&=T(d+244z|2w`r8ua!_t-e)Vw
z0G?bZOYb0Z>f&?%7sgn3_v6QRgkji#fsAD$GHN<#kiOGaI1}g}uq_l8v`nyvdr6>7
zzAktxI{<YQUxB>={0brzX+yig3qk?vDaa+x$5{=++v{>mFZ36cWHInd`P*p{A^ooC
zdtt=0+$!gdR%*J&LlpI?U|&?9K{uG3&zUA|2k$m6DK_9OcHkdFJP0edE8<dOu$y3n
z+3dL0GcZNBxqEQrY&v!EdhUn%TTxY7fQVyDxv`mEte`uAEuZ^A!^#yrExq=p?dy4b
zQr8wMD7mZT1sr)q&3lg4l-J4)2n<J(?^_=yF7W-u=J<rHN1y#lYNlAjZ+6yTr*C06
zSQmUoc=sUd?@@q4(Czz%&<Zo{)U96{hyRxJV=uTJuz+`^eTn?H^tY<whh}wF>4t3f
z87S=QiEo&HDD@z~d8Zb>-~1LD=A@bc@zA4&uI~E9cx{cLRo6iLG4~&gQWWTeH-n86
zVyL~(SP9{$h1*yiH`>weD92Vi`?R+Qk}()=fkp2{r|tDGJz68!M_Ju+$*xfQd9U9d
zBr%QoLTWQ@!)aQYt-KFT=a|$K_8_v+sNZ%B%*ddN2wvCQonH|+p)fJN7fF-lR{P0)
z@t(tlo8X6nAVSHo-Ai)O!N(AHwShk_Jw~Is-1+4u`$FY|_;wPiYy@JPYLuGPt&W5~
zjfJv>J$(lPaEW5Fp@H<&&ShceaQl?-;qbe6ds?;WC*hX(zyxT6tWn3Icmb%&8vH7U
zq}cr6KT~41)4r%BcRr4w<Pa9f`(Et)3MYq@P{IeO<^s*ldfeGPwdhzH4kJ7>AL_kK
z``AB~{bl+YQ6l*5f088l7kw7)(xO%?bGsbb6vqn9dPj{We|Aw5d~A8<`^L@Kqr5Pm
zn@?#Ua|0q_+XPG+d~syb%T21hUZyOeAf!4c1!!E_9^HK{Iq$YVa!_oij2=;TT&#9p
za|S9}Nq)oDBpg9eOt<t2fm3v&n$Y|BbSde<$+cA+Iut@bF#uVDcrzD0I(Q^YA#Q^S
zBqw!JQ|Y{sR7oYZ+6h1tjZ9$mFT6g$=;0vk62b>GdiorS7RQnZ!41n)*Q!@w9NhP~
znR@#=%y@>o%PzhUg6o9~p)vc<DXy4<`~H`Z_BX8Z>5m-_ebf!I>ZLg>?7847oQqTZ
zG?0F<Fo(^SZpI7qx0Tc4dh)S<LfWzrjCNLf8}8pPdD*6#S?lVl8X|xg5aJQNy7yJz
zx4WuDMO9+~=kf=`BOM#rrO@h!zz!lGe6OLptytPqS$RdMV86H-eU)avnMN_?z`s6v
zcX5iGD>hrjBMM3Z2t*VN+InfdR6x~*giLcB1;Dx}vmOjYHgemkFigSlo>auVv|uaK
z4ZBF=s$WcK0LndfG9YAI$HgN<Rl%@tQ(nMP7EBImAN=a%rUgCij7jlsR?Gv!#MI$w
za$@WrAYxH7Cfdc%TPnVXZztu|DadCTTVE_rT5>$q)I?pkdJfyVaSs|3wvr%FF_sEI
z7U_7$zM&NDEY;_eKbPi<9^Bwo0CSO%Y`w#t2VKU>S5klsX@ovt4w53v(kWD_D$DRM
zt`?F1qVyr`clmXF_hM1E`_XwLggM`qY(htc6-?g*WA0lVVGZ<Pi+PIOaG4CxV|jUZ
zsx?eRZowiYz4!pZ4r}g3Mqgs;a|jlb?wUzx0ruY_-~Yh$Nv%kKHHVuvc$hbI=a2zN
z*XCyIy+KzL*=%An9hj-33I*gpp1KAbv1Ke!Bzjtvuq$y8Wk0To>S0ohams!MHbAfu
z{`$^^fG3bbEC&Z{rg7wiKxngAA-T?*QY8W8dne|LLLlRn3`eTo=#zRK3|IvlRBy?M
zExhgcvv~Q#OW4DE8*Rh2WC5Zw@Uq%H5G=H~W^36?biPJRjTQ(6u?k6vqkK=>(S-(4
z4;dwN@bPUFa762=jPI}t9WnXP-ZUnkOYO~8uE@Vk1%#Xwt&D}4pEX`#a}1!FIuni}
zi?VNh7j%)dw#aO5p!9>(Gw0Zl@+aY?<`vlRpFmp{rNHNji^+en=|uPqnLVw>*O2C1
zK4vg}vtq6>6i!l;KGwb(?{hZ!&EVTLIhus8f^zv<J`lf$IvCA=YJTmEXxEkjE4`iu
z(Sn?#3K|EY#-`yf)@)3rn%#<2i@%~hRb+pYPMw~10ir9_$Q;x8gW82774X`ky%tnT
zO;P(#*4rTr+}tyE%N`_y+Wt19enV5!`;y18lR*ku2ZwLnXHPPR6n`udSf@&}eZvj^
z&OAf*F)JsOk-j_VrE0!;xWsqy3*$VU+86L_e}PCk$1Fdij`X1SPdOE_@hXKa78t@i
zKSI!FA8}ffuRrP`x{ua`K;pn6KpC%amgyDY6?6RD^MsyT^*hP^INp362ihTI7pdgo
zEaCiK4++*cQ;!93`0-7?!y7KJd8(q?oKx^I#CNICWAO!6j-p6imN<e!)lpe4)D6Qp
zKY@8-;|7aQv`yJ!Mm1_WpQS-Ra{AF|P6_CdfDR)fM^UMF<|uG@;Ai9<5T?%A@xA-7
z@oQ@iIx)@ZYLqJ3!yI|a-?YS=aGPgf?QoXaN2FW<^M|rZiHtL99Sz8hcdf6DSisP=
zhVK__gwNgKbm`-a;JmqQ4?v%s<_Vc5*^3cZ06!dG*(||~z_NaiKnaLk(GjO!1EjzI
zCFnET3KM@JHJZ=3t_Xg>fYPn``2!e`KD%)=H-bZ7KV&H^te*c6xgX{-ZjtGvo3)ub
z(OVVdwli9Uk_c)&G&k+mRU@B7={NaEL!pV9)_D1yhPc(}z|%b4%S$##mG_9jZ&9@D
zOay(w6_^f`$4Ek`L<aVBvUL{(<DSlHeTs|Odn;gFk;5*=t^&N{@N_kZek0k_+1>Z@
z4F(mv)CYQqtZz@$_#9d$i_(qX%R$A?4N+$i=FN-!dJ6@M9Yy)&qdXJL_Yp$V8|KuN
z`CEF0LxEmVZ_o(tQgpnw|4q!6Urdxf9QYfxa^FXdBe+47ntbRgXKw(OiquxK2h4Ub
za|YEptzPQ6*z1NehKY0!{|L!CG5j#j!?BuiP)!i#Oc6OR=+3%kb_>K%fWEuxBv==#
zi)@-ITPB_VM|*{*8`ajUJ9(~YH<P=y*eXJz+i@0#!wvREq@g-O5xP}j72Kf{o#k!%
zYugWaJBDS)(8k_Kph;j2|KU)&7?7v-!)D%2WFeQz#%@4ax+ft{8;FeckTFVfLL0NX
zI1AYEMX@ate(q1|TWpm%@*a1DYH?@7^YD9hEV%5T8YdqCK%VT?fOpgdD5jWuGb0Z-
zc9k=T&!*OX?nB?MoLaA44Pf+oYC2+eLBtJje-#5f4|TT>HUi*0A0^Oy(l!_VtL!s!
z86?11Zl2^!xx0~bFLj>g6^$AYF+M*kcZk8iUM*4i!gQINifmNx@@$2M7YJ9bpL*c~
zUmi)7OK`&#OT8tDE9Jo1#j|r-5p+{0qn|BV{<KlEX#-2!^F)|u$DsjyaN+P_Qvz$F
z$L4J`Oy6PoYK2{|k1w(n^KBB%>`~muMW7TbWLhT5ggNdp)p}ts)EsyK_izFY)20R9
zKIGt6G7q_h5B`$Gh}W72RGcR8Z7UxcreA3=E0ud-J)TweK%i0!lUY9ury+?3f5F#y
zNH|6P2LAra1kwQ{CWPrDgxS>aU#R*~R+F>Uc&7niD#@*4Gj$6q+8119L2n=>@sx!2
za^9sA4%FE^>rRdT4XVG9UWfs7j-c7L+UF)0Zx8~Dt?R}6rbP%>4U25|<ljYHxp`iJ
znuYsHL<_k9)vpb|^^ARaoY~DzGMMX$o@Hz1M+jL{k%R5l6Dj3^L<L9pp0vf{Hj!xV
zQ+kVf@e7luif%RB&oq>s2BS~@*;iCcoDh^|`Kw8b{MH^uqeplExnlJYx}=y_=M?X$
z<S4`QH()m1e#bz<9Nw3b3n`n*;V`fxisWhy^pVX-2#$m4HN0V%j(n%d5Xn+9!O{n3
z)vZ+%ns}dX{1o1yfXKA>BunjC|2X3jEOfGVs?o5SItjjHU@@TJkk<Q?93tNB%9x#p
zoKdo*?MnAVpG$`Uo;q1)eB_Zr`3RvXRm}7e=N5R(Xh{BH>-d0`tpjkk)~S%I=i8ex
zntuTKWG)a80)lwN+z+C`9ih}NOg#51(DjrRg?|M$-}&Bb@k${i4%{xgvL6c2hLO%-
z|0JRR0`kp>(^p25{?AZ##QzRe3&j9J)&Ju0BS!$CYLH5b!9$-8-w@Co%bd0L%QpRm
zA)e*HYmcb}Z&e>B&s)yUoM!+UU%b)*-odT}NgGQ8HsaJPa8eX~%{5F&#M@lNK#mQP
zzaapqm@jbpr`BRRC=~or1N6#6DOnm{73-F!JzzIXaM9e3QF}lw!VuBo2Pl-~=e>R#
z>sccy^^^?X1Rn~dQKa&BZGtFf3~-g`aGyhv%S?<Q$K|UCAIkkCT??>t+B;s4Dn9sR
z;ht@+N#w&H$n3tMlyh5&YS)BE$e1ald7F@BwHZ64G~g}OhK*SF-zFcyi@UH}nCBRP
z7YMX5$jNKYpOa)m3}w#57P#(F(pvAkBM>10Djf#_Kh=k*fC5}SW{?gr8{!J?ORZgw
zIQF*pFJwIqmIuU-teWQMw1}K#a5S0#Dt~IUH}IHe<s!`gE&hxw2Tdi-YGt}7otyaT
z>kd@Ci0p$XPdkx0a@DMbw!7oiKMJ5;n#Y-s<B)BU4&JvkPAg7L2GWzSyy5k~Ip@W|
zDexl&TzlIOX^uSc9oenw0oE7WeBg#?fH(xWU5mn2ZZ`4}cJJ|Y$bkms4uPp0axXyB
z>_vH|Im+2xq<aqUaF}*b8@4XbQW+e`dP?Ws<{E<8Gs#CQWji$=h1jGU7g)>soHmA%
z2`=a+xm0+MeCTn**_%bWlu;1KF-UlXF_TSG5l0Ze<UY8gkZYO<7d*vB0c9Q8=a|mS
zP4~Q#qNjM#cn9pUe*p*{9)o)%2Bi7mnER90<b+V1Iw+8xJya+HF5bTat_pmai9*F3
zwoSGag3vjg)$*c4BHCP{9|3><qW3zlM(g!s0u~Y5Hl2j9*F%$faKsd**vuP=P8?Xx
z;|l1bvsutC`Up1<Ed>Y^y6e2jGV>sf_fx*oSQL@Be)aNkv^Hr)ffAJ4LooF=fwda?
z{{G7c`?a|yT}*{L)jULY`4Tp0>@B$)x4EMv&|b6RYs<;jUUR~kpgZBR|E4@hM*a7k
zJq$6!s`JS>Zg2jY;CHV=ZtqQ^-MuGR#&d=zqm*B~HiVs`oFHOIXfuFA1qG>+RX`rJ
z<4RjVM+v;-{NfR9li5|z!ul}c_}4`zh_|Bt5WVm#>?F>HKVKL+y-cYQ>d7sd?r1Z$
zfhNx#O$1<*Bz$)cto~WvI0)+G3v6;v4v8QjSRS5Q5>!ZUl2+lVZ-<{9-pRk|I%L6R
zbu&?u!=2MTvkqCc=<EbPBagn6n1e6&vve;{diU0Vez(!z2PKVfG)~6euTe(q{1OJ}
z2Gskg;aI7Of+!~Rf9HznBsEDJ?sGzB+!8@<Psd|I`^(jvQ5#XDc*fcnX)dZ^eK_P$
z^h*TcuH!HMV(}I3eR<WgXIQBC#k+l9eJVq$wA#y()K@;SpQZi1dHkRi7}EsXiO(;O
zd){1!&Q0aRi<}5`@Wm>M$4qM}k2kt1JG!eutVnNQeYnkwP1^W-2E0H{U-$^;`CcW>
z2$s}tU~^Vfj&{jTZ2<1q@=4Bjj(a_jF(%2=Ru;EP8;hdG!qqHW6j_exnAHb}7gU*w
zLa9N3jpz!V%dSCN0cK-H+wC~8l}4pxmi>&n^(py>en)XefP(cepY`_HG^4ZCn4-Y}
z%m(l3FEaT)-};1lRqL9(4*i(o9W1|h2<md%i{r^6GRWYK6i%hj1Z!25?zYxhdR6g?
z0rX$L;~=#^sqto8{L+%YhS8`ZaJ_NVQP5REFBoKt_^=|%3mKz5qH9t21ly3r6kzA2
z_2pd{|F};LOY3~XKIuJ_kIY>Kj<EG;8QJ}!$_WuAFJFLuWzGApt_2&<;4cHMqG6&g
zX)HJjkz%?bwudpy<A|wX->tDU-(<WU&!m<eKYS^2qOQ0L>DL?}nLNXZSAl)>8mOMu
z!)fsOG5LC%tmQ#eI^S7g0Xw`qZ{}@^mzzEBBCchfLAH9(6EKs^pf#9_uw&20oK8vU
zNEtLy<8#+%?{6EOviOV!o&c<mo3x|Du06?imN#+Q_SiphV+{FP@mjfK6c4&IWTkkh
zobl!-MVI+TytE*~6VZN`AeDRGf{&Rv)UuPz+1ZzY;x{Q>^yjo(ci$%)>JyJ{S55om
zdKm``DY6Faf~(M=9r7zG5WToBj5z90RHXT#!bYAl9A8h&lr&kl0|<0u84lX5S=%%c
z98iGfh*ZKQMTMy$<uf=gk4sI;n?Tm*Y2~HS=g~|1p^*T4K<CQ|brEX9nl`$JyU+bZ
z{bbQ1z11><+G0hYn(m5`$EF<VPpBhVwRRtSX0SWv^JN*;S4rkc0KX1{&QyLT8=e3^
z6x_s$z9Yy(Vca-$Fs`dxHoJ^5vxs~)S9nm50=7%&!7a!R-{VNPRvXCYZN?D1Q5}Sz
zx9_FjMF7^n(ZMSb^bYQ6R8?#YR>rG0x<B`~XS1UXii!RWwl2EWeM+XD4-`k**zCW#
zQi!s5I36Ged!4!t@)}(EE}A)42`Z#QHO@H*F%U?TEk2i40OyyJf@QtpBT<V}Ft9jd
z(Di2z^wL4J)ycxQA|SsD{3a)ODKn&Xo<zoNf))4`PplQGJ35&CgNKsBoV1JY@7)`5
zo!V36Jsff{C%Wh_D0dhtm(cH!V0H2JEPVFLCXgc*m;pK~4^srarQ@mfZM5(vqiM`B
z;XrG=aY}>^!A4+EW1rQU?JLlkLq>a#CkV6Vhq``Xc*wn*7{<>%oq#>#&Qb6D?Q&VX
z;}__;pA3_QlLRXeU{_Xp22(ql9X6%2V?W}JEjP`NXcG{VIOzO7f=;V*qsn)B5LUv|
z)QXc3pV$D$OZDkpS`Cn#koOr8Dnb7AcTN$PC@r!o7zo<{8sF_@P_xk`><X<<jkKx~
z-z%XW$vN+5VShMruBjYg;;>!<a2zFzsMM?Rmn)zbRaA@@j0Vm7BY5r~&fc>TQB1P)
z{*h2<5KMgu_Q-*Df~Hjelw2S^ScoDj5tV!5v_G&A+5u|6Xvr@}fa-4Pipsa*?Tv)H
z2!Uv5Cd1a)aI*RMJ)+Es!k2ZK2TjK;ys0RjRk9D1V~|M#C6NKtf6L1?%aGFu1f>(l
zsys(0+0w(5OLpo~t<mZ^4oz2)@8PLL>(XSCJ@<wIJjrXQ3apP1AcHEk&E7*GrDGuk
z@<l8)Zs#`mm0uphT$gM}hR?(2%}glT?WT&%sGY@RwGaq}7plY?+BTT&3cuGj+umrH
z{}Bb^OmhZvC#xH{#V{5OlQsGxd#8Zvtq3@W#+vC+IXT!FS$KrA)1tGj;JA?SLBJ!F
z0%4-s?K|$p{VA%wNt6-D`kz#iK+J(8=+g9cBEnZX@1j0169|AnkhX{`#!rX3(h&^!
z%R_%BQU=gG2pBz~oBLA00K=GOwFcJXs@7y<9pD(~QrVONObh_&yRS*Y&aM<{;;?%>
z^7?axQvd8Th%9!6K7)^EtFe_7Y7Xu4QS*TT0Nah%F^_D#UNF<*dGnLauCHu5u5=l7
z(%rvHFTQ7$F#*~X{zC1|Tq+yxpfBtl7&+P&KL&X^7<D4)Dikt@KB3-a)=MU;lRz(8
z1KjDUfQb6@f8tDoO$OkefKjK;|LG=xtOGQIf#ta~FRa}+`4^9`-VaEB;siD%K4xBx
zo0NH2jeVCN@4P97pc!Sj>@()>{P__@>Vz42poB}KS0d|bdFV9{*E3S#9ThB~=aU!+
zUZtEt%#}F3*9doLEyh!OzO5u{ulGkP2t#0qi>?<a6e3l{PI>0^KlGQU_+G*9oR4tE
zj}Hb10i;!0?Dg$L%HA3_(7e(7)^rqkleDdWfBift7PKDK>Fsd>6JN_SBDYSUy~@}P
zHy@j3DU|ExPzcj}m(I=~FEAU29affAqIOGA*8Twtv`R?5_#z@K!A@=*7)42TMTZNV
zV2Sq~<6v!nX4_wcl_|9>q|Ly~j;<6caI7qH?k!=b1b?u^*eo0sq3h0VLK=QQGFQ{t
zP;`SiyRfBmq>=w)S|Aox`JRR47(n)@4w@1Kfh6W*zJTygd}xk{6?Rg(0B(ESUygC?
zO7hglUBE&}UTXSZ7_<Ie0419wE)Vt^m69MRxTdUfou>pKfCCuZc2-=+YC6c-7N?jN
zkQGuVpafpov3gNWfBF9aKS%R><C!09@`OuX2ReX4T(4dKGIG8u-9HFkQT(cH?Ya0*
ze(4)R!jgzP4%R%=3X1m5l))Pk#iuwE0P^uyGJ{F1V2l#4>$bz(W5Vtb&wTN|e-fZe
zW2!E@@+W}@7=px|m{x&oT$BqZYCGU7**Nj*5T*Z7)X48Ob7GLo;f1@5LawYC|MQpk
z-`I}Q5HM}GX<3Dlw>}sorz*&HS0%f=o%L&oMMYXXFZ}!8^D_|Iovn4Bwt`k{zwLew
z9mv4`sXF`_HQ#`s-;YGSdIuC9cd9zozUM<TeZWps`MtSST2BTG($o}uvHCZ1ts4mR
zQRi%xK^oYdZr!&0c0&7}_k0!1WANwd{Tb-cgt-K7J&;By7X+sUQACO%#|iq9ep9)j
zC}_iJjrG!O+@}A!Bti;4g>bB*19IF!H$86050ZI4=t&MDNz>euFzxjkZ6qL4Yf27U
zYi1e>LuMbE;Z~_zekXvSS|^^iVcc?!qxnv5J)RpaTNCJiIaP>bRu_1S%j0jcr9_Oi
zfgunT5XLw?LBBVx?`gtCqA{nG!iey0Za4{~MfQpsimE)8jQl)%CAOs)d6dXjI#p2H
zR9Sk$m`O?Fnc&|Xxx=X5|7sNIQAD`B=kbOkPs7^qjM>~BWGSy)ns=Ch{rQv7ABGPS
zJ2b9L=B-JJw`?TZxaII{O2z()RlST%EX8oql;yYd%PT7fU?=p?T_3pJK!-6}s%g^;
zX{#Yx0UKp^ECdC=W|um)xMtW_K_yu}pkVBqX=4xurkLE$*S&5u*GF*(WLC}#ZVxMT
z29Zi?6}q)U47>=o{l+EBQNa(gu0GHjLZ#;Lx%?~D-y#4lA@C^Y6pgE(?{L_P3ebeG
zD0zGocEZ#4a;R2HHMKWHLtITl3Xf}0TKLZIY5CnUMlb4m5)sF9Vw#{ow@5p=ZwMx0
z2qh-NtS6M1pqX|Gn_&>I5-Rh{r~=QZh@a$!g?9($&1&+2w}+$Z<|wN0tF9H7sABET
zy}-B^#>=_R{$8#pb;GH=TA|J+pFS;OW9LMv+Sb4Dc+9WXb$xr3c92BAXx+nHJA{3$
z*J>%sBSVp4Kyhq@xr!m%tdh{JSpqLoi#kv6kf~}~4a~>tP9mM-!V^2IGvtf*bZI?)
zpW@0OH)avFsW4)Bc}cvqqf^kheS{?ZAsXo$_~ht8&&+CCL>YEcllDKq$Ba-Ac@?(Q
z(rsLmjeq}G8GxmtthxG5%)m7_(JGJRuA7r#UmBPYqxQS#0Q1v9W%}#W=?~6mu;h4U
zb7lsExv;i5N%=8~vr?zu(z6v$?tV%?>fn#P&goQ*BY3v+;&r?;w*BS#N-VW;f7j0)
z@mP<w9TGQ&7g9jHF0y@)F@gN866M*1+S6*O;OFe^hm2AFCVtD`-$SUN98)9UO;|W6
z%))Ll5bN*P5B)R&356I6k0Hm;5QizhMNt6HxZMxfFU5M58~ymTqj8n)KPq<5bE(M0
z61xjx8d^XdTdqJ#li1XhsmfkTl#2bi?g~ti4Y|u{<UtXk{8r(QWm#t_7Qrr_rLHLq
z)rdoI!qza{5GFmF>uN6lzEmufAg212rzp2Oa4KvkU@?xKwM!Qg*+M+b;`!Lxzw(57
zVe4+$VCv@RH3LD22Q>(qeY9GArf4BVO^TP-z+i8%UE~d&{o|A$hvq)QRW!QVCftEB
z!juWvdX<nFFdb?fLh%svJO7%71ye--WuF}_0tQ0PZFEL@Z<pXj+AYH*TF2k<tH-ck
zQ>a$Yx8(_R5-fL%(Q3JN>OvD81ze#qE|!pmq5>T=Y_Oy-wmlXldT7le&xIQKBud{k
z53TrSC6$z4i>}0}9$hM2WZy#HLBK+4`P}5j4Q*;ber#P7TOaWTC(?UVygVo_E$$}a
z)GMXdDGBO&?jkqznjDG8G^Gfpj{Fx<nALZSY`V;!@@y}}w*;gaJ}`PBrL()d9WveA
zEN!Z3FsC(qZ2Op#G_C~Kz2*Tc(@sPb4pgAh`46Ri@a<>S75M$oY2N3r)eb5+Ltz^n
z7H{U~Gyl%IBn1TALRj%0QVOJOnsJjqo)WP%XkoY1zEQ^*vE#M-_to66HH=d_G8V8@
zQC3E#`F?G{-31=Rnm<G+m15T*?qI1lV3!$Aq4)03Hc=C*+w0cwn15T2ELc6n`PRY0
zjR0@twqy-WdT#smLTFWxCyRZ1KR`twY`AsI6-nOwq%f8BrVlIqSDF|}1%}CQEDg3@
zp;hW$VPXLd<_}k`-?c=h5|`w#m3cEZjeYk*WPV5RBY_!f5Tb9I)t)#Od|DKd-Xsy9
zTklLk6Od=CN>-CwI9pP5$Agfx<KKa8#mmJzZW5IfXoj7yV>X#~Z>WyP2lGS;lo%(<
zRZb0Ivje1SBGriiUsV6DfLEUQ;~q1ocY@_&2C73+s=#@)j-)dzPv@gHeuM@Iw{dQB
z1vD`?Vp8TX&yh%C_@0z3UtlDZNo`J8Lq@J<e~^3{j!qZwNYD<RdNM9iI;wCR+nu_J
z3QFJvhT3L^-rAFAxYR<6^Fk?;PN5#S>QL68360xkX{@E49uIVAW`>SQ;6|2rro;sr
z^r0FZW?TmE)?lxyxXH&4c@rTkKuWv`5$v({YU^-ijVg{6(#{eW?B8ixRwhXBTu|Vd
zm>)<ClB7qJPw%l!;ubuDoomZKytMzS?Ji+z{ZSr^^NDhJ@Rex#DvTASi5bnv<&&k~
zJ#z%-E+yUoV2}PQUcf{$Ms^7^vr<==yLu*PeB3xScp62<skKwHT|oa;9xM}PpQnP!
ziF73Jolm?v+XfLP?f|-oi<-KAoT+RyHvr?kMZWGg7oEBr4Z2<>2mQ96wihlGFF)J!
z{(9A%`)R^pwrJa3fb`(pbkD4GRjx@qdqZ|Z5r$+F>GyZ(UW5#JiL&4anG_q3_ANIH
zHElU&1;{LKI8!I&?Y#G8aIE0P-LN@Eo1`_2eHW#uf$))NI3BrP3`z0++n<BH-q&?4
zgL_&*rNzfHy$ewB@DUYM)ubeIgw00IH&5AVHVg%+z&x<=?ht~YGmrLD-I>r73khj#
zvl%*n=LA}v&7Y}S$XNbqdm^DO8!X>VnR1gzX-l1OWuE7|$7J+F6>_V%@xk|a=0s}4
zpab|cK;hb1Xk%a*`vdrLNgFz_yh<0@z0u7a1bvreqo4wkvJM+Kk2xawedE6si)yxU
z7{DJZ;4t%;D<n^@fu*_a=k^(2Y1Pu(?hmMX5YZPHh23FCjlgAEgpTH^w_bCX+P5w~
zU@B+!K{?hKUcy$6XzZkEm81kp3&Bf|1k+o>)q{j}6Tsqq^7FLfRGA<qLoH^3x?0bg
zI0OjYVt?!6_<)6U7_pJe<<XRx+H%%d(hZblBUs%o9~N0KMg7lhZ-C^NDXFc7T_tTL
zN?_k+Mf)f&V_<P4TB68S8h91BR}Unx>>{cJU0r4<!I|?5Z%6$&S5MJYdO1xHx$iYy
zsE^)k?g<PuF1Ep@ARbBcE-6o_{zHC|j!ZX{LDIm{C@=Z9EOAR|`vLa~<>75#q6idv
zGi)g_wDxH0-F6L(4gb=hp{l@~!8F%}w>k6LjI)^WBDnz_@C;(y0bkIPARFF$e|zus
zb@jc5Q+DI7_P8;=%5@AX(}x-n{&S97ol$=Q=GbAdOGb&w*~7QB@2v!5kS~@tscZ%H
z)0fb@gHKh-(wUZs!T&Kl`jcXEdVL$tjS?Mrt3cwt*nJ!jF2MX0P}pZ830VZWy({IC
zAe4q~5z469;Bp#q-n<!pd(9disDn(o2Nm*`tg$f?5@SoxO;(R7a_GHGfvnDpoC&$s
zRDlck9D(ygWNvOGUx$m+4GrFb=@(?J7V$@`6Q2#F*E-?C;DPRPwIt1n65u5%`t){J
zb|4+G6!iU(*=YPJhLu5L!wyOfN)1xHg}C>{0ZRpI7)fP<Z$d|~rJM7)19n`7H5~}b
z$KdhItQe-+%z4QId7wrdB-+6K4&BteaVZlVdrFI-rn!=MR3@~dg27fltlcV-xhCt;
zVKA27Ut2Z;xX5duj||WKgOmYzlymdbSnb>9@9z{_QSfdju<@!b+=B`3YhGFt11hg9
zW!s9zpoUoVb2VC=^AEV`nma4^XVol8D<6!jdB)&SX`0hJQ-V(L;_TiAs?b)<(jXaP
zq{ysLy|oFpRuL3G@pCZp5e>EQ(J7k33b)O2_CPQs{gX)iBOmO_>koywFwB0P+oq<?
zYP3#P?@Gp?%~aIX%=_}q+eR?t>k37raWalJ$-jFUo)$D=vLl*zB4&dbbo+O?rJqk;
z_T2WwttOmfOlWkIhhGRYmZ?+~C0e0p>{w`ZqL)4D*aas(dJo`fxmEWk&_OS{QF+N0
z?~v)+R3oItV4y3uYpVO~edvX3+{mK-90<`9D^hL4E#2r|6Alqw#^Ry9{UKK8JYV^<
zrE2o#*l~h^q{qd9%)%V~OOV-uVHD!hA@+qy$y~{_>w|VA$s4-w+Db>KR{ux+Pu)va
z-*_Mj<j{di!DSR~Q?<VRYD8_k!{1CKWfXh{m~^vhkGL|lAJ_++P8}U{NCVJQQXN;q
zwvMkUle9N<!4eksgW|ucRE3G|>a8-d{3QGhWk900%<?P(*E=#Cj>87$p?AvZ)b)06
zjz0M7mlZrLOLF@)tg1sXRl#aSOtM#Utu3hvl=WTL&XCat=Z3<FJRzT1-pdlV?GP4)
z-|D$5Ofd7c6{sf;lEKtn-zh0u4u_{mnweYWFKL-8H>)7fXVIrABuVsx7YYWZ<%ET=
zzx)WU%@ViQ!)#U0nkJocT1>$zJL21Lb#au=bl~rIh>vr@J(p7ttr<M_I0Yp|4i(xd
z%E??Fy^11K!hAlf9hPj0TmWAZiA#Whc&35c7)k99&|gZ_9f?cu(Wwx!04WP-lrUL;
z7@W1@<nHV<I)pMRFFB-?HQE!^KK`i{KIImyBdm+kMss@JX#SqRFJyV#^B{r|cy5F0
zj9AC~vOO(o^*qO|JQsKz+OM=&$y!Y=VFP)MsrDjJ3eS|G|DIz6My*bokJR_w_H26=
z>>V4CJXk}~wxX=roUV#wLd+8V1NC048&w;Uk>{5W)XmEAXQdFeh5s0}_~;PABDTki
z68#oN@4@Z@{Ronz=8t~UW-d1E33?&_A}evAb&0*iLo((rgLhRClIPS{o=TuiLE>03
zQY)Ah_^B7!SKj0!EWe)t;T{G_5l1d+dT8*4a%_68qU(dI6zcMRRLWF0s}WyAjqZfo
z@U_{(`U6y(8k}HqIoi;3;k-wi%VDzDRYzx0zNF*JDf<MzWJ3NxYwG`@f#5%>c#Hjk
z6}o&p6YYC{E`Ogh1br=&B_9SqwiQtYMuJ^yPzADGh5|?D*QE8h_zf;;`Yt#I><i2x
zE~&(1y>2?H^snCqeQIB9?auDKd7^Y=QA{?kBUk5c%ECljD6)urxpSvb_{*vg$3;V&
z78WL)=?p%z@#df*2jxLkeaL8TEpHO8Pm+%|!46!w>^EoGZ@Oau6F_Ks0OmsNJu8i5
zxOARaiK9OKXhAY_vjMmN&`r+axbXgDQ9T#8h25Q45LIIM!wFUncleMi#7pBqc_(r!
zt0r(H6yJVS6=aN0C-hv{E`^AwX#hq8X$3+pn@~B0%t8_*6&*Qx{?Y42V~1}Cx7W@c
zPdU{?SlUpNo<!nt0u1W<rs?obOx-k=Z|?-32P=rhXJGu;uo|gjl81|{==4o_Y$$M&
zt3gywLHe^mK^Q;n>(>-Er0>Cq*Rj4Rs`%C2LXr+6c$JBL=3OKxXdn|Q=Y!!)6`e?-
zU85}JDMzNftDo8sZg<F=n0w#8I2rKa>8sq(lzc789AmIR=$oYQ8_FgGTz_O%=nEbT
zTpy1^OrSldZ<0p(@h!DG2WaMQ3S#A!+_}k|gP#75Uy?jj1!J+`3nB2CRFPH)<Tie9
zqiz1swsuZD9fA8$%68IT1QpA9ubf9dL|J38C?$qZs15N^2^3mwuF^K_SsjogVC8l+
zh>1ri7-dtlh`z*V4X&*+Vh-L=E#|!Cm5JcC^AMuhDqKWw^H7ox2w5zJ1kKls)ldGu
z7tjf^vTa?abN1DLUM=BcQ;H|y<8ow5w|!o(xiTaQGPoy|*IH+d=_GG%Av^F&kE{dg
zfF1YEUG?y{X`{#vQ`P)Mt@|Q&@00y~L@Y~`(@YUnIg9T3#S@4uZzhj-+iUC%_m&WG
zYzvi8LKTCq$V@_h{d3NlTRe?L+&-0f@j!-cA)mQ?ko2(ev6M!?g=7<ItIEovX~R~N
zW~^FoBVy#3PFJ=i#$2x?lCe2UW?;?rm(xtOIl^9MN#%*iiOK9hC4F@?B~>np7d6_+
z?UXOm@Szc<5ZY&FyN_@8R25n69zOxwM7ss799W!XyVNne6nM`p;_IXpu}3DQA4%So
z%NHPeWUks%aIiWpI@eC&VWLWMn$sGn?OLD7Ii<ky5QQAqB?c<@CYm_!*%1IPhLSu=
z_ac+a()vQtzDnfxx=#*T*`WDImCyTCp>S5~uBXN0)9Pzbu0Di+o(11yHq(6bWlT${
zR9drau*jgv(j^BJ>(*0AU?B;lN|nV5*_3k|Krhhv9Pb=V^dnLg_x2GZ{XB+WA?Al1
zUz%_m25>b}dC^_kC9?fqr}p<?Lx=R0G!>S4!{<WVmr`fqaip2~Rj=`!G}+m}d?$|A
zC#snJ<M|D~2@f6h`}N@}GZK#+BJ#{?sK*mG7Z8y2k7^3clguu69(l95DB(}m%^&!p
z_Bra+1POk3HX(#KSikp*FpJqwU63I{cRqNhyI%s>(<W-FB=MnkXo$a9z8|{_Lo}M*
zzcf+8d!AP@5Zry+>ZEyT+Q+XpHyb=ssyb_bp#baL{Lp0lxb?WSgIZvp?tlE}*AURh
zX(1_q3vr4On>c9ZL=r~=TO<a~zE58K4HT;sm1r2$OJfc-&eVQscV;Wph-xmctKk2{
z%*-j$j`+O&OsCkHbg0bTK{f|-ld)L)GpA9SzBRdqP@CcWYloNC2b-@~;RcDjc1%Ah
zzD-UFzbY!3UU}Q82UY{48MCxx)O^n@Hw0?|jFhz5%cs-VZ?E1B)Fb$G<dGpdZTqFy
zf&+_Hi^;xI@XcxEKHOE%@R2t^PW=!Y6LLNg;7n*Fhjh3O3ttu)n}h;E+s(Y{+$ipg
ze>FRycr-?_Y*B-ZQ?G9U1)X&#W-dS(x_uX)t75op_NI05cp91=3Iyu*e0|8m-{$_i
zLXy`mgBh`X({}J^ruZsQPJ{H=k>p}&^AaWP?bMa|i(BuSYEH;%_7t?!VHg+1*wKf$
z_+CwBydk->*h0pml&HHCw34l(zs`((CY1c*8(d6@<xikhuI;aL%pGH;t~lw0jev#`
zI^?XdYr0q$MLgWM0t!r{k&62-ci*Gr$lbGaY><c(CD53cKaFSbCXC?{(XUUK;qChP
zGsF!`CMZVK)Q3RTstP&O*iR+zA%yck!(E&eA>3ysX2vNw%e=upPaEReJZo$7CDyV&
zK9LDogJc7ap`ko0eS^MW{aiKZR?bxD@ZRZ=-Bt*F+fQcQ%(PzryDVyv-CbGzm=SOr
z<!<7u_Y8Y%!R?N_l=w!bQ(uVL%W`av8|9`SWJ^u2K<YNQX5IKp&mwr(ev}e<yw8nj
z>}ubPU#Ugt`0IJ@CBj+2dBa?_Dl6Zk(yzOA-_C4t7_fOX5d6r&GM|Tjor26x+;7RU
zkB)SG=oMUSsmg~akien7;3}A8u8|wXBF2cwwoy&Jm?*7_4N=A(KiN(`MQxb86YFIV
zuXU3@fuACGLy(ss&h^5GJ3d$KBq)UL71h!aDH(yZy9UnMhx^WAk%o4arP*|MqsMl~
zUzS2h-nEA}m(dSyTQ@D<&sIMzZ+vCjVin7txIkexK0hv;y=gIUfV(<irJ^@Up=AJf
z!Xk9AQJ6cx15)12q{B}mK#0&@%aiCN!@oq=`r|NPRM0ph<)lRQd$LnV9y2)g7zynp
z2xqDz5!eB+YB!v0c*@I8tm2BAvh5E|N$8dXd|R>F>Wu|daf4LyCK9hld`LS1IP8d9
zpNT_!RWF`6M=hhV0r#Flhj|;v&*In(aQe^<CJXVJeJyPnKlmo`nG3Z#15L>&xB878
zdo9k$nfu?&U4U#&6VS$|x%Q#B+xupd701TtP<57WPX$-EGFLdoBNipk;uk|eLxuap
zw6qR#$TE5nD*q$;TM3-rPqW&{T)#&?gw3lElx~;*wJ5Q=AOD}{Pi6r%kYBfz@o#&b
zls>gSs^(H*LV%RHk8SboQ(OGrxg24X6brrE?R0ZSv)B@sjwJ^5CuUw*HgEHl&u>lB
zRxwy#zswYMKHB>5wUz6Qm+wz{vG;WJBL<PU_tP$4Vdgy|uOO^^RJrG~l=j&ZU#=v6
znC@`&VOWycqO--FW{=Lk<<*)SXK3bl@aintl;5jYAFxpPIMsoFdf3$J!%MFoSX1I?
zBDwNOvSUW*?6?2pxYd-`>c3p|Kr54(=fc}LV&!tPxU*b&SN^ztX!e{-Qd;wqx)+DJ
zNfxj0lK3$%J@5Da{L|Oc<D8oN<?Z(|+x-1q^IH~_-$Cs`5LIZsqdw~A)hFLM)wRC{
zAKG3X|Id*Bm={9Hk+l!@82$P8?zDORwiEA#cU3db3u~5t_~kC=$9!-R3N`A8_Mw?y
z>MZL2G<^B6*S&_j&HT9V#qjxdwZC4^<oVAk_`jsDs{Gs^QH04ZN*|pfIN$#j=diD@
ntNC$W{@uGeo8l|{%9Zu3mRy{l%p^2FG5~?6tDnm{r-UW|4~^$$

literal 0
HcmV?d00001

diff --git a/apps/meteor/server/settings/accounts.ts b/apps/meteor/server/settings/accounts.ts
index b4da1cd913e9..81166af5c200 100644
--- a/apps/meteor/server/settings/accounts.ts
+++ b/apps/meteor/server/settings/accounts.ts
@@ -743,6 +743,11 @@ export const createAccountSettings = () =>
 				i18nLabel: 'Sidebar_Sections_Order',
 				i18nDescription: 'Sidebar_Sections_Order_Description',
 			});
+
+			await this.add('Accounts_Default_User_Preferences_featuresPreview', '[]', {
+				type: 'string',
+				public: true,
+			});
 		});
 
 		await this.section('Avatar', async function () {
diff --git a/apps/meteor/tests/end-to-end/api/miscellaneous.ts b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
index b8341f7c0994..d933f1f3c4b3 100644
--- a/apps/meteor/tests/end-to-end/api/miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
@@ -186,6 +186,7 @@ describe('miscellaneous', () => {
 					'muteFocusedConversations',
 					'notifyCalendarEvents',
 					'enableMobileRinging',
+					'featuresPreview',
 				].filter((p) => Boolean(p));
 
 				expect(res.body).to.have.property('success', true);
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 0e99c1bdc1d8..47d2034e002e 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -85,6 +85,7 @@
   "Accounts_AllowEmailChange": "Allow Email Change",
   "Accounts_AllowEmailNotifications": "Allow Email Notifications",
   "Accounts_AllowFeaturePreview": "Allow Feature Preview",
+  "Accounts_AllowFeaturePreview_Description": "Make feature preview available to all workspace members.",
   "Accounts_AllowPasswordChange": "Allow Password Change",
   "Accounts_AllowPasswordChangeForOAuthUsers": "Allow Password Change for OAuth Users",
   "Accounts_AllowRealNameChange": "Allow Name Change",
@@ -1125,8 +1126,8 @@
   "Common_Access": "Common Access",
   "Commit": "Commit",
   "Community": "Community",
-  "Contextualbar_resizable": "Contextual bar resizable",
-  "Contextualbar_resizable_description": "Allows you to adjust the size of the contextual bar by simply dragging, giving you instant customization and flexibility",
+  "Contextualbar_resizable": "Resizable contextual bar",
+  "Contextualbar_resizable_description": "Adjust the size of the contextual bar by clicking and dragging the edge, giving you instant customization and flexibility.",
   "Free_Edition": "Free edition",
   "Composer_not_available_phone_calls": "Messages are not available on phone calls",
   "Condensed": "Condensed",
@@ -1949,8 +1950,8 @@
   "Enable_Password_History": "Enable Password History",
   "Enable_Password_History_Description": "When enabled, users won't be able to update their passwords to some of their most recently used passwords.",
   "Enable_Svg_Favicon": "Enable SVG favicon",
-  "Enable_timestamp": "Enable timestamp parsing in messages",
-  "Enable_timestamp_description": "Enable timestamps to be parsed in messages",
+  "Enable_timestamp": "Timestamp in messages",
+  "Enable_timestamp_description": "Render Unix timestamps inside messages in your local (system) timezone.",
   "Enable_to_bypass_email_verification": "Enable to bypass email verification",
   "Enable_two-factor_authentication": "Enable two-factor authentication via TOTP",
   "Enable_two-factor_authentication_email": "Enable two-factor authentication via Email",
@@ -2284,7 +2285,10 @@
   "Favorite_Rooms": "Enable Favorite Rooms",
   "Favorites": "Favorites",
   "Feature_preview": "Feature preview",
-  "Feature_preview_page_description": "Welcome to the features preview page! Here, you can enable the latest cutting-edge features that are currently under development and not yet officially released.\n\nPlease note that these configurations are still in the testing phase and may not be stable or fully functional.",
+  "Feature_preview_page_description": "Enable the latest features that are currently under development.",
+  "Feature_preview_page_callout": "Feature previews are being tested and may not be stable or fully functional. Features may become premium capabilities once officially released.",
+  "Feature_preview_admin_page_description": "Choose what feature previews to make available to workspace members.",
+  "Feature_preview_admin_page_callout": "Features enabled here will be enabled to each user in their feature preview preferences.",
   "featured": "featured",
   "Featured": "Featured",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "This feature depends on the above selected call provider to be enabled from the administration settings (Admin -> Video Conference).",
@@ -4364,7 +4368,7 @@
   "Queue_Time": "Queue Time",
   "Queue_management": "Queue Management",
   "Quick_reactions": "Quick reactions",
-  "Quick_reactions_description": "The three most used reactions get an easy access while your mouse is over the message",
+  "Quick_reactions_description": "Easily access your most used and most recent emoji message reactions by hovering on a message.",
   "quote": "quote",
   "Quote": "Quote",
   "Random": "Random",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 090e081e83fa..3110d6e82a67 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -2169,7 +2169,6 @@
   "Favorite_Rooms": "पसंदीदा कमरे सक्षम करें",
   "Favorites": "पसंदीदा",
   "Feature_preview": "फ़ीचर पूर्वावलोकन",
-  "Feature_preview_page_description": "फीचर पूर्वावलोकन पृष्ठ पर आपका स्वागत है! यहां, आप नवीनतम अत्याधुनिक सुविधाओं को सक्षम कर सकते हैं जो वर्तमान में विकास के अधीन हैं और अभी तक आधिकारिक तौर पर जारी नहीं की गई हैं।\n\nकृपया ध्यान दें कि ये कॉन्फ़िगरेशन अभी भी परीक्षण चरण में हैं और स्थिर या पूरी तरह कार्यात्मक नहीं हो सकते हैं।",
   "featured": "प्रदर्शित",
   "Featured": "प्रदर्शित",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "यह सुविधा प्रशासन सेटिंग्स (एडमिन -> वीडियो कॉन्फ्रेंस) से सक्षम होने के लिए उपरोक्त चयनित कॉल प्रदाता पर निर्भर करती है।",
@@ -4128,7 +4127,6 @@
   "Queue_Time": "कतार समय",
   "Queue_management": "कतार प्रबंधन",
   "Quick_reactions": "त्वरित प्रतिक्रियाएँ",
-  "Quick_reactions_description": "जब आपका माउस संदेश पर होता है तो सबसे अधिक उपयोग की जाने वाली तीन प्रतिक्रियाओं तक आसान पहुंच मिलती है",
   "quote": "उद्धरण",
   "Quote": "उद्धरण",
   "Random": "Random",
@@ -4987,7 +4985,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> यह करने में सक्षम होगा:",
   "The_channel_name_is_required": "चैनल का नाम आवश्यक है",
   "The_emails_are_being_sent": "ईमेल भेजे जा रहे हैं.",
-  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",   
+  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "छवि का आकार बदलना काम नहीं करेगा क्योंकि हम आपके सर्वर पर स्थापित ImageMagick या ग्राफ़िक्सMagick का पता नहीं लगा सकते हैं।",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "संदेश एक चर्चा है आप संदेशों को पुनर्प्राप्त नहीं कर पाएंगे!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "मोबाइल सूचनाएं सभी उपयोगकर्ताओं के लिए अक्षम कर दी गई थीं, पुश गेटवे को फिर से सक्षम करने के लिए \"एडमिन > पुश\" पर जाएं",
@@ -6134,4 +6132,4 @@
   "Unlimited_seats": "असीमित सीटें",
   "Unlimited_MACs": "असीमित एमएसी",
   "Unlimited_seats_MACs": "असीमित सीटें और एमएसी"
-}
\ No newline at end of file
+}
diff --git a/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
new file mode 100644
index 000000000000..eece30cc7280
--- /dev/null
+++ b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
@@ -0,0 +1,21 @@
+import { Badge } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+
+import { usePreferenceFeaturePreviewList } from '../../hooks/usePreferenceFeaturePreviewList';
+
+const FeaturePreviewBadge = () => {
+	const t = useTranslation();
+	const { unseenFeatures } = usePreferenceFeaturePreviewList();
+
+	if (!unseenFeatures) {
+		return null;
+	}
+
+	return (
+		<Badge variant='primary' aria-label={t('Unseen_features')}>
+			{unseenFeatures}
+		</Badge>
+	);
+};
+
+export default FeaturePreviewBadge;
diff --git a/packages/ui-client/src/components/FeaturePreview/index.ts b/packages/ui-client/src/components/FeaturePreview/index.ts
new file mode 100644
index 000000000000..f6b8e5f2071e
--- /dev/null
+++ b/packages/ui-client/src/components/FeaturePreview/index.ts
@@ -0,0 +1,2 @@
+export { FeaturePreview, FeaturePreviewOn, FeaturePreviewOff } from './FeaturePreview';
+export { default as FeaturePreviewBadge } from './FeaturePreviewBadge';
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index 8642983229aa..7308c8e75431 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -11,7 +11,7 @@ export * as UserStatus from './UserStatus';
 export * from './Header';
 export * from './HeaderV2';
 export * from './MultiSelectCustom/MultiSelectCustom';
-export * from './FeaturePreview/FeaturePreview';
+export * from './FeaturePreview';
 export * from './RoomBanner';
 export { default as UserAutoComplete } from './UserAutoComplete';
 export * from './GenericMenu';
diff --git a/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
new file mode 100644
index 000000000000..373862379cc1
--- /dev/null
+++ b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
@@ -0,0 +1,12 @@
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
+
+export const useDefaultSettingFeaturePreviewList = () => {
+	const featurePreviewSettingJSON = useSetting<string>('Accounts_Default_User_Preferences_featuresPreview');
+
+	const settingFeaturePreview = useMemo(() => parseSetting(featurePreviewSettingJSON), [featurePreviewSettingJSON]);
+
+	return useFeaturePreviewList(settingFeaturePreview ?? []);
+};
diff --git a/packages/ui-client/src/hooks/useFeaturePreview.ts b/packages/ui-client/src/hooks/useFeaturePreview.ts
index 4bdda9c9251a..bd46adfdefff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreview.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreview.ts
@@ -1,7 +1,8 @@
-import { type FeaturesAvailable, useFeaturePreviewList } from './useFeaturePreviewList';
+import { type FeaturesAvailable } from './useFeaturePreviewList';
+import { usePreferenceFeaturePreviewList } from './usePreferenceFeaturePreviewList';
 
 export const useFeaturePreview = (featureName: FeaturesAvailable) => {
-	const { features } = useFeaturePreviewList();
+	const { features } = usePreferenceFeaturePreviewList();
 
 	const currentFeature = features?.find((feature) => feature.name === featureName);
 
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index ff103a8d84ef..08bda4ff81ff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -1,5 +1,4 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
 
 export type FeaturesAvailable =
 	| 'quickReactions'
@@ -24,6 +23,7 @@ export type FeaturePreviewProps = {
 	};
 };
 
+// TODO: Move the features preview array to another directory to be accessed from both BE and FE.
 export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 	{
 		name: 'quickReactions',
@@ -47,6 +47,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'Enable_timestamp',
 		description: 'Enable_timestamp_description',
 		group: 'Message',
+		imageUrl: 'images/featurePreview/timestamp.png',
 		value: false,
 		enabled: true,
 	},
@@ -55,6 +56,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'Contextualbar_resizable',
 		description: 'Contextualbar_resizable_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/resizable-contextual-bar.png',
 		value: false,
 		enabled: true,
 	},
@@ -63,6 +65,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'New_navigation',
 		description: 'New_navigation_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/enhanced-navigation.png',
 		value: false,
 		enabled: true,
 	},
@@ -82,22 +85,27 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 
 export const enabledDefaultFeatures = defaultFeaturesPreview.filter((feature) => feature.enabled);
 
-export const useFeaturePreviewList = () => {
-	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
-	const userFeaturesPreview = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
-
-	if (!featurePreviewEnabled) {
-		return { unseenFeatures: 0, features: [] as FeaturePreviewProps[], featurePreviewEnabled };
+// TODO: Remove this logic after we have a way to store object settings.
+export const parseSetting = (setting?: FeaturePreviewProps[] | string) => {
+	if (typeof setting === 'string') {
+		try {
+			return JSON.parse(setting) as FeaturePreviewProps[];
+		} catch (_) {
+			return;
+		}
 	}
+	return setting;
+};
 
+export const useFeaturePreviewList = (featuresList: Pick<FeaturePreviewProps, 'name' | 'value'>[]) => {
 	const unseenFeatures = enabledDefaultFeatures.filter(
-		(feature) => !userFeaturesPreview?.find((userFeature) => userFeature.name === feature.name),
+		(defaultFeature) => !featuresList?.find((feature) => feature.name === defaultFeature.name),
 	).length;
 
-	const mergedFeatures = enabledDefaultFeatures.map((feature) => {
-		const userFeature = userFeaturesPreview?.find((userFeature) => userFeature.name === feature.name);
-		return { ...feature, ...userFeature };
+	const mergedFeatures = enabledDefaultFeatures.map((defaultFeature) => {
+		const features = featuresList?.find((feature) => feature.name === defaultFeature.name);
+		return { ...defaultFeature, ...features };
 	});
 
-	return { unseenFeatures, features: mergedFeatures, featurePreviewEnabled };
+	return { unseenFeatures, features: mergedFeatures };
 };
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
similarity index 79%
rename from packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx
rename to packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
index e348cfb6a864..ac3d6f92d51a 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
@@ -1,10 +1,11 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { renderHook } from '@testing-library/react';
 
-import { useFeaturePreviewList, enabledDefaultFeatures } from './useFeaturePreviewList';
+import { enabledDefaultFeatures } from './useFeaturePreviewList';
+import { usePreferenceFeaturePreviewList } from './usePreferenceFeaturePreviewList';
 
 it('should return the number of unseen features and Accounts_AllowFeaturePreview enabled ', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', true).build(),
 	});
@@ -18,7 +19,7 @@ it('should return the number of unseen features and Accounts_AllowFeaturePreview
 });
 
 it('should return the number of unseen features and Accounts_AllowFeaturePreview disabled ', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', false).build(),
 	});
@@ -32,7 +33,7 @@ it('should return the number of unseen features and Accounts_AllowFeaturePreview
 });
 
 it('should return 0 unseen features', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
@@ -49,7 +50,7 @@ it('should return 0 unseen features', () => {
 });
 
 it('should ignore removed feature previews', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
@@ -72,7 +73,7 @@ it('should ignore removed feature previews', () => {
 });
 
 it('should turn off ignored feature previews', async () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
diff --git a/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
new file mode 100644
index 000000000000..d7c4c13417d2
--- /dev/null
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
@@ -0,0 +1,16 @@
+import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { FeaturePreviewProps, parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
+
+export const usePreferenceFeaturePreviewList = () => {
+	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
+	const userFeaturesPreviewPreference = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
+	const userFeaturesPreview = useMemo(() => parseSetting(userFeaturesPreviewPreference), [userFeaturesPreviewPreference]);
+	const { unseenFeatures, features } = useFeaturePreviewList(userFeaturesPreview ?? []);
+
+	if (!featurePreviewEnabled) {
+		return { unseenFeatures: 0, features: [] as FeaturePreviewProps[], featurePreviewEnabled };
+	}
+	return { unseenFeatures, features, featurePreviewEnabled };
+};
diff --git a/packages/ui-client/src/index.ts b/packages/ui-client/src/index.ts
index 3e640343da5b..a96ef265aadc 100644
--- a/packages/ui-client/src/index.ts
+++ b/packages/ui-client/src/index.ts
@@ -1,5 +1,7 @@
 export * from './components';
 export * from './hooks/useFeaturePreview';
+export * from './hooks/useDefaultSettingFeaturePreviewList';
 export * from './hooks/useFeaturePreviewList';
+export * from './hooks/usePreferenceFeaturePreviewList';
 export * from './hooks/useDocumentTitle';
 export * from './helpers';

From a4fcd99e3006f28abb0b3f06985809b447365fc4 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 24 Sep 2024 12:45:44 -0300
Subject: [PATCH 109/170] chore: move common files to core-services (#33341)

---
 _templates/service/new/service.ejs.t               |  8 ++------
 ee/apps/account-service/src/service.ts             |  8 ++------
 ee/apps/authorization-service/src/service.ts       |  8 ++------
 ee/apps/ddp-streamer/src/service.ts                |  8 ++------
 ee/apps/omnichannel-transcript/src/service.ts      |  8 ++------
 ee/apps/presence-service/src/service.ts            |  8 ++------
 ee/apps/queue-worker/src/service.ts                |  8 ++------
 ee/apps/stream-hub-service/src/service.ts          |  8 ++------
 packages/core-services/src/index.ts                |  2 ++
 .../core-services/src/lib}/mongo.ts                | 14 ++------------
 10 files changed, 20 insertions(+), 60 deletions(-)
 rename {apps/meteor/ee/server/services => packages/core-services/src/lib}/mongo.ts (72%)

diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
index 77f02d2b7769..699539365259 100644
--- a/_templates/service/new/service.ejs.t
+++ b/_templates/service/new/service.ejs.t
@@ -1,12 +1,10 @@
 ---
 to: ee/apps/<%= name %>/src/service.ts
 ---
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
 const PORT = process.env.PORT || <%= h.random() %>;
@@ -14,9 +12,7 @@ const PORT = process.env.PORT || <%= h.random() %>;
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
index 07ca30ed748f..c2f64e37bde3 100755
--- a/ee/apps/account-service/src/service.ts
+++ b/ee/apps/account-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3033;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
index 4dcd466afa60..1698ef7a115c 100755
--- a/ee/apps/authorization-service/src/service.ts
+++ b/ee/apps/authorization-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3034;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
index 07666a265dbe..58552240cadd 100755
--- a/ee/apps/ddp-streamer/src/service.ts
+++ b/ee/apps/ddp-streamer/src/service.ts
@@ -1,16 +1,12 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
index 66456456fb74..ad60687d5ba4 100644
--- a/ee/apps/omnichannel-transcript/src/service.ts
+++ b/ee/apps/omnichannel-transcript/src/service.ts
@@ -1,20 +1,16 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3036;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
index 0e1c97f2daa2..0c51c30dc577 100755
--- a/ee/apps/presence-service/src/service.ts
+++ b/ee/apps/presence-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3031;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
index 4bc6c9642913..c11376d56534 100644
--- a/ee/apps/queue-worker/src/service.ts
+++ b/ee/apps/queue-worker/src/service.ts
@@ -1,20 +1,16 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3038;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index eade703321d2..5e035548dc38 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -1,11 +1,9 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { StreamHub } from './StreamHub';
 
@@ -14,9 +12,7 @@ const PORT = process.env.PORT || 3035;
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
index 8eea19ea7405..85722c98839f 100644
--- a/packages/core-services/src/index.ts
+++ b/packages/core-services/src/index.ts
@@ -75,6 +75,8 @@ export {
 	AnalyticsOverviewDataResult,
 } from './types/IOmnichannelAnalyticsService';
 
+export { getConnection, getTrashCollection } from './lib/mongo';
+
 export {
 	AutoUpdateRecord,
 	FindVoipRoomsParams,
diff --git a/apps/meteor/ee/server/services/mongo.ts b/packages/core-services/src/lib/mongo.ts
similarity index 72%
rename from apps/meteor/ee/server/services/mongo.ts
rename to packages/core-services/src/lib/mongo.ts
index 27e9e931c039..fab1fd108d99 100644
--- a/apps/meteor/ee/server/services/mongo.ts
+++ b/packages/core-services/src/lib/mongo.ts
@@ -5,16 +5,6 @@ const { MONGO_URL = 'mongodb://localhost:27017/rocketchat' } = process.env;
 
 const name = /^mongodb:\/\/.*?(?::[0-9]+)?\/([^?]*)/.exec(MONGO_URL)?.[1];
 
-export enum Collections {
-	Subscriptions = 'rocketchat_subscription',
-	UserSession = 'usersSessions',
-	User = 'users',
-	Trash = 'rocketchat__trash',
-	Messages = 'rocketchat_message',
-	Rooms = 'rocketchat_room',
-	Settings = 'rocketchat_settings',
-}
-
 function connectDb(options?: MongoClientOptions): Promise<MongoClient> {
 	const client = new MongoClient(MONGO_URL, options);
 
@@ -44,9 +34,9 @@ export const getConnection = ((): ((options?: MongoClientOptions) => Promise<Db>
 	};
 })();
 
-export async function getCollection<T extends Document>(name: Collections): Promise<Collection<T>> {
+export async function getTrashCollection<T extends Document>(): Promise<Collection<T>> {
 	if (!db) {
 		db = await getConnection();
 	}
-	return db.collection<T>(name);
+	return db.collection<T>('rocketchat__trash');
 }

From d94a159126a757d156496f8ab2ce95f09ea45ff1 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 24 Sep 2024 12:50:10 -0300
Subject: [PATCH 110/170] regression: `Sidepanel` color highlight (#33342)

---
 apps/meteor/package.json              |  2 +-
 apps/uikit-playground/package.json    |  2 +-
 ee/packages/ui-theming/package.json   |  2 +-
 packages/fuselage-ui-kit/package.json |  2 +-
 packages/gazzodown/package.json       |  2 +-
 packages/ui-avatar/package.json       |  2 +-
 packages/ui-client/package.json       |  2 +-
 packages/ui-composer/package.json     |  2 +-
 packages/ui-video-conf/package.json   |  2 +-
 yarn.lock                             | 50 +++++++++++++--------------
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index a09dcb657466..a30ce30a7b6f 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -241,7 +241,7 @@
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
 		"@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 48c099b8d9d1..c5e7628001c6 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -17,7 +17,7 @@
     "@lezer/highlight": "^1.1.6",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/css-in-js": "~0.31.25",
-    "@rocket.chat/fuselage": "^0.59.0",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 0548f235c3fd..29fe229ca532 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 8fb0ca254d68..573d65dc215e 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -66,7 +66,7 @@
     "@rocket.chat/apps-engine": "1.45.0-alpha.868",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.59.0",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/icons": "~0.38.0",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 47bf2782226e..a5883bbe3c0f 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -28,7 +28,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index a32a7a8be6bf..70f0efe2cff9 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 82705ba026cb..40bccd8ca628 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -21,7 +21,7 @@
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 363299698bfa..c43f3485880e 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -19,7 +19,7 @@
     "@babel/core": "~7.22.20",
     "@react-aria/toolbar": "^3.0.0-beta.1",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.59.0",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/icons": "~0.38.0",
     "@storybook/addon-actions": "~6.5.16",
     "@storybook/addon-docs": "~6.5.16",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 0f1f3e50eab8..74c3ec43bcbb 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index c0fb2733310e..20c005cca203 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8910,7 +8910,7 @@ __metadata:
     "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/gazzodown": "workspace:^"
@@ -8959,19 +8959,19 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-avatar": 7.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.0
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": "*"
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.0
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.59.0":
-  version: 0.59.0
-  resolution: "@rocket.chat/fuselage@npm:0.59.0"
+"@rocket.chat/fuselage@npm:^0.59.1":
+  version: 0.59.1
+  resolution: "@rocket.chat/fuselage@npm:0.59.1"
   dependencies:
     "@rocket.chat/css-in-js": ^0.31.25
     "@rocket.chat/css-supports": ^0.31.25
@@ -8989,7 +8989,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: 259dce5381a3c3e0d7c7f3dc7ab51346cb65a9f4906a5ca5d6a976627d05e01e7f8a3a940604d0ad1b2b4ed89c250a871ef3fb253f6bbb69d35bc931e193898d
+  checksum: 6ecceaefe8b2c6b9fe0ba3b6e19360f5d46af9697e7c97af16cce6c9eea2cb79255f38ccffdbc4766b4104c079281b4980fe7c924cd62fe5d2d341581fdf4f62
   languageName: node
   linkType: hard
 
@@ -9000,7 +9000,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -9047,10 +9047,10 @@ __metadata:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-tokens": "*"
-    "@rocket.chat/message-parser": 0.31.29
+    "@rocket.chat/message-parser": 0.31.30-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-client": 11.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.0
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9372,7 +9372,7 @@ __metadata:
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -10244,7 +10244,7 @@ __metadata:
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/ui-contexts": "workspace:^"
     "@types/react": ~17.0.80
     "@types/react-dom": ~17.0.25
@@ -10257,7 +10257,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-contexts": 11.0.0-rc.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10269,7 +10269,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10308,8 +10308,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-avatar": 7.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.0
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10322,7 +10322,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/icons": ~0.38.0
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10416,7 +10416,7 @@ __metadata:
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10446,7 +10446,7 @@ __metadata:
     "@rocket.chat/css-in-js": ~0.31.25
     "@rocket.chat/emitter": ~0.31.25
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10478,8 +10478,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-avatar": 7.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.0
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10495,7 +10495,7 @@ __metadata:
     "@lezer/highlight": ^1.1.6
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -10567,7 +10567,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-contexts": 11.0.0-rc.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 2f9eea03d2122e963bc89559e772bf00a54ad200 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Tue, 24 Sep 2024 09:54:31 -0300
Subject: [PATCH 111/170] feat: Adds new admin feature preview setting
 management (#33212)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/quick-rings-wave.md                |   7 +
 .../UserMenu/hooks/useAccountItems.tsx        |   4 +-
 .../hooks/useFeaturePreviewEnableQuery.ts     |  28 ++++
 .../sidebar/header/hooks/useAccountItems.tsx  |   4 +-
 .../AccountFeaturePreviewBadge.tsx            |  21 ---
 .../AccountFeaturePreviewPage.tsx             |  44 ++----
 .../client/views/account/sidebarItems.tsx     |   5 +-
 .../AdminFeaturePreviewPage.tsx               | 127 ++++++++++++++++++
 .../AdminFeaturePreviewRoute.tsx              |  26 ++++
 apps/meteor/client/views/admin/routes.tsx     |   9 ++
 .../meteor/client/views/admin/sidebarItems.ts |   8 ++
 .../featurePreview/enhanced-navigation.png    | Bin 0 -> 2372 bytes
 .../resizable-contextual-bar.png              | Bin 0 -> 4776 bytes
 .../images/featurePreview/timestamp.png       | Bin 0 -> 51432 bytes
 apps/meteor/server/settings/accounts.ts       |   5 +
 .../tests/end-to-end/api/miscellaneous.ts     |   1 +
 packages/i18n/src/locales/en.i18n.json        |  16 ++-
 packages/i18n/src/locales/hi-IN.i18n.json     |   6 +-
 .../FeaturePreview/FeaturePreviewBadge.tsx    |  21 +++
 .../src/components/FeaturePreview/index.ts    |   2 +
 packages/ui-client/src/components/index.ts    |   2 +-
 .../useDefaultSettingFeaturePreviewList.ts    |  12 ++
 .../ui-client/src/hooks/useFeaturePreview.ts  |   5 +-
 .../src/hooks/useFeaturePreviewList.ts        |  32 +++--
 ... usePreferenceFeaturePreviewList.spec.tsx} |  13 +-
 .../hooks/usePreferenceFeaturePreviewList.ts  |  16 +++
 packages/ui-client/src/index.ts               |   2 +
 27 files changed, 324 insertions(+), 92 deletions(-)
 create mode 100644 .changeset/quick-rings-wave.md
 create mode 100644 apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
 delete mode 100644 apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
 create mode 100644 apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
 create mode 100644 apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
 create mode 100644 apps/meteor/public/images/featurePreview/enhanced-navigation.png
 create mode 100644 apps/meteor/public/images/featurePreview/resizable-contextual-bar.png
 create mode 100644 apps/meteor/public/images/featurePreview/timestamp.png
 create mode 100644 packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
 create mode 100644 packages/ui-client/src/components/FeaturePreview/index.ts
 create mode 100644 packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
 rename packages/ui-client/src/hooks/{useFeaturePreviewList.spec.tsx => usePreferenceFeaturePreviewList.spec.tsx} (79%)
 create mode 100644 packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts

diff --git a/.changeset/quick-rings-wave.md b/.changeset/quick-rings-wave.md
new file mode 100644
index 000000000000..0ea22897ff45
--- /dev/null
+++ b/.changeset/quick-rings-wave.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+"@rocket.chat/ui-client": minor
+---
+
+Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
index 82c39c5c1b10..e54e2b72d675 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
@@ -1,7 +1,7 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
 
-	const { unseenFeatures, featurePreviewEnabled } = useFeaturePreviewList();
+	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
 
 	const handleMyAccount = useEffectEvent(() => {
 		router.navigate('/account');
diff --git a/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
new file mode 100644
index 000000000000..fd88f0237d29
--- /dev/null
+++ b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
@@ -0,0 +1,28 @@
+import type { FeaturePreviewProps } from '@rocket.chat/ui-client';
+import { useMemo } from 'react';
+
+const handleFeaturePreviewEnableQuery = (item: FeaturePreviewProps, _: any, features: FeaturePreviewProps[]) => {
+	if (item.enableQuery) {
+		const expected = item.enableQuery.value;
+		const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
+		if (expected !== received) {
+			item.disabled = true;
+			item.value = false;
+		} else {
+			item.disabled = false;
+		}
+	}
+	return item;
+};
+
+const groupFeaturePreview = (features: FeaturePreviewProps[]) =>
+	Object.entries(
+		features.reduce((result, currentValue) => {
+			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
+			return result;
+		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
+	);
+
+export const useFeaturePreviewEnableQuery = (features: FeaturePreviewProps[]) => {
+	return useMemo(() => groupFeaturePreview(features.map(handleFeaturePreviewEnableQuery)), [features]);
+};
diff --git a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
index 2be6b2b1dea2..51ab7a198a67 100644
--- a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
@@ -1,7 +1,7 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
 
-	const { unseenFeatures, featurePreviewEnabled } = useFeaturePreviewList();
+	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
 
 	const handleMyAccount = useMutableCallback(() => {
 		router.navigate('/account');
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
deleted file mode 100644
index c109ca1aefb5..000000000000
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Badge } from '@rocket.chat/fuselage';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-const AccountFeaturePreviewBadge = () => {
-	const { t } = useTranslation();
-	const { unseenFeatures } = useFeaturePreviewList();
-
-	if (!unseenFeatures) {
-		return null;
-	}
-
-	return (
-		<Badge variant='primary' aria-label={t('Unseen_features')}>
-			{unseenFeatures}
-		</Badge>
-	);
-};
-
-export default AccountFeaturePreviewBadge;
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
index dd9ab6a90959..358d2394003b 100644
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
+++ b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
@@ -1,4 +1,3 @@
-import { css } from '@rocket.chat/css-in-js';
 import {
 	ButtonGroup,
 	Button,
@@ -13,9 +12,10 @@ import {
 	FieldLabel,
 	FieldRow,
 	FieldHint,
+	Callout,
+	Margins,
 } from '@rocket.chat/fuselage';
-import type { FeaturePreviewProps } from '@rocket.chat/ui-client';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
+import { usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
@@ -23,26 +23,12 @@ import React, { useEffect, Fragment } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { useFeaturePreviewEnableQuery } from '../../../hooks/useFeaturePreviewEnableQuery';
 
-const handleEnableQuery = (features: FeaturePreviewProps[]) => {
-	return features.map((item) => {
-		if (item.enableQuery) {
-			const expected = item.enableQuery.value;
-			const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
-			if (expected !== received) {
-				item.disabled = true;
-				item.value = false;
-			} else {
-				item.disabled = false;
-			}
-		}
-		return item;
-	});
-};
 const AccountFeaturePreviewPage = () => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const { features, unseenFeatures } = useFeaturePreviewList();
+	const { features, unseenFeatures } = usePreferenceFeaturePreviewList();
 
 	const setUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 
@@ -85,12 +71,7 @@ const AccountFeaturePreviewPage = () => {
 		setValue('featuresPreview', updated, { shouldDirty: true });
 	};
 
-	const grouppedFeaturesPreview = Object.entries(
-		handleEnableQuery(featuresPreview).reduce((result, currentValue) => {
-			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
-			return result;
-		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
-	);
+	const grouppedFeaturesPreview = useFeaturePreviewEnableQuery(featuresPreview);
 
 	return (
 		<Page>
@@ -105,14 +86,11 @@ const AccountFeaturePreviewPage = () => {
 					)}
 					{featuresPreview.length > 0 && (
 						<>
-							<Box
-								className={css`
-									white-space: break-spaces;
-								`}
-								pbe={24}
-								fontScale='p1'
-							>
-								{t('Feature_preview_page_description')}
+							<Box>
+								<Margins block={24}>
+									<Box fontScale='p1'>{t('Feature_preview_page_description')}</Box>
+									<Callout>{t('Feature_preview_page_callout')}</Callout>
+								</Margins>
 							</Box>
 							<Accordion>
 								{grouppedFeaturesPreview?.map(([group, features], index) => (
diff --git a/apps/meteor/client/views/account/sidebarItems.tsx b/apps/meteor/client/views/account/sidebarItems.tsx
index ca0376be329d..fa2ab8bd5e40 100644
--- a/apps/meteor/client/views/account/sidebarItems.tsx
+++ b/apps/meteor/client/views/account/sidebarItems.tsx
@@ -1,10 +1,9 @@
-import { defaultFeaturesPreview } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, FeaturePreviewBadge } from '@rocket.chat/ui-client';
 import React from 'react';
 
 import { hasPermission, hasAtLeastOnePermission } from '../../../app/authorization/client';
 import { settings } from '../../../app/settings/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
-import AccountFeaturePreviewBadge from './featurePreview/AccountFeaturePreviewBadge';
 
 export const {
 	registerSidebarItem: registerAccountSidebarItem,
@@ -54,7 +53,7 @@ export const {
 		href: '/account/feature-preview',
 		i18nLabel: 'Feature_preview',
 		icon: 'flask',
-		badge: () => <AccountFeaturePreviewBadge />,
+		badge: () => <FeaturePreviewBadge />,
 		permissionGranted: () => settings.get('Accounts_AllowFeaturePreview') && defaultFeaturesPreview?.length > 0,
 	},
 	{
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
new file mode 100644
index 000000000000..615fd20cf5a6
--- /dev/null
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
@@ -0,0 +1,127 @@
+import {
+	ButtonGroup,
+	Button,
+	Box,
+	ToggleSwitch,
+	Accordion,
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	FieldHint,
+	Callout,
+	Margins,
+} from '@rocket.chat/fuselage';
+import { useDefaultSettingFeaturePreviewList } from '@rocket.chat/ui-client';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useTranslation, useSettingsDispatch } from '@rocket.chat/ui-contexts';
+import type { ChangeEvent } from 'react';
+import React, { Fragment } from 'react';
+import { useForm } from 'react-hook-form';
+
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { useFeaturePreviewEnableQuery } from '../../../hooks/useFeaturePreviewEnableQuery';
+import { useEditableSetting } from '../EditableSettingsContext';
+import Setting from '../settings/Setting';
+import SettingsGroupPageSkeleton from '../settings/SettingsGroupPage/SettingsGroupPageSkeleton';
+
+const AdminFeaturePreviewPage = () => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const allowFeaturePreviewSetting = useEditableSetting('Accounts_AllowFeaturePreview');
+	const { features } = useDefaultSettingFeaturePreviewList();
+
+	const {
+		watch,
+		formState: { isDirty },
+		setValue,
+		handleSubmit,
+		reset,
+	} = useForm({
+		defaultValues: { featuresPreview: features },
+	});
+	const { featuresPreview } = watch();
+	const dispatch = useSettingsDispatch();
+
+	const handleSave = async () => {
+		try {
+			const featuresToBeSaved = featuresPreview.map((feature) => ({ name: feature.name, value: feature.value }));
+
+			await dispatch([
+				{ _id: allowFeaturePreviewSetting!._id, value: allowFeaturePreviewSetting!.value },
+				{ _id: 'Accounts_Default_User_Preferences_featuresPreview', value: JSON.stringify(featuresToBeSaved) },
+			]);
+			dispatchToastMessage({ type: 'success', message: t('Preferences_saved') });
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		} finally {
+			reset({ featuresPreview });
+		}
+	};
+
+	const handleFeatures = (e: ChangeEvent<HTMLInputElement>) => {
+		const updated = featuresPreview.map((item) => (item.name === e.target.name ? { ...item, value: e.target.checked } : item));
+		setValue('featuresPreview', updated, { shouldDirty: true });
+	};
+
+	const grouppedFeaturesPreview = useFeaturePreviewEnableQuery(featuresPreview);
+
+	if (!allowFeaturePreviewSetting) {
+		// TODO: Implement FeaturePreviewSkeleton component
+		return <SettingsGroupPageSkeleton />;
+	}
+
+	return (
+		<Page>
+			<PageHeader title={t('Feature_preview')} />
+			<PageScrollableContentWithShadow>
+				<Box maxWidth='x600' w='full' alignSelf='center'>
+					<Box>
+						<Margins block={24}>
+							<Box fontScale='p1'>{t('Feature_preview_admin_page_description')}</Box>
+							<Callout>{t('Feature_preview_page_callout')}</Callout>
+							<Callout>{t('Feature_preview_admin_page_callout')}</Callout>
+							<Setting settingId='Accounts_AllowFeaturePreview' sectionChanged={allowFeaturePreviewSetting.changed} />
+						</Margins>
+					</Box>
+					<Accordion>
+						{grouppedFeaturesPreview?.map(([group, features], index) => (
+							<Accordion.Item defaultExpanded={index === 0} key={group} title={t(group as TranslationKey)}>
+								<FieldGroup>
+									{features.map((feature) => (
+										<Fragment key={feature.name}>
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={feature.name}>{t(feature.i18n)}</FieldLabel>
+													<ToggleSwitch
+														id={feature.name}
+														checked={feature.value}
+														name={feature.name}
+														onChange={handleFeatures}
+														disabled={feature.disabled || !allowFeaturePreviewSetting.value}
+													/>
+												</FieldRow>
+												{feature.description && <FieldHint mbs={12}>{t(feature.description)}</FieldHint>}
+											</Field>
+											{feature.imageUrl && <Box is='img' width='100%' height='auto' mbs={16} src={feature.imageUrl} alt='' />}
+										</Fragment>
+									))}
+								</FieldGroup>
+							</Accordion.Item>
+						))}
+					</Accordion>
+				</Box>
+			</PageScrollableContentWithShadow>
+			<PageFooter isDirty={isDirty || allowFeaturePreviewSetting.changed}>
+				<ButtonGroup>
+					<Button onClick={() => reset({ featuresPreview: features })}>{t('Cancel')}</Button>
+					<Button primary disabled={!(isDirty || allowFeaturePreviewSetting.changed)} onClick={handleSubmit(handleSave)}>
+						{t('Save_changes')}
+					</Button>
+				</ButtonGroup>
+			</PageFooter>
+		</Page>
+	);
+};
+
+export default AdminFeaturePreviewPage;
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
new file mode 100644
index 000000000000..a7d6bd77d136
--- /dev/null
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
@@ -0,0 +1,26 @@
+import { usePermission } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
+
+import SettingsProvider from '../../../providers/SettingsProvider';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
+import EditableSettingsProvider from '../settings/EditableSettingsProvider';
+import AdminFeaturePreviewPage from './AdminFeaturePreviewPage';
+
+const AdminFeaturePreviewRoute = (): ReactElement => {
+	const canViewFeaturesPreview = usePermission('manage-cloud');
+
+	if (!canViewFeaturesPreview) {
+		return <NotAuthorizedPage />;
+	}
+
+	return (
+		<SettingsProvider privileged>
+			<EditableSettingsProvider>
+				<AdminFeaturePreviewPage />
+			</EditableSettingsProvider>
+		</SettingsProvider>
+	);
+};
+
+export default memo(AdminFeaturePreviewRoute);
diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx
index f70df1625871..d244d5e2f19b 100644
--- a/apps/meteor/client/views/admin/routes.tsx
+++ b/apps/meteor/client/views/admin/routes.tsx
@@ -104,6 +104,10 @@ declare module '@rocket.chat/ui-contexts' {
 			pathname: `/admin/subscription`;
 			pattern: '/admin/subscription';
 		};
+		'admin-feature-preview': {
+			pathname: '/admin/feature-preview';
+			pattern: '/admin/feature-preview';
+		};
 	}
 }
 
@@ -237,3 +241,8 @@ registerAdminRoute('/subscription', {
 	name: 'subscription',
 	component: lazy(() => import('./subscription/SubscriptionRoute')),
 });
+
+registerAdminRoute('/feature-preview', {
+	name: 'admin-feature-preview',
+	component: lazy(() => import('./featurePreview/AdminFeaturePreviewRoute')),
+});
diff --git a/apps/meteor/client/views/admin/sidebarItems.ts b/apps/meteor/client/views/admin/sidebarItems.ts
index 013206d9e9a8..fc7d307396d4 100644
--- a/apps/meteor/client/views/admin/sidebarItems.ts
+++ b/apps/meteor/client/views/admin/sidebarItems.ts
@@ -1,3 +1,5 @@
+import { defaultFeaturesPreview } from '@rocket.chat/ui-client';
+
 import { hasPermission, hasAtLeastOnePermission, hasAllPermission } from '../../../app/authorization/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
 
@@ -129,6 +131,12 @@ export const {
 		icon: 'emoji',
 		permissionGranted: (): boolean => hasPermission('manage-emoji'),
 	},
+	{
+		href: '/admin/feature-preview',
+		i18nLabel: 'Feature_preview',
+		icon: 'flask',
+		permissionGranted: () => defaultFeaturesPreview?.length > 0,
+	},
 	{
 		href: '/admin/settings',
 		i18nLabel: 'Settings',
diff --git a/apps/meteor/public/images/featurePreview/enhanced-navigation.png b/apps/meteor/public/images/featurePreview/enhanced-navigation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4240326ba985d0a054ae5d9c8521b24c8d93e6f7
GIT binary patch
literal 2372
zcmeHIYgCg*8lKz;k(*0VynsLp8%mX01@Ra$34#GB2w8)n2Lz6kXazzALMRv_YP;xG
zVrfx?0*kHdhC)CtVh|D##7hAYg%TP_P1$fufB*?0CfSL{AKkOvo<04szxKyBGw<`h
z^UgExH}gzEL^#D}&89T~0Gp8DKq>$zF&wv8TEKSeq4Rv$;nISm(*aoTVg3*yRQGuZ
zBGRdp08rcKGzASbgB(T%puW)RWda5O%aM>k@?kbYDJ7;mXg7)%7}|_U^u0g_?-vIh
z3PLLno>;U^yRy;Ip#U%U`gz?3Q9dbXM|jd~=gzm4M_kLikKsE!!V_rWmyy}L8oj)=
zS2fb<YGu2XmmyLtmL#0Z$ReIgYI>?Im$rG8QwM!!;_UE8Rx|HP0%OX2>m!4{!$M9@
zmzycKXS|vvx3jAFOuN;#LOx%@xz-bPQB~L4+B$H!?W8hJu;wTX4KMQ=yEwA+byHJQ
z4Srntp0Hr<_>yuo%x4&B_O`IRa^*|1XD(Z^^k)!1hMgXbR43&u9)Lcv`iBcipXe%2
zq_vq)1Omaa`(22J@|`C&yL#jc-3GtCI}p2cuqKsjiPzA?P2zh4jxQVm;07eyMCq?+
zYV8fOwUa-ksVNIq0FcPLSd^mM+Od*DToGaEjy4EpBb~T5rBg*r>d@@<%gYepB7JF0
zqq_ZhTTbt4e99^Fl9eP{muC7SQ?As-T7ZUt1HXW7`egSV>XAs%dT2+~9d#BA(P*)j
z(D0-Wc6F=Xq;Ez*19MWIbzS0osT7X6ozKk>&N3dh)U{&Re&fo8P%s&w0N~{VcrIKq
z2x~}d4RQmV;DFu^gWmrCgjZEc@Ze_b(=Aoh-_d=XJZ8+v)lKA~z%BN~S8<JboQ+I_
zs+X;ssKD|<n+Q&Rh;PzNMnlW8LezzIdASX^w)%~&WNz*hecr(6x8R)xpSlZI485hy
zZfUCt2V?|k;EG^w%)WznE}iREkg9%%gOEi^`|qn5?&fH;a52|eV-2t~oC6&7lnCir
z0l`$mloWt1%=ASTn0Q0X6HEJvc0jfuJaPa$!gJja3L{cnlpRfa&@ls0>6rpYMt?0u
zFkC3)tSau`mnY25=B{g)dM3owSbf=Vw0-aZz2T~fTHkJ@F6pcLmqLRS&;Cv>BWR!I
z+RPN!dq?ck6I|axSa+4|B<B1h&T~r?ZTV$%_P@BMr(JDNe)ug@8Zd-;#K^-YdT`Gu
zs&ZIT;Sfe$Cqflp_BWry-*c>7lNzG$S`NkbWu8%wj3c6P@vb)pL!5@#dmB^TW{?vN
zBGfH=G3iH<==4p-aBGihHuu9{(zqJ-xB51NXv62_%8><?<AsN8pS<MTpJqO$J9<_a
zoO!fYf6hVK`E48q%qLbD^e%`md(r>>T@awGan@0K^3i((iN+xo%#ouHt&I7j7;gA~
zaM|kYft59-NVWnweEfy~obuR!X;>4?FtKhWk9LQc+ATc4!u|H0t|p=C4#)UkIs1b*
zU~l>r;^|xj-Rs_fd+|eK`kzi4=TVAO6y<e|-she<zjwbKAmQHscVSTgn7P<cmQg_j
zPA+f6!;(<9BP`adg%v%IyKI0=2Q9M#L6_~sP5iS<!SwJ;i9qK58vjqql(z0TD85jQ
zLjmHi>`vwsAMd7!IrRlB4EwT%Irr}B_*-~AjVn(;{-)H)yq<^yYV&jM#%$9>QVh%U
z%UJHItG`bwI}ZY}o0&klMYUn~qrAe2#ymoOtW#gr9Dz%HofNmdj`t8&#p7n_pOvuZ
z=F?L2tj|bH_{0E*<e_G!)Tfv6O4h6SEe%h*W?6xA9|5s_TKFDpeJrR87Vw$FML)^*
zD-cl7BW`g-+JQ%R(w}Sm#{V*2xQF8cu=A_edLAcQ0U3|a7V!DHpt>sl4L|c!c+jV`
zeXy-WWIHdBNTLXs_UIBMDy?(d=pS%;{K~$(^7C(zfUTgQC0m#>rkYzG!&0srmo+zP
z%uIJAf4!wl*sSe43silWOG&I~w3z|7=J<^(E=H1Jo*@0}lR+k4a4{Z+7t=?Z<-^16
z#HH**nNR$)va<ZD_<p0MuXq&q<f>bV9KteLt5UV>qWh13{~`%a65CIDvwi8xxILa6
z!t*MO@WlMq>6uJgtPOPTCQBxzspEI!d<QodT8;Z#p;kJo!W#BD*$Nupd-(y4<|wgC
zX|y|PXO4Yy96J{!xIicxS(5KO+wob-^;BZ-F_WF|;<o*ghtuYF8H5Cd2i69}=l>I!
CCsuy|

literal 0
HcmV?d00001

diff --git a/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png b/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36c7e44a29d8c27c9c035a77026f1cd7e7dabd0
GIT binary patch
literal 4776
zcmb_gc|6o>+y4y{3PqAFw469i)`&`jifq|xQrRVB8`*};U@Ub)ksQe`Y7ApZSu&Ox
z6)GY7))=y78T%}Z8PBitzUT9K&->SNp7Z=MGr#-3uj^jE_jP^0*KgviER2MAN$&yx
zK-k3C;4%R4lELS<0({`NlI6W(@Mq^8;~Rkhu>a`K55(m1FUw#jB=EA)d7!N0z%1B+
zdYm&q2LKgGf?F;-0AMfN#NZqv6hfo;Jv`tM&cE!zND54gZ$Tjr8UJp7FxeF9e>=~-
zNczd;?|U6ZGO+R3j65s?Iw<~pHX$#1*wnzw?C>E+k>1!?Q)OT2Rh}c~J?-;xh*DD@
z5&VuPfv<Q=e`j?QYu7k-3~fdRoW1BnO<ZzkZeU)}7jr_GsGRhQ86DEhU7T@YQO~Ro
zcRRgSX5`WOriJM>6;!uDa`!Y;|D_5s9QkRjaLGpz021e>yNWI*E7UP9U*uPKlu$5l
ze~mBdx$8HNP<@t@lk;O=yF-uBG)gm}vQ`FTX2=5oSi1PVK?_BPq3}?*Ii*IA>5n%v
zbWfn2Z0%VeSS;40*OG6^x`g#gc6vG+0n4xqj%>2%a|E&SDoPm@8=~J!AF?cEymsTg
zg9!IX{1QP(Ia9Y692SZ~j-v+Fzbsry_Do~5Q;7QVx)|1Hgr?kFWAI^!+ImZe`h7{@
z<7Wd?nvqU+hh0K`X#Te9Qv~+NQEfZlaS3p1E?Qj;@Lu62F^-=7@DAebv#>32$7(zZ
z#2P$QKDTo&6i`vDH*Gffd5$i%t_F_vl8F?y%}h3Z8H@yM*BiosI8lh4P_(iF1@}}?
zq{PzNEj#Cf+}E7=M~A1;!yU-VR(Iqja9E9a^KglbjG>o(CfIVWY-qIJ*IfOF9qsco
zsP|zA0FZBI-ri@#KF<q2{yOr_7&Lqgfk=XjDG89l#;tPz7;y&$dDOth4G}Ep@-Z3^
z0s#H}P-n2~^+5o1eZ1rExO_DQ)C~4Z=y<yLSJW>BojJyDX#L`1fpMw(8}=y(;Qb50
ztG4g(e21#ii+lH)f6o-y6co%37_uw9=%rOG{I07yaBXcWTt!j*qfypbuNvD_ng%1S
zswfOjww>h>)~7YAPcMAKJRN5mtgR)u*&%|zQM^a8U~`j4t7%8x1g0+hG$#bW$p^tB
zc&WljyR{;5B?77{FJK2sZ+Y5Xbn=<Min-5mQ@dKiFBuC6>6bQF;65*X%HMlHJoVhw
z6)82L1yy>U@X&1#ma6@IPERFLq98z_CBT>0j}WxM`2u5KK=^tyR#3-#w17MA|1nno
zKD<)L<Dpp!Y(XJC@Gef+{9?2|`MgUKV^>2GDvPHBG2q=DbfuxLTun%p7zwTGyA<=9
zB!nyebHtGOAm~b6YDV#ihj{|_k6cGWt<MEikxI<_<{^AtrhtC`cWfmEuI8&ahFDNl
z`-b?hgu-8rSGgB>TxFs7vUX!*wNWgREa0gb-;1oeZ2iKt*DX@2Z)*70VGVg08F*ZA
zN+mNp(=s7Jmf!Q?i^1xoFC8yoT1#hWss%)Q8AJ5+1%MCxP`1?Sl)meFbG2i$N3ZYy
zP7t`h^XCM3EB)QYgZ=YwNe|}&eD~2#Z~og?)Df-6Nzt<yDc^3d3|Shj9A(f(GDo@9
znLYBD^&>k0Y_8`~07mCBDH(F1W8Bph#ys^|#42?=rT<DSmBVJHB^Bau-5e%07XYjv
ze0W48OE^<IH?4nUty3>@YlU~u*~iG*si#l?3kX@Ir@UX9UT-FG>MBPYH$M)1rcwf_
z;mn;)0AK>};Xee7Ye)YOzvg2$uN+Y*A_Uwy0g-gp58g$BpH~COpP<fINU!=9Ljbfl
zOWz^w{K!IxG+w{fVJ6?;`>Jh^Ieh5GDu!JXulYcLtS%E|89R1ose!2gV6*o1XuQdW
zlBMFtWFVo>D8T~`o--ZUMT_o<Uyj;np)7QS&$FMTSW}#~bgYzVr-y^0_^!ur&4h&s
z+_EkJIQ<n|O<0%JwC80wnwitPWAl50s)dBZ*<`+zc14M_v!qS8m~6sUR}Z^qa&q!X
zE^V-)pdJED8UTFP3pz*FYF8WepqA$FT<&y2<kM<jJN7TvB`A%R^Swtx${LRMH-@8o
zKy2SmdWd4s6JR_B<O^z&fx}P|n?gcwZLD=#rbY$&)tssC3LCG9<WU+=6BCbVui(2O
z)yHWj@%DA+&=mk)A$;PY>#V6D@lVOpcW-O*QU4kh*j>HHph>nY<t$StYjJ)rFomk3
z|4gCc5$=iNwkqpN4>=I%_>z6m10y3;)SB_t2!g=fg5r4Cg)Ha6UgS$0${lJb;CW!A
zg>Wj}CXM5UNb@eZ-C6$(Dwua((c)p%-L<=(4RojcV>}zLLeNMpX-^jyb^q5kgp9R8
z|5yEsawWp3DYK97@r$ZlS^QH*i7G@g@1|&U=R6-6Q@Iu)-~5ei{hY!ly=SXOkY)q+
zf#ytRq>^wQ9?;HgM+!I^Z(Vvb^c8*p=&(|UYmArxy)AKR=fXBSnmXi@vNg75awqhP
zhlVzKXIZMp4Hip_339;X2g#odd2<wJUix}(Rvmt87YTT!Mb!UE(2G@ek9xiKdqza4
zE29WawTRdw3oTG((FpThe1NwiNaBb@3#I(MLO|AOhrGWn9Jh}G2fec`O#dKzMeg9i
zM;DWaOKo8Bh&ZB>1l^fk{FHI)dJ({@-}3!bAPT9gtb)?o%F}3kpFC8HXdb}#1X%B>
zF8A`Zyq^jRmXwaIf6)NM15*goeIKRSRuO*H41K}}%=(Yl5%zPq_$5T^RKA>#6Brdj
zGJi+T{=#AZL^QDv#SNuRKnClLp%H9{Q|O=&>bJxrNJly^x-S3!{hjDXYI|P|k6Y?S
zp6tn+tNzo=<$t^ut!Hqk<0oZg(CbqCq(`pQm-sQ`w<>Lh@WIC7mvAZfQYdgsdAIHe
zC8iT4t^9vh&FA@N^8Qcp0A&Ce%E(DKQN7gpVkSoip(`&hZ#LscdD7C_vX_h(1vCA`
z8b@9?l}o2`k8sBLEpZ-u%$3<0f=-)Hf|_=ynp~@2U0tM!?{wY=-Umov%auzyRORFM
z`S)-`O|bEEF3`eK%C7Hjs-#~WP_u2_{mPkQ^j9-7+gT{R)g(`%-3mOFw{z=ly`fbi
z{qB1@DLG=Qiu5~h|HhxGV_4Ive3!ePP1Af(5y*$uTgOZhoGg=c87$9xg%P3|$U*M?
z=X>5Y<VA8tR9c&mk2wnsPCs%gf9Tv$*Rrt*tqCU7O-xL<eH5;U*mD4b6CzQ$9n7Z~
zi+cANeq``vUP)UXHT`x0a&NoW`0TqyWx3X8U9+>Z0ZN|G!cgD(awmicwO9Dv`^nl1
zzjYT-L+eYT8PSo5+5)@fSFxM;O<mUV;zVZ+a_C7}-So9OMTIh0n%l{WFV-|F1-`Lj
z@APsTSM%+0S;O?eUh*ptQ?H8v&f+i&&RR}O`i*4f6k#H@m7lp*^zKSfa^hmOXkOS-
z60>2cVM#iEOcKIf?8G3O<3kV^s3C1SZEnQ`{BY};A8}$L{)cZWe-He=7IuFnmhY#4
zY4E58i;gn|BRS3+r;6+SHcPc%%tvs7XD`vC?_eAskXhq<zJ+}T8j|x@*`M^b*Po1$
zXoCh;+w}K^i6O#?Zmjo782r<yM$)RxRVp*&eHenqFWSdJb5{jh2~Dsj@+;3#|JGLB
z9032wlJoxilNr)>i@US|;p8Cu(-kNgy~rVG>ghS%FC0N}9f?~Ks%GAz6J`Z%cVO}B
zG04y@>b8#k=;z!%1hn-NM-L`XT9eg&nMqxp*7RR7oT3$9b4u=@sq`?pYiu|62LtEe
z%mc7~s>k96X5&=9)5DSQm4rx_zJbV9Ro!gHS%&KD+~VuXk+#m1%{A39Yo-Bt%80P3
zq2VTDzf#=Rmdh&?bCCx)b*_Bg4-wI3l2pChar~jmn+7izL<}=qt?9DEhX7`ApQulH
zMEj?4#;~_z$l3Lll0lC%>Vrf3=gSpgq(a-sPF?M*i6e<#oG7stWG;STlQSA38!4w~
z3fwm=Na;p^D=55k@_R@4!LT=E(c(nD&8r-6O_;~)0c9x82zM9b4Q1@Qgjqk8p)K@{
zcK3AGBaS(kU`DqS7yE$=&M+7`WhXH9jFNO9`v*QtIaJs+;+mMNJC&Z8+14tW6_(oX
z(yMp>G?90}aC_5kKK5E+LFE1gZd^6s<@360Hi!Y%5J8nXe&u1I?-_5za#YY8N2io~
z)d6Pb9A<3nGbM^mLOZxeCnBdj&>VU~+1Mc>wzZnqD$ug>jHkb)X}j!B;NxhcUt~>v
z(%iJEn2uq{z?DZ-4o!wy@AWID@3@mSA8wR2bf#TEmU@&Y3{wM7g6EWRrwA4qQ>PUk
z#mD8H|03d$wnSxHxWE;p>Ncycy(|wRkQ)4Z8pLFPlU0T4+8T_bVCjIpvpmQe=!?D-
z6hgZ<kcvb%u7ujQS2x~afIO2vhYJZG5kRRwN5s}i%4{t>FIu&I%SkgPKEF8dj#lON
z(7`duN{&<zl7C@`q$JOtnrfe8ILA;I##&J_N&%Fy29dy7806GDm-5T?SptTI(mDq;
zcDBwRHt6@{Datto5owch(Qbh;%YMV;hnhPS=X5=7SnQN2aZOurJgGNagzUp$b(!LZ
z>Q@~nOMl(JXj*jar!?fu3+B&+@XnbY{$`_o+Q$CoF`g?Fl|#K^V#e7dx4>c9L#(ge
z9RZ?he#Djbs<~Ae%4@Vry)%dBj=fmz4EWB5FSq<4?*_=p%jYiGL@lWxq96zDI2uw(
z%zGJhR(P=ZMBc=HN^Sx13>@y@XoFWtaipVNh#B;d<uMJ9eG4^=Y^6Anh=_Y>?L7F8
z6w2Jvt+Ti35do9N><QP2H-5AIF^XVOpM4bKwXk5ba<jz0e6=p8?{if=*{=1gT`JcN
zy*y5F!#aBI)x;js7!oGcg;^%@k4XxCgA?vLz@(FQH35%n`d|;#RTx1kPWy6KK&~MA
zqz!W01RYr2X*lA8iV|xGeEExIVmlw_^@+UPQ-bRO<#h|)W*wVxF@0H7rmU+yJssiS
zHm|YWVcyz$hPh~|2(>Jqh!ewVXbv?v3~a~PY^VI#70y~7uhFuj{T2(>1Z}n9=S~tg
zag~^B{YLWWt@Rd~Tn4Oex2nVkP$KB7x(Xx1wlOMix@6f)@|yvh(<D`4M#E4^L8hOo
zv)m7YBa@`!7)bYa49D=z()%O3zyH|O(P(&u#vNkmGY#}Ry<A%%{X@5yjDE*~nVg%o
z*HGJCSynsw1|=mZx;2v<Jt5U%08r?AB6xpU0?$%hWY_h@zLj??6@e<VO1L_34E#&N
z!Zai)yC;GUz5{65px0_=ki&iE9cfCaGr5+aft3d3tB!b+_Urjt*GyD1J>puJ?>s^t
zrF5E9*fYD3k)B@buYR(O7BN=6*r^bo%Eu2@Y2+IsQ8j4oA*F7yzy!hV^*~owCtKxp
a2K(3rHj$^VY%~U(889)lFep3k9Q`kU29J{f

literal 0
HcmV?d00001

diff --git a/apps/meteor/public/images/featurePreview/timestamp.png b/apps/meteor/public/images/featurePreview/timestamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7573f97db55b73e2d880af67e6705e3c4a2040c7
GIT binary patch
literal 51432
zcmY&<Wl&tv(k-sRgAMM%-Q5{9xC99<gFC@JxVw9BcMI<BgkXca!=NwsefO(+ud9yM
zK7V%a?p|y4J`rD)WzkRoC{R#PXh1nBH7F?9-~aC0kP!ZznN&h6{#}qA<#b)3pzvt^
zb3g;tsIUILgmzJrm4K?5CO-c60B0$#Bn|~tABXyC3=ai0>I;+-*YJcs>o%A*9CD*w
zN8@p~9UFmUL=UF0QoDG?@49d!Nib-d(z9o%!<t~TAV}>x8dHFgHB<K}N0MpurA>ma
z;FAdYG|=i3(lb%mv0XS<v0ZQxohtL9^eKk;lgJcA-UsfyRyMuw4ZD9-zpq`s_-#GP
zzx^)rxZHee_4c^z&NZym{-%y}xH01Y1kQWw#Mm^ua30=x@8Qg=8}`}Y`v0s7%fja_
z&!OSq(xUg0z<a?%<h3vBV_ffLhQ`{Cr9aN^u1JN?`}WW>{G%RgGwlC0G(?ag$K}WC
zMDG=9@0G`~6^a=6B`L4#ab&t}ChPwl85V{Xo1yhIBXYCzjdY<V3XY(uhg0(=t8pTa
z4ekH4%HUqki$f2E_3fWfMxE~G4_TsDeIGrlW0#?oWJuHgw~V4Ee!U--WbFU>j2D|&
zuvLN}&X!r{32CJ|wcr$e*wx;B!(V`SW>hv21aq9N4$?uqmnkjcYSjfz?si<UT(=z8
z-y+{lD%8yRfaYrn^<BA8@K?3K4rDWE+SQ`DWu9BDgMMABJq@#dLSm;PuX8gmZE5oc
z9qz481gvYBL&D+XmVn2J<8$)Zk7kME&d_j`Y9=5ZE}<n+3ztZ#2r1dea(EQHa<$b`
zv&3wlRY;FEgt+5uv>uRy+Z-~pnMmF}bi{2MnX53H^ZZyt5^F7K<_zh~a^U!QWNzKK
zK}YL~$PGB~pi0{MzjH{cjOwx%@~*^UhN-HbJ|_n?Ix;oaKP8r29dE%<+@SLW^Zl(h
z+d*pei8t4OWo%FK17xmNIf|S*QshJf>Hp$%7^V<%Ka;6d`2pT_dfrg3Vxn1mgMJ5W
zX*1DSFVEVnq%^}JFU~*DHbk$c(3)a#x2jp#$M0RYQgx+nq%$UO;9v|efVYONtva2Y
zI`2}f>~@}5r7pVFG9so~qsNkrvPQG^sm!ILFp|O?phUFvXMZRYe5m(<uvOe9moCJ$
zl+jlr@ushHE<iDoG@NlwfIa-*M8R<~LM`$FIPOi`49f27JDN$p4S7$HmxEr9<taGc
z(EZIj3##7#c)1cfi~q8pfXp!@TKB>DzzLlFQkx*jT-z*@iWRQ=9_n9hVD1T1ysPgD
z5M8p~nFKC5`Zeg`S`a6O*oIM)%&6e_D0%hV&lVrlF<0-nwmB#OUjz@Z4HrP)sl=DD
z8%`HceP<qJH)FB*>zsrDJ)bZkY(pSL^ES;IUG+TCe(8)qY}{mWnsU_6HGKLVTLGiG
zjKipn)x;knxiZ<;9@Een3e%*r?wbs_G7b4~XyItAHbVVQHomW(5`kqc<JH%XAsp|%
zz`Ha<dOMFwINf*pJ@}Abu8qVod^$yjwrdsdH^shWq14;VB!KcsHjA<Zk$pP<kv{_C
zr|fMmpilp5))w4{7Qr_1Rh<88qa^@hXJuuzx*BhmEVfxZ-$*i+WIB)Xfn=I)=FFXn
zeWG?WLYG)vrL^dousyFwfkw^?1OXBlCC4(H@tM437ZsOJt}FJw(<OKRh6Mbu;(Y%3
zwQYxX*4GxF<lC_>Jk6jU)fS@ewU%1>cOg-kuj`+mWw<ySio?t`CsTIEevXwXjP23<
zrQ^0yMLJg*y`>GRphz-T2wWQZ7@e_``dv43CCikc-McrC+&y$a+lEr8U9Ux9Czq+H
z53mSTAL&86%N(lGcVr%2-g#QtB$*ymVU0cv$vxEok(<9F){WgrOkV5%)giKhTEr*W
zbQ=Sey7DQNv-=O9!V;0mZz&P!k<78P=s5c9%8EkP$iP6^fX?dJ%+|yI#0wgR2t5D^
zpn=D|!=9qDL})Rwr|Y+-Ha6kONsSfl6fTu{fRAfZ@x8>kXuQsdAC__O_;OjAKa^hS
z3lOJ$VvbEO274{KPt!<;7UnuFBqqr5%VtO5Psc){ek^E#Z+?7aIAe9w{K8~gDF%io
zt`h4(C%D1;4mb^YDr%5PJ7a=yg+Y(`XkD?Ok=7-?*U&Weuk`1!sC_?~mpRE##htP@
z1Slqgu6q%XHg8{Z)YLN;J1u?8-d8iPbbjPWmv;2ciP<v_`;(rGevRdByJ=%LQqh>O
zxFyW9Oi$o~J0SgNVTv|gFQefNj0Z?-DO27l$R;8A0kdrhZ@jodFOaTY4oW{p{%?-2
zf@`aC(9I`$7jHLAx-4SDH*ygtU|wrL8sHv^U2hM`FQ`6O?_0zXVoKsE*4e>NZM941
zkRn^Dz-LavhV5rX{;J5<oN3#dn%K(R&bLXul<E>)YSRE_ta(eB%n9azFZgMBIvO3@
z{M^WK5)$W1MH^?GXd2(5mCQQY5InD;=>^9>$4(aGPn(XCieF%7w=0Y_sC^<aeS|q+
zdZx0GkVmqKnl$1Mjn{zCJY!V_^_H?L=SVxFdZly3WW70J_=6gu8E<~%V->$+&H)E3
z${-m;)xOf)yT3)aSw8&Jxa(qt&~7=Rcet~v8u?%^+IY*5lZ?9hqT!QXGJv36oK4@W
zM(q!}b68A&cxA@O+1XT1|6{5DGu`8LR@GZvX~91;run{BOQd{c84~7FZNC;iLk|ix
zh}ZVFm2JWI>0W>z0~B*fKu@GQi(5srs&l1H0jb?G&8&_;eK@l4nMN)fFDzt6P6lV!
z5tAZeS;e_ZiV}Zt?sci`=v==>@ZIF;6?{#k9-(w{V<8vp2eTs1@iAdny+|3W;-d6B
z?<<Dhf5daVt-C8wdmY!Xbr6A5mm_;wu|w7(dwq@(N=v&{WZYjZ;}`rMRu}>?x{F2A
zIJ^M|GSi32N7sTA2$umDqYa9|cdoB-C2k+mkE-*V9CHlTA8euVG_k&BRjN|V!A^2@
zE1LdO$LEaVM5hxAC&T-PwFjGqEF@{@b~8!g*Ov&Uo=s0kT)ngr83&J|{d(J3B2PPH
zAA$?B|Ez94pG=Jm(}(YdEbOY%0{E))GsdDU3doeTgt6*n7~*jQv)_)nmBU1B4w9uI
zT7MXZn~$Md4;*!!HNR2GQIVc2YLqX0FD2o}D5J~v+!*<UT)+4*bgpEA|CpfYU7@@o
z)Lt3F+^IMgmKyEB3h2Red`%Z1z{!n>12zwe<PeSYPDOLrgsQQ<EBv9mK#2nAv#S-i
zA3?4?x)3J(T%@LkjrVS`eAJ#Q(GG=$Qkt8{aNO~u&qcI5XcF0Po4Q?#oDBC(rKrpY
zax~F-&YtgZjBR`3Y);=uI+s<>(z(TT*<Zb+9MEvwMQ%on?0aej{TG&pNvTlip#DKE
zvX8T^zh+ZPz4n0rm=?Om*N2hiL2RxRc0w30^?fvb4wJ@K#YSspUIWwx!6nixZJ|(X
zncCu8?ugz-Q*VI;7)yAoWv(u$>_I%vij<ed!)Eg2I+Z_U;nk56J<5LUOzr{}n)6Ho
zqbQ`gQ3J)!uv10Y+$K^kT#m5;)QMLY$>SVp-OQg9LS;jD%%EZ+0bmm{;}Bl%cT^@>
zpWKXV)`-76>|p~<&RdIh(K~b!R0u8P_Q1`seP%P+F~>WrH>cI->A_16y1PwJFDZ*x
zS#Bn@N?#M6r?F;D%nPO3eph!Smk1{3zg@$M9S5=a*Bz%6_kiP}32H*dF7TVjLJXNI
zkur61BpmOS*+qx-L;tg=lH@-dke9%TetR5FFFtO({it)K8!{uK#lha1dtR%*?=M&B
zqM%(=%LW+BP6~Ss`Kv2&Au5Ud&0JJRVkmZmY>i(#L*VL?Ks?n#0&d%1UqElT6S3Ar
z>vBRU@Vkra-|>@K14gw|St@P~CdRFcK?%`3f!#J<^zkwgQoCx>CHD2nq{aOuljT(O
z+1n`Ly$g(%t51hci*BnBz&eGn7p@E%-Xrt6VeF9Z_?Jr9OXBHbLnn@{*&CeaYR!fL
z6L510i>HyA=@Cop5@NWzp3V=MCMm)ewyHe<qk)Y}Ijm|wt-iZFULV!6q1%b$++|Ve
z<8%>Fd5ih2AApw{Pv|K+yoSg7FyJRa+vV@Z>R@S)NT>5(Jj)3CY>m0^%Arg0rNep4
zGwg~g3P38`Bq-;@%`Tk$dCy^Po0taJasZvCrLW<qK{jw$l#|XOPa+pai(Cm5FJ&WP
z^_XH)MkVJnb`1K;Xu!y-dTJDgybN}lEqkp+wG4K2T%}MexYGE#1FY+hnEFf+>z^ns
zu06Rd``TQ^!q+G%*di*6O^s_3!>H+`6o@+V(T1zS6!f@M-~Y|_8rIfiX1uJCJ0a$k
zy&h6!J%26arxIJ#>yHlU-pRqlMl-vKnwf7fE!(pTH9g)SsHe!L_xF4TF?t5y$S&iw
z?+9^z;II}rnGmXD#=J}lMl4B<#Td?X6=WyWwqMiveY79x|A?Czy`;0xg!lg+#!*FG
zh(VtudQHSpGXvPg^O=-E#F^)Rd!=?^XICvv`C=Ar+&|f_5zcP^w6j+_t^8T>*+nLP
zv=<%2?unR7!BG>HDTj#0z_G6i>u%iH&VgV8q4yXYW%mcgD4MUY24Zo`;Z4C}3#MQQ
zxllC`LBdkLD{Efp#NbrS#-f9d33bGV3foUG8FIz?@*SG&e93gtNen`pD<kP)ZTug{
zeel*N2>dZBd$T3~5AtiobAp5{)w%hEy==^wm9RMnYujj0@Yd%l=HndNUrYwh;>>D=
zUBOgz2PJt#MK^~Md^m9m5eznPycMx2an`zAMt=I-?*^W^<r#@Zu8;GLY<rS`IFI$W
zmwo(*n)6~H?(KD!;{OCupdX7qLn6f%$WrRCe4oQF@@zaqr}Q8ij;Mmag*y?xRw0J(
zSgM_U62sJ)BrvKb9HbF`Me);_sn-nH*1Y$3-N&=J&^c&3RYH#9M^K>DYUEHEvVB6!
zD#Hki0Kx8R0<lLL>JXoxtf|uHcxz{s4V2x(3%ST|oX&TXFiwkP-zJ9nwLw6zQFa%m
zTyr``obU<ETe_@2JS_rm^Hhw#siJdY@!hq`iSZu1#eUkF=Yo$<aeBNO;X3V`R8T}V
zb*xl5>!1u_$Ghs`aBo(p2OvXh-cl#CHKmco%ZewKP8j{i6yd(A&CJl)h>8A=XD(ii
z?2{i7DCz0_1=z&y=b*zOv|v0YeK%OG<VQpVZT}D4>WI&(Ais&Y_C~~++=<KiklV6V
z%ZutwA2kyW5Uabyo(6@=w*yo~aBKCmn<V_^Uz<`{^k(F}+EKlr4-GcFK2?VKR1G?n
z!058f*uogHQ{%iT&2xA0@nb$fk%pI&nU;tXvH0=_7*U5^5C7z0XH+eLpT26L*ZrQZ
z;RZS(?JSSZ%SrFU$8eI9WW@IZKUf@QTpK;J#OKDKku*5%T8#2<hSAikOU}h}y*YGn
ztH+5}?Zd?rxwI1|I%1Y)#3waw`?A^oV8j#ZLB5)s0B=cwMVD%th5f4Ha^sZBz~?kR
z{Xw?L%7-CLNAYvd&?ExG>6E9{(%;`-n`NA7ZL=4n7Ggws6sPGLpIfNGHsr$qz<*~3
zE)Vk^dVd~8DJ|iO(&WH1Lfkf028aE)J!(Gc;kR^V>%2-6=?uNoulJxR`64JBdEQM_
z7FIEA2G#t8HtiidT{~<8rSG);c%h+!AE{J#ZHx&flKpbMg+MjUPXf(^V?+r2(kF2@
z1;#<2Gcj8RJE+AvmF`Y=`MT0IdgzlkmC4%ECaXnxo)zPYz0$baT1;LomGVpr2nMW#
z=!VAjNMigGOZSk=s)!nn%^z|Pu#$!LeuqW5DiPTi`6ID6!;H-HIjJ!LK8E6vJAAT%
z7ot!+_AY61akY$~HQqrpx^l>D0oXr7NB=#r$z&Jb<|H#d#a}vlB16sK8_`4z6z@ND
zTSXqEt1=L>H;6Bu$eOe+SHH+kB0$_wXv0tE1Y|P()kXbT7SgGh3#j_au;pXAX!NV3
zt!{kO&q+-psi2y>kaF_SU{vjwRsh`TFA#vDfaH=BTMvBomB%&rNPdrphc&LXU`ORk
zMWZvnVVaF%3bTMSKh>vXJ^FgFqG)EhkI2Ruef)MG>E|z^pp3B-HkM%J8stV4!WMY2
z5s{b_W3e*kY8#^bw2K;MtpL7$rI-C$7k#oe$W^=RHaXVc*ou&baUwBhS<Yz(>_I6j
z7sE$i8taeCgSCPeR)5+P)p@gbW-urVXVeS8GHKLbEx{El@6oK8b1@C__}RN?bZar~
z2V)Wq-V&R}-BO|Y{U4&t2q(UnY<aw<otnflw>xW7f`-q`{5#XBlM47fS;SrjX`&vV
z3YBQ>wYkmHeh6UwtYE010L!@N{Rux!6kp<VY8CyC79={y9U67dSRaXS1q!rO&~GPi
zbY^o*fL}v`W;p^MGeqZBVS~fYr2c8${Z?c?(T6UL9qG1+XL5W%m-wCM71u~^oFAj{
zn4KtL_j`=ZDx$(UzPw3FPXR-?{}TXxxR-5?ilmG~`AR@Vr1;3aD_!4GkRzR94Q8ZQ
ztYgG+AQpAF7pRyBOu~#nyl8Ug1QV;qTn|vPKYCC_Y?#UJJZ{~T3C3Da&^GDs@HS&@
z|A+J8264sN;9w=-kRLbjyz@QPZAf_;9++*r3cJN@0;}8j_E9f%YQW(-HtGqRf;68#
z2#%LXwNxk-*&A-5)pz7sImW)_Yti2@zCG}3VkgL1IMXK1c7B(wn5x1}e*a77GHxpg
zec(gN&u$o%H6iP5q~Y4j*Yl-Q0B5qL<V@fVRn8Qu9}WRcJ2z_C^aYe$8spnf4;D@F
zV6fc;jXgD)TIEo$cnwDHE4-d7z9da3WuqMyy>pU&l)Ar0HBSl?dVS00%ViI&(em9{
zSwhFUwi3|~ajlR}pdU%r%E3_PuYG!t!bu0$yY$;Qt5sP{%^^Ad2Y{i#NF#lWk)b~!
z{$|f0pA~7STNRi>A@k!sAX@q&blJ_ePEHc%VCPCFlg3n)slty&5a==*n_Y4fAwQoU
z!c!m?!Jgz;6)%eiVEwwAyjL`G$Sak{*g|cuVw}Ne8f=6%1R&dM#45jmM+XF7bv)h>
zSrJ_qDy4F_>RFgL12L6DU91egMrx}|`|Q4tcwl@uDzg14WpW+t9ty@!u~6!tBz*}S
z0CLi(4(RT#sj4jb`cU^v=s#phFb7uB`rHLxgV{_W&0}D>5w6uRUpmsau&O`{@U$pM
zQVr-xi%&JmyI>&=&eK;~F1J$pv73lS7JS!S#PyZ9h(&jRlDe}myOxheo67$i<Zo%u
z#~oq*(%2O-;(0C2CG=TkPjL%E+dqc4^9-Hh^^6gKyf;VbJa}t1Uyqh<7)s8zSeFJe
z@AIIZ=Z17h>7b$2?QJEz?<R1X)2vB3#d4xN*Eu$rJn1MLN9koK*~0B3ImzG5fx&3N
zbCO8AU;KoosS%CF*2)p)!tM7?K|uJ^fkn3*?4&VkkFoo`WjTIIVQ8%<1tlz{P$7Be
zh|dxy#iz8CgPLGbbCmObzhj;3x>h}Bdg2e3xo;)8wOY;Osb{r-+K7x&Djgaj?Ucc%
zvbcmKL(qW9UpDA|Bi}hHY}Myo0I)?tS$)v%q@o9F+|A6$$;r6r3vn#W2)l!JrV?h}
z6g@M58-WG4Ju`kUZ0iF{OF437Lq|Ltv2i|=<uC-<4>J7UI>PRF6J;DmLdC8%rds+L
zU%3ci=KhA*ruZp3IA}fNn9@6P=kUgLjnQ|iO0PjqB0GYXsxTUM{zM}e6G<G9kQ$GZ
z$RC-t#n9XI{RHs`rd9}y*;MpIa_j=G{b#@9ft&fFq(&4x<3^*Rc)gg3QtF{(mu!9-
z?Sggj2etYr>OropdMF~)igZ1iDtABYP1@mJa}W&LAwA6{OH%fc+)~F~tp0(pS#z|P
ztlX5s{w89^xL#_?ehL?Owus(QkHQn*vtOU%y@by+7h;W)G+F!n;|k5~`TJzF|1opq
zxqJ-aQ&&8OdRR(`*T~1s*RPHFjqPk3m^Xr5k`k&z&s+6xyEp$c6>Wyw!*SGpMdh|O
ztFkF3)OLMoBBOuEWY*bKh2%lwK@fZOcTJ4>Z!~sxhE%_z`7hLoMhcyKr2F!;>9o-{
zZBq@LY4J=#*{pTVFnL2yN)s6*XG}=|G__CPE^J3-tg{yrs$K0zVU@P5AX;)bQu21G
zR5&DYInGK^wI$M%jGqPRC2J|EeJPul=MzLtPew#hdOas=fN{zd?j1<&%BiRu)N~Q!
zO5z-3Kjso|N_IwP_!$@`jI<%e?mva1zp13_4h<p(7V8pyU`NQazv|m@t}qM6N2-`B
zjr^oBO%f95L0AP)DMzQ8=z@E@T>Y4QCq3zCR3Too2X9Yhv3zg1CI%cW)*IOWt*rzm
z<5;7F-5cV)FYs!F*p~8orb@MFA58Xvl$;`m&O!2?Q?%Ue^Ol`5#B4U3JnD%GDIisH
zRL;5|PR2ZUYkP1S(y0p0;a-_?a9VtL`kpFcN>h9Z-+}scd&IohG5BRb?hrIasg<G`
zNfU0x6b8FBb31D5HKuX__MrR4CdqG-++4;Kd;Dfx?I+xZJg{V1LKcyO2bjnk{p308
z??PnlFtkSm)=_Zk+KQz*&y2EUruT66w!UteP=}4h8`(VXC1sgEbm!+dKNhZa(=33a
zc8@ulh2@N29KU36tOgyn>0dc?@$eV;s|?mQaGE7<m2aISYWw_e8GT=i6CoUU93&iA
zlLI{Y?%Y)M;-M0mlYs+5<Jp`^rqZ*MwFC^|^j&F}YLeY$-_!NQDFL|(dGxH`rX?t%
zNQ!P51w%@IN)TTN*|muDx-#49z%y8?a*sP+bPK4T7qE9=DgYZPAmhCCY*vMZ)Hk4X
zy_`%}ap7h{-irO^aRnL5F|{sv$LoxDx0g^991dKcuYpt_%HcM<f?Tz=X~R(CsPcI@
zKL@A*GK)I@-0u9O4;Bq_HC;z!=dL!>b!QPua{x~9Nc#lSREPP7hk=H`qW8q7g7;EZ
z>R;y@<$SCW8zx@-JeC;f*WMH!U!ng;>fzWnDWy1k_jvlkCs^vV2ZkOI{rIQI=lNa1
z-ZnmNa$dZ74K;^p_JxbOMnP5&;xe-wI@T0n&CfEgb|ol=?)n*4;3g#e+Js}mSVT`2
zBeg6iBjwH&gFcPozHpmn?~T@#<~lmo+34(~$uv4~TnlM(YZI`BzZ;l_ZVVH5muebd
z*qQ`IkI*!VaVd)f%0&Sb(WfQFhL<5t%3}`3zmb*8*ZxtiT#)$!8$KP;H^)!N>+U+d
zB9BkC9oFrs*Yybl%^3+AxbhVvVF7>`P4isC{R5!BR{vF0WoHSNS%^`I`obFNZqqb6
zo)wsJGt<#a>ou~#3h+NDLQ<aX0R}li@;Fn2&+qc>aq98onruqN|G81d&w=griB6RJ
z<MQL(^7i)8pGEe|Jo;b=Z;!n+MNFpjN_x)xUEmcXJFaq2r;#+xS2cKG5+~AipIer4
zQYUSKQN&S)E02gFaxtBD%Fmkpb5ig0V9E0sc8<9iO4Jb>Vf`C@o6c*#X;FR4^??Sz
zvyd(|$Wp%NC1`UijICam`33A{?WG{i7&l{_ju!RF`&6f36SCEGz15tU!%@#xUN+(M
z7n8^9^-n(8QcDm~qb?s_4oyLk3|)uQnUw|Rn8VdN`lD;?3QQLD|K@+Iq`5G9$*Zh^
z6fV)HzGfL8hwojYNuS;!Mm1yjjejL@%-F7f{Vget&TN^&lZ)BV;3n_ATdDU+{KQ`H
zx9_{Y>tXSpzMF*xgju=DC{d2BJFGYHMp+<rda9`cp3vP3Tm9y{sKI#H6Y9?&4nr<K
zs<kS#cW+zh^DrI9Zu717+YoqEwK!DpKLjF_<~(U);v>Lx+Fl$Si1YZNrbKiD&r)yT
z!XzD<>QOy<L4LIxE`9Nhqalezx?%sqf%Y%weA5b@J^swN?kAyfAGU;dX#0_BA;)sw
z&uIlj1JTIqs~KlL!9QgJi2kG7VeVR*$CD*B#KJOft0)e{#5`_#&nU`9y2fu>n%)rA
zJaP^r^AAE8)+wu#K#2vooZ2apHD+@L5!8Bp$!%<OV~c7jsAiYa8V+B4JbwTnt`bm2
zAB=0Xlu`0~Ijo<O{si>sm=@k|G$0u&<2ONKop#Gu;xa*VLZ5rrG&<B)+5EWbP1<=9
zRiD0FxRdvzAJ@BjoCNTwnkW9EFi24m+dbpgo(h>U&Vr0FeG|3#hs?Qu9b<dR@v_Ez
zw$7Z%2)MtIRfg1~-nt0s<rDHy{x2ESd59W$`_zcsLp5P^yHIE2>A$JWj?|@3`N`Rh
ztAo~}ebOzOW^jU?H?1v|#nw;vTNKq0MshySFPN0aV)i_Sin>wT`@)c9IRP9i{}Fwp
zg!`y#6hO*B$_)yMh8z^t{Cl^Yx(;KP=%K&vc#<G$kQ9=RXxy+`#j#7y*ihLjy#At-
z&VHfn7fovJcRP&?Yl{W0IDQIkQKKr7_J-zb?mXeO&QyFL&;@NHd&LEbzGjvpm{*5D
zuqKcr$rKH!(pkDe)zRFyoW7_P{lDesmp*nx_FkuPsKXS;G8*?rz!eOuI|qIQZ{op9
z#X6V<sm%0X#{pkEo`YK}o!MhkTpHP2zfRqc(OL6$a)^<B@Ur!|+u|FJwNJB}Lbq+@
z$`O--VtS5CpJ4-6sEac01Z1-Zz_rd3>VP*;FKQ}L$guup<a*F$x<!ubhmje7X}ppV
zyX93vOm$_mO^%EwR$azz&>nYmvSQER`(u@8f%i&7aq(7W0|VaXe3vf=>5|$^T|Yln
zyQ;lV8z_Iy$p@e7fmp!nr}^yl%zv?ZB*oJM;30wnA0a~{O_m670JDUgap7?mMR81^
zzUU^Fg_~@bkj-RoX?A)$X1~G-AFKQsNjj6`b7Z3GM*A3BJ@`{g<_$dcXv|Tz?e0XR
z=g*<r9tH|X;UhuRzG*LW!EbDTR~d(w&@Mk09O3e|cEl=7^N*Z*r^VI0Z0-W+A3|7K
z>)6uZUN*V`X9k(C=0ss`Bl})+RZOT$&KUx|sT(K}!|MHXDTFy=Z(<64rMmswJKEW+
zyfThK`$0yr|Ba*1KK4t99gd}b>3nupKiPr16vA;ps<(B8u|7?v$<&m+26iTcCuQB(
zJqnGaS9!$IL_};l>%>*77{!BPA1*5i)|ES4b1|F;h8=RttfXz`yaJbwMI%g>p*l(8
z2n2pp7-lEpvfS+u^R&ko29;TwwfQ!ifxX7rX~<^t=I&p<zEKk_u;{d;M{yaNdpk95
z-*=o%D%^Nd>3=y&gpBdfAaW57jU;w~y(b!?9iUiN$EJ8#sA1|#gy`0%)+<-^U&aWR
z_wBy!+RfjZf~+O%6hQ->-a@F#lApm?@NzG#bgrrIw)(J$+a*vxlv?QS&epV@v1(Fo
zF)~Hoy@5Pi{xDk62jb=@xX#Wz&j0~J7F<m%m{QRCN7f@?dT6R7Zcf0-f{rY=*r@P(
zj<EyBKfZ{g8Yz1({Gys=`CIZ7e2B5sU}V})w2RU5{q>t(m8t7c=s>_TJJDfw6|2ak
zc7-SU>%=gLO*@5UgjvaVB~_B3Y2$&1SdlhbU41EN#!Z@ew$b~B`4wE>Fm9yN;B%F{
zX#zZ+Y(C17JS*oZ8UARuIw8aYdts69|7}~Wx3;`wJGKWQQ<r$YZ1B76kEdLCo~Bk?
zjKuzFv}Q5tF`4dmsS(_4vQBDuSz+O1tugGjP|g#vW6|$g%yG!w@AQ3X(e-stum09*
zcB%^di*?bPG&^$%S9RTfrN)5MayqwKS+?(zKT9^29X@_A=9-whCspof2TP^IA?EX8
zo_a#Mn7oIrH>t|FfdGbVXieho;T(cxqVqeYl6$+9&!@^CgAyeAl)ZI9e78J{%jh!;
z{QR2v33QF_CemN8G!4yMK{O@^N*z*;Dy4h5Isk3rG(AzpZ)+Fx@PoW`!e-W5!G}8>
zE7t^m#Ef`!Sz%4x!z+o^@xv$rnOO88I4d{Td7vdHfbk?}9<5izEq69rzH#VLVkcV$
z(R%^F4W%AePHa1EI>vY{1u04@xp#4ndUet~ac1@+8RJ{Sa-Oo;KB>Zg5h8-puK|!J
zX4fmD$h;U|T<=pMztgTJS&R2$S!2lAU_{cv({<Y966lSz@ms5HMii97{q}0>rTFbt
zPk7-Kqc%$xm28iVO+9!owjJrJeXSUp8UN<lp|&S+3g^O2UH~PX+S7RX{b!;j4+%wR
zeo!yf?j?Z&w!L|X6Y3}@zH+A-ELP;GS~?AWW|){HHAEn_I0wJqykR-kz}Qf)hsLeo
z5)Wu`UV}q<CNDn)+}DpxBY^QgkjcZ`cKhPhrAIUZ^SH`drn&`V_Ol``=`@Z9OPfEn
zE$=!mIME0nmn|&Z3;rswJy!`-I7IJ@uBP;)5M&NQZBR{T$`OkHD(~mjcJ#=^+obqT
zq6&+j17x*$H~&KX(K9umhZr|J#7$6}ffNH}6#lfi)nmHZy#cbb&#{&jxd#<MxxV+8
zT-4${zCM&KfyleMA%9z6A%8vo8uK`8CRZOqQ1LrOp{(5gjTM~w+v^uj51;D&{tD0P
zy7e%2-YDem_Q(Rgjxb&$eUgjk#0u4xx6<P)FnZYXr)6f{&qImFz<2X?nsAG@)&8$Q
z<xK3qb-Fus*|mQQSNtqBaFdVh5y)g3;VIU`%g@O;`%IdHRX-7Y&<dCDCFFcpP6(+a
z(=Hc!ycES;g5~N-V~sNwYpb1{#vl{1;(<}l`9Z~pIK^UB<DrGED);zYzHso~{fJw(
zW6p|y^Euk$K!5iWqbzCs_n#~Ew;;6~O7YlCMp-jX{L-D^$<KSDstt>t(bOl0A-kW2
zzW|LifSI~i{e5k6aBbTPHHZ*CDr?tZ=fQrk4FOdbzOIjev1xJ-gLo!i0yD`072$~)
z2J7!~!swOeHX7VwfKh6yG94e8mmH5(D45dJ{i1<kT>eG_PGlSf&{+J&b)ygmJe)o7
zvhpmR<GwY%d14LH^ef>DTZ$CMcvl;!4}Y6$2j1JmJqf_XmmPlWO5fh_sywriD`($z
zL2?=my7a8f5J#7BR7klmdjwHR$_xby5~a!WReT`7<RpyVmn%t}d|y#t1hKRFC$<Ev
zb3bnJJ73VR!@QnBGj8|3dyOxYl%MWHZa~*Dhk566X6M~PH*4XMNL7BKrKqf9h`Hwr
zGeY=6sBvqY;m<x`Q8INpL^UXr_rbJ0lzsrTp{Ui3AJ-}UXc{)P-D#?>XuC7NQb_x<
z$AayK5zezCb1a$vT$0hRk+;XcE7n{)-Sb&ey~er15BeT&i)WsXxqqR@HhO$JA<r%|
z78Bw(v7<^G`{YV6zq`+vexZ)6H9FwpY^!rN=yO`vf6@`JPNu}6uV!2MLL@l^qR1J3
zsJeC|RB|4$Ie>RaZM7)-RUjn*);p|=gzVAc{RP4GXCLLMoDn63EVwXlL??<MqG8<3
zeH%oXk)a#}*P|loC+De|Sm$Nr74w}-{CpbT^=!@oeu?u}lK_CgX3CW5dX=&5@?fK$
zKJ2}Ti9&^ophut+?$aK0OGy-!@uQnWcDDAR*9)M09fm@f6KDfWFgEQ%d%seyled{G
zlohA?eTqcQ7|?mSzLd~Y9xr#)K!J5Z9KiPeP8El6FBOOrK{n`hc0F)#{n4}~bVX*i
zgE0=TCg*fo{jEcY?O)Wq$*i!{cKP_&7qlE0ZetAm2zu3!MQ`$khB8)ZHU)~PWs&P5
zoxFy}X(fG^<29eB4y`#yaK4W@EK9f{!o3S+9pgu06$B)`N#y#TR?+o}nUMJ%6|7y#
zCRq%Mk>&|MxcQ@(j&{2LH74~rGERcUJZ!ZzyPnp474~+Qg}{_c`@F3-_URcNt$06f
z3N9oX-qZHRlhOSCE}(Dn?tQW-=l3{?^dNLFV>y$1PyKoM%YbhH?c=T@?5EylFW8JQ
z9)>y6g$F&BHgdv;!FmT930owFaXC2N5_(!_W6fyeOjh2}N)}(ilKDIfj_P6FeJ=sp
z*@P_(p5~xR>L6tpEj(c-aII5VMV&xj6RLZIMs0ImB{fszgnlngq_G|!Rkd{7R%O>p
zEh86t`MqfjrpkV>h6|y&aEs$=i_>HeXwb>-s;gAv>pu~v(i1xVaqQ_6N66|>`0LAg
zb2^UTYS>X4mX*;_FVge3vixgXVmvhX0%&fv4Wugpn9)zzC6zebwAje-l<AcHk3JS2
z3G__qKv?$E8?!yQ(H9&Qk^R%Dh}5vdkJq+ZqCLnS8QGoQQmok&60sHFrHwVy+YjU+
zWf-`qR)`pa*;GUjXCqEAQ`YNlt2IqQ_R*qZf7;Ye14SA8==RU$!JvGI(%*>*f3Jpx
z6PVohg~JXYdc<De+wN_!cfd>gA!pvjWNP2%=Y5BslRt1bkj3dgf}9R0wu0-l7_Xb%
z2Bc7<h!^mG;7-ts8$aK*GoyTsYtF7~&&5P>1lN=QjX+8N91u?`;97SYwV0uf^2fsL
zQlXJc?%5g2jt1Lu*4aMeUS0ksfQfSFZ;M^$$&t<D#ot^gqYj<ks$iUR-+sMaKsG-o
z3+$TUf=)0$zg0z9IwzI#%=|u*<Ke4K;K8A_T(a$F$*&vYBb-`O(sV=3r*z)V($qI1
zIGM&e`{gYm*mF|}TgX+wT}B=(Sw_kdv<!vsq$NrN+)aO7q?rjRI*0Tg^v-{%avKD(
z3OFk+guZcdr5Lj8V3JtPc?jmZToLU#dHrDSK^}m_BWs}&R6lqkJ`;)Ebp1WdtI$ag
z_rYmz!YTEyQ~5UhsxTt@k4d*7EGJW$1B8d^SHf8E*H0Xd`RnVXdNB^ku`dN^y0Er!
zN3ynriQ?%NDP7bxQOJ#H)_KU=kjT?Ni<M%2uXx?VL7b}DS~XRJ>W9_Sg<FxJjOY?r
zIB^9jSq|b{#H78gx2ix)*^m*G*x?ru*LNSu_-Atl0LG)J$Q-ZE>K4ds^#ObM;{|S^
zW6(AaOn*@qPhW?kL^eVGz5*TiOe2S!R3&1wSYoc$Sx^C(k~;At(fO35kl^q_XL7R9
zmv_Vmx5tpvL4{}N4MvexmLBeyHhZ=!711!rC1)Hpln{cb+uhIh+vyIsQ$*6gTh^wa
z-%4)nV_cZW+A2LJ&TTTwMGl$Y_n}M2kY?ZQa|TeLPb9{;tnw&&7bJCJ_&IGNy=P_}
zGGGbM*}E~mcyJK1P=Yi(>qQ0;b}xS2yNLrbCt%?IrM9~zoF<OkoiFC<yE4uCep4Co
z%G?m{&~tvYOeDf+|3f^jP;xR+M2S&WOF2&iI}m8_zDKB5dTDJ?!Z{MAWVvePYo%HU
z+{PGI^jt<FPK_W<EFPW~B~mJz48||HMQ11F>BVLfXw}H^ML=KrGu^LQ-)y*>!~Ulc
z>>Oo3FCF0HqvRx#^m75%2SJ6jj>o3Uu*m$t{=nBixeN=6l7A3A(SDOC7vPlM9<u%`
zkbIcSg6b73W>Ck1_u6z7IW*Q#F;q+T@(}k^pk?NwWv+;tnTg^h?|v~#Q_oKicsp#g
zh2?yhK6oX*e9ovItuo`wvFBfJyCI1-o#I(Fn-dOYm!U13gC%=uy9uJJD}OOw3xcca
zL`3ganwuALB%5-IXpg=9zqLqDn#RSgyO2NM!o2X?NgffY@eMn~WBD5X6tX#D?_`1g
zsm=_657JifgWe|mF~MfBjgNHsS-*=fHuU_@$&F6egU3cc(&X;~yL_dDHW>PDttV2L
zLyt#{a};Ys{scpdpb-3Z=b2po<$e4y1vwvC;2OHIhT>wjamv5VjE1eY*4tlUsST;2
z@4HNs;1jsQ;`uT)3&?f%>dJ{%=eZbTE*D&4R`+woPJXyD_Jsu8V`VGQaM0>4oQ8z7
zr)hCS-xGDP{#sFMES4EXe<5O2=%U&Gp_IpZ&cLIyVp4jozz&uI2oRd>MTA~6R4)>U
z4AYmVbNZyvm9|pWFCFbALm!RzOU0foGK4rxI@+#u6M`uVDREqs=_l1OjCzW=ciPpR
z72;x$^Y9($b5qXS>v84lZ=PEFr+Cq>u%Y)5kkR=<CBAYR!C5_i9Y73;%q)8-9UT!c
zfyxxMc}FQmK(d-P)?ognr8ckU+z7^o;)gw_CN~f2_PVw3f4$hBxW4aqbIm%`nHY(%
zmRFZQ6)Yhhgzc>ag$ED}z=eldzVH1kmyUSAe}-;>73!RK>#(vw^TnGt{up#yAYLpC
z5G3+`XN}GB==CXC%~-uhKmOO`guCnPw<zF+3ApO-FkChD{1e@#tXqT;a!a7=udnbO
zzx)mUD~D36AB;pKs4{R=L|<p7o73)^vC&m5Kqc>oq>^lo(Rr7z?l)4WD?>TKZ(X=*
zWJNW%G~F_dyWK8~ET*cu6G%HUd|P5)J`Wv^$MJ@`D}^*OHIQh2H3+khF0%=*RwQlX
z%_r7hU9kO3>VZfmJ&x{{C6`H;o`e{d2k)JnYKyyUutKT<9f&p@!2UddfqI^VZe2vN
z*90>nkzHA&J;zB2YBR0sgF3)LbHO{tUSm2HtY(T!J9x!|TK^|Q$bf+*7`V5wBc5un
z%b(IhBDfU#{{XhRVd4Su#0PE{umHYE)X5(+?=y37ZG*|Jcr@!q_U`&H<QG2Y6>#!D
z9RBneOd_`G!<^?YB8WA8O)|8(QCcW%>h&dQfw;}&150R^KWj`dB=}WP6_>0VZB$fj
zAz1&BAeM5olUN4ca8IfE=xaxBRw;-Jo5Hq-iU`J0ak#=PSEGJRUYr#V-hWbxMhd}Z
zIkOdm+Nq+*5xd(YZTgkQVsHbB>AQnm^#yBsG3&idtZb_(3B(&y|K=_oI~qh)EDPMW
znXY^C&Gs&vY%mqE$|OB=cKw#2nnhJzK4|J^Ac;Q`cFZ2FDQzhb$OekBYWbBAZ635J
zod`))6-qnJab^y~#iryp<+qk1(B$(}1eYo*7&uLZ?FmDg;9E-8P2F)8yzEb&LeS&r
zlD57WZBm%gR*TBfD^)l&5@M%CNJz?_x=&1+w3`Z9FEwgW;O|k5R1;Q(#u#&Y;e8I*
z{Z&hFR#w{ea7)QONqb<mo5t>I;lmSFMlq9|V9@U#tZ}D(a#G6Qr^nK9U$G@X7%vNl
zNr0kL_A+WocE;6nWQM|J7U#d?Vzc?vt0}W&)Y^Zg!N;1+U^ZFeTM=yC6xpB8o-zk|
z!|UE(=H3e%8T9Es?F--1$p*JM#?<8O;~;-k@oACsYp#wD5DKQMEicBn@ji<ij`;k`
zn}zjfoQ{TQ0EbHVa_xD@7;zPbmG7LH?``SVqWAI~L7|L?*!lP8J2aIL2;E>fa4WI-
zwU7l_3`&JlWkl?U@n7d^<om+r-oxn})SIGHx4BP%pWZRrmQYoM2r$uZ2jA!eJ*=sh
z+78;>A(vbQ;WK9wFvSOB8A)52|0DqbU%Py>Bg^cx^f#LOKoF;2_8HF?4^Z>ctpwF!
zN-4~*=KIaOaIrLo08!3Bf|pl9-B=qVXiLR%$$X9ICNNL5X{42Ywn$E`XuSk#^5=@{
zA$=DHNpUKYroyAi@pd+<4ukn4M)HdtDvIRw?!tNCtRPT&pvT7Soi+zm+S;`J@`5Ep
ze?VgwP#uvMA07{qZsW1>Os7%>xAEjOe5fIVd$G3p0|)W5x#6YUWa7UwGkV_c>#1xo
zgxd@TtQL+KqLWYNzn#dfTrPWKRf|VFcx2>f-uhvHbvjYcp+b<m0l}7LS8dUM$mh5h
zXWh9UzZSlgtXx4PGrTX>PMf<NmB*Ol!M~U|RAFWe*N2gy;V^Fyah?)i0&k4o50L#8
z|42C#4@27pSd;tNi3Yfj9KzDhHq|P;5jV{N63!L#EY0w9ud^(tf2b_aYURl2tX)E6
z#MmepfK$T+J!ZC=&^T0b8pcYZeA6&fjJEA?#kao$-=zP1`WHs1d``|Af?g{%p8P1>
z!C}>j^2luQdagF1pr6OWx#XbW$Ftmr8W#K?#TmY&%F=6HUo-yD0;y&t26cXy&pL-n
z<m22LG3wAT(Ug_}vsB9m^o8=U^`HMBR}Sp`M1|kjCM<_rIWq3~u1<g7xjj6Oq9VXQ
z5Rn_Ti$ueWac3ZMUvSG83Tcy?kAJ*p#?$JPt``C--<{oQ$+bfpE@W{wBEHIS7ZSO9
zU_tv&e+txC&tHwmvA4@Mn>(Da#IQ1opGVe>zjjDL4*tSR_n0peKu0O<)5&aQA?2p(
zJwpjSH))F>aliPk29wU&e%?hT>NI-kyJ1&8kgW)fT$#i6OZNr!x4^Eu?1nK;;+DS1
z_7qVb>mAvm4=i#?63ln@S^lT-Jwz|nxIaBTLE%>D9fuCp$DA;^7*)E48hO&S>sKRb
z1iyXzw_@Z&RMCe_F_NVr@E|R0M0B5;7fC3J*YUZs$&|p^pp2`Pya@+~7OQhsD`Qr4
z1=N6S`Pji<gm>lY4z9V43ebPl3R2T*C=e+9EoRYY_Fv`aP1^LO7(;H&Vh7{7d-zR2
zoG=Z&_Avz(v%iMWkhIII%8*<2^hKczya?4u;nNHZ)Y#EVlWH_Ix00ayQDoK@`S6oS
z>8yk4%4^|vm2MWA!}xEA9>(G;?%6l4j96-=$umT?hvbc~sR;Uj24QKlR^n<taPJi~
z!1|><VLzo75}I8p2Qea&a#x)1p@qSY|JwVMp%HL`*^U$brr1&|ObEAKHS)KIw3h-9
zW>1;94VkuLin{Ik>rSJIZm+-^xXiy7keu$oat0)b7>n3ZtsA;#q<PZTKX<qnhgpfb
z6k~Dies@1R6<l}^dPu2hgl|C7Tkt@Apn+es@`uh@_E^S<f87<>oMycHJ{^^5EKtvu
z%3I?mQ;0M@ldrGOiZ-*I^6_IMOU?s_)j#6_DauW}cD8BD)z?FdY?V<L_U|qJ2?s`j
zzD!;yPoUGXU<i?tQ6Stvx7!ORzR0bnOjQm6EW+Ewmn;()9RCSz+<ZcKS-r)Hn?Hmv
zTP0Th5qNl9O&<rborS$K=c1T{UY-5QUNgCW-$@gsV1J(hy5(UL@;))l0g@7=sgWH%
zi?zoydG#q}NS-=@xeTn#)c$-FNHUG!x1|KMj_CX%Zmk`4wVq!x7_QHemj}zOWM`;6
zq1}*@wL~~;GK#Z&rHuBcO`8t2Cd_D=RODE~GhKF1pNKboY&|ZlGw(;HOTc#xG}7Tx
z7;&{8HWGTLK><v&>e4Lh<nOU5<RL|sk+Ugz3a7-DWxysk!f*T`+}Fenl?JCZ`Lhl2
z$+{Ieh<5VKoL0cib54sgf(m)H?`|4<7S;;#<MB~(@{qY;^dpq1WPh^8lU((GQua%g
z_E|wWEqQ~V2R<?%42Hq}WX9Iqh(t!hiXU;9eE$vRNqn>yz9JI=RF^NEs8+lUxeceY
zTG<t#|I;zLY6rw-<B=ru#0#UhPuq=Qq&plsdR??<R#dWxXF*)A;#+%mFb8AvJaXNK
zH@W0uTbrYXX`N$%HQjk=%aI;{o!;rzxqGMyziTLX9NEw;a|KX}r?<?uVY;;`>kPYY
zeTub6Ul(7fG{_%X{b2(>+^_`dChAdc?DiVW3gJ_q$~*1z)@RC(Wj9lD7+Yp*=VOT{
z$e1l28;%8Ls21>$@VLDuqcmt`GX1<@*~^m0qMxS1vpd<om08O3KazT}#Gwww)&d+D
z>CyHmF927pR3~w&!U7&?x`qzESAKJZ=~|9uQ(h-TigRr5nZ8Yl^-3p+NFj*v4H?e;
zzV?*Xh;b`F#pA?buCx|&kXy-&>N3t6H$5DZym8CVsr>uNQ+ay%^J1d1q8U}z^R-d9
z1}xBl$2^+K<q<dnI^v7YP0P;^n?WX5Z1$eCm#Rv8NJ}yz4=is8><V1thj}R3m%^P6
z^a%>XRZL`8id<Z=@fTN!-23;ZX%saeTln7E@N790OpW~5pS?bg^2mMh{HIF)mqUyN
z-XAzQUTmlIt0x3q)0ky6B*%_sK%F!W@d{@)=I<()m+zL7a1i?)C>YPZBkfMpS(~1_
zT~uhoZpZ7w6?^-?4ctJD<IGhJQJt^{{HD4#c&v1aOF3IfxW{1h>g}}JL#4pXudorV
zFQj+-ySW1(RQWzzOnLE@rxX66g9@6>d~5XL-|3i7pyf)DufNfM!tj=GTd)V0a79V!
z!i<bDoL7x86eSu<&n_zNb%TA^=k4O!5YmRPk2#y2A%gX51WuhM*@<>hYWt~8*4AC*
zfv#sLu_Zx8KuU@lv8Nlii#$$)ez7pJC_;=?u0Z<orjYvRIpnmclWbeDb$cFl+<#k1
zc5h|*Gq1+So*sQFZaeln`F;=gb=+QtJUOG!$3W7b)WI)yuRW>HXby~#G69UxncU>o
z`Jn^NWo^Q!@ui9P8AMp81#j?n0(8CY4duryn8O<1g0=8g_F&qT_6<58@LP>f#(`Cw
zVee4B2stMIR5j|S4Lx%014^L)(JSxA^3xRKM5sSdCkWI=Ff@eU?LR@eoSO?;fq(n9
z9Q)34Kdmqxwen&|j*U=eDz#V)K#dXQKgRml%j^zEu#$TpU3*<_dMAM_SQD$e)$sTx
zX5agN7{Z<Pc|TqCnZ0^ncK&NnIL_3?v8VH<1qcrO2(<Dy?%n2=UYVmlCJH58d>akn
zkq)yfW(M3cY%%~-8f7BXxN<K1auT)ZD`pq%8RYq5!}gaV@dwAwpWLxY46T_MGwUa;
z_Xxc3z(1bNWo|f^Wp_DDwH>>{Y^>XF>t%cj%dqFY^}*QfKBahQfbacEK}ZN$sWpEu
zSs$k8F{bNB99@o_yo)od=ZiU_Z$wZEgv_r^L5fQzdUSL&Y0u!vN?>GTz1XlnCaE8t
zqH7Fq9d6;b`I792<&Sydu&ej`#TIcrq>kpEyz>Zv+i<WHf!wF`*qTJn-22&g7>Z9V
z3=HJGQ1U(Ye-rJEDvXt^k3r47s=^#Igf;4{lU&5j9XfH@YuqNB3qR&wOWwk)GlWz=
z6+uACO?)yg$BZBeft7j4h73GDMSt46V^`p4O-PQQdph`_<bvSg`foke-GkpsPNxtw
zLLzc*3eC)zn2l;BO1uyoZ0f(2kWFEJ$wJ;J)|JpD;rkCj1qclE8_f!&{YX|WjK8|?
z-~6(86KjFWk@x_koFShkFbSZX8y{SekEq64ra`fe8gr0GOMt>BBoRc9WZUlwJLFX{
zlqOVHs^GB}3)QWzeqzdFRqU55|3x}p|2#|V{Ftp*YZ#Q+G{*6ykmvU)nqr+@JvFyX
z6Z7-&UU7dB&#@(^mX$Hsh{+VX?o6j=P3qa{_2siN%P{hYP%M@q9d~W|_nI-Lrjj~1
zXQuAtl32N!oOlcwm*L8>F*A!hEpi-}b?=UUpf_MMgCEO~yS52b{U&`A1y`E<3iG9%
z-~YN0n8s<SA`E+SSMF-0`wMZIY&@X_1ULn9X(&c{KPt}3#xPZVTUv*HCP+oRFFF@{
z6b^ILd8|wjtGPEw0cOhhNN!IUCSDH&Lr*})l@P2r`_3SfYmGTxtSiGox~ymCsOtu^
zsTW)R`KYiBh#`b6VlX$rm8~FJ4XWUYx%b=$i}eyI*Z(V9D*OSIK$#KF8&V~CVTd;6
zKe{<>)r~uS@eASju|Ag413&-dkoZ|nio8Zj5gi-*pubh3g1q<DJsT@T5C>;0^Mrq&
z54W@*wMdJ+EH!?a;xfA20~^TPkWE!P_m#08Ery-2+Rtl3k!E6nnOLXI)pvKGCBwvu
zSXs8;Mh<ruS6WRGoaXZzk2^&@zO+T4O>2|pnKB}mveEv@GFRBAEK>!4&vq}jK=jbn
zv}4;+$m5P~lvz>4M>P4t7Ve)^{gVwUf{pLU>)_avOh-QKm+W_Ra=!n=*IRJa)ivw3
zXmBSu1ef6M8X&ksaDvOi-CcvbYjC$ka1ZY8?(VSAyWUUsz5BLy&R>{wwi<I(_5PHi
z-?=8uQ(x<tL_!L1;ob32nR5?UBwHLZJ?L51rC0}acico+C8Rd1rHxw(mmqCF0vl69
z2_^aRE%l<QmSm0+e<x5fZ4<2vSE}zcFqr5)uSV+Bjh{Y*X3%$NG=Q`BDizwjbHK~<
z&~75!!6G-rJS&6rXs63d>wIzMeTe((wM205Ctm7J;tK<_0!%AQh(IJif*d~2e(#HE
z=yk5|5L0(5Hq5YbeLiS{wE8+o=a&<!qm8v9?bAv4SI<%6n+6uWQ4_VLG)KgdQ}5*E
zCKA$9XMKGjZ&{<l$7lIuR`t_^(MpWhFxFrlx_zW{<DUqYoRH~FfX7Ta)!CjYff7<F
zSs*J0h*;(#y*PqMGXhY(>=GbSaXyZ#IKUZk6SweG+@w@)*>LRBR7*5LTxh`9fbF0V
zEbH?X{Gm(N$ww<GRkIZ_?j*D%K?8=L{pUK=T`HB4Q0p<&>Xz1>YLZn>u^hC2=KM&J
z2GZrCPOC&T8nna+U$;><qwz0&LEv6kfT)4wAoqTMrD7GL`X*BRQ*a+VaCZ$3<rDWj
zi$(Ro`f+7}OyYwZ0-Sqyyg}-R4HvGam=_r)LZ_Rmq_Bi-aJn+{e$;dG#Dvc<ET@w@
zH<ev%NwM;S+)BpJ(#Z#1zoDI-4&h;*=V<04a#V}JP=)D<?8U*%zCbpdgWH>Fi~4>P
z&A8!{kRH$&a3ZTBEpD4GgO#y9^+>y*Ji3p1i1X(IH_yPUrI5Y?jb~MUx3tBLbNR{b
z&iFVdFl(c}dDNduLEgL9)`M^@N!~>TQUA25&^ePX(si{HnFFs10SSXPR3>Pj3NB(Q
z^26@qd~4ak5Z_21e-wszNkFxidL1jt`=<M2h8Rn^Gn~Web~R1H9Cx6P0AUlTxm|Lj
z<Y01&Rn_U6__1%|gE@akhA|})PnwSab+ukQFnQ{4Op*~FnxbA~S~5juPc`|}IR|oG
zzI++K2_iW)nF(qA?(nh2yWk}YSaqoghp}jz-3;GOvtJOeN#n5IXInPD*J24gD;TbI
z@Q$^ST6jP`b?q%<*AGzJ2eHcYo_j=CQYkD-I8&)3BpUL!b^>2($)s^PEg7jM_tS|#
z)QeX8na9`bocn5G5ifBM35zpJ9q)kX3za6alrO)(d^k@W=;`P-6F5F>zK+DUZeD&Y
ze;<>C#x!*IC$NOQ8C=xvB~X~6C3k%r$mu>)oo$_VoNmF6LzJ)hz6)8Gk*c}*?zes%
zOUA75&^&mkas{3=Wlh4Kx^jvT|5P-z^dciItF^N(pP=*qR$Y?o!8CPcHDuYE3m*3r
z*d*|@GUme6EW%GE$h@F9ZTa?<RTZnyPDAtsL+GU<>##cXA{OuRM2JAH5-3Nr%4LY?
zM?Zzan@s77hq`^de;F%>d>$^6^~r^@IZ9#F(KblK(($|hAxCUvnf|LmpM`8Y>*{8=
z?215}Fce2RDr3uFludQdn7q&-dxvh+wO<`}G6v3KkK2EKmcbtqyNiZhQ;mPnMDs)}
zWcPPrP%!@Fyum(soXOTMfpN&Aat~%?ZE(+zz_phi#jCW^9u;SnkiGVGNrDe@_n>S0
zbDP1K?5q$pvvK{vCbWOLyI33s&S*bSr)&d%eyOxEMNRY<kRH4>>Uem|#+}lzsIK7k
zKH<n}XbSW(;w<1+e~E-(6ht3pI<InE@nzdxwtng5l395lywg{431&O;?a~&SqA5w(
zR8b1kZ1<xO(LuH8J0-vWI5o^Ym-v=2&(AaGD24k2H<RC7tApEwCEM1=P>{u$a&%rv
zPKr!B_no0@T=`tTy!7pSMj0rbX6bIlI9YfhP%SPrNmtvW$ObrpbkW<Q9FN8rs*p6x
zMpy(OTcS*3&k9HkZG-0(vIgY|MxsQ05_j>7`Tnm3z19}g<t)bO!&!YMy=)Q{tL%v$
zk?+_gJu*XfHfS1n%1}+M$VEIE(F=IJ?Av^bo#W?eMV}*aDu5fi!U!wUEybx=28e9$
z*KZrJ%dALj%??nKqw?QoA?!%=W~o_%4tn)2^A}wf3B>NqhWfYXqoS(6^NSLfM%3LA
z$%<UU%>YhQ0VfS4HZxVyovy%A-S)$KPuB`$7qJz5^?>?cV21WD#S{d<u?%ieC+)0`
zdPw$QvWdkvp1rc{YqE&KBK+!2oRxeG=G%{pc(X4abnVY*?0P@j$|lM5yvi7}>ADUj
z26f<<qMzzzZ5b9J((gFmWE3P+9~XPy-0u-Roiy0H_N91}+UDH7O~XW?vIxM<rW&n2
z-#;u<$`OaWagsZihfI;jf(8E}yguRLi?asCZ-c=#h<oZOY`HWtV%zdEr*UoRIzGLE
zEHz&J&8LGPL93@%Y+qGIx$hG-$N)FdkSd_liAS=Wn8}WPJYnD5*{g}{QnAXj1Jx<P
zZ|C}wl>1p{20I$vUr$mj?*Q%WA9%M6__?=oFJqz<hePBNz9mBS^8wU#Qa=|9Lx=A$
znjI4{OVUOD<*cC-fm|5IqzwDM?>@h#aWN1r$OV1tS&Yw%hj+T|!*mj-IpM()Isc75
zj;J4~r|@PJge-@_@WLq0VY|Erg@ieKW1NUEs52K%63d^n6!$b!73UtIml{X;_T(XM
zFE(!BA?8^%$b;3%e(&X?EF^G_$E4a()c19es9iN#;O7}SlR^fCY5oh#U_BaK6307;
zu(u`Q`jYLiy**)?{E(D-wtVS+Rvd>35pi`fRErV1{nzN}pu!X5sj}eFOVO8)&PX=J
z3nFg(H^I&S7)a#UG)b|z@e>QWQUFbP?BQVNuQ>o~AT|@aXErJ6p^Igp()eeDUvm4j
zhO^xu9nzz(F0%^|i$e>Pgq!7oI}|d%i8AGMGnnm!P=;5pALYJ4P!M4{$O|D&3`w>2
zHw-xlRD{Y>3Wd@m>ktSy)U)z)7Du70+Up+$k6N=)@5~Faa8_+WJ=4qEwlMHU&nERc
zuu+lEy1!;m0o&N#Sv&2=2@G$B2Wkk-<*sF-=r-LBixuJ2l8kmHv{ZC37n!e!o0yyw
zCIVvpGCNED!#Kk0{x%$HNhU|bfHtq>mIvu_t=ZR>Avwg}u4dqU?F>Hk;goZTn&<Bo
zlP|y@nYcSI9AM3D|Jp^=d|SfAfE`1(th8t8r#s?f)vuH@5RQd_8SP3zHeqAfFD*`b
z&remY<VEFY*;<U&@Q(Mg8Oj+kID*E#^9RC-y0Z>*De#FSCK|P`b@{#9b3kqr+WR$C
zo?@>`+}#Fo;A75`<ai)EVSvD+`?~N<ZyByG<*Rp&s=gj)T5-q$mLcYPN)EnP>=Xi?
znvM>kBI(tAH~0q!<{u5pP@+fpO&k?pm_F!Ln!@i2+6L)~koZgIeu_6`YAeeFkJU+(
z<p3UZ9m~XAb;=k)nk$>SSTics=r+ywxcf$O$H07NLBsb`7zwQLU#O<iB!`zU2$(-c
z1o2ZxlFMs;yVI$#TDkTQLu7C(s!pZyFvhM{R0}T{<p+y<U1^&S_00dhCXmMZW6E9c
zCHWn*l{B&_>Vqr=IP!$%Z{jqfS|_Pybnr<NcXB{o>}FtGAWCFMQ{#?X{j7l1MqkQ{
zP`W=Y)`@Q2y~nGoiFzrt;?sX<VV)&#%a7Au<8p?Vzp*y9+FOKpq%7Xnx8K7OXVmg9
zqDo<)1vAJ@+$l*N$x;xC90f`Y2st22QJfOwb5k3{ddd)as~p&D^nCjmVNFt1hp}NR
z$$(TQyy-)@d%d`*CDJq68y9n-9(YuCRhSwr&}3`%JU6X(v?W)bMZwv{Mo!&z!q1SU
z!)ptFOa2Ze5)WV*u4r5@B@g;oz0%|$9+Q`m2rKlf2UvN4q7XwP5_R1LbK-U>7x6tN
z!fK|8AGNuVM30FKh#UVTEGWtFt@tVnfARdaiDS7I*@{N(!|Y)EU*na-aC}D?A^+$g
z(~hg_S+>hU=rtcLJ(LiR<=9~qPT1mop4qSc6q*=nm_9w@m5;h6*tsee!`6wihc!RR
z%Rgl&0iuZMo2L<h9<oVp+QipFuZXz4^YGc#xV9urEv?jgh^^-h{|-23%Sw@$J0rgF
zIbLUOxvc{4-Hq?DM$v_H8$I`i=lODnBdl(10A@eB7*~``R@V1KXErCSq@)4mWA{H2
zy9U%sGxAda)o#f|j%IiD!pllEJ;kX#ObKH+G6vpvtUuXAACX@8w1(|XWrvcsSsRsp
zG)RIn4z_6-SJtlf{}Ne|-!Yt4;4=ThLfy%J`ADOaumB$KjP0xSg#mJEDqeeZtUc)z
ztPHgE4z_Xm<d4X?yykZHZEK1_y3#NTkfq%PKQtWulO4T34<6s%9WF$fvZO~8n<o!R
z-495KTgi2a+($xr(p!&+R;8%M@D}Uux<q0=vrasVupn%Yti)tU$cD7ewEZprTfOWa
z3k;&RJaf{^<FU=wj^Pr(ZFXZk-TemX2q)FStrq&lyy`PW^z)VWQsgyV)Z)m1Ff*MT
zyIt%=QR1asJ7owjl}rI(SE)W?65#ksW9x-qr5-Du`DrmEbFV&_o+UxCy&?18nxbdG
z4HbIo5yIkeAt3x6dS@zSWpJBZIg1J8Frr&!Y?nsKJINS$8cu{1x!d4jjf=<?N@O0g
ziFqTtJHN3ZMnx$7clx8%Unn@RycmIr?33=&zDI)WZr^W1Jrlw(`GB7j&FHm46~{`B
z4s&PneDanX3bJQZu1t-sYBGs`+8Tp3aW@=(dakC*w}r4e;O1X)B2T7|q@wl}Rk16e
zQ)&b}3jjyu@Nvx)zkjflu{6Hob@{%AU8cutu1Zt<)aSV&nebLS<|O>2)z{itlo-@k
z!(Q;o9e;{rCK8(1pv>}f-%i}MB2hZe4Q@x9IA?3rf66U#nPR9^?~+|yjIZ$+-ef)U
z3(E%xwZ(s4$V4q}P7Rmt+B@({v(c?EVJ@m*{t34v_9A5iDpy=;El^%wlZUE$A?q^;
z_nVv|{g#v(e}cX%^xPW9A%^F#L;_jL+l|O_Q{8pxgoJb?tk&Y3AD;CgzhXJs?@(1Z
zl7#4VGPyS^Lg33piHxI8j(Lxlzh^8@{q*sON&W_)LY~i~RH$lv*VN3E%eoOd+P#s^
z!GzNI^>b!OJbEu{ChTm<wu8p~Tb7ZQm@i!HRa4UplLv_~tEH#d^SfGaUE-Qe;isHk
zEEbt~tj;f-aoB~C-awS1v^vqJ$8Sd#joX#1uZ(!|{ZEg+Ybm}zpz^E!tL7BKsLPuA
zQQuF;idf7L`PNvv(<mVan{oIRf1x1kPc90~vXAT%g9X)v&)vTsW^rNZ;U9%MF@7I~
z4ijcp<H<*NBvB+s)<QsAuuPW9>)+wX4#2ipuKPJ~^i-we$}90Cle4H)oV(Nmee)_l
zFjNRqnM2HojFXF=u!GuGY|&5+#kd)5nwXOQeu}|whOIvG_4v4EdeFOCkTEwZ|8LY?
zB&xKKfRA?{F}6IRcr~p8Pe4*My+a5qv}*s0j3@!^;^b6W;_VNMPjiSvpr_+NC-_ZX
zQ^hE5$$h6HXsT5CDYso~mD~^&i<FM}T|ezd)RXw3^}W^fL?d<*{_Q21eYDZfl^6@k
z#<}bmEC126pg(ZJH+Q$aHYa~&gxhyKZu~DZjkhcCpVA@Q9cJ6|*LveFe#0`;Vtrdo
zbeV@Pl+O@-KyS-a4~U%Yt|*4kl?LsrSB_A|*sb!J2=tZrLEtH4bH+7h*MYGBqq;~*
zvO389)wp6D5B4wou_YI!&H3&%BRV)tKp46FcK2H;rX`e3vXci)|C#GkSaVmg@v<j<
z0;_0r>PPXvGa6X!QIxK>o%SdIY2IvOaqq8(mzkFzyTTc{?|0_WuUs4))|#(-C19WI
zCHLL*VdA;PK3P>KH97!~2CdB35p>xbl9V^@zcZdv3SpzyJoI?<o#yM3WY-KE{5kiK
z5Mum@gO~tC|6~A0UAGmOm;iF{+rWD;vRWyXclXH8%AzPS$hML8eTJOqzti<h>2*25
z9}BKWxfh)JUPh?*U(M!9wZPlh6dmEfpjsc$|L319EQr8!G_%V}l3yra6E{Ho3FMSc
zF~PBQMK0wjZ`S|-l&`89T}HV$9jmM1YaVR{hI{5vWlfstH7!1gA0x$}wicOk{fR2c
zZoeU2;ZWoB=X6Zf&m7&slgGovWmPw2O=5g<6{5d09lHziq6xH1<>6i!o`dRa_O1;A
z|62`SDGrwYis1C3l@Zpwft|a5B|TOI=61jlYz4gLkych8H<61Hcf`*kvC^G3IBnET
zxcj`iP%mgOCBx7oveW;aWsqz6q#8JXE2?rJouvffqGX~zlSut7i|CPexQN_Rfx>N8
zMVCw}!y3N1KC%J5K9QtI@|UW8r6!8>Or*mZCa8uv-K|`FT%2q$G<b1E`L_Z=fTBLE
zuQL4qt6dRx(>X0=*w6hFkrlvdtIh%6^F-70N!XYqJ=LJ}ym6yNH7zV>Q^lYPG1mFD
zb-a*~tTTc(DRSwk9EHf}nqq7%BjHzC-i*SNyH-4UtmV#b0^Kh$E@^4|wds1TB#Q;&
zm!e~U(hT#VOK5VKsh?iip7z&l)__I#Bjdg&=Jjob){X!Cg9lEQ+@O_@`Hy2Rg8m79
zV<3c0;EO*{<tq^?$KvesaVO9~F_@7}>AC|{@0U|@CU9a5|89dD>aYBGirU1lZb9K}
zy5Vwi)ZEDQ9+y{uu^YWw*g1g_UzW@@9nW;CMx<l7B@||~TVVw%jFiAiY1{R3<-p<C
za#emYK&k}V{YQ#`XUdfNqVf8KI%-DkWBo7d4l&pw>G(AZQ=uX1KD(NwE944;QYDK<
zDp*d|Ky~4Y@LYpR6GUKCZyi*Tpq&mF-)(a2opqA*Q_$X^Q&UvA`noJm)IPB?7AO7L
z+uFIRhS4N-xT;~?vFm#FCWVhSRX;o=jJ1C+y^yeAW*C?I^&5?u%xaxYkTda)m)}c_
z$Ky@%#nVES&RB`>`NP&T2r0F-OMC5hHCLlXufub^{r@W;m^j`G_-z|K!Y#F1&Q@0c
zFZ;mhUi*@A7tGY=?$=ecxgkt(DY-JLJT``VL3Y2jKb+5s3jJAc@>zIj1Joa%+#a}1
zJaM(SoGyTc8F8O{96R4b##|cGc^b$2KB2FWImC_kHo0qN1jRk^(1U&d7&_IsFzj9_
z=+UBtyhO5@CwRu6F$a8GG=`Im$u9LG?yOceU;}BHe+%x?9e2xMRGW(}#2luDwNoXi
z4zrm*`)Gm|)D45i_pdYE$d9#}SrEI#6QgXX7b6sP*$0Q5emffpa2{iQQ%%186e+oa
zm;H_@8mdUHl*p~y8prp*`8*x#*SfV`ulxURO+}-UDo%d<jXc=5%egZY$;x@%4H9h!
zBguc6^cgomne0Y9ap^QU0#+M7Zj>BgLm-~=Uw(j$7}@%+!O~{@61M*P!tjMY*e0UZ
zhjV-wGJlk~_jmOBi2p9n*m?chKpas>+miZS=tT)5Kz?1(QV9I4Dm|Xl4+G76Zb1Wn
z;6T+(Z2vUj>-~~ImMX<P2#|;`?-oqV9g&^$)g+SOqpaywAnPv7$=U0A*9Tlfd9(X<
zLW_G@E@>-RV`{LRrEZwEKRDBJvf)y0bQ#rXFdp<yQ~)0og75b=uQTqw(lv`>1DAhU
z28@2DS38cA#s9R8$s`}4tL5nVQ$!10hFR}XE-u&GxB@DOAI`nypcsRn!}%L-Zl$PS
z22Wq8=;_}SERcB*bD1U+9mtjX614c#`dqif@qfVcp+JTA;#FTUg~M-`cEiSZKP<aE
zwuIMc4xsm;v<jQ=7Z~+O(k20$zP|yfKlFui<|P#aT$!)J3<X7f%V#sJ9-+WFT$5C*
zb(CMq<nx%4l-yk2`@UC5vlM2sS+X(b>3YXdC6aSv_Dh?y^$^H)^E-Ax+2!(^GmXO^
zhD3J!9a_-Jg%tbaG>FQM7Dq~M6@Jz*n8SWJ(P7*)c2aNtcu~OSy4Lx-!V8f_0jz(W
zUw*D+ZnE3tYTNYIMx?#n>S1;n^m6snrs|$*GM|jX`K-EvbK?C_)o`#ABC98)dODWN
zzSm%Uc)sqG{%f?M&g&xE>D~LK>0EC;1)({X{>QVM-SHlDjd{6ZGSmy^p58O~J|t5Y
zE=|g(VMT4DkWE6vnvV*63)ys<501xb47w7g(Oeg%U`LM#E{LAv==X_mVV(_1Kpm0d
zEEt`S1b#Lg;rXzXPGI0hU#UeGR^J+MY2RQ>L0a_@NKq>%%b&n3CGA>^HYcFUu%VW#
zzw4=gYA1HsS+Q3UNWvF1BJ)Aqh+1bLBnT-P?0uTIGLz1+mD^QSjy;FMkW91?nx6Rw
z*B6SCO5$KN<3bAvhQg4;*!B`?XdA-D87mA(bMdH;<%)Zx$?+ap%*0|unfw4b7;q0^
zHO`i*pGz%7b?2L*$6SJ{)-gO_*~BAA(8Z==j0DPILj-c)SL(EQ!@Rv&DqwAF5&Xk<
zebzls7q$p2d{rNBZVYnH8e9EKKJHp<6TXpW+jl*^Zjo&HUVz3*_!~@FLVQ7)HP2iD
z-a?#May?_2P^&Rb!_ZxBcBya>HvwKfTmh|qyCCD@e_(wA5v!i|EU1-NFT31RxoSur
zIw+e;%bxtMjd1GO0NS5g%_tHu#-ma!@WtO_gyu2i5mx`$uqz6>6#g=qZjUD=ZxZ<9
zBKbN3V^E1TCpwzD_;!`gJaJNvm5CeEWucJc&dG9F@?XDAPU}rFz&BL{-oKDo@J8JU
z^h+SeAA(58nPs)9L?N4NFviEHny)11HX^ZR0)80B>FBCw$NXEJ-$%d}Nxsl1dG}Q(
z&-+f~LH`*(c^+}syY91~-%h`@)9aJ0DB;96{~}L&i%GD*IC?NtX)sq{b|$s8ixGb2
z=XIY<t|EVmbnVvJ`ukT@pC+%P^O&)lQST51n~f;TJU*wNa|~UgSe0@6IqD+aWNcA<
z45sbiuI!dZ*@)?$k3(Z8IYoXEBM+P9hg=lZ4^TsGL6atRmu2&uyu2vgqXu>sW^~D>
zY4qHUP{p{Hg*t5jSBvr`e}BDG#2HQ+z2=7f0*sk0$B)BaB55zn;{9ld8lH{Ui)DX-
ze4O;mauo;!`ssJb9tnt^LI}1%2&mit5dcJNNCE+5@#6X&u0R6-9~Sl2hWm1j&r6c<
zCpMT2Bg9g)#=n=sj(PlHoV{_lm?lsA#bcO1jUb1alfIoInnY#@%05Ef^MR+Nv5zYT
zxiJ^8qt~D@DLN{L|G@u)X6J)%*Wj*?k{aqBw8!R0cV~_+D!~4~?Em{2V<JW0dOvd9
zK{~|i6E2B-iqonbZHm-6beC6dZg;m=7y`b#tBP-|pl>Pn=Z_#Cry3Xi&oG-tHxlRO
z67qN3j39zQk+ET<!N0Pptvr+C@RE!Oq0XwJ!$pNQP~=F##h<|NCRm_@U*+)nu1kUC
znP!fFAmn6r7t)Qena*xL-t)~sCI!}nW3g$_{1GH}Amrqdl5<<UO&kG6G|}Ox`7hSg
zFD4;QQcr{<#cjnz#cTu35x278Y+#LppmMfNcP=4vMw6F8+kJ53lHC!B`TH0af%&-?
z%c|TM5XbuI^0Y|`*pOC(R$-WgikPv9C^f8XynLJlysH7uimdKTWMqHE|Dpu?7^Jf}
z{KB|qp^K5l(GlT~Z`8&KLpQupcEq=_mKoK>;bO)dOZlN-MHE5GFA;WblptLbnG+pC
z?lG=fMeYhoC0ezgrcXdMpj~5xg46g1X+MjsoTe>h2^U)pJmBVpSd<G;LW9|P1w{%W
z!=qvr(M|Zp1&ggD0F!w|NYvWsFtDrd#{xF&Mx;Mm_>>*Q28CKGr12$iSoHEY903-~
z$MU@Dg_<a6lGIjFOk_J!wc56wk}v)d2<CJ6<M^C)Ls9E{pI>X+4E)Wg*Q!dgEn}y(
zmLK0Abf;HLNK@cRpQ%nu0vgFJLtli!{sMJ+{<rL0k7tV?)O*n9IWzihr)?h((--O8
z9rJu>I-jTPD&Rl^Jf0Iwha$sBY50DY#nIwb$mpRpW8u*7SLkq3;tHdZklLdj;nV32
z6fK1r<eIqNdqb*_APD(6AYifnUi1cO@3Q;-jlIg|@(fjK^mx|JxsU*&moKgMpwUJX
zj<hSOTTD;HI1(bT?lK?FCu^oD#8df3_BQ^c-RH$MzJ2Df-9}?^Qn+>V58WPg@qu~R
zLuk{wR_W)xdmS7~8~VFN`qbICNPrIrreBRH6NoG1HFUcjMsmWDVL=Q#3A=)AZ{><?
zBQH%YP?As=yhjYF{p?|%BDX}E=L>|vv-jjmv0|Vq--P8=PwJIb@t!Qx!l>FKLhe={
zknSvrhu5O2V>Nwc`I~{6dPgf|?_nL0jf-uu_jzGWZDk3R6RqKzBZMP~BoL;R$kulV
z-|W1d6`RyV`LRzSVGnd?K$c%(5d31qv!my=MA$42Scm`LHUhd3r4MPlDr6V8gwTSI
zc!0gi?P3lok=E0SRC#hzW6IiDGmOZT2tR_9<q_DDJ&WD!@aFB*w=e>F#JDJDr4@6e
zHFm0wi24txLZcg##uMa#5-E!Rq3Dm`mQb(GWEN3WnRivGNqM@1eI^CH+KefC1%yip
z7e4Rgm3fz8)vH70a-+zVg(5ZIE4yhw0ipA;gAMu@V?(ruCMunA9=5)rxdo$2t*$n7
zWrqM5m3N`VVLOe1P_^8CW_veUVnTT_aAqc`i-;v6oJu0Tk7xKabEJMOKSBn?#o!7Z
z%mWL%1@+r`7J{G}t=zkm{8&bd<5qBPcC~*}Dnn=*%iZ?y8Dz?rcCvwUp(llKF@6r=
z=CTV!){vl#FK<6puvc9kni0sC!p$AtFPrqddEL8V?`-8y^TA(Wtr}1J11F_?<Lzx%
zUZ)H39Td+7rNcWKUIMs+xh5gQ+3#E|WED{JeU6$vj-QZ3y?WcMz${bSVW3Y$qFkCT
zt=5O<#oCiiXse=DD9eEh(^2A-(9+}9A6FaJJ@sdyEe%`=dnSry8LK}mh2o+F`t<i~
z?Rb=*bN8|@@-gb5kY)=4J5m@Ilv=l}$1FJPiWi@L$TG1M*_5nOz-nKG^d9%P^3Z0>
zyIxbuOcCt8WKp(A`nB&i2~SK>mvQUpb3IW?{SEIQAm7a`Ih&OJplt^IGtPu4G@HCU
zJ0FWHvHsHsNzm+@nJv3fi3^!AA(6O=dCr{nxPVDOdLbgY#azT$T=>{@zWUc2UHc`l
z>9e$E*)X?!=FIzp%hJK+7ml)(XY=OJI4R+Uc);8A86LI7Mn^lIYHziCILpW)hwQb3
z9;;_Q6YM!VixyiAoOx$<s>wb?qGWATW=ix#pT7WeFPjlXz+@f&{_b}_r`28Md^N0U
zva|PemRKGk3qq$ng72jCI$vL4s8VO1Hx+{TDLV5c=(PZdP(llEFg`NAbPt#_sk2PQ
z3m={GLr<Mydv!22vZtcA&?1CcRN7ZQznV~b<J(E;@|&G48_AbFUe3Qp6u8il)#oV>
zx=;DJs;9{-!p2FGW_d~HjzMy4OevxYJhzZ1z&*nD<FAk`RNg%FM<9Yz6{>;e@&*Z0
z^15-Xtu?)Cno#3_OP@#BNkVFY;=DZ{5t^UnacdCsl3@Wj<Ms*`K>z}d8vy&^DO44v
z<wW|#XmnyZ-dU<)WQgW<29P60H;p(PiH|aJ*y+n44(CH)Zrr6n%7&G?BZ;1l9bwLB
zNHBpBuJ;G9-RXYzghiO=xG0W5wN&8q&#Ad|R1d&!T}N=T5Ny6q&2v>Eq=)#Ls}5~c
z58pcYvh(x1?bI-K+|ppz6))!{P+Z}qEoEQ!<tVTidxe15-{yU(xSO5L(_C_H;~Ur~
z%2wazGo-yt7v?4C4*@uzGvrG7d+szy+*H_v!0e$l=BY+d?maGjA-;K37n30qDriF4
z#uv@)^t`v)s|9@Rj!5IC`LRIy=tX>abRx^h7zb})N3i`fFc+R70b(iJT<F(azq_5-
zD%_${qIv=2iCi>XfZLA}(HG|}(I%LrMhC~1hA9W^?={=!9g|jI+=<gzMSe9F(6dE!
zno53D=2{r+K8Tv#OrHN8<#@TlJm}earEz)FYvj~9+JkZN3YxdVXMl4_pe?M#EaQ~_
zvXWx?XF=qnKB8@z{q@e@Ji%>`PS2aq4c5*%MPaRD6=3BF3E@o9IM<^>Y8OmZy0?VB
z%51>V47VD)f0>fbrqs<Sf2iH@99HUPo<&!dDri%aq`EAv5V`QQ+|HO8$BSpsAq+d#
za<E(R*{SW=ACV-`cccpcy=JaiE!n6t#6eDV?G)Gl^Csi-;2*kzgAO%}46%rZ)Xigo
zJzlhGP_mVZlHms3u(q#F*XA6S4UD@2={2mmd{QHXXdtk1YdjST;vW}7sYe%A@WBzn
z@Y6Q&&ToY4da!1pM_oG1n8axLE1y_oHcUUdhn>w`cfcmD6vWu5H!hfD;djjG{jNl9
zfv+r!aG10P#Tzq1PKlb+(HM;Z75-%}_a;yda=+_!9P2%;DPoT&3VH=%R!&cL72}K-
zmIIMbe`7ptV&~bJvUf|_^Ul9xMLf+{Kw`<EU}ffZ>=Bm3t=S9*RvX1Wo9{8efYJAl
zMq&nmFrQ5u_ld66;Y6IS!gO$tU{d9e!i>o*Gf;xjJ2I`Fs<iYl&Vzg&41b9pY+$HK
zXlCHIH<>XTz(qFT=?|0rnQU5t9?AI1DMU`bArxF=lgLGhEgG!ZRk%$uNgZhA1O)7&
zNSC}p@@sY_c}5oazy$mnU&oPhd-6?j3Jo#Fr?L8lQ2Twvdj|GdOgX3x0#dlp$%j{#
zqO1L<=S!LUfQ5XLnMfLHA8Y~+O+${m1GIYQJ;uoitrp7SBdYqHiCO!0?aH?56!5;t
z?99+t|80DAbzr(4eMdT$HaYu_821aa;~fl!tEqZcRGsyP|D8hg^kAJ5{RgsjDF%+*
z_zPblO)CLpPB`}Uc~f4xWj7A+kpUCka(%a;E@#C+20VKGlkK)g1J1vW<sUQ}D?}c$
zv(l>y&H#2nR8rWw^~=}CzaHE`+HE{}=YQlK5K7TzV@r967W=oC4%!$P^nBxhTfhCY
zaOaVphb5k;#U#t_j*|<7Yh-Pr!rb0y^z0P0StQ`XA{pPq@tyzaLtY?$1oogaX}a?;
zW@r3=lVdlETI9+^DK&pG^x5!H1V8|UG0GSn{Ta4=6gc0`A0&t`u)=W`$yH1ASO1hS
z(l^-<)+jpMz!-<}rOCt#N%#2)LOwH8PKFAG=5H#3P=o$hoxoJNl80yDFpIs&(x_T=
z6{kSg3fmtqsI&Ay!w^5y7B0fGP;H20lz>iXz3X}?^CFWoc-aaa2557L<z0c!NMT~V
zr6IOqx)P4w-$((N%7nw^WG0+)5uUBh9g;=_06#j9VZj#XQN_%RpBefU-|0NBm~!l{
zwAf;3C_iH~b;MQQG~q704c4n3d}?oy7L002B4nol1hg$Rz55bER`+XT8pQlt&JbHx
zdr7B=7SS&)#%b)r`yx#nC*iK(9Z8PDxndyFMg21Uli7q8&bOoFQj~qI%Et^0i!R^~
z*EFJFroD^tma2cUaZ?Cdoj1KgT<6UvI9bXx&Ap(8YXt5(Pa2dyR>>~xRl+`-H*ne~
z0Y~Dfi>Q`=AN)qQ4pSvfn&HV{rzdr$m4nXrau0k!5g9g(IB-;kxRK44C<<rfR8&a+
z4CuCTMn^+B4X#n+LHWHINtg5IxL@LzJ)=xt*K`2Ej0(iGmlq3Mr}J?_E`yleE~m#e
zXTz<PA4uDgulQ#H^q}>xAxEVKuV(Xce4H+{r4M(4U|d4K?UpnPOWh(RxX%kBEI@rM
zcp1(gGTyQ`I10SmMROeXt^%*@7jOatsC{BaBfHP`%8}gYR#f9VaYvsglH90eeM3Lp
zdd(5Aw>-b&(;lbtlCj&^ZLKw8p4)H?{WY`e$G{nge0bCtE5L|`_)#!Bgi-K`x~5~m
zwl1c00s0@$LQL|J@j_7Vv|&QTI=)m!hc*AUIA*HPb4%EJuKnib`V2-a`T=(lpQ0|Q
z-N>!bcZx^M$36k3$GkIuRQ56Yh5t8n<D$NBHdXf;fWr=p<qI6UWA)paVCo|jqAgXU
zvIq^bjG*1`1Kf*9tHWz81}mQ%?QdC0l8g|zzmj4d5UF6A#r;cyQ8_GBAqmX-V~7F2
z>)>YO1wZw<DwVmxTg~~?+SPE_!4e5RtL5R3S}Hr8Ivq|Y1U1Dg=oZ2+7I3^S68b~r
zn8oDe*`N}?7A&_kRHHF#zYy{P+9+=BVnzv7#5JI(CKCpot+xI5)v&e-^=L4Bqwxh0
zA7P}Gtv_8C85`q#C&!VLYKDr=o!!M&uAnXF*I-bjNIVk#d>*I^zm3&B%rcNHuW1Y=
zNSqO>a>S@TxMh=dBI4^PlBTQF+BDL@PTd)K^2cc7Z=ud<Ui)+*U=LG})QmVr{p(R?
zDV5oIw1s}&q4=N4Ga%4K1&I8=%nA)$$Q3<>9Z41MwlvAnKawv<+A5S?&BZB5gXpMU
z?6H<&hZ<{0PF9$(kDQ-GNPs!{b@H^3C0HbB%qY+$I)n&^ld-25cBAOX?YI}w#Ea8?
zdm`st`h+M6-8k)A>c9{!ct@|Z8P5DI4gg6$@i0|fYc?Pc@{?$Gf*YwT?|8#zfu)Wh
zD8xsPF2L8B7+89>W?w~TK@ZZ<#EzV~GKhts(eu?izsfm&p8uW8Z6M&j1PFH0Y<$2K
zxlNQ?4KShT4$!7MT5(((h$N@H!7@cwziA3>tpUpD0xEgn(hz44kZp#o$$QpnHj<j+
z!AmiI?B#7*<c0UyczM6L&lh8S71Q$6#jj{&b1V3)URru?<4hvlFcMqH>2U2$P7Yi0
zeRqAnzPK)B(177@5ooow`g}W>q6KWh!WNv#BZl(yAq(5trXe5Ez)11)wQz+OLsr9B
zEQt7jV$9l8D>3moknH!g@Dt6P7`CfE<L+YjjS65XULhDF!Tdt{r>q^Y_}&RxpY~<|
zPT)O5-{Er@e6pd$1Y54F*j&s%*LT4kwcJ*Hd}@SRlssFJ8!9EtkN#AzL;XDI{qrfi
zZD-z>ESYO+2h!i?6dgIT*b4-@l_EUl2wW~VXgk_Hg(Nlx)i#BwUVJD!-_SBVM1Yc`
zpArnRmSB40DO}ZlYn+lIJly|1w`f8J$jeeA{d6Sze7O=Fp~V6!j!8lNBImWBpA`Dx
z*&hI%d-{$(71qU;dDP67_9ck-MV7fUZrpr&#h^R{R!YCoi#{^7)%YkAEzt((m^V?|
zjl{#5UwpbsQ-c*dXJT=&Ltd7RIIM;}p-l2IVRDN60?0?G`8-oY*GxW6dpNL1Uq&Yu
zoh32E&QPJGD@sXg7_U$&DJ@aL(ukQ|SDehT{XO;l7yDG1cI_n>bEwPpPx?NxPUGt`
zNsh;HW-WFB;Xeyz@L7(Gr3n1a@fqG(-elSvG7I1l6%`-KOl>M7rvpm%$(m4Gr=4l|
z75I%fyfG96zd}KwSPj6$S!t?jKWm@csl|>tg`UnKv7^9MF*OO!QJA|%=b5B=buJ8%
zr3~Npvt)D~h({W8q;_JW|2&yO9y%&pR7msaekt8+J~<W^<f7=R`DD0Aaa}aENASIK
zGe%Oud#+U4W>{O5Ak2;erVteppmk{JMVcygQ0%$M2%BI~-ZBwy&<&1tF-2XQ<N5Ae
zwp&MEOG&DXGvAqPZ655kPX1G;Y!2sJ<lNOJyua_Yfm!h5=BAh5Vs1}ANxRslN6AJB
z7-rrlSoeE5-jo>#Yt>Ji2hQCD^7jQ+CHV`e9{#9(yfXn8y2QVJGUi7v+1wA`6TWMe
z>}5k^9y-SMQ^(NLF~b(64{c(utaIqF1^h7l9mk??4zOMuVTxLWi%v#ew7R|TXfGg`
zPb3IDNNqFh8)0$aZx{u3yE@AV`O+7rJ$eWY?IHm+>VE!pD5t#1oOvY>Byr{1ymq&~
zQA0prnvUUy5`dfHXQ$~ELEO5`*?hl~LErv2<zED*{9%u8P4x0~C)@?^kxOSwz!yyL
z0fDw(D1eYlqZ47zc(KmD4aZqu^9HOg3Ka_7&;QK`v;K(J+tdDof=KtYt+G>^^ZqE`
z%Svm?z`o1cpG)+XdYSsrlcp0}w{tu3dV!5h5hJ+thoSBV_>MTm=tv8KgnVIO)%tY#
z#|{gHZU>RfV$i^SIxEmuFw$>J#Nz#hYg$8IOGgJ$!B;d+`0D8J*No@wq1KyB1Suyc
z)BNkqDK4{~%s|m;@gI{LSVu>&I`+mJx0w`*`uu4g+aRk0y328|j20Y}_kChwfF|K)
zax&*y+w(>rCJ(L8>C^0bnMv;DBr+Ba9aKA5koEU`U<zr>`2oGQ`{s3dPl+cb6jk&W
z!=rbg@jgGLj;sDtT(#W%ox--~oait&4WN{&D@_u9PCBh0!|59F={K6=h=ZEB!h^#L
zx%ttvzJjOTm362y&Z?05v|5^>hxxG~kx4Qe=Ex2$pJ_*oz(9V*46vf{<yrgX!a7=q
zEr`*<UY$MqAHjgH3SveRhj3=f6_K;2?7`}Pd<|>M+p*beq1q&5WjJ9X5t1D6_#g(N
z=l|+!RNUuhOw6>32$ue_yxL&EU|jjq>ij3<K971B9hal`)%U4Ggg_sca_<VxM?$-6
zRf|r5_u-p9Y9&T!7tv2W#*JBiKPSm3=$r~=`gO}znmeuGEZ#qiSP$E$*-t9?v<V?g
z5}k>`4~D<JUJe?C$^?VTfUy1B;KfB*UglgW8^@f<SrDoX!=@NNBVI{_?*8sH^584A
zzNgkSyq!!_NbH4PoXgUXQYx`8COujy_y%O{jj7hu+azCsiXeiCrM;r1&m|$`sLwV(
zKo@ud`oi24LC)49Uz!DYoS*>Va}9+nPf6*|Y>i!WnS70Y<pv___TV^OuVeOAARzT}
z(;khbWgy#NJS-~sBF?#`d(~Evr?*i+j^eNJD<3A|0T5z`jSa*ymZlV-F^GmzRtWCw
zRN%0)v`uq(a^S>r9x-X*zp=`WIZgM+#c9ZnNQe<Ku5d<Zea7X`XNm7_z^uPdT@dln
zQ3+Q4R%IVmD@J6q0OsrpESS>f5CK#2mDm=6gpm5A9OQD@k4j2xFeZo#s=XSFA{M3J
z3J2eh;%Kn8rrq_ORDS)-=UBDFbzZLdm(O9LE!q%M2z0Y|wv}wYxT8ep=qoCWsCHtU
ze}|f)XV3WZPYXZBnQZzZ;=W8|7ttj55bZFpOdM105-z+Sbc;I%sOiF3Lvk^ZxRqq2
zYeY%%0&5{-&r39IEIDWyH_S-u57O*xX#4xr>Ob{3vLOPScFooyn%(R@i?^=_9}I9e
zmSppW`3nk-B6ySK50SK~v2|6ozqE2+WMe(HGeW|z)ACH3a-~DiblD4oYl!{vOsVC%
z`p*JJ-t@0j54BuaQt(ZY2l=UqG~>=h;V3j+XqR479Km_i7Z5C?CFk$GXX!iQlN;#|
z?7+`SX1qOhMCW!qwrF1z6y1GoxtJzUba*?2GHD^54lqUhJ{2HYZlh&^S4#1BA#TkZ
z{%VXV1PFYqDvWPpLWHlAv+tl@YL+=)Oo-bhz~oPMFDQ(oa9AoaiIS9e3`$EmgA)iP
zqjQK)=cD1rvl2|-h6j3<We!sa=J#-PtP}?R*tH5-qO90E^-!fA&yaM&_o){L3#wv#
zl2hhf4@keuXZG7pfbDNC^a{EtyTTTW&FkQRIw&5D1y9qODuQ96b>C3L8)qA{s>e<2
z1#reee~i^P*~N56n}b~g2q%Nn#q)w<J*c(RrjjeQb7qKeCU<vV@Q}Oxn4fcYU&^x8
zL6*V}v1(267X%cjSU-z@a&a?3e%-!n+cfha^?`=8b%wwa(K3@RhA`w+C78XB`i5Xw
z+AapBPkZ7=sE>fCJ#5drVX+5Pw4n?;ER=0TTx2h&KVS}h+m$iWuQTh_HWT3@40XSX
zly(Ar_9dHtmNGlRKm-K@t8}Z<Jx!tLV)K0%qa6;FMBr=^#KjFyYP2@%LI(<YeP7hs
z93KdJ5AuS!%-nywf@(}Vg<M($J#AqlcE3E@oiCpwuvi@Z8Eb6E)Y>!temV=5L!nC5
zyDtPmtTM#f0bI>V5YVJd#S$~Zskih9O!B(LJe7_J>nY9xuuk!xBc2An*4DBx>Z){G
zem2&nvVGPBa3?I0iBnc7Fvgy_VrfiYOAhTNi_~ds4A4PyGJztH@M~n9P(sniiMIDB
zV}vC;J9!ottwn*SqPekZMki}U4M<773hC(fJzP?HQsDF^n*i~&>aaZsN4Qlg{~yN=
z@|IGcN?p-na6|4_9^LdI5PEH5p5CiD6l_tBz;6c%9@pZ!XL<H<19e!iz$yFz4vlIN
z9@-yf({;5;!D&3#@7PnrJrtbT_Gj}l)i`<Kuh?5R<__3}a+ZbHaOv7G4V=h)mbUPO
z+(n?&ghpo|r90|J973v`UuQ*cbF%Bgf<G8_^%Wo9XB*3<1HoFq9~E~8qy~pA>;IW+
zWH%)r5oCat_S_fu^x|qZSK!MVH^>zXqR(EoQQQ(eg<shN{O}t5wlU^{Lv2aXQUWM_
z+#gN->(Y*Gz^BX2s|1y14cZY|>Iu%u?6!mHZh(y)2ZytsHy*c7?mh@F;l>cZcz(wV
z5ZQ5pWMret%bTB1!DIOLf|Mw|#OxoQ!UGH}f;hrM;q2Krn{smp!1iamF-&O}+UFOT
z%Cx_y@#!QWbPE6&oy=wuJtT5H+_TJX`Ot<f1Ekvwy+`gVQTklQiw4?_VX$zRN-)F&
zvu$BOT1(}g!_%18^9q~^&!oSwNCL(Iq0tBtcD1nRZPjG+h#`#RBILk~fkjFybn_se
zaeyBv7{and_YGV;q4zjcMSQo=vbh5AIbhLKgwSyH68-!6;p|fyr7TWGF^cZL!X7MU
zj$(%W_+v|FMU&>8=2oM#W`GOfl1DwD6h=@$x2~uNGdlcb0q)(xM`pDUCh~~8=ro$p
zIk*4<)UJ7xZusRdW;({uTrzzszdQ>B{3V?sF*E#YkwQT+)MC^EPwLmd`vD><NtLFs
zD*i6{fUiy)xy-ekZCeuje}tY#l2<99kPD#}ko~Tw3>5>*9?gD1zdS~syMp0|#04wn
zAc($a?Gth9-%uwh<zIME`FXskOV7n`4G^Y&G<M{q7QOwgYJw;lMaZjBHbTSV;?(xG
zs)AV3$rqjIEyC0N5=!~ClP{P?ib>D7RJ5%#9N4LKBRb5u2+vO@korTERWIcU#epGR
z7@s~5uXbiF&<R&>_Zp;Hs7kO6lIq&0QNtNvf_sgwWk{?%NXw#{PB8X2&Daijl!&Px
z$m(^i;WnJu7$Dlpp20~PNjoE5ok~x87aDXBP<T3|sU?8i5Rt;jR$tR`uY#atEiu$X
zVvvz-DSfd72YY?dKp4D)R#4l0Y`qKm)C+2|Ssh1W?!<EkeDaq(eSf()mD5f|0Jk0)
zA3n07PApqC`CV)v#F58JL{&=_70x!Nf-yxogLRrJFWgY62}ER(#c%tE6AKdA+?m!f
z1A_6dz-Rl^Kx1xFnlJ?v`w_dHI>t}Zb}4^O)mIRU)Bw+|IT4w)N20k0BNb<+hAei?
z<Sr?Fd1jgTuUXS&@DH8%LRKXeGBDM7v{WdRxQU`W1*Jn&HWA}Dg3D5Mf@?fM^Wugz
zDy8tqSI+m8Ay_mP53%bFb9xN$$LHisPKKNz7K|IxX)S$Auc%!XZFyYyN#Rozz~2-z
zt86va_jT6AD#fzdo^$W43zYoDrEBw}AvO)Xktme#^XqLd^Gxhko8JdoF*fN?P!lFc
z=+A;yjly4^Gz$yxHQe3KxN>@;st>{&?(3Cs-6Oj*MfzAM{77p;vlmqfaLz0!-%+^G
zhtx^Wsk#rL{NEw>-aR)HY?hxEKTcAk9jF31RF~wPiGq)1<ca}x==BVBCEl}1>%o{b
zidx|s3j}5(YX*mt6!SQA=9&Q1$@ZvgHxf3#-yWf;2?YCf*qHM}0xQ95-n*o}54#?}
zo@w~18_km(r0Z*<{|950GD+1jN5Q%fvOfu9HGghlP?~HbjDLkXdfvQ;iYvE8Dc6#3
z@A$N;TLpL3!oh%^fJG&tfqED4i?`uHMqG@`Hh-_)QYCIQCl2cni^J*o_ZB8-Ps%>@
zb;fAW30L=+({CZTl^-iU{?*g6rFXl(KXCC`1|F}{INQ3EX5TY7dit_~TlZ%_a>LlX
zg3h7r>|(-p8DL}A@l}sNOJ>_4OFCNo8}QO>&2(i-8g}N)s7w9gl=?q=OW{KVu_|Xz
zM7p@?17!)<Uh%UK^FbHcZMFhvdy&1#hA8*-O)XZ<6Y&@;#?QvfElHskH0Q6(6A{kz
zp`5H?O4z15b*y!43iLD>a>Ke=#9f#Po7z{pw7n4sbRRRdwS}~m;4kFa#gor?$W>^%
zXotXco6EN71lWaTKE!Fam69DRp30q&Mh^n^Fhl}-l6&Ta7<y7O@LT1f*Z#pqjnHYH
z!<Yk$HY0gCx=y2i82J3PHtEjTOsMiFnCS-AbDpXY+A3KvH+J6x@XU2%Wq?TtY=%p1
zoGkP6po5G~Gf*(KdH(cZPa)^ukiX8GxVYx5Op(BEeA1`5g``wzTb`+5j1(r8>^F0A
zqGf{qNDXWZvSmZ!K#<;Uu#2H%b{Nu|4+(>qZ5)lbd*Ag0{ygOqKHmTyhg#A`1F(?j
zFyVZf<KLUb;AP)iod|yspr8;EH%~epHwmC{^H5%L<@hYKqWVDdrC&MvV51z0py()I
zG#^~*c~)T3HAFb85N$MyIU~D?`5Jp^lfgy5MjbY9aI+wxN+p=mIXX|5nU2HqjWWn{
znaJ!qD=nVITt~-+;cd3G?E8a;YMlSzDVQ6o^rs!{_x=J&;v+D<7f9mWI7YnrVf_0M
z+GqQ}5Gwysv9?%(u+Y8><<m^mg@|yFD@BRnv{S<+D#BbaJHYSBO8OcRZl6LsEzV8`
zsX`Pz#LKoRazb|5HbR#pE@eq%J`+>Rfnq5CRNybp@cV*leF}b^%dmM1*q3wJ!Wzv=
zeN2{-q8tg*QOJmo=hHYLXi*^2i|(Rs)f#LUeUYvR#%Z?v_nHahlf4FF&K@q-7dtyE
z2C#NzIKPG1tLwbbMaYQYG_1x+U05Wu=&@A@A(Wp^-sKc%g$?~(KIR79^0ri{7-b@8
z&09NhD&*nEdEAKPkCfRHMC=@#?AzD|;+K4y`d;>4J8r6>iNA-Dnwd<2CKaDW`)s5o
zMbo&v`gT#W*Jj)&lmO8B`O47N1qcjf9skt{>@fnnR@xNd6w(mCtf2Yk;eY(IK@U~P
zd6e-@v}nsN8U<$e$@5i5HE=YG89D1m%2gyLcE8)+<gZ~OvSJDkQSF_AtSGw7vAiF;
zR{+f%4N489fznDY3j78KA}X87{kS|<Vmgq1h1VNFfui}TFO}T(P@~*@7;ZF{e!Nj;
zt+7lZNttrLZD5>UP==mWV7H2rJj?h0aKni2f?Rh?36t<Ip|3lGT-=P{-DZ6<5W!31
znL;zU77DeL$kkWh95Ph7v9f;;DDS4tT-X1kD$5DHg{Ltq=%d<M3N#VK!T@$L<xT7%
zdg(97tmt`v3c}F}H%`~cEoSJ9Cs3+B@S`8%+6ann=&Mv&CbPT%_UvsWi*u^$AUkFc
zAsm*qYa%I&4i=a#I-~qrKoG5-pc=LKw>B3-ieTNx?Jr~3lSPl~Xxj-gyRGPYjXdc4
z@*HRR&mQ)02(ph9G~e#m8)o0NHE&fhT^G7>GTfGIg2`HUUgCW<U*!@*SCza<kzE<C
zzKJTsFP~B-hK?)I7yWDldFpKvOkw#Q-ptl^CMx8s+G!eOOLb7FMv+Vc+usTw=DP8;
z3+Mh6O94hXyYX<cR$G0W^5~!vNys!Jm^r^v)f}hewSHD{UdC7dwsE%g4@;~8Up5KT
zk@m8;={-Bn-g9I8dv;D73UCa!nBmZxOe1HSL}$W=cyq7MKYP8$FJl8V+_P&$imcqw
zFhX!#r3{ysrGvGpQ^Is}Qq#9}0`bB*EbkA25Jn5yHl&r7jqX}kK!1p*^P*Xdab`JX
z?9?wlF(oZzV-4U-^ID=~_fPIc7ALrt{{DYRdk5~!nnqnWX2-VG>2z${=p-H6wr$(C
zZ9D0pW81c^{dB+Yx6fL8tUb;d<J2!mo;hdLoK^RIU4v+iGfCGThZE8}kgZaMY}1gW
zT~X#<p6<1esdI1s6ARg#H`dTcDNbb+q8Ps_MazDGiCw->Z8ARvaQJ@ZNNNmSRX)9#
z&Jf+7vOPXg;^t;IJQ?2)u%CGjDAA12wHtr|W3y^@!DWT}>%zMS`C8F(o#E|HEE^}4
zl<3R8o4g9Mh!UsxfRbL><3K8vD;EJXX&P_H^DaM6g;0|CO0O9UR6oGd?>10KPCPm}
zt;Dk`e}nU@@E2q}iv&AaoB@P=e7-<rG%3%D)S6;OTt@_=wN#JMYRACwP6GRld7&3$
zq2_-3Ig^l#vxi~jPf7KKy+MN*3`M4o#^4m}IxH~UR1elCRs#!3376+pW}f)Io83)l
zQTjcPK1}(qXfqU(-Uzog)4tGSxyNLZI}rBe6Qteqg_<C@U-{pmwycwKFk)@+gZKH3
zHJ1*5)#<fa#(>mc(SI4@{m-NGMe?J-8s>KadsTwE``+!qv*!o6#34_Cthk;6xbz!?
z-nu-iSz-(WKh11_ZX%s8b=e>(oA|w7uq(Sg@D}6S#OJ*%h&ro-e1CMKIf(|U^*04c
z{X&c1eFbYt%*!!yEI)Evj2y%id%rF!=u+MFZ>Fwsv|p1MNLf{0kg~1F4^AOP3R!rF
z2BB!?dz=TTP11iPM{XZzNO&6WKJ}W%4Nd>1C&FT!sfBKZ37WdLj@!-N(@(sfgn}ni
z`nBtQ!y2?dw95Z_Rxn&LZ!WS~HZx55q6GU~h1W1RwIL9CExVfBIrbucpw*JQO88u0
z`R}C$mxf2$$HMuY>6jE^m0@;IKv)c0Cngr>X9b76uX3!<p&4^PRr=tAjHCqH=!P{v
zV8?gk7_P%^Mzmt#MOzv{Z==@>F{EF{!=<vw>U+X25#y<>VnH%l2rX4+A=Rcqaw0Nd
z!K9_1xa&GK56s-G75U3+D5YQ55N9P0ph&3v#CuIu)FzVRA9>QoP$A*9Sosp9Daf|p
zT(dOiJR}UxF6&VVrys#3g82y@EVEsBjkh=Y1A2kD#|X3l8iEY^`*5MP495>dUle0Q
z%&YT|w`}PlO&k-j<{Dx)o%|23F8h~Rt(@F6trdt;Wf}E<-xjt&Qpph|M{lnDuQnz(
zSwC<52~x7V9<yvOt)Zr?{<!P`u0xJq8iKc+<-2KZI#yQ-Cx@gU0u&W&k>zjcAw7j~
zQPMT2Ax!_ie)Q%12Eq<X@|BTWcz*-fu6W=66qMfnEhzmhlHl^bFHer~zK{OAy<HA)
z56M_VT4Enc=6ojCw>6r1Irv+5QgP1cwkdsWcRWS6|3jDG4B{d!Z?>{bp|3qgd=7dW
zMW|xlSp~fC{CVe5^ijQOB>3<?_<UM2`hw-95Dr^X<eW0{2oinIavl5T&%R0*xd#qN
zN}eKazOFitwI^3Q4Dpcyd=Sl$i?J4SJAlpW2DkH*dGmwu%dY*&%dS)Sde>X>`0{_;
z5j_Xe=|+z0rWYUgoKjRZYk#07<%?C0y3L+;uiv6IzlQoX`PP}owiOGn!2(?zHd<%H
z-?W}Lo!2*QYQ{?|XR~(O4>pegs4EjE^&}^-jV`yG*3VqPr93}CN)G?AA-I!4@xJoP
z8oo|O!kDHiU#T^dw<80zeb1qP7KA@Tg=ORQd2$3xf+kHF4r7R<{=H?Q`LM4aTPIF<
zGE$SzO<2^K_vKnvSpv>x+iZB*`<9yb#H;($n1G&@!-tFe6N5G_x!ZLn7}(bBCK>_a
z`mbHVrP1XNJZBp@l>L4sloZ%=XH@hjGR!glXWvKEK+)Arvy9Ut$RiE#@G?pEI>tQc
z@Ar36eCEcd!P`kE(zv`mE&S&*L18c!N8ZBcKaz)oW8<uFD6;WGoX_VaQaEbFTZ*nX
zMZ}`}P-MQ<^HyVPRCv;NoJj&kxP45`o(SNbj|jn~zh5-}+-|wLG*{H!ceX@KX?@Yv
zx6;L>3d}nu5pf!_Uguk8(v*3oK8r|VN<hw=jpZbs3c02;NzkD-hd>38!xWViW-l>M
z{24>|ycYPMvajQypW8h21e6%V#Na6t0{^uI(S>T6_y4&B5!ZL??X^a*TOd07lH@-T
z8{{P?odfb9l=7!`_jgoq%NHoO9H8~i<#Tmfy+?0iS#UvB6j1@T^hAMD`SS`)>FZsg
zNKr#{!k{*9Q`d!yYIMlq1}aA5W620FWx1Xcs#z)2uzl`y)(K^&Wb&07NmLm@AkzkU
zF2WD8HdpXsi3uAMj(~~4&M61;)#Qe6kE`+06YYnGy3gZRIsX4-{Tpu|CjQ5)|DuWN
zvAsHK2^NoKdk_Pd(FC*}j*H&~$Y06$A6G1gue+bjxv4J5Ic*y2EOSq(<w=KvT#$&5
zGOo4PqXl1<T=<yuPbv;kLGTsc|Cv(11O6XMz1z82_kx26*ES%gPV0RezzY$tGli<a
z=b1y}^%)Dg&JH+0=!hZgw}xK!3k4_bmV>XPj$!?OVbtF}ewOJh@R%tO{9h6EA7_?z
zPz+Lw$hRYbK@3-wV4eL!I9mDJ|1=r_7q@~&zJQe^!zEa$-)+-(n)vw_w=XmCH&dTg
z7BO?63mceBx=dd0>0sbq-<pk7`A+|@gr3D8Cqj+&q;NU51uN22n^xS%Qt>Ziv!Y>A
z%E#|T8H&CO7`_u7loA<qzyOB33kJbhUiG}`l6#%kO18a#c;kAGwDRSC^X#L*D%Ott
zjpX$(!P#ji$>hfrzmiHe!OQ8&%JBrz%EXV`&(3acV~MM!-TVjKkPj}t8#wO<xLj);
zHtS+4_)#lVA$3By6|K>z_ra@0_UAwz$LAZvzaO)Ji4%!G5Q#b?-X-dM+eBc6OXf~p
zb$oP2p6P!en-66I-T&d5Z^JWr&%L3E!68m%^p~i~RTdO9?ime{0og&Ui1YmhbH6<p
z|9H~mPXV7CCZmj`@I{$TC`wpxmS7Ko^itL)`7(e>&c?(AAUaFYNC38B5NhzYmJ_RR
zL>SGF>SN$vDeeqMfUz1WeRyOj;Ilr%cMsNSwW*xQok;wu-W~Tik;lp>_`PH^@n4S@
zXw=7}@NQjEv>_%k*v;YbU*w%TtT+7+wmo;<Pj4!Cv)qfbuTq;o{&bb9G+N~|Fd}@z
zlfS3c8;c;EWUqCNpRF{GT4+u=X#+MhnHPgPE;IJqO=n*!3xi*|Ul&yEZCMr$TeXJ|
z?<zJmTb5*@`d>YUEI<%0sv)jAOjZT)wo=d6=sickEv<XpnxFId0f$7L)3&vqt4{Tv
zuPltTgp-o>huX7{PxVy2T$f-kR=!SU=h<A*uBRlvP2$pcro1U`*5MycVwVbM7@Ss{
zv5DfY>Vj!2k5|7`y#qK1k1)5N7xjMVQ-H4!NL*;UVF=<mpOsj0iUa8PY<rl-7qQ*Q
z!4wO}R7hDEuzM{?TVz0DaAfee7p5@(;Lml#F$WkHq?1g%TbFI2eOhiC%aJLMJ1t+G
z=n2;Bpd0+<ae#mYrQQBZx_6P=pFA;5ML~|HT<E1XDh2@hvMn$3!YQzXUB+lOj}Omx
z<exZ8siGF4oh!`As`Xu)Xs<-#0QP@jBF+G=XGlwa%SwmN6^-(k&+ZTY@b0*7TQ*^{
zz4__w0Vvx514H<NUFtqw$jT!3=|m8CUklss45-L_rzPAMjrL-$;{#5;TGrQQbvHVG
z96w>FMdD!@J-yLk|D&~XB+;jk$v9i#aqNbKKbu^*4BVwni?4S&c<y1`Xfq6Vbx0b@
zY@bmd^Nn%4+R_EIggP`pvsSkSA<I|sSDpbqGjLt?tW^$@IUH;G67(q}(I_rvl#8KD
zp^J?i?kGHWD{{r?Rl+{7IW7UNx!q;etiy?43%pB^@OV6w3$TO53E#nwV70xg#%RS<
zl$JJgwG_mN*G^Suyc9NnAQybVTwcaGgLz(pYH>eH%)78Vo;3We3z>0}G(1W=Te^H+
zc3x`TUiBlCK8kjO`)Jlb4l8GuDG**g!r+l8S7}78R6^WFWuoTL;<CRe((%9(yzHE%
zp4=ond>6SIIbdQ7FC0>|Aqq~|&r=2%&UIMNuFHXGipg$|j6gaGa~R9GyX%`#=8mz&
z3F%O4WFF_ttHHFgIZ+N&G2gE5GZpX*q=o-WEO<om5a>)j_tD^PBBG=-7;r+*Q4Z2`
zd)&d#IICHLqscicjx#W19KMHf0lpyLuck>DOZN<{4le$@2=v?aU+Q|4qM*k>-V3l4
zhz_qPiX%|Uj6NG1EbPn~E(IF^otw_5K0Zsnh!>(6!|GbJjcFu}_E&iooVwdg4L;Tg
zgvRB3UbgDZ2{|RieK*w){5%dEz&s_U(5s7*4#wg50$1<-3H($4{;Ym7^$!&E6_lYf
z*4BfZ5_qKWaWv4dWpk430t3i^55*3c(8Ukv_bVAV7a(#z84gq0an27F(A2H*4Db75
ziQ2P=`Vd`>>uP4kvi=Bs0lN|rw~3n*-QSY4=d8uY8|)@WgqMZq>2;;Cy<EBI4)yZo
zPJd&w7)Weq8N7)A@(w9VStj9fji0}<)$n?gE*$7?a^?Yo_-)G{0VCS{$e0-&bSi75
zU_}H1QPo9uP6{4a_25$P13&OI#+jWd5<sqaJfu{`9OCT9#?^Nm?F!OH7T3U8W9qTb
zv!7!^8R%6-AuHqi?_hR7+!x=S-G|bD3gLP>z(o}R#s7|?Xb*2FxuR(TNhozRkI6;i
zKV-ND5n7cS)KuR3=PGsvO%nVDlMhnUVk_Qz_>=HX7A6<pT9#bJB;reldA7gRfs^Cm
zfEBc45cofl?4C&vj-}cDENUcsnS+mv?d?s^8>@#RmmB@|!RG9Y_ovVfRS7{@8n5Q6
zTwP2>0ytm%d`Sl~0RE+Z(~gIW&gOJ>$Zdl~yl|qPxCQ6YifqjhC}lzq-x`*MbDnxY
z6X%@`=;opCoAxl|$!i}hty9``$(#9N2ch%%%8E?D0?^4*pA@1%!39QxJE4!H8Ym%X
zLnYCKCu1c1-fZ)636;P86s0(JX}%CBXxfe_!TRN{FVItBs!p&af`C@3lG(C>Axw?8
z#WI65W$*}y2`%agC-7q7YkGmWpTpuoM#UvS4d3E>2<r*dnA?GXn;H9&tmQ^D^?;Yc
zeHvE_a#^Ds)CG~YDsMxx$Mp#JXrB?0Zs?;nNH`&#!RAxz`e|X2Y!c0>umvtH*JA*g
znd19VV?1e9@2OtR1~luQ!q#hzCKGejMFjj3_P`StljZ_yvDu~RnGF;wip%36cjm0#
z^i3%$wt^!^+D;#A!_lRBY6#(Mb5r`;Zu`?+MP=-h00D&kQHPY=SC1M`uU0H3G%LD5
zGE>OQDa<PNK|pqcSbm^+)i20|>JS_maeT}vRz>!lmduAeeszNL1||4yV~8)Lg#}Se
z<^M?=o8`9llaqG0di12T@@OCNmOMisOHhF8sFzLjD)*+ro!G7}DqkUv^FO{-GJA^j
z-1;()hM&|Q5p_5dI!`o*ZgQMf%R0v+M0+@GI?4tpz^o0gEyvNsk*Dx0RFWV<&)xL|
zBY_1)HeDcr<qLm@@olUS8|H&z^SH`sedsS&MQKK%5QUR8et11P^gDHbxFe6EBS8S_
zr7>)3p0>>}0qQAu-S$L)SlssV^~nQ*viu62k?@6&=T(d+244z|2w`r8ua!_t-e)Vw
z0G?bZOYb0Z>f&?%7sgn3_v6QRgkji#fsAD$GHN<#kiOGaI1}g}uq_l8v`nyvdr6>7
zzAktxI{<YQUxB>={0brzX+yig3qk?vDaa+x$5{=++v{>mFZ36cWHInd`P*p{A^ooC
zdtt=0+$!gdR%*J&LlpI?U|&?9K{uG3&zUA|2k$m6DK_9OcHkdFJP0edE8<dOu$y3n
z+3dL0GcZNBxqEQrY&v!EdhUn%TTxY7fQVyDxv`mEte`uAEuZ^A!^#yrExq=p?dy4b
zQr8wMD7mZT1sr)q&3lg4l-J4)2n<J(?^_=yF7W-u=J<rHN1y#lYNlAjZ+6yTr*C06
zSQmUoc=sUd?@@q4(Czz%&<Zo{)U96{hyRxJV=uTJuz+`^eTn?H^tY<whh}wF>4t3f
z87S=QiEo&HDD@z~d8Zb>-~1LD=A@bc@zA4&uI~E9cx{cLRo6iLG4~&gQWWTeH-n86
zVyL~(SP9{$h1*yiH`>weD92Vi`?R+Qk}()=fkp2{r|tDGJz68!M_Ju+$*xfQd9U9d
zBr%QoLTWQ@!)aQYt-KFT=a|$K_8_v+sNZ%B%*ddN2wvCQonH|+p)fJN7fF-lR{P0)
z@t(tlo8X6nAVSHo-Ai)O!N(AHwShk_Jw~Is-1+4u`$FY|_;wPiYy@JPYLuGPt&W5~
zjfJv>J$(lPaEW5Fp@H<&&ShceaQl?-;qbe6ds?;WC*hX(zyxT6tWn3Icmb%&8vH7U
zq}cr6KT~41)4r%BcRr4w<Pa9f`(Et)3MYq@P{IeO<^s*ldfeGPwdhzH4kJ7>AL_kK
z``AB~{bl+YQ6l*5f088l7kw7)(xO%?bGsbb6vqn9dPj{We|Aw5d~A8<`^L@Kqr5Pm
zn@?#Ua|0q_+XPG+d~syb%T21hUZyOeAf!4c1!!E_9^HK{Iq$YVa!_oij2=;TT&#9p
za|S9}Nq)oDBpg9eOt<t2fm3v&n$Y|BbSde<$+cA+Iut@bF#uVDcrzD0I(Q^YA#Q^S
zBqw!JQ|Y{sR7oYZ+6h1tjZ9$mFT6g$=;0vk62b>GdiorS7RQnZ!41n)*Q!@w9NhP~
znR@#=%y@>o%PzhUg6o9~p)vc<DXy4<`~H`Z_BX8Z>5m-_ebf!I>ZLg>?7847oQqTZ
zG?0F<Fo(^SZpI7qx0Tc4dh)S<LfWzrjCNLf8}8pPdD*6#S?lVl8X|xg5aJQNy7yJz
zx4WuDMO9+~=kf=`BOM#rrO@h!zz!lGe6OLptytPqS$RdMV86H-eU)avnMN_?z`s6v
zcX5iGD>hrjBMM3Z2t*VN+InfdR6x~*giLcB1;Dx}vmOjYHgemkFigSlo>auVv|uaK
z4ZBF=s$WcK0LndfG9YAI$HgN<Rl%@tQ(nMP7EBImAN=a%rUgCij7jlsR?Gv!#MI$w
za$@WrAYxH7Cfdc%TPnVXZztu|DadCTTVE_rT5>$q)I?pkdJfyVaSs|3wvr%FF_sEI
z7U_7$zM&NDEY;_eKbPi<9^Bwo0CSO%Y`w#t2VKU>S5klsX@ovt4w53v(kWD_D$DRM
zt`?F1qVyr`clmXF_hM1E`_XwLggM`qY(htc6-?g*WA0lVVGZ<Pi+PIOaG4CxV|jUZ
zsx?eRZowiYz4!pZ4r}g3Mqgs;a|jlb?wUzx0ruY_-~Yh$Nv%kKHHVuvc$hbI=a2zN
z*XCyIy+KzL*=%An9hj-33I*gpp1KAbv1Ke!Bzjtvuq$y8Wk0To>S0ohams!MHbAfu
z{`$^^fG3bbEC&Z{rg7wiKxngAA-T?*QY8W8dne|LLLlRn3`eTo=#zRK3|IvlRBy?M
zExhgcvv~Q#OW4DE8*Rh2WC5Zw@Uq%H5G=H~W^36?biPJRjTQ(6u?k6vqkK=>(S-(4
z4;dwN@bPUFa762=jPI}t9WnXP-ZUnkOYO~8uE@Vk1%#Xwt&D}4pEX`#a}1!FIuni}
zi?VNh7j%)dw#aO5p!9>(Gw0Zl@+aY?<`vlRpFmp{rNHNji^+en=|uPqnLVw>*O2C1
zK4vg}vtq6>6i!l;KGwb(?{hZ!&EVTLIhus8f^zv<J`lf$IvCA=YJTmEXxEkjE4`iu
z(Sn?#3K|EY#-`yf)@)3rn%#<2i@%~hRb+pYPMw~10ir9_$Q;x8gW82774X`ky%tnT
zO;P(#*4rTr+}tyE%N`_y+Wt19enV5!`;y18lR*ku2ZwLnXHPPR6n`udSf@&}eZvj^
z&OAf*F)JsOk-j_VrE0!;xWsqy3*$VU+86L_e}PCk$1Fdij`X1SPdOE_@hXKa78t@i
zKSI!FA8}ffuRrP`x{ua`K;pn6KpC%amgyDY6?6RD^MsyT^*hP^INp362ihTI7pdgo
zEaCiK4++*cQ;!93`0-7?!y7KJd8(q?oKx^I#CNICWAO!6j-p6imN<e!)lpe4)D6Qp
zKY@8-;|7aQv`yJ!Mm1_WpQS-Ra{AF|P6_CdfDR)fM^UMF<|uG@;Ai9<5T?%A@xA-7
z@oQ@iIx)@ZYLqJ3!yI|a-?YS=aGPgf?QoXaN2FW<^M|rZiHtL99Sz8hcdf6DSisP=
zhVK__gwNgKbm`-a;JmqQ4?v%s<_Vc5*^3cZ06!dG*(||~z_NaiKnaLk(GjO!1EjzI
zCFnET3KM@JHJZ=3t_Xg>fYPn``2!e`KD%)=H-bZ7KV&H^te*c6xgX{-ZjtGvo3)ub
z(OVVdwli9Uk_c)&G&k+mRU@B7={NaEL!pV9)_D1yhPc(}z|%b4%S$##mG_9jZ&9@D
zOay(w6_^f`$4Ek`L<aVBvUL{(<DSlHeTs|Odn;gFk;5*=t^&N{@N_kZek0k_+1>Z@
z4F(mv)CYQqtZz@$_#9d$i_(qX%R$A?4N+$i=FN-!dJ6@M9Yy)&qdXJL_Yp$V8|KuN
z`CEF0LxEmVZ_o(tQgpnw|4q!6Urdxf9QYfxa^FXdBe+47ntbRgXKw(OiquxK2h4Ub
za|YEptzPQ6*z1NehKY0!{|L!CG5j#j!?BuiP)!i#Oc6OR=+3%kb_>K%fWEuxBv==#
zi)@-ITPB_VM|*{*8`ajUJ9(~YH<P=y*eXJz+i@0#!wvREq@g-O5xP}j72Kf{o#k!%
zYugWaJBDS)(8k_Kph;j2|KU)&7?7v-!)D%2WFeQz#%@4ax+ft{8;FeckTFVfLL0NX
zI1AYEMX@ate(q1|TWpm%@*a1DYH?@7^YD9hEV%5T8YdqCK%VT?fOpgdD5jWuGb0Z-
zc9k=T&!*OX?nB?MoLaA44Pf+oYC2+eLBtJje-#5f4|TT>HUi*0A0^Oy(l!_VtL!s!
z86?11Zl2^!xx0~bFLj>g6^$AYF+M*kcZk8iUM*4i!gQINifmNx@@$2M7YJ9bpL*c~
zUmi)7OK`&#OT8tDE9Jo1#j|r-5p+{0qn|BV{<KlEX#-2!^F)|u$DsjyaN+P_Qvz$F
z$L4J`Oy6PoYK2{|k1w(n^KBB%>`~muMW7TbWLhT5ggNdp)p}ts)EsyK_izFY)20R9
zKIGt6G7q_h5B`$Gh}W72RGcR8Z7UxcreA3=E0ud-J)TweK%i0!lUY9ury+?3f5F#y
zNH|6P2LAra1kwQ{CWPrDgxS>aU#R*~R+F>Uc&7niD#@*4Gj$6q+8119L2n=>@sx!2
za^9sA4%FE^>rRdT4XVG9UWfs7j-c7L+UF)0Zx8~Dt?R}6rbP%>4U25|<ljYHxp`iJ
znuYsHL<_k9)vpb|^^ARaoY~DzGMMX$o@Hz1M+jL{k%R5l6Dj3^L<L9pp0vf{Hj!xV
zQ+kVf@e7luif%RB&oq>s2BS~@*;iCcoDh^|`Kw8b{MH^uqeplExnlJYx}=y_=M?X$
z<S4`QH()m1e#bz<9Nw3b3n`n*;V`fxisWhy^pVX-2#$m4HN0V%j(n%d5Xn+9!O{n3
z)vZ+%ns}dX{1o1yfXKA>BunjC|2X3jEOfGVs?o5SItjjHU@@TJkk<Q?93tNB%9x#p
zoKdo*?MnAVpG$`Uo;q1)eB_Zr`3RvXRm}7e=N5R(Xh{BH>-d0`tpjkk)~S%I=i8ex
zntuTKWG)a80)lwN+z+C`9ih}NOg#51(DjrRg?|M$-}&Bb@k${i4%{xgvL6c2hLO%-
z|0JRR0`kp>(^p25{?AZ##QzRe3&j9J)&Ju0BS!$CYLH5b!9$-8-w@Co%bd0L%QpRm
zA)e*HYmcb}Z&e>B&s)yUoM!+UU%b)*-odT}NgGQ8HsaJPa8eX~%{5F&#M@lNK#mQP
zzaapqm@jbpr`BRRC=~or1N6#6DOnm{73-F!JzzIXaM9e3QF}lw!VuBo2Pl-~=e>R#
z>sccy^^^?X1Rn~dQKa&BZGtFf3~-g`aGyhv%S?<Q$K|UCAIkkCT??>t+B;s4Dn9sR
z;ht@+N#w&H$n3tMlyh5&YS)BE$e1ald7F@BwHZ64G~g}OhK*SF-zFcyi@UH}nCBRP
z7YMX5$jNKYpOa)m3}w#57P#(F(pvAkBM>10Djf#_Kh=k*fC5}SW{?gr8{!J?ORZgw
zIQF*pFJwIqmIuU-teWQMw1}K#a5S0#Dt~IUH}IHe<s!`gE&hxw2Tdi-YGt}7otyaT
z>kd@Ci0p$XPdkx0a@DMbw!7oiKMJ5;n#Y-s<B)BU4&JvkPAg7L2GWzSyy5k~Ip@W|
zDexl&TzlIOX^uSc9oenw0oE7WeBg#?fH(xWU5mn2ZZ`4}cJJ|Y$bkms4uPp0axXyB
z>_vH|Im+2xq<aqUaF}*b8@4XbQW+e`dP?Ws<{E<8Gs#CQWji$=h1jGU7g)>soHmA%
z2`=a+xm0+MeCTn**_%bWlu;1KF-UlXF_TSG5l0Ze<UY8gkZYO<7d*vB0c9Q8=a|mS
zP4~Q#qNjM#cn9pUe*p*{9)o)%2Bi7mnER90<b+V1Iw+8xJya+HF5bTat_pmai9*F3
zwoSGag3vjg)$*c4BHCP{9|3><qW3zlM(g!s0u~Y5Hl2j9*F%$faKsd**vuP=P8?Xx
z;|l1bvsutC`Up1<Ed>Y^y6e2jGV>sf_fx*oSQL@Be)aNkv^Hr)ffAJ4LooF=fwda?
z{{G7c`?a|yT}*{L)jULY`4Tp0>@B$)x4EMv&|b6RYs<;jUUR~kpgZBR|E4@hM*a7k
zJq$6!s`JS>Zg2jY;CHV=ZtqQ^-MuGR#&d=zqm*B~HiVs`oFHOIXfuFA1qG>+RX`rJ
z<4RjVM+v;-{NfR9li5|z!ul}c_}4`zh_|Bt5WVm#>?F>HKVKL+y-cYQ>d7sd?r1Z$
zfhNx#O$1<*Bz$)cto~WvI0)+G3v6;v4v8QjSRS5Q5>!ZUl2+lVZ-<{9-pRk|I%L6R
zbu&?u!=2MTvkqCc=<EbPBagn6n1e6&vve;{diU0Vez(!z2PKVfG)~6euTe(q{1OJ}
z2Gskg;aI7Of+!~Rf9HznBsEDJ?sGzB+!8@<Psd|I`^(jvQ5#XDc*fcnX)dZ^eK_P$
z^h*TcuH!HMV(}I3eR<WgXIQBC#k+l9eJVq$wA#y()K@;SpQZi1dHkRi7}EsXiO(;O
zd){1!&Q0aRi<}5`@Wm>M$4qM}k2kt1JG!eutVnNQeYnkwP1^W-2E0H{U-$^;`CcW>
z2$s}tU~^Vfj&{jTZ2<1q@=4Bjj(a_jF(%2=Ru;EP8;hdG!qqHW6j_exnAHb}7gU*w
zLa9N3jpz!V%dSCN0cK-H+wC~8l}4pxmi>&n^(py>en)XefP(cepY`_HG^4ZCn4-Y}
z%m(l3FEaT)-};1lRqL9(4*i(o9W1|h2<md%i{r^6GRWYK6i%hj1Z!25?zYxhdR6g?
z0rX$L;~=#^sqto8{L+%YhS8`ZaJ_NVQP5REFBoKt_^=|%3mKz5qH9t21ly3r6kzA2
z_2pd{|F};LOY3~XKIuJ_kIY>Kj<EG;8QJ}!$_WuAFJFLuWzGApt_2&<;4cHMqG6&g
zX)HJjkz%?bwudpy<A|wX->tDU-(<WU&!m<eKYS^2qOQ0L>DL?}nLNXZSAl)>8mOMu
z!)fsOG5LC%tmQ#eI^S7g0Xw`qZ{}@^mzzEBBCchfLAH9(6EKs^pf#9_uw&20oK8vU
zNEtLy<8#+%?{6EOviOV!o&c<mo3x|Du06?imN#+Q_SiphV+{FP@mjfK6c4&IWTkkh
zobl!-MVI+TytE*~6VZN`AeDRGf{&Rv)UuPz+1ZzY;x{Q>^yjo(ci$%)>JyJ{S55om
zdKm``DY6Faf~(M=9r7zG5WToBj5z90RHXT#!bYAl9A8h&lr&kl0|<0u84lX5S=%%c
z98iGfh*ZKQMTMy$<uf=gk4sI;n?Tm*Y2~HS=g~|1p^*T4K<CQ|brEX9nl`$JyU+bZ
z{bbQ1z11><+G0hYn(m5`$EF<VPpBhVwRRtSX0SWv^JN*;S4rkc0KX1{&QyLT8=e3^
z6x_s$z9Yy(Vca-$Fs`dxHoJ^5vxs~)S9nm50=7%&!7a!R-{VNPRvXCYZN?D1Q5}Sz
zx9_FjMF7^n(ZMSb^bYQ6R8?#YR>rG0x<B`~XS1UXii!RWwl2EWeM+XD4-`k**zCW#
zQi!s5I36Ged!4!t@)}(EE}A)42`Z#QHO@H*F%U?TEk2i40OyyJf@QtpBT<V}Ft9jd
z(Di2z^wL4J)ycxQA|SsD{3a)ODKn&Xo<zoNf))4`PplQGJ35&CgNKsBoV1JY@7)`5
zo!V36Jsff{C%Wh_D0dhtm(cH!V0H2JEPVFLCXgc*m;pK~4^srarQ@mfZM5(vqiM`B
z;XrG=aY}>^!A4+EW1rQU?JLlkLq>a#CkV6Vhq``Xc*wn*7{<>%oq#>#&Qb6D?Q&VX
z;}__;pA3_QlLRXeU{_Xp22(ql9X6%2V?W}JEjP`NXcG{VIOzO7f=;V*qsn)B5LUv|
z)QXc3pV$D$OZDkpS`Cn#koOr8Dnb7AcTN$PC@r!o7zo<{8sF_@P_xk`><X<<jkKx~
z-z%XW$vN+5VShMruBjYg;;>!<a2zFzsMM?Rmn)zbRaA@@j0Vm7BY5r~&fc>TQB1P)
z{*h2<5KMgu_Q-*Df~Hjelw2S^ScoDj5tV!5v_G&A+5u|6Xvr@}fa-4Pipsa*?Tv)H
z2!Uv5Cd1a)aI*RMJ)+Es!k2ZK2TjK;ys0RjRk9D1V~|M#C6NKtf6L1?%aGFu1f>(l
zsys(0+0w(5OLpo~t<mZ^4oz2)@8PLL>(XSCJ@<wIJjrXQ3apP1AcHEk&E7*GrDGuk
z@<l8)Zs#`mm0uphT$gM}hR?(2%}glT?WT&%sGY@RwGaq}7plY?+BTT&3cuGj+umrH
z{}Bb^OmhZvC#xH{#V{5OlQsGxd#8Zvtq3@W#+vC+IXT!FS$KrA)1tGj;JA?SLBJ!F
z0%4-s?K|$p{VA%wNt6-D`kz#iK+J(8=+g9cBEnZX@1j0169|AnkhX{`#!rX3(h&^!
z%R_%BQU=gG2pBz~oBLA00K=GOwFcJXs@7y<9pD(~QrVONObh_&yRS*Y&aM<{;;?%>
z^7?axQvd8Th%9!6K7)^EtFe_7Y7Xu4QS*TT0Nah%F^_D#UNF<*dGnLauCHu5u5=l7
z(%rvHFTQ7$F#*~X{zC1|Tq+yxpfBtl7&+P&KL&X^7<D4)Dikt@KB3-a)=MU;lRz(8
z1KjDUfQb6@f8tDoO$OkefKjK;|LG=xtOGQIf#ta~FRa}+`4^9`-VaEB;siD%K4xBx
zo0NH2jeVCN@4P97pc!Sj>@()>{P__@>Vz42poB}KS0d|bdFV9{*E3S#9ThB~=aU!+
zUZtEt%#}F3*9doLEyh!OzO5u{ulGkP2t#0qi>?<a6e3l{PI>0^KlGQU_+G*9oR4tE
zj}Hb10i;!0?Dg$L%HA3_(7e(7)^rqkleDdWfBift7PKDK>Fsd>6JN_SBDYSUy~@}P
zHy@j3DU|ExPzcj}m(I=~FEAU29affAqIOGA*8Twtv`R?5_#z@K!A@=*7)42TMTZNV
zV2Sq~<6v!nX4_wcl_|9>q|Ly~j;<6caI7qH?k!=b1b?u^*eo0sq3h0VLK=QQGFQ{t
zP;`SiyRfBmq>=w)S|Aox`JRR47(n)@4w@1Kfh6W*zJTygd}xk{6?Rg(0B(ESUygC?
zO7hglUBE&}UTXSZ7_<Ie0419wE)Vt^m69MRxTdUfou>pKfCCuZc2-=+YC6c-7N?jN
zkQGuVpafpov3gNWfBF9aKS%R><C!09@`OuX2ReX4T(4dKGIG8u-9HFkQT(cH?Ya0*
ze(4)R!jgzP4%R%=3X1m5l))Pk#iuwE0P^uyGJ{F1V2l#4>$bz(W5Vtb&wTN|e-fZe
zW2!E@@+W}@7=px|m{x&oT$BqZYCGU7**Nj*5T*Z7)X48Ob7GLo;f1@5LawYC|MQpk
z-`I}Q5HM}GX<3Dlw>}sorz*&HS0%f=o%L&oMMYXXFZ}!8^D_|Iovn4Bwt`k{zwLew
z9mv4`sXF`_HQ#`s-;YGSdIuC9cd9zozUM<TeZWps`MtSST2BTG($o}uvHCZ1ts4mR
zQRi%xK^oYdZr!&0c0&7}_k0!1WANwd{Tb-cgt-K7J&;By7X+sUQACO%#|iq9ep9)j
zC}_iJjrG!O+@}A!Bti;4g>bB*19IF!H$86050ZI4=t&MDNz>euFzxjkZ6qL4Yf27U
zYi1e>LuMbE;Z~_zekXvSS|^^iVcc?!qxnv5J)RpaTNCJiIaP>bRu_1S%j0jcr9_Oi
zfgunT5XLw?LBBVx?`gtCqA{nG!iey0Za4{~MfQpsimE)8jQl)%CAOs)d6dXjI#p2H
zR9Sk$m`O?Fnc&|Xxx=X5|7sNIQAD`B=kbOkPs7^qjM>~BWGSy)ns=Ch{rQv7ABGPS
zJ2b9L=B-JJw`?TZxaII{O2z()RlST%EX8oql;yYd%PT7fU?=p?T_3pJK!-6}s%g^;
zX{#Yx0UKp^ECdC=W|um)xMtW_K_yu}pkVBqX=4xurkLE$*S&5u*GF*(WLC}#ZVxMT
z29Zi?6}q)U47>=o{l+EBQNa(gu0GHjLZ#;Lx%?~D-y#4lA@C^Y6pgE(?{L_P3ebeG
zD0zGocEZ#4a;R2HHMKWHLtITl3Xf}0TKLZIY5CnUMlb4m5)sF9Vw#{ow@5p=ZwMx0
z2qh-NtS6M1pqX|Gn_&>I5-Rh{r~=QZh@a$!g?9($&1&+2w}+$Z<|wN0tF9H7sABET
zy}-B^#>=_R{$8#pb;GH=TA|J+pFS;OW9LMv+Sb4Dc+9WXb$xr3c92BAXx+nHJA{3$
z*J>%sBSVp4Kyhq@xr!m%tdh{JSpqLoi#kv6kf~}~4a~>tP9mM-!V^2IGvtf*bZI?)
zpW@0OH)avFsW4)Bc}cvqqf^kheS{?ZAsXo$_~ht8&&+CCL>YEcllDKq$Ba-Ac@?(Q
z(rsLmjeq}G8GxmtthxG5%)m7_(JGJRuA7r#UmBPYqxQS#0Q1v9W%}#W=?~6mu;h4U
zb7lsExv;i5N%=8~vr?zu(z6v$?tV%?>fn#P&goQ*BY3v+;&r?;w*BS#N-VW;f7j0)
z@mP<w9TGQ&7g9jHF0y@)F@gN866M*1+S6*O;OFe^hm2AFCVtD`-$SUN98)9UO;|W6
z%))Ll5bN*P5B)R&356I6k0Hm;5QizhMNt6HxZMxfFU5M58~ymTqj8n)KPq<5bE(M0
z61xjx8d^XdTdqJ#li1XhsmfkTl#2bi?g~ti4Y|u{<UtXk{8r(QWm#t_7Qrr_rLHLq
z)rdoI!qza{5GFmF>uN6lzEmufAg212rzp2Oa4KvkU@?xKwM!Qg*+M+b;`!Lxzw(57
zVe4+$VCv@RH3LD22Q>(qeY9GArf4BVO^TP-z+i8%UE~d&{o|A$hvq)QRW!QVCftEB
z!juWvdX<nFFdb?fLh%svJO7%71ye--WuF}_0tQ0PZFEL@Z<pXj+AYH*TF2k<tH-ck
zQ>a$Yx8(_R5-fL%(Q3JN>OvD81ze#qE|!pmq5>T=Y_Oy-wmlXldT7le&xIQKBud{k
z53TrSC6$z4i>}0}9$hM2WZy#HLBK+4`P}5j4Q*;ber#P7TOaWTC(?UVygVo_E$$}a
z)GMXdDGBO&?jkqznjDG8G^Gfpj{Fx<nALZSY`V;!@@y}}w*;gaJ}`PBrL()d9WveA
zEN!Z3FsC(qZ2Op#G_C~Kz2*Tc(@sPb4pgAh`46Ri@a<>S75M$oY2N3r)eb5+Ltz^n
z7H{U~Gyl%IBn1TALRj%0QVOJOnsJjqo)WP%XkoY1zEQ^*vE#M-_to66HH=d_G8V8@
zQC3E#`F?G{-31=Rnm<G+m15T*?qI1lV3!$Aq4)03Hc=C*+w0cwn15T2ELc6n`PRY0
zjR0@twqy-WdT#smLTFWxCyRZ1KR`twY`AsI6-nOwq%f8BrVlIqSDF|}1%}CQEDg3@
zp;hW$VPXLd<_}k`-?c=h5|`w#m3cEZjeYk*WPV5RBY_!f5Tb9I)t)#Od|DKd-Xsy9
zTklLk6Od=CN>-CwI9pP5$Agfx<KKa8#mmJzZW5IfXoj7yV>X#~Z>WyP2lGS;lo%(<
zRZb0Ivje1SBGriiUsV6DfLEUQ;~q1ocY@_&2C73+s=#@)j-)dzPv@gHeuM@Iw{dQB
z1vD`?Vp8TX&yh%C_@0z3UtlDZNo`J8Lq@J<e~^3{j!qZwNYD<RdNM9iI;wCR+nu_J
z3QFJvhT3L^-rAFAxYR<6^Fk?;PN5#S>QL68360xkX{@E49uIVAW`>SQ;6|2rro;sr
z^r0FZW?TmE)?lxyxXH&4c@rTkKuWv`5$v({YU^-ijVg{6(#{eW?B8ixRwhXBTu|Vd
zm>)<ClB7qJPw%l!;ubuDoomZKytMzS?Ji+z{ZSr^^NDhJ@Rex#DvTASi5bnv<&&k~
zJ#z%-E+yUoV2}PQUcf{$Ms^7^vr<==yLu*PeB3xScp62<skKwHT|oa;9xM}PpQnP!
ziF73Jolm?v+XfLP?f|-oi<-KAoT+RyHvr?kMZWGg7oEBr4Z2<>2mQ96wihlGFF)J!
z{(9A%`)R^pwrJa3fb`(pbkD4GRjx@qdqZ|Z5r$+F>GyZ(UW5#JiL&4anG_q3_ANIH
zHElU&1;{LKI8!I&?Y#G8aIE0P-LN@Eo1`_2eHW#uf$))NI3BrP3`z0++n<BH-q&?4
zgL_&*rNzfHy$ewB@DUYM)ubeIgw00IH&5AVHVg%+z&x<=?ht~YGmrLD-I>r73khj#
zvl%*n=LA}v&7Y}S$XNbqdm^DO8!X>VnR1gzX-l1OWuE7|$7J+F6>_V%@xk|a=0s}4
zpab|cK;hb1Xk%a*`vdrLNgFz_yh<0@z0u7a1bvreqo4wkvJM+Kk2xawedE6si)yxU
z7{DJZ;4t%;D<n^@fu*_a=k^(2Y1Pu(?hmMX5YZPHh23FCjlgAEgpTH^w_bCX+P5w~
zU@B+!K{?hKUcy$6XzZkEm81kp3&Bf|1k+o>)q{j}6Tsqq^7FLfRGA<qLoH^3x?0bg
zI0OjYVt?!6_<)6U7_pJe<<XRx+H%%d(hZblBUs%o9~N0KMg7lhZ-C^NDXFc7T_tTL
zN?_k+Mf)f&V_<P4TB68S8h91BR}Unx>>{cJU0r4<!I|?5Z%6$&S5MJYdO1xHx$iYy
zsE^)k?g<PuF1Ep@ARbBcE-6o_{zHC|j!ZX{LDIm{C@=Z9EOAR|`vLa~<>75#q6idv
zGi)g_wDxH0-F6L(4gb=hp{l@~!8F%}w>k6LjI)^WBDnz_@C;(y0bkIPARFF$e|zus
zb@jc5Q+DI7_P8;=%5@AX(}x-n{&S97ol$=Q=GbAdOGb&w*~7QB@2v!5kS~@tscZ%H
z)0fb@gHKh-(wUZs!T&Kl`jcXEdVL$tjS?Mrt3cwt*nJ!jF2MX0P}pZ830VZWy({IC
zAe4q~5z469;Bp#q-n<!pd(9disDn(o2Nm*`tg$f?5@SoxO;(R7a_GHGfvnDpoC&$s
zRDlck9D(ygWNvOGUx$m+4GrFb=@(?J7V$@`6Q2#F*E-?C;DPRPwIt1n65u5%`t){J
zb|4+G6!iU(*=YPJhLu5L!wyOfN)1xHg}C>{0ZRpI7)fP<Z$d|~rJM7)19n`7H5~}b
z$KdhItQe-+%z4QId7wrdB-+6K4&BteaVZlVdrFI-rn!=MR3@~dg27fltlcV-xhCt;
zVKA27Ut2Z;xX5duj||WKgOmYzlymdbSnb>9@9z{_QSfdju<@!b+=B`3YhGFt11hg9
zW!s9zpoUoVb2VC=^AEV`nma4^XVol8D<6!jdB)&SX`0hJQ-V(L;_TiAs?b)<(jXaP
zq{ysLy|oFpRuL3G@pCZp5e>EQ(J7k33b)O2_CPQs{gX)iBOmO_>koywFwB0P+oq<?
zYP3#P?@Gp?%~aIX%=_}q+eR?t>k37raWalJ$-jFUo)$D=vLl*zB4&dbbo+O?rJqk;
z_T2WwttOmfOlWkIhhGRYmZ?+~C0e0p>{w`ZqL)4D*aas(dJo`fxmEWk&_OS{QF+N0
z?~v)+R3oItV4y3uYpVO~edvX3+{mK-90<`9D^hL4E#2r|6Alqw#^Ry9{UKK8JYV^<
zrE2o#*l~h^q{qd9%)%V~OOV-uVHD!hA@+qy$y~{_>w|VA$s4-w+Db>KR{ux+Pu)va
z-*_Mj<j{di!DSR~Q?<VRYD8_k!{1CKWfXh{m~^vhkGL|lAJ_++P8}U{NCVJQQXN;q
zwvMkUle9N<!4eksgW|ucRE3G|>a8-d{3QGhWk900%<?P(*E=#Cj>87$p?AvZ)b)06
zjz0M7mlZrLOLF@)tg1sXRl#aSOtM#Utu3hvl=WTL&XCat=Z3<FJRzT1-pdlV?GP4)
z-|D$5Ofd7c6{sf;lEKtn-zh0u4u_{mnweYWFKL-8H>)7fXVIrABuVsx7YYWZ<%ET=
zzx)WU%@ViQ!)#U0nkJocT1>$zJL21Lb#au=bl~rIh>vr@J(p7ttr<M_I0Yp|4i(xd
z%E??Fy^11K!hAlf9hPj0TmWAZiA#Whc&35c7)k99&|gZ_9f?cu(Wwx!04WP-lrUL;
z7@W1@<nHV<I)pMRFFB-?HQE!^KK`i{KIImyBdm+kMss@JX#SqRFJyV#^B{r|cy5F0
zj9AC~vOO(o^*qO|JQsKz+OM=&$y!Y=VFP)MsrDjJ3eS|G|DIz6My*bokJR_w_H26=
z>>V4CJXk}~wxX=roUV#wLd+8V1NC048&w;Uk>{5W)XmEAXQdFeh5s0}_~;PABDTki
z68#oN@4@Z@{Ronz=8t~UW-d1E33?&_A}evAb&0*iLo((rgLhRClIPS{o=TuiLE>03
zQY)Ah_^B7!SKj0!EWe)t;T{G_5l1d+dT8*4a%_68qU(dI6zcMRRLWF0s}WyAjqZfo
z@U_{(`U6y(8k}HqIoi;3;k-wi%VDzDRYzx0zNF*JDf<MzWJ3NxYwG`@f#5%>c#Hjk
z6}o&p6YYC{E`Ogh1br=&B_9SqwiQtYMuJ^yPzADGh5|?D*QE8h_zf;;`Yt#I><i2x
zE~&(1y>2?H^snCqeQIB9?auDKd7^Y=QA{?kBUk5c%ECljD6)urxpSvb_{*vg$3;V&
z78WL)=?p%z@#df*2jxLkeaL8TEpHO8Pm+%|!46!w>^EoGZ@Oau6F_Ks0OmsNJu8i5
zxOARaiK9OKXhAY_vjMmN&`r+axbXgDQ9T#8h25Q45LIIM!wFUncleMi#7pBqc_(r!
zt0r(H6yJVS6=aN0C-hv{E`^AwX#hq8X$3+pn@~B0%t8_*6&*Qx{?Y42V~1}Cx7W@c
zPdU{?SlUpNo<!nt0u1W<rs?obOx-k=Z|?-32P=rhXJGu;uo|gjl81|{==4o_Y$$M&
zt3gywLHe^mK^Q;n>(>-Er0>Cq*Rj4Rs`%C2LXr+6c$JBL=3OKxXdn|Q=Y!!)6`e?-
zU85}JDMzNftDo8sZg<F=n0w#8I2rKa>8sq(lzc789AmIR=$oYQ8_FgGTz_O%=nEbT
zTpy1^OrSldZ<0p(@h!DG2WaMQ3S#A!+_}k|gP#75Uy?jj1!J+`3nB2CRFPH)<Tie9
zqiz1swsuZD9fA8$%68IT1QpA9ubf9dL|J38C?$qZs15N^2^3mwuF^K_SsjogVC8l+
zh>1ri7-dtlh`z*V4X&*+Vh-L=E#|!Cm5JcC^AMuhDqKWw^H7ox2w5zJ1kKls)ldGu
z7tjf^vTa?abN1DLUM=BcQ;H|y<8ow5w|!o(xiTaQGPoy|*IH+d=_GG%Av^F&kE{dg
zfF1YEUG?y{X`{#vQ`P)Mt@|Q&@00y~L@Y~`(@YUnIg9T3#S@4uZzhj-+iUC%_m&WG
zYzvi8LKTCq$V@_h{d3NlTRe?L+&-0f@j!-cA)mQ?ko2(ev6M!?g=7<ItIEovX~R~N
zW~^FoBVy#3PFJ=i#$2x?lCe2UW?;?rm(xtOIl^9MN#%*iiOK9hC4F@?B~>np7d6_+
z?UXOm@Szc<5ZY&FyN_@8R25n69zOxwM7ss799W!XyVNne6nM`p;_IXpu}3DQA4%So
z%NHPeWUks%aIiWpI@eC&VWLWMn$sGn?OLD7Ii<ky5QQAqB?c<@CYm_!*%1IPhLSu=
z_ac+a()vQtzDnfxx=#*T*`WDImCyTCp>S5~uBXN0)9Pzbu0Di+o(11yHq(6bWlT${
zR9drau*jgv(j^BJ>(*0AU?B;lN|nV5*_3k|Krhhv9Pb=V^dnLg_x2GZ{XB+WA?Al1
zUz%_m25>b}dC^_kC9?fqr}p<?Lx=R0G!>S4!{<WVmr`fqaip2~Rj=`!G}+m}d?$|A
zC#snJ<M|D~2@f6h`}N@}GZK#+BJ#{?sK*mG7Z8y2k7^3clguu69(l95DB(}m%^&!p
z_Bra+1POk3HX(#KSikp*FpJqwU63I{cRqNhyI%s>(<W-FB=MnkXo$a9z8|{_Lo}M*
zzcf+8d!AP@5Zry+>ZEyT+Q+XpHyb=ssyb_bp#baL{Lp0lxb?WSgIZvp?tlE}*AURh
zX(1_q3vr4On>c9ZL=r~=TO<a~zE58K4HT;sm1r2$OJfc-&eVQscV;Wph-xmctKk2{
z%*-j$j`+O&OsCkHbg0bTK{f|-ld)L)GpA9SzBRdqP@CcWYloNC2b-@~;RcDjc1%Ah
zzD-UFzbY!3UU}Q82UY{48MCxx)O^n@Hw0?|jFhz5%cs-VZ?E1B)Fb$G<dGpdZTqFy
zf&+_Hi^;xI@XcxEKHOE%@R2t^PW=!Y6LLNg;7n*Fhjh3O3ttu)n}h;E+s(Y{+$ipg
ze>FRycr-?_Y*B-ZQ?G9U1)X&#W-dS(x_uX)t75op_NI05cp91=3Iyu*e0|8m-{$_i
zLXy`mgBh`X({}J^ruZsQPJ{H=k>p}&^AaWP?bMa|i(BuSYEH;%_7t?!VHg+1*wKf$
z_+CwBydk->*h0pml&HHCw34l(zs`((CY1c*8(d6@<xikhuI;aL%pGH;t~lw0jev#`
zI^?XdYr0q$MLgWM0t!r{k&62-ci*Gr$lbGaY><c(CD53cKaFSbCXC?{(XUUK;qChP
zGsF!`CMZVK)Q3RTstP&O*iR+zA%yck!(E&eA>3ysX2vNw%e=upPaEReJZo$7CDyV&
zK9LDogJc7ap`ko0eS^MW{aiKZR?bxD@ZRZ=-Bt*F+fQcQ%(PzryDVyv-CbGzm=SOr
z<!<7u_Y8Y%!R?N_l=w!bQ(uVL%W`av8|9`SWJ^u2K<YNQX5IKp&mwr(ev}e<yw8nj
z>}ubPU#Ugt`0IJ@CBj+2dBa?_Dl6Zk(yzOA-_C4t7_fOX5d6r&GM|Tjor26x+;7RU
zkB)SG=oMUSsmg~akien7;3}A8u8|wXBF2cwwoy&Jm?*7_4N=A(KiN(`MQxb86YFIV
zuXU3@fuACGLy(ss&h^5GJ3d$KBq)UL71h!aDH(yZy9UnMhx^WAk%o4arP*|MqsMl~
zUzS2h-nEA}m(dSyTQ@D<&sIMzZ+vCjVin7txIkexK0hv;y=gIUfV(<irJ^@Up=AJf
z!Xk9AQJ6cx15)12q{B}mK#0&@%aiCN!@oq=`r|NPRM0ph<)lRQd$LnV9y2)g7zynp
z2xqDz5!eB+YB!v0c*@I8tm2BAvh5E|N$8dXd|R>F>Wu|daf4LyCK9hld`LS1IP8d9
zpNT_!RWF`6M=hhV0r#Flhj|;v&*In(aQe^<CJXVJeJyPnKlmo`nG3Z#15L>&xB878
zdo9k$nfu?&U4U#&6VS$|x%Q#B+xupd701TtP<57WPX$-EGFLdoBNipk;uk|eLxuap
zw6qR#$TE5nD*q$;TM3-rPqW&{T)#&?gw3lElx~;*wJ5Q=AOD}{Pi6r%kYBfz@o#&b
zls>gSs^(H*LV%RHk8SboQ(OGrxg24X6brrE?R0ZSv)B@sjwJ^5CuUw*HgEHl&u>lB
zRxwy#zswYMKHB>5wUz6Qm+wz{vG;WJBL<PU_tP$4Vdgy|uOO^^RJrG~l=j&ZU#=v6
znC@`&VOWycqO--FW{=Lk<<*)SXK3bl@aintl;5jYAFxpPIMsoFdf3$J!%MFoSX1I?
zBDwNOvSUW*?6?2pxYd-`>c3p|Kr54(=fc}LV&!tPxU*b&SN^ztX!e{-Qd;wqx)+DJ
zNfxj0lK3$%J@5Da{L|Oc<D8oN<?Z(|+x-1q^IH~_-$Cs`5LIZsqdw~A)hFLM)wRC{
zAKG3X|Id*Bm={9Hk+l!@82$P8?zDORwiEA#cU3db3u~5t_~kC=$9!-R3N`A8_Mw?y
z>MZL2G<^B6*S&_j&HT9V#qjxdwZC4^<oVAk_`jsDs{Gs^QH04ZN*|pfIN$#j=diD@
ntNC$W{@uGeo8l|{%9Zu3mRy{l%p^2FG5~?6tDnm{r-UW|4~^$$

literal 0
HcmV?d00001

diff --git a/apps/meteor/server/settings/accounts.ts b/apps/meteor/server/settings/accounts.ts
index b4da1cd913e9..81166af5c200 100644
--- a/apps/meteor/server/settings/accounts.ts
+++ b/apps/meteor/server/settings/accounts.ts
@@ -743,6 +743,11 @@ export const createAccountSettings = () =>
 				i18nLabel: 'Sidebar_Sections_Order',
 				i18nDescription: 'Sidebar_Sections_Order_Description',
 			});
+
+			await this.add('Accounts_Default_User_Preferences_featuresPreview', '[]', {
+				type: 'string',
+				public: true,
+			});
 		});
 
 		await this.section('Avatar', async function () {
diff --git a/apps/meteor/tests/end-to-end/api/miscellaneous.ts b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
index b8341f7c0994..d933f1f3c4b3 100644
--- a/apps/meteor/tests/end-to-end/api/miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
@@ -186,6 +186,7 @@ describe('miscellaneous', () => {
 					'muteFocusedConversations',
 					'notifyCalendarEvents',
 					'enableMobileRinging',
+					'featuresPreview',
 				].filter((p) => Boolean(p));
 
 				expect(res.body).to.have.property('success', true);
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 8ce6bea2e117..27978d72e7dd 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -85,6 +85,7 @@
   "Accounts_AllowEmailChange": "Allow Email Change",
   "Accounts_AllowEmailNotifications": "Allow Email Notifications",
   "Accounts_AllowFeaturePreview": "Allow Feature Preview",
+  "Accounts_AllowFeaturePreview_Description": "Make feature preview available to all workspace members.",
   "Accounts_AllowPasswordChange": "Allow Password Change",
   "Accounts_AllowPasswordChangeForOAuthUsers": "Allow Password Change for OAuth Users",
   "Accounts_AllowRealNameChange": "Allow Name Change",
@@ -1125,8 +1126,8 @@
   "Common_Access": "Common Access",
   "Commit": "Commit",
   "Community": "Community",
-  "Contextualbar_resizable": "Contextual bar resizable",
-  "Contextualbar_resizable_description": "Allows you to adjust the size of the contextual bar by simply dragging, giving you instant customization and flexibility",
+  "Contextualbar_resizable": "Resizable contextual bar",
+  "Contextualbar_resizable_description": "Adjust the size of the contextual bar by clicking and dragging the edge, giving you instant customization and flexibility.",
   "Free_Edition": "Free edition",
   "Composer_not_available_phone_calls": "Messages are not available on phone calls",
   "Condensed": "Condensed",
@@ -1949,8 +1950,8 @@
   "Enable_Password_History": "Enable Password History",
   "Enable_Password_History_Description": "When enabled, users won't be able to update their passwords to some of their most recently used passwords.",
   "Enable_Svg_Favicon": "Enable SVG favicon",
-  "Enable_timestamp": "Enable timestamp parsing in messages",
-  "Enable_timestamp_description": "Enable timestamps to be parsed in messages",
+  "Enable_timestamp": "Timestamp in messages",
+  "Enable_timestamp_description": "Render Unix timestamps inside messages in your local (system) timezone.",
   "Enable_to_bypass_email_verification": "Enable to bypass email verification",
   "Enable_two-factor_authentication": "Enable two-factor authentication via TOTP",
   "Enable_two-factor_authentication_email": "Enable two-factor authentication via Email",
@@ -2284,7 +2285,10 @@
   "Favorite_Rooms": "Enable Favorite Rooms",
   "Favorites": "Favorites",
   "Feature_preview": "Feature preview",
-  "Feature_preview_page_description": "Welcome to the features preview page! Here, you can enable the latest cutting-edge features that are currently under development and not yet officially released.\n\nPlease note that these configurations are still in the testing phase and may not be stable or fully functional.",
+  "Feature_preview_page_description": "Enable the latest features that are currently under development.",
+  "Feature_preview_page_callout": "Feature previews are being tested and may not be stable or fully functional. Features may become premium capabilities once officially released.",
+  "Feature_preview_admin_page_description": "Choose what feature previews to make available to workspace members.",
+  "Feature_preview_admin_page_callout": "Features enabled here will be enabled to each user in their feature preview preferences.",
   "featured": "featured",
   "Featured": "Featured",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "This feature depends on the above selected call provider to be enabled from the administration settings (Admin -> Video Conference).",
@@ -4363,7 +4367,7 @@
   "Queue_Time": "Queue Time",
   "Queue_management": "Queue Management",
   "Quick_reactions": "Quick reactions",
-  "Quick_reactions_description": "The three most used reactions get an easy access while your mouse is over the message",
+  "Quick_reactions_description": "Easily access your most used and most recent emoji message reactions by hovering on a message.",
   "quote": "quote",
   "Quote": "Quote",
   "Random": "Random",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 090e081e83fa..3110d6e82a67 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -2169,7 +2169,6 @@
   "Favorite_Rooms": "पसंदीदा कमरे सक्षम करें",
   "Favorites": "पसंदीदा",
   "Feature_preview": "फ़ीचर पूर्वावलोकन",
-  "Feature_preview_page_description": "फीचर पूर्वावलोकन पृष्ठ पर आपका स्वागत है! यहां, आप नवीनतम अत्याधुनिक सुविधाओं को सक्षम कर सकते हैं जो वर्तमान में विकास के अधीन हैं और अभी तक आधिकारिक तौर पर जारी नहीं की गई हैं।\n\nकृपया ध्यान दें कि ये कॉन्फ़िगरेशन अभी भी परीक्षण चरण में हैं और स्थिर या पूरी तरह कार्यात्मक नहीं हो सकते हैं।",
   "featured": "प्रदर्शित",
   "Featured": "प्रदर्शित",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "यह सुविधा प्रशासन सेटिंग्स (एडमिन -> वीडियो कॉन्फ्रेंस) से सक्षम होने के लिए उपरोक्त चयनित कॉल प्रदाता पर निर्भर करती है।",
@@ -4128,7 +4127,6 @@
   "Queue_Time": "कतार समय",
   "Queue_management": "कतार प्रबंधन",
   "Quick_reactions": "त्वरित प्रतिक्रियाएँ",
-  "Quick_reactions_description": "जब आपका माउस संदेश पर होता है तो सबसे अधिक उपयोग की जाने वाली तीन प्रतिक्रियाओं तक आसान पहुंच मिलती है",
   "quote": "उद्धरण",
   "Quote": "उद्धरण",
   "Random": "Random",
@@ -4987,7 +4985,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> यह करने में सक्षम होगा:",
   "The_channel_name_is_required": "चैनल का नाम आवश्यक है",
   "The_emails_are_being_sent": "ईमेल भेजे जा रहे हैं.",
-  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",   
+  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "छवि का आकार बदलना काम नहीं करेगा क्योंकि हम आपके सर्वर पर स्थापित ImageMagick या ग्राफ़िक्सMagick का पता नहीं लगा सकते हैं।",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "संदेश एक चर्चा है आप संदेशों को पुनर्प्राप्त नहीं कर पाएंगे!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "मोबाइल सूचनाएं सभी उपयोगकर्ताओं के लिए अक्षम कर दी गई थीं, पुश गेटवे को फिर से सक्षम करने के लिए \"एडमिन > पुश\" पर जाएं",
@@ -6134,4 +6132,4 @@
   "Unlimited_seats": "असीमित सीटें",
   "Unlimited_MACs": "असीमित एमएसी",
   "Unlimited_seats_MACs": "असीमित सीटें और एमएसी"
-}
\ No newline at end of file
+}
diff --git a/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
new file mode 100644
index 000000000000..eece30cc7280
--- /dev/null
+++ b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
@@ -0,0 +1,21 @@
+import { Badge } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+
+import { usePreferenceFeaturePreviewList } from '../../hooks/usePreferenceFeaturePreviewList';
+
+const FeaturePreviewBadge = () => {
+	const t = useTranslation();
+	const { unseenFeatures } = usePreferenceFeaturePreviewList();
+
+	if (!unseenFeatures) {
+		return null;
+	}
+
+	return (
+		<Badge variant='primary' aria-label={t('Unseen_features')}>
+			{unseenFeatures}
+		</Badge>
+	);
+};
+
+export default FeaturePreviewBadge;
diff --git a/packages/ui-client/src/components/FeaturePreview/index.ts b/packages/ui-client/src/components/FeaturePreview/index.ts
new file mode 100644
index 000000000000..f6b8e5f2071e
--- /dev/null
+++ b/packages/ui-client/src/components/FeaturePreview/index.ts
@@ -0,0 +1,2 @@
+export { FeaturePreview, FeaturePreviewOn, FeaturePreviewOff } from './FeaturePreview';
+export { default as FeaturePreviewBadge } from './FeaturePreviewBadge';
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index 8642983229aa..7308c8e75431 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -11,7 +11,7 @@ export * as UserStatus from './UserStatus';
 export * from './Header';
 export * from './HeaderV2';
 export * from './MultiSelectCustom/MultiSelectCustom';
-export * from './FeaturePreview/FeaturePreview';
+export * from './FeaturePreview';
 export * from './RoomBanner';
 export { default as UserAutoComplete } from './UserAutoComplete';
 export * from './GenericMenu';
diff --git a/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
new file mode 100644
index 000000000000..373862379cc1
--- /dev/null
+++ b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
@@ -0,0 +1,12 @@
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
+
+export const useDefaultSettingFeaturePreviewList = () => {
+	const featurePreviewSettingJSON = useSetting<string>('Accounts_Default_User_Preferences_featuresPreview');
+
+	const settingFeaturePreview = useMemo(() => parseSetting(featurePreviewSettingJSON), [featurePreviewSettingJSON]);
+
+	return useFeaturePreviewList(settingFeaturePreview ?? []);
+};
diff --git a/packages/ui-client/src/hooks/useFeaturePreview.ts b/packages/ui-client/src/hooks/useFeaturePreview.ts
index 4bdda9c9251a..bd46adfdefff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreview.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreview.ts
@@ -1,7 +1,8 @@
-import { type FeaturesAvailable, useFeaturePreviewList } from './useFeaturePreviewList';
+import { type FeaturesAvailable } from './useFeaturePreviewList';
+import { usePreferenceFeaturePreviewList } from './usePreferenceFeaturePreviewList';
 
 export const useFeaturePreview = (featureName: FeaturesAvailable) => {
-	const { features } = useFeaturePreviewList();
+	const { features } = usePreferenceFeaturePreviewList();
 
 	const currentFeature = features?.find((feature) => feature.name === featureName);
 
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index ff103a8d84ef..08bda4ff81ff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -1,5 +1,4 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
 
 export type FeaturesAvailable =
 	| 'quickReactions'
@@ -24,6 +23,7 @@ export type FeaturePreviewProps = {
 	};
 };
 
+// TODO: Move the features preview array to another directory to be accessed from both BE and FE.
 export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 	{
 		name: 'quickReactions',
@@ -47,6 +47,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'Enable_timestamp',
 		description: 'Enable_timestamp_description',
 		group: 'Message',
+		imageUrl: 'images/featurePreview/timestamp.png',
 		value: false,
 		enabled: true,
 	},
@@ -55,6 +56,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'Contextualbar_resizable',
 		description: 'Contextualbar_resizable_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/resizable-contextual-bar.png',
 		value: false,
 		enabled: true,
 	},
@@ -63,6 +65,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'New_navigation',
 		description: 'New_navigation_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/enhanced-navigation.png',
 		value: false,
 		enabled: true,
 	},
@@ -82,22 +85,27 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 
 export const enabledDefaultFeatures = defaultFeaturesPreview.filter((feature) => feature.enabled);
 
-export const useFeaturePreviewList = () => {
-	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
-	const userFeaturesPreview = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
-
-	if (!featurePreviewEnabled) {
-		return { unseenFeatures: 0, features: [] as FeaturePreviewProps[], featurePreviewEnabled };
+// TODO: Remove this logic after we have a way to store object settings.
+export const parseSetting = (setting?: FeaturePreviewProps[] | string) => {
+	if (typeof setting === 'string') {
+		try {
+			return JSON.parse(setting) as FeaturePreviewProps[];
+		} catch (_) {
+			return;
+		}
 	}
+	return setting;
+};
 
+export const useFeaturePreviewList = (featuresList: Pick<FeaturePreviewProps, 'name' | 'value'>[]) => {
 	const unseenFeatures = enabledDefaultFeatures.filter(
-		(feature) => !userFeaturesPreview?.find((userFeature) => userFeature.name === feature.name),
+		(defaultFeature) => !featuresList?.find((feature) => feature.name === defaultFeature.name),
 	).length;
 
-	const mergedFeatures = enabledDefaultFeatures.map((feature) => {
-		const userFeature = userFeaturesPreview?.find((userFeature) => userFeature.name === feature.name);
-		return { ...feature, ...userFeature };
+	const mergedFeatures = enabledDefaultFeatures.map((defaultFeature) => {
+		const features = featuresList?.find((feature) => feature.name === defaultFeature.name);
+		return { ...defaultFeature, ...features };
 	});
 
-	return { unseenFeatures, features: mergedFeatures, featurePreviewEnabled };
+	return { unseenFeatures, features: mergedFeatures };
 };
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
similarity index 79%
rename from packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx
rename to packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
index e348cfb6a864..ac3d6f92d51a 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
@@ -1,10 +1,11 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { renderHook } from '@testing-library/react';
 
-import { useFeaturePreviewList, enabledDefaultFeatures } from './useFeaturePreviewList';
+import { enabledDefaultFeatures } from './useFeaturePreviewList';
+import { usePreferenceFeaturePreviewList } from './usePreferenceFeaturePreviewList';
 
 it('should return the number of unseen features and Accounts_AllowFeaturePreview enabled ', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', true).build(),
 	});
@@ -18,7 +19,7 @@ it('should return the number of unseen features and Accounts_AllowFeaturePreview
 });
 
 it('should return the number of unseen features and Accounts_AllowFeaturePreview disabled ', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', false).build(),
 	});
@@ -32,7 +33,7 @@ it('should return the number of unseen features and Accounts_AllowFeaturePreview
 });
 
 it('should return 0 unseen features', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
@@ -49,7 +50,7 @@ it('should return 0 unseen features', () => {
 });
 
 it('should ignore removed feature previews', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
@@ -72,7 +73,7 @@ it('should ignore removed feature previews', () => {
 });
 
 it('should turn off ignored feature previews', async () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
diff --git a/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
new file mode 100644
index 000000000000..d7c4c13417d2
--- /dev/null
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
@@ -0,0 +1,16 @@
+import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { FeaturePreviewProps, parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
+
+export const usePreferenceFeaturePreviewList = () => {
+	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
+	const userFeaturesPreviewPreference = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
+	const userFeaturesPreview = useMemo(() => parseSetting(userFeaturesPreviewPreference), [userFeaturesPreviewPreference]);
+	const { unseenFeatures, features } = useFeaturePreviewList(userFeaturesPreview ?? []);
+
+	if (!featurePreviewEnabled) {
+		return { unseenFeatures: 0, features: [] as FeaturePreviewProps[], featurePreviewEnabled };
+	}
+	return { unseenFeatures, features, featurePreviewEnabled };
+};
diff --git a/packages/ui-client/src/index.ts b/packages/ui-client/src/index.ts
index 3e640343da5b..a96ef265aadc 100644
--- a/packages/ui-client/src/index.ts
+++ b/packages/ui-client/src/index.ts
@@ -1,5 +1,7 @@
 export * from './components';
 export * from './hooks/useFeaturePreview';
+export * from './hooks/useDefaultSettingFeaturePreviewList';
 export * from './hooks/useFeaturePreviewList';
+export * from './hooks/usePreferenceFeaturePreviewList';
 export * from './hooks/useDocumentTitle';
 export * from './helpers';

From 519ed86b392219851c28b101b1219c22caf23c9e Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 24 Sep 2024 12:03:20 -0600
Subject: [PATCH 112/170] fix: Avoid destructuring `connectionData` when value
 is undefined (#33339)

---
 .changeset/brave-brooms-invent.md             |  5 ++++
 .../app/livechat/server/lib/LivechatTyped.ts  |  8 ++++--
 .../end-to-end/api/livechat/09-visitors.ts    | 28 +++++++++++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/brave-brooms-invent.md

diff --git a/.changeset/brave-brooms-invent.md b/.changeset/brave-brooms-invent.md
new file mode 100644
index 000000000000..35d32b485944
--- /dev/null
+++ b/.changeset/brave-brooms-invent.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index ade6726336ec..6c2d655f4c95 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -589,6 +589,10 @@ class LivechatClass {
 		}
 	}
 
+	isValidObject(obj: unknown): obj is Record<string, any> {
+		return typeof obj === 'object' && obj !== null;
+	}
+
 	async registerGuest({
 		id,
 		token,
@@ -654,10 +658,10 @@ class LivechatClass {
 			visitorDataToUpdate.status = status;
 			visitorDataToUpdate.ts = new Date();
 
-			if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations')) {
+			if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations') && Livechat.isValidObject(connectionData)) {
 				Livechat.logger.debug(`Saving connection data for visitor ${token}`);
 				const { httpHeaders, clientAddress } = connectionData;
-				if (httpHeaders) {
+				if (Livechat.isValidObject(httpHeaders)) {
 					visitorDataToUpdate.userAgent = httpHeaders['user-agent'];
 					visitorDataToUpdate.ip = httpHeaders['x-real-ip'] || httpHeaders['x-forwarded-for'] || clientAddress;
 					visitorDataToUpdate.host = httpHeaders?.host;
diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
index f02d9d1d1e95..31134412b8ec 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -1,11 +1,11 @@
 import { faker } from '@faker-js/faker';
 import type { ILivechatVisitor } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { before, describe, it, after } from 'mocha';
 import moment from 'moment';
 import { type Response } from 'supertest';
 
-import { getCredentials, api, request, credentials } from '../../../data/api-data';
+import { getCredentials, api, request, credentials, methodCallAnon } from '../../../data/api-data';
 import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';
 import {
 	makeAgentAvailable,
@@ -217,6 +217,30 @@ describe('LIVECHAT - visitors', () => {
 			expect(body.visitor).to.have.property('livechatData');
 			expect(body.visitor.livechatData).to.have.property(customFieldName, 'Not a real address :)');
 		});
+
+		describe('special cases', () => {
+			before(async () => {
+				await updateSetting('Livechat_Allow_collect_and_store_HTTP_header_informations', true);
+			});
+			after(async () => {
+				await updateSetting('Livechat_Allow_collect_and_store_HTTP_header_informations', false);
+			});
+
+			// Note: this had to use the meteor method because the endpoint used `req.headers` which we cannot send as empty
+			// method doesn't pass them to the func allowing us to create a test for it
+			it('should allow to create a visitor without passing connectionData when GDPR setting is enabled', async () => {
+				const token = `${new Date().getTime()}-test`;
+				const response = await request
+					.post(methodCallAnon('livechat:registerGuest'))
+					.send({ message: `{"msg":"method","id":"23","method":"livechat:registerGuest","params":[{ "token": "${token}"}]}` });
+
+				expect(response.body).to.have.property('success', true);
+				const r = JSON.parse(response.body.message);
+
+				expect(r.result).to.have.property('visitor');
+				expect(r.result.visitor).to.have.property('token', token);
+			});
+		});
 	});
 
 	describe('livechat/visitors.info', () => {

From 2327ff58b2b06f127ac2d9fbc5b37ceb7202f752 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 24 Sep 2024 21:16:36 +0000
Subject: [PATCH 113/170] Release 6.13.0-rc.1

[no ci]
---
 .changeset/bump-patch-1727212585363.md        |  5 +++
 .changeset/pre.json                           |  3 ++
 apps/meteor/CHANGELOG.md                      | 39 +++++++++++++++++++
 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            | 13 +++++++
 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       | 12 ++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              | 10 +++++
 ee/packages/license/package.json              |  2 +-
 ee/packages/omnichannel-services/CHANGELOG.md | 15 +++++++
 ee/packages/omnichannel-services/package.json |  2 +-
 ee/packages/pdf-worker/CHANGELOG.md           | 10 +++++
 ee/packages/pdf-worker/package.json           |  2 +-
 ee/packages/presence/CHANGELOG.md             | 12 ++++++
 ee/packages/presence/package.json             |  2 +-
 package.json                                  |  2 +-
 packages/api-client/CHANGELOG.md              | 11 ++++++
 packages/api-client/package.json              |  2 +-
 packages/apps/CHANGELOG.md                    | 11 ++++++
 packages/apps/package.json                    |  2 +-
 packages/core-services/CHANGELOG.md           | 12 ++++++
 packages/core-services/package.json           |  2 +-
 packages/core-typings/CHANGELOG.md            |  3 ++
 packages/core-typings/package.json            |  2 +-
 packages/cron/CHANGELOG.md                    | 11 ++++++
 packages/cron/package.json                    |  2 +-
 packages/ddp-client/CHANGELOG.md              | 12 ++++++
 packages/ddp-client/package.json              |  2 +-
 packages/fuselage-ui-kit/CHANGELOG.md         | 14 +++++++
 packages/fuselage-ui-kit/package.json         |  8 ++--
 packages/gazzodown/CHANGELOG.md               | 12 ++++++
 packages/gazzodown/package.json               |  6 +--
 packages/i18n/CHANGELOG.md                    |  6 +++
 packages/i18n/package.json                    |  2 +-
 packages/instance-status/CHANGELOG.md         | 10 +++++
 packages/instance-status/package.json         |  2 +-
 packages/livechat/CHANGELOG.md                | 10 +++++
 packages/livechat/package.json                |  2 +-
 packages/mock-providers/CHANGELOG.md          |  9 +++++
 packages/mock-providers/package.json          |  2 +-
 packages/model-typings/CHANGELOG.md           | 10 +++++
 packages/model-typings/package.json           |  2 +-
 packages/models/CHANGELOG.md                  | 10 +++++
 packages/models/package.json                  |  2 +-
 packages/rest-typings/CHANGELOG.md            | 10 +++++
 packages/rest-typings/package.json            |  2 +-
 packages/ui-avatar/CHANGELOG.md               |  9 +++++
 packages/ui-avatar/package.json               |  4 +-
 packages/ui-client/CHANGELOG.md               | 15 +++++++
 packages/ui-client/package.json               |  6 +--
 packages/ui-contexts/CHANGELOG.md             | 13 +++++++
 packages/ui-contexts/package.json             |  2 +-
 packages/ui-video-conf/CHANGELOG.md           | 11 ++++++
 packages/ui-video-conf/package.json           |  6 +--
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +-
 72 files changed, 474 insertions(+), 47 deletions(-)
 create mode 100644 .changeset/bump-patch-1727212585363.md

diff --git a/.changeset/bump-patch-1727212585363.md b/.changeset/bump-patch-1727212585363.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727212585363.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 6976ce2b60aa..7c415a6b0dde 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -63,7 +63,9 @@
     "@rocket.chat/web-ui-registration": "10.0.0"
   },
   "changesets": [
+    "brave-brooms-invent",
     "brown-singers-appear",
+    "bump-patch-1727212585363",
     "cyan-ladybugs-thank",
     "dirty-stingrays-beg",
     "five-coats-rhyme",
@@ -80,6 +82,7 @@
     "mighty-drinks-hide",
     "nasty-tools-enjoy",
     "pink-swans-teach",
+    "quick-rings-wave",
     "quiet-cherries-punch",
     "rich-toes-bow",
     "rotten-rabbits-brush",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index ee5d553d85a5..c31645ca4ea4 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.1
+
+### Minor Changes
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+### Patch Changes
+
+- ([#33339](https://github.com/RocketChat/Rocket.Chat/pull/33339)) Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.1
+  - @rocket.chat/ui-client@11.0.0-rc.1
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/web-ui-registration@11.0.0-rc.1
+  - @rocket.chat/gazzodown@11.0.0-rc.1
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.1
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  - @rocket.chat/ui-video-conf@11.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/license@0.2.8-rc.1
+  - @rocket.chat/omnichannel-services@0.3.5-rc.1
+  - @rocket.chat/pdf-worker@0.2.5-rc.1
+  - @rocket.chat/presence@0.2.8-rc.1
+  - @rocket.chat/api-client@0.2.8-rc.1
+  - @rocket.chat/apps@0.1.8-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/cron@0.1.8-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.1
+  - @rocket.chat/instance-status@0.1.8-rc.1
+  </details>
+
 ## 6.13.0-rc.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index fc41ef05cacd..cfec7fa33824 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.0"
+	"version": "6.13.0-rc.1"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index fb0072738db2..59da7bfded9c 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 1.3.5-rc.0
 
 ### Patch Changes
@@ -13,6 +26,7 @@
   - @rocket.chat/message-parser@0.31.30-rc.0
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 1.3.4
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 2cab26ca2d38..540a283be188 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": "1.3.5-rc.0",
+	"version": "1.3.5-rc.1",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index a30ce30a7b6f..a36621eac547 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": "6.13.0-rc.0",
+	"version": "6.13.0-rc.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index d1528ca7502d..d2793509ff54 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 0.5.0-rc.0
 
 ### Minor Changes
@@ -15,6 +27,7 @@
   - @rocket.chat/ui-avatar@7.0.0-rc.0
   - @rocket.chat/ui-contexts@11.0.0-rc.0
   </details>
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index c5e7628001c6..82ebd11ee8dc 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.5.0-rc.0",
+  "version": "0.5.0-rc.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 929082c7bb9a..4c86f21b24c4 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.4.8-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/core-services@0.7.0-rc.0
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index f2c7dd0a8761..36ea1d9294c6 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.8-rc.0",
+	"version": "0.4.8-rc.1",
 	"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 5be055a875d0..c587761cdb38 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.4.8-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/core-services@0.7.0-rc.0
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index eaa51c88691c..255b76d2db2e 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.8-rc.0",
+	"version": "0.4.8-rc.1",
 	"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 4b61203020bf..975b9af1abf2 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  - @rocket.chat/instance-status@0.1.8-rc.1
+  </details>
+
 ## 0.3.8-rc.0
 
 ### Patch Changes
@@ -13,6 +27,7 @@
   - @rocket.chat/models@0.3.0-rc.0
   - @rocket.chat/instance-status@0.1.7-rc.0
   </details>
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 16dcc7b6f507..7fd25289ca55 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.8-rc.0",
+	"version": "0.3.8-rc.1",
 	"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 b934e4037e8a..613d6ef3f377 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.5-rc.1
+  - @rocket.chat/pdf-worker@0.2.5-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.4.8-rc.0
 
 ### Patch Changes
@@ -13,6 +27,7 @@
   - @rocket.chat/omnichannel-services@0.3.4-rc.0
   - @rocket.chat/pdf-worker@0.2.4-rc.0
   </details>
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 2f83816f4650..b0f97ce6d562 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.8-rc.0",
+	"version": "0.4.8-rc.1",
 	"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 78b716888236..795b6a2df283 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/presence@0.2.8-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.4.8-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/models@0.3.0-rc.0
   - @rocket.chat/presence@0.2.7-rc.0
   </details>
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 7c21dbbdcbec..d1eb50267c52 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.8-rc.0",
+	"version": "0.4.8-rc.1",
 	"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 9ac7c4bed05f..cca63889589c 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.5-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.4.8-rc.0
 
 ### Patch Changes
@@ -12,6 +25,7 @@
   - @rocket.chat/models@0.3.0-rc.0
   - @rocket.chat/omnichannel-services@0.3.4-rc.0
   </details>
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index b800469a8274..634d49159ea8 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.8-rc.0",
+	"version": "0.4.8-rc.1",
 	"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 550a6a251252..05843d5502b1 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.4.8-rc.0
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 1ffac9a8775c..dca9ad443b3d 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.8-rc.0",
+	"version": "0.4.8-rc.1",
 	"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 05c4edfb5e77..92b07995bb4b 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 0.2.8-rc.0
 
 ### Patch Changes
@@ -8,6 +17,7 @@
 
   - @rocket.chat/core-typings@6.13.0-rc.0
   </details>
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 24b5676b8fc0..30a89b4334bd 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.0",
+	"version": "0.2.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 3cfb53628c15..339277317d7f 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.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/pdf-worker@0.2.5-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.3.5-rc.0
 
 ### Patch Changes
@@ -13,6 +27,7 @@
   - @rocket.chat/models@0.3.0-rc.0
   - @rocket.chat/pdf-worker@0.2.4-rc.0
   </details>
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 227ac2927974..98f507325586 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.5-rc.0",
+	"version": "0.3.5-rc.1",
 	"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 785607cc6856..60f03a15a1de 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.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 0.2.5-rc.0
 
 ### Patch Changes
@@ -8,6 +17,7 @@
 
   - @rocket.chat/core-typings@6.13.0-rc.0
   </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index dbc1f4483d23..570b3baab2e2 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.5-rc.0",
+	"version": "0.2.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 428dcbca5933..7b8bc5b28116 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.2.8-rc.0
 
 ### Patch Changes
@@ -10,6 +21,7 @@
   - @rocket.chat/core-services@0.7.0-rc.0
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index a0a9d059dead..912b4bf453fd 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.0",
+	"version": "0.2.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 2f89cab55d2a..1a87fa6034bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.0",
+	"version": "6.13.0-rc.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 8158e1f876d5..18b99f365728 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  </details>
+
 ## 0.2.8-rc.0
 
 ### Patch Changes
@@ -9,6 +19,7 @@
   - @rocket.chat/rest-typings@6.13.0-rc.0
   - @rocket.chat/core-typings@6.13.0-rc.0
   </details>
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 10492ffedab4..b87cdb6600d9 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.8-rc.0",
+	"version": "0.2.8-rc.1",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 10681302f29e..fcf1229c306a 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  </details>
+
 ## 0.1.8-rc.0
 
 ### Patch Changes
@@ -9,6 +19,7 @@
   - @rocket.chat/model-typings@0.8.0-rc.0
   - @rocket.chat/core-typings@6.13.0-rc.0
   </details>
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 7dc954e5c3db..af88aff27664 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.0",
+	"version": "0.1.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index b1c5158d51a4..aafc8e1f0c6c 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.7.0-rc.0
 
 ### Minor Changes
@@ -19,6 +30,7 @@
   - @rocket.chat/message-parser@0.31.30-rc.0
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 0.6.1
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 7326f3cd3617..2ee07033e732 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.0-rc.0",
+	"version": "0.7.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 4d686538954f..e7171dedd7b6 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.1
+
 ## 6.13.0-rc.0
 
 ### Minor Changes
@@ -16,6 +18,7 @@
 
   - @rocket.chat/message-parser@0.31.30-rc.0
   </details>
+
 ## 6.12.1
 
 ### Patch Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 2c5cb3f64a2d..6fcd5a43d20d 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.0",
+	"version": "6.13.0-rc.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 27aa9beb2b65..297acb29b0cf 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.1.8-rc.0
 
 ### Patch Changes
@@ -9,6 +19,7 @@
   - @rocket.chat/core-typings@6.13.0-rc.0
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 798e07348d3b..f9ac01ce7740 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.0",
+	"version": "0.1.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index ac4b3f76b11c..5e81a05f3804 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/api-client@0.2.8-rc.1
+  </details>
+
 ## 0.3.8-rc.0
 
 ### Patch Changes
@@ -10,6 +21,7 @@
   - @rocket.chat/core-typings@6.13.0-rc.0
   - @rocket.chat/api-client@0.2.7-rc.0
   </details>
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 949fe4eebd65..c2dc8b95a4b9 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.8-rc.0",
+	"version": "0.3.8-rc.1",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 895ffaf94ab4..14c2fea3c3c1 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/gazzodown@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  - @rocket.chat/ui-video-conf@11.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 11.0.0-rc.0
 
 ### Minor Changes
@@ -20,6 +33,7 @@
   - @rocket.chat/ui-avatar@7.0.0-rc.0
   - @rocket.chat/ui-contexts@11.0.0-rc.0
   </details>
+
 ## 10.0.1
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 573d65dc215e..975051db933f 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.0",
+  "version": "11.0.0-rc.1",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.0",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.0",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.1",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.1",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.0",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.1",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 9c4e6777a8a8..5ce5e8e7afed 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0-rc.1
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 11.0.0-rc.0
 
 ### Minor Changes
@@ -15,6 +26,7 @@
   - @rocket.chat/message-parser@0.31.30-rc.0
   - @rocket.chat/ui-contexts@11.0.0-rc.0
   </details>
+
 ## 10.0.1
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index b9a5023ce13c..cf4a9209d649 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -74,8 +74,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "11.0.0-rc.0",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
+		"@rocket.chat/ui-client": "11.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 27bb4b471c66..3fa9140d4e99 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/i18n
 
+## 0.8.0-rc.1
+
+### Minor Changes
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
 ## 0.8.0-rc.0
 
 ### Minor Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index fe98e3b1f7fc..b93b9e9926cc 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.8.0-rc.0",
+	"version": "0.8.0-rc.1",
 	"private": true,
 	"type": "module",
 	"main": "./dist/index.js",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index a2df17f053d2..dacdd5e1d383 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
 ## 0.1.8-rc.0
 
 ### Patch Changes
@@ -8,6 +17,7 @@
 
   - @rocket.chat/models@0.3.0-rc.0
   </details>
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index a99c78a1ea78..79f0a19faf15 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.8-rc.0",
+	"version": "0.1.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 480e9f27b435..b5e6fc40dff6 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.1
+  </details>
+
 ## 1.20.0-rc.0
 
 ### Minor Changes
@@ -14,6 +23,7 @@
   - @rocket.chat/gazzodown@11.0.0-rc.0
   - @rocket.chat/message-parser@0.31.30-rc.0
   </details>
+
 ## 1.19.4
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index ab4a2a9b3a11..5663d8746eea 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.0",
+	"version": "1.20.0-rc.1",
 	"files": [
 		"/build"
 	],
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index 5bd539fda340..a18b8b2e51fc 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/mock-providers
 
+## 0.1.3-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.1
+  </details>
+
 ## 0.1.3-rc.0
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 1a7051e87ff2..3cd4aef7325d 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.3-rc.0",
+	"version": "0.1.3-rc.1",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index ecec03565e40..54c1a0769d1e 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 0.8.0-rc.0
 
 ### Minor Changes
@@ -18,6 +27,7 @@
 
   - @rocket.chat/core-typings@6.13.0-rc.0
   </details>
+
 ## 0.7.1
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 10a2fd9b643c..2c535eb950ad 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.0",
+	"version": "0.8.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 5491066cea23..a332d48b4443 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  </details>
+
 ## 0.3.0-rc.0
 
 ### Minor Changes
@@ -12,6 +21,7 @@
 
   - @rocket.chat/model-typings@0.8.0-rc.0
   </details>
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 35064171d9a6..aee39a8e841c 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.0",
+	"version": "0.3.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 8d999a8e7f5f..8dff96c33b7e 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
 ## 6.13.0-rc.0
 
 ### Minor Changes
@@ -23,6 +32,7 @@
   - @rocket.chat/core-typings@6.13.0-rc.0
   - @rocket.chat/message-parser@0.31.30-rc.0
   </details>
+
 ## 6.12.1
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 33aad6d64823..6d435a93ccfc 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.0",
+	"version": "6.13.0-rc.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 8192d99f770b..b5fc9c4b46d3 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  </details>
+
 ## 7.0.0-rc.0
 
 ### Minor Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 70f0efe2cff9..5c319c8837a5 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.0",
+	"version": "7.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 9be8c33c299d..0d5f01b17910 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.1
+
+### Minor Changes
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  </details>
+
 ## 11.0.0-rc.0
 
 ### Minor Changes
@@ -17,6 +31,7 @@
   - @rocket.chat/ui-avatar@7.0.0-rc.0
   - @rocket.chat/ui-contexts@11.0.0-rc.0
   </details>
+
 ## 10.0.1
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 40bccd8ca628..3b551cf83681 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "11.0.0-rc.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.0",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 9dcb89eda51d..4e29a0d34993 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/ddp-client@0.3.8-rc.1
+  </details>
+
 ## 11.0.0-rc.0
 
 ### Patch Changes
@@ -11,6 +23,7 @@
   - @rocket.chat/core-typings@6.13.0-rc.0
   - @rocket.chat/ddp-client@0.3.7-rc.0
   </details>
+
 ## 10.0.1
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 37f83e96a2aa..c3b0d5465da2 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.0",
+	"version": "11.0.0-rc.1",
 	"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 e058c3c4d257..450c89d74361 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  </details>
+
 ## 11.0.0-rc.0
 
 ### Minor Changes
@@ -13,6 +23,7 @@
   - @rocket.chat/ui-avatar@7.0.0-rc.0
   - @rocket.chat/ui-contexts@11.0.0-rc.0
   </details>
+
 ## 10.0.1
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 74c3ec43bcbb..fa14113988a2 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": "11.0.0-rc.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.0",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index c53cb5a2623b..01be06de3c00 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  </details>
+
 ## 11.0.0-rc.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 23fd80c89842..c039b3fc6c94 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": "11.0.0-rc.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.0",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From 7dc9c4154f672c26f046e8936f4cb02e86814355 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 25 Sep 2024 13:14:54 -0300
Subject: [PATCH 114/170] chore: replace Meteor._localStorage ->
 Accounts.storageLocation (#33356)

---
 apps/meteor/app/e2e/client/rocketchat.e2e.ts  | 27 ++++++++++---------
 apps/meteor/app/ui-master/server/scripts.ts   |  1 +
 .../client/messageBox/createComposerAPI.ts    |  8 +++---
 apps/meteor/app/ui-utils/server/Message.ts    |  4 +--
 .../app/utils/client/lib/RestApiClient.ts     |  6 +++--
 .../client/meteorOverrides/login/saml.ts      |  2 +-
 .../providers/UserProvider/UserProvider.tsx   |  6 ++---
 apps/meteor/client/startup/accounts.ts        | 16 +----------
 .../components/AuthorizationFormPage.tsx      |  3 +--
 .../externals/meteor/accounts-base.d.ts       |  1 +
 10 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index bbd6f208f35a..50224cb89dbb 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -6,6 +6,7 @@ import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
 import _ from 'lodash';
+import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
@@ -308,8 +309,8 @@ class E2E extends Emitter {
 
 	getKeysFromLocalStorage(): KeyPair {
 		return {
-			public_key: Meteor._localStorage.getItem('public_key'),
-			private_key: Meteor._localStorage.getItem('private_key'),
+			public_key: Accounts.storageLocation.getItem('public_key'),
+			private_key: Accounts.storageLocation.getItem('private_key'),
 		};
 	}
 
@@ -332,7 +333,7 @@ class E2E extends Emitter {
 					imperativeModal.close();
 				},
 				onConfirm: () => {
-					Meteor._localStorage.removeItem('e2e.randomPassword');
+					Accounts.storageLocation.removeItem('e2e.randomPassword');
 					this.setState(E2EEState.READY);
 					dispatchToastMessage({ type: 'success', message: t('End_To_End_Encryption_Enabled') });
 					this.closeAlert();
@@ -394,7 +395,7 @@ class E2E extends Emitter {
 			await this.persistKeys(this.getKeysFromLocalStorage(), await this.createRandomPassword());
 		}
 
-		const randomPassword = Meteor._localStorage.getItem('e2e.randomPassword');
+		const randomPassword = Accounts.storageLocation.getItem('e2e.randomPassword');
 		if (randomPassword) {
 			this.setState(E2EEState.SAVE_PASSWORD);
 			this.openAlert({
@@ -412,8 +413,8 @@ class E2E extends Emitter {
 		this.log('-> Stop Client');
 		this.closeAlert();
 
-		Meteor._localStorage.removeItem('public_key');
-		Meteor._localStorage.removeItem('private_key');
+		Accounts.storageLocation.removeItem('public_key');
+		Accounts.storageLocation.removeItem('private_key');
 		this.instancesByRoomId = {};
 		this.privateKey = undefined;
 		this.started = false;
@@ -425,8 +426,8 @@ class E2E extends Emitter {
 	async changePassword(newPassword: string): Promise<void> {
 		await this.persistKeys(this.getKeysFromLocalStorage(), newPassword, { force: true });
 
-		if (Meteor._localStorage.getItem('e2e.randomPassword')) {
-			Meteor._localStorage.setItem('e2e.randomPassword', newPassword);
+		if (Accounts.storageLocation.getItem('e2e.randomPassword')) {
+			Accounts.storageLocation.setItem('e2e.randomPassword', newPassword);
 		}
 	}
 
@@ -447,12 +448,12 @@ class E2E extends Emitter {
 	}
 
 	async loadKeys({ public_key, private_key }: { public_key: string; private_key: string }): Promise<void> {
-		Meteor._localStorage.setItem('public_key', public_key);
+		Accounts.storageLocation.setItem('public_key', public_key);
 
 		try {
 			this.privateKey = await importRSAKey(EJSON.parse(private_key), ['decrypt']);
 
-			Meteor._localStorage.setItem('private_key', private_key);
+			Accounts.storageLocation.setItem('private_key', private_key);
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
 			return this.error('Error importing private key: ', error);
@@ -474,7 +475,7 @@ class E2E extends Emitter {
 		try {
 			const publicKey = await exportJWKKey(key.publicKey);
 
-			Meteor._localStorage.setItem('public_key', JSON.stringify(publicKey));
+			Accounts.storageLocation.setItem('public_key', JSON.stringify(publicKey));
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
 			return this.error('Error exporting public key: ', error);
@@ -483,7 +484,7 @@ class E2E extends Emitter {
 		try {
 			const privateKey = await exportJWKKey(key.privateKey);
 
-			Meteor._localStorage.setItem('private_key', JSON.stringify(privateKey));
+			Accounts.storageLocation.setItem('private_key', JSON.stringify(privateKey));
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
 			return this.error('Error exporting private key: ', error);
@@ -498,7 +499,7 @@ class E2E extends Emitter {
 
 	async createRandomPassword(): Promise<string> {
 		const randomPassword = await generateMnemonicPhrase(5);
-		Meteor._localStorage.setItem('e2e.randomPassword', randomPassword);
+		Accounts.storageLocation.setItem('e2e.randomPassword', randomPassword);
 		return randomPassword;
 	}
 
diff --git a/apps/meteor/app/ui-master/server/scripts.ts b/apps/meteor/app/ui-master/server/scripts.ts
index 9edadb021d32..3e84a6e39c90 100644
--- a/apps/meteor/app/ui-master/server/scripts.ts
+++ b/apps/meteor/app/ui-master/server/scripts.ts
@@ -45,6 +45,7 @@ window.addEventListener('load', function() {
 		});
 		window.localStorage.clear();
 		Meteor._localStorage = window.sessionStorage;
+		Accounts.config({ clientStorage: 'session'  });
 	}
 });
 `
diff --git a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
index a926f8540d27..741f7959fa90 100644
--- a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
+++ b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
@@ -1,6 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
-import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
 import { withDebouncing } from '../../../../lib/utils/highOrderFunctions';
@@ -31,11 +31,11 @@ export const createComposerAPI = (input: HTMLTextAreaElement, storageID: string)
 
 	const persist = withDebouncing({ wait: 300 })(() => {
 		if (input.value) {
-			Meteor._localStorage.setItem(storageID, input.value);
+			Accounts.storageLocation.setItem(storageID, input.value);
 			return;
 		}
 
-		Meteor._localStorage.removeItem(storageID);
+		Accounts.storageLocation.removeItem(storageID);
 	});
 
 	const notifyQuotedMessagesUpdate = (): void => {
@@ -262,7 +262,7 @@ export const createComposerAPI = (input: HTMLTextAreaElement, storageID: string)
 
 	const insertNewLine = (): void => insertText('\n');
 
-	setText(Meteor._localStorage.getItem(storageID) ?? '', {
+	setText(Accounts.storageLocation.getItem(storageID) ?? '', {
 		skipFocus: true,
 	});
 
diff --git a/apps/meteor/app/ui-utils/server/Message.ts b/apps/meteor/app/ui-utils/server/Message.ts
index 06ae59238b42..21d8886c70bc 100644
--- a/apps/meteor/app/ui-utils/server/Message.ts
+++ b/apps/meteor/app/ui-utils/server/Message.ts
@@ -1,6 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { escapeHTML } from '@rocket.chat/string-helpers';
-import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 import { trim } from '../../../lib/utils/stringUtils';
 import { i18n } from '../../../server/lib/i18n';
@@ -17,7 +17,7 @@ export const Message = {
 			}
 			if (messageType.message) {
 				if (!language) {
-					language = Meteor._localStorage.getItem('userLanguage') || 'en';
+					language = Accounts.storageLocation.getItem('userLanguage') || 'en';
 				}
 				const data = (typeof messageType.data === 'function' && messageType.data(msg)) || {};
 				return i18n.t(messageType.message, { ...data, lng: language });
diff --git a/apps/meteor/app/utils/client/lib/RestApiClient.ts b/apps/meteor/app/utils/client/lib/RestApiClient.ts
index c5e12250b441..53c95ee3e4fa 100644
--- a/apps/meteor/app/utils/client/lib/RestApiClient.ts
+++ b/apps/meteor/app/utils/client/lib/RestApiClient.ts
@@ -1,6 +1,5 @@
 import { RestClient } from '@rocket.chat/api-client';
 import { Accounts } from 'meteor/accounts-base';
-import { Meteor } from 'meteor/meteor';
 
 import { invokeTwoFactorModal } from '../../../../client/lib/2fa/process2faReturn';
 import { baseURI } from '../../../../client/lib/baseURI';
@@ -12,7 +11,10 @@ class RestApiClient extends RestClient {
 				'X-Auth-Token': string;
 		  }
 		| undefined {
-		const [uid, token] = [Meteor._localStorage.getItem(Accounts.USER_ID_KEY), Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY)];
+		const [uid, token] = [
+			Accounts.storageLocation.getItem(Accounts.USER_ID_KEY),
+			Accounts.storageLocation.getItem(Accounts.LOGIN_TOKEN_KEY),
+		];
 
 		if (!uid || !token) {
 			return;
diff --git a/apps/meteor/client/meteorOverrides/login/saml.ts b/apps/meteor/client/meteorOverrides/login/saml.ts
index 14dfcc694e5c..f2199af5c0c7 100644
--- a/apps/meteor/client/meteorOverrides/login/saml.ts
+++ b/apps/meteor/client/meteorOverrides/login/saml.ts
@@ -72,7 +72,7 @@ Meteor.logout = async function (...args) {
 
 				// Remove the userId from the client to prevent calls to the server while the logout is processed.
 				// If the logout fails, the userId will be reloaded on the resume call
-				Meteor._localStorage.removeItem(Accounts.USER_ID_KEY);
+				Accounts.storageLocation.removeItem(Accounts.USER_ID_KEY);
 
 				// A nasty bounce: 'result' has the SAML LogoutRequest but we need a proper 302 to redirected from the server.
 				window.location.replace(Meteor.absoluteUrl(`_saml/sloRedirect/${provider}/?redirect=${encodeURIComponent(result)}`));
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index 27bba21eae95..53761fbef4e7 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -19,8 +19,6 @@ import { useDeleteUser } from './hooks/useDeleteUser';
 import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning';
 import { useUpdateAvatar } from './hooks/useUpdateAvatar';
 
-const getUserId = (): string | null => Meteor.userId();
-
 const getUser = (): IUser | null => Meteor.user() as IUser | null;
 
 const logout = (): Promise<void> =>
@@ -42,9 +40,9 @@ type UserProviderProps = {
 };
 
 const UserProvider = ({ children }: UserProviderProps): ReactElement => {
-	const userId = useReactiveValue(getUserId);
-	const previousUserId = useRef(userId);
 	const user = useReactiveValue(getUser);
+	const userId = user?._id ?? null;
+	const previousUserId = useRef(userId);
 	const [userLanguage, setUserLanguage] = useLocalStorage('userLanguage', '');
 	const [preferedLanguage, setPreferedLanguage] = useLocalStorage('preferedLanguage', '');
 
diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/startup/accounts.ts
index 88008a606656..50c033dc0596 100644
--- a/apps/meteor/client/startup/accounts.ts
+++ b/apps/meteor/client/startup/accounts.ts
@@ -2,7 +2,7 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { settings } from '../../app/settings/client';
+// import { settings } from '../../app/settings/client';
 import { mainReady } from '../../app/ui-utils/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { t } from '../../app/utils/lib/i18n';
@@ -25,17 +25,3 @@ Accounts.onEmailVerificationLink((token: string) => {
 		});
 	});
 });
-
-Meteor.startup(() => {
-	Tracker.autorun((computation) => {
-		const forgetUserSessionOnWindowClose = settings.get('Accounts_ForgetUserSessionOnWindowClose');
-
-		if (forgetUserSessionOnWindowClose === undefined) {
-			return;
-		}
-
-		computation.stop();
-
-		Accounts.config({ clientStorage: forgetUserSessionOnWindowClose ? 'session' : 'local' });
-	});
-});
diff --git a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
index 14f251042abc..623214352372 100644
--- a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
+++ b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
@@ -4,7 +4,6 @@ import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { Form } from '@rocket.chat/layout';
 import { useLogout, useRoute } from '@rocket.chat/ui-contexts';
 import { Accounts } from 'meteor/accounts-base';
-import { Meteor } from 'meteor/meteor';
 import React, { useEffect, useMemo, useRef } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
@@ -19,7 +18,7 @@ type AuthorizationFormPageProps = {
 };
 
 const AuthorizationFormPage = ({ oauthApp, redirectUri, user }: AuthorizationFormPageProps) => {
-	const token = useMemo(() => Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY) ?? undefined, []);
+	const token = useMemo(() => Accounts.storageLocation.getItem(Accounts.LOGIN_TOKEN_KEY) ?? undefined, []);
 
 	const formLabelId = useUniqueId();
 
diff --git a/apps/meteor/definition/externals/meteor/accounts-base.d.ts b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
index 31b70f7b7154..0d30eed0430d 100644
--- a/apps/meteor/definition/externals/meteor/accounts-base.d.ts
+++ b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
@@ -1,5 +1,6 @@
 declare module 'meteor/accounts-base' {
 	namespace Accounts {
+		const storageLocation: Window['localStorage'];
 		function createUser(
 			options: {
 				username?: string;

From b4c3e5cfee9f5a778b26c374b8b89a5a1ae79a26 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 25 Sep 2024 19:43:42 -0300
Subject: [PATCH 115/170] Bump rocket.chat to 6.14.0-develop (#33366)

---
 apps/meteor/app/utils/rocketchat.info |  2 +-
 apps/meteor/package.json              |  2 +-
 package.json                          |  2 +-
 packages/core-typings/package.json    |  2 +-
 packages/rest-typings/package.json    |  2 +-
 yarn.lock                             | 22 +++++++++++-----------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index cfec7fa33824..de3eb50fa5d1 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.1"
+	"version": "6.14.0-develop"
 }
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 766770427e0a..3767939a7e3c 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": "6.13.0-rc.1",
+	"version": "6.14.0-develop",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/package.json b/package.json
index 1a87fa6034bf..f06deed440ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.1",
+	"version": "6.14.0-develop",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 6fcd5a43d20d..0db23760066b 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.1",
+	"version": "6.14.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 6d435a93ccfc..30a448980c9b 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.1",
+	"version": "6.14.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/yarn.lock b/yarn.lock
index 161420f46399..f6c5de3e9a44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8962,10 +8962,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.0
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9052,8 +9052,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 11.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-client": 11.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10286,7 +10286,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10337,8 +10337,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10507,8 +10507,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10596,7 +10596,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 725997009f5ad86227c216473c1b41fad6c7374e Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Thu, 26 Sep 2024 11:53:04 -0300
Subject: [PATCH 116/170] Bump Apps-Engine version (#33368)

---
 apps/meteor/ee/server/services/package.json |  2 +-
 apps/meteor/package.json                    |  2 +-
 ee/apps/ddp-streamer/package.json           |  2 +-
 ee/packages/presence/package.json           |  2 +-
 packages/apps/package.json                  |  2 +-
 packages/core-services/package.json         |  2 +-
 packages/core-typings/package.json          |  2 +-
 packages/fuselage-ui-kit/package.json       |  2 +-
 packages/rest-typings/package.json          |  2 +-
 yarn.lock                                   | 48 ++++++++++-----------
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 540a283be188..4aa98902c3e3 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -18,7 +18,7 @@
 	"author": "Rocket.Chat",
 	"license": "MIT",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index a36621eac547..a1c74052c933 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -230,7 +230,7 @@
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
 		"@rocket.chat/apps": "workspace:^",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/base64": "workspace:^",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 7fd25289ca55..fca0c2122b21 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -15,7 +15,7 @@
 	],
 	"author": "Rocket.Chat",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 912b4bf453fd..aaa5596836a9 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@types/node": "^14.18.63",
diff --git a/packages/apps/package.json b/packages/apps/package.json
index af88aff27664..8a758aa4fb6e 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -18,7 +18,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^"
 	}
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 2ee07033e732..f4e8369314c4 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -32,7 +32,7 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 6fcd5a43d20d..47543b7b6637 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -22,7 +22,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 975051db933f..4fcf3a852bf9 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -63,7 +63,7 @@
     "@babel/preset-env": "~7.22.20",
     "@babel/preset-react": "~7.22.15",
     "@babel/preset-typescript": "~7.22.15",
-    "@rocket.chat/apps-engine": "1.45.0-alpha.868",
+    "@rocket.chat/apps-engine": "1.46.0",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/fuselage": "^0.59.1",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 6d435a93ccfc..529e073d0bd7 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -23,7 +23,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index bd9d3f7ea36d..2b1e2b970d43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8512,9 +8512,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:1.45.0-alpha.868":
-  version: 1.45.0-alpha.868
-  resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.868"
+"@rocket.chat/apps-engine@npm:1.46.0":
+  version: 1.46.0
+  resolution: "@rocket.chat/apps-engine@npm:1.46.0"
   dependencies:
     "@msgpack/msgpack": 3.0.0-beta2
     adm-zip: ^0.5.9
@@ -8530,7 +8530,7 @@ __metadata:
     uuid: ~8.3.2
   peerDependencies:
     "@rocket.chat/ui-kit": "*"
-  checksum: 3ac41e3de76be67e856e4bca888f113360628e510f9d4c66d70ed71d84f25bda6ca6659ead6c7a87d21c117c47bfa090b4508cce66e8630d2e935d3ed3158835
+  checksum: 0b4f0c6d00c666a78c488e5940639523e5d22500cbe2d687adc4b532b221be0e4bb9c4f011730077d8f8a06e252ea8e1d78c90d56f2517a5cf5d36d4376bed1e
   languageName: node
   linkType: hard
 
@@ -8538,7 +8538,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/apps@workspace:packages/apps"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     eslint: ~8.45.0
@@ -8611,7 +8611,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
@@ -8636,7 +8636,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/message-parser": "workspace:^"
@@ -8709,7 +8709,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
@@ -8907,7 +8907,7 @@ __metadata:
     "@babel/preset-env": ~7.22.20
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": ^0.59.1
@@ -8959,10 +8959,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.0
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9049,8 +9049,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 11.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-client": 11.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9360,7 +9360,7 @@ __metadata:
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
     "@rocket.chat/apps": "workspace:^"
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/base64": "workspace:^"
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
@@ -9983,7 +9983,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -10097,7 +10097,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -10257,7 +10257,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10308,8 +10308,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10478,8 +10478,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.0
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10567,7 +10567,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"
@@ -37200,7 +37200,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": ~0.31.25

From 6bee2a11a5ca3ed282311d0dd7f97d9c0a9392a0 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:54:59 -0700
Subject: [PATCH 117/170] ci: use node20 for release action (#33343)

---
 packages/release-action/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/release-action/action.yml b/packages/release-action/action.yml
index 2fc8fe35d565..23d7382aab6d 100644
--- a/packages/release-action/action.yml
+++ b/packages/release-action/action.yml
@@ -10,7 +10,7 @@ inputs:
     required: false
 
 runs:
-  using: "node16"
+  using: "node20"
   main: "dist/index.js"
 
 branding:

From fc26d85b287e9f3c7b8b8f714316cfb72470048e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 26 Sep 2024 18:47:39 -0300
Subject: [PATCH 118/170] regression: `Sidepanel` sort requires refresh after
 room update (#33370)

---
 .../views/room/Sidepanel/hooks/useTeamslistChildren.ts       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
index 5791a6e5d547..772c29509608 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type { Mongo } from 'meteor/mongo';
 import { useEffect, useMemo } from 'react';
 
 import { ChatRoom } from '../../../../../app/models/client';
@@ -12,7 +13,7 @@ const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
 	if (!b.lm) {
 		return -1;
 	}
-	return new Date(b.lm).toUTCString().localeCompare(new Date(a.lm).toUTCString());
+	return b.lm.getTime() - a.lm.getTime();
 };
 
 export const useTeamsListChildrenUpdate = (
@@ -23,7 +24,7 @@ export const useTeamsListChildrenUpdate = (
 	const queryClient = useQueryClient();
 
 	const query = useMemo(() => {
-		const query: Parameters<typeof ChatRoom.find>[0] = {
+		const query: Mongo.Selector<IRoom> = {
 			$or: [
 				{
 					_id: parentRid,

From 14f7fd11e445ae50f4d5d99f0f97b100ef0dfd55 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 26 Sep 2024 18:47:39 -0300
Subject: [PATCH 119/170] regression: `Sidepanel` sort requires refresh after
 room update (#33370)

---
 .../views/room/Sidepanel/hooks/useTeamslistChildren.ts       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
index 5791a6e5d547..772c29509608 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type { Mongo } from 'meteor/mongo';
 import { useEffect, useMemo } from 'react';
 
 import { ChatRoom } from '../../../../../app/models/client';
@@ -12,7 +13,7 @@ const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
 	if (!b.lm) {
 		return -1;
 	}
-	return new Date(b.lm).toUTCString().localeCompare(new Date(a.lm).toUTCString());
+	return b.lm.getTime() - a.lm.getTime();
 };
 
 export const useTeamsListChildrenUpdate = (
@@ -23,7 +24,7 @@ export const useTeamsListChildrenUpdate = (
 	const queryClient = useQueryClient();
 
 	const query = useMemo(() => {
-		const query: Parameters<typeof ChatRoom.find>[0] = {
+		const query: Mongo.Selector<IRoom> = {
 			$or: [
 				{
 					_id: parentRid,

From 9d26a73120639d961773d9e21fa844662e9f5a5f Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Thu, 26 Sep 2024 23:09:03 +0000
Subject: [PATCH 120/170] Release 6.13.0-rc.2

[no ci]
---
 .changeset/bump-patch-1727392133102.md        |  5 +++
 .changeset/pre.json                           |  1 +
 apps/meteor/CHANGELOG.md                      | 32 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 ++++++++
 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          | 13 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++++
 ee/packages/license/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/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/web-ui-registration/CHANGELOG.md     |  9 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 68 files changed, 415 insertions(+), 45 deletions(-)
 create mode 100644 .changeset/bump-patch-1727392133102.md

diff --git a/.changeset/bump-patch-1727392133102.md b/.changeset/bump-patch-1727392133102.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727392133102.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 7c415a6b0dde..467d26f1e0fd 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -66,6 +66,7 @@
     "brave-brooms-invent",
     "brown-singers-appear",
     "bump-patch-1727212585363",
+    "bump-patch-1727392133102",
     "cyan-ladybugs-thank",
     "dirty-stingrays-beg",
     "five-coats-rhyme",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index c31645ca4ea4..891e1aacc10d 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.2
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/license@0.2.8-rc.2
+  - @rocket.chat/omnichannel-services@0.3.5-rc.2
+  - @rocket.chat/pdf-worker@0.2.5-rc.2
+  - @rocket.chat/presence@0.2.8-rc.2
+  - @rocket.chat/api-client@0.2.8-rc.2
+  - @rocket.chat/apps@0.1.8-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/cron@0.1.8-rc.2
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.2
+  - @rocket.chat/gazzodown@11.0.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.2
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  - @rocket.chat/ui-client@11.0.0-rc.2
+  - @rocket.chat/ui-video-conf@11.0.0-rc.2
+  - @rocket.chat/web-ui-registration@11.0.0-rc.2
+  - @rocket.chat/instance-status@0.1.8-rc.2
+  </details>
+
 ## 6.13.0-rc.1
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index cfec7fa33824..cdb965e398f1 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.1"
+	"version": "6.13.0-rc.2"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 59da7bfded9c..533aa4bed06a 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 1.3.5-rc.1
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 4aa98902c3e3..3824180239ba 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": "1.3.5-rc.1",
+	"version": "1.3.5-rc.2",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index a1c74052c933..ad9f35d1e940 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": "6.13.0-rc.1",
+	"version": "6.13.0-rc.2",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index d2793509ff54..8355445a504c 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  </details>
+
 ## 0.5.0-rc.1
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 82ebd11ee8dc..31978e953958 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.5.0-rc.1",
+  "version": "0.5.0-rc.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 4c86f21b24c4..3f7aacf72531 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.4.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 36ea1d9294c6..995f14803292 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.8-rc.1",
+	"version": "0.4.8-rc.2",
 	"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 c587761cdb38..596be6356d49 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.4.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 255b76d2db2e..1b824e01726c 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.8-rc.1",
+	"version": "0.4.8-rc.2",
 	"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 975b9af1abf2..50a3a8329ef0 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  - @rocket.chat/instance-status@0.1.8-rc.2
+  </details>
+
 ## 0.3.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index fca0c2122b21..5feec2abc901 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.8-rc.1",
+	"version": "0.3.8-rc.2",
 	"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 613d6ef3f377..6b87f074638c 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.5-rc.2
+  - @rocket.chat/pdf-worker@0.2.5-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.4.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index b0f97ce6d562..53ba16262a44 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.8-rc.1",
+	"version": "0.4.8-rc.2",
 	"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 795b6a2df283..b73a591e04c3 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/presence@0.2.8-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.4.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index d1eb50267c52..88c87a1785ba 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.8-rc.1",
+	"version": "0.4.8-rc.2",
 	"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 cca63889589c..bd77d36d5fb1 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.5-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.4.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 634d49159ea8..f9522c510479 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.8-rc.1",
+	"version": "0.4.8-rc.2",
 	"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 05843d5502b1..8d119d985f98 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.4.8-rc.1
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index dca9ad443b3d..9fb58738737a 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.8-rc.1",
+	"version": "0.4.8-rc.2",
 	"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 92b07995bb4b..5325c6fdab8c 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
 ## 0.2.8-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 30a89b4334bd..976461397924 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.1",
+	"version": "0.2.8-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 339277317d7f..04c1ed37d1f7 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.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/pdf-worker@0.2.5-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.3.5-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 98f507325586..7d784b9ca847 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.5-rc.1",
+	"version": "0.3.5-rc.2",
 	"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 60f03a15a1de..666ab0405664 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.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
 ## 0.2.5-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 570b3baab2e2..ef5fe9e25641 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.5-rc.1",
+	"version": "0.2.5-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 7b8bc5b28116..8478835b20c8 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.2.8-rc.1
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index aaa5596836a9..a658148d537f 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.1",
+	"version": "0.2.8-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 1a87fa6034bf..6da849fc768d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.1",
+	"version": "6.13.0-rc.2",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 18b99f365728..879fad65c766 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  </details>
+
 ## 0.2.8-rc.1
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index b87cdb6600d9..972e51d4d804 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.8-rc.1",
+	"version": "0.2.8-rc.2",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index fcf1229c306a..78678d25bbfc 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  </details>
+
 ## 0.1.8-rc.1
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 8a758aa4fb6e..4262f5447404 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.1",
+	"version": "0.1.8-rc.2",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index aafc8e1f0c6c..853a8fc13260 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.7.0-rc.1
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index f4e8369314c4..effb18278253 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.0-rc.1",
+	"version": "0.7.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index e7171dedd7b6..d8dd0a43ceb0 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.2
+
 ## 6.13.0-rc.1
 
 ## 6.13.0-rc.0
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 47543b7b6637..88748914eb47 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.1",
+	"version": "6.13.0-rc.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 297acb29b0cf..a783830d3db8 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.1.8-rc.1
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index f9ac01ce7740..f23f1f9b04ae 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.1",
+	"version": "0.1.8-rc.2",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 5e81a05f3804..20b386444de1 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/api-client@0.2.8-rc.2
+  </details>
+
 ## 0.3.8-rc.1
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index c2dc8b95a4b9..54b10ecc53c9 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.8-rc.1",
+	"version": "0.3.8-rc.2",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 14c2fea3c3c1..c5c801fd123b 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/gazzodown@11.0.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  - @rocket.chat/ui-video-conf@11.0.0-rc.2
+  </details>
+
 ## 11.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 4fcf3a852bf9..93e937c566a8 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.1",
+  "version": "11.0.0-rc.2",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.1",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.1",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.2",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.2",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.1",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.2",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 5ce5e8e7afed..0b4fb2012547 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-client@11.0.0-rc.2
+  </details>
+
 ## 11.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index cf4a9209d649..a905e90e2a4c 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.1",
+	"version": "11.0.0-rc.2",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -74,8 +74,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "11.0.0-rc.1",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
+		"@rocket.chat/ui-client": "11.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index dacdd5e1d383..592d2b18879b 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
 ## 0.1.8-rc.1
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 79f0a19faf15..edcad17e2ff8 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.8-rc.1",
+	"version": "0.1.8-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index b5e6fc40dff6..4c20e6d34d2f 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.2
+  </details>
+
 ## 1.20.0-rc.1
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 5663d8746eea..c3fb62ebc539 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.1",
+	"version": "1.20.0-rc.2",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 54c1a0769d1e..51f30ad091e7 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
 ## 0.8.0-rc.1
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 2c535eb950ad..a3344bf44577 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.1",
+	"version": "0.8.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index a332d48b4443..effdec77a73e 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  </details>
+
 ## 0.3.0-rc.1
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index aee39a8e841c..578e1f52d9b5 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.1",
+	"version": "0.3.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 8dff96c33b7e..4fc0ce1a524d 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
 ## 6.13.0-rc.1
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 529e073d0bd7..d9259c966591 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.1",
+	"version": "6.13.0-rc.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index b5fc9c4b46d3..06d8d346596a 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  </details>
+
 ## 7.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 5c319c8837a5..2504481c999f 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.1",
+	"version": "7.0.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 0d5f01b17910..77ee80a47966 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  </details>
+
 ## 11.0.0-rc.1
 
 ### Minor Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 3b551cf83681..dc49888789de 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "11.0.0-rc.1",
+	"version": "11.0.0-rc.2",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 4e29a0d34993..d77eb16272a0 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/ddp-client@0.3.8-rc.2
+  </details>
+
 ## 11.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index c3b0d5465da2..eaf609940c86 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.1",
+	"version": "11.0.0-rc.2",
 	"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 450c89d74361..edef43cd60e4 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  </details>
+
 ## 11.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index fa14113988a2..1ec416147b4f 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": "11.0.0-rc.1",
+	"version": "11.0.0-rc.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 01be06de3c00..5d342fe4754c 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  </details>
+
 ## 11.0.0-rc.1
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index c039b3fc6c94..6cacf9fea0bf 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": "11.0.0-rc.1",
+	"version": "11.0.0-rc.2",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From fa226e4fcc3f1e4f785dd45f0e615e13b7775100 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 27 Sep 2024 01:49:52 -0300
Subject: [PATCH 121/170] chore: add ui-composer to storybook (#33383)

---
 .gitignore                        |   1 +
 packages/ui-composer/package.json | 102 +++++++++++++++---------------
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbad2c29a22c..03e74631957b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ yarn-error.log*
 .env.test.local
 .env.production.local
 
+storybook-static
 # turbo
 .turbo
 
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index c43f3485880e..562865bfd2d1 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -1,52 +1,54 @@
 {
-  "name": "@rocket.chat/ui-composer",
-  "version": "0.3.0-rc.0",
-  "private": true,
-  "main": "./dist/index.js",
-  "typings": "./dist/index.d.ts",
-  "files": [
-    "/dist"
-  ],
-  "scripts": {
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-    "build": "rm -rf dist && tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit",
-    "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-    "storybook": "start-storybook -p 6006"
-  },
-  "devDependencies": {
-    "@babel/core": "~7.22.20",
-    "@react-aria/toolbar": "^3.0.0-beta.1",
-    "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.59.1",
-    "@rocket.chat/icons": "~0.38.0",
-    "@storybook/addon-actions": "~6.5.16",
-    "@storybook/addon-docs": "~6.5.16",
-    "@storybook/addon-essentials": "~6.5.16",
-    "@storybook/builder-webpack4": "~6.5.16",
-    "@storybook/manager-webpack4": "~6.5.16",
-    "@storybook/react": "~6.5.16",
-    "@storybook/testing-library": "~0.0.13",
-    "@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",
-    "eslint-plugin-storybook": "~0.6.15",
-    "react": "~17.0.2",
-    "react-docgen-typescript-plugin": "~1.0.8",
-    "react-dom": "~17.0.2",
-    "typescript": "~5.5.4"
-  },
-  "peerDependencies": {
-    "@react-aria/toolbar": "*",
-    "@rocket.chat/fuselage": "*",
-    "@rocket.chat/icons": "*",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
-  },
-  "volta": {
-    "extends": "../../package.json"
-  }
+	"name": "@rocket.chat/ui-composer",
+	"version": "0.3.0-rc.0",
+	"private": true,
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"scripts": {
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"typecheck": "tsc --noEmit",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"storybook": "start-storybook -p 6006",
+		"build-preview": "build-storybook",
+		".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./storybook-static ../../.preview/ui-composer"
+	},
+	"devDependencies": {
+		"@babel/core": "~7.22.20",
+		"@react-aria/toolbar": "^3.0.0-beta.1",
+		"@rocket.chat/eslint-config": "workspace:^",
+		"@rocket.chat/fuselage": "^0.59.1",
+		"@rocket.chat/icons": "~0.38.0",
+		"@storybook/addon-actions": "~6.5.16",
+		"@storybook/addon-docs": "~6.5.16",
+		"@storybook/addon-essentials": "~6.5.16",
+		"@storybook/builder-webpack4": "~6.5.16",
+		"@storybook/manager-webpack4": "~6.5.16",
+		"@storybook/react": "~6.5.16",
+		"@storybook/testing-library": "~0.0.13",
+		"@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",
+		"eslint-plugin-storybook": "~0.6.15",
+		"react": "~17.0.2",
+		"react-docgen-typescript-plugin": "~1.0.8",
+		"react-dom": "~17.0.2",
+		"typescript": "~5.5.4"
+	},
+	"peerDependencies": {
+		"@react-aria/toolbar": "*",
+		"@rocket.chat/fuselage": "*",
+		"@rocket.chat/icons": "*",
+		"react": "^17.0.2",
+		"react-dom": "^17.0.2"
+	},
+	"volta": {
+		"extends": "../../package.json"
+	}
 }

From 34087b04728c52038cfd3dc7c5412c1fa35d58e3 Mon Sep 17 00:00:00 2001
From: "Julio A." <52619625+julio-cfa@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:46:04 +0200
Subject: [PATCH 122/170] ci: remove Jira-GitHub security integration (#33384)

---
 .../vulnerabilities-jira-integration.yml      | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 .github/workflows/vulnerabilities-jira-integration.yml

diff --git a/.github/workflows/vulnerabilities-jira-integration.yml b/.github/workflows/vulnerabilities-jira-integration.yml
deleted file mode 100644
index 2daeb533937d..000000000000
--- a/.github/workflows/vulnerabilities-jira-integration.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Github vulnerabilities and jira board integration
-
-on:
-  schedule:
-    - cron: '0 1 * * *'
-      
-jobs:
-  IntegrateSecurityVulnerabilities:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Github vulnerabilities and jira board integration"
-        uses: RocketChat/github-vulnerabilities-jira-integration@v0.3
-        env:
-          JIRA_URL: https://rocketchat.atlassian.net/
-          JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
-          JIRA_EMAIL: security-team-accounts@rocket.chat
-          JIRA_PROJECT_ID: GJIT
-          UID_CUSTOMFIELD_ID: customfield_10059
-          JIRA_COMPLETE_PHASE_ID: 31
-          JIRA_START_PHASE_ID: 11
-          

From 5965a1dbfe568f3379f53202a888932e6ffd3e52 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:47:09 -0300
Subject: [PATCH 123/170] chore: Single Contact ID: improved typings and
 removed some duplicated code (#33324)

---
 .../app/livechat/server/api/v1/contact.ts     | 14 +--
 .../app/livechat/server/lib/Contacts.ts       | 87 ++++++++-----------
 .../app/livechat/server/lib/LivechatTyped.ts  |  4 +-
 .../server/models/raw/LivechatCustomField.ts  |  6 +-
 4 files changed, 50 insertions(+), 61 deletions(-)

diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index f3fec80b23fe..ec0559d5f191 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -9,7 +9,7 @@ import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { API } from '../../../../api/server';
-import { Contacts, createContact, updateContact } from '../../lib/Contacts';
+import { Contacts, createContact, updateContact, isSingleContactEnabled } from '../../lib/Contacts';
 
 API.v1.addRoute(
 	'omnichannel/contact',
@@ -96,8 +96,8 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['create-livechat-contact'], validateParams: isPOSTOmnichannelContactsProps },
 	{
 		async post() {
-			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
-				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			if (!isSingleContactEnabled()) {
+				return API.v1.unauthorized();
 			}
 			const contactId = await createContact({ ...this.bodyParams, unknown: false });
 
@@ -111,8 +111,8 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['update-livechat-contact'], validateParams: isPOSTUpdateOmnichannelContactsProps },
 	{
 		async post() {
-			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
-				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			if (!isSingleContactEnabled()) {
+				return API.v1.unauthorized();
 			}
 
 			const contact = await updateContact({ ...this.bodyParams });
@@ -127,8 +127,8 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsProps },
 	{
 		async get() {
-			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
-				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			if (!isSingleContactEnabled()) {
+				return API.v1.unauthorized();
 			}
 			const contact = await LivechatContacts.findOneById(this.queryParams.contactId);
 
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index f6f812ce8af8..e9be40aa942b 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -1,4 +1,5 @@
 import type {
+	AtLeast,
 	ILivechatContact,
 	ILivechatContactChannel,
 	ILivechatCustomField,
@@ -113,41 +114,8 @@ export const Contacts = {
 			}
 		}
 
-		const allowedCF = LivechatCustomField.findByScope<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required' | 'visibility'>>(
-			'visitor',
-			{
-				projection: { _id: 1, label: 1, regexp: 1, required: 1 },
-			},
-			false,
-		);
-
-		const livechatData: Record<string, string> = {};
-
-		for await (const cf of allowedCF) {
-			if (!customFields.hasOwnProperty(cf._id)) {
-				if (cf.required) {
-					throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
-				}
-				continue;
-			}
-			const cfValue: string = trim(customFields[cf._id]);
-
-			if (!cfValue || typeof cfValue !== 'string') {
-				if (cf.required) {
-					throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
-				}
-				continue;
-			}
-
-			if (cf.regexp) {
-				const regex = new RegExp(cf.regexp);
-				if (!regex.test(cfValue)) {
-					throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
-				}
-			}
-
-			livechatData[cf._id] = cfValue;
-		}
+		const allowedCF = await getAllowedCustomFields();
+		const livechatData: Record<string, string> = validateCustomFields(allowedCF, customFields, { ignoreAdditionalFields: true });
 
 		const fieldsToRemove = {
 			// if field is explicitely set to empty string, remove
@@ -202,15 +170,20 @@ export const Contacts = {
 	},
 };
 
+export function isSingleContactEnabled(): boolean {
+	// The Single Contact feature is not yet available in production, but can already be partially used in test environments.
+	return process.env.TEST_MODE?.toUpperCase() === 'TRUE';
+}
+
 export async function createContact(params: CreateContactParams): Promise<string> {
-	const { name, emails, phones, customFields = {}, contactManager, channels, unknown } = params;
+	const { name, emails, phones, customFields: receivedCustomFields = {}, contactManager, channels, unknown } = params;
 
 	if (contactManager) {
 		await validateContactManager(contactManager);
 	}
 
 	const allowedCustomFields = await getAllowedCustomFields();
-	validateCustomFields(allowedCustomFields, customFields);
+	const customFields = validateCustomFields(allowedCustomFields, receivedCustomFields);
 
 	const { insertedId } = await LivechatContacts.insertOne({
 		name,
@@ -226,7 +199,7 @@ export async function createContact(params: CreateContactParams): Promise<string
 }
 
 export async function updateContact(params: UpdateContactParams): Promise<ILivechatContact> {
-	const { contactId, name, emails, phones, customFields, contactManager, channels } = params;
+	const { contactId, name, emails, phones, customFields: receivedCustomFields, contactManager, channels } = params;
 
 	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id'>>(contactId, { projection: { _id: 1 } });
 
@@ -238,17 +211,21 @@ export async function updateContact(params: UpdateContactParams): Promise<ILivec
 		await validateContactManager(contactManager);
 	}
 
-	if (customFields) {
-		const allowedCustomFields = await getAllowedCustomFields();
-		validateCustomFields(allowedCustomFields, customFields);
-	}
+	const customFields = receivedCustomFields && validateCustomFields(await getAllowedCustomFields(), receivedCustomFields);
 
-	const updatedContact = await LivechatContacts.updateContact(contactId, { name, emails, phones, contactManager, channels, customFields });
+	const updatedContact = await LivechatContacts.updateContact(contactId, {
+		name,
+		emails,
+		phones,
+		contactManager,
+		channels,
+		customFields,
+	});
 
 	return updatedContact;
 }
 
-async function getAllowedCustomFields(): Promise<ILivechatCustomField[]> {
+async function getAllowedCustomFields(): Promise<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[]> {
 	return LivechatCustomField.findByScope(
 		'visitor',
 		{
@@ -258,7 +235,13 @@ async function getAllowedCustomFields(): Promise<ILivechatCustomField[]> {
 	).toArray();
 }
 
-export function validateCustomFields(allowedCustomFields: ILivechatCustomField[], customFields: Record<string, string | unknown>) {
+export function validateCustomFields(
+	allowedCustomFields: AtLeast<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[],
+	customFields: Record<string, string | unknown>,
+	options?: { ignoreAdditionalFields?: boolean },
+): Record<string, string> {
+	const validValues: Record<string, string> = {};
+
 	for (const cf of allowedCustomFields) {
 		if (!customFields.hasOwnProperty(cf._id)) {
 			if (cf.required) {
@@ -281,14 +264,20 @@ export function validateCustomFields(allowedCustomFields: ILivechatCustomField[]
 				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
 			}
 		}
+
+		validValues[cf._id] = cfValue;
 	}
 
-	const allowedCustomFieldIds = new Set(allowedCustomFields.map((cf) => cf._id));
-	for (const key in customFields) {
-		if (!allowedCustomFieldIds.has(key)) {
-			throw new Error(i18n.t('error-custom-field-not-allowed', { key }));
+	if (!options?.ignoreAdditionalFields) {
+		const allowedCustomFieldIds = new Set(allowedCustomFields.map((cf) => cf._id));
+		for (const key in customFields) {
+			if (!allowedCustomFieldIds.has(key)) {
+				throw new Error(i18n.t('error-custom-field-not-allowed', { key }));
+			}
 		}
 	}
+
+	return validValues;
 }
 
 export async function validateContactManager(contactManagerUserId: string) {
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 6c2d655f4c95..44ee46f04418 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -71,7 +71,7 @@ import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
 import { businessHourManager } from '../business-hour';
-import { createContact } from './Contacts';
+import { createContact, isSingleContactEnabled } from './Contacts';
 import { parseAgentCustomFields, updateDepartmentAgents, validateEmail, normalizeTransferredByData } from './Helper';
 import { QueueManager } from './QueueManager';
 import { RoutingManager } from './RoutingManager';
@@ -669,7 +669,7 @@ class LivechatClass {
 			}
 		}
 
-		if (process.env.TEST_MODE?.toUpperCase() === 'TRUE') {
+		if (isSingleContactEnabled()) {
 			const contactId = await createContact({
 				name: name ?? (visitorDataToUpdate.username as string),
 				emails: email ? [email] : [],
diff --git a/apps/meteor/server/models/raw/LivechatCustomField.ts b/apps/meteor/server/models/raw/LivechatCustomField.ts
index 71228f55069d..38a93f6439b4 100644
--- a/apps/meteor/server/models/raw/LivechatCustomField.ts
+++ b/apps/meteor/server/models/raw/LivechatCustomField.ts
@@ -13,12 +13,12 @@ export class LivechatCustomFieldRaw extends BaseRaw<ILivechatCustomField> implem
 		return [{ key: { scope: 1 } }];
 	}
 
-	findByScope(
+	findByScope<T extends ILivechatCustomField>(
 		scope: ILivechatCustomField['scope'],
 		options?: FindOptions<ILivechatCustomField>,
 		includeHidden = true,
-	): FindCursor<ILivechatCustomField> {
-		return this.find({ scope, ...(includeHidden === true ? {} : { visibility: { $ne: 'hidden' } }) }, options);
+	): FindCursor<T> {
+		return this.find<T>({ scope, ...(includeHidden === true ? {} : { visibility: { $ne: 'hidden' } }) }, options);
 	}
 
 	findMatchingCustomFields(

From 92e366ee285a2f6adec4bafa45c3bc21994cf1e3 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Fri, 27 Sep 2024 14:45:31 -0300
Subject: [PATCH 124/170] fix: race condition when forwarding livechat by
 splitting subscription removal (#33381)

---
 .changeset/dry-taxis-cry.md              |  5 +++++
 apps/meteor/server/models/raw/BaseRaw.ts | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/dry-taxis-cry.md

diff --git a/.changeset/dry-taxis-cry.md b/.changeset/dry-taxis-cry.md
new file mode 100644
index 000000000000..ae8244087d9e
--- /dev/null
+++ b/.changeset/dry-taxis-cry.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
diff --git a/apps/meteor/server/models/raw/BaseRaw.ts b/apps/meteor/server/models/raw/BaseRaw.ts
index d822038b177e..3e763017bbd3 100644
--- a/apps/meteor/server/models/raw/BaseRaw.ts
+++ b/apps/meteor/server/models/raw/BaseRaw.ts
@@ -318,33 +318,33 @@ export abstract class BaseRaw<
 
 	async findOneAndDelete(filter: Filter<T>, options?: FindOneAndDeleteOptions): Promise<ModifyResult<T>> {
 		if (!this.trash) {
-			if (options) {
-				return this.col.findOneAndDelete(filter, options);
-			}
-			return this.col.findOneAndDelete(filter);
+			return this.col.findOneAndDelete(filter, options || {});
 		}
 
-		const result = await this.col.findOneAndDelete(filter);
-
-		const { value: doc } = result;
+		const doc = await this.col.findOne(filter);
 		if (!doc) {
-			return result;
+			return { ok: 1, value: null };
 		}
 
 		const { _id, ...record } = doc;
-
 		const trash: TDeleted = {
 			...record,
 			_deletedAt: new Date(),
 			__collection__: this.name,
 		} as unknown as TDeleted;
 
-		// since the operation is not atomic, we need to make sure that the record is not already deleted/inserted
 		await this.trash?.updateOne({ _id } as Filter<TDeleted>, { $set: trash } as UpdateFilter<TDeleted>, {
 			upsert: true,
 		});
 
-		return result;
+		try {
+			await this.col.deleteOne({ _id } as Filter<T>);
+		} catch (e) {
+			await this.trash?.deleteOne({ _id } as Filter<TDeleted>);
+			throw e;
+		}
+
+		return { ok: 1, value: doc };
 	}
 
 	async deleteMany(filter: Filter<T>, options?: DeleteOptions & { onTrash?: (record: ResultFields<T, C>) => void }): Promise<DeleteResult> {

From 88b9dc9c9d4d53f47c7872c6c215c56dd3509e00 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Fri, 27 Sep 2024 14:45:31 -0300
Subject: [PATCH 125/170] fix: race condition when forwarding livechat by
 splitting subscription removal (#33381)

---
 .changeset/dry-taxis-cry.md              |  5 +++++
 apps/meteor/server/models/raw/BaseRaw.ts | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/dry-taxis-cry.md

diff --git a/.changeset/dry-taxis-cry.md b/.changeset/dry-taxis-cry.md
new file mode 100644
index 000000000000..ae8244087d9e
--- /dev/null
+++ b/.changeset/dry-taxis-cry.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
diff --git a/apps/meteor/server/models/raw/BaseRaw.ts b/apps/meteor/server/models/raw/BaseRaw.ts
index d822038b177e..3e763017bbd3 100644
--- a/apps/meteor/server/models/raw/BaseRaw.ts
+++ b/apps/meteor/server/models/raw/BaseRaw.ts
@@ -318,33 +318,33 @@ export abstract class BaseRaw<
 
 	async findOneAndDelete(filter: Filter<T>, options?: FindOneAndDeleteOptions): Promise<ModifyResult<T>> {
 		if (!this.trash) {
-			if (options) {
-				return this.col.findOneAndDelete(filter, options);
-			}
-			return this.col.findOneAndDelete(filter);
+			return this.col.findOneAndDelete(filter, options || {});
 		}
 
-		const result = await this.col.findOneAndDelete(filter);
-
-		const { value: doc } = result;
+		const doc = await this.col.findOne(filter);
 		if (!doc) {
-			return result;
+			return { ok: 1, value: null };
 		}
 
 		const { _id, ...record } = doc;
-
 		const trash: TDeleted = {
 			...record,
 			_deletedAt: new Date(),
 			__collection__: this.name,
 		} as unknown as TDeleted;
 
-		// since the operation is not atomic, we need to make sure that the record is not already deleted/inserted
 		await this.trash?.updateOne({ _id } as Filter<TDeleted>, { $set: trash } as UpdateFilter<TDeleted>, {
 			upsert: true,
 		});
 
-		return result;
+		try {
+			await this.col.deleteOne({ _id } as Filter<T>);
+		} catch (e) {
+			await this.trash?.deleteOne({ _id } as Filter<TDeleted>);
+			throw e;
+		}
+
+		return { ok: 1, value: doc };
 	}
 
 	async deleteMany(filter: Filter<T>, options?: DeleteOptions & { onTrash?: (record: ResultFields<T, C>) => void }): Promise<DeleteResult> {

From b17b3befdf860eeb532d9dfd78903ab15a709b2f Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Fri, 27 Sep 2024 14:11:21 -0600
Subject: [PATCH 126/170] fix: Avoid notifying `watch.settings` on uncaught
 errors (#33376)

---
 .../server/lib/RocketChat.ErrorHandler.ts              | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts b/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
index 264443a1378b..984561fe13cd 100644
--- a/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
+++ b/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
@@ -3,14 +3,13 @@ import { Meteor } from 'meteor/meteor';
 
 import { throttledCounter } from '../../../../lib/utils/throttledCounter';
 import { sendMessage } from '../../../lib/server/functions/sendMessage';
-import { notifyOnSettingChanged } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 
 const incException = throttledCounter((counter) => {
 	Settings.incrementValueById('Uncaught_Exceptions_Count', counter, { returnDocument: 'after' })
 		.then(({ value }) => {
 			if (value) {
-				void notifyOnSettingChanged(value);
+				settings.set(value);
 			}
 		})
 		.catch(console.error);
@@ -118,5 +117,12 @@ process.on('unhandledRejection', (error) => {
 
 process.on('uncaughtException', async (error) => {
 	incException();
+
+	console.error('=== UnCaughtException ===');
+	console.error(error);
+	console.error('-------------------------');
+	console.error('Errors like this can cause oplog processing errors.');
+	console.error('===========================');
+
 	void errorHandler.trackError(error.message, error.stack);
 });

From a430faf72bb160355bf7cb92549e27d341e35d7c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 27 Sep 2024 18:52:13 -0300
Subject: [PATCH 127/170] chore: add gazzodown preview (#33279)

---
 .gitignore                            | 2 ++
 packages/gazzodown/.storybook/main.js | 8 ++++++++
 packages/gazzodown/package.json       | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/.gitignore b/.gitignore
index 03e74631957b..8ca2d018f92e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,5 @@ storybook-static
 
 data/
 registration.yaml
+
+storybook-static
diff --git a/packages/gazzodown/.storybook/main.js b/packages/gazzodown/.storybook/main.js
index de5a951bbded..f12b58cf856f 100644
--- a/packages/gazzodown/.storybook/main.js
+++ b/packages/gazzodown/.storybook/main.js
@@ -15,6 +15,14 @@ module.exports = {
 			include: /node_modules/,
 			loader: 'babel-loader',
 		});
+		config.module.rules.push({
+			test: /\.m?js$/,
+			include: /node_modules/,
+			type: 'javascript/auto',
+			use: {
+				loader: require.resolve('babel-loader'),
+			},
+		});
 		return config;
 	},
 };
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index cf4a9209d649..ca64df5ec913 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -10,6 +10,8 @@
 	"scripts": {
 		"build": "rm -rf dist && tsc -p tsconfig.build.json",
 		"build-storybook": "build-storybook",
+		"build-preview": "build-storybook --quiet",
+		".:build-preview-move": "mkdir -p ../../.preview && cp -r ./storybook-static ../../.preview/gazzodown",
 		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",

From 214d1b348681bb43f6c1b859b31efe5773bb2cce Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 27 Sep 2024 19:11:27 -0300
Subject: [PATCH 128/170] chore(Sidepanel): uses only local channels and
 discussions (#33387)

---
 .../views/room/Sidepanel/RoomSidepanel.tsx    |  4 +-
 .../SidepanelItem/RoomSidepanelItem.tsx       |  4 +-
 .../Sidepanel/hooks/useTeamslistChildren.ts   | 79 ++++---------------
 3 files changed, 20 insertions(+), 67 deletions(-)

diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
index 27c45e2774e8..6ee16a850202 100644
--- a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
@@ -51,8 +51,8 @@ const RoomSidepanelWithData = ({ parentRid, openedRoom }: { parentRid: string; o
 		<Sidepanel>
 			<Box pb={8} h='full'>
 				<Virtuoso
-					totalCount={result.data.data.length}
-					data={result.data.data}
+					totalCount={result.data.length}
+					data={result.data}
 					components={{ Item: SidepanelListItem, List: RoomSidepanelListWrapper, Scroller: VirtuosoScrollbars }}
 					itemContent={(_, data) => (
 						<RoomSidepanelItem openedRoom={openedRoom} room={data} parentRid={parentRid} viewMode={sidebarViewMode} />
diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
index dceb69e1aba3..8bb4d84eaebe 100644
--- a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
@@ -1,4 +1,4 @@
-import type { IRoom, ISubscription, Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { useUserSubscription } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
@@ -8,7 +8,7 @@ import { useItemData } from '../hooks/useItemData';
 
 export type RoomSidepanelItemProps = {
 	openedRoom?: string;
-	room: Serialized<IRoom>;
+	room: IRoom;
 	parentRid: string;
 	viewMode?: 'extended' | 'medium' | 'condensed';
 };
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
index 772c29509608..de7645ae2a30 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -1,107 +1,60 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import type { Mongo } from 'meteor/mongo';
 import { useEffect, useMemo } from 'react';
 
 import { ChatRoom } from '../../../../../app/models/client';
 
-const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
-	if (!a.lm) {
-		return 1;
-	}
-	if (!b.lm) {
-		return -1;
-	}
-	return b.lm.getTime() - a.lm.getTime();
-};
-
 export const useTeamsListChildrenUpdate = (
 	parentRid: string,
 	teamId?: string | null,
 	sidepanelItems?: 'channels' | 'discussions' | null,
 ) => {
-	const queryClient = useQueryClient();
-
 	const query = useMemo(() => {
 		const query: Mongo.Selector<IRoom> = {
 			$or: [
 				{
 					_id: parentRid,
 				},
-				{
-					prid: parentRid,
-				},
 			],
 		};
 
-		if (teamId && query.$or) {
+		if ((!sidepanelItems || sidepanelItems === 'discussions') && query.$or) {
+			query.$or.push({
+				prid: parentRid,
+			});
+		}
+
+		if ((!sidepanelItems || sidepanelItems === 'channels') && teamId && query.$or) {
 			query.$or.push({
 				teamId,
 			});
 		}
 		return query;
-	}, [parentRid, teamId]);
+	}, [parentRid, teamId, sidepanelItems]);
 
-	const teamList = useEndpoint('GET', '/v1/teams.listChildren');
-
-	const listRoomsAndDiscussions = useEndpoint('GET', '/v1/teams.listChildren');
 	const result = useQuery({
 		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems],
 		queryFn: () =>
-			listRoomsAndDiscussions({
-				roomId: parentRid,
-				sort: JSON.stringify({ lm: -1 }),
-				type: sidepanelItems || undefined,
-			}),
+			ChatRoom.find(query, {
+				sort: { lm: -1 },
+			}).fetch(),
 		enabled: sidepanelItems !== null && teamId !== null,
 		refetchInterval: 5 * 60 * 1000,
 		keepPreviousData: true,
 	});
 
-	const { mutate: update } = useMutation({
-		mutationFn: async (params?: { action: 'add' | 'remove' | 'update'; data: IRoom }) => {
-			queryClient.setQueryData(['sidepanel', 'list', parentRid, sidepanelItems], (data: Awaited<ReturnType<typeof teamList>> | void) => {
-				if (!data) {
-					return;
-				}
-
-				if (params?.action === 'add') {
-					data.data = [JSON.parse(JSON.stringify(params.data)), ...data.data].sort(sortRoomByLastMessage);
-				}
-
-				if (params?.action === 'remove') {
-					data.data = data.data.filter((item) => item._id !== params.data?._id);
-				}
-
-				if (params?.action === 'update') {
-					data.data = data.data
-						.map((item) => (item._id === params.data?._id ? JSON.parse(JSON.stringify(params.data)) : item))
-						.sort(sortRoomByLastMessage);
-				}
-
-				return { ...data };
-			});
-		},
-	});
-
 	useEffect(() => {
 		const liveQueryHandle = ChatRoom.find(query).observe({
-			added: (item) => {
-				queueMicrotask(() => update({ action: 'add', data: item }));
-			},
-			changed: (item) => {
-				queueMicrotask(() => update({ action: 'update', data: item }));
-			},
-			removed: (item) => {
-				queueMicrotask(() => update({ action: 'remove', data: item }));
-			},
+			added: () => queueMicrotask(() => result.refetch({ exact: false })),
+			changed: () => queueMicrotask(() => result.refetch({ exact: false })),
+			removed: () => queueMicrotask(() => result.refetch({ exact: false })),
 		});
 
 		return () => {
 			liveQueryHandle.stop();
 		};
-	}, [update, query]);
+	}, [query, result]);
 
 	return result;
 };

From 9f21b58c1e5ea33efa024a16b6ba085509e755da Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 27 Sep 2024 19:11:27 -0300
Subject: [PATCH 129/170] chore(Sidepanel): uses only local channels and
 discussions (#33387)

---
 .../views/room/Sidepanel/RoomSidepanel.tsx    |  4 +-
 .../SidepanelItem/RoomSidepanelItem.tsx       |  4 +-
 .../Sidepanel/hooks/useTeamslistChildren.ts   | 79 ++++---------------
 3 files changed, 20 insertions(+), 67 deletions(-)

diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
index 27c45e2774e8..6ee16a850202 100644
--- a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
@@ -51,8 +51,8 @@ const RoomSidepanelWithData = ({ parentRid, openedRoom }: { parentRid: string; o
 		<Sidepanel>
 			<Box pb={8} h='full'>
 				<Virtuoso
-					totalCount={result.data.data.length}
-					data={result.data.data}
+					totalCount={result.data.length}
+					data={result.data}
 					components={{ Item: SidepanelListItem, List: RoomSidepanelListWrapper, Scroller: VirtuosoScrollbars }}
 					itemContent={(_, data) => (
 						<RoomSidepanelItem openedRoom={openedRoom} room={data} parentRid={parentRid} viewMode={sidebarViewMode} />
diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
index dceb69e1aba3..8bb4d84eaebe 100644
--- a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
@@ -1,4 +1,4 @@
-import type { IRoom, ISubscription, Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { useUserSubscription } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
@@ -8,7 +8,7 @@ import { useItemData } from '../hooks/useItemData';
 
 export type RoomSidepanelItemProps = {
 	openedRoom?: string;
-	room: Serialized<IRoom>;
+	room: IRoom;
 	parentRid: string;
 	viewMode?: 'extended' | 'medium' | 'condensed';
 };
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
index 772c29509608..de7645ae2a30 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -1,107 +1,60 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import type { Mongo } from 'meteor/mongo';
 import { useEffect, useMemo } from 'react';
 
 import { ChatRoom } from '../../../../../app/models/client';
 
-const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
-	if (!a.lm) {
-		return 1;
-	}
-	if (!b.lm) {
-		return -1;
-	}
-	return b.lm.getTime() - a.lm.getTime();
-};
-
 export const useTeamsListChildrenUpdate = (
 	parentRid: string,
 	teamId?: string | null,
 	sidepanelItems?: 'channels' | 'discussions' | null,
 ) => {
-	const queryClient = useQueryClient();
-
 	const query = useMemo(() => {
 		const query: Mongo.Selector<IRoom> = {
 			$or: [
 				{
 					_id: parentRid,
 				},
-				{
-					prid: parentRid,
-				},
 			],
 		};
 
-		if (teamId && query.$or) {
+		if ((!sidepanelItems || sidepanelItems === 'discussions') && query.$or) {
+			query.$or.push({
+				prid: parentRid,
+			});
+		}
+
+		if ((!sidepanelItems || sidepanelItems === 'channels') && teamId && query.$or) {
 			query.$or.push({
 				teamId,
 			});
 		}
 		return query;
-	}, [parentRid, teamId]);
+	}, [parentRid, teamId, sidepanelItems]);
 
-	const teamList = useEndpoint('GET', '/v1/teams.listChildren');
-
-	const listRoomsAndDiscussions = useEndpoint('GET', '/v1/teams.listChildren');
 	const result = useQuery({
 		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems],
 		queryFn: () =>
-			listRoomsAndDiscussions({
-				roomId: parentRid,
-				sort: JSON.stringify({ lm: -1 }),
-				type: sidepanelItems || undefined,
-			}),
+			ChatRoom.find(query, {
+				sort: { lm: -1 },
+			}).fetch(),
 		enabled: sidepanelItems !== null && teamId !== null,
 		refetchInterval: 5 * 60 * 1000,
 		keepPreviousData: true,
 	});
 
-	const { mutate: update } = useMutation({
-		mutationFn: async (params?: { action: 'add' | 'remove' | 'update'; data: IRoom }) => {
-			queryClient.setQueryData(['sidepanel', 'list', parentRid, sidepanelItems], (data: Awaited<ReturnType<typeof teamList>> | void) => {
-				if (!data) {
-					return;
-				}
-
-				if (params?.action === 'add') {
-					data.data = [JSON.parse(JSON.stringify(params.data)), ...data.data].sort(sortRoomByLastMessage);
-				}
-
-				if (params?.action === 'remove') {
-					data.data = data.data.filter((item) => item._id !== params.data?._id);
-				}
-
-				if (params?.action === 'update') {
-					data.data = data.data
-						.map((item) => (item._id === params.data?._id ? JSON.parse(JSON.stringify(params.data)) : item))
-						.sort(sortRoomByLastMessage);
-				}
-
-				return { ...data };
-			});
-		},
-	});
-
 	useEffect(() => {
 		const liveQueryHandle = ChatRoom.find(query).observe({
-			added: (item) => {
-				queueMicrotask(() => update({ action: 'add', data: item }));
-			},
-			changed: (item) => {
-				queueMicrotask(() => update({ action: 'update', data: item }));
-			},
-			removed: (item) => {
-				queueMicrotask(() => update({ action: 'remove', data: item }));
-			},
+			added: () => queueMicrotask(() => result.refetch({ exact: false })),
+			changed: () => queueMicrotask(() => result.refetch({ exact: false })),
+			removed: () => queueMicrotask(() => result.refetch({ exact: false })),
 		});
 
 		return () => {
 			liveQueryHandle.stop();
 		};
-	}, [update, query]);
+	}, [query, result]);
 
 	return result;
 };

From bc1e6eec3be194a017624f73449c5974d0e296a1 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Fri, 27 Sep 2024 19:36:57 -0300
Subject: [PATCH 130/170] chore: Move Apps-Engine to monorepo (#32951)

---
 .github/CODEOWNERS                            |    1 +
 .github/actions/build-docker-image/action.yml |    5 +-
 .github/actions/build-docker/action.yml       |    7 +
 .github/actions/meteor-build/action.yml       |    5 +
 .github/actions/setup-node/action.yml         |   25 +-
 .github/workflows/ci-code-check.yml           |    4 +
 .../workflows/ci-deploy-gh-pages-preview.yml  |    1 +
 .github/workflows/ci-deploy-gh-pages.yml      |    1 +
 .github/workflows/ci-test-e2e.yml             |    4 +
 .github/workflows/ci-test-unit.yml            |    4 +
 .github/workflows/ci.yml                      |   19 +
 .github/workflows/new-release.yml             |    1 +
 .github/workflows/pr-update-description.yml   |    1 +
 .github/workflows/publish-release.yml         |    1 +
 .github/workflows/release-candidate.yml       |    1 +
 .tool-versions                                |    1 +
 README.md                                     |    1 +
 apps/meteor/.docker/Dockerfile                |   11 +-
 apps/meteor/.docker/Dockerfile.alpine         |   27 +-
 apps/meteor/ee/server/services/package.json   |    2 +-
 apps/meteor/package.json                      |    2 +-
 docker-compose-ci.yml                         |    4 +
 ee/apps/account-service/Dockerfile            |    4 +
 ee/apps/authorization-service/Dockerfile      |    4 +
 ee/apps/ddp-streamer/Dockerfile               |    4 +
 ee/apps/ddp-streamer/package.json             |    2 +-
 ee/apps/omnichannel-transcript/Dockerfile     |    4 +
 ee/apps/presence-service/Dockerfile           |    4 +
 ee/apps/queue-worker/Dockerfile               |    4 +
 ee/apps/stream-hub-service/Dockerfile         |    4 +
 ee/packages/presence/package.json             |    2 +-
 packages/apps-engine/.eslintignore            |    8 +
 packages/apps-engine/.eslintrc.json           |   58 +
 packages/apps-engine/.gitignore               |   61 +
 packages/apps-engine/.prettierrc              |    7 +
 packages/apps-engine/README.md                |  125 ++
 packages/apps-engine/deno-runtime/.gitignore  |    1 +
 .../deno-runtime/AppObjectRegistry.ts         |   26 +
 .../apps-engine/deno-runtime/acorn-walk.d.ts  |  170 ++
 packages/apps-engine/deno-runtime/acorn.d.ts  |  857 ++++++++++
 packages/apps-engine/deno-runtime/deno.jsonc  |   16 +
 packages/apps-engine/deno-runtime/deno.lock   |  107 ++
 .../deno-runtime/handlers/api-handler.ts      |   46 +
 .../deno-runtime/handlers/app/construct.ts    |  126 ++
 .../handlers/app/handleGetStatus.ts           |   15 +
 .../handlers/app/handleInitialize.ts          |   19 +
 .../handlers/app/handleOnDisable.ts           |   19 +
 .../handlers/app/handleOnEnable.ts            |   16 +
 .../handlers/app/handleOnInstall.ts           |   30 +
 .../handlers/app/handleOnPreSettingUpdate.ts  |   22 +
 .../handlers/app/handleOnSettingUpdated.ts    |   24 +
 .../handlers/app/handleOnUninstall.ts         |   30 +
 .../handlers/app/handleOnUpdate.ts            |   30 +
 .../handlers/app/handleSetStatus.ts           |   29 +
 .../deno-runtime/handlers/app/handler.ts      |  112 ++
 .../deno-runtime/handlers/listener/handler.ts |  150 ++
 .../handlers/scheduler-handler.ts             |   51 +
 .../handlers/slashcommand-handler.ts          |  122 ++
 .../handlers/tests/api-handler.test.ts        |   79 +
 .../handlers/tests/listener-handler.test.ts   |  234 +++
 .../handlers/tests/scheduler-handler.test.ts  |   46 +
 .../tests/slashcommand-handler.test.ts        |  152 ++
 .../handlers/tests/uikit-handler.test.ts      |   99 ++
 .../tests/videoconference-handler.test.ts     |  122 ++
 .../deno-runtime/handlers/uikit/handler.ts    |   82 +
 .../handlers/videoconference-handler.ts       |   49 +
 .../lib/accessors/builders/BlockBuilder.ts    |  216 +++
 .../accessors/builders/DiscussionBuilder.ts   |   59 +
 .../builders/LivechatMessageBuilder.ts        |  204 +++
 .../lib/accessors/builders/MessageBuilder.ts  |  232 +++
 .../lib/accessors/builders/RoomBuilder.ts     |  163 ++
 .../lib/accessors/builders/UserBuilder.ts     |   81 +
 .../builders/VideoConferenceBuilder.ts        |   94 ++
 .../lib/accessors/extenders/HttpExtender.ts   |   62 +
 .../accessors/extenders/MessageExtender.ts    |   66 +
 .../lib/accessors/extenders/RoomExtender.ts   |   61 +
 .../extenders/VideoConferenceExtend.ts        |   69 +
 .../deno-runtime/lib/accessors/http.ts        |   92 ++
 .../deno-runtime/lib/accessors/mod.ts         |  302 ++++
 .../lib/accessors/modify/ModifyCreator.ts     |  344 ++++
 .../lib/accessors/modify/ModifyExtender.ts    |   93 ++
 .../lib/accessors/modify/ModifyUpdater.ts     |  153 ++
 .../deno-runtime/lib/accessors/notifier.ts    |   75 +
 .../lib/accessors/tests/AppAccessors.test.ts  |  122 ++
 .../lib/accessors/tests/ModifyCreator.test.ts |  106 ++
 .../accessors/tests/ModifyExtender.test.ts    |  120 ++
 .../lib/accessors/tests/ModifyUpdater.test.ts |  128 ++
 .../apps-engine/deno-runtime/lib/ast/mod.ts   |   64 +
 .../deno-runtime/lib/ast/operations.ts        |  239 +++
 .../lib/ast/tests/data/ast_blocks.ts          |  436 +++++
 .../lib/ast/tests/operations.test.ts          |  245 +++
 .../apps-engine/deno-runtime/lib/codec.ts     |   43 +
 .../apps-engine/deno-runtime/lib/logger.ts    |  142 ++
 .../apps-engine/deno-runtime/lib/messenger.ts |  199 +++
 .../apps-engine/deno-runtime/lib/require.ts   |   14 +
 packages/apps-engine/deno-runtime/lib/room.ts |  104 ++
 .../deno-runtime/lib/roomFactory.ts           |   27 +
 .../lib/sanitizeDeprecatedUsage.ts            |   20 +
 .../deno-runtime/lib/tests/logger.test.ts     |  111 ++
 .../deno-runtime/lib/tests/messenger.test.ts  |   96 ++
 packages/apps-engine/deno-runtime/main.ts     |  129 ++
 packages/apps-engine/package.json             |  132 ++
 packages/apps-engine/scripts/bundle.js        |   35 +
 packages/apps-engine/scripts/deno-cache.js    |   25 +
 .../src/client/AppClientManager.ts            |   28 +
 .../src/client/AppServerCommunicator.ts       |   16 +
 .../src/client/AppsEngineUIClient.ts          |   70 +
 .../src/client/AppsEngineUIHost.ts            |   78 +
 .../apps-engine/src/client/constants/index.ts |    6 +
 .../client/definition/AppsEngineUIMethods.ts  |    7 +
 .../definition/IAppsEngineUIResponse.ts       |   19 +
 .../definition/IExternalComponentRoomInfo.ts  |   16 +
 .../definition/IExternalComponentUserInfo.ts  |   14 +
 .../src/client/definition/index.ts            |    4 +
 packages/apps-engine/src/client/index.ts      |    4 +
 .../apps-engine/src/client/utils/index.ts     |   18 +
 packages/apps-engine/src/definition/App.ts    |  236 +++
 .../apps-engine/src/definition/AppStatus.ts   |   65 +
 packages/apps-engine/src/definition/IApp.ts   |   90 +
 packages/apps-engine/src/definition/LICENSE   |   21 +
 .../src/definition/accessors/IApiExtend.ts    |   16 +
 .../src/definition/accessors/IAppAccessors.ts |   11 +
 .../accessors/IAppInstallationContext.ts      |    5 +
 .../accessors/IAppUninstallationContext.ts    |    5 +
 .../definition/accessors/IAppUpdateContext.ts |    6 +
 .../accessors/ICloudWorkspaceRead.ts          |   24 +
 .../accessors/IConfigurationExtend.ts         |   36 +
 .../accessors/IConfigurationModify.ts         |   18 +
 .../accessors/IDiscussionBuilder.ts           |   25 +
 .../src/definition/accessors/IEmailCreator.ts |   10 +
 .../definition/accessors/IEnvironmentRead.ts  |   27 +
 .../definition/accessors/IEnvironmentWrite.ts |   10 +
 .../accessors/IEnvironmentalVariableRead.ts   |   11 +
 .../accessors/IExternalComponentsExtend.ts    |   17 +
 .../src/definition/accessors/IHttp.ts         |  202 +++
 .../definition/accessors/ILivechatCreator.ts  |   43 +
 .../accessors/ILivechatMessageBuilder.ts      |  219 +++
 .../src/definition/accessors/ILivechatRead.ts |   38 +
 .../definition/accessors/ILivechatUpdater.ts  |   33 +
 .../src/definition/accessors/ILogEntry.ts     |   22 +
 .../src/definition/accessors/ILogger.ts       |   29 +
 .../definition/accessors/IMessageBuilder.ts   |  236 +++
 .../definition/accessors/IMessageExtender.ts  |   36 +
 .../src/definition/accessors/IMessageRead.ts  |   15 +
 .../definition/accessors/IMessageUpdater.ts   |   21 +
 .../definition/accessors/IModerationModify.ts |   27 +
 .../src/definition/accessors/IModify.ts       |   45 +
 .../definition/accessors/IModifyCreator.ts    |  100 ++
 .../definition/accessors/IModifyDeleter.ts    |   12 +
 .../definition/accessors/IModifyExtender.ts   |   40 +
 .../definition/accessors/IModifyUpdater.ts    |   52 +
 .../src/definition/accessors/INotifier.ts     |   63 +
 .../src/definition/accessors/IOAuthApp.ts     |   13 +
 .../definition/accessors/IOAuthAppsModify.ts  |   23 +
 .../definition/accessors/IOAuthAppsReader.ts  |   16 +
 .../src/definition/accessors/IPersistence.ts  |   97 ++
 .../definition/accessors/IPersistenceRead.ts  |   40 +
 .../src/definition/accessors/IRead.ts         |   52 +
 .../src/definition/accessors/IRoleRead.ts     |   27 +
 .../src/definition/accessors/IRoomBuilder.ts  |  186 +++
 .../src/definition/accessors/IRoomExtender.ts |   40 +
 .../src/definition/accessors/IRoomRead.ts     |   93 ++
 .../definition/accessors/ISchedulerExtend.ts  |   11 +
 .../definition/accessors/ISchedulerModify.ts  |   31 +
 .../accessors/IServerSettingRead.ts           |   43 +
 .../accessors/IServerSettingUpdater.ts        |    6 +
 .../accessors/IServerSettingsModify.ts        |   40 +
 .../src/definition/accessors/ISettingRead.ts  |   23 +
 .../definition/accessors/ISettingUpdater.ts   |    5 +
 .../definition/accessors/ISettingsExtend.ts   |   17 +
 .../accessors/ISlashCommandsExtend.ts         |   16 +
 .../accessors/ISlashCommandsModify.ts         |   30 +
 .../src/definition/accessors/IThreadRead.ts   |    9 +
 .../src/definition/accessors/IUIController.ts |   31 +
 .../src/definition/accessors/IUIExtend.ts     |    5 +
 .../definition/accessors/IUploadCreator.ts    |   12 +
 .../src/definition/accessors/IUploadRead.ts   |    7 +
 .../src/definition/accessors/IUserBuilder.ts  |   60 +
 .../src/definition/accessors/IUserRead.ts     |   22 +
 .../src/definition/accessors/IUserUpdater.ts  |   18 +
 .../accessors/IVideoConfProvidersExtend.ts    |   15 +
 .../accessors/IVideoConferenceBuilder.ts      |   34 +
 .../accessors/IVideoConferenceExtend.ts       |   21 +
 .../accessors/IVideoConferenceRead.ts         |   15 +
 .../src/definition/accessors/index.ts         |   58 +
 .../src/definition/api/ApiEndpoint.ts         |   40 +
 .../apps-engine/src/definition/api/IApi.ts    |   58 +
 .../src/definition/api/IApiEndpoint.ts        |   47 +
 .../src/definition/api/IApiEndpointInfo.ts    |    6 +
 .../definition/api/IApiEndpointMetadata.ts    |   10 +
 .../src/definition/api/IApiExample.ts         |   19 +
 .../src/definition/api/IRequest.ts            |   16 +
 .../src/definition/api/IResponse.ts           |   13 +
 .../apps-engine/src/definition/api/index.ts   |    8 +
 .../src/definition/app-schema.json            |   75 +
 .../src/definition/assets/IAsset.ts           |    6 +
 .../src/definition/assets/IAssetProvider.ts   |    5 +
 .../src/definition/assets/index.ts            |    4 +
 .../src/definition/cloud/IWorkspaceToken.ts   |    4 +
 .../src/definition/email/IEmail.ts            |    9 +
 .../src/definition/email/IEmailDescriptor.ts  |   11 +
 .../src/definition/email/IPreEmailSent.ts     |   25 +
 .../definition/email/IPreEmailSentContext.ts  |    6 +
 .../apps-engine/src/definition/email/index.ts |    4 +
 .../src/definition/example-app.json           |   13 +
 .../exceptions/AppsEngineException.ts         |   32 +
 .../EssentialAppDisabledException.ts          |   16 +
 .../FileUploadNotAllowedException.ts          |   12 +
 .../InvalidSettingValueException.ts           |    8 +
 .../exceptions/UserNotAllowedException.ts     |   14 +
 .../src/definition/exceptions/index.ts        |    5 +
 .../externalComponent/IExternalComponent.ts   |   51 +
 .../IExternalComponentOptions.ts              |   10 +
 .../IExternalComponentState.ts                |   16 +
 .../IPostExternalComponentClosed.ts           |   16 +
 .../IPostExternalComponentOpened.ts           |   16 +
 .../src/definition/externalComponent/index.ts |    5 +
 .../src/definition/livechat/IDepartment.ts    |   17 +
 .../livechat/ILivechatEventContext.ts         |    7 +
 .../definition/livechat/ILivechatMessage.ts   |    7 +
 .../src/definition/livechat/ILivechatRoom.ts  |   55 +
 .../livechat/ILivechatRoomClosedHandler.ts    |   19 +
 .../livechat/ILivechatTransferData.ts         |    8 +
 .../livechat/ILivechatTransferEventContext.ts |   15 +
 .../livechat/IPostLivechatAgentAssigned.ts    |   25 +
 .../livechat/IPostLivechatAgentUnassigned.ts  |   25 +
 .../livechat/IPostLivechatGuestSaved.ts       |   19 +
 .../livechat/IPostLivechatRoomClosed.ts       |   19 +
 .../livechat/IPostLivechatRoomSaved.ts        |   19 +
 .../livechat/IPostLivechatRoomStarted.ts      |   19 +
 .../livechat/IPostLivechatRoomTransferred.ts  |   13 +
 .../src/definition/livechat/IVisitor.ts       |   16 +
 .../src/definition/livechat/IVisitorEmail.ts  |    3 +
 .../src/definition/livechat/IVisitorPhone.ts  |    3 +
 .../src/definition/livechat/index.ts          |   38 +
 .../src/definition/messages/IMessage.ts       |   34 +
 .../src/definition/messages/IMessageAction.ts |   17 +
 .../definition/messages/IMessageAttachment.ts |   43 +
 .../messages/IMessageAttachmentAuthor.ts      |   11 +
 .../messages/IMessageAttachmentField.ts       |   11 +
 .../messages/IMessageAttachmentTitle.ts       |    8 +
 .../messages/IMessageDeleteContext.ts         |   17 +
 .../src/definition/messages/IMessageFile.ts   |    5 +
 .../messages/IMessageFollowContext.ts         |   21 +
 .../definition/messages/IMessagePinContext.ts |   21 +
 .../src/definition/messages/IMessageRaw.ts    |   40 +
 .../definition/messages/IMessageReaction.ts   |   13 +
 .../messages/IMessageReactionContext.ts       |   25 +
 .../messages/IMessageReportContext.ts         |   21 +
 .../messages/IMessageStarContext.ts           |   21 +
 .../messages/IPostMessageDeleted.ts           |   37 +
 .../messages/IPostMessageFollowed.ts          |   18 +
 .../definition/messages/IPostMessagePinned.ts |   18 +
 .../messages/IPostMessageReacted.ts           |   19 +
 .../messages/IPostMessageReported.ts          |   18 +
 .../definition/messages/IPostMessageSent.ts   |   27 +
 .../messages/IPostMessageSentToBot.ts         |   15 +
 .../messages/IPostMessageStarred.ts           |   18 +
 .../messages/IPostMessageUpdated.ts           |   27 +
 .../messages/IPreMessageDeletePrevent.ts      |   28 +
 .../messages/IPreMessageSentExtend.ts         |   29 +
 .../messages/IPreMessageSentModify.ts         |   29 +
 .../messages/IPreMessageSentPrevent.ts        |   28 +
 .../messages/IPreMessageUpdatedExtend.ts      |   29 +
 .../messages/IPreMessageUpdatedModify.ts      |   29 +
 .../messages/IPreMessageUpdatedPrevent.ts     |   28 +
 .../messages/MessageActionButtonsAlignment.ts |    4 +
 .../definition/messages/MessageActionType.ts  |    3 +
 .../messages/MessageProcessingType.ts         |    4 +
 .../src/definition/messages/index.ts          |   71 +
 .../src/definition/metadata/AppInterface.ts   |   60 +
 .../src/definition/metadata/AppMethod.ts      |  102 ++
 .../src/definition/metadata/IAppAuthorInfo.ts |    5 +
 .../src/definition/metadata/IAppInfo.ts       |   20 +
 .../metadata/RocketChatAssociations.ts        |   22 +
 .../src/definition/metadata/index.ts          |    8 +
 .../src/definition/oauth2/IOAuth2.ts          |  136 ++
 .../src/definition/oauth2/OAuth2.ts           |   15 +
 .../src/definition/permissions/IPermission.ts |   12 +
 .../persistence/IPersistenceItem.ts           |    7 +
 .../src/definition/persistence/index.ts       |    1 +
 .../apps-engine/src/definition/roles/IRole.ts |    8 +
 .../apps-engine/src/definition/roles/index.ts |    5 +
 .../src/definition/rooms/IPostRoomCreate.ts   |   27 +
 .../src/definition/rooms/IPostRoomDeleted.ts  |   27 +
 .../definition/rooms/IPostRoomUserJoined.ts   |   19 +
 .../definition/rooms/IPostRoomUserLeave.ts    |   19 +
 .../definition/rooms/IPreRoomCreateExtend.ts  |   28 +
 .../definition/rooms/IPreRoomCreateModify.ts  |   28 +
 .../definition/rooms/IPreRoomCreatePrevent.ts |   26 +
 .../definition/rooms/IPreRoomDeletePrevent.ts |   26 +
 .../definition/rooms/IPreRoomUserJoined.ts    |   18 +
 .../src/definition/rooms/IPreRoomUserLeave.ts |   18 +
 .../apps-engine/src/definition/rooms/IRoom.ts |   26 +
 .../rooms/IRoomUserJoinedContext.ts           |   23 +
 .../definition/rooms/IRoomUserLeaveContext.ts |   23 +
 .../src/definition/rooms/RoomType.ts          |    6 +
 .../apps-engine/src/definition/rooms/index.ts |   17 +
 .../definition/scheduler/IOnetimeSchedule.ts  |   13 +
 .../src/definition/scheduler/IProcessor.ts    |   45 +
 .../scheduler/IRecurringSchedule.ts           |   17 +
 .../src/definition/scheduler/index.ts         |    3 +
 .../src/definition/settings/ISetting.ts       |   47 +
 .../settings/ISettingUpdateContext.ts         |    6 +
 .../src/definition/settings/SettingType.ts    |   14 +
 .../src/definition/settings/index.ts          |    4 +
 .../definition/slashcommands/ISlashCommand.ts |   41 +
 .../slashcommands/ISlashCommandPreview.ts     |   28 +
 .../slashcommands/SlashCommandContext.ts      |   33 +
 .../src/definition/slashcommands/index.ts     |    5 +
 .../ui/IUIActionButtonDescriptor.ts           |   41 +
 .../definition/ui/UIActionButtonContext.ts    |    7 +
 .../apps-engine/src/definition/ui/index.ts    |    2 +
 .../definition/uikit/IUIKitActionHandler.ts   |   77 +
 .../uikit/IUIKitIncomingInteraction.ts        |   28 +
 .../IUIKitIncomingInteractionActionButton.ts  |   78 +
 .../definition/uikit/IUIKitInteractionType.ts |   41 +
 .../src/definition/uikit/IUIKitSurface.ts     |   22 +
 .../src/definition/uikit/IUIKitView.ts        |    7 +
 .../UIKitIncomingInteractionContainer.ts      |   18 +
 .../uikit/UIKitIncomingInteractionTypes.ts    |   60 +
 .../uikit/UIKitInteractionContext.ts          |   69 +
 .../uikit/UIKitInteractionPayloadFormatter.ts |   68 +
 .../uikit/UIKitInteractionResponder.ts        |   75 +
 .../definition/uikit/blocks/BlockBuilder.ts   |  196 +++
 .../src/definition/uikit/blocks/Blocks.ts     |  108 ++
 .../src/definition/uikit/blocks/Elements.ts   |  115 ++
 .../src/definition/uikit/blocks/Objects.ts    |   33 +
 .../src/definition/uikit/blocks/index.ts      |    4 +
 .../apps-engine/src/definition/uikit/index.ts |    7 +
 .../livechat/IUIKitLivechatActionHandler.ts   |   23 +
 .../IUIKitLivechatIncomingInteraction.ts      |   17 +
 .../UIKitLivechatIncomingInteractionType.ts   |   22 +
 .../UIKitLivechatInteractionContext.ts        |   33 +
 .../src/definition/uikit/livechat/index.ts    |    4 +
 .../definition/uploads/IFileUploadContext.ts  |    6 +
 .../src/definition/uploads/IPreFileUpload.ts  |   20 +
 .../src/definition/uploads/IUpload.ts         |   25 +
 .../definition/uploads/IUploadDescriptor.ts   |   24 +
 .../src/definition/uploads/IUploadDetails.ts  |   26 +
 .../src/definition/uploads/StoreType.ts       |    7 +
 .../src/definition/uploads/index.ts           |    6 +
 .../src/definition/users/IBotUser.ts          |    6 +
 .../src/definition/users/IPostUserCreated.ts  |   15 +
 .../src/definition/users/IPostUserDeleted.ts  |   15 +
 .../src/definition/users/IPostUserLoggedIn.ts |   15 +
 .../definition/users/IPostUserLoggedOut.ts    |   15 +
 .../users/IPostUserStatusChanged.ts           |   17 +
 .../src/definition/users/IPostUserUpdated.ts  |   15 +
 .../apps-engine/src/definition/users/IUser.ts |   25 +
 .../src/definition/users/IUserContext.ts      |   19 +
 .../definition/users/IUserCreationOptions.ts  |    7 +
 .../src/definition/users/IUserEmail.ts        |    4 +
 .../src/definition/users/IUserLookup.ts       |    5 +
 .../src/definition/users/IUserSettings.ts     |    5 +
 .../definition/users/IUserStatusContext.ts    |   23 +
 .../src/definition/users/IUserUpdateContex.ts |   24 +
 .../definition/users/IUserUpdateContext.ts    |   24 +
 .../definition/users/UserStatusConnection.ts  |    9 +
 .../src/definition/users/UserType.ts          |   10 +
 .../apps-engine/src/definition/users/index.ts |   33 +
 .../videoConfProviders/IVideoConfProvider.ts  |   63 +
 .../IVideoConferenceOptions.ts                |    4 +
 .../videoConfProviders/VideoConfData.ts       |    7 +
 .../definition/videoConfProviders/index.ts    |    5 +
 .../videoConferences/AppVideoConference.ts    |    6 +
 .../videoConferences/IVideoConference.ts      |   56 +
 .../videoConferences/IVideoConferenceUser.ts  |    5 +
 .../src/definition/videoConferences/index.ts  |    5 +
 packages/apps-engine/src/lib/utils.ts         |    1 +
 packages/apps-engine/src/server/AppManager.ts | 1150 +++++++++++++
 .../apps-engine/src/server/IGetAppsFilter.ts  |    6 +
 packages/apps-engine/src/server/ProxiedApp.ts |  154 ++
 .../src/server/accessors/ApiExtend.ts         |   11 +
 .../src/server/accessors/AppAccessors.ts      |   36 +
 .../server/accessors/CloudWorkspaceRead.ts    |   11 +
 .../server/accessors/ConfigurationExtend.ts   |   24 +
 .../server/accessors/ConfigurationModify.ts   |    9 +
 .../src/server/accessors/DiscussionBuilder.ts |   47 +
 .../src/server/accessors/EmailCreator.ts      |   11 +
 .../src/server/accessors/EnvironmentRead.ts   |   21 +
 .../src/server/accessors/EnvironmentWrite.ts  |   13 +
 .../accessors/EnvironmentalVariableRead.ts    |   18 +
 .../accessors/ExternalComponentsExtend.ts     |   11 +
 .../apps-engine/src/server/accessors/Http.ts  |   77 +
 .../src/server/accessors/HttpExtend.ts        |   58 +
 .../src/server/accessors/LivechatCreator.ts   |   29 +
 .../accessors/LivechatMessageBuilder.ts       |  191 +++
 .../src/server/accessors/LivechatRead.ts      |   73 +
 .../src/server/accessors/LivechatUpdater.ts   |   23 +
 .../src/server/accessors/MessageBuilder.ts    |  224 +++
 .../src/server/accessors/MessageExtender.ts   |   50 +
 .../src/server/accessors/MessageRead.ts       |   33 +
 .../src/server/accessors/ModerationModify.ts  |   20 +
 .../src/server/accessors/Modify.ts            |   89 +
 .../src/server/accessors/ModifyCreator.ts     |  260 +++
 .../src/server/accessors/ModifyDeleter.ts     |   35 +
 .../src/server/accessors/ModifyExtender.ts    |   46 +
 .../src/server/accessors/ModifyUpdater.ts     |  106 ++
 .../src/server/accessors/Notifier.ts          |   49 +
 .../src/server/accessors/OAuthAppsModify.ts   |   19 +
 .../src/server/accessors/OAuthAppsReader.ts   |   15 +
 .../src/server/accessors/Persistence.ts       |   43 +
 .../src/server/accessors/PersistenceRead.ts   |   19 +
 .../src/server/accessors/Reader.ts            |   87 +
 .../src/server/accessors/RoleRead.ts          |   15 +
 .../src/server/accessors/RoomBuilder.ts       |  155 ++
 .../src/server/accessors/RoomExtender.ts      |   56 +
 .../src/server/accessors/RoomRead.ts          |   73 +
 .../src/server/accessors/SchedulerExtend.ts   |   11 +
 .../src/server/accessors/SchedulerModify.ts   |   27 +
 .../src/server/accessors/ServerSettingRead.ts |   34 +
 .../server/accessors/ServerSettingUpdater.ts  |   15 +
 .../server/accessors/ServerSettingsModify.ts  |   23 +
 .../src/server/accessors/SettingRead.ts       |   25 +
 .../src/server/accessors/SettingUpdater.ts    |   22 +
 .../src/server/accessors/SettingsExtend.ts    |   26 +
 .../server/accessors/SlashCommandsExtend.ts   |   11 +
 .../server/accessors/SlashCommandsModify.ts   |   19 +
 .../src/server/accessors/ThreadRead.ts        |   11 +
 .../src/server/accessors/UIController.ts      |  106 ++
 .../src/server/accessors/UIExtend.ts          |   11 +
 .../src/server/accessors/UploadCreator.ts     |   25 +
 .../src/server/accessors/UploadRead.ts        |   21 +
 .../src/server/accessors/UserBuilder.ts       |   74 +
 .../src/server/accessors/UserRead.ts          |   23 +
 .../src/server/accessors/UserUpdater.ts       |   28 +
 .../accessors/VideoConfProviderExtend.ts      |   11 +
 .../accessors/VideoConferenceBuilder.ts       |   83 +
 .../server/accessors/VideoConferenceExtend.ts |   64 +
 .../server/accessors/VideoConferenceRead.ts   |   11 +
 .../apps-engine/src/server/accessors/index.ts |   95 ++
 .../src/server/bridges/ApiBridge.ts           |   49 +
 .../src/server/bridges/AppActivationBridge.ts |   35 +
 .../src/server/bridges/AppBridges.ts          |  101 ++
 .../server/bridges/AppDetailChangesBridge.ts  |   16 +
 .../src/server/bridges/BaseBridge.ts          |    6 +
 .../server/bridges/CloudWorkspaceBridge.ts    |   30 +
 .../src/server/bridges/CommandBridge.ts       |  117 ++
 .../src/server/bridges/EmailBridge.ts         |   30 +
 .../bridges/EnvironmentalVariableBridge.ts    |   45 +
 .../src/server/bridges/HttpBridge.ts          |   37 +
 .../src/server/bridges/IInternalBridge.ts     |    7 +
 .../bridges/IInternalFederationBridge.ts      |   15 +
 .../bridges/IInternalPersistenceBridge.ts     |    9 +
 .../bridges/IInternalSchedulerBridge.ts       |    8 +
 .../src/server/bridges/IInternalUserBridge.ts |    8 +
 .../src/server/bridges/IListenerBridge.ts     |   10 +
 .../src/server/bridges/InternalBridge.ts      |   22 +
 .../src/server/bridges/ListenerBridge.ts      |   18 +
 .../src/server/bridges/LivechatBridge.ts      |  259 +++
 .../src/server/bridges/MessageBridge.ts       |  116 ++
 .../src/server/bridges/ModerationBridge.ts    |   47 +
 .../src/server/bridges/OAuthAppsBridge.ts     |   85 +
 .../src/server/bridges/PersistenceBridge.ts   |  161 ++
 .../src/server/bridges/RoleBridge.ts          |   38 +
 .../src/server/bridges/RoomBridge.ts          |  179 ++
 .../src/server/bridges/SchedulerBridge.ts     |   62 +
 .../src/server/bridges/ServerSettingBridge.ts |   93 ++
 .../src/server/bridges/ThreadBridge.ts        |   35 +
 .../src/server/bridges/UiInteractionBridge.ts |   31 +
 .../src/server/bridges/UploadBridge.ts        |   62 +
 .../src/server/bridges/UserBridge.ts          |  149 ++
 .../server/bridges/VideoConferenceBridge.ts   |   94 ++
 .../apps-engine/src/server/bridges/index.ts   |   52 +
 .../src/server/compiler/AppCompiler.ts        |   30 +
 .../compiler/AppFabricationFulfillment.ts     |   74 +
 .../src/server/compiler/AppImplements.ts      |   27 +
 .../src/server/compiler/AppPackageParser.ts   |  161 ++
 .../server/compiler/IParseAppPackageResult.ts |    9 +
 .../apps-engine/src/server/compiler/index.ts  |    7 +
 .../src/server/compiler/modules/index.ts      |   55 +
 .../src/server/compiler/modules/networking.ts |   36 +
 .../errors/CommandAlreadyExistsError.ts       |    9 +
 .../CommandHasAlreadyBeenTouchedError.ts      |    9 +
 .../src/server/errors/CompilerError.ts        |    9 +
 .../server/errors/InvalidInstallationError.ts |    5 +
 .../src/server/errors/InvalidLicenseError.ts  |    7 +
 .../server/errors/MustContainFunctionError.ts |    9 +
 .../src/server/errors/MustExtendAppError.ts   |    5 +
 .../errors/NotEnoughMethodArgumentsError.ts   |    9 +
 .../server/errors/PathAlreadyExistsError.ts   |    9 +
 .../server/errors/PermissionDeniedError.ts    |   25 +
 .../server/errors/RequiredApiVersionError.ts  |   21 +
 .../VideoConfProviderAlreadyExistsError.ts    |    9 +
 .../VideoConfProviderNotRegisteredError.ts    |    9 +
 .../apps-engine/src/server/errors/index.ts    |   25 +
 .../src/server/logging/AppConsole.ts          |  121 ++
 .../src/server/logging/ILoggerStorageEntry.ts |   14 +
 .../apps-engine/src/server/logging/index.ts   |    4 +
 .../src/server/managers/AppAccessorManager.ts |  228 +++
 .../apps-engine/src/server/managers/AppApi.ts |   95 ++
 .../src/server/managers/AppApiManager.ts      |  165 ++
 .../managers/AppExternalComponentManager.ts   |  142 ++
 .../src/server/managers/AppLicenseManager.ts  |   91 +
 .../src/server/managers/AppListenerManager.ts | 1220 ++++++++++++++
 .../server/managers/AppPermissionManager.ts   |   40 +
 .../src/server/managers/AppRuntimeManager.ts  |   57 +
 .../server/managers/AppSchedulerManager.ts    |   98 ++
 .../src/server/managers/AppSettingsManager.ts |   55 +
 .../server/managers/AppSignatureManager.ts    |   85 +
 .../src/server/managers/AppSlashCommand.ts    |   77 +
 .../server/managers/AppSlashCommandManager.ts |  470 ++++++
 .../server/managers/AppVideoConfProvider.ts   |  105 ++
 .../managers/AppVideoConfProviderManager.ts   |  207 +++
 .../server/managers/UIActionButtonManager.ts  |   72 +
 .../apps-engine/src/server/managers/index.ts  |   21 +
 .../server/marketplace/IAppLicenseMetadata.ts |    5 +
 .../server/marketplace/IMarketplaceInfo.ts    |   24 +
 .../marketplace/IMarketplacePricingPlan.ts    |   11 +
 .../marketplace/IMarketplacePricingTier.ts    |    6 +
 .../IMarketplaceSimpleBundleInfo.ts           |    4 +
 .../IMarketplaceSubscriptionInfo.ts           |   15 +
 .../marketplace/MarketplacePricingStrategy.ts |    5 +
 .../marketplace/MarketplacePurchaseType.ts    |    4 +
 .../MarketplaceSubscriptionStatus.ts          |   10 +
 .../MarketplaceSubscriptionType.ts            |    4 +
 .../src/server/marketplace/index.ts           |    8 +
 .../license/AppLicenseValidationResult.ts     |   56 +
 .../src/server/marketplace/license/Crypto.ts  |   26 +
 .../src/server/marketplace/license/index.ts   |    4 +
 .../src/server/messages/Message.ts            |  106 ++
 .../apps-engine/src/server/misc/UIHelper.ts   |   32 +
 .../apps-engine/src/server/misc/Utilities.ts  |   36 +
 .../src/server/oauth2/OAuth2Client.ts         |  322 ++++
 .../src/server/permissions/AppPermissions.ts  |  152 ++
 packages/apps-engine/src/server/rooms/Room.ts |  104 ++
 .../server/runtime/AppsEngineEmptyRuntime.ts  |   21 +
 .../server/runtime/AppsEngineNodeRuntime.ts   |   71 +
 .../src/server/runtime/AppsEngineRuntime.ts   |   29 +
 .../runtime/deno/AppsEngineDenoRuntime.ts     |  568 +++++++
 .../server/runtime/deno/LivenessManager.ts    |  184 +++
 .../server/runtime/deno/ProcessMessenger.ts   |   48 +
 .../src/server/runtime/deno/bundler.ts        |   90 +
 .../src/server/runtime/deno/codec.ts          |   29 +
 .../src/server/storage/AppLogStorage.ts       |   24 +
 .../src/server/storage/AppMetadataStorage.ts  |   19 +
 .../src/server/storage/AppSourceStorage.ts    |   40 +
 .../src/server/storage/IAppStorageItem.ts     |   31 +
 .../apps-engine/src/server/storage/index.ts   |    4 +
 packages/apps-engine/tests/runner.ts          |   20 +
 .../tests/server/AppManager.spec.ts           |  122 ++
 .../server/accessors/AppAccessors.spec.ts     |  134 ++
 .../accessors/ConfigurationExtend.spec.ts     |   76 +
 .../accessors/ConfigurationModify.spec.ts     |   28 +
 .../server/accessors/EnvironmentRead.spec.ts  |   29 +
 .../server/accessors/EnvironmentWrite.spec.ts |   25 +
 .../EnvironmentalVariableRead.spec.ts         |   33 +
 .../tests/server/accessors/Http.spec.ts       |  128 ++
 .../tests/server/accessors/HttpExtend.spec.ts |   83 +
 .../server/accessors/MessageBuilder.spec.ts   |  125 ++
 .../server/accessors/MessageExtender.spec.ts  |   35 +
 .../server/accessors/MessageRead.spec.ts      |   58 +
 .../tests/server/accessors/Modify.spec.ts     |   44 +
 .../server/accessors/ModifyCreator.spec.ts    |  129 ++
 .../server/accessors/ModifyExtender.spec.ts   |   74 +
 .../server/accessors/ModifyUpdater.spec.ts    |  139 ++
 .../tests/server/accessors/Notifier.spec.ts   |   37 +
 .../server/accessors/Persistence.spec.ts      |   82 +
 .../server/accessors/PersistenceRead.spec.ts  |   31 +
 .../tests/server/accessors/Reader.spec.ts     |  112 ++
 .../server/accessors/RoomBuilder.spec.ts      |   90 +
 .../server/accessors/RoomExtender.spec.ts     |   38 +
 .../tests/server/accessors/RoomRead.spec.ts   |   83 +
 .../accessors/ServerSettingRead.spec.ts       |   43 +
 .../accessors/ServerSettingsModify.spec.ts    |   60 +
 .../server/accessors/SettingRead.spec.ts      |   40 +
 .../server/accessors/SettingsExtend.spec.ts   |   54 +
 .../accessors/SlashCommandsExtend.spec.ts     |   47 +
 .../accessors/SlashCommandsModify.spec.ts     |   47 +
 .../server/accessors/UserBuilder.spec.ts      |   58 +
 .../tests/server/accessors/UserRead.spec.ts   |   49 +
 .../accessors/VideoConfProviderExtend.spec.ts |   38 +
 .../accessors/VideoConferenceBuilder.spec.ts  |  108 ++
 .../accessors/VideoConferenceExtend.spec.ts   |   81 +
 .../accessors/VideoConferenceRead.spec.ts     |   34 +
 .../tests/server/compiler/AppCompiler.spec.ts |   24 +
 .../AppFabricationFulfillment.spec.ts         |   48 +
 .../server/compiler/AppImplements.spec.ts     |   19 +
 .../errors/CommandAlreadyExistsError.spec.ts  |   13 +
 .../CommandHasAlreadyBeenTouchedError.spec.ts |   13 +
 .../tests/server/errors/CompilerError.spec.ts |   13 +
 .../errors/MustContainFunctionError.spec.ts   |   13 +
 .../server/errors/MustExtendAppError.spec.ts  |   13 +
 .../NotEnoughMethodArgumentsError.spec.ts     |   13 +
 .../errors/RequiredApiVersionError.spec.ts    |   26 +
 .../tests/server/logging/AppConsole.spec.ts   |   79 +
 .../managers/AppAccessorManager.spec.ts       |  166 ++
 .../tests/server/managers/AppApi.spec.ts      |   28 +
 .../server/managers/AppApiManager.spec.ts     |  233 +++
 .../AppExternalComponentManager.spec.ts       |  154 ++
 .../managers/AppListenerManager.spec.ts       |   44 +
 .../managers/AppSettingsManager.spec.ts       |  148 ++
 .../server/managers/AppSlashCommand.spec.ts   |   29 +
 .../managers/AppSlashCommandManager.spec.ts   |  469 ++++++
 .../managers/AppVideoConfProvider.spec.ts     |   25 +
 .../AppVideoConfProviderManager.spec.ts       |  435 +++++
 .../tests/server/misc/Utilities.spec.ts       |   69 +
 .../DenoRuntimeSubprocessController.spec.ts   |  222 +++
 .../apps-engine/tests/test-data/README.md     |    2 +
 .../test-data/apps/hello-world-test_0.0.1.zip |  Bin 0 -> 10309 bytes
 .../test-data/apps/testing-app_0.0.8.zip      |  Bin 0 -> 37318 bytes
 .../test-data/bridges/OAuthAppsBridge.ts      |   28 +
 .../test-data/bridges/activationBridge.ts     |   25 +
 .../tests/test-data/bridges/apiBridge.ts      |   37 +
 .../tests/test-data/bridges/appBridges.ts     |  228 +++
 .../test-data/bridges/appDetailChanges.ts     |    6 +
 .../tests/test-data/bridges/cloudBridge.ts    |   15 +
 .../tests/test-data/bridges/commandBridge.ts  |   38 +
 .../tests/test-data/bridges/emailBridge.ts    |    8 +
 .../bridges/environmentalVariableBridge.ts    |   15 +
 .../tests/test-data/bridges/httpBridge.ts     |   15 +
 .../tests/test-data/bridges/internalBridge.ts |   16 +
 .../bridges/internalFederationBridge.ts       |   11 +
 .../tests/test-data/bridges/livechatBridge.ts |   96 ++
 .../tests/test-data/bridges/messageBridge.ts  |   43 +
 .../test-data/bridges/moderationBridge.ts     |   17 +
 .../tests/test-data/bridges/persisBridge.ts   |   40 +
 .../tests/test-data/bridges/roleBridge.ts     |   12 +
 .../tests/test-data/bridges/roomBridge.ts     |   67 +
 .../test-data/bridges/schedulerBridge.ts      |   24 +
 .../test-data/bridges/serverSettingBridge.ts  |   41 +
 .../tests/test-data/bridges/threadBridge.ts   |    8 +
 .../test-data/bridges/uiIntegrationBridge.ts  |    9 +
 .../tests/test-data/bridges/uploadBridge.ts   |   17 +
 .../tests/test-data/bridges/userBridge.ts     |   44 +
 .../bridges/videoConferenceBridge.ts          |   25 +
 .../test-data/misc/fake-library-file.d.ts     |    5 +
 .../test-data/storage/TestSourceStorage.ts    |   20 +
 .../tests/test-data/storage/logStorage.ts     |   25 +
 .../tests/test-data/storage/storage.ts        |   93 ++
 .../apps-engine/tests/test-data/utilities.ts  |  492 ++++++
 packages/apps-engine/tsconfig-lint.json       |    7 +
 packages/apps-engine/tsconfig.json            |   21 +
 packages/apps-engine/turbo.json               |    9 +
 packages/apps-engine/typedoc.json             |    9 +
 packages/apps/package.json                    |    2 +-
 packages/core-services/package.json           |    2 +-
 packages/core-typings/package.json            |    2 +-
 packages/fuselage-ui-kit/package.json         |    2 +-
 packages/jwt/package.json                     |    3 +
 packages/rest-typings/package.json            |    2 +-
 yarn.lock                                     | 1461 +++++++++++++++--
 643 files changed, 35661 insertions(+), 132 deletions(-)
 create mode 100644 .tool-versions
 create mode 100644 packages/apps-engine/.eslintignore
 create mode 100644 packages/apps-engine/.eslintrc.json
 create mode 100644 packages/apps-engine/.gitignore
 create mode 100644 packages/apps-engine/.prettierrc
 create mode 100644 packages/apps-engine/README.md
 create mode 100644 packages/apps-engine/deno-runtime/.gitignore
 create mode 100644 packages/apps-engine/deno-runtime/AppObjectRegistry.ts
 create mode 100644 packages/apps-engine/deno-runtime/acorn-walk.d.ts
 create mode 100644 packages/apps-engine/deno-runtime/acorn.d.ts
 create mode 100644 packages/apps-engine/deno-runtime/deno.jsonc
 create mode 100644 packages/apps-engine/deno-runtime/deno.lock
 create mode 100644 packages/apps-engine/deno-runtime/handlers/api-handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/construct.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleGetStatus.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleInitialize.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnDisable.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnEnable.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnInstall.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnPreSettingUpdate.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnSettingUpdated.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnUninstall.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleOnUpdate.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handleSetStatus.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/app/handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/listener/handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/scheduler-handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/slashcommand-handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/tests/api-handler.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/tests/listener-handler.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/tests/scheduler-handler.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/tests/slashcommand-handler.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/tests/uikit-handler.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/tests/videoconference-handler.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/uikit/handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/handlers/videoconference-handler.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/BlockBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/DiscussionBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/LivechatMessageBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/UserBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/builders/VideoConferenceBuilder.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/extenders/HttpExtender.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/extenders/MessageExtender.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/extenders/RoomExtender.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/extenders/VideoConferenceExtend.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/http.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/mod.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyExtender.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/notifier.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/tests/AppAccessors.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyCreator.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyExtender.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyUpdater.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/ast/mod.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/ast/operations.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/ast/tests/data/ast_blocks.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/ast/tests/operations.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/codec.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/logger.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/messenger.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/require.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/room.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/roomFactory.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/sanitizeDeprecatedUsage.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/tests/logger.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/lib/tests/messenger.test.ts
 create mode 100644 packages/apps-engine/deno-runtime/main.ts
 create mode 100644 packages/apps-engine/package.json
 create mode 100644 packages/apps-engine/scripts/bundle.js
 create mode 100644 packages/apps-engine/scripts/deno-cache.js
 create mode 100644 packages/apps-engine/src/client/AppClientManager.ts
 create mode 100644 packages/apps-engine/src/client/AppServerCommunicator.ts
 create mode 100644 packages/apps-engine/src/client/AppsEngineUIClient.ts
 create mode 100644 packages/apps-engine/src/client/AppsEngineUIHost.ts
 create mode 100644 packages/apps-engine/src/client/constants/index.ts
 create mode 100644 packages/apps-engine/src/client/definition/AppsEngineUIMethods.ts
 create mode 100644 packages/apps-engine/src/client/definition/IAppsEngineUIResponse.ts
 create mode 100644 packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts
 create mode 100644 packages/apps-engine/src/client/definition/IExternalComponentUserInfo.ts
 create mode 100644 packages/apps-engine/src/client/definition/index.ts
 create mode 100644 packages/apps-engine/src/client/index.ts
 create mode 100644 packages/apps-engine/src/client/utils/index.ts
 create mode 100644 packages/apps-engine/src/definition/App.ts
 create mode 100644 packages/apps-engine/src/definition/AppStatus.ts
 create mode 100644 packages/apps-engine/src/definition/IApp.ts
 create mode 100644 packages/apps-engine/src/definition/LICENSE
 create mode 100644 packages/apps-engine/src/definition/accessors/IApiExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IAppAccessors.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IAppInstallationContext.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IAppUninstallationContext.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IAppUpdateContext.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ICloudWorkspaceRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IConfigurationExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IConfigurationModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IDiscussionBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IEmailCreator.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IEnvironmentRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IEnvironmentWrite.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IEnvironmentalVariableRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IExternalComponentsExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IHttp.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ILivechatCreator.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ILivechatMessageBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ILivechatRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ILivechatUpdater.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ILogEntry.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ILogger.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IMessageBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IMessageExtender.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IMessageRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IMessageUpdater.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IModerationModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IModifyCreator.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IModifyDeleter.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IModifyExtender.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IModifyUpdater.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/INotifier.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IOAuthApp.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IOAuthAppsModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IOAuthAppsReader.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IPersistence.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IPersistenceRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IRoleRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IRoomBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IRoomExtender.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IRoomRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISchedulerExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISchedulerModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IServerSettingRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IServerSettingUpdater.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IServerSettingsModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISettingRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISettingUpdater.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISettingsExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISlashCommandsExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/ISlashCommandsModify.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IThreadRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUIController.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUIExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUploadCreator.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUploadRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUserBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUserRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IUserUpdater.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IVideoConfProvidersExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IVideoConferenceBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IVideoConferenceExtend.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/IVideoConferenceRead.ts
 create mode 100644 packages/apps-engine/src/definition/accessors/index.ts
 create mode 100644 packages/apps-engine/src/definition/api/ApiEndpoint.ts
 create mode 100644 packages/apps-engine/src/definition/api/IApi.ts
 create mode 100644 packages/apps-engine/src/definition/api/IApiEndpoint.ts
 create mode 100644 packages/apps-engine/src/definition/api/IApiEndpointInfo.ts
 create mode 100644 packages/apps-engine/src/definition/api/IApiEndpointMetadata.ts
 create mode 100644 packages/apps-engine/src/definition/api/IApiExample.ts
 create mode 100644 packages/apps-engine/src/definition/api/IRequest.ts
 create mode 100644 packages/apps-engine/src/definition/api/IResponse.ts
 create mode 100644 packages/apps-engine/src/definition/api/index.ts
 create mode 100644 packages/apps-engine/src/definition/app-schema.json
 create mode 100644 packages/apps-engine/src/definition/assets/IAsset.ts
 create mode 100644 packages/apps-engine/src/definition/assets/IAssetProvider.ts
 create mode 100644 packages/apps-engine/src/definition/assets/index.ts
 create mode 100644 packages/apps-engine/src/definition/cloud/IWorkspaceToken.ts
 create mode 100644 packages/apps-engine/src/definition/email/IEmail.ts
 create mode 100644 packages/apps-engine/src/definition/email/IEmailDescriptor.ts
 create mode 100644 packages/apps-engine/src/definition/email/IPreEmailSent.ts
 create mode 100644 packages/apps-engine/src/definition/email/IPreEmailSentContext.ts
 create mode 100644 packages/apps-engine/src/definition/email/index.ts
 create mode 100644 packages/apps-engine/src/definition/example-app.json
 create mode 100644 packages/apps-engine/src/definition/exceptions/AppsEngineException.ts
 create mode 100644 packages/apps-engine/src/definition/exceptions/EssentialAppDisabledException.ts
 create mode 100644 packages/apps-engine/src/definition/exceptions/FileUploadNotAllowedException.ts
 create mode 100644 packages/apps-engine/src/definition/exceptions/InvalidSettingValueException.ts
 create mode 100644 packages/apps-engine/src/definition/exceptions/UserNotAllowedException.ts
 create mode 100644 packages/apps-engine/src/definition/exceptions/index.ts
 create mode 100644 packages/apps-engine/src/definition/externalComponent/IExternalComponent.ts
 create mode 100644 packages/apps-engine/src/definition/externalComponent/IExternalComponentOptions.ts
 create mode 100644 packages/apps-engine/src/definition/externalComponent/IExternalComponentState.ts
 create mode 100644 packages/apps-engine/src/definition/externalComponent/IPostExternalComponentClosed.ts
 create mode 100644 packages/apps-engine/src/definition/externalComponent/IPostExternalComponentOpened.ts
 create mode 100644 packages/apps-engine/src/definition/externalComponent/index.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IDepartment.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/ILivechatEventContext.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/ILivechatMessage.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/ILivechatRoom.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/ILivechatRoomClosedHandler.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/ILivechatTransferData.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/ILivechatTransferEventContext.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatAgentAssigned.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatAgentUnassigned.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatGuestSaved.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatRoomClosed.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatRoomSaved.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatRoomStarted.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IPostLivechatRoomTransferred.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IVisitor.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IVisitorEmail.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/IVisitorPhone.ts
 create mode 100644 packages/apps-engine/src/definition/livechat/index.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessage.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageAction.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageAttachment.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageAttachmentAuthor.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageAttachmentField.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageAttachmentTitle.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageDeleteContext.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageFile.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageFollowContext.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessagePinContext.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageRaw.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageReaction.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageReactionContext.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageReportContext.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IMessageStarContext.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageDeleted.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageFollowed.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessagePinned.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageReacted.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageReported.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageSent.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageSentToBot.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageStarred.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPostMessageUpdated.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageDeletePrevent.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageSentExtend.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageSentModify.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageSentPrevent.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageUpdatedExtend.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageUpdatedModify.ts
 create mode 100644 packages/apps-engine/src/definition/messages/IPreMessageUpdatedPrevent.ts
 create mode 100644 packages/apps-engine/src/definition/messages/MessageActionButtonsAlignment.ts
 create mode 100644 packages/apps-engine/src/definition/messages/MessageActionType.ts
 create mode 100644 packages/apps-engine/src/definition/messages/MessageProcessingType.ts
 create mode 100644 packages/apps-engine/src/definition/messages/index.ts
 create mode 100644 packages/apps-engine/src/definition/metadata/AppInterface.ts
 create mode 100644 packages/apps-engine/src/definition/metadata/AppMethod.ts
 create mode 100644 packages/apps-engine/src/definition/metadata/IAppAuthorInfo.ts
 create mode 100644 packages/apps-engine/src/definition/metadata/IAppInfo.ts
 create mode 100644 packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts
 create mode 100644 packages/apps-engine/src/definition/metadata/index.ts
 create mode 100644 packages/apps-engine/src/definition/oauth2/IOAuth2.ts
 create mode 100644 packages/apps-engine/src/definition/oauth2/OAuth2.ts
 create mode 100644 packages/apps-engine/src/definition/permissions/IPermission.ts
 create mode 100644 packages/apps-engine/src/definition/persistence/IPersistenceItem.ts
 create mode 100644 packages/apps-engine/src/definition/persistence/index.ts
 create mode 100644 packages/apps-engine/src/definition/roles/IRole.ts
 create mode 100644 packages/apps-engine/src/definition/roles/index.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPostRoomCreate.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPostRoomDeleted.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPostRoomUserJoined.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPostRoomUserLeave.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPreRoomCreateExtend.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPreRoomCreateModify.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPreRoomCreatePrevent.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPreRoomDeletePrevent.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPreRoomUserJoined.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IPreRoomUserLeave.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IRoom.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IRoomUserJoinedContext.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/IRoomUserLeaveContext.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/RoomType.ts
 create mode 100644 packages/apps-engine/src/definition/rooms/index.ts
 create mode 100644 packages/apps-engine/src/definition/scheduler/IOnetimeSchedule.ts
 create mode 100644 packages/apps-engine/src/definition/scheduler/IProcessor.ts
 create mode 100644 packages/apps-engine/src/definition/scheduler/IRecurringSchedule.ts
 create mode 100644 packages/apps-engine/src/definition/scheduler/index.ts
 create mode 100644 packages/apps-engine/src/definition/settings/ISetting.ts
 create mode 100644 packages/apps-engine/src/definition/settings/ISettingUpdateContext.ts
 create mode 100644 packages/apps-engine/src/definition/settings/SettingType.ts
 create mode 100644 packages/apps-engine/src/definition/settings/index.ts
 create mode 100644 packages/apps-engine/src/definition/slashcommands/ISlashCommand.ts
 create mode 100644 packages/apps-engine/src/definition/slashcommands/ISlashCommandPreview.ts
 create mode 100644 packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts
 create mode 100644 packages/apps-engine/src/definition/slashcommands/index.ts
 create mode 100644 packages/apps-engine/src/definition/ui/IUIActionButtonDescriptor.ts
 create mode 100644 packages/apps-engine/src/definition/ui/UIActionButtonContext.ts
 create mode 100644 packages/apps-engine/src/definition/ui/index.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/IUIKitActionHandler.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/IUIKitIncomingInteraction.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/IUIKitIncomingInteractionActionButton.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/IUIKitInteractionType.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/IUIKitSurface.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/IUIKitView.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionContainer.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionTypes.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/UIKitInteractionContext.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/blocks/Blocks.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/blocks/Elements.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/blocks/Objects.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/blocks/index.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/index.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatActionHandler.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatIncomingInteraction.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatIncomingInteractionType.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatInteractionContext.ts
 create mode 100644 packages/apps-engine/src/definition/uikit/livechat/index.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/IFileUploadContext.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/IPreFileUpload.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/IUpload.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/IUploadDescriptor.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/IUploadDetails.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/StoreType.ts
 create mode 100644 packages/apps-engine/src/definition/uploads/index.ts
 create mode 100644 packages/apps-engine/src/definition/users/IBotUser.ts
 create mode 100644 packages/apps-engine/src/definition/users/IPostUserCreated.ts
 create mode 100644 packages/apps-engine/src/definition/users/IPostUserDeleted.ts
 create mode 100644 packages/apps-engine/src/definition/users/IPostUserLoggedIn.ts
 create mode 100644 packages/apps-engine/src/definition/users/IPostUserLoggedOut.ts
 create mode 100644 packages/apps-engine/src/definition/users/IPostUserStatusChanged.ts
 create mode 100644 packages/apps-engine/src/definition/users/IPostUserUpdated.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUser.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserContext.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserCreationOptions.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserEmail.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserLookup.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserSettings.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserStatusContext.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserUpdateContex.ts
 create mode 100644 packages/apps-engine/src/definition/users/IUserUpdateContext.ts
 create mode 100644 packages/apps-engine/src/definition/users/UserStatusConnection.ts
 create mode 100644 packages/apps-engine/src/definition/users/UserType.ts
 create mode 100644 packages/apps-engine/src/definition/users/index.ts
 create mode 100644 packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts
 create mode 100644 packages/apps-engine/src/definition/videoConfProviders/IVideoConferenceOptions.ts
 create mode 100644 packages/apps-engine/src/definition/videoConfProviders/VideoConfData.ts
 create mode 100644 packages/apps-engine/src/definition/videoConfProviders/index.ts
 create mode 100644 packages/apps-engine/src/definition/videoConferences/AppVideoConference.ts
 create mode 100644 packages/apps-engine/src/definition/videoConferences/IVideoConference.ts
 create mode 100644 packages/apps-engine/src/definition/videoConferences/IVideoConferenceUser.ts
 create mode 100644 packages/apps-engine/src/definition/videoConferences/index.ts
 create mode 100644 packages/apps-engine/src/lib/utils.ts
 create mode 100644 packages/apps-engine/src/server/AppManager.ts
 create mode 100644 packages/apps-engine/src/server/IGetAppsFilter.ts
 create mode 100644 packages/apps-engine/src/server/ProxiedApp.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ApiExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/AppAccessors.ts
 create mode 100644 packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ConfigurationExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ConfigurationModify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/DiscussionBuilder.ts
 create mode 100644 packages/apps-engine/src/server/accessors/EmailCreator.ts
 create mode 100644 packages/apps-engine/src/server/accessors/EnvironmentRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/EnvironmentWrite.ts
 create mode 100644 packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/Http.ts
 create mode 100644 packages/apps-engine/src/server/accessors/HttpExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/LivechatCreator.ts
 create mode 100644 packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts
 create mode 100644 packages/apps-engine/src/server/accessors/LivechatRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/LivechatUpdater.ts
 create mode 100644 packages/apps-engine/src/server/accessors/MessageBuilder.ts
 create mode 100644 packages/apps-engine/src/server/accessors/MessageExtender.ts
 create mode 100644 packages/apps-engine/src/server/accessors/MessageRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ModerationModify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/Modify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ModifyCreator.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ModifyDeleter.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ModifyExtender.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ModifyUpdater.ts
 create mode 100644 packages/apps-engine/src/server/accessors/Notifier.ts
 create mode 100644 packages/apps-engine/src/server/accessors/OAuthAppsModify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/OAuthAppsReader.ts
 create mode 100644 packages/apps-engine/src/server/accessors/Persistence.ts
 create mode 100644 packages/apps-engine/src/server/accessors/PersistenceRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/Reader.ts
 create mode 100644 packages/apps-engine/src/server/accessors/RoleRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/RoomBuilder.ts
 create mode 100644 packages/apps-engine/src/server/accessors/RoomExtender.ts
 create mode 100644 packages/apps-engine/src/server/accessors/RoomRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SchedulerExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SchedulerModify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ServerSettingRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ServerSettingsModify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SettingRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SettingUpdater.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SettingsExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/SlashCommandsModify.ts
 create mode 100644 packages/apps-engine/src/server/accessors/ThreadRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UIController.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UIExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UploadCreator.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UploadRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UserBuilder.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UserRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/UserUpdater.ts
 create mode 100644 packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/VideoConferenceBuilder.ts
 create mode 100644 packages/apps-engine/src/server/accessors/VideoConferenceExtend.ts
 create mode 100644 packages/apps-engine/src/server/accessors/VideoConferenceRead.ts
 create mode 100644 packages/apps-engine/src/server/accessors/index.ts
 create mode 100644 packages/apps-engine/src/server/bridges/ApiBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/AppActivationBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/AppBridges.ts
 create mode 100644 packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/BaseBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/CommandBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/EmailBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/HttpBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/IInternalBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/IInternalFederationBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/IInternalPersistenceBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/IInternalSchedulerBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/IInternalUserBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/IListenerBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/InternalBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/ListenerBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/LivechatBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/MessageBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/ModerationBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/PersistenceBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/RoleBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/RoomBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/SchedulerBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/ServerSettingBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/ThreadBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/UiInteractionBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/UploadBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/UserBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts
 create mode 100644 packages/apps-engine/src/server/bridges/index.ts
 create mode 100644 packages/apps-engine/src/server/compiler/AppCompiler.ts
 create mode 100644 packages/apps-engine/src/server/compiler/AppFabricationFulfillment.ts
 create mode 100644 packages/apps-engine/src/server/compiler/AppImplements.ts
 create mode 100644 packages/apps-engine/src/server/compiler/AppPackageParser.ts
 create mode 100644 packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts
 create mode 100644 packages/apps-engine/src/server/compiler/index.ts
 create mode 100644 packages/apps-engine/src/server/compiler/modules/index.ts
 create mode 100644 packages/apps-engine/src/server/compiler/modules/networking.ts
 create mode 100644 packages/apps-engine/src/server/errors/CommandAlreadyExistsError.ts
 create mode 100644 packages/apps-engine/src/server/errors/CommandHasAlreadyBeenTouchedError.ts
 create mode 100644 packages/apps-engine/src/server/errors/CompilerError.ts
 create mode 100644 packages/apps-engine/src/server/errors/InvalidInstallationError.ts
 create mode 100644 packages/apps-engine/src/server/errors/InvalidLicenseError.ts
 create mode 100644 packages/apps-engine/src/server/errors/MustContainFunctionError.ts
 create mode 100644 packages/apps-engine/src/server/errors/MustExtendAppError.ts
 create mode 100644 packages/apps-engine/src/server/errors/NotEnoughMethodArgumentsError.ts
 create mode 100644 packages/apps-engine/src/server/errors/PathAlreadyExistsError.ts
 create mode 100644 packages/apps-engine/src/server/errors/PermissionDeniedError.ts
 create mode 100644 packages/apps-engine/src/server/errors/RequiredApiVersionError.ts
 create mode 100644 packages/apps-engine/src/server/errors/VideoConfProviderAlreadyExistsError.ts
 create mode 100644 packages/apps-engine/src/server/errors/VideoConfProviderNotRegisteredError.ts
 create mode 100644 packages/apps-engine/src/server/errors/index.ts
 create mode 100644 packages/apps-engine/src/server/logging/AppConsole.ts
 create mode 100644 packages/apps-engine/src/server/logging/ILoggerStorageEntry.ts
 create mode 100644 packages/apps-engine/src/server/logging/index.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppAccessorManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppApi.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppApiManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppExternalComponentManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppLicenseManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppListenerManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppPermissionManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppRuntimeManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppSchedulerManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppSettingsManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppSignatureManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppSlashCommand.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppSlashCommandManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppVideoConfProvider.ts
 create mode 100644 packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/UIActionButtonManager.ts
 create mode 100644 packages/apps-engine/src/server/managers/index.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/IAppLicenseMetadata.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/IMarketplacePricingPlan.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/IMarketplacePricingTier.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/IMarketplaceSimpleBundleInfo.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/IMarketplaceSubscriptionInfo.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/MarketplacePricingStrategy.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/MarketplacePurchaseType.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionStatus.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionType.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/index.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/license/AppLicenseValidationResult.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/license/Crypto.ts
 create mode 100644 packages/apps-engine/src/server/marketplace/license/index.ts
 create mode 100644 packages/apps-engine/src/server/messages/Message.ts
 create mode 100644 packages/apps-engine/src/server/misc/UIHelper.ts
 create mode 100644 packages/apps-engine/src/server/misc/Utilities.ts
 create mode 100644 packages/apps-engine/src/server/oauth2/OAuth2Client.ts
 create mode 100644 packages/apps-engine/src/server/permissions/AppPermissions.ts
 create mode 100644 packages/apps-engine/src/server/rooms/Room.ts
 create mode 100644 packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts
 create mode 100644 packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts
 create mode 100644 packages/apps-engine/src/server/runtime/AppsEngineRuntime.ts
 create mode 100644 packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
 create mode 100644 packages/apps-engine/src/server/runtime/deno/LivenessManager.ts
 create mode 100644 packages/apps-engine/src/server/runtime/deno/ProcessMessenger.ts
 create mode 100644 packages/apps-engine/src/server/runtime/deno/bundler.ts
 create mode 100644 packages/apps-engine/src/server/runtime/deno/codec.ts
 create mode 100644 packages/apps-engine/src/server/storage/AppLogStorage.ts
 create mode 100644 packages/apps-engine/src/server/storage/AppMetadataStorage.ts
 create mode 100644 packages/apps-engine/src/server/storage/AppSourceStorage.ts
 create mode 100644 packages/apps-engine/src/server/storage/IAppStorageItem.ts
 create mode 100644 packages/apps-engine/src/server/storage/index.ts
 create mode 100644 packages/apps-engine/tests/runner.ts
 create mode 100644 packages/apps-engine/tests/server/AppManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/AppAccessors.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ConfigurationExtend.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ConfigurationModify.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/EnvironmentRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/EnvironmentWrite.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/EnvironmentalVariableRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/Http.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/HttpExtend.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/MessageBuilder.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/MessageExtender.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/MessageRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/Modify.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ModifyCreator.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ModifyExtender.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ModifyUpdater.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/Notifier.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/Persistence.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/PersistenceRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/Reader.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/RoomBuilder.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/RoomExtender.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/RoomRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ServerSettingRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/ServerSettingsModify.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/SettingRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/SettingsExtend.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/SlashCommandsExtend.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/SlashCommandsModify.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/UserBuilder.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/UserRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/VideoConfProviderExtend.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/VideoConferenceBuilder.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/VideoConferenceExtend.spec.ts
 create mode 100644 packages/apps-engine/tests/server/accessors/VideoConferenceRead.spec.ts
 create mode 100644 packages/apps-engine/tests/server/compiler/AppCompiler.spec.ts
 create mode 100644 packages/apps-engine/tests/server/compiler/AppFabricationFulfillment.spec.ts
 create mode 100644 packages/apps-engine/tests/server/compiler/AppImplements.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/CommandAlreadyExistsError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/CommandHasAlreadyBeenTouchedError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/CompilerError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/MustContainFunctionError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/MustExtendAppError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/NotEnoughMethodArgumentsError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/errors/RequiredApiVersionError.spec.ts
 create mode 100644 packages/apps-engine/tests/server/logging/AppConsole.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppAccessorManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppApi.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppApiManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppExternalComponentManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppListenerManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppSettingsManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppSlashCommand.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppSlashCommandManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppVideoConfProvider.spec.ts
 create mode 100644 packages/apps-engine/tests/server/managers/AppVideoConfProviderManager.spec.ts
 create mode 100644 packages/apps-engine/tests/server/misc/Utilities.spec.ts
 create mode 100644 packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts
 create mode 100644 packages/apps-engine/tests/test-data/README.md
 create mode 100644 packages/apps-engine/tests/test-data/apps/hello-world-test_0.0.1.zip
 create mode 100644 packages/apps-engine/tests/test-data/apps/testing-app_0.0.8.zip
 create mode 100644 packages/apps-engine/tests/test-data/bridges/OAuthAppsBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/activationBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/apiBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/appBridges.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/appDetailChanges.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/cloudBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/commandBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/emailBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/environmentalVariableBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/httpBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/internalBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/internalFederationBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/livechatBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/messageBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/moderationBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/persisBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/roleBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/roomBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/schedulerBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/serverSettingBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/threadBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/uiIntegrationBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/uploadBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/userBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/bridges/videoConferenceBridge.ts
 create mode 100644 packages/apps-engine/tests/test-data/misc/fake-library-file.d.ts
 create mode 100644 packages/apps-engine/tests/test-data/storage/TestSourceStorage.ts
 create mode 100644 packages/apps-engine/tests/test-data/storage/logStorage.ts
 create mode 100644 packages/apps-engine/tests/test-data/storage/storage.ts
 create mode 100644 packages/apps-engine/tests/test-data/utilities.ts
 create mode 100644 packages/apps-engine/tsconfig-lint.json
 create mode 100644 packages/apps-engine/tsconfig.json
 create mode 100644 packages/apps-engine/turbo.json
 create mode 100644 packages/apps-engine/typedoc.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a834776aeff5..f66c5d29de5b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,5 @@
 /packages/* @RocketChat/Architecture
+/packages/apps-engine/ @RocketChat/apps
 /packages/core-typings/ @RocketChat/Architecture
 /packages/rest-typings/ @RocketChat/Architecture @RocketChat/backend
 /packages/ui-contexts/ @RocketChat/frontend
diff --git a/.github/actions/build-docker-image/action.yml b/.github/actions/build-docker-image/action.yml
index 378f6bdb01b9..02a05d9605a7 100644
--- a/.github/actions/build-docker-image/action.yml
+++ b/.github/actions/build-docker-image/action.yml
@@ -12,6 +12,9 @@ inputs:
     required: false
   password:
     required: false
+  deno-version:
+    required: true
+    type: string
 
 outputs:
   image-name:
@@ -59,7 +62,7 @@ runs:
         fi;
 
         echo "Build ${{ inputs.release }} Docker image"
-        docker build -t $IMAGE_NAME .
+        docker build --build-arg DENO_VERSION=${{ inputs.deno-version }} -t $IMAGE_NAME .
 
         echo "image-name-base=${IMAGE_NAME_BASE}" >> $GITHUB_OUTPUT
         echo "image-name=${IMAGE_NAME}" >> $GITHUB_OUTPUT
diff --git a/.github/actions/build-docker/action.yml b/.github/actions/build-docker/action.yml
index 5af39b924057..ae84e376a0d9 100644
--- a/.github/actions/build-docker/action.yml
+++ b/.github/actions/build-docker/action.yml
@@ -9,6 +9,10 @@ inputs:
     required: true
     description: 'Node version'
     type: string
+  deno-version:
+    required: true
+    description: 'Deno version'
+    type: string
   platform:
     required: false
     description: 'Platform'
@@ -66,6 +70,7 @@ runs:
       if: inputs.setup == 'true'
       with:
         node-version: ${{ inputs.node-version }}
+        deno-version: ${{ inputs.deno-version }}
         cache-modules: true
         install: true
         NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
@@ -79,6 +84,8 @@ runs:
       run: |
         args=(rocketchat ${{ inputs.build-containers }})
 
+        export DENO_VERSION="${{ inputs.deno-version }}"
+
         docker compose -f docker-compose-ci.yml build "${args[@]}"
 
     - name: Publish Docker images to GitHub Container Registry
diff --git a/.github/actions/meteor-build/action.yml b/.github/actions/meteor-build/action.yml
index 551a57d28a7c..bfd4ae7f5c20 100644
--- a/.github/actions/meteor-build/action.yml
+++ b/.github/actions/meteor-build/action.yml
@@ -16,6 +16,10 @@ inputs:
   NPM_TOKEN:
     required: false
     description: 'NPM token'
+  deno-version:
+    required: true
+    description: 'Deno version'
+    type: string
 
 runs:
   using: composite
@@ -30,6 +34,7 @@ runs:
       uses: ./.github/actions/setup-node
       with:
         node-version: ${{ inputs.node-version }}
+        deno-version: ${{ inputs.deno-version }}
         cache-modules: true
         install: true
         NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
index 1035e2835792..120797d2ba3c 100644
--- a/.github/actions/setup-node/action.yml
+++ b/.github/actions/setup-node/action.yml
@@ -11,10 +11,11 @@ inputs:
   install:
     required: false
     description: 'Install dependencies'
-  deno-dir:
-    required: false
-    description: 'Deno directory'
-    default: ~/.deno-cache
+    type: boolean
+  deno-version:
+    required: true
+    description: 'Deno version'
+    type: string
   NPM_TOKEN:
     required: false
     description: 'NPM token'
@@ -28,21 +29,20 @@ runs:
   using: composite
 
   steps:
-    - run: echo 'DENO_DIR=${{ inputs.deno-dir }}' >> $GITHUB_ENV
-      shell: bash
-
-    - name: Cache Node Modules
+    - name: Cache Node Modules & Deno
       if: inputs.cache-modules
       id: cache-node-modules
       uses: actions/cache@v3
       with:
+        # We need to cache node_modules for all workspaces with "hoistingLimits" defined
         path: |
           .turbo/cache
           node_modules
-          ${{ env.DENO_DIR }}
           apps/meteor/node_modules
           apps/meteor/ee/server/services/node_modules
-        key: node-modules-${{ hashFiles('yarn.lock') }}
+          packages/apps-engine/node_modules
+          packages/apps-engine/.deno-cache
+        key: node-modules-${{ hashFiles('yarn.lock') }}-deno-${{ hashFiles('packages/apps-engine/deno-runtime/deno.lock') }}
     #
     # Could use this command to list all paths to save:
     # find . -name 'node_modules' -prune | grep -v "/\.meteor/" | grep -v "/meteor/packages/"
@@ -54,6 +54,11 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache: 'yarn'
 
+    - name: Use Deno ${{ inputs.deno-version }}
+      uses: denoland/setup-deno@v1
+      with:
+        deno-version: ${{ inputs.deno-version }}
+
     - name: yarn login
       shell: bash
       if: inputs.NPM_TOKEN
diff --git a/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml
index af50b3230ba7..41facad89a03 100644
--- a/.github/workflows/ci-code-check.yml
+++ b/.github/workflows/ci-code-check.yml
@@ -6,6 +6,9 @@ on:
       node-version:
         required: true
         type: string
+      deno-version:
+        required: true
+        type: string
 
 env:
   TOOL_NODE_FLAGS: ${{ vars.TOOL_NODE_FLAGS }}
@@ -33,6 +36,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: ${{ inputs.node-version }}
+          deno-version: ${{ inputs.deno-version }}
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/ci-deploy-gh-pages-preview.yml b/.github/workflows/ci-deploy-gh-pages-preview.yml
index 17f247ddad94..8a0905a174bb 100644
--- a/.github/workflows/ci-deploy-gh-pages-preview.yml
+++ b/.github/workflows/ci-deploy-gh-pages-preview.yml
@@ -23,6 +23,7 @@ jobs:
         if: github.event.action != 'closed'
         with:
           node-version: 14.21.3
+          deno-version: 1.37.1
           cache-modules: true
           install: true
 
diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml
index b381e05ae5d8..0aab8022c7e6 100644
--- a/.github/workflows/ci-deploy-gh-pages.yml
+++ b/.github/workflows/ci-deploy-gh-pages.yml
@@ -18,6 +18,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: 14.21.3
+          deno-version: 1.37.1
           cache-modules: true
           install: true
 
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index a80a40419e9f..f219f39c0614 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -6,6 +6,9 @@ on:
       node-version:
         required: true
         type: string
+      deno-version:
+        required: true
+        type: string
       lowercase-repo:
         required: true
         type: string
@@ -128,6 +131,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: ${{ inputs.node-version }}
+          deno-version: ${{ inputs.deno-version }}
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml
index 840808ff5e31..883212d0cf3d 100644
--- a/.github/workflows/ci-test-unit.yml
+++ b/.github/workflows/ci-test-unit.yml
@@ -6,6 +6,9 @@ on:
       node-version:
         required: true
         type: string
+      deno-version:
+        required: true
+        type: string
       enterprise-license:
         required: false
         type: string
@@ -37,6 +40,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: ${{ inputs.node-version }}
+          deno-version: ${{ inputs.deno-version }}
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40260f71d21f..6b6fa426ca96 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,6 +31,7 @@ jobs:
       rc-dockerfile-alpine: '${{ github.workspace }}/apps/meteor/.docker/Dockerfile.alpine'
       rc-docker-tag-alpine: '${{ steps.docker.outputs.gh-docker-tag }}.alpine'
       node-version: ${{ steps.var.outputs.node-version }}
+      deno-version: ${{ steps.var.outputs.deno-version }}
       # this is 100% intentional, secrets are not available for forks, so ee-tests will always fail
       # to avoid this, we are using a dummy license, expiring at 2025-06-31
       enterprise-license: X/XumwIkgwQuld0alWKt37lVA90XjKOrfiMvMZ0/RtqsMtrdL9GoAk+4jXnaY1b2ePoG7XSzGhuxEDxFKIWJK3hIKGNTvrd980LgH5sM5+1T4P42ivSpd8UZi0bwjJkCFLIu9RozzYwslGG0IehMxe0S6VjcO0UYlUJtbMCBHuR2WmTAmO6YVU3ln+pZCbrPFaTPSS1RovhKaNCNkZwIx/CLWW8UTXUuFV/ML4PbKKVoa5nvvJwPeatgL7UCnlSD90lfCiiuikpzj/Y/JLkIL6velFbwNxsrxg9iRJ2k0sKheMMSmlTiGzSvZUm+na5WQq91aKGncih+DmaEZA7QGrjp4eoA0dqTk6OmItsy0fHmQhvZIOKNMeO7vNQiLbaSV6rqibrzu7WPpeIvsvL57T1h37USoCSB6+jDqkzdfoqIpz8BxTiJDj1d8xGPJFVrgxoqQqkj9qIP/gCaEz5DF39QFv5sovk4yK2O8fEQYod2d14V9yECYl4szZPMk1IBfCAC2w7czWGHHFonhL+CQGT403y5wmDmnsnjlCqMKF72odqfTPTI8XnCvJDriPMWohnQEAGtTTyciAhNokx/mjAVJ4NeZPcsbm4BjhvJvnjxx/BhYhBBTNWPaCSZzocfrGUj9Z+ZA7BEz+xAFQyGDx3xRzqIXfT0G7w8fvgYJMU=
@@ -39,6 +40,7 @@ jobs:
         with:
           sparse-checkout: |
             package.json
+            .tool-versions
           sparse-checkout-cone-mode: false
           ref: ${{ github.ref }}
 
@@ -53,6 +55,10 @@ jobs:
           echo "NODE_VERSION: ${NODE_VERSION}"
           echo "node-version=${NODE_VERSION}" >> $GITHUB_OUTPUT
 
+          DENO_VERSION=$(awk '$1=="deno"{ print $2 }' .tool-versions)
+          echo "DENO_VERSION: ${DENO_VERSION}"
+          echo "deno-version=${DENO_VERSION}" >> $GITHUB_OUTPUT
+
       - id: by-tag
         run: |
           if echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
@@ -150,6 +156,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: ${{ needs.release-versions.outputs.node-version }}
+          deno-version: ${{ needs.release-versions.outputs.deno-version }}
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -194,6 +201,7 @@ jobs:
       - uses: ./.github/actions/meteor-build
         with:
           node-version: ${{ needs.release-versions.outputs.node-version }}
+          deno-version: ${{ needs.release-versions.outputs.deno-version }}
           coverage: ${{ github.event_name != 'release' }}
 
   build-prod:
@@ -224,6 +232,7 @@ jobs:
       - uses: ./.github/actions/meteor-build
         with:
           node-version: ${{ needs.release-versions.outputs.node-version }}
+          deno-version: ${{ needs.release-versions.outputs.deno-version }}
           coverage: ${{ github.event_name != 'release' }}
 
   build-gh-docker-coverage:
@@ -252,6 +261,7 @@ jobs:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
           node-version: ${{ needs.release-versions.outputs.node-version }}
+          deno-version: ${{ needs.release-versions.outputs.deno-version }}
           platform: ${{ matrix.platform }}
           build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -280,6 +290,7 @@ jobs:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
           node-version: ${{ needs.release-versions.outputs.node-version }}
+          deno-version: ${{ needs.release-versions.outputs.deno-version }}
           platform: ${{ matrix.platform }}
           build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -300,6 +311,7 @@ jobs:
     uses: ./.github/workflows/ci-code-check.yml
     with:
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
 
   test-unit:
     name: 🔨 Test Unit
@@ -308,6 +320,7 @@ jobs:
     uses: ./.github/workflows/ci-test-unit.yml
     with:
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
       enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -321,6 +334,7 @@ jobs:
       type: api
       release: ce
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
@@ -344,6 +358,7 @@ jobs:
       shard: '[1, 2, 3, 4]'
       total-shard: 4
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
@@ -371,6 +386,7 @@ jobs:
       enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
       mongodb-version: "['4.4']"
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
@@ -395,6 +411,7 @@ jobs:
       total-shard: 5
       mongodb-version: "['4.4']"
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
@@ -425,6 +442,7 @@ jobs:
       total-shard: 5
       mongodb-version: "['6.0']"
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      deno-version: ${{ needs.release-versions.outputs.deno-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
@@ -564,6 +582,7 @@ jobs:
           username: ${{ secrets.CR_USER }}
           password: ${{ secrets.CR_PAT }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          deno-version: ${{ needs.release-versions.outputs.deno-version }}
 
   docker-image-publish:
     name: 🚀 Publish Docker Image (main)
diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
index b2eae5d90b92..70e9eb354a06 100644
--- a/.github/workflows/new-release.yml
+++ b/.github/workflows/new-release.yml
@@ -35,6 +35,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: 14.21.3
+          deno-version: 1.37.1
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/pr-update-description.yml b/.github/workflows/pr-update-description.yml
index 084f2a383480..26ffffc6c86f 100644
--- a/.github/workflows/pr-update-description.yml
+++ b/.github/workflows/pr-update-description.yml
@@ -22,6 +22,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: 14.21.3
+          deno-version: 1.37.1
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 3f2067ac7ec3..fe049f6a8369 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -25,6 +25,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: 14.21.3
+          deno-version: 1.37.1
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index 4a1e67fca33a..8c9048710dd2 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -16,6 +16,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           node-version: 14.21.3
+          deno-version: 1.37.1
           cache-modules: true
           install: true
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 000000000000..bc89cc40f83e
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+deno 1.37.1
diff --git a/README.md b/README.md
index 6461ad602516..564ca75d2b11 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ 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 **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/
 - Clone this repo: `git clone https://github.com/RocketChat/Rocket.Chat.git`
 - Run `yarn` to install dependencies
 
diff --git a/apps/meteor/.docker/Dockerfile b/apps/meteor/.docker/Dockerfile
index 1e9ed3f5e592..75df2cb90678 100644
--- a/apps/meteor/.docker/Dockerfile
+++ b/apps/meteor/.docker/Dockerfile
@@ -1,3 +1,7 @@
+ARG DENO_VERSION="1.37.1"
+
+FROM denoland/deno:bin-${DENO_VERSION} as deno
+
 FROM node:14.21.3-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
@@ -10,6 +14,8 @@ RUN groupadd -g 65533 -r rocketchat \
     && apt-get update \
     && apt-get install -y --no-install-recommends fontconfig
 
+COPY --from=deno /deno /bin/deno
+
 # --chown requires Docker 17.12 and works only on Linux
 ADD --chown=rocketchat:rocketchat . /app
 
@@ -20,8 +26,7 @@ ENV DEPLOY_METHOD=docker \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads \
-    DENO_DIR=/usr/share/deno
+    Accounts_AvatarStorePath=/app/uploads
 
 RUN aptMark="$(apt-mark showmanual)" \
     && apt-get install -y --no-install-recommends g++ make python3 ca-certificates \
@@ -29,8 +34,6 @@ RUN aptMark="$(apt-mark showmanual)" \
     && npm install \
     && cd npm/node_modules/isolated-vm \
     && npm install \
-    && cd /app/bundle/programs/server/npm/node_modules/@rocket.chat/apps-engine/deno-runtime \
-    && ../../../deno-bin/bin/deno cache main.ts \
     && apt-mark auto '.*' > /dev/null \
     && apt-mark manual $aptMark > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
index feebf76a03e7..aaa2d2552ab3 100644
--- a/apps/meteor/.docker/Dockerfile.alpine
+++ b/apps/meteor/.docker/Dockerfile.alpine
@@ -1,7 +1,17 @@
+ARG DENO_VERSION="1.37.1"
+
+FROM denoland/deno:bin-${DENO_VERSION} as deno
+
 FROM node:14.21.3-alpine3.16
 
+LABEL maintainer="buildmaster@rocket.chat"
+
 ENV LANG=C.UTF-8
 
+## Alpine 3.16 does not have a deno package, but newer versions have it
+## So as soon as we can update the Alpine version, we can replace the following
+## GLIBC installation part by an `apk add deno`
+
 # Installing glibc deps required by Deno
 # This replaces libc6-compat
 # Copied from https://github.com/Docker-Hub-frolvlad/docker-alpine-glibc, which denoland/deno:alpine-1.37.1 uses
@@ -11,7 +21,7 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
     ALPINE_GLIBC_BASE_PACKAGE_FILENAME="glibc-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
     ALPINE_GLIBC_BIN_PACKAGE_FILENAME="glibc-bin-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
     ALPINE_GLIBC_I18N_PACKAGE_FILENAME="glibc-i18n-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
-    apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
+    apk add --no-cache --virtual=.build-dependencies wget ca-certificates ttf-dejavu && \
     echo \
         "-----BEGIN PUBLIC KEY-----\
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m\
@@ -44,12 +54,11 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
     rm \
         "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
         "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-    apk add --no-cache ttf-dejavu
+        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
 
-ADD . /app
+COPY --from=deno /deno /bin/deno
 
-LABEL maintainer="buildmaster@rocket.chat"
+ADD . /app
 
 # needs a mongo instance - defaults to container linking with alias 'mongo'
 ENV DEPLOY_METHOD=docker \
@@ -58,13 +67,12 @@ ENV DEPLOY_METHOD=docker \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads \
-    DENO_DIR=/usr/share/deno
+    Accounts_AvatarStorePath=/app/uploads
 
 RUN set -x \
     && apk add --no-cache --virtual .fetch-deps python3 make g++ \
     && cd /app/bundle/programs/server \
-    && npm install --production \
+    && npm install --omit=dev --unsafe-perm \
     # Start hack for sharp...
     && rm -rf npm/node_modules/sharp \
     && npm install sharp@0.32.6 \
@@ -75,9 +83,6 @@ RUN set -x \
     && npm install isolated-vm@4.4.2 \
     && mv node_modules/isolated-vm npm/node_modules/isolated-vm \
     # End hack for isolated-vm
-    # Cache Deno dependencies for Apps-Engine
-    && cd npm/node_modules/@rocket.chat/apps-engine/deno-runtime \
-    && /app/bundle/programs/server/npm/node_modules/deno-bin/bin/deno cache main.ts \
     && cd /app/bundle/programs/server/npm \
     && npm rebuild bcrypt --build-from-source \
     && npm cache clear --force \
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 390b2c646cd1..9eb2e917819d 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -18,7 +18,7 @@
 	"author": "Rocket.Chat",
 	"license": "MIT",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 3767939a7e3c..b5c9003b6974 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -230,7 +230,7 @@
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
 		"@rocket.chat/apps": "workspace:^",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/base64": "workspace:^",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index 23ee3b125524..0fe101c8fab1 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -8,6 +8,8 @@ services:
     build:
       dockerfile: ${RC_DOCKERFILE}
       context: /tmp/build
+      args:
+        DENO_VERSION: ${DENO_VERSION}
     image: ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${RC_DOCKER_TAG}
     environment:
       - TEST_MODE=true
@@ -39,6 +41,7 @@ services:
       context: .
       args:
         SERVICE: authorization-service
+        DENO_VERSION: ${DENO_VERSION}
     image: ghcr.io/${LOWERCASE_REPOSITORY}/authorization-service:${DOCKER_TAG}
     environment:
       - 'MONGO_URL=${MONGO_URL}'
@@ -73,6 +76,7 @@ services:
       context: .
       args:
         SERVICE: presence-service
+        DENO_VERSION: ${DENO_VERSION}
     image: ghcr.io/${LOWERCASE_REPOSITORY}/presence-service:${DOCKER_TAG}
     environment:
       - MONGO_URL=${MONGO_URL}
diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
index c80d4f2eb376..a97290a43394 100644
--- a/ee/apps/account-service/Dockerfile
+++ b/ee/apps/account-service/Dockerfile
@@ -7,6 +7,10 @@ WORKDIR /app
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/agenda/package.json packages/agenda/package.json
 COPY ./packages/agenda/dist packages/agenda/dist
 
diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
index 9a9e8ded922c..9ddeadd380fe 100644
--- a/ee/apps/authorization-service/Dockerfile
+++ b/ee/apps/authorization-service/Dockerfile
@@ -7,6 +7,10 @@ WORKDIR /app
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/agenda/package.json packages/agenda/package.json
 COPY ./packages/agenda/dist packages/agenda/dist
 
diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
index 32103dc3528b..dea2bc3790a1 100644
--- a/ee/apps/ddp-streamer/Dockerfile
+++ b/ee/apps/ddp-streamer/Dockerfile
@@ -7,6 +7,10 @@ WORKDIR /app
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/agenda/package.json packages/agenda/package.json
 COPY ./packages/agenda/dist packages/agenda/dist
 
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 36c244f41180..f250b9e33106 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -15,7 +15,6 @@
 	],
 	"author": "Rocket.Chat",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
@@ -45,6 +44,7 @@
 		"ws": "^8.8.1"
 	},
 	"devDependencies": {
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/ejson": "^2.2.2",
diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
index 9b7e47968e68..0f18534e1453 100644
--- a/ee/apps/omnichannel-transcript/Dockerfile
+++ b/ee/apps/omnichannel-transcript/Dockerfile
@@ -7,6 +7,10 @@ WORKDIR /app
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/agenda/package.json packages/agenda/package.json
 COPY ./packages/agenda/dist packages/agenda/dist
 
diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
index 430880d29606..78c6a98f809a 100644
--- a/ee/apps/presence-service/Dockerfile
+++ b/ee/apps/presence-service/Dockerfile
@@ -13,6 +13,10 @@ COPY ./packages/agenda/dist packages/agenda/dist
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/core-typings/package.json packages/core-typings/package.json
 COPY ./packages/core-typings/dist packages/core-typings/dist
 
diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
index 9b7e47968e68..0f18534e1453 100644
--- a/ee/apps/queue-worker/Dockerfile
+++ b/ee/apps/queue-worker/Dockerfile
@@ -7,6 +7,10 @@ WORKDIR /app
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/agenda/package.json packages/agenda/package.json
 COPY ./packages/agenda/dist packages/agenda/dist
 
diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
index 9a9e8ded922c..9ddeadd380fe 100644
--- a/ee/apps/stream-hub-service/Dockerfile
+++ b/ee/apps/stream-hub-service/Dockerfile
@@ -7,6 +7,10 @@ WORKDIR /app
 COPY ./packages/core-services/package.json packages/core-services/package.json
 COPY ./packages/core-services/dist packages/core-services/dist
 
+COPY ./packages/apps-engine/package.json packages/apps-engine/package.json
+COPY ./packages/apps-engine/client packages/apps-engine/client
+COPY ./packages/apps-engine/definition packages/apps-engine/definition
+
 COPY ./packages/agenda/package.json packages/agenda/package.json
 COPY ./packages/agenda/dist packages/agenda/dist
 
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 912b4bf453fd..06bbc244fd48 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -6,7 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@types/node": "^14.18.63",
diff --git a/packages/apps-engine/.eslintignore b/packages/apps-engine/.eslintignore
new file mode 100644
index 000000000000..f7e4e0b38e59
--- /dev/null
+++ b/packages/apps-engine/.eslintignore
@@ -0,0 +1,8 @@
+!/gulpfile.js
+/client
+/definition
+/docs
+/server
+/lib
+/deno-runtime
+/.deno
diff --git a/packages/apps-engine/.eslintrc.json b/packages/apps-engine/.eslintrc.json
new file mode 100644
index 000000000000..8e42d7cfa9f6
--- /dev/null
+++ b/packages/apps-engine/.eslintrc.json
@@ -0,0 +1,58 @@
+{
+    "extends": "@rocket.chat/eslint-config",
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "project": "./tsconfig-lint.json"
+    },
+    "rules": {
+        "@typescript-eslint/ban-types": [
+            "error",
+            {
+                "types": {
+                    "{}": false
+                }
+            }
+        ],
+        "@typescript-eslint/naming-convention": [
+            "error",
+            {
+                "selector": ["function", "parameter", "variable"],
+                "modifiers": ["destructured"],
+                "format": null
+            },
+            {
+                "selector": ["variable"],
+                "format": ["camelCase", "UPPER_CASE", "PascalCase"],
+                "leadingUnderscore": "allowSingleOrDouble"
+            },
+            {
+                "selector": ["function"],
+                "format": ["camelCase", "PascalCase"],
+                "leadingUnderscore": "allowSingleOrDouble"
+            },
+            {
+                "selector": ["parameter"],
+                "format": ["camelCase"],
+                "leadingUnderscore": "allow"
+            },
+            {
+                "selector": ["parameter"],
+                "format": ["camelCase"],
+                "modifiers": ["unused"],
+                "leadingUnderscore": "allow"
+            },
+            {
+                "selector": ["interface"],
+                "format": ["PascalCase"],
+                "custom": {
+                    "regex": "^I[A-Z]",
+                    "match": true
+                }
+            }
+        ],
+        "@typescript-eslint/no-empty-function": "off",
+        "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
+        "new-cap": "off",
+        "no-await-in-loop": "off"
+    }
+}
diff --git a/packages/apps-engine/.gitignore b/packages/apps-engine/.gitignore
new file mode 100644
index 000000000000..c4568f9c7430
--- /dev/null
+++ b/packages/apps-engine/.gitignore
@@ -0,0 +1,61 @@
+# Created by https://www.gitignore.io/api/node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+.deno
+.deno-cache
+
+# Optional REPL history
+.node_repl_history
+
+### Typings ###
+## Ignore downloaded typings
+/typings
+
+## dev environment stuff
+/examples/
+/dev-dist/
+/data/
+/tests/test-data/dbs
+/client
+/definition
+/server
+/lib
+
+.DS_Store
+.idea/
diff --git a/packages/apps-engine/.prettierrc b/packages/apps-engine/.prettierrc
new file mode 100644
index 000000000000..9b77117b35c0
--- /dev/null
+++ b/packages/apps-engine/.prettierrc
@@ -0,0 +1,7 @@
+{
+    "tabWidth": 4,
+    "useTabs": false,
+    "singleQuote": true,
+    "trailingComma": "all",
+    "printWidth": 160
+}
diff --git a/packages/apps-engine/README.md b/packages/apps-engine/README.md
new file mode 100644
index 000000000000..d73e09f1aed7
--- /dev/null
+++ b/packages/apps-engine/README.md
@@ -0,0 +1,125 @@
+## Thoughts While Working (for docs)
+- Apps which don't provide a valid uuid4 id will be assigned one, but this is not recommended and your App should provide an id
+- The language strings are only done on the clients (`TAPi18next.addResourceBundle(lang, projectName, translations);`)
+- The implementer of this should restrict the server setting access and environmental variables. Idea is to allow the implementer to have a default set of restricted ones while letting the admin/owner of the server to restrict it even further or lift the restriction on some more. Simple interface with settings and checkbox to allow/disallow them.  :thinking:
+
+## What does the Apps-Engine enable you to do?
+The Apps-Engine is Rocket.Chat's _plugin framework_ - it provides the APIs for Rocket.Chat Apps to interact with the host system.
+
+Currently, a Rocket.Chat App can:
+- Listen to message events
+  - before/after sent
+  - before/after updated
+  - before/after deleted
+- Listen to room events
+  - before/after created
+  - before/after deleted
+- Send messages to users and livechat visitors
+- Register new slash commands
+- Register new HTTP endpoints
+
+Some features the Engine allows Apps to use:
+- Key-Value Storage system
+- App specific settings
+
+## Development environment with Rocket.Chat
+When developing new functionalities, you need to integrate the local version of the Apps-Engine with your local version of Rocket.Chat.
+
+First of all, make sure you've installed all required packages and compiled the changes you've made to the Apps-Engine, since that is what Rocket.Chat will execute:
+```sh
+npm install
+npm run compile
+```
+
+Now, you need to setup a local Rocket.Chat server, [so head to the project's README for instructions on getting started](https://github.com/RocketChat/Rocket.Chat#development) (if you haven't already). Make sure to actually clone the repo, since you will probably need to add some code to it in order to make your new functionality work.
+
+After that, `cd` into Rocket.Chat folder and run:
+```sh
+meteor npm install PATH_TO_APPS_ENGINE
+```
+
+Where `PATH_TO_APPS_ENGINE` is the path to the Apps-Engine repo you've cloned.
+
+That's it! Now when you start Rocket.Chat with the `meteor` command, it will use your local Apps-Engine instead of the one on NPM :)
+
+Whenever you make changes to the engine, run `npm run compile` again - meteor will take care of restarting the server due to the changes.
+
+## Troubleshooting
+1. Sometimes, when you update the Apps-Engine code and compile it while Rocket.Chat is running, you might run on errors similar to these:
+
+```
+Unable to resolve some modules:
+
+  "@rocket.chat/apps-engine/definition/AppStatus" in
+/Users/dev/rocket.chat/Rocket.Chat/app/apps/client/admin/helpers.js (web.browser)
+
+If you notice problems related to these missing modules, consider running:
+
+  meteor npm install --save @rocket.chat/apps-engine
+```
+
+Simply restart the meteor process and it should be fixed.
+
+2. Sometimes when using `meteor npm install PATH_TO_APPS_ENGINE` will cause the following error :-
+
+```
+npm ERR! code ENOENT
+npm ERR! syscall rename
+npm ERR! path PATH_TO_ROCKETCHAT/node_modules/.staging/@rocket.chat/apps-engine-c7135600/node_modules/@babel/code-frame
+npm ERR! dest PATH_TO_ROCKETCHAT/node_modules/.staging/@babel/code-frame-f3697825
+npm ERR! errno -2
+npm ERR! enoent ENOENT: no such file or directory, rename 'PATH_TO_ROCKETCHAT/node_modules/.staging/@rocket.chat/apps-engine-c7135600/node_modules/@babel/code-frame' -> 'PATH_TO_ROCKETCHAT/node_modules/.staging/@babel/code-frame-f3697825'
+npm ERR! enoent This is related to npm not being able to find a file.
+npm ERR! enoent 
+```
+Here `PATH_TO_ROCKETCHAT` is the path to the main rocketchat server repo in your system
+To correct this we reinstall the package once again deleting the previous package
+```
+~/Rocket.Chat$ rm -rf node_modules/@rocket.chat/apps-engine
+~/Rocket.Chat$ cd PATH_TO_APP_ENGINE
+~/Rocket.Chat.Apps-engine$ npm install
+~/Rocket.Chat.Apps-engine$ cd PATH_TO_ROCKETCHAT
+~/Rocket.Chat$ meteor npm install ../Rocket.Chat.Apps-engine
+```
+
+## Implementer Needs to Implement:
+- `src/server/storage/AppStorage`
+- `src/server/storage/AppLogStorage`
+- `src/server/bridges/*`
+
+## Testing Framework:
+Makes great usage of TypeScript and decorators: https://github.com/alsatian-test/alsatian/wiki
+* To run the tests do: `npm run unit-tests`
+* To generate the coverage information: `npm run check-coverage`
+* To view the coverage: `npm run view-coverage`
+
+# Rocket.Chat Apps TypeScript Definitions
+
+## Handlers
+Handlers are essentially "listeners" for different events, except there are various ways to handle an event.
+When something happens there is `pre` and `post` handlers.
+The set of `pre` handlers happens before the event is finalized.
+The set of `post` handlers happens after the event is finalized.
+With that said, the rule of thumb is that if you are going to modify, extend, or change the data backing the event then that should be done in the `pre` handlers. If you are simply wanting to listen for when something happens and not modify anything, then the `post` is the way to go.
+
+The order in which they happen is:
+* Pre**Event**Prevent
+* Pre**Event**Extend
+* Pre**Event**Modify
+* Post**Event**
+
+Here is an explanation of what each of them means:
+* **Prevent**: This is ran to determine whether the event should be prevented or not.
+* **Extend**: This is ran to allow extending the data without being destructive of the data (adding an attachment to a message for example).
+* **Modify**: This is ran and allows for destructive changes to the data (change any and everything).
+* Post**Event**: Is mostly for simple listening and no changes can be made to the data.
+
+## Generating/Updating Documentation
+To update or generate the documentation, please commit your changes first and then in a second commit provide the updated documentation.
+
+# Engage with us
+## Share your story
+We’d love to hear about [your experience](https://survey.zohopublic.com/zs/e4BUFG) and potentially feature it on our [Blog](https://rocket.chat/case-studies/?utm_source=github&utm_medium=readme&utm_campaign=community).
+
+## Subscribe for Updates
+Once a month our marketing team releases an email update with news about product releases, company related topics, events and use cases. [Sign Up!](https://rocket.chat/newsletter/?utm_source=github&utm_medium=readme&utm_campaign=community)
diff --git a/packages/apps-engine/deno-runtime/.gitignore b/packages/apps-engine/deno-runtime/.gitignore
new file mode 100644
index 000000000000..5942ea3a153e
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/.gitignore
@@ -0,0 +1 @@
+.deno/
diff --git a/packages/apps-engine/deno-runtime/AppObjectRegistry.ts b/packages/apps-engine/deno-runtime/AppObjectRegistry.ts
new file mode 100644
index 000000000000..9069c17eaac5
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/AppObjectRegistry.ts
@@ -0,0 +1,26 @@
+export type Maybe<T> = T | null | undefined;
+
+export const AppObjectRegistry = new class {
+    registry: Record<string, unknown> = {};
+
+    public get<T>(key: string): Maybe<T> {
+        return this.registry[key] as Maybe<T>;
+    }
+
+    public set(key: string, value: unknown): void {
+        this.registry[key] = value;
+    }
+
+    public has(key: string): boolean {
+        return key in this.registry;
+    }
+
+    public delete(key: string): void {
+        delete this.registry[key];
+    }
+
+    public clear(): void {
+        this.registry = {};
+    }
+}
+
diff --git a/packages/apps-engine/deno-runtime/acorn-walk.d.ts b/packages/apps-engine/deno-runtime/acorn-walk.d.ts
new file mode 100644
index 000000000000..25861f3bce0f
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/acorn-walk.d.ts
@@ -0,0 +1,170 @@
+import type acorn from "./acorn.d.ts";
+
+export type FullWalkerCallback<TState> = (
+  node: acorn.AnyNode,
+  state: TState,
+  type: string
+) => void
+
+export type FullAncestorWalkerCallback<TState> = (
+  node: acorn.AnyNode,
+  state: TState,
+  ancestors: acorn.AnyNode[],
+  type: string
+) => void
+
+type AggregateType = {
+  Expression: acorn.Expression,
+  Statement: acorn.Statement,
+  Pattern: acorn.Pattern,
+  ForInit: acorn.VariableDeclaration | acorn.Expression
+}
+
+export type SimpleVisitors<TState> = {
+  [type in acorn.AnyNode["type"]]?: (node: Extract<acorn.AnyNode, { type: type }>, state: TState) => void
+} & {
+  [type in keyof AggregateType]?: (node: AggregateType[type], state: TState) => void
+}
+
+export type AncestorVisitors<TState> = {
+  [type in acorn.AnyNode["type"]]?: ( node: Extract<acorn.AnyNode, { type: type }>, state: TState, ancestors: acorn.Node[]
+) => void
+} & {
+  [type in keyof AggregateType]?: (node: AggregateType[type], state: TState, ancestors: acorn.Node[]) => void
+}
+
+export type WalkerCallback<TState> = (node: acorn.Node, state: TState) => void
+
+export type RecursiveVisitors<TState> = {
+  [type in acorn.AnyNode["type"]]?: ( node: Extract<acorn.AnyNode, { type: type }>, state: TState, callback: WalkerCallback<TState>) => void
+} &  {
+  [type in keyof AggregateType]?: (node: AggregateType[type], state: TState, callback: WalkerCallback<TState>) => void
+}
+
+export type FindPredicate = (type: string, node: acorn.Node) => boolean
+
+export interface Found<TState> {
+  node: acorn.Node,
+  state: TState
+}
+
+/**
+ * does a 'simple' walk over a tree
+ * @param node the AST node to walk
+ * @param visitors an object with properties whose names correspond to node types in the {@link https://github.com/estree/estree | ESTree spec}. The properties should contain functions that will be called with the node object and, if applicable the state at that point.
+ * @param base a walker algorithm
+ * @param state a start state. The default walker will simply visit all statements and expressions and not produce a meaningful state. (An example of a use of state is to track scope at each point in the tree.)
+ */
+export function simple<TState>(
+  node: acorn.Node,
+  visitors: SimpleVisitors<TState>,
+  base?: RecursiveVisitors<TState>,
+  state?: TState
+): void
+
+/**
+ * does a 'simple' walk over a tree, building up an array of ancestor nodes (including the current node) and passing the array to the callbacks as a third parameter.
+ * @param node
+ * @param visitors
+ * @param base
+ * @param state
+ */
+export function ancestor<TState>(
+    node: acorn.Node,
+    visitors: AncestorVisitors<TState>,
+    base?: RecursiveVisitors<TState>,
+    state?: TState
+  ): void
+
+/**
+ * does a 'recursive' walk, where the walker functions are responsible for continuing the walk on the child nodes of their target node.
+ * @param node
+ * @param state the start state
+ * @param functions contain an object that maps node types to walker functions
+ * @param base provides the fallback walker functions for node types that aren't handled in the {@link functions} object. If not given, the default walkers will be used.
+ */
+export function recursive<TState>(
+  node: acorn.Node,
+  state: TState,
+  functions: RecursiveVisitors<TState>,
+  base?: RecursiveVisitors<TState>
+): void
+
+/**
+ * does a 'full' walk over a tree, calling the {@link callback} with the arguments (node, state, type) for each node
+ * @param node
+ * @param callback
+ * @param base
+ * @param state
+ */
+export function full<TState>(
+  node: acorn.Node,
+  callback: FullWalkerCallback<TState>,
+  base?: RecursiveVisitors<TState>,
+  state?: TState
+): void
+
+/**
+ * does a 'full' walk over a tree, building up an array of ancestor nodes (including the current node) and passing the array to the callbacks as a third parameter.
+ * @param node
+ * @param callback
+ * @param base
+ * @param state
+ */
+export function fullAncestor<TState>(
+  node: acorn.AnyNode,
+  callback: FullAncestorWalkerCallback<TState>,
+  base?: RecursiveVisitors<TState>,
+  state?: TState
+): void
+
+/**
+ * builds a new walker object by using the walker functions in {@link functions} and filling in the missing ones by taking defaults from {@link base}.
+ * @param functions
+ * @param base
+ */
+export function make<TState>(
+  functions: RecursiveVisitors<TState>,
+  base?: RecursiveVisitors<TState>
+): RecursiveVisitors<TState>
+
+/**
+ * tries to locate a node in a tree at the given start and/or end offsets, which satisfies the predicate test. {@link start} and {@link end} can be either `null` (as wildcard) or a `number`. {@link test} may be a string (indicating a node type) or a function that takes (nodeType, node) arguments and returns a boolean indicating whether this node is interesting. {@link base} and {@link state} are optional, and can be used to specify a custom walker. Nodes are tested from inner to outer, so if two nodes match the boundaries, the inner one will be preferred.
+ * @param node
+ * @param start
+ * @param end
+ * @param type
+ * @param base
+ * @param state
+ */
+export function findNodeAt<TState>(
+  node: acorn.AnyNode,
+  start: number | undefined,
+  end?: number | undefined,
+  type?: FindPredicate | string,
+  base?: RecursiveVisitors<TState>,
+  state?: TState
+): Found<TState> | undefined
+
+/**
+ * like {@link findNodeAt}, but will match any node that exists 'around' (spanning) the given position.
+ * @param node
+ * @param start
+ * @param type
+ * @param base
+ * @param state
+ */
+export function findNodeAround<TState>(
+  node: acorn.AnyNode,
+  start: number | undefined,
+  type?: FindPredicate | string,
+  base?: RecursiveVisitors<TState>,
+  state?: TState
+): Found<TState> | undefined
+
+/**
+ * similar to {@link findNodeAround}, but will match all nodes after the given position (testing outer nodes before inner nodes).
+ */
+export const findNodeAfter: typeof findNodeAround
+
+export const base: RecursiveVisitors<unknown>
diff --git a/packages/apps-engine/deno-runtime/acorn.d.ts b/packages/apps-engine/deno-runtime/acorn.d.ts
new file mode 100644
index 000000000000..0b5bc6b407b2
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/acorn.d.ts
@@ -0,0 +1,857 @@
+export interface Node {
+  start?: number
+  end?: number
+  type: string
+  range?: [number, number]
+  loc?: SourceLocation | null
+}
+
+export interface SourceLocation {
+  source?: string | null
+  start: Position
+  end: Position
+}
+
+export interface Position {
+  /** 1-based */
+  line: number
+  /** 0-based */
+  column: number
+}
+
+export interface Identifier extends Node {
+  type: "Identifier"
+  name: string
+}
+
+export interface Literal extends Node {
+  type: "Literal"
+  value?: string | boolean | null | number | RegExp | bigint
+  raw?: string
+  regex?: {
+    pattern: string
+    flags: string
+  }
+  bigint?: string
+}
+
+export interface Program extends Node {
+  type: "Program"
+  body: Array<Statement | ModuleDeclaration>
+  sourceType: "script" | "module"
+}
+
+export interface Function extends Node {
+  id?: Identifier | null
+  params: Array<Pattern>
+  body: BlockStatement | Expression
+  generator: boolean
+  expression: boolean
+  async: boolean
+}
+
+export interface ExpressionStatement extends Node {
+  type: "ExpressionStatement"
+  expression: Expression | Literal
+  directive?: string
+}
+
+export interface BlockStatement extends Node {
+  type: "BlockStatement"
+  body: Array<Statement>
+}
+
+export interface EmptyStatement extends Node {
+  type: "EmptyStatement"
+}
+
+export interface DebuggerStatement extends Node {
+  type: "DebuggerStatement"
+}
+
+export interface WithStatement extends Node {
+  type: "WithStatement"
+  object: Expression
+  body: Statement
+}
+
+export interface ReturnStatement extends Node {
+  type: "ReturnStatement"
+  argument?: Expression | null
+}
+
+export interface LabeledStatement extends Node {
+  type: "LabeledStatement"
+  label: Identifier
+  body: Statement
+}
+
+export interface BreakStatement extends Node {
+  type: "BreakStatement"
+  label?: Identifier | null
+}
+
+export interface ContinueStatement extends Node {
+  type: "ContinueStatement"
+  label?: Identifier | null
+}
+
+export interface IfStatement extends Node {
+  type: "IfStatement"
+  test: Expression
+  consequent: Statement
+  alternate?: Statement | null
+}
+
+export interface SwitchStatement extends Node {
+  type: "SwitchStatement"
+  discriminant: Expression
+  cases: Array<SwitchCase>
+}
+
+export interface SwitchCase extends Node {
+  type: "SwitchCase"
+  test?: Expression | null
+  consequent: Array<Statement>
+}
+
+export interface ThrowStatement extends Node {
+  type: "ThrowStatement"
+  argument: Expression
+}
+
+export interface TryStatement extends Node {
+  type: "TryStatement"
+  block: BlockStatement
+  handler?: CatchClause | null
+  finalizer?: BlockStatement | null
+}
+
+export interface CatchClause extends Node {
+  type: "CatchClause"
+  param?: Pattern | null
+  body: BlockStatement
+}
+
+export interface WhileStatement extends Node {
+  type: "WhileStatement"
+  test: Expression
+  body: Statement
+}
+
+export interface DoWhileStatement extends Node {
+  type: "DoWhileStatement"
+  body: Statement
+  test: Expression
+}
+
+export interface ForStatement extends Node {
+  type: "ForStatement"
+  init?: VariableDeclaration | Expression | null
+  test?: Expression | null
+  update?: Expression | null
+  body: Statement
+}
+
+export interface ForInStatement extends Node {
+  type: "ForInStatement"
+  left: VariableDeclaration | Pattern
+  right: Expression
+  body: Statement
+}
+
+export interface FunctionDeclaration extends Function {
+  type: "FunctionDeclaration"
+  id: Identifier
+  body: BlockStatement
+}
+
+export interface VariableDeclaration extends Node {
+  type: "VariableDeclaration"
+  declarations: Array<VariableDeclarator>
+  kind: "var" | "let" | "const"
+}
+
+export interface VariableDeclarator extends Node {
+  type: "VariableDeclarator"
+  id: Pattern
+  init?: Expression | null
+}
+
+export interface ThisExpression extends Node {
+  type: "ThisExpression"
+}
+
+export interface ArrayExpression extends Node {
+  type: "ArrayExpression"
+  elements: Array<Expression | SpreadElement | null>
+}
+
+export interface ObjectExpression extends Node {
+  type: "ObjectExpression"
+  properties: Array<Property | SpreadElement>
+}
+
+export interface Property extends Node {
+  type: "Property"
+  key: Expression
+  value: Expression
+  kind: "init" | "get" | "set"
+  method: boolean
+  shorthand: boolean
+  computed: boolean
+}
+
+export interface FunctionExpression extends Function {
+  type: "FunctionExpression"
+  body: BlockStatement
+}
+
+export interface UnaryExpression extends Node {
+  type: "UnaryExpression"
+  operator: UnaryOperator
+  prefix: boolean
+  argument: Expression
+}
+
+export type UnaryOperator = "-" | "+" | "!" | "~" | "typeof" | "void" | "delete"
+
+export interface UpdateExpression extends Node {
+  type: "UpdateExpression"
+  operator: UpdateOperator
+  argument: Expression
+  prefix: boolean
+}
+
+export type UpdateOperator = "++" | "--"
+
+export interface BinaryExpression extends Node {
+  type: "BinaryExpression"
+  operator: BinaryOperator
+  left: Expression | PrivateIdentifier
+  right: Expression
+}
+
+export type BinaryOperator = "==" | "!=" | "===" | "!==" | "<" | "<=" | ">" | ">=" | "<<" | ">>" | ">>>" | "+" | "-" | "*" | "/" | "%" | "|" | "^" | "&" | "in" | "instanceof" | "**"
+
+export interface AssignmentExpression extends Node {
+  type: "AssignmentExpression"
+  operator: AssignmentOperator
+  left: Pattern
+  right: Expression
+}
+
+export type AssignmentOperator = "=" | "+=" | "-=" | "*=" | "/=" | "%=" | "<<=" | ">>=" | ">>>=" | "|=" | "^=" | "&=" | "**=" | "||=" | "&&=" | "??="
+
+export interface LogicalExpression extends Node {
+  type: "LogicalExpression"
+  operator: LogicalOperator
+  left: Expression
+  right: Expression
+}
+
+export type LogicalOperator = "||" | "&&" | "??"
+
+export interface MemberExpression extends Node {
+  type: "MemberExpression"
+  object: Expression | Super
+  property: Expression | PrivateIdentifier
+  computed: boolean
+  optional: boolean
+}
+
+export interface ConditionalExpression extends Node {
+  type: "ConditionalExpression"
+  test: Expression
+  alternate: Expression
+  consequent: Expression
+}
+
+export interface CallExpression extends Node {
+  type: "CallExpression"
+  callee: Expression | Super
+  arguments: Array<Expression | SpreadElement>
+  optional: boolean
+}
+
+export interface NewExpression extends Node {
+  type: "NewExpression"
+  callee: Expression
+  arguments: Array<Expression | SpreadElement>
+}
+
+export interface SequenceExpression extends Node {
+  type: "SequenceExpression"
+  expressions: Array<Expression>
+}
+
+export interface ForOfStatement extends Node {
+  type: "ForOfStatement"
+  left: VariableDeclaration | Pattern
+  right: Expression
+  body: Statement
+  await: boolean
+}
+
+export interface Super extends Node {
+  type: "Super"
+}
+
+export interface SpreadElement extends Node {
+  type: "SpreadElement"
+  argument: Expression
+}
+
+export interface ArrowFunctionExpression extends Function {
+  type: "ArrowFunctionExpression"
+}
+
+export interface YieldExpression extends Node {
+  type: "YieldExpression"
+  argument?: Expression | null
+  delegate: boolean
+}
+
+export interface TemplateLiteral extends Node {
+  type: "TemplateLiteral"
+  quasis: Array<TemplateElement>
+  expressions: Array<Expression>
+}
+
+export interface TaggedTemplateExpression extends Node {
+  type: "TaggedTemplateExpression"
+  tag: Expression
+  quasi: TemplateLiteral
+}
+
+export interface TemplateElement extends Node {
+  type: "TemplateElement"
+  tail: boolean
+  value: {
+    cooked?: string | null
+    raw: string
+  }
+}
+
+export interface AssignmentProperty extends Node {
+  type: "Property"
+  key: Expression
+  value: Pattern
+  kind: "init"
+  method: false
+  shorthand: boolean
+  computed: boolean
+}
+
+export interface ObjectPattern extends Node {
+  type: "ObjectPattern"
+  properties: Array<AssignmentProperty | RestElement>
+}
+
+export interface ArrayPattern extends Node {
+  type: "ArrayPattern"
+  elements: Array<Pattern | null>
+}
+
+export interface RestElement extends Node {
+  type: "RestElement"
+  argument: Pattern
+}
+
+export interface AssignmentPattern extends Node {
+  type: "AssignmentPattern"
+  left: Pattern
+  right: Expression
+}
+
+export interface Class extends Node {
+  id?: Identifier | null
+  superClass?: Expression | null
+  body: ClassBody
+}
+
+export interface ClassBody extends Node {
+  type: "ClassBody"
+  body: Array<MethodDefinition | PropertyDefinition | StaticBlock>
+}
+
+export interface MethodDefinition extends Node {
+  type: "MethodDefinition"
+  key: Expression | PrivateIdentifier
+  value: FunctionExpression
+  kind: "constructor" | "method" | "get" | "set"
+  computed: boolean
+  static: boolean
+}
+
+export interface ClassDeclaration extends Class {
+  type: "ClassDeclaration"
+  id: Identifier
+}
+
+export interface ClassExpression extends Class {
+  type: "ClassExpression"
+}
+
+export interface MetaProperty extends Node {
+  type: "MetaProperty"
+  meta: Identifier
+  property: Identifier
+}
+
+export interface ImportDeclaration extends Node {
+  type: "ImportDeclaration"
+  specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>
+  source: Literal
+}
+
+export interface ImportSpecifier extends Node {
+  type: "ImportSpecifier"
+  imported: Identifier | Literal
+  local: Identifier
+}
+
+export interface ImportDefaultSpecifier extends Node {
+  type: "ImportDefaultSpecifier"
+  local: Identifier
+}
+
+export interface ImportNamespaceSpecifier extends Node {
+  type: "ImportNamespaceSpecifier"
+  local: Identifier
+}
+
+export interface ExportNamedDeclaration extends Node {
+  type: "ExportNamedDeclaration"
+  declaration?: Declaration | null
+  specifiers: Array<ExportSpecifier>
+  source?: Literal | null
+}
+
+export interface ExportSpecifier extends Node {
+  type: "ExportSpecifier"
+  exported: Identifier | Literal
+  local: Identifier | Literal
+}
+
+export interface AnonymousFunctionDeclaration extends Function {
+  type: "FunctionDeclaration"
+  id: null
+  body: BlockStatement
+}
+
+export interface AnonymousClassDeclaration extends Class {
+  type: "ClassDeclaration"
+  id: null
+}
+
+export interface ExportDefaultDeclaration extends Node {
+  type: "ExportDefaultDeclaration"
+  declaration: AnonymousFunctionDeclaration | FunctionDeclaration | AnonymousClassDeclaration | ClassDeclaration | Expression
+}
+
+export interface ExportAllDeclaration extends Node {
+  type: "ExportAllDeclaration"
+  source: Literal
+  exported?: Identifier | Literal | null
+}
+
+export interface AwaitExpression extends Node {
+  type: "AwaitExpression"
+  argument: Expression
+}
+
+export interface ChainExpression extends Node {
+  type: "ChainExpression"
+  expression: MemberExpression | CallExpression
+}
+
+export interface ImportExpression extends Node {
+  type: "ImportExpression"
+  source: Expression
+}
+
+export interface ParenthesizedExpression extends Node {
+  type: "ParenthesizedExpression"
+  expression: Expression
+}
+
+export interface PropertyDefinition extends Node {
+  type: "PropertyDefinition"
+  key: Expression | PrivateIdentifier
+  value?: Expression | null
+  computed: boolean
+  static: boolean
+}
+
+export interface PrivateIdentifier extends Node {
+  type: "PrivateIdentifier"
+  name: string
+}
+
+export interface StaticBlock extends Node {
+  type: "StaticBlock"
+  body: Array<Statement>
+}
+
+export type Statement =
+| ExpressionStatement
+| BlockStatement
+| EmptyStatement
+| DebuggerStatement
+| WithStatement
+| ReturnStatement
+| LabeledStatement
+| BreakStatement
+| ContinueStatement
+| IfStatement
+| SwitchStatement
+| ThrowStatement
+| TryStatement
+| WhileStatement
+| DoWhileStatement
+| ForStatement
+| ForInStatement
+| ForOfStatement
+| Declaration
+
+export type Declaration =
+| FunctionDeclaration
+| VariableDeclaration
+| ClassDeclaration
+
+export type Expression =
+| Identifier
+| Literal
+| ThisExpression
+| ArrayExpression
+| ObjectExpression
+| FunctionExpression
+| UnaryExpression
+| UpdateExpression
+| BinaryExpression
+| AssignmentExpression
+| LogicalExpression
+| MemberExpression
+| ConditionalExpression
+| CallExpression
+| NewExpression
+| SequenceExpression
+| ArrowFunctionExpression
+| YieldExpression
+| TemplateLiteral
+| TaggedTemplateExpression
+| ClassExpression
+| MetaProperty
+| AwaitExpression
+| ChainExpression
+| ImportExpression
+| ParenthesizedExpression
+
+export type Pattern =
+| Identifier
+| MemberExpression
+| ObjectPattern
+| ArrayPattern
+| RestElement
+| AssignmentPattern
+
+export type ModuleDeclaration =
+| ImportDeclaration
+| ExportNamedDeclaration
+| ExportDefaultDeclaration
+| ExportAllDeclaration
+
+export type AnyNode = Statement | Expression | Declaration | ModuleDeclaration | Literal | Program | SwitchCase | CatchClause | Property | Super | SpreadElement | TemplateElement | AssignmentProperty | ObjectPattern | ArrayPattern | RestElement | AssignmentPattern | ClassBody | MethodDefinition | MetaProperty | ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ExportSpecifier | AnonymousFunctionDeclaration | AnonymousClassDeclaration | PropertyDefinition | PrivateIdentifier | StaticBlock | VariableDeclaration | VariableDeclarator
+
+export function parse(input: string, options: Options): Program
+
+export function parseExpressionAt(input: string, pos: number, options: Options): Expression
+
+export function tokenizer(input: string, options: Options): {
+  getToken(): Token
+  [Symbol.iterator](): Iterator<Token>
+}
+
+export type ecmaVersion = 3 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024 | "latest"
+
+export interface Options {
+  /**
+   * `ecmaVersion` indicates the ECMAScript version to parse. Must be
+   * either 3, 5, 6 (or 2015), 7 (2016), 8 (2017), 9 (2018), 10
+   * (2019), 11 (2020), 12 (2021), 13 (2022), 14 (2023), or `"latest"`
+   * (the latest version the library supports). This influences
+   * support for strict mode, the set of reserved words, and support
+   * for new syntax features.
+   */
+  ecmaVersion: ecmaVersion
+
+  /**
+   * `sourceType` indicates the mode the code should be parsed in.
+   * Can be either `"script"` or `"module"`. This influences global
+   * strict mode and parsing of `import` and `export` declarations.
+   */
+  sourceType?: "script" | "module"
+
+  /**
+   * a callback that will be called when a semicolon is automatically inserted.
+   * @param lastTokEnd the position of the comma as an offset
+   * @param lastTokEndLoc location if {@link locations} is enabled
+   */
+  onInsertedSemicolon?: (lastTokEnd: number, lastTokEndLoc?: Position) => void
+
+  /**
+   * similar to `onInsertedSemicolon`, but for trailing commas
+   * @param lastTokEnd the position of the comma as an offset
+   * @param lastTokEndLoc location if `locations` is enabled
+   */
+  onTrailingComma?: (lastTokEnd: number, lastTokEndLoc?: Position) => void
+
+  /**
+   * By default, reserved words are only enforced if ecmaVersion >= 5.
+   * Set `allowReserved` to a boolean value to explicitly turn this on
+   * an off. When this option has the value "never", reserved words
+   * and keywords can also not be used as property names.
+   */
+  allowReserved?: boolean | "never"
+
+  /**
+   * When enabled, a return at the top level is not considered an error.
+   */
+  allowReturnOutsideFunction?: boolean
+
+  /**
+   * When enabled, import/export statements are not constrained to
+   * appearing at the top of the program, and an import.meta expression
+   * in a script isn't considered an error.
+   */
+  allowImportExportEverywhere?: boolean
+
+  /**
+   * By default, `await` identifiers are allowed to appear at the top-level scope only if {@link ecmaVersion} >= 2022.
+   * When enabled, await identifiers are allowed to appear at the top-level scope,
+   * but they are still not allowed in non-async functions.
+   */
+  allowAwaitOutsideFunction?: boolean
+
+  /**
+   * When enabled, super identifiers are not constrained to
+   * appearing in methods and do not raise an error when they appear elsewhere.
+   */
+  allowSuperOutsideMethod?: boolean
+
+  /**
+   * When enabled, hashbang directive in the beginning of file is
+   * allowed and treated as a line comment. Enabled by default when
+   * {@link ecmaVersion} >= 2023.
+   */
+  allowHashBang?: boolean
+
+  /**
+   * By default, the parser will verify that private properties are
+   * only used in places where they are valid and have been declared.
+   * Set this to false to turn such checks off.
+   */
+  checkPrivateFields?: boolean
+
+  /**
+   * When `locations` is on, `loc` properties holding objects with
+   * `start` and `end` properties as {@link Position} objects will be attached to the
+   * nodes.
+   */
+  locations?: boolean
+
+  /**
+   * a callback that will cause Acorn to call that export function with object in the same
+   * format as tokens returned from `tokenizer().getToken()`. Note
+   * that you are not allowed to call the parser from the
+   * callback—that will corrupt its internal state.
+   */
+  onToken?: ((token: Token) => void) | Token[]
+
+
+  /**
+   * This takes a export function or an array.
+   *
+   * When a export function is passed, Acorn will call that export function with `(block, text, start,
+   * end)` parameters whenever a comment is skipped. `block` is a
+   * boolean indicating whether this is a block (`/* *\/`) comment,
+   * `text` is the content of the comment, and `start` and `end` are
+   * character offsets that denote the start and end of the comment.
+   * When the {@link locations} option is on, two more parameters are
+   * passed, the full locations of {@link Position} export type of the start and
+   * end of the comments.
+   *
+   * When a array is passed, each found comment of {@link Comment} export type is pushed to the array.
+   *
+   * Note that you are not allowed to call the
+   * parser from the callback—that will corrupt its internal state.
+   */
+  onComment?: ((
+    isBlock: boolean, text: string, start: number, end: number, startLoc?: Position,
+    endLoc?: Position
+  ) => void) | Comment[]
+
+  /**
+   * Nodes have their start and end characters offsets recorded in
+   * `start` and `end` properties (directly on the node, rather than
+   * the `loc` object, which holds line/column data. To also add a
+   * [semi-standardized][range] `range` property holding a `[start,
+   * end]` array with the same numbers, set the `ranges` option to
+   * `true`.
+   */
+  ranges?: boolean
+
+  /**
+   * It is possible to parse multiple files into a single AST by
+   * passing the tree produced by parsing the first file as
+   * `program` option in subsequent parses. This will add the
+   * toplevel forms of the parsed file to the `Program` (top) node
+   * of an existing parse tree.
+   */
+  program?: Node
+
+  /**
+   * When {@link locations} is on, you can pass this to record the source
+   * file in every node's `loc` object.
+   */
+  sourceFile?: string
+
+  /**
+   * This value, if given, is stored in every node, whether {@link locations} is on or off.
+   */
+  directSourceFile?: string
+
+  /**
+   * When enabled, parenthesized expressions are represented by
+   * (non-standard) ParenthesizedExpression nodes
+   */
+  preserveParens?: boolean
+}
+
+export class Parser {
+  options: Options
+  input: string
+
+  constructor(options: Options, input: string, startPos?: number)
+  parse(): Program
+
+  static parse(input: string, options: Options): Program
+  static parseExpressionAt(input: string, pos: number, options: Options): Expression
+  static tokenizer(input: string, options: Options): {
+    getToken(): Token
+    [Symbol.iterator](): Iterator<Token>
+  }
+  static extend(...plugins: ((BaseParser: typeof Parser) => typeof Parser)[]): typeof Parser
+}
+
+export const defaultOptions: Options
+
+export function getLineInfo(input: string, offset: number): Position
+
+export class TokenType {
+  label: string
+  keyword: string | undefined
+}
+
+export const tokTypes: {
+  num: TokenType
+  regexp: TokenType
+  string: TokenType
+  name: TokenType
+  privateId: TokenType
+  eof: TokenType
+
+  bracketL: TokenType
+  bracketR: TokenType
+  braceL: TokenType
+  braceR: TokenType
+  parenL: TokenType
+  parenR: TokenType
+  comma: TokenType
+  semi: TokenType
+  colon: TokenType
+  dot: TokenType
+  question: TokenType
+  questionDot: TokenType
+  arrow: TokenType
+  template: TokenType
+  invalidTemplate: TokenType
+  ellipsis: TokenType
+  backQuote: TokenType
+  dollarBraceL: TokenType
+
+  eq: TokenType
+  assign: TokenType
+  incDec: TokenType
+  prefix: TokenType
+  logicalOR: TokenType
+  logicalAND: TokenType
+  bitwiseOR: TokenType
+  bitwiseXOR: TokenType
+  bitwiseAND: TokenType
+  equality: TokenType
+  relational: TokenType
+  bitShift: TokenType
+  plusMin: TokenType
+  modulo: TokenType
+  star: TokenType
+  slash: TokenType
+  starstar: TokenType
+  coalesce: TokenType
+
+  _break: TokenType
+  _case: TokenType
+  _catch: TokenType
+  _continue: TokenType
+  _debugger: TokenType
+  _default: TokenType
+  _do: TokenType
+  _else: TokenType
+  _finally: TokenType
+  _for: TokenType
+  _function: TokenType
+  _if: TokenType
+  _return: TokenType
+  _switch: TokenType
+  _throw: TokenType
+  _try: TokenType
+  _var: TokenType
+  _const: TokenType
+  _while: TokenType
+  _with: TokenType
+  _new: TokenType
+  _this: TokenType
+  _super: TokenType
+  _class: TokenType
+  _extends: TokenType
+  _export: TokenType
+  _import: TokenType
+  _null: TokenType
+  _true: TokenType
+  _false: TokenType
+  _in: TokenType
+  _instanceof: TokenType
+  _typeof: TokenType
+  _void: TokenType
+  _delete: TokenType
+}
+
+export interface Comment {
+  type: "Line" | "Block"
+  value: string
+  start: number
+  end: number
+  loc?: SourceLocation
+  range?: [number, number]
+}
+
+export class Token {
+  type: TokenType
+  start: number
+  end: number
+  loc?: SourceLocation
+  range?: [number, number]
+}
+
+export const version: string
diff --git a/packages/apps-engine/deno-runtime/deno.jsonc b/packages/apps-engine/deno-runtime/deno.jsonc
new file mode 100644
index 000000000000..231d0924237a
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/deno.jsonc
@@ -0,0 +1,16 @@
+{
+    "imports": {
+        "@rocket.chat/apps-engine/": "./../src/",
+        "@rocket.chat/ui-kit": "npm:@rocket.chat/ui-kit@^0.31.22",
+        "@msgpack/msgpack": "npm:@msgpack/msgpack@3.0.0-beta2",
+        "acorn": "npm:acorn@8.10.0",
+        "acorn-walk": "npm:acorn-walk@8.2.0",
+        "astring": "npm:astring@1.8.6",
+        "jsonrpc-lite": "npm:jsonrpc-lite@2.2.0",
+        "stack-trace": "npm:stack-trace@0.0.10",
+        "uuid": "npm:uuid@8.3.2"
+    },
+    "tasks": {
+        "test": "deno test --no-check --allow-read=../../../"
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/deno.lock b/packages/apps-engine/deno-runtime/deno.lock
new file mode 100644
index 000000000000..86cebf98f63a
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/deno.lock
@@ -0,0 +1,107 @@
+{
+  "version": "3",
+  "packages": {
+    "specifiers": {
+      "npm:@msgpack/msgpack@3.0.0-beta2": "npm:@msgpack/msgpack@3.0.0-beta2",
+      "npm:@rocket.chat/ui-kit@^0.31.22": "npm:@rocket.chat/ui-kit@0.31.25_@rocket.chat+icons@0.32.0",
+      "npm:acorn-walk@8.2.0": "npm:acorn-walk@8.2.0",
+      "npm:acorn@8.10.0": "npm:acorn@8.10.0",
+      "npm:astring@1.8.6": "npm:astring@1.8.6",
+      "npm:jsonrpc-lite@2.2.0": "npm:jsonrpc-lite@2.2.0",
+      "npm:stack-trace": "npm:stack-trace@0.0.10",
+      "npm:stack-trace@0.0.10": "npm:stack-trace@0.0.10",
+      "npm:uuid@8.3.2": "npm:uuid@8.3.2"
+    },
+    "npm": {
+      "@msgpack/msgpack@3.0.0-beta2": {
+        "integrity": "sha512-y+l1PNV0XDyY8sM3YtuMLK5vE3/hkfId+Do8pLo/OPxfxuFAUwcGz3oiiUuV46/aBpwTzZ+mRWVMtlSKbradhw==",
+        "dependencies": {}
+      },
+      "@rocket.chat/icons@0.32.0": {
+        "integrity": "sha512-7yhhELKNLb9kUtXCvau0V+iMXraV2bOsxcPjc/ZtLR5VeeIDTeaflqRWGtLroX6f3bE+J1n5qB5zi8A4YXuH2g==",
+        "dependencies": {}
+      },
+      "@rocket.chat/ui-kit@0.31.25_@rocket.chat+icons@0.32.0": {
+        "integrity": "sha512-yTgTKDw9SMlJ6p8n0PDO6zSvox/nHYUrwCIvILQeAK6PvTrgSe/u9CvU7ATTYjnQiQ603yEGR6dxjF4euCGdNA==",
+        "dependencies": {
+          "@rocket.chat/icons": "@rocket.chat/icons@0.32.0"
+        }
+      },
+      "acorn-walk@8.2.0": {
+        "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+        "dependencies": {}
+      },
+      "acorn@8.10.0": {
+        "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+        "dependencies": {}
+      },
+      "astring@1.8.6": {
+        "integrity": "sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==",
+        "dependencies": {}
+      },
+      "jsonrpc-lite@2.2.0": {
+        "integrity": "sha512-/cbbSxtZWs1O7R4tWqabrCM/t3N8qKUZMAg9IUqpPvUs6UyRvm6pCNYkskyKN/XU0UgffW+NY2ZRr8t0AknX7g==",
+        "dependencies": {}
+      },
+      "stack-trace@0.0.10": {
+        "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+        "dependencies": {}
+      },
+      "uuid@8.3.2": {
+        "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+        "dependencies": {}
+      }
+    }
+  },
+  "remote": {
+    "https://deno.land/std@0.203.0/assert/_constants.ts": "8a9da298c26750b28b326b297316cdde860bc237533b07e1337c021379e6b2a9",
+    "https://deno.land/std@0.203.0/assert/_diff.ts": "1a3c044aedf77647d6cac86b798c6417603361b66b54c53331b312caeb447aea",
+    "https://deno.land/std@0.203.0/assert/_format.ts": "a69126e8a469009adf4cf2a50af889aca364c349797e63174884a52ff75cf4c7",
+    "https://deno.land/std@0.203.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
+    "https://deno.land/std@0.203.0/assert/assert_almost_equals.ts": "e15ca1f34d0d5e0afae63b3f5d975cbd18335a132e42b0c747d282f62ad2cd6c",
+    "https://deno.land/std@0.203.0/assert/assert_array_includes.ts": "6856d7f2c3544bc6e62fb4646dfefa3d1df5ff14744d1bca19f0cbaf3b0d66c9",
+    "https://deno.land/std@0.203.0/assert/assert_equals.ts": "d8ec8a22447fbaf2fc9d7c3ed2e66790fdb74beae3e482855d75782218d68227",
+    "https://deno.land/std@0.203.0/assert/assert_exists.ts": "407cb6b9fb23a835cd8d5ad804e2e2edbbbf3870e322d53f79e1c7a512e2efd7",
+    "https://deno.land/std@0.203.0/assert/assert_false.ts": "0ccbcaae910f52c857192ff16ea08bda40fdc79de80846c206bfc061e8c851c6",
+    "https://deno.land/std@0.203.0/assert/assert_greater.ts": "ae2158a2d19313bf675bf7251d31c6dc52973edb12ac64ac8fc7064152af3e63",
+    "https://deno.land/std@0.203.0/assert/assert_greater_or_equal.ts": "1439da5ebbe20855446cac50097ac78b9742abe8e9a43e7de1ce1426d556e89c",
+    "https://deno.land/std@0.203.0/assert/assert_instance_of.ts": "3aedb3d8186e120812d2b3a5dea66a6e42bf8c57a8bd927645770bd21eea554c",
+    "https://deno.land/std@0.203.0/assert/assert_is_error.ts": "c21113094a51a296ffaf036767d616a78a2ae5f9f7bbd464cd0197476498b94b",
+    "https://deno.land/std@0.203.0/assert/assert_less.ts": "aec695db57db42ec3e2b62e97e1e93db0063f5a6ec133326cc290ff4b71b47e4",
+    "https://deno.land/std@0.203.0/assert/assert_less_or_equal.ts": "5fa8b6a3ffa20fd0a05032fe7257bf985d207b85685fdbcd23651b70f928c848",
+    "https://deno.land/std@0.203.0/assert/assert_match.ts": "c4083f80600bc190309903c95e397a7c9257ff8b5ae5c7ef91e834704e672e9b",
+    "https://deno.land/std@0.203.0/assert/assert_not_equals.ts": "9f1acab95bd1f5fc9a1b17b8027d894509a745d91bac1718fdab51dc76831754",
+    "https://deno.land/std@0.203.0/assert/assert_not_instance_of.ts": "0c14d3dfd9ab7a5276ed8ed0b18c703d79a3d106102077ec437bfe7ed912bd22",
+    "https://deno.land/std@0.203.0/assert/assert_not_match.ts": "3796a5b0c57a1ce6c1c57883dd4286be13a26f715ea662318ab43a8491a13ab0",
+    "https://deno.land/std@0.203.0/assert/assert_not_strict_equals.ts": "ca6c6d645e95fbc873d25320efeb8c4c6089a9a5e09f92d7c1c4b6e935c2a6ad",
+    "https://deno.land/std@0.203.0/assert/assert_object_match.ts": "d8fc2867cfd92eeacf9cea621e10336b666de1874a6767b5ec48988838370b54",
+    "https://deno.land/std@0.203.0/assert/assert_rejects.ts": "45c59724de2701e3b1f67c391d6c71c392363635aad3f68a1b3408f9efca0057",
+    "https://deno.land/std@0.203.0/assert/assert_strict_equals.ts": "b1f538a7ea5f8348aeca261d4f9ca603127c665e0f2bbfeb91fa272787c87265",
+    "https://deno.land/std@0.203.0/assert/assert_string_includes.ts": "b821d39ebf5cb0200a348863c86d8c4c4b398e02012ce74ad15666fc4b631b0c",
+    "https://deno.land/std@0.203.0/assert/assert_throws.ts": "63784e951475cb7bdfd59878cd25a0931e18f6dc32a6077c454b2cd94f4f4bcd",
+    "https://deno.land/std@0.203.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
+    "https://deno.land/std@0.203.0/assert/equal.ts": "9f1a46d5993966d2596c44e5858eec821859b45f783a5ee2f7a695dfc12d8ece",
+    "https://deno.land/std@0.203.0/assert/fail.ts": "c36353d7ae6e1f7933d45f8ea51e358c8c4b67d7e7502028598fe1fea062e278",
+    "https://deno.land/std@0.203.0/assert/mod.ts": "37c49a26aae2b254bbe25723434dc28cd7532e444cf0b481a97c045d110ec085",
+    "https://deno.land/std@0.203.0/assert/unimplemented.ts": "d56fbeecb1f108331a380f72e3e010a1f161baa6956fd0f7cf3e095ae1a4c75a",
+    "https://deno.land/std@0.203.0/assert/unreachable.ts": "4600dc0baf7d9c15a7f7d234f00c23bca8f3eba8b140286aaca7aa998cf9a536",
+    "https://deno.land/std@0.203.0/fmt/colors.ts": "c51c4642678eb690dcf5ffee5918b675bf01a33fba82acf303701ae1a4f8c8d9",
+    "https://deno.land/std@0.203.0/testing/_test_suite.ts": "30f018feeb3835f12ab198d8a518f9089b1bcb2e8c838a8b615ab10d5005465c",
+    "https://deno.land/std@0.203.0/testing/bdd.ts": "3f446df5ef8e856a869e8eec54c8482590415741ff0b6358a00c43486cc15769",
+    "https://deno.land/std@0.203.0/testing/mock.ts": "6576b4aa55ee20b1990d656a78fff83599e190948c00e9f25a7f3ac5e9d6492d",
+    "https://deno.land/std@0.216.0/io/types.ts": "748bbb3ac96abda03594ef5a0db15ce5450dcc6c0d841c8906f8b10ac8d32c96",
+    "https://deno.land/std@0.216.0/io/write_all.ts": "24aac2312bb21096ae3ae0b102b22c26164d3249dff96dbac130958aa736f038"
+  },
+  "workspace": {
+    "dependencies": [
+      "npm:@msgpack/msgpack@3.0.0-beta2",
+      "npm:@rocket.chat/ui-kit@^0.31.22",
+      "npm:acorn-walk@8.2.0",
+      "npm:acorn@8.10.0",
+      "npm:astring@1.8.6",
+      "npm:jsonrpc-lite@2.2.0",
+      "npm:stack-trace@0.0.10",
+      "npm:uuid@8.3.2"
+    ]
+  }
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/api-handler.ts b/packages/apps-engine/deno-runtime/handlers/api-handler.ts
new file mode 100644
index 000000000000..32d30e532fd3
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/api-handler.ts
@@ -0,0 +1,46 @@
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+import type { IApiEndpoint } from '@rocket.chat/apps-engine/definition/api/IApiEndpoint.ts';
+
+import { AppObjectRegistry } from '../AppObjectRegistry.ts';
+import { Logger } from '../lib/logger.ts';
+import { AppAccessorsInstance } from '../lib/accessors/mod.ts';
+
+export default async function apiHandler(call: string, params: unknown): Promise<JsonRpcError | Defined> {
+    const [, path, httpMethod] = call.split(':');
+
+    const endpoint = AppObjectRegistry.get<IApiEndpoint>(`api:${path}`);
+    const logger = AppObjectRegistry.get<Logger>('logger');
+
+    if (!endpoint) {
+        return new JsonRpcError(`Endpoint ${path} not found`, -32000);
+    }
+
+    const method = endpoint[httpMethod as keyof IApiEndpoint];
+
+    if (typeof method !== 'function') {
+        return new JsonRpcError(`${path}'s ${httpMethod} not exists`, -32000);
+    }
+
+    const [request, endpointInfo] = params as Array<unknown>;
+
+    logger?.debug(`${path}'s ${call} is being executed...`, request);
+
+    try {
+        // deno-lint-ignore ban-types
+        const result = await (method as Function).apply(endpoint, [
+            request,
+            endpointInfo,
+            AppAccessorsInstance.getReader(),
+            AppAccessorsInstance.getModifier(),
+            AppAccessorsInstance.getHttp(),
+            AppAccessorsInstance.getPersistence(),
+        ]);
+
+        logger?.debug(`${path}'s ${call} was successfully executed.`);
+
+        return result;
+    } catch (e) {
+        logger?.debug(`${path}'s ${call} was unsuccessful.`);
+        return new JsonRpcError(e.message || "Internal server error", -32000);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/construct.ts b/packages/apps-engine/deno-runtime/handlers/app/construct.ts
new file mode 100644
index 000000000000..798a83d0923c
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/construct.ts
@@ -0,0 +1,126 @@
+import type { IParseAppPackageResult } from '@rocket.chat/apps-engine/server/compiler/IParseAppPackageResult.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { require } from '../../lib/require.ts';
+import { sanitizeDeprecatedUsage } from '../../lib/sanitizeDeprecatedUsage.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+import { Socket } from 'node:net';
+
+const ALLOWED_NATIVE_MODULES = ['path', 'url', 'crypto', 'buffer', 'stream', 'net', 'http', 'https', 'zlib', 'util', 'punycode', 'os', 'querystring', 'fs'];
+const ALLOWED_EXTERNAL_MODULES = ['uuid'];
+
+
+function prepareEnvironment() {
+    // Deno does not behave equally to Node when it comes to piping content to a socket
+    // So we intervene here
+    const originalFinal = Socket.prototype._final;
+    Socket.prototype._final = function _final(cb) {
+        // Deno closes the readable stream in the Socket earlier than Node
+        // The exact reason for that is yet unknown, so we'll need to simply delay the execution
+        // which allows data to be read in a response
+        setTimeout(() => originalFinal.call(this, cb), 1);
+    };
+}
+
+// As the apps are bundled, the only times they will call require are
+// 1. To require native modules
+// 2. To require external npm packages we may provide
+// 3. To require apps-engine files
+function buildRequire(): (module: string) => unknown {
+    return (module: string): unknown => {
+        if (ALLOWED_NATIVE_MODULES.includes(module)) {
+            return require(`node:${module}`);
+        }
+
+        if (ALLOWED_EXTERNAL_MODULES.includes(module)) {
+            return require(`npm:${module}`);
+        }
+
+        if (module.startsWith('@rocket.chat/apps-engine')) {
+            // Our `require` function knows how to handle these
+            return require(module);
+        }
+
+        throw new Error(`Module ${module} is not allowed`);
+    };
+}
+
+function wrapAppCode(code: string): (require: (module: string) => unknown) => Promise<Record<string, unknown>> {
+    return new Function(
+        'require',
+        `
+        const { Buffer } = require('buffer');
+        const exports = {};
+        const module = { exports };
+        const _error = console.error.bind(console);
+        const _console = {
+            log: _error,
+            error: _error,
+            debug: _error,
+            info: _error,
+            warn: _error,
+        };
+
+        const result = (async (exports,module,require,Buffer,console,globalThis,Deno) => {
+            ${code};
+        })(exports,module,require,Buffer,_console,undefined,undefined);
+
+        return result.then(() => module.exports);`,
+    ) as (require: (module: string) => unknown) => Promise<Record<string, unknown>>;
+}
+
+export default async function handleConstructApp(params: unknown): Promise<boolean> {
+    if (!Array.isArray(params)) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [appPackage] = params as [IParseAppPackageResult];
+
+    if (!appPackage?.info?.id || !appPackage?.info?.classFile || !appPackage?.files) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    prepareEnvironment();
+
+    AppObjectRegistry.set('id', appPackage.info.id);
+    const source = sanitizeDeprecatedUsage(appPackage.files[appPackage.info.classFile]);
+
+    const require = buildRequire();
+    const exports = await wrapAppCode(source)(require);
+
+    // This is the same naive logic we've been using in the App Compiler
+    // Applying the correct type here is quite difficult because of the dynamic nature of the code
+    // deno-lint-ignore no-explicit-any
+    const appClass = Object.values(exports)[0] as any;
+    const logger = AppObjectRegistry.get('logger');
+
+    const app = new appClass(appPackage.info, logger, AppAccessorsInstance.getDefaultAppAccessors());
+
+    if (typeof app.getName !== 'function') {
+        throw new Error('App must contain a getName function');
+    }
+
+    if (typeof app.getNameSlug !== 'function') {
+        throw new Error('App must contain a getNameSlug function');
+    }
+
+    if (typeof app.getVersion !== 'function') {
+        throw new Error('App must contain a getVersion function');
+    }
+
+    if (typeof app.getID !== 'function') {
+        throw new Error('App must contain a getID function');
+    }
+
+    if (typeof app.getDescription !== 'function') {
+        throw new Error('App must contain a getDescription function');
+    }
+
+    if (typeof app.getRequiredApiVersion !== 'function') {
+        throw new Error('App must contain a getRequiredApiVersion function');
+    }
+
+    AppObjectRegistry.set('app', app);
+
+    return true;
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleGetStatus.ts b/packages/apps-engine/deno-runtime/handlers/app/handleGetStatus.ts
new file mode 100644
index 000000000000..5428d989812e
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleGetStatus.ts
@@ -0,0 +1,15 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+
+export default function handleGetStatus(): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.getStatus !== 'function') {
+        throw new Error('App must contain a getStatus function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    return app.getStatus();
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleInitialize.ts b/packages/apps-engine/deno-runtime/handlers/app/handleInitialize.ts
new file mode 100644
index 000000000000..ad90d3b01e25
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleInitialize.ts
@@ -0,0 +1,19 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default async function handleInitialize(): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.initialize !== 'function') {
+        throw new Error('App must contain an initialize function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    await app.initialize(AppAccessorsInstance.getConfigurationExtend(), AppAccessorsInstance.getEnvironmentRead());
+
+    return true;
+}
+
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnDisable.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnDisable.ts
new file mode 100644
index 000000000000..e66c2414fd0a
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnDisable.ts
@@ -0,0 +1,19 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default async function handleOnDisable(): Promise<boolean> {
+  const app = AppObjectRegistry.get<App>('app');
+
+  if (typeof app?.onDisable !== 'function') {
+    throw new Error('App must contain an onDisable function', {
+      cause: 'invalid_app',
+    });
+  }
+
+  await app.onDisable(AppAccessorsInstance.getConfigurationModify());
+
+  return true;
+}
+
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnEnable.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnEnable.ts
new file mode 100644
index 000000000000..1bdf84476422
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnEnable.ts
@@ -0,0 +1,16 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default function handleOnEnable(): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.onEnable !== 'function') {
+        throw new Error('App must contain an onEnable function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    return app.onEnable(AppAccessorsInstance.getEnvironmentRead(), AppAccessorsInstance.getConfigurationModify());
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnInstall.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnInstall.ts
new file mode 100644
index 000000000000..aebf7628a914
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnInstall.ts
@@ -0,0 +1,30 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default async function handleOnInstall(params: unknown): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.onInstall !== 'function') {
+        throw new Error('App must contain an onInstall function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    if (!Array.isArray(params)) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [context] = params as [Record<string, unknown>];
+
+    await app.onInstall(
+        context,
+        AppAccessorsInstance.getReader(),
+        AppAccessorsInstance.getHttp(),
+        AppAccessorsInstance.getPersistence(),
+        AppAccessorsInstance.getModifier(),
+    );
+
+    return true;
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnPreSettingUpdate.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnPreSettingUpdate.ts
new file mode 100644
index 000000000000..19646fa6704f
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnPreSettingUpdate.ts
@@ -0,0 +1,22 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default function handleOnPreSettingUpdate(params: unknown): Promise<object> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.onPreSettingUpdate !== 'function') {
+        throw new Error('App must contain an onPreSettingUpdate function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    if (!Array.isArray(params)) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [setting] = params as [Record<string, unknown>];
+
+    return app.onPreSettingUpdate(setting, AppAccessorsInstance.getConfigurationModify(), AppAccessorsInstance.getReader(), AppAccessorsInstance.getHttp());
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnSettingUpdated.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnSettingUpdated.ts
new file mode 100644
index 000000000000..07084bc22425
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnSettingUpdated.ts
@@ -0,0 +1,24 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default async function handleOnSettingUpdated(params: unknown): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.onSettingUpdated !== 'function') {
+        throw new Error('App must contain an onSettingUpdated function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    if (!Array.isArray(params)) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [setting] = params as [Record<string, unknown>];
+
+    await app.onSettingUpdated(setting, AppAccessorsInstance.getConfigurationModify(), AppAccessorsInstance.getReader(), AppAccessorsInstance.getHttp());
+
+    return true;
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnUninstall.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnUninstall.ts
new file mode 100644
index 000000000000..865819728ca4
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnUninstall.ts
@@ -0,0 +1,30 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default async function handleOnUninstall(params: unknown): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.onUninstall !== 'function') {
+        throw new Error('App must contain an onUninstall function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    if (!Array.isArray(params)) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [context] = params as [Record<string, unknown>];
+
+    await app.onUninstall(
+        context,
+        AppAccessorsInstance.getReader(),
+        AppAccessorsInstance.getHttp(),
+        AppAccessorsInstance.getPersistence(),
+        AppAccessorsInstance.getModifier(),
+    );
+
+    return true;
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleOnUpdate.ts b/packages/apps-engine/deno-runtime/handlers/app/handleOnUpdate.ts
new file mode 100644
index 000000000000..f21e4f947d5d
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleOnUpdate.ts
@@ -0,0 +1,30 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export default async function handleOnUpdate(params: unknown): Promise<boolean> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (typeof app?.onUpdate !== 'function') {
+        throw new Error('App must contain an onUpdate function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    if (!Array.isArray(params)) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [context] = params as [Record<string, unknown>];
+
+    await app.onUpdate(
+        context,
+        AppAccessorsInstance.getReader(),
+        AppAccessorsInstance.getHttp(),
+        AppAccessorsInstance.getPersistence(),
+        AppAccessorsInstance.getModifier(),
+    );
+
+    return true;
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handleSetStatus.ts b/packages/apps-engine/deno-runtime/handlers/app/handleSetStatus.ts
new file mode 100644
index 000000000000..c39ab2a16d62
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handleSetStatus.ts
@@ -0,0 +1,29 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+import type { AppStatus as _AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { require } from '../../lib/require.ts';
+
+const { AppStatus } = require('@rocket.chat/apps-engine/definition/AppStatus.js') as {
+    AppStatus: typeof _AppStatus;
+};
+
+export default async function handleSetStatus(params: unknown): Promise<null> {
+    if (!Array.isArray(params) || !Object.values(AppStatus).includes(params[0])) {
+        throw new Error('Invalid params', { cause: 'invalid_param_type' });
+    }
+
+    const [status] = params as [typeof AppStatus];
+
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (!app || typeof app['setStatus'] !== 'function') {
+        throw new Error('App must contain a setStatus function', {
+            cause: 'invalid_app',
+        });
+    }
+
+    await app['setStatus'](status);
+
+    return null;
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/app/handler.ts b/packages/apps-engine/deno-runtime/handlers/app/handler.ts
new file mode 100644
index 000000000000..2a44f34cb7fe
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/app/handler.ts
@@ -0,0 +1,112 @@
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+
+import handleConstructApp from './construct.ts';
+import handleInitialize from './handleInitialize.ts';
+import handleGetStatus from './handleGetStatus.ts';
+import handleSetStatus from './handleSetStatus.ts';
+import handleOnEnable from './handleOnEnable.ts';
+import handleOnInstall from './handleOnInstall.ts';
+import handleOnDisable from './handleOnDisable.ts';
+import handleOnUninstall from './handleOnUninstall.ts';
+import handleOnPreSettingUpdate from './handleOnPreSettingUpdate.ts';
+import handleOnSettingUpdated from './handleOnSettingUpdated.ts';
+import handleListener from '../listener/handler.ts';
+import handleUIKitInteraction, { uikitInteractions } from '../uikit/handler.ts';
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import handleOnUpdate from './handleOnUpdate.ts';
+
+export default async function handleApp(method: string, params: unknown): Promise<Defined | JsonRpcError> {
+    const [, appMethod] = method.split(':');
+
+    // We don't want the getStatus method to generate logs, so we handle it separately
+    if (appMethod === 'getStatus') {
+        return handleGetStatus();
+    }
+
+    // `app` will be undefined if the method here is "app:construct"
+    const app = AppObjectRegistry.get<App>('app');
+
+    app?.getLogger().debug(`'${appMethod}' is being called...`);
+
+    if (uikitInteractions.includes(appMethod)) {
+        return handleUIKitInteraction(appMethod, params).then((result) => {
+            if (result instanceof JsonRpcError) {
+                app?.getLogger().debug(`'${appMethod}' was unsuccessful.`, result.message);
+            } else {
+                app?.getLogger().debug(`'${appMethod}' was successfully called! The result is:`, result);
+            }
+
+            return result;
+        });
+    }
+
+    if (appMethod.startsWith('check') || appMethod.startsWith('execute')) {
+        return handleListener(appMethod, params).then((result) => {
+            if (result instanceof JsonRpcError) {
+                app?.getLogger().debug(`'${appMethod}' was unsuccessful.`, result.message);
+            } else {
+                app?.getLogger().debug(`'${appMethod}' was successfully called! The result is:`, result);
+            }
+
+            return result;
+        });
+    }
+
+    try {
+        let result: Defined | JsonRpcError;
+
+        switch (appMethod) {
+            case 'construct':
+                result = await handleConstructApp(params);
+                break;
+            case 'initialize':
+                result = await handleInitialize();
+                break;
+            case 'setStatus':
+                result = await handleSetStatus(params);
+                break;
+            case 'onEnable':
+                result = await handleOnEnable();
+                break;
+            case 'onDisable':
+                result = await handleOnDisable();
+                break;
+            case 'onInstall':
+                result = await handleOnInstall(params);
+                break;
+            case 'onUninstall':
+                result = await handleOnUninstall(params);
+                break;
+            case 'onPreSettingUpdate':
+                result = await handleOnPreSettingUpdate(params);
+                break;
+            case 'onSettingUpdated':
+                result = await handleOnSettingUpdated(params);
+                break;
+            case 'onUpdate':
+                result = await handleOnUpdate(params);
+                break;
+            default:
+                throw new JsonRpcError('Method not found', -32601);
+        }
+
+        app?.getLogger().debug(`'${appMethod}' was successfully called! The result is:`, result);
+
+        return result;
+    } catch (e: unknown) {
+        if (!(e instanceof Error)) {
+            return new JsonRpcError('Unknown error', -32000, e);
+        }
+
+        if ((e.cause as string)?.includes('invalid_param_type')) {
+            return JsonRpcError.invalidParams(null);
+        }
+
+        if ((e.cause as string)?.includes('invalid_app')) {
+            return JsonRpcError.internalError({ message: 'App unavailable' });
+        }
+
+        return new JsonRpcError(e.message, -32000, e);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/listener/handler.ts b/packages/apps-engine/deno-runtime/handlers/listener/handler.ts
new file mode 100644
index 000000000000..1e6de20538fc
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/listener/handler.ts
@@ -0,0 +1,150 @@
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { AppsEngineException as _AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions/AppsEngineException.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { MessageExtender } from '../../lib/accessors/extenders/MessageExtender.ts';
+import { RoomExtender } from '../../lib/accessors/extenders/RoomExtender.ts';
+import { MessageBuilder } from '../../lib/accessors/builders/MessageBuilder.ts';
+import { RoomBuilder } from '../../lib/accessors/builders/RoomBuilder.ts';
+import { AppAccessors, AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+import { require } from '../../lib/require.ts';
+import createRoom from '../../lib/roomFactory.ts';
+import { Room } from "../../lib/room.ts";
+
+const { AppsEngineException } = require('@rocket.chat/apps-engine/definition/exceptions/AppsEngineException.js') as {
+    AppsEngineException: typeof _AppsEngineException;
+};
+
+export default async function handleListener(evtInterface: string, params: unknown): Promise<Defined | JsonRpcError> {
+    const app = AppObjectRegistry.get<App>('app');
+
+    const eventExecutor = app?.[evtInterface as keyof App];
+
+    if (typeof eventExecutor !== 'function') {
+        return JsonRpcError.methodNotFound({
+            message: 'Invalid event interface called on app',
+        });
+    }
+
+    if (!Array.isArray(params) || params.length < 1 || params.length > 2) {
+        return JsonRpcError.invalidParams(null);
+    }
+
+    try {
+        const args = parseArgs({ AppAccessorsInstance }, evtInterface, params);
+        return await (eventExecutor as (...args: unknown[]) => Promise<Defined>).apply(app, args);
+    } catch (e) {
+        if (e instanceof JsonRpcError) {
+            return e;
+        }
+
+        if (e instanceof AppsEngineException) {
+            return new JsonRpcError(e.message, AppsEngineException.JSONRPC_ERROR_CODE, { name: e.name });
+        }
+
+        return JsonRpcError.internalError({ message: e.message });
+    }
+
+}
+
+export function parseArgs(deps: { AppAccessorsInstance: AppAccessors }, evtMethod: string, params: unknown[]): unknown[] {
+    const { AppAccessorsInstance } = deps;
+    /**
+     * param1 is the context for the event handler execution
+     * param2 is an optional extra content that some hanlers require
+     */
+    const [param1, param2] = params as [unknown, unknown];
+
+    if (!param1) {
+        throw JsonRpcError.invalidParams(null);
+    }
+
+    let context = param1;
+
+    if (evtMethod.includes('Message')) {
+        context = hydrateMessageObjects(context) as Record<string, unknown>;
+    } else if (evtMethod.endsWith('RoomUserJoined') || evtMethod.endsWith('RoomUserLeave')) {
+        (context as Record<string, unknown>).room = createRoom((context as Record<string, unknown>).room as IRoom, AppAccessorsInstance.getSenderFn());
+    } else if (evtMethod.includes('PreRoom')) {
+        context = createRoom(context as IRoom, AppAccessorsInstance.getSenderFn());
+    }
+
+    const args: unknown[] = [context, AppAccessorsInstance.getReader(), AppAccessorsInstance.getHttp()];
+
+    // "check" events will only go this far - (context, reader, http)
+    if (evtMethod.startsWith('check')) {
+        // "checkPostMessageDeleted" has an extra param - (context, reader, http, extraContext)
+        if (param2) {
+            args.push(hydrateMessageObjects(param2));
+        }
+
+        return args;
+    }
+
+    // From this point on, all events will require (reader, http, persistence) injected
+    args.push(AppAccessorsInstance.getPersistence());
+
+    // "extend" events have an additional "Extender" param - (context, extender, reader, http, persistence)
+    if (evtMethod.endsWith('Extend')) {
+        if (evtMethod.includes('Message')) {
+            args.splice(1, 0, new MessageExtender(param1 as IMessage));
+        } else if (evtMethod.includes('Room')) {
+            args.splice(1, 0, new RoomExtender(param1 as IRoom));
+        }
+
+        return args;
+    }
+
+    // "Modify" events have an additional "Builder" param - (context, builder, reader, http, persistence)
+    if (evtMethod.endsWith('Modify')) {
+        if (evtMethod.includes('Message')) {
+            args.splice(1, 0, new MessageBuilder(param1 as IMessage));
+        } else if (evtMethod.includes('Room')) {
+            args.splice(1, 0, new RoomBuilder(param1 as IRoom));
+        }
+
+        return args;
+    }
+
+    // From this point on, all events will require (reader, http, persistence, modifier) injected
+    args.push(AppAccessorsInstance.getModifier());
+
+    // This guy gets an extra one
+    if (evtMethod === 'executePostMessageDeleted') {
+        if (!param2) {
+            throw JsonRpcError.invalidParams(null);
+        }
+
+        args.push(hydrateMessageObjects(param2));
+    }
+
+    return args;
+}
+
+/**
+ * Hydrate the context object with the correct IMessage
+ *
+ * Some information is lost upon serializing the data from listeners through the pipes,
+ * so here we hydrate the complete object as necessary
+ */
+function hydrateMessageObjects(context: unknown): unknown {
+    if (objectIsRawMessage(context)) {
+        context.room = createRoom(context.room as IRoom, AppAccessorsInstance.getSenderFn());
+    } else if ((context as Record<string, unknown>)?.message) {
+        (context as Record<string, unknown>).message = hydrateMessageObjects((context as Record<string, unknown>).message);
+    }
+
+    return context;
+}
+
+function objectIsRawMessage(value: unknown): value is IMessage {
+    if (!value) return false;
+
+    const { id, room, sender, createdAt } = value as Record<string, unknown>;
+
+    // Check if we have the fields of a message and the room hasn't already been hydrated
+    return !!(id && room && sender && createdAt) && !(room instanceof Room);
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/scheduler-handler.ts b/packages/apps-engine/deno-runtime/handlers/scheduler-handler.ts
new file mode 100644
index 000000000000..0145034957f2
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/scheduler-handler.ts
@@ -0,0 +1,51 @@
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+import type { IProcessor } from '@rocket.chat/apps-engine/definition/scheduler/IProcessor.ts';
+
+import { AppObjectRegistry } from '../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../lib/accessors/mod.ts';
+
+export default async function handleScheduler(method: string, params: unknown): Promise<Defined | JsonRpcError> {
+    const [, processorId] = method.split(':');
+    if (!Array.isArray(params)) {
+        return JsonRpcError.invalidParams({ message: 'Invalid params' });
+    }
+
+    const [context] = params as [Record<string, unknown>];
+
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (!app) {
+        return JsonRpcError.internalError({ message: 'App not found' });
+    }
+
+    // AppSchedulerManager will append the appId to the processor name to avoid conflicts
+    const processor = AppObjectRegistry.get<IProcessor>(`scheduler:${processorId}`);
+
+    if (!processor) {
+        return JsonRpcError.methodNotFound({
+            message: `Could not find processor for method ${method}`,
+        });
+    }
+
+    app.getLogger().debug(`Job processor ${processor.id} is being executed...`);
+
+    try {
+        await processor.processor(
+            context,
+            AppAccessorsInstance.getReader(),
+            AppAccessorsInstance.getModifier(),
+            AppAccessorsInstance.getHttp(),
+            AppAccessorsInstance.getPersistence(),
+        );
+
+        app.getLogger().debug(`Job processor ${processor.id} was successfully executed`);
+
+        return null;
+    } catch (e) {
+        app.getLogger().error(e);
+        app.getLogger().error(`Job processor ${processor.id} was unsuccessful`);
+
+        return JsonRpcError.internalError({ message: e.message });
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/slashcommand-handler.ts b/packages/apps-engine/deno-runtime/handlers/slashcommand-handler.ts
new file mode 100644
index 000000000000..cfebf0d1460e
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/slashcommand-handler.ts
@@ -0,0 +1,122 @@
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+
+import type { App } from "@rocket.chat/apps-engine/definition/App.ts";
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { ISlashCommand } from '@rocket.chat/apps-engine/definition/slashcommands/ISlashCommand.ts';
+import type { SlashCommandContext as _SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands/SlashCommandContext.ts';
+import type { Room as _Room } from '@rocket.chat/apps-engine/server/rooms/Room.ts';
+
+import { AppObjectRegistry } from '../AppObjectRegistry.ts';
+import { AppAccessors, AppAccessorsInstance } from '../lib/accessors/mod.ts';
+import { require } from '../lib/require.ts';
+import createRoom from '../lib/roomFactory.ts';
+
+// For some reason Deno couldn't understand the typecast to the original interfaces and said it wasn't a constructor type
+const { SlashCommandContext } = require('@rocket.chat/apps-engine/definition/slashcommands/SlashCommandContext.js') as {
+    SlashCommandContext: typeof _SlashCommandContext;
+};
+
+export default async function slashCommandHandler(call: string, params: unknown): Promise<JsonRpcError | Defined> {
+    const [, commandName, method] = call.split(':');
+
+    const command = AppObjectRegistry.get<ISlashCommand>(`slashcommand:${commandName}`);
+
+    if (!command) {
+        return new JsonRpcError(`Slashcommand ${commandName} not found`, -32000);
+    }
+
+    let result: Awaited<ReturnType<typeof handleExecutor>> | Awaited<ReturnType<typeof handlePreviewItem>>;
+
+    // If the command is registered, we're pretty safe to assume the app is not undefined
+    const app = AppObjectRegistry.get<App>('app')!;
+
+    app.getLogger().debug(`${commandName}'s ${method} is being executed...`, params);
+
+    try {
+        if (method === 'executor' || method === 'previewer') {
+            result = await handleExecutor({ AppAccessorsInstance }, command, method, params);
+        } else if (method === 'executePreviewItem') {
+            result = await handlePreviewItem({ AppAccessorsInstance }, command, params);
+        } else {
+            return new JsonRpcError(`Method ${method} not found on slashcommand ${commandName}`, -32000);
+        }
+
+        app.getLogger().debug(`${commandName}'s ${method} was successfully executed.`);
+    } catch (error) {
+        app.getLogger().debug(`${commandName}'s ${method} was unsuccessful.`);
+
+        return new JsonRpcError(error.message, -32000);
+    }
+
+    return result;
+}
+
+/**
+ * @param deps Dependencies that need to be injected into the slashcommand
+ * @param command The slashcommand that is being executed
+ * @param method The method that is being executed
+ * @param params The parameters that are being passed to the method
+ */
+export function handleExecutor(deps: { AppAccessorsInstance: AppAccessors }, command: ISlashCommand, method: 'executor' | 'previewer', params: unknown) {
+    const executor = command[method];
+
+    if (typeof executor !== 'function') {
+        throw new Error(`Method ${method} not found on slashcommand ${command.command}`);
+    }
+
+    if (!Array.isArray(params) || typeof params[0] !== 'object' || !params[0]) {
+        throw new Error(`First parameter must be an object`);
+    }
+
+    const { sender, room, params: args, threadId, triggerId } = params[0] as Record<string, unknown>;
+
+    const context = new SlashCommandContext(
+        sender as _SlashCommandContext['sender'],
+        createRoom(room as IRoom, deps.AppAccessorsInstance.getSenderFn()),
+        args as _SlashCommandContext['params'],
+        threadId as _SlashCommandContext['threadId'],
+        triggerId as _SlashCommandContext['triggerId'],
+    );
+
+    return executor.apply(command, [
+        context,
+        deps.AppAccessorsInstance.getReader(),
+        deps.AppAccessorsInstance.getModifier(),
+        deps.AppAccessorsInstance.getHttp(),
+        deps.AppAccessorsInstance.getPersistence(),
+    ]);
+}
+
+/**
+ * @param deps Dependencies that need to be injected into the slashcommand
+ * @param command The slashcommand that is being executed
+ * @param params The parameters that are being passed to the method
+ */
+export function handlePreviewItem(deps: { AppAccessorsInstance: AppAccessors }, command: ISlashCommand, params: unknown) {
+    if (typeof command.executePreviewItem !== 'function') {
+        throw new Error(`Method  not found on slashcommand ${command.command}`);
+    }
+
+    if (!Array.isArray(params) || typeof params[0] !== 'object' || !params[0]) {
+        throw new Error(`First parameter must be an object`);
+    }
+
+    const [previewItem, { sender, room, params: args, threadId, triggerId }] = params as [Record<string, unknown>, Record<string, unknown>];
+
+    const context = new SlashCommandContext(
+        sender as _SlashCommandContext['sender'],
+        createRoom(room as IRoom, deps.AppAccessorsInstance.getSenderFn()),
+        args as _SlashCommandContext['params'],
+        threadId as _SlashCommandContext['threadId'],
+        triggerId as _SlashCommandContext['triggerId'],
+    );
+
+    return command.executePreviewItem(
+        previewItem,
+        context,
+        deps.AppAccessorsInstance.getReader(),
+        deps.AppAccessorsInstance.getModifier(),
+        deps.AppAccessorsInstance.getHttp(),
+        deps.AppAccessorsInstance.getPersistence(),
+    );
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/tests/api-handler.test.ts b/packages/apps-engine/deno-runtime/handlers/tests/api-handler.test.ts
new file mode 100644
index 000000000000..a3789f755542
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/tests/api-handler.test.ts
@@ -0,0 +1,79 @@
+// deno-lint-ignore-file no-explicit-any
+import { assertEquals, assertObjectMatch } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { spy } from "https://deno.land/std@0.203.0/testing/mock.ts";
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { assertInstanceOf } from "https://deno.land/std@0.203.0/assert/assert_instance_of.ts";
+import { JsonRpcError } from "jsonrpc-lite";
+import type { IApiEndpoint } from "@rocket.chat/apps-engine/definition/api/IApiEndpoint.ts";
+import apiHandler from "../api-handler.ts";
+
+describe('handlers > api', () => {
+    const mockEndpoint: IApiEndpoint = {
+        path: '/test',
+        // deno-lint-ignore no-unused-vars
+        get: (request: any, endpoint: any, read: any, modify: any, http: any, persis: any) => Promise.resolve('ok'),
+        // deno-lint-ignore no-unused-vars
+        post: (request: any, endpoint: any, read: any, modify: any, http: any, persis: any) => Promise.resolve('ok'),
+        // deno-lint-ignore no-unused-vars
+        put: (request: any, endpoint: any, read: any, modify: any, http: any, persis: any) => { throw new Error('Method execution error example') },
+    }
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('api:/test', mockEndpoint);
+    });
+
+    it('correctly handles execution of an api endpoint method GET', async () => {
+        const _spy = spy(mockEndpoint, 'get');
+        
+        const result = await apiHandler('api:/test:get', ['request', 'endpointInfo']);
+
+        assertEquals(result, 'ok');
+        assertEquals(_spy.calls[0].args.length, 6);
+        assertEquals(_spy.calls[0].args[0], 'request');
+        assertEquals(_spy.calls[0].args[1], 'endpointInfo');
+    });
+
+    it('correctly handles execution of an api endpoint method POST', async () => {
+        const _spy = spy(mockEndpoint, 'post');
+        
+        const result = await apiHandler('api:/test:post', ['request', 'endpointInfo']);
+
+        assertEquals(result, 'ok');
+        assertEquals(_spy.calls[0].args.length, 6);
+        assertEquals(_spy.calls[0].args[0], 'request');
+        assertEquals(_spy.calls[0].args[1], 'endpointInfo');
+    });
+
+    it('correctly handles an error if the method not exists for the selected endpoint', async () => {
+        const result = await apiHandler(`api:/test:delete`, ['request', 'endpointInfo']);
+
+        assertInstanceOf(result, JsonRpcError)
+        assertObjectMatch(result, {
+            message: `/test's delete not exists`,
+            code: -32000
+        })
+    });
+
+    it('correctly handles an error if endpoint not exists', async () => {
+        const result = await apiHandler(`api:/error:get`, ['request', 'endpointInfo']);
+
+        assertInstanceOf(result, JsonRpcError)
+        assertObjectMatch(result, {
+            message: `Endpoint /error not found`,
+            code: -32000
+        })
+    });
+
+    it('correctly handles an error if the method execution fails', async () => {
+        const result = await apiHandler(`api:/test:put`, ['request', 'endpointInfo']);
+
+        assertInstanceOf(result, JsonRpcError)
+        assertObjectMatch(result, {
+            message: `Method execution error example`,
+            code: -32000
+        })
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/handlers/tests/listener-handler.test.ts b/packages/apps-engine/deno-runtime/handlers/tests/listener-handler.test.ts
new file mode 100644
index 000000000000..3e3663b06d22
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/tests/listener-handler.test.ts
@@ -0,0 +1,234 @@
+// deno-lint-ignore-file no-explicit-any
+import { assertEquals, assertInstanceOf, assertObjectMatch } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+
+import { parseArgs } from '../listener/handler.ts';
+import { AppAccessors } from '../../lib/accessors/mod.ts';
+import { Room } from '../../lib/room.ts';
+import { MessageExtender } from '../../lib/accessors/extenders/MessageExtender.ts';
+import { RoomExtender } from '../../lib/accessors/extenders/RoomExtender.ts';
+import { MessageBuilder } from '../../lib/accessors/builders/MessageBuilder.ts';
+import { RoomBuilder } from '../../lib/accessors/builders/RoomBuilder.ts';
+
+describe('handlers > listeners', () => {
+    const mockAppAccessors = {
+        getReader: () => ({ __type: 'reader' }),
+        getHttp: () => ({ __type: 'http' }),
+        getModifier: () => ({ __type: 'modifier' }),
+        getPersistence: () => ({ __type: 'persistence' }),
+        getSenderFn: () => (id: string) => Promise.resolve([{ __type: 'bridgeCall' }, { id }]),
+    } as unknown as AppAccessors;
+
+    it('correctly parses the arguments for a request to trigger the "checkPreMessageSentPrevent" method', () => {
+        const evtMethod = 'checkPreMessageSentPrevent';
+        // For the 'checkPreMessageSentPrevent' method, the context will be a message in a real scenario
+        const evtArgs = [{ __type: 'context' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 3);
+        assertEquals(params[0], { __type: 'context' });
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "checkPostMessageDeleted" method', () => {
+        const evtMethod = 'checkPostMessageDeleted';
+        // For the 'checkPostMessageDeleted' method, the context will be a message in a real scenario,
+        // and the extraContext will provide further information such the user who deleted the message
+        const evtArgs = [{ __type: 'context' }, { __type: 'extraContext' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 4);
+        assertEquals(params[0], { __type: 'context' });
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+        assertEquals(params[3], { __type: 'extraContext' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "checkPreRoomCreateExtend" method', () => {
+        const evtMethod = 'checkPreRoomCreateExtend';
+        // For the 'checkPreRoomCreateExtend' method, the context will be a room in a real scenario
+        const evtArgs = [
+            {
+                id: 'fake',
+                type: 'fake',
+                slugifiedName: 'fake',
+                creator: 'fake',
+                createdAt: Date.now(),
+            },
+        ];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 3);
+
+        assertInstanceOf(params[0], Room);
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePreMessageSentExtend" method', () => {
+        const evtMethod = 'executePreMessageSentExtend';
+        // For the 'executePreMessageSentExtend' method, the context will be a message in a real scenario
+        const evtArgs = [{ __type: 'context' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        // Instantiating the MessageExtender might modify the original object, so we need to assert it matches instead of equals
+        assertObjectMatch(params[0] as Record<string, unknown>, {
+            __type: 'context',
+        });
+        assertInstanceOf(params[1], MessageExtender);
+        assertEquals(params[2], { __type: 'reader' });
+        assertEquals(params[3], { __type: 'http' });
+        assertEquals(params[4], { __type: 'persistence' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePreRoomCreateExtend" method', () => {
+        const evtMethod = 'executePreRoomCreateExtend';
+        // For the 'executePreRoomCreateExtend' method, the context will be a room in a real scenario
+        const evtArgs = [{ __type: 'context' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        // Instantiating the RoomExtender might modify the original object, so we need to assert it matches instead of equals
+        assertObjectMatch(params[0] as Record<string, unknown>, {
+            __type: 'context',
+        });
+        assertInstanceOf(params[1], RoomExtender);
+        assertEquals(params[2], { __type: 'reader' });
+        assertEquals(params[3], { __type: 'http' });
+        assertEquals(params[4], { __type: 'persistence' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePreMessageSentModify" method', () => {
+        const evtMethod = 'executePreMessageSentModify';
+        // For the 'executePreMessageSentModify' method, the context will be a message in a real scenario
+        const evtArgs = [{ __type: 'context' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        // Instantiating the MessageBuilder might modify the original object, so we need to assert it matches instead of equals
+        assertObjectMatch(params[0] as Record<string, unknown>, {
+            __type: 'context',
+        });
+        assertInstanceOf(params[1], MessageBuilder);
+        assertEquals(params[2], { __type: 'reader' });
+        assertEquals(params[3], { __type: 'http' });
+        assertEquals(params[4], { __type: 'persistence' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePreRoomCreateModify" method', () => {
+        const evtMethod = 'executePreRoomCreateModify';
+        // For the 'executePreRoomCreateModify' method, the context will be a room in a real scenario
+        const evtArgs = [{ __type: 'context' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        // Instantiating the RoomBuilder might modify the original object, so we need to assert it matches instead of equals
+        assertObjectMatch(params[0] as Record<string, unknown>, {
+            __type: 'context',
+        });
+        assertInstanceOf(params[1], RoomBuilder);
+        assertEquals(params[2], { __type: 'reader' });
+        assertEquals(params[3], { __type: 'http' });
+        assertEquals(params[4], { __type: 'persistence' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePostRoomUserJoined" method', () => {
+        const evtMethod = 'executePostRoomUserJoined';
+        // For the 'executePostRoomUserJoined' method, the context will be a room in a real scenario
+        const room = {
+            id: 'fake',
+            type: 'fake',
+            slugifiedName: 'fake',
+            creator: 'fake',
+            createdAt: Date.now(),
+        };
+
+        const evtArgs = [{ __type: 'context', room }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        assertInstanceOf((params[0] as any).room, Room);
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+        assertEquals(params[3], { __type: 'persistence' });
+        assertEquals(params[4], { __type: 'modifier' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePostRoomUserLeave" method', () => {
+        const evtMethod = 'executePostRoomUserLeave';
+        // For the 'executePostRoomUserLeave' method, the context will be a room in a real scenario
+        const room = {
+            id: 'fake',
+            type: 'fake',
+            slugifiedName: 'fake',
+            creator: 'fake',
+            createdAt: Date.now(),
+        };
+
+        const evtArgs = [{ __type: 'context', room }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        assertInstanceOf((params[0] as any).room, Room);
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+        assertEquals(params[3], { __type: 'persistence' });
+        assertEquals(params[4], { __type: 'modifier' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePostMessageDeleted" method', () => {
+        const evtMethod = 'executePostMessageDeleted';
+        // For the 'executePostMessageDeleted' method, the context will be a message in a real scenario
+        const evtArgs = [{ __type: 'context' }, { __type: 'extraContext' }];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 6);
+        assertEquals(params[0], { __type: 'context' });
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+        assertEquals(params[3], { __type: 'persistence' });
+        assertEquals(params[4], { __type: 'modifier' });
+        assertEquals(params[5], { __type: 'extraContext' });
+    });
+
+    it('correctly parses the arguments for a request to trigger the "executePostMessageSent" method', () => {
+        const evtMethod = 'executePostMessageSent';
+        // For the 'executePostMessageDeleted' method, the context will be a message in a real scenario
+        const evtArgs = [
+            {
+                id: 'fake',
+                sender: 'fake',
+                createdAt: Date.now(),
+                room: {
+                    id: 'fake-room',
+                    type: 'fake',
+                    slugifiedName: 'fake',
+                    creator: 'fake',
+                    createdAt: Date.now(),
+                },
+            },
+        ];
+
+        const params = parseArgs({ AppAccessorsInstance: mockAppAccessors }, evtMethod, evtArgs);
+
+        assertEquals(params.length, 5);
+        assertObjectMatch((params[0] as Record<string, unknown>), { id: 'fake' });
+        assertInstanceOf((params[0] as any).room, Room);
+        assertEquals(params[1], { __type: 'reader' });
+        assertEquals(params[2], { __type: 'http' });
+        assertEquals(params[3], { __type: 'persistence' });
+        assertEquals(params[4], { __type: 'modifier' });
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/handlers/tests/scheduler-handler.test.ts b/packages/apps-engine/deno-runtime/handlers/tests/scheduler-handler.test.ts
new file mode 100644
index 000000000000..681f228bdb3e
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/tests/scheduler-handler.test.ts
@@ -0,0 +1,46 @@
+import { assertEquals } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessors } from '../../lib/accessors/mod.ts';
+import handleScheduler from '../scheduler-handler.ts';
+
+describe('handlers > scheduler', () => {
+    const mockAppAccessors = new AppAccessors(() =>
+        Promise.resolve({
+            id: 'mockId',
+            result: {},
+            jsonrpc: '2.0',
+            serialize: () => '',
+        }),
+    );
+
+    const mockApp = {
+        getID: () => 'mockApp',
+        getLogger: () => ({
+            debug: () => {},
+            error: () => {},
+        }),
+    };
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('app', mockApp);
+        mockAppAccessors.getConfigurationExtend().scheduler.registerProcessors([
+            {
+                id: 'mockId',
+                processor: () => Promise.resolve('it works!'),
+            },
+        ]);
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+    });
+
+    it('correctly executes a request to a processor', async () => {
+        const result = await handleScheduler('scheduler:mockId', [{}]);
+
+        assertEquals(result, null);
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/handlers/tests/slashcommand-handler.test.ts b/packages/apps-engine/deno-runtime/handlers/tests/slashcommand-handler.test.ts
new file mode 100644
index 000000000000..d3da4b132d66
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/tests/slashcommand-handler.test.ts
@@ -0,0 +1,152 @@
+// deno-lint-ignore-file no-explicit-any
+import { assertEquals, assertInstanceOf } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessors } from '../../lib/accessors/mod.ts';
+import { handleExecutor, handlePreviewItem } from '../slashcommand-handler.ts';
+import { Room } from "../../lib/room.ts";
+
+describe('handlers > slashcommand', () => {
+    const mockAppAccessors = {
+        getReader: () => ({ __type: 'reader' }),
+        getHttp: () => ({ __type: 'http' }),
+        getModifier: () => ({ __type: 'modifier' }),
+        getPersistence: () => ({ __type: 'persistence' }),
+        getSenderFn: () => (id: string) => Promise.resolve([{ __type: 'bridgeCall' }, { id }]),
+    } as unknown as AppAccessors;
+
+    const mockCommandExecutorOnly = {
+        command: 'executor-only',
+        i18nParamsExample: 'test',
+        i18nDescription: 'test',
+        providesPreview: false,
+        // deno-lint-ignore no-unused-vars
+        async executor(context: any, read: any, modify: any, http: any, persis: any): Promise<void> {},
+    };
+
+    const mockCommandExecutorAndPreview = {
+        command: 'executor-and-preview',
+        i18nParamsExample: 'test',
+        i18nDescription: 'test',
+        providesPreview: true,
+        // deno-lint-ignore no-unused-vars
+        async executor(context: any, read: any, modify: any, http: any, persis: any): Promise<void> {},
+        // deno-lint-ignore no-unused-vars
+        async previewer(context: any, read: any, modify: any, http: any, persis: any): Promise<void> {},
+        // deno-lint-ignore no-unused-vars
+        async executePreviewItem(previewItem: any, context: any, read: any, modify: any, http: any, persis: any): Promise<void> {},
+    };
+
+    const mockCommandPreviewWithNoExecutor = {
+        command: 'preview-with-no-executor',
+        i18nParamsExample: 'test',
+        i18nDescription: 'test',
+        providesPreview: true,
+        // deno-lint-ignore no-unused-vars
+        async previewer(context: any, read: any, modify: any, http: any, persis: any): Promise<void> {},
+        // deno-lint-ignore no-unused-vars
+        async executePreviewItem(previewItem: any, context: any, read: any, modify: any, http: any, persis: any): Promise<void> {},
+    };
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('slashcommand:executor-only', mockCommandExecutorOnly);
+        AppObjectRegistry.set('slashcommand:executor-and-preview', mockCommandExecutorAndPreview);
+        AppObjectRegistry.set('slashcommand:preview-with-no-executor', mockCommandPreviewWithNoExecutor);
+    });
+
+    it('correctly handles execution of a slash command', async () => {
+        const mockContext = {
+            sender: { __type: 'sender' },
+            room: { __type: 'room' },
+            params: { __type: 'params' },
+            threadId: 'threadId',
+            triggerId: 'triggerId',
+        };
+
+        const _spy = spy(mockCommandExecutorOnly, 'executor');
+
+        await handleExecutor({ AppAccessorsInstance: mockAppAccessors }, mockCommandExecutorOnly, 'executor', [mockContext]);
+
+        const context = _spy.calls[0].args[0];
+
+        assertInstanceOf(context.getRoom(), Room);
+        assertEquals(context.getSender(), { __type: 'sender' });
+        assertEquals(context.getArguments(), { __type: 'params' });
+        assertEquals(context.getThreadId(), 'threadId');
+        assertEquals(context.getTriggerId(), 'triggerId');
+
+        assertEquals(_spy.calls[0].args[1], mockAppAccessors.getReader());
+        assertEquals(_spy.calls[0].args[2], mockAppAccessors.getModifier());
+        assertEquals(_spy.calls[0].args[3], mockAppAccessors.getHttp());
+        assertEquals(_spy.calls[0].args[4], mockAppAccessors.getPersistence());
+
+        _spy.restore();
+    });
+
+    it('correctly handles execution of a slash command previewer', async () => {
+        const mockContext = {
+            sender: { __type: 'sender' },
+            room: { __type: 'room' },
+            params: { __type: 'params' },
+            threadId: 'threadId',
+            triggerId: 'triggerId',
+        };
+
+        const _spy = spy(mockCommandExecutorAndPreview, 'previewer');
+
+        await handleExecutor({ AppAccessorsInstance: mockAppAccessors }, mockCommandExecutorAndPreview, 'previewer', [mockContext]);
+
+        const context = _spy.calls[0].args[0];
+
+        assertInstanceOf(context.getRoom(), Room);
+        assertEquals(context.getSender(), { __type: 'sender' });
+        assertEquals(context.getArguments(), { __type: 'params' });
+        assertEquals(context.getThreadId(), 'threadId');
+        assertEquals(context.getTriggerId(), 'triggerId');
+
+        assertEquals(_spy.calls[0].args[1], mockAppAccessors.getReader());
+        assertEquals(_spy.calls[0].args[2], mockAppAccessors.getModifier());
+        assertEquals(_spy.calls[0].args[3], mockAppAccessors.getHttp());
+        assertEquals(_spy.calls[0].args[4], mockAppAccessors.getPersistence());
+
+        _spy.restore();
+    });
+
+    it('correctly handles execution of a slash command preview item executor', async () => {
+        const mockContext = {
+            sender: { __type: 'sender' },
+            room: { __type: 'room' },
+            params: { __type: 'params' },
+            threadId: 'threadId',
+            triggerId: 'triggerId',
+        };
+
+        const mockPreviewItem = {
+            id: 'previewItemId',
+            type: 'image',
+            value: 'https://example.com/image.png',
+        };
+
+        const _spy = spy(mockCommandExecutorAndPreview, 'executePreviewItem');
+
+        await handlePreviewItem({ AppAccessorsInstance: mockAppAccessors }, mockCommandExecutorAndPreview, [mockPreviewItem, mockContext]);
+
+        const context = _spy.calls[0].args[1];
+
+        assertInstanceOf(context.getRoom(), Room);
+        assertEquals(context.getSender(), { __type: 'sender' });
+        assertEquals(context.getArguments(), { __type: 'params' });
+        assertEquals(context.getThreadId(), 'threadId');
+        assertEquals(context.getTriggerId(), 'triggerId');
+
+        assertEquals(_spy.calls[0].args[2], mockAppAccessors.getReader());
+        assertEquals(_spy.calls[0].args[3], mockAppAccessors.getModifier());
+        assertEquals(_spy.calls[0].args[4], mockAppAccessors.getHttp());
+        assertEquals(_spy.calls[0].args[5], mockAppAccessors.getPersistence());
+
+        _spy.restore();
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/handlers/tests/uikit-handler.test.ts b/packages/apps-engine/deno-runtime/handlers/tests/uikit-handler.test.ts
new file mode 100644
index 000000000000..f2293d6c98e0
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/tests/uikit-handler.test.ts
@@ -0,0 +1,99 @@
+// deno-lint-ignore-file no-explicit-any
+import { assertInstanceOf } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import handleUIKitInteraction, {
+    UIKitActionButtonInteractionContext,
+    UIKitBlockInteractionContext,
+    UIKitLivechatBlockInteractionContext,
+    UIKitViewCloseInteractionContext,
+    UIKitViewSubmitInteractionContext,
+} from '../uikit/handler.ts';
+
+describe('handlers > uikit', () => {
+    const mockApp = {
+        getID: (): string => 'appId',
+        executeBlockActionHandler: (context: any): Promise<any> => Promise.resolve(context),
+        executeViewSubmitHandler: (context: any): Promise<any> => Promise.resolve(context),
+        executeViewClosedHandler: (context: any): Promise<any> => Promise.resolve(context),
+        executeActionButtonHandler: (context: any): Promise<any> => Promise.resolve(context),
+        executeLivechatBlockActionHandler: (context: any): Promise<any> => Promise.resolve(context),
+    };
+
+    beforeEach(() => {
+        AppObjectRegistry.set('app', mockApp);
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+    });
+
+    it('successfully handles a call for "executeBlockActionHandler"', async () => {
+        const result = await handleUIKitInteraction('executeBlockActionHandler', [
+            {
+                actionId: 'actionId',
+                blockId: 'blockId',
+                value: 'value',
+                viewId: 'viewId',
+            },
+        ]);
+
+        assertInstanceOf(result, UIKitBlockInteractionContext);
+    });
+
+    it('successfully handles a call for "executeViewSubmitHandler"', async () => {
+        const result = await handleUIKitInteraction('executeViewSubmitHandler', [
+            {
+                viewId: 'viewId',
+                appId: 'appId',
+                userId: 'userId',
+                isAppUser: true,
+                values: {},
+            },
+        ]);
+
+        assertInstanceOf(result, UIKitViewSubmitInteractionContext);
+    });
+
+    it('successfully handles a call for "executeViewClosedHandler"', async () => {
+        const result = await handleUIKitInteraction('executeViewClosedHandler', [
+            {
+                viewId: 'viewId',
+                appId: 'appId',
+                userId: 'userId',
+                isAppUser: true,
+            },
+        ]);
+
+        assertInstanceOf(result, UIKitViewCloseInteractionContext);
+    });
+
+    it('successfully handles a call for "executeActionButtonHandler"', async () => {
+        const result = await handleUIKitInteraction('executeActionButtonHandler', [
+            {
+                actionId: 'actionId',
+                appId: 'appId',
+                userId: 'userId',
+                isAppUser: true,
+            },
+        ]);
+
+        assertInstanceOf(result, UIKitActionButtonInteractionContext);
+    });
+
+    it('successfully handles a call for "executeLivechatBlockActionHandler"', async () => {
+        const result = await handleUIKitInteraction('executeLivechatBlockActionHandler', [
+            {
+                actionId: 'actionId',
+                appId: 'appId',
+                userId: 'userId',
+                visitor: {},
+                isAppUser: true,
+                room: {},
+            },
+        ]);
+
+        assertInstanceOf(result, UIKitLivechatBlockInteractionContext);
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/handlers/tests/videoconference-handler.test.ts b/packages/apps-engine/deno-runtime/handlers/tests/videoconference-handler.test.ts
new file mode 100644
index 000000000000..a32d3175e24d
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/tests/videoconference-handler.test.ts
@@ -0,0 +1,122 @@
+// deno-lint-ignore-file no-explicit-any
+import { assertEquals, assertObjectMatch } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
+
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import videoconfHandler from '../videoconference-handler.ts';
+import { assertInstanceOf } from 'https://deno.land/std@0.203.0/assert/assert_instance_of.ts';
+import { JsonRpcError } from 'jsonrpc-lite';
+
+describe('handlers > videoconference', () => {
+    // deno-lint-ignore no-unused-vars
+    const mockMethodWithoutParam = (read: any, modify: any, http: any, persis: any): Promise<string> => Promise.resolve('ok none');
+    // deno-lint-ignore no-unused-vars
+    const mockMethodWithOneParam = (call: any, read: any, modify: any, http: any, persis: any): Promise<string> => Promise.resolve('ok one');
+    // deno-lint-ignore no-unused-vars
+    const mockMethodWithTwoParam = (call: any, user: any, read: any, modify: any, http: any, persis: any): Promise<string> => Promise.resolve('ok two');
+    // deno-lint-ignore no-unused-vars
+    const mockMethodWithThreeParam = (call: any, user: any, options: any, read: any, modify: any, http: any, persis: any): Promise<string> =>
+        Promise.resolve('ok three');
+    const mockProvider = {
+        empty: mockMethodWithoutParam,
+        one: mockMethodWithOneParam,
+        two: mockMethodWithTwoParam,
+        three: mockMethodWithThreeParam,
+        notAFunction: true,
+        error: () => {
+            throw new Error('Method execution error example');
+        },
+    };
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('videoConfProvider:test-provider', mockProvider);
+    });
+
+    it('correctly handles execution of a videoconf method without additional params', async () => {
+        const _spy = spy(mockProvider, 'empty');
+
+        const result = await videoconfHandler('videoconference:test-provider:empty', []);
+
+        assertEquals(result, 'ok none');
+        assertEquals(_spy.calls[0].args.length, 4);
+
+        _spy.restore();
+    });
+
+    it('correctly handles execution of a videoconf method with one param', async () => {
+        const _spy = spy(mockProvider, 'one');
+
+        const result = await videoconfHandler('videoconference:test-provider:one', ['call']);
+
+        assertEquals(result, 'ok one');
+        assertEquals(_spy.calls[0].args.length, 5);
+        assertEquals(_spy.calls[0].args[0], 'call');
+
+        _spy.restore();
+    });
+
+    it('correctly handles execution of a videoconf method with two params', async () => {
+        const _spy = spy(mockProvider, 'two');
+
+        const result = await videoconfHandler('videoconference:test-provider:two', ['call', 'user']);
+
+        assertEquals(result, 'ok two');
+        assertEquals(_spy.calls[0].args.length, 6);
+        assertEquals(_spy.calls[0].args[0], 'call');
+        assertEquals(_spy.calls[0].args[1], 'user');
+
+        _spy.restore();
+    });
+
+    it('correctly handles execution of a videoconf method with three params', async () => {
+        const _spy = spy(mockProvider, 'three');
+
+        const result = await videoconfHandler('videoconference:test-provider:three', ['call', 'user', 'options']);
+
+        assertEquals(result, 'ok three');
+        assertEquals(_spy.calls[0].args.length, 7);
+        assertEquals(_spy.calls[0].args[0], 'call');
+        assertEquals(_spy.calls[0].args[1], 'user');
+        assertEquals(_spy.calls[0].args[2], 'options');
+
+        _spy.restore();
+    });
+
+    it('correctly handles an error on execution of a videoconf method', async () => {
+        const result = await videoconfHandler('videoconference:test-provider:error', []);
+
+        assertInstanceOf(result, JsonRpcError);
+        assertObjectMatch(result, {
+            message: 'Method execution error example',
+            code: -32000,
+        });
+    });
+
+    it('correctly handles an error when provider is not found', async () => {
+        const providerName = 'error-provider';
+        const result = await videoconfHandler(`videoconference:${providerName}:method`, []);
+
+        assertInstanceOf(result, JsonRpcError);
+        assertObjectMatch(result, {
+            message: `Provider ${providerName} not found`,
+            code: -32000,
+        });
+    });
+
+    it('correctly handles an error if method is not a function of provider', async () => {
+        const methodName = 'notAFunction';
+        const providerName = 'test-provider';
+        const result = await videoconfHandler(`videoconference:${providerName}:${methodName}`, []);
+
+        assertInstanceOf(result, JsonRpcError);
+        assertObjectMatch(result, {
+            message: 'Method not found',
+            code: -32601,
+            data: {
+                message: `Method ${methodName} not found on provider ${providerName}`,
+            },
+        });
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/handlers/uikit/handler.ts b/packages/apps-engine/deno-runtime/handlers/uikit/handler.ts
new file mode 100644
index 000000000000..5a418f242ad9
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/uikit/handler.ts
@@ -0,0 +1,82 @@
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import { require } from '../../lib/require.ts';
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
+
+export const uikitInteractions = [
+    'executeBlockActionHandler',
+    'executeViewSubmitHandler',
+    'executeViewClosedHandler',
+    'executeActionButtonHandler',
+    'executeLivechatBlockActionHandler',
+];
+
+export const {
+    UIKitBlockInteractionContext,
+    UIKitViewSubmitInteractionContext,
+    UIKitViewCloseInteractionContext,
+    UIKitActionButtonInteractionContext,
+} = require('@rocket.chat/apps-engine/definition/uikit/UIKitInteractionContext.js');
+
+export const { UIKitLivechatBlockInteractionContext } = require('@rocket.chat/apps-engine/definition/uikit/livechat/UIKitLivechatInteractionContext.js');
+
+export default async function handleUIKitInteraction(method: string, params: unknown): Promise<Defined | JsonRpcError> {
+    if (!uikitInteractions.includes(method)) {
+        return JsonRpcError.methodNotFound(null);
+    }
+
+    if (!Array.isArray(params)) {
+        return JsonRpcError.invalidParams(null);
+    }
+
+    const app = AppObjectRegistry.get<App>('app');
+
+    const interactionHandler = app?.[method as keyof App] as unknown;
+
+    if (!app || typeof interactionHandler !== 'function') {
+        return JsonRpcError.methodNotFound({
+            message: `App does not implement method "${method}"`,
+        });
+    }
+
+    const [payload] = params as [Record<string, unknown>];
+
+    if (!payload) {
+        return JsonRpcError.invalidParams(null);
+    }
+
+    let context;
+
+    switch (method) {
+        case 'executeBlockActionHandler':
+            context = new UIKitBlockInteractionContext(payload);
+            break;
+        case 'executeViewSubmitHandler':
+            context = new UIKitViewSubmitInteractionContext(payload);
+            break;
+        case 'executeViewClosedHandler':
+            context = new UIKitViewCloseInteractionContext(payload);
+            break;
+        case 'executeActionButtonHandler':
+            context = new UIKitActionButtonInteractionContext(payload);
+            break;
+        case 'executeLivechatBlockActionHandler':
+            context = new UIKitLivechatBlockInteractionContext(payload);
+            break;
+    }
+
+    try {
+        return await interactionHandler.call(
+            app,
+            context,
+            AppAccessorsInstance.getReader(),
+            AppAccessorsInstance.getHttp(),
+            AppAccessorsInstance.getPersistence(),
+            AppAccessorsInstance.getModifier(),
+        );
+    } catch (e) {
+        return JsonRpcError.internalError({ message: e.message });
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/handlers/videoconference-handler.ts b/packages/apps-engine/deno-runtime/handlers/videoconference-handler.ts
new file mode 100644
index 000000000000..0347519db2e6
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/handlers/videoconference-handler.ts
@@ -0,0 +1,49 @@
+import { Defined, JsonRpcError } from 'jsonrpc-lite';
+import type { IVideoConfProvider } from '@rocket.chat/apps-engine/definition/videoConfProviders/IVideoConfProvider.ts';
+
+import { AppObjectRegistry } from '../AppObjectRegistry.ts';
+import { AppAccessorsInstance } from '../lib/accessors/mod.ts';
+import { Logger } from '../lib/logger.ts';
+
+export default async function videoConferenceHandler(call: string, params: unknown): Promise<JsonRpcError | Defined> {
+    const [, providerName, methodName] = call.split(':');
+
+    const provider = AppObjectRegistry.get<IVideoConfProvider>(`videoConfProvider:${providerName}`);
+    const logger = AppObjectRegistry.get<Logger>('logger');
+
+    if (!provider) {
+        return new JsonRpcError(`Provider ${providerName} not found`, -32000);
+    }
+
+    const method = provider[methodName as keyof IVideoConfProvider];
+
+    if (typeof method !== 'function') {
+        return JsonRpcError.methodNotFound({
+            message: `Method ${methodName} not found on provider ${providerName}`,
+        });
+    }
+
+    const [videoconf, user, options] = params as Array<unknown>;
+
+    logger?.debug(`Executing ${methodName} on video conference provider...`);
+
+    const args = [...(videoconf ? [videoconf] : []), ...(user ? [user] : []), ...(options ? [options] : [])];
+
+    try {
+        // deno-lint-ignore ban-types
+        const result = await (method as Function).apply(provider, [
+            ...args,
+            AppAccessorsInstance.getReader(),
+            AppAccessorsInstance.getModifier(),
+            AppAccessorsInstance.getHttp(),
+            AppAccessorsInstance.getPersistence(),
+        ]);
+
+        logger?.debug(`Video Conference Provider's ${methodName} was successfully executed.`);
+
+        return result;
+    } catch (e) {
+        logger?.debug(`Video Conference Provider's ${methodName} was unsuccessful.`);
+        return new JsonRpcError(e.message, -32000);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/BlockBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/BlockBuilder.ts
new file mode 100644
index 000000000000..e1602860fe97
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/BlockBuilder.ts
@@ -0,0 +1,216 @@
+import { v1 as uuid } from 'uuid';
+
+import type {
+    BlockType as _BlockType,
+    IActionsBlock,
+    IBlock,
+    IConditionalBlock,
+    IConditionalBlockFilters,
+    IContextBlock,
+    IImageBlock,
+    IInputBlock,
+    ISectionBlock,
+} from '@rocket.chat/apps-engine/definition/uikit/blocks/Blocks.ts';
+import type {
+    BlockElementType as _BlockElementType,
+    IBlockElement,
+    IButtonElement,
+    IImageElement,
+    IInputElement,
+    IInteractiveElement,
+    IMultiStaticSelectElement,
+    IOverflowMenuElement,
+    IPlainTextInputElement,
+    ISelectElement,
+    IStaticSelectElement,
+} from '@rocket.chat/apps-engine/definition/uikit/blocks/Elements.ts';
+import type { ITextObject, TextObjectType as _TextObjectType } from '@rocket.chat/apps-engine/definition/uikit/blocks/Objects.ts';
+
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+import { require } from '../../../lib/require.ts';
+
+const { BlockType } = require('@rocket.chat/apps-engine/definition/uikit/blocks/Blocks.js') as { BlockType: typeof _BlockType };
+const { BlockElementType } = require('@rocket.chat/apps-engine/definition/uikit/blocks/Elements.js') as { BlockElementType: typeof _BlockElementType };
+const { TextObjectType } = require('@rocket.chat/apps-engine/definition/uikit/blocks/Objects.js') as { TextObjectType: typeof _TextObjectType };
+
+type BlockFunctionParameter<T extends IBlock> = Omit<T, 'type'>;
+type ElementFunctionParameter<T extends IBlockElement> = T extends IInteractiveElement
+    ? Omit<T, 'type' | 'actionId'> | Partial<Pick<T, 'actionId'>>
+    : Omit<T, 'type'>;
+
+type SectionBlockParam = BlockFunctionParameter<ISectionBlock>;
+type ImageBlockParam = BlockFunctionParameter<IImageBlock>;
+type ActionsBlockParam = BlockFunctionParameter<IActionsBlock>;
+type ContextBlockParam = BlockFunctionParameter<IContextBlock>;
+type InputBlockParam = BlockFunctionParameter<IInputBlock>;
+
+type ButtonElementParam = ElementFunctionParameter<IButtonElement>;
+type ImageElementParam = ElementFunctionParameter<IImageElement>;
+type OverflowMenuElementParam = ElementFunctionParameter<IOverflowMenuElement>;
+type PlainTextInputElementParam = ElementFunctionParameter<IPlainTextInputElement>;
+type StaticSelectElementParam = ElementFunctionParameter<IStaticSelectElement>;
+type MultiStaticSelectElementParam = ElementFunctionParameter<IMultiStaticSelectElement>;
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export class BlockBuilder {
+    private readonly blocks: Array<IBlock>;
+    private readonly appId: string;
+
+    constructor() {
+        this.blocks = [];
+        this.appId = String(AppObjectRegistry.get('id'));
+    }
+
+    public addSectionBlock(block: SectionBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.SECTION, ...block } as ISectionBlock);
+
+        return this;
+    }
+
+    public addImageBlock(block: ImageBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.IMAGE, ...block } as IImageBlock);
+
+        return this;
+    }
+
+    public addDividerBlock(): BlockBuilder {
+        this.addBlock({ type: BlockType.DIVIDER });
+
+        return this;
+    }
+
+    public addActionsBlock(block: ActionsBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.ACTIONS, ...block } as IActionsBlock);
+
+        return this;
+    }
+
+    public addContextBlock(block: ContextBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.CONTEXT, ...block } as IContextBlock);
+
+        return this;
+    }
+
+    public addInputBlock(block: InputBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.INPUT, ...block } as IInputBlock);
+
+        return this;
+    }
+
+    public addConditionalBlock(innerBlocks: BlockBuilder | Array<IBlock>, condition?: IConditionalBlockFilters): BlockBuilder {
+        const render = innerBlocks instanceof BlockBuilder ? innerBlocks.getBlocks() : innerBlocks;
+
+        this.addBlock({
+            type: BlockType.CONDITIONAL,
+            render,
+            when: condition,
+        } as IConditionalBlock);
+
+        return this;
+    }
+
+    public getBlocks() {
+        return this.blocks;
+    }
+
+    public newPlainTextObject(text: string, emoji = false): ITextObject {
+        return {
+            type: TextObjectType.PLAINTEXT,
+            text,
+            emoji,
+        };
+    }
+
+    public newMarkdownTextObject(text: string): ITextObject {
+        return {
+            type: TextObjectType.MARKDOWN,
+            text,
+        };
+    }
+
+    public newButtonElement(info: ButtonElementParam): IButtonElement {
+        return this.newInteractiveElement({
+            type: BlockElementType.BUTTON,
+            ...info,
+        } as IButtonElement);
+    }
+
+    public newImageElement(info: ImageElementParam): IImageElement {
+        return {
+            type: BlockElementType.IMAGE,
+            ...info,
+        };
+    }
+
+    public newOverflowMenuElement(info: OverflowMenuElementParam): IOverflowMenuElement {
+        return this.newInteractiveElement({
+            type: BlockElementType.OVERFLOW_MENU,
+            ...info,
+        } as IOverflowMenuElement);
+    }
+
+    public newPlainTextInputElement(info: PlainTextInputElementParam): IPlainTextInputElement {
+        return this.newInputElement({
+            type: BlockElementType.PLAIN_TEXT_INPUT,
+            ...info,
+        } as IPlainTextInputElement);
+    }
+
+    public newStaticSelectElement(info: StaticSelectElementParam): IStaticSelectElement {
+        return this.newSelectElement({
+            type: BlockElementType.STATIC_SELECT,
+            ...info,
+        } as IStaticSelectElement);
+    }
+
+    public newMultiStaticElement(info: MultiStaticSelectElementParam): IMultiStaticSelectElement {
+        return this.newSelectElement({
+            type: BlockElementType.MULTI_STATIC_SELECT,
+            ...info,
+        } as IMultiStaticSelectElement);
+    }
+
+    private newInteractiveElement<T extends IInteractiveElement>(element: T): T {
+        if (!element.actionId) {
+            element.actionId = this.generateActionId();
+        }
+
+        return element;
+    }
+
+    private newInputElement<T extends IInputElement>(element: T): T {
+        if (!element.actionId) {
+            element.actionId = this.generateActionId();
+        }
+
+        return element;
+    }
+
+    private newSelectElement<T extends ISelectElement>(element: T): T {
+        if (!element.actionId) {
+            element.actionId = this.generateActionId();
+        }
+
+        return element;
+    }
+
+    private addBlock(block: IBlock): void {
+        if (!block.blockId) {
+            block.blockId = this.generateBlockId();
+        }
+
+        block.appId = this.appId;
+
+        this.blocks.push(block);
+    }
+
+    private generateBlockId(): string {
+        return uuid();
+    }
+
+    private generateActionId(): string {
+        return uuid();
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/DiscussionBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/DiscussionBuilder.ts
new file mode 100644
index 000000000000..e2c2dc021438
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/DiscussionBuilder.ts
@@ -0,0 +1,59 @@
+import type { IDiscussionBuilder as _IDiscussionBuilder } from '@rocket.chat/apps-engine/definition/accessors/IDiscussionBuilder.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { IRoomBuilder } from '@rocket.chat/apps-engine/definition/accessors/IRoomBuilder.ts';
+
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+import type { RoomType as _RoomType } from '@rocket.chat/apps-engine/definition/rooms/RoomType.ts';
+
+import { RoomBuilder } from './RoomBuilder.ts';
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+const { RoomType } = require('@rocket.chat/apps-engine/definition/rooms/RoomType.js') as { RoomType: typeof _RoomType };
+
+export interface IDiscussionBuilder extends _IDiscussionBuilder, IRoomBuilder {}
+
+export class DiscussionBuilder extends RoomBuilder implements IDiscussionBuilder {
+    public kind: _RocketChatAssociationModel.DISCUSSION;
+
+    private reply?: string;
+
+    private parentMessage?: IMessage;
+
+    constructor(data?: Partial<IRoom>) {
+        super(data);
+        this.kind = RocketChatAssociationModel.DISCUSSION;
+        this.room.type = RoomType.PRIVATE_GROUP;
+    }
+
+    public setParentRoom(parentRoom: IRoom): IDiscussionBuilder {
+        this.room.parentRoom = parentRoom;
+        return this;
+    }
+
+    public getParentRoom(): IRoom {
+        return this.room.parentRoom!;
+    }
+
+    public setReply(reply: string): IDiscussionBuilder {
+        this.reply = reply;
+        return this;
+    }
+
+    public getReply(): string {
+        return this.reply!;
+    }
+
+    public setParentMessage(parentMessage: IMessage): IDiscussionBuilder {
+        this.parentMessage = parentMessage;
+        return this;
+    }
+
+    public getParentMessage(): IMessage {
+        return this.parentMessage!;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/LivechatMessageBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/LivechatMessageBuilder.ts
new file mode 100644
index 000000000000..a12024ab7b5d
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/LivechatMessageBuilder.ts
@@ -0,0 +1,204 @@
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+import type { RoomType as _RoomType } from '@rocket.chat/apps-engine/definition/rooms/RoomType.ts';
+
+import type { ILivechatMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/ILivechatMessageBuilder.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IMessageAttachment } from '@rocket.chat/apps-engine/definition/messages/IMessageAttachment.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+import type { ILivechatMessage as EngineLivechatMessage } from '@rocket.chat/apps-engine/definition/livechat/ILivechatMessage.ts';
+import type { IVisitor } from '@rocket.chat/apps-engine/definition/livechat/IVisitor.ts';
+import type { IMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/IMessageBuilder.ts';
+
+import { MessageBuilder } from './MessageBuilder.ts';
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+const { RoomType } = require('@rocket.chat/apps-engine/definition/rooms/RoomType.js') as { RoomType: typeof _RoomType };
+
+export interface ILivechatMessage extends EngineLivechatMessage, IMessage {}
+
+export class LivechatMessageBuilder implements ILivechatMessageBuilder {
+    public kind: _RocketChatAssociationModel.LIVECHAT_MESSAGE;
+
+    private msg: ILivechatMessage;
+
+    constructor(message?: ILivechatMessage) {
+        this.kind = RocketChatAssociationModel.LIVECHAT_MESSAGE;
+        this.msg = message || ({} as ILivechatMessage);
+    }
+
+    public setData(data: ILivechatMessage): ILivechatMessageBuilder {
+        delete data.id;
+        this.msg = data;
+
+        return this;
+    }
+
+    public setRoom(room: IRoom): ILivechatMessageBuilder {
+        this.msg.room = room;
+        return this;
+    }
+
+    public getRoom(): IRoom {
+        return this.msg.room;
+    }
+
+    public setSender(sender: IUser): ILivechatMessageBuilder {
+        this.msg.sender = sender;
+        delete this.msg.visitor;
+
+        return this;
+    }
+
+    public getSender(): IUser {
+        return this.msg.sender;
+    }
+
+    public setText(text: string): ILivechatMessageBuilder {
+        this.msg.text = text;
+        return this;
+    }
+
+    public getText(): string {
+        return this.msg.text!;
+    }
+
+    public setEmojiAvatar(emoji: string): ILivechatMessageBuilder {
+        this.msg.emoji = emoji;
+        return this;
+    }
+
+    public getEmojiAvatar(): string {
+        return this.msg.emoji!;
+    }
+
+    public setAvatarUrl(avatarUrl: string): ILivechatMessageBuilder {
+        this.msg.avatarUrl = avatarUrl;
+        return this;
+    }
+
+    public getAvatarUrl(): string {
+        return this.msg.avatarUrl!;
+    }
+
+    public setUsernameAlias(alias: string): ILivechatMessageBuilder {
+        this.msg.alias = alias;
+        return this;
+    }
+
+    public getUsernameAlias(): string {
+        return this.msg.alias!;
+    }
+
+    public addAttachment(attachment: IMessageAttachment): ILivechatMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        this.msg.attachments.push(attachment);
+        return this;
+    }
+
+    public setAttachments(attachments: Array<IMessageAttachment>): ILivechatMessageBuilder {
+        this.msg.attachments = attachments;
+        return this;
+    }
+
+    public getAttachments(): Array<IMessageAttachment> {
+        return this.msg.attachments!;
+    }
+
+    public replaceAttachment(position: number, attachment: IMessageAttachment): ILivechatMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to replace.`);
+        }
+
+        this.msg.attachments[position] = attachment;
+        return this;
+    }
+
+    public removeAttachment(position: number): ILivechatMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to remove.`);
+        }
+
+        this.msg.attachments.splice(position, 1);
+
+        return this;
+    }
+
+    public setEditor(user: IUser): ILivechatMessageBuilder {
+        this.msg.editor = user;
+        return this;
+    }
+
+    public getEditor(): IUser {
+        return this.msg.editor;
+    }
+
+    public setGroupable(groupable: boolean): ILivechatMessageBuilder {
+        this.msg.groupable = groupable;
+        return this;
+    }
+
+    public getGroupable(): boolean {
+        return this.msg.groupable!;
+    }
+
+    public setParseUrls(parseUrls: boolean): ILivechatMessageBuilder {
+        this.msg.parseUrls = parseUrls;
+        return this;
+    }
+
+    public getParseUrls(): boolean {
+        return this.msg.parseUrls!;
+    }
+
+    public setToken(token: string): ILivechatMessageBuilder {
+        this.msg.token = token;
+        return this;
+    }
+
+    public getToken(): string {
+        return this.msg.token!;
+    }
+
+    public setVisitor(visitor: IVisitor): ILivechatMessageBuilder {
+        this.msg.visitor = visitor;
+        delete this.msg.sender;
+
+        return this;
+    }
+
+    public getVisitor(): IVisitor {
+        return this.msg.visitor;
+    }
+
+    public getMessage(): ILivechatMessage {
+        if (!this.msg.room) {
+            throw new Error('The "room" property is required.');
+        }
+
+        if (this.msg.room.type !== RoomType.LIVE_CHAT) {
+            throw new Error('The room is not a Livechat room');
+        }
+
+        return this.msg;
+    }
+
+    public getMessageBuilder(): IMessageBuilder {
+        return new MessageBuilder(this.msg as IMessage);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts
new file mode 100644
index 000000000000..98cd919f7b00
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts
@@ -0,0 +1,232 @@
+import { LayoutBlock } from '@rocket.chat/ui-kit';
+
+import type { IMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/IMessageBuilder.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IMessageAttachment } from '@rocket.chat/apps-engine/definition/messages/IMessageAttachment.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { IBlock } from '@rocket.chat/apps-engine/definition/uikit/blocks/Blocks.ts';
+
+import { BlockBuilder } from './BlockBuilder.ts';
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class MessageBuilder implements IMessageBuilder {
+    public kind: _RocketChatAssociationModel.MESSAGE;
+
+    private msg: IMessage;
+
+    constructor(message?: IMessage) {
+        this.kind = RocketChatAssociationModel.MESSAGE;
+        this.msg = message || ({} as IMessage);
+    }
+
+    public setData(data: IMessage): IMessageBuilder {
+        delete data.id;
+        this.msg = data;
+
+        return this as IMessageBuilder;
+    }
+
+    public setUpdateData(data: IMessage, editor: IUser): IMessageBuilder {
+        this.msg = data;
+        this.msg.editor = editor;
+        this.msg.editedAt = new Date();
+
+        return this as IMessageBuilder;
+    }
+
+    public setThreadId(threadId: string): IMessageBuilder {
+        this.msg.threadId = threadId;
+
+        return this as IMessageBuilder;
+    }
+
+    public getThreadId(): string {
+        return this.msg.threadId!;
+    }
+
+    public setRoom(room: IRoom): IMessageBuilder {
+        this.msg.room = room;
+        return this as IMessageBuilder;
+    }
+
+    public getRoom(): IRoom {
+        return this.msg.room;
+    }
+
+    public setSender(sender: IUser): IMessageBuilder {
+        this.msg.sender = sender;
+        return this as IMessageBuilder;
+    }
+
+    public getSender(): IUser {
+        return this.msg.sender;
+    }
+
+    public setText(text: string): IMessageBuilder {
+        this.msg.text = text;
+        return this as IMessageBuilder;
+    }
+
+    public getText(): string {
+        return this.msg.text!;
+    }
+
+    public setEmojiAvatar(emoji: string): IMessageBuilder {
+        this.msg.emoji = emoji;
+        return this as IMessageBuilder;
+    }
+
+    public getEmojiAvatar(): string {
+        return this.msg.emoji!;
+    }
+
+    public setAvatarUrl(avatarUrl: string): IMessageBuilder {
+        this.msg.avatarUrl = avatarUrl;
+        return this as IMessageBuilder;
+    }
+
+    public getAvatarUrl(): string {
+        return this.msg.avatarUrl!;
+    }
+
+    public setUsernameAlias(alias: string): IMessageBuilder {
+        this.msg.alias = alias;
+        return this as IMessageBuilder;
+    }
+
+    public getUsernameAlias(): string {
+        return this.msg.alias!;
+    }
+
+    public addAttachment(attachment: IMessageAttachment): IMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        this.msg.attachments.push(attachment);
+        return this as IMessageBuilder;
+    }
+
+    public setAttachments(attachments: Array<IMessageAttachment>): IMessageBuilder {
+        this.msg.attachments = attachments;
+        return this as IMessageBuilder;
+    }
+
+    public getAttachments(): Array<IMessageAttachment> {
+        return this.msg.attachments!;
+    }
+
+    public replaceAttachment(position: number, attachment: IMessageAttachment): IMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to replace.`);
+        }
+
+        this.msg.attachments[position] = attachment;
+        return this as IMessageBuilder;
+    }
+
+    public removeAttachment(position: number): IMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to remove.`);
+        }
+
+        this.msg.attachments.splice(position, 1);
+
+        return this as IMessageBuilder;
+    }
+
+    public setEditor(user: IUser): IMessageBuilder {
+        this.msg.editor = user;
+        return this as IMessageBuilder;
+    }
+
+    public getEditor(): IUser {
+        return this.msg.editor;
+    }
+
+    public setGroupable(groupable: boolean): IMessageBuilder {
+        this.msg.groupable = groupable;
+        return this as IMessageBuilder;
+    }
+
+    public getGroupable(): boolean {
+        return this.msg.groupable!;
+    }
+
+    public setParseUrls(parseUrls: boolean): IMessageBuilder {
+        this.msg.parseUrls = parseUrls;
+        return this as IMessageBuilder;
+    }
+
+    public getParseUrls(): boolean {
+        return this.msg.parseUrls!;
+    }
+
+    public getMessage(): IMessage {
+        if (!this.msg.room) {
+            throw new Error('The "room" property is required.');
+        }
+
+        return this.msg;
+    }
+
+    public addBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
+        if (!Array.isArray(this.msg.blocks)) {
+            this.msg.blocks = [];
+        }
+
+        if (blocks instanceof BlockBuilder) {
+            this.msg.blocks.push(...blocks.getBlocks());
+        } else {
+            this.msg.blocks.push(...blocks);
+        }
+
+        return this as IMessageBuilder;
+    }
+
+    public setBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
+        if (blocks instanceof BlockBuilder) {
+            this.msg.blocks = blocks.getBlocks();
+        } else {
+            this.msg.blocks = blocks;
+        }
+
+        return this as IMessageBuilder;
+    }
+
+    public getBlocks() {
+        return this.msg.blocks!;
+    }
+
+    public addCustomField(key: string, value: unknown): IMessageBuilder {
+        if (!this.msg.customFields) {
+            this.msg.customFields = {};
+        }
+
+        if (this.msg.customFields[key]) {
+            throw new Error(`The message already contains a custom field by the key: ${key}`);
+        }
+
+        if (key.includes('.')) {
+            throw new Error(`The given key contains a period, which is not allowed. Key: ${key}`);
+        }
+
+        this.msg.customFields[key] = value;
+
+        return this as IMessageBuilder;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts
new file mode 100644
index 000000000000..38983475162d
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts
@@ -0,0 +1,163 @@
+import type { IRoomBuilder } from '@rocket.chat/apps-engine/definition/accessors/IRoomBuilder.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+
+import type { RoomType } from '@rocket.chat/apps-engine/definition/rooms/RoomType.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class RoomBuilder implements IRoomBuilder {
+    public kind: _RocketChatAssociationModel.ROOM | _RocketChatAssociationModel.DISCUSSION;
+
+    protected room: IRoom;
+
+    private members: Array<string>;
+
+    constructor(data?: Partial<IRoom>) {
+        this.kind = RocketChatAssociationModel.ROOM;
+        this.room = (data || { customFields: {} }) as IRoom;
+        this.members = [];
+    }
+
+    public setData(data: Partial<IRoom>): IRoomBuilder {
+        delete data.id;
+        this.room = data as IRoom;
+
+        return this;
+    }
+
+    public setDisplayName(name: string): IRoomBuilder {
+        this.room.displayName = name;
+        return this;
+    }
+
+    public getDisplayName(): string {
+        return this.room.displayName!;
+    }
+
+    public setSlugifiedName(name: string): IRoomBuilder {
+        this.room.slugifiedName = name;
+        return this;
+    }
+
+    public getSlugifiedName(): string {
+        return this.room.slugifiedName;
+    }
+
+    public setType(type: RoomType): IRoomBuilder {
+        this.room.type = type;
+        return this;
+    }
+
+    public getType(): RoomType {
+        return this.room.type;
+    }
+
+    public setCreator(creator: IUser): IRoomBuilder {
+        this.room.creator = creator;
+        return this;
+    }
+
+    public getCreator(): IUser {
+        return this.room.creator;
+    }
+
+    /**
+     * @deprecated
+     */
+    public addUsername(username: string): IRoomBuilder {
+        this.addMemberToBeAddedByUsername(username);
+        return this;
+    }
+
+    /**
+     * @deprecated
+     */
+    public setUsernames(usernames: Array<string>): IRoomBuilder {
+        this.setMembersToBeAddedByUsernames(usernames);
+        return this;
+    }
+
+    /**
+     * @deprecated
+     */
+    public getUsernames(): Array<string> {
+        const usernames = this.getMembersToBeAddedUsernames();
+        if (usernames && usernames.length > 0) {
+            return usernames;
+        }
+        return this.room.usernames || [];
+    }
+
+    public addMemberToBeAddedByUsername(username: string): IRoomBuilder {
+        this.members.push(username);
+        return this;
+    }
+
+    public setMembersToBeAddedByUsernames(usernames: Array<string>): IRoomBuilder {
+        this.members = usernames;
+        return this;
+    }
+
+    public getMembersToBeAddedUsernames(): Array<string> {
+        return this.members;
+    }
+
+    public setDefault(isDefault: boolean): IRoomBuilder {
+        this.room.isDefault = isDefault;
+        return this;
+    }
+
+    public getIsDefault(): boolean {
+        return this.room.isDefault!;
+    }
+
+    public setReadOnly(isReadOnly: boolean): IRoomBuilder {
+        this.room.isReadOnly = isReadOnly;
+        return this;
+    }
+
+    public getIsReadOnly(): boolean {
+        return this.room.isReadOnly!;
+    }
+
+    public setDisplayingOfSystemMessages(displaySystemMessages: boolean): IRoomBuilder {
+        this.room.displaySystemMessages = displaySystemMessages;
+        return this;
+    }
+
+    public getDisplayingOfSystemMessages(): boolean {
+        return this.room.displaySystemMessages!;
+    }
+
+    public addCustomField(key: string, value: object): IRoomBuilder {
+        if (typeof this.room.customFields !== 'object') {
+            this.room.customFields = {};
+        }
+
+        this.room.customFields[key] = value;
+        return this;
+    }
+
+    public setCustomFields(fields: { [key: string]: object }): IRoomBuilder {
+        this.room.customFields = fields;
+        return this;
+    }
+
+    public getCustomFields(): { [key: string]: object } {
+        return this.room.customFields!;
+    }
+
+    public getUserIds(): Array<string> {
+        return this.room.userIds!;
+    }
+
+    public getRoom(): IRoom {
+        return this.room;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/UserBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/UserBuilder.ts
new file mode 100644
index 000000000000..01c11a13f7a3
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/UserBuilder.ts
@@ -0,0 +1,81 @@
+import type { IUserBuilder } from '@rocket.chat/apps-engine/definition/accessors/IUserBuilder.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+import type { IUserSettings } from '@rocket.chat/apps-engine/definition/users/IUserSettings.ts';
+import type { IUserEmail } from '@rocket.chat/apps-engine/definition/users/IUserEmail.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class UserBuilder implements IUserBuilder {
+    public kind: _RocketChatAssociationModel.USER;
+
+    private user: Partial<IUser>;
+
+    constructor(user?: Partial<IUser>) {
+        this.kind = RocketChatAssociationModel.USER;
+        this.user = user || ({} as Partial<IUser>);
+    }
+
+    public setData(data: Partial<IUser>): IUserBuilder {
+        delete data.id;
+        this.user = data;
+
+        return this;
+    }
+
+    public setEmails(emails: Array<IUserEmail>): IUserBuilder {
+        this.user.emails = emails;
+        return this;
+    }
+
+    public getEmails(): Array<IUserEmail> {
+        return this.user.emails!;
+    }
+
+    public setDisplayName(name: string): IUserBuilder {
+        this.user.name = name;
+        return this;
+    }
+
+    public getDisplayName(): string {
+        return this.user.name!;
+    }
+
+    public setUsername(username: string): IUserBuilder {
+        this.user.username = username;
+        return this;
+    }
+
+    public getUsername(): string {
+        return this.user.username!;
+    }
+
+    public setRoles(roles: Array<string>): IUserBuilder {
+        this.user.roles = roles;
+        return this;
+    }
+
+    public getRoles(): Array<string> {
+        return this.user.roles!;
+    }
+
+    public getSettings(): Partial<IUserSettings> {
+        return this.user.settings;
+    }
+
+    public getUser(): Partial<IUser> {
+        if (!this.user.username) {
+            throw new Error('The "username" property is required.');
+        }
+
+        if (!this.user.name) {
+            throw new Error('The "name" property is required.');
+        }
+
+        return this.user;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/VideoConferenceBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/VideoConferenceBuilder.ts
new file mode 100644
index 000000000000..e617cdddf154
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/VideoConferenceBuilder.ts
@@ -0,0 +1,94 @@
+import type { IVideoConferenceBuilder } from '@rocket.chat/apps-engine/definition/accessors/IVideoConferenceBuilder.ts';
+import type { IGroupVideoConference } from '@rocket.chat/apps-engine/definition/videoConferences/IVideoConference.ts';
+
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export type AppVideoConference = Pick<IGroupVideoConference, 'rid' | 'providerName' | 'providerData' | 'title' | 'discussionRid'> & {
+    createdBy: IGroupVideoConference['createdBy']['_id'];
+};
+
+export class VideoConferenceBuilder implements IVideoConferenceBuilder {
+    public kind: _RocketChatAssociationModel.VIDEO_CONFERENCE = RocketChatAssociationModel.VIDEO_CONFERENCE;
+
+    protected call: AppVideoConference;
+
+    constructor(data?: Partial<AppVideoConference>) {
+        this.call = (data || {}) as AppVideoConference;
+    }
+
+    public setData(data: Partial<AppVideoConference>): IVideoConferenceBuilder {
+        this.call = {
+            rid: data.rid!,
+            createdBy: data.createdBy,
+            providerName: data.providerName!,
+            title: data.title!,
+            discussionRid: data.discussionRid,
+        };
+
+        return this;
+    }
+
+    public setRoomId(rid: string): IVideoConferenceBuilder {
+        this.call.rid = rid;
+        return this;
+    }
+
+    public getRoomId(): string {
+        return this.call.rid;
+    }
+
+    public setCreatedBy(userId: string): IVideoConferenceBuilder {
+        this.call.createdBy = userId;
+        return this;
+    }
+
+    public getCreatedBy(): string {
+        return this.call.createdBy;
+    }
+
+    public setProviderName(userId: string): IVideoConferenceBuilder {
+        this.call.providerName = userId;
+        return this;
+    }
+
+    public getProviderName(): string {
+        return this.call.providerName;
+    }
+
+    public setProviderData(data: Record<string, unknown> | undefined): IVideoConferenceBuilder {
+        this.call.providerData = data;
+        return this;
+    }
+
+    public getProviderData(): Record<string, unknown> {
+        return this.call.providerData!;
+    }
+
+    public setTitle(userId: string): IVideoConferenceBuilder {
+        this.call.title = userId;
+        return this;
+    }
+
+    public getTitle(): string {
+        return this.call.title;
+    }
+
+    public setDiscussionRid(rid: AppVideoConference['discussionRid']): IVideoConferenceBuilder {
+        this.call.discussionRid = rid;
+        return this;
+    }
+
+    public getDiscussionRid(): AppVideoConference['discussionRid'] {
+        return this.call.discussionRid;
+    }
+
+    public getVideoConference(): AppVideoConference {
+        return this.call;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/extenders/HttpExtender.ts b/packages/apps-engine/deno-runtime/lib/accessors/extenders/HttpExtender.ts
new file mode 100644
index 000000000000..c323d385de9d
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/extenders/HttpExtender.ts
@@ -0,0 +1,62 @@
+import type {
+    IHttpExtend,
+    IHttpPreRequestHandler,
+    IHttpPreResponseHandler
+} from "@rocket.chat/apps-engine/definition/accessors/IHttp.ts";
+
+export class HttpExtend implements IHttpExtend {
+    private headers: Map<string, string>;
+
+    private params: Map<string, string>;
+
+    private requests: Array<IHttpPreRequestHandler>;
+
+    private responses: Array<IHttpPreResponseHandler>;
+
+    constructor() {
+        this.headers = new Map<string, string>();
+        this.params = new Map<string, string>();
+        this.requests = [];
+        this.responses = [];
+    }
+
+    public provideDefaultHeader(key: string, value: string): void {
+        this.headers.set(key, value);
+    }
+
+    public provideDefaultHeaders(headers: { [key: string]: string }): void {
+        Object.keys(headers).forEach((key) => this.headers.set(key, headers[key]));
+    }
+
+    public provideDefaultParam(key: string, value: string): void {
+        this.params.set(key, value);
+    }
+
+    public provideDefaultParams(params: { [key: string]: string }): void {
+        Object.keys(params).forEach((key) => this.params.set(key, params[key]));
+    }
+
+    public providePreRequestHandler(handler: IHttpPreRequestHandler): void {
+        this.requests.push(handler);
+    }
+
+    public providePreResponseHandler(handler: IHttpPreResponseHandler): void {
+        this.responses.push(handler);
+    }
+
+    public getDefaultHeaders(): Map<string, string> {
+        return new Map<string, string>(this.headers);
+    }
+
+    public getDefaultParams(): Map<string, string> {
+        return new Map<string, string>(this.params);
+    }
+
+    public getPreRequestHandlers(): Array<IHttpPreRequestHandler> {
+        return Array.from(this.requests);
+    }
+
+    public getPreResponseHandlers(): Array<IHttpPreResponseHandler> {
+        return Array.from(this.responses);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/extenders/MessageExtender.ts b/packages/apps-engine/deno-runtime/lib/accessors/extenders/MessageExtender.ts
new file mode 100644
index 000000000000..abf1629c760a
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/extenders/MessageExtender.ts
@@ -0,0 +1,66 @@
+import type { IMessageExtender } from '@rocket.chat/apps-engine/definition/accessors/IMessageExtender.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IMessageAttachment } from '@rocket.chat/apps-engine/definition/messages/IMessageAttachment.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class MessageExtender implements IMessageExtender {
+    public readonly kind: _RocketChatAssociationModel.MESSAGE;
+
+    constructor(private msg: IMessage) {
+        this.kind = RocketChatAssociationModel.MESSAGE;
+
+        if (!Array.isArray(msg.attachments)) {
+            this.msg.attachments = [];
+        }
+    }
+
+    public addCustomField(key: string, value: unknown): IMessageExtender {
+        if (!this.msg.customFields) {
+            this.msg.customFields = {};
+        }
+
+        if (this.msg.customFields[key]) {
+            throw new Error(`The message already contains a custom field by the key: ${key}`);
+        }
+
+        if (key.includes('.')) {
+            throw new Error(`The given key contains a period, which is not allowed. Key: ${key}`);
+        }
+
+        this.msg.customFields[key] = value;
+
+        return this;
+    }
+
+    public addAttachment(attachment: IMessageAttachment): IMessageExtender {
+        this.ensureAttachment();
+
+        this.msg.attachments!.push(attachment);
+
+        return this;
+    }
+
+    public addAttachments(attachments: Array<IMessageAttachment>): IMessageExtender {
+        this.ensureAttachment();
+
+        this.msg.attachments = this.msg.attachments!.concat(attachments);
+
+        return this;
+    }
+
+    public getMessage(): IMessage {
+        return structuredClone(this.msg);
+    }
+
+    private ensureAttachment(): void {
+        if (!Array.isArray(this.msg.attachments)) {
+            this.msg.attachments = [];
+        }
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/extenders/RoomExtender.ts b/packages/apps-engine/deno-runtime/lib/accessors/extenders/RoomExtender.ts
new file mode 100644
index 000000000000..6509d5dae90e
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/extenders/RoomExtender.ts
@@ -0,0 +1,61 @@
+import type { IRoomExtender } from '@rocket.chat/apps-engine/definition/accessors/IRoomExtender.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class RoomExtender implements IRoomExtender {
+    public kind: _RocketChatAssociationModel.ROOM;
+
+    private members: Array<IUser>;
+
+    constructor(private room: IRoom) {
+        this.kind = RocketChatAssociationModel.ROOM;
+        this.members = [];
+    }
+
+    public addCustomField(key: string, value: unknown): IRoomExtender {
+        if (!this.room.customFields) {
+            this.room.customFields = {};
+        }
+
+        if (this.room.customFields[key]) {
+            throw new Error(`The room already contains a custom field by the key: ${key}`);
+        }
+
+        if (key.includes('.')) {
+            throw new Error(`The given key contains a period, which is not allowed. Key: ${key}`);
+        }
+
+        this.room.customFields[key] = value;
+
+        return this;
+    }
+
+    public addMember(user: IUser): IRoomExtender {
+        if (this.members.find((u) => u.username === user.username)) {
+            throw new Error('The user is already in the room.');
+        }
+
+        this.members.push(user);
+
+        return this;
+    }
+
+    public getMembersBeingAdded(): Array<IUser> {
+        return this.members;
+    }
+
+    public getUsernamesOfMembersBeingAdded(): Array<string> {
+        return this.members.map((u) => u.username);
+    }
+
+    public getRoom(): IRoom {
+        return structuredClone(this.room);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/extenders/VideoConferenceExtend.ts b/packages/apps-engine/deno-runtime/lib/accessors/extenders/VideoConferenceExtend.ts
new file mode 100644
index 000000000000..9616bf619067
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/extenders/VideoConferenceExtend.ts
@@ -0,0 +1,69 @@
+import type { IVideoConferenceExtender } from '@rocket.chat/apps-engine/definition/accessors/IVideoConferenceExtend.ts';
+import type { VideoConference, VideoConferenceMember } from '@rocket.chat/apps-engine/definition/videoConferences/IVideoConference.ts';
+import type { IVideoConferenceUser } from '@rocket.chat/apps-engine/definition/videoConferences/IVideoConferenceUser.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class VideoConferenceExtender implements IVideoConferenceExtender {
+    public kind: _RocketChatAssociationModel.VIDEO_CONFERENCE;
+
+    constructor(private videoConference: VideoConference) {
+        this.kind = RocketChatAssociationModel.VIDEO_CONFERENCE;
+    }
+
+    public setProviderData(value: Record<string, unknown>): IVideoConferenceExtender {
+        this.videoConference.providerData = value;
+
+        return this;
+    }
+
+    public setStatus(value: VideoConference['status']): IVideoConferenceExtender {
+        this.videoConference.status = value;
+
+        return this;
+    }
+
+    public setEndedBy(value: IVideoConferenceUser['_id']): IVideoConferenceExtender {
+        this.videoConference.endedBy = {
+            _id: value,
+            // Name and username will be loaded automatically by the bridge
+            username: '',
+            name: '',
+        };
+
+        return this;
+    }
+
+    public setEndedAt(value: VideoConference['endedAt']): IVideoConferenceExtender {
+        this.videoConference.endedAt = value;
+
+        return this;
+    }
+
+    public addUser(userId: VideoConferenceMember['_id'], ts?: VideoConferenceMember['ts']): IVideoConferenceExtender {
+        this.videoConference.users.push({
+            _id: userId,
+            ts,
+            // Name and username will be loaded automatically by the bridge
+            username: '',
+            name: '',
+        });
+
+        return this;
+    }
+
+    public setDiscussionRid(rid: VideoConference['discussionRid']): IVideoConferenceExtender {
+        this.videoConference.discussionRid = rid;
+
+        return this;
+    }
+
+    public getVideoConference(): VideoConference {
+        return structuredClone(this.videoConference);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/http.ts b/packages/apps-engine/deno-runtime/lib/accessors/http.ts
new file mode 100644
index 000000000000..f55838e60186
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/http.ts
@@ -0,0 +1,92 @@
+import type {
+    IHttp,
+    IHttpExtend,
+    IHttpRequest,
+    IHttpResponse,
+} from "@rocket.chat/apps-engine/definition/accessors/IHttp.ts";
+import type { IPersistence } from "@rocket.chat/apps-engine/definition/accessors/IPersistence.ts";
+import type { IRead } from "@rocket.chat/apps-engine/definition/accessors/IRead.ts";
+
+import * as Messenger from '../messenger.ts';
+import { AppObjectRegistry } from "../../AppObjectRegistry.ts";
+
+type RequestMethod = 'get' | 'post' | 'put' | 'head' | 'delete' | 'patch';
+
+export class Http implements IHttp {
+    private httpExtender: IHttpExtend;
+    private read: IRead;
+    private persistence: IPersistence;
+    private senderFn: typeof Messenger.sendRequest;
+
+    constructor(read: IRead, persistence: IPersistence, httpExtender: IHttpExtend, senderFn: typeof Messenger.sendRequest) {
+        this.read = read;
+        this.persistence = persistence;
+        this.httpExtender = httpExtender;
+        this.senderFn = senderFn;
+        // this.httpExtender = new HttpExtend();
+    }
+
+    public get(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, 'get', options);
+    }
+
+    public put(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, 'put', options);
+    }
+
+    public post(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, 'post', options);
+    }
+
+    public del(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, 'delete', options);
+    }
+
+    public patch(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, 'patch', options);
+    }
+
+    private async _processHandler(url: string, method: RequestMethod, options?: IHttpRequest): Promise<IHttpResponse> {
+        let request = options || {};
+
+        if (typeof request.headers === 'undefined') {
+            request.headers = {};
+        }
+
+        this.httpExtender.getDefaultHeaders().forEach((value: string, key: string) => {
+            if (typeof request.headers?.[key] !== 'string') {
+                request.headers![key] = value;
+            }
+        });
+
+        if (typeof request.params === 'undefined') {
+            request.params = {};
+        }
+
+        this.httpExtender.getDefaultParams().forEach((value: string, key: string) => {
+            if (typeof request.params?.[key] !== 'string') {
+                request.params![key] = value;
+            }
+        });
+
+        for (const handler of this.httpExtender.getPreRequestHandlers()) {
+            request = await handler.executePreHttpRequest(url, request, this.read, this.persistence);
+        }
+
+        let { result: response } = await this.senderFn({
+            method: `bridges:getHttpBridge:doCall`,
+            params: [{
+                appId: AppObjectRegistry.get<string>('id'),
+                method,
+                url,
+                request,
+            }],
+        })
+
+        for (const handler of this.httpExtender.getPreResponseHandlers()) {
+            response = await handler.executePreHttpResponse(response as IHttpResponse, this.read, this.persistence);
+        }
+
+        return response as IHttpResponse;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/mod.ts b/packages/apps-engine/deno-runtime/lib/accessors/mod.ts
new file mode 100644
index 000000000000..e71f014421ab
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/mod.ts
@@ -0,0 +1,302 @@
+import type { IAppAccessors } from '@rocket.chat/apps-engine/definition/accessors/IAppAccessors.ts';
+import type { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api/IApiEndpointMetadata.ts';
+import type { IEnvironmentWrite } from '@rocket.chat/apps-engine/definition/accessors/IEnvironmentWrite.ts';
+import type { IEnvironmentRead } from '@rocket.chat/apps-engine/definition/accessors/IEnvironmentRead.ts';
+import type { IConfigurationModify } from '@rocket.chat/apps-engine/definition/accessors/IConfigurationModify.ts';
+import type { IRead } from '@rocket.chat/apps-engine/definition/accessors/IRead.ts';
+import type { IModify } from '@rocket.chat/apps-engine/definition/accessors/IModify.ts';
+import type { INotifier } from '@rocket.chat/apps-engine/definition/accessors/INotifier.ts';
+import type { IPersistence } from '@rocket.chat/apps-engine/definition/accessors/IPersistence.ts';
+import type { IHttp, IHttpExtend } from '@rocket.chat/apps-engine/definition/accessors/IHttp.ts';
+import type { IConfigurationExtend } from '@rocket.chat/apps-engine/definition/accessors/IConfigurationExtend.ts';
+import type { ISlashCommand } from '@rocket.chat/apps-engine/definition/slashcommands/ISlashCommand.ts';
+import type { IProcessor } from '@rocket.chat/apps-engine/definition/scheduler/IProcessor.ts';
+import type { IApi } from '@rocket.chat/apps-engine/definition/api/IApi.ts';
+import type { IVideoConfProvider } from '@rocket.chat/apps-engine/definition/videoConfProviders/IVideoConfProvider.ts';
+
+import { Http } from './http.ts';
+import { HttpExtend } from './extenders/HttpExtender.ts';
+import * as Messenger from '../messenger.ts';
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { ModifyCreator } from './modify/ModifyCreator.ts';
+import { ModifyUpdater } from './modify/ModifyUpdater.ts';
+import { ModifyExtender } from './modify/ModifyExtender.ts';
+import { Notifier } from './notifier.ts';
+
+const httpMethods = ['get', 'post', 'put', 'delete', 'head', 'options', 'patch'] as const;
+
+// We need to create this object first thing, as we'll handle references to it later on
+if (!AppObjectRegistry.has('apiEndpoints')) {
+    AppObjectRegistry.set('apiEndpoints', []);
+}
+
+export class AppAccessors {
+    private defaultAppAccessors?: IAppAccessors;
+    private environmentRead?: IEnvironmentRead;
+    private environmentWriter?: IEnvironmentWrite;
+    private configModifier?: IConfigurationModify;
+    private configExtender?: IConfigurationExtend;
+    private reader?: IRead;
+    private modifier?: IModify;
+    private persistence?: IPersistence;
+    private creator?: ModifyCreator;
+    private updater?: ModifyUpdater;
+    private extender?: ModifyExtender;
+    private httpExtend: IHttpExtend = new HttpExtend();
+    private http?: IHttp;
+    private notifier?: INotifier;
+
+    private proxify: <T>(namespace: string, overrides?: Record<string, (...args: unknown[]) => unknown>) => T;
+
+    constructor(private readonly senderFn: typeof Messenger.sendRequest) {
+        this.proxify = <T>(namespace: string, overrides: Record<string, (...args: unknown[]) => unknown> = {}): T =>
+            new Proxy(
+                { __kind: `accessor:${namespace}` },
+                {
+                    get:
+                        (_target: unknown, prop: string) =>
+                        (...params: unknown[]) => {
+                            // We don't want to send a request for this prop
+                            if (prop === 'toJSON') {
+                                return {};
+                            }
+
+                            // If the prop is inteded to be overriden by the caller
+                            if (prop in overrides) {
+                                return overrides[prop].apply(undefined, params);
+                            }
+
+                            return senderFn({
+                                method: `accessor:${namespace}:${prop}`,
+                                params,
+                            })
+                                .then((response) => response.result)
+                                .catch((err) => { throw new Error(err.error) });
+                        },
+                },
+            ) as T;
+
+        this.http = new Http(this.getReader(), this.getPersistence(), this.httpExtend, this.getSenderFn());
+        this.notifier = new Notifier(this.getSenderFn());
+    }
+
+    public getSenderFn() {
+        return this.senderFn;
+    }
+
+    public getEnvironmentRead(): IEnvironmentRead {
+        if (!this.environmentRead) {
+            this.environmentRead = {
+                getSettings: () => this.proxify('getEnvironmentRead:getSettings'),
+                getServerSettings: () => this.proxify('getEnvironmentRead:getServerSettings'),
+                getEnvironmentVariables: () => this.proxify('getEnvironmentRead:getEnvironmentVariables'),
+            };
+        }
+
+        return this.environmentRead;
+    }
+
+    public getEnvironmentWrite() {
+        if (!this.environmentWriter) {
+            this.environmentWriter = {
+                getSettings: () => this.proxify('getEnvironmentWrite:getSettings'),
+                getServerSettings: () => this.proxify('getEnvironmentWrite:getServerSettings'),
+            };
+        }
+
+        return this.environmentWriter;
+    }
+
+    public getConfigurationModify() {
+        if (!this.configModifier) {
+            this.configModifier = {
+                scheduler: this.proxify('getConfigurationModify:scheduler'),
+                slashCommands: {
+                    _proxy: this.proxify('getConfigurationModify:slashCommands'),
+                    modifySlashCommand(slashcommand: ISlashCommand) {
+                        // Store the slashcommand instance to use when the Apps-Engine calls the slashcommand
+                        AppObjectRegistry.set(`slashcommand:${slashcommand.command}`, slashcommand);
+
+                        return this._proxy.modifySlashCommand(slashcommand);
+                    },
+                    disableSlashCommand(command: string) {
+                        return this._proxy.disableSlashCommand(command);
+                    },
+                    enableSlashCommand(command: string) {
+                        return this._proxy.enableSlashCommand(command);
+                    },
+                },
+                serverSettings: this.proxify('getConfigurationModify:serverSettings'),
+            };
+        }
+
+        return this.configModifier;
+    }
+
+    public getConfigurationExtend() {
+        if (!this.configExtender) {
+            const senderFn = this.senderFn;
+
+            this.configExtender = {
+                ui: this.proxify('getConfigurationExtend:ui'),
+                http: this.httpExtend,
+                settings: this.proxify('getConfigurationExtend:settings'),
+                externalComponents: this.proxify('getConfigurationExtend:externalComponents'),
+                api: {
+                    _proxy: this.proxify('getConfigurationExtend:api'),
+                    async provideApi(api: IApi) {
+                        const apiEndpoints = AppObjectRegistry.get<IApiEndpointMetadata[]>('apiEndpoints')!;
+
+                        api.endpoints.forEach((endpoint) => {
+                            endpoint._availableMethods = httpMethods.filter((method) => typeof endpoint[method] === 'function');
+
+                            // We need to keep a reference to the endpoint around for us to call the executor later
+                            AppObjectRegistry.set(`api:${endpoint.path}`, endpoint);
+                        });
+
+                        const result = await this._proxy.provideApi(api);
+
+                        // Let's call the listApis method to cache the info from the endpoints
+                        // Also, since this is a side-effect, we do it async so we can return to the caller
+                        senderFn({ method: 'accessor:api:listApis' })
+                            .then((response) => apiEndpoints.push(...(response.result as IApiEndpointMetadata[])))
+                            .catch((err) => err.error);
+
+                        return result;
+                    },
+                },
+                scheduler: {
+                    _proxy: this.proxify('getConfigurationExtend:scheduler'),
+                    registerProcessors(processors: IProcessor[]) {
+                        // Store the processor instance to use when the Apps-Engine calls the processor
+                        processors.forEach((processor) => {
+                            AppObjectRegistry.set(`scheduler:${processor.id}`, processor);
+                        });
+
+                        return this._proxy.registerProcessors(processors);
+                    },
+                },
+                videoConfProviders: {
+                    _proxy: this.proxify('getConfigurationExtend:videoConfProviders'),
+                    provideVideoConfProvider(provider: IVideoConfProvider) {
+                        // Store the videoConfProvider instance to use when the Apps-Engine calls the videoConfProvider
+                        AppObjectRegistry.set(`videoConfProvider:${provider.name}`, provider);
+
+                        return this._proxy.provideVideoConfProvider(provider);
+                    },
+                },
+                slashCommands: {
+                    _proxy: this.proxify('getConfigurationExtend:slashCommands'),
+                    provideSlashCommand(slashcommand: ISlashCommand) {
+                        // Store the slashcommand instance to use when the Apps-Engine calls the slashcommand
+                        AppObjectRegistry.set(`slashcommand:${slashcommand.command}`, slashcommand);
+
+                        return this._proxy.provideSlashCommand(slashcommand);
+                    },
+                },
+            };
+        }
+
+        return this.configExtender;
+    }
+
+    public getDefaultAppAccessors() {
+        if (!this.defaultAppAccessors) {
+            this.defaultAppAccessors = {
+                environmentReader: this.getEnvironmentRead(),
+                environmentWriter: this.getEnvironmentWrite(),
+                reader: this.getReader(),
+                http: this.getHttp(),
+                providedApiEndpoints: AppObjectRegistry.get<IApiEndpointMetadata[]>('apiEndpoints') as IApiEndpointMetadata[],
+            };
+        }
+
+        return this.defaultAppAccessors;
+    }
+
+    public getReader() {
+        if (!this.reader) {
+            this.reader = {
+                getEnvironmentReader: () => ({
+                    getSettings: () => this.proxify('getReader:getEnvironmentReader:getSettings'),
+                    getServerSettings: () => this.proxify('getReader:getEnvironmentReader:getServerSettings'),
+                    getEnvironmentVariables: () => this.proxify('getReader:getEnvironmentReader:getEnvironmentVariables'),
+                }),
+                getMessageReader: () => this.proxify('getReader:getMessageReader'),
+                getPersistenceReader: () => this.proxify('getReader:getPersistenceReader'),
+                getRoomReader: () => this.proxify('getReader:getRoomReader'),
+                getUserReader: () => this.proxify('getReader:getUserReader'),
+                getNotifier: () => this.getNotifier(),
+                getLivechatReader: () => this.proxify('getReader:getLivechatReader'),
+                getUploadReader: () => this.proxify('getReader:getUploadReader'),
+                getCloudWorkspaceReader: () => this.proxify('getReader:getCloudWorkspaceReader'),
+                getVideoConferenceReader: () => this.proxify('getReader:getVideoConferenceReader'),
+                getOAuthAppsReader: () => this.proxify('getReader:getOAuthAppsReader'),
+                getThreadReader: () => this.proxify('getReader:getThreadReader'),
+                getRoleReader: () => this.proxify('getReader:getRoleReader'),
+            };
+        }
+
+        return this.reader;
+    }
+
+    public getModifier() {
+        if (!this.modifier) {
+            this.modifier = {
+                getCreator: this.getCreator.bind(this),
+                getUpdater: this.getUpdater.bind(this),
+                getExtender: this.getExtender.bind(this),
+                getDeleter: () => this.proxify('getModifier:getDeleter'),
+                getNotifier: () => this.getNotifier(),
+                getUiController: () => this.proxify('getModifier:getUiController'),
+                getScheduler: () => this.proxify('getModifier:getScheduler'),
+                getOAuthAppsModifier: () => this.proxify('getModifier:getOAuthAppsModifier'),
+                getModerationModifier: () => this.proxify('getModifier:getModerationModifier'),
+            };
+        }
+
+        return this.modifier;
+    }
+
+    public getPersistence() {
+        if (!this.persistence) {
+            this.persistence = this.proxify('getPersistence');
+        }
+
+        return this.persistence;
+    }
+
+    public getHttp() {
+        return this.http;
+    }
+
+    private getCreator() {
+        if (!this.creator) {
+            this.creator = new ModifyCreator(this.senderFn);
+        }
+
+        return this.creator;
+    }
+
+    private getUpdater() {
+        if (!this.updater) {
+            this.updater = new ModifyUpdater(this.senderFn);
+        }
+
+        return this.updater;
+    }
+
+    private getExtender() {
+        if (!this.extender) {
+            this.extender = new ModifyExtender(this.senderFn);
+        }
+
+        return this.extender;
+    }
+
+    private getNotifier() {
+        return this.notifier;
+    }
+}
+
+export const AppAccessorsInstance = new AppAccessors(Messenger.sendRequest);
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts
new file mode 100644
index 000000000000..06797551a621
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts
@@ -0,0 +1,344 @@
+import type { IModifyCreator } from '@rocket.chat/apps-engine/definition/accessors/IModifyCreator.ts';
+import type { IUploadCreator } from '@rocket.chat/apps-engine/definition/accessors/IUploadCreator.ts';
+import type { IEmailCreator } from '@rocket.chat/apps-engine/definition/accessors/IEmailCreator.ts';
+import type { ILivechatCreator } from '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { IBotUser } from '@rocket.chat/apps-engine/definition/users/IBotUser.ts';
+import type { UserType as _UserType } from '@rocket.chat/apps-engine/definition/users/UserType.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+import type { IMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/IMessageBuilder.ts';
+import type { IRoomBuilder } from '@rocket.chat/apps-engine/definition/accessors/IRoomBuilder.ts';
+import type { IUserBuilder } from '@rocket.chat/apps-engine/definition/accessors/IUserBuilder.ts';
+import type { IVideoConferenceBuilder } from '@rocket.chat/apps-engine/definition/accessors/IVideoConferenceBuilder.ts';
+import type { RoomType as _RoomType } from '@rocket.chat/apps-engine/definition/rooms/RoomType.ts';
+import type { ILivechatMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/ILivechatMessageBuilder.ts';
+import type { UIHelper as _UIHelper } from '@rocket.chat/apps-engine/server/misc/UIHelper.ts';
+
+import * as Messenger from '../../messenger.ts';
+
+import { BlockBuilder } from '../builders/BlockBuilder.ts';
+import { MessageBuilder } from '../builders/MessageBuilder.ts';
+import { DiscussionBuilder, IDiscussionBuilder } from '../builders/DiscussionBuilder.ts';
+import { ILivechatMessage, LivechatMessageBuilder } from '../builders/LivechatMessageBuilder.ts';
+import { RoomBuilder } from '../builders/RoomBuilder.ts';
+import { UserBuilder } from '../builders/UserBuilder.ts';
+import { AppVideoConference, VideoConferenceBuilder } from '../builders/VideoConferenceBuilder.ts';
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+import { require } from '../../../lib/require.ts';
+
+const { UIHelper } = require('@rocket.chat/apps-engine/server/misc/UIHelper.js') as { UIHelper: typeof _UIHelper };
+const { RoomType } = require('@rocket.chat/apps-engine/definition/rooms/RoomType.js') as { RoomType: typeof _RoomType };
+const { UserType } = require('@rocket.chat/apps-engine/definition/users/UserType.js') as { UserType: typeof _UserType };
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class ModifyCreator implements IModifyCreator {
+    constructor(private readonly senderFn: typeof Messenger.sendRequest) { }
+
+    getLivechatCreator(): ILivechatCreator {
+        return new Proxy(
+            { __kind: 'getLivechatCreator' },
+            {
+                get: (_target: unknown, prop: string) => {
+                    // It's not worthwhile to make an asynchronous request for such a simple method
+                    if (prop === 'createToken') {
+                        return () => Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+                    }
+
+                    if (prop === 'toJSON') {
+                        return () => ({});
+                    }
+
+                    return (...params: unknown[]) =>
+                        this.senderFn({
+                            method: `accessor:getModifier:getCreator:getLivechatCreator:${prop}`,
+                            params,
+                        })
+                            .then((response) => response.result)
+                            .catch((err) => {
+                                throw new Error(err.error);
+                            });
+                },
+            },
+        ) as ILivechatCreator;
+    }
+
+    getUploadCreator(): IUploadCreator {
+        return new Proxy(
+            { __kind: 'getUploadCreator' },
+            {
+                get:
+                    (_target: unknown, prop: string) =>
+                        (...params: unknown[]) =>
+                            prop === 'toJSON'
+                                ? {}
+                                : this.senderFn({
+                                    method: `accessor:getModifier:getCreator:getUploadCreator:${prop}`,
+                                    params,
+                                })
+                                    .then((response) => response.result)
+                                    .catch((err) => {
+                                        throw new Error(err.error);
+                                    }),
+            },
+        ) as IUploadCreator;
+    }
+
+    getEmailCreator(): IEmailCreator {
+        return new Proxy(
+            { __kind: 'getEmailCreator' },
+            {
+                get: (_target: unknown, prop: string) => 
+                        (...params: unknown[]) =>
+                            prop === 'toJSON'
+                                ? {}
+                                : this.senderFn({
+                                    method: `accessor:getModifier:getCreator:getEmailCreator:${prop}`,
+                                    params
+                                })
+                                    .then((response) => response.result)
+                                    .catch((err) => {
+                                        throw new Error(err.error);
+                                    }),
+            }
+        )
+    }
+
+    getBlockBuilder() {
+        return new BlockBuilder();
+    }
+
+    startMessage(data?: IMessage) {
+        if (data) {
+            delete data.id;
+        }
+
+        return new MessageBuilder(data);
+    }
+
+    startLivechatMessage(data?: ILivechatMessage) {
+        if (data) {
+            delete data.id;
+        }
+
+        return new LivechatMessageBuilder(data);
+    }
+
+    startRoom(data?: IRoom) {
+        if (data) {
+            // @ts-ignore - this has been imported from the Apps-Engine
+            delete data.id;
+        }
+
+        return new RoomBuilder(data);
+    }
+
+    startDiscussion(data?: Partial<IRoom>) {
+        if (data) {
+            delete data.id;
+        }
+
+        return new DiscussionBuilder(data);
+    }
+
+    startVideoConference(data?: Partial<AppVideoConference>) {
+        return new VideoConferenceBuilder(data);
+    }
+
+    startBotUser(data?: Partial<IBotUser>) {
+        if (data) {
+            delete data.id;
+
+            const { roles } = data;
+
+            if (roles?.length) {
+                const hasRole = roles
+                    .map((role: string) => role.toLocaleLowerCase())
+                    .some((role: string) => role === 'admin' || role === 'owner' || role === 'moderator');
+
+                if (hasRole) {
+                    throw new Error('Invalid role assigned to the user. Should not be admin, owner or moderator.');
+                }
+            }
+
+            if (!data.type) {
+                data.type = UserType.BOT;
+            }
+        }
+
+        return new UserBuilder(data);
+    }
+
+    public finish(
+        builder: IMessageBuilder | ILivechatMessageBuilder | IRoomBuilder | IDiscussionBuilder | IVideoConferenceBuilder | IUserBuilder,
+    ): Promise<string> {
+        switch (builder.kind) {
+            case RocketChatAssociationModel.MESSAGE:
+                return this._finishMessage(builder as IMessageBuilder);
+            case RocketChatAssociationModel.LIVECHAT_MESSAGE:
+                return this._finishLivechatMessage(builder as ILivechatMessageBuilder);
+            case RocketChatAssociationModel.ROOM:
+                return this._finishRoom(builder as IRoomBuilder);
+            case RocketChatAssociationModel.DISCUSSION:
+                return this._finishDiscussion(builder as IDiscussionBuilder);
+            case RocketChatAssociationModel.VIDEO_CONFERENCE:
+                return this._finishVideoConference(builder as IVideoConferenceBuilder);
+            case RocketChatAssociationModel.USER:
+                return this._finishUser(builder as IUserBuilder);
+            default:
+                throw new Error('Invalid builder passed to the ModifyCreator.finish function.');
+        }
+    }
+
+    private async _finishMessage(builder: IMessageBuilder): Promise<string> {
+        const result = builder.getMessage();
+        delete result.id;
+
+        if (!result.sender || !result.sender.id) {
+            const response = await this.senderFn({
+                method: 'bridges:getUserBridge:doGetAppUser',
+                params: ['APP_ID'],
+            });
+
+            const appUser = response.result;
+
+            if (!appUser) {
+                throw new Error('Invalid sender assigned to the message.');
+            }
+
+            result.sender = appUser;
+        }
+
+        if (result.blocks?.length) {
+            // Can we move this elsewhere? This AppObjectRegistry usage doesn't really belong here, but where?
+            result.blocks = UIHelper.assignIds(result.blocks, AppObjectRegistry.get('id') || '');
+        }
+
+        const response = await this.senderFn({
+            method: 'bridges:getMessageBridge:doCreate',
+            params: [result, AppObjectRegistry.get('id')],
+        });
+
+        return String(response.result);
+    }
+
+    private async _finishLivechatMessage(builder: ILivechatMessageBuilder): Promise<string> {
+        if (builder.getSender() && !builder.getVisitor()) {
+            return this._finishMessage(builder.getMessageBuilder());
+        }
+
+        const result = builder.getMessage();
+        delete result.id;
+
+        if (!result.token && (!result.visitor || !result.visitor.token)) {
+            throw new Error('Invalid visitor sending the message');
+        }
+
+        result.token = result.visitor ? result.visitor.token : result.token;
+
+        const response = await this.senderFn({
+            method: 'bridges:getLivechatBridge:doCreateMessage',
+            params: [result, AppObjectRegistry.get('id')],
+        });
+
+        return String(response.result);
+    }
+
+    private async _finishRoom(builder: IRoomBuilder): Promise<string> {
+        const result = builder.getRoom();
+        delete result.id;
+
+        if (!result.type) {
+            throw new Error('Invalid type assigned to the room.');
+        }
+
+        if (result.type !== RoomType.LIVE_CHAT) {
+            if (!result.creator || !result.creator.id) {
+                throw new Error('Invalid creator assigned to the room.');
+            }
+        }
+
+        if (result.type !== RoomType.DIRECT_MESSAGE) {
+            if (result.type !== RoomType.LIVE_CHAT) {
+                if (!result.slugifiedName || !result.slugifiedName.trim()) {
+                    throw new Error('Invalid slugifiedName assigned to the room.');
+                }
+            }
+
+            if (!result.displayName || !result.displayName.trim()) {
+                throw new Error('Invalid displayName assigned to the room.');
+            }
+        }
+
+        const response = await this.senderFn({
+            method: 'bridges:getRoomBridge:doCreate',
+            params: [result, builder.getMembersToBeAddedUsernames(), AppObjectRegistry.get('id')],
+        });
+
+        return String(response.result);
+    }
+
+    private async _finishDiscussion(builder: IDiscussionBuilder): Promise<string> {
+        const room = builder.getRoom();
+        delete room.id;
+
+        if (!room.creator || !room.creator.id) {
+            throw new Error('Invalid creator assigned to the discussion.');
+        }
+
+        if (!room.slugifiedName || !room.slugifiedName.trim()) {
+            throw new Error('Invalid slugifiedName assigned to the discussion.');
+        }
+
+        if (!room.displayName || !room.displayName.trim()) {
+            throw new Error('Invalid displayName assigned to the discussion.');
+        }
+
+        if (!room.parentRoom || !room.parentRoom.id) {
+            throw new Error('Invalid parentRoom assigned to the discussion.');
+        }
+
+        const response = await this.senderFn({
+            method: 'bridges:getRoomBridge:doCreateDiscussion',
+            params: [room, builder.getParentMessage(), builder.getReply(), builder.getMembersToBeAddedUsernames(), AppObjectRegistry.get('id')],
+        });
+
+        return String(response.result);
+    }
+
+    private async _finishVideoConference(builder: IVideoConferenceBuilder): Promise<string> {
+        const videoConference = builder.getVideoConference();
+
+        if (!videoConference.createdBy) {
+            throw new Error('Invalid creator assigned to the video conference.');
+        }
+
+        if (!videoConference.providerName?.trim()) {
+            throw new Error('Invalid provider name assigned to the video conference.');
+        }
+
+        if (!videoConference.rid) {
+            throw new Error('Invalid roomId assigned to the video conference.');
+        }
+
+        const response = await this.senderFn({
+            method: 'bridges:getVideoConferenceBridge:doCreate',
+            params: [videoConference, AppObjectRegistry.get('id')],
+        });
+
+        return String(response.result);
+    }
+
+    private async _finishUser(builder: IUserBuilder): Promise<string> {
+        const user = builder.getUser();
+
+        const response = await this.senderFn({
+            method: 'bridges:getUserBridge:doCreate',
+            params: [user, AppObjectRegistry.get('id')],
+        });
+
+        return String(response.result);
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyExtender.ts b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyExtender.ts
new file mode 100644
index 000000000000..c0793d015c64
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyExtender.ts
@@ -0,0 +1,93 @@
+import type { IModifyExtender } from '@rocket.chat/apps-engine/definition/accessors/IModifyExtender.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IMessageExtender } from '@rocket.chat/apps-engine/definition/accessors/IMessageExtender.ts';
+import type { IRoomExtender } from '@rocket.chat/apps-engine/definition/accessors/IRoomExtender.ts';
+import type { IVideoConferenceExtender } from '@rocket.chat/apps-engine/definition/accessors/IVideoConferenceExtend.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+import type { VideoConference } from '@rocket.chat/apps-engine/definition/videoConferences/IVideoConference.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+
+import * as Messenger from '../../messenger.ts';
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+import { MessageExtender } from '../extenders/MessageExtender.ts';
+import { RoomExtender } from '../extenders/RoomExtender.ts';
+import { VideoConferenceExtender } from '../extenders/VideoConferenceExtend.ts';
+import { require } from '../../../lib/require.ts';
+
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class ModifyExtender implements IModifyExtender {
+    constructor(private readonly senderFn: typeof Messenger.sendRequest) {}
+
+    public async extendMessage(messageId: string, updater: IUser): Promise<IMessageExtender> {
+        const result = await this.senderFn({
+            method: 'bridges:getMessageBridge:doGetById',
+            params: [messageId, AppObjectRegistry.get('id')],
+        });
+
+        const msg = result.result as IMessage;
+
+        msg.editor = updater;
+        msg.editedAt = new Date();
+
+        return new MessageExtender(msg);
+    }
+
+    public async extendRoom(roomId: string, _updater: IUser): Promise<IRoomExtender> {
+        const result = await this.senderFn({
+            method: 'bridges:getRoomBridge:doGetById',
+            params: [roomId, AppObjectRegistry.get('id')],
+        });
+
+        const room = result.result as IRoom;
+
+        room.updatedAt = new Date();
+
+        return new RoomExtender(room);
+    }
+
+    public async extendVideoConference(id: string): Promise<IVideoConferenceExtender> {
+        const result = await this.senderFn({
+            method: 'bridges:getVideoConferenceBridge:doGetById',
+            params: [id, AppObjectRegistry.get('id')],
+        });
+
+        const call = result.result as VideoConference;
+
+        call._updatedAt = new Date();
+
+        return new VideoConferenceExtender(call);
+    }
+
+    public async finish(extender: IMessageExtender | IRoomExtender | IVideoConferenceExtender): Promise<void> {
+        switch (extender.kind) {
+            case RocketChatAssociationModel.MESSAGE:
+                await this.senderFn({
+                    method: 'bridges:getMessageBridge:doUpdate',
+                    params: [(extender as IMessageExtender).getMessage(), AppObjectRegistry.get('id')],
+                });
+                break;
+            case RocketChatAssociationModel.ROOM:
+                await this.senderFn({
+                    method: 'bridges:getRoomBridge:doUpdate',
+                    params: [
+                        (extender as IRoomExtender).getRoom(),
+                        (extender as IRoomExtender).getUsernamesOfMembersBeingAdded(),
+                        AppObjectRegistry.get('id'),
+                    ],
+                });
+                break;
+            case RocketChatAssociationModel.VIDEO_CONFERENCE:
+                await this.senderFn({
+                    method: 'bridges:getVideoConferenceBridge:doUpdate',
+                    params: [(extender as IVideoConferenceExtender).getVideoConference(), AppObjectRegistry.get('id')],
+                });
+                break;
+            default:
+                throw new Error('Invalid extender passed to the ModifyExtender.finish function.');
+        }
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts
new file mode 100644
index 000000000000..8befe7bfa983
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts
@@ -0,0 +1,153 @@
+import type { IModifyUpdater } from '@rocket.chat/apps-engine/definition/accessors/IModifyUpdater.ts';
+import type { ILivechatUpdater } from '@rocket.chat/apps-engine/definition/accessors/ILivechatUpdater.ts';
+import type { IUserUpdater } from '@rocket.chat/apps-engine/definition/accessors/IUserUpdater.ts';
+import type { IMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/IMessageBuilder.ts';
+import type { IRoomBuilder } from '@rocket.chat/apps-engine/definition/accessors/IRoomBuilder.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+
+import type { UIHelper as _UIHelper } from '@rocket.chat/apps-engine/server/misc/UIHelper.ts';
+import type { RoomType as _RoomType } from '@rocket.chat/apps-engine/definition/rooms/RoomType.ts';
+import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
+
+import * as Messenger from '../../messenger.ts';
+
+import { MessageBuilder } from '../builders/MessageBuilder.ts';
+import { RoomBuilder } from '../builders/RoomBuilder.ts';
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+
+import { require } from '../../../lib/require.ts';
+
+const { UIHelper } = require('@rocket.chat/apps-engine/server/misc/UIHelper.js') as { UIHelper: typeof _UIHelper };
+const { RoomType } = require('@rocket.chat/apps-engine/definition/rooms/RoomType.js') as { RoomType: typeof _RoomType };
+const { RocketChatAssociationModel } = require('@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.js') as {
+    RocketChatAssociationModel: typeof _RocketChatAssociationModel;
+};
+
+export class ModifyUpdater implements IModifyUpdater {
+    constructor(private readonly senderFn: typeof Messenger.sendRequest) { }
+
+    public getLivechatUpdater(): ILivechatUpdater {
+        return new Proxy(
+            { __kind: 'getLivechatUpdater' },
+            {
+                get:
+                    (_target: unknown, prop: string) =>
+                        (...params: unknown[]) =>
+                            prop === 'toJSON'
+                                ? {}
+                                : this.senderFn({
+                                    method: `accessor:getModifier:getUpdater:getLivechatUpdater:${prop}`,
+                                    params,
+                                })
+                                    .then((response) => response.result)
+                                    .catch((err) => {
+                                        throw new Error(err.error);
+                                    }),
+            },
+        ) as ILivechatUpdater;
+    }
+
+    public getUserUpdater(): IUserUpdater {
+        return new Proxy(
+            { __kind: 'getUserUpdater' },
+            {
+                get:
+                    (_target: unknown, prop: string) =>
+                        (...params: unknown[]) =>
+                            prop === 'toJSON'
+                                ? {}
+                                : this.senderFn({
+                                    method: `accessor:getModifier:getUpdater:getUserUpdater:${prop}`,
+                                    params,
+                                })
+                                    .then((response) => response.result)
+                                    .catch((err) => {
+                                        throw new Error(err.error);
+                                    }),
+            },
+        ) as IUserUpdater;
+    }
+
+    public async message(messageId: string, _updater: IUser): Promise<IMessageBuilder> {
+        const response = await this.senderFn({
+            method: 'bridges:getMessageBridge:doGetById',
+            params: [messageId, AppObjectRegistry.get('id')],
+        });
+
+        return new MessageBuilder(response.result as IMessage);
+    }
+
+    public async room(roomId: string, _updater: IUser): Promise<IRoomBuilder> {
+        const response = await this.senderFn({
+            method: 'bridges:getRoomBridge:doGetById',
+            params: [roomId, AppObjectRegistry.get('id')],
+        });
+
+        return new RoomBuilder(response.result as IRoom);
+    }
+
+    public finish(builder: IMessageBuilder | IRoomBuilder): Promise<void> {
+        switch (builder.kind) {
+            case RocketChatAssociationModel.MESSAGE:
+                return this._finishMessage(builder as IMessageBuilder);
+            case RocketChatAssociationModel.ROOM:
+                return this._finishRoom(builder as IRoomBuilder);
+            default:
+                throw new Error('Invalid builder passed to the ModifyUpdater.finish function.');
+        }
+    }
+
+    private async _finishMessage(builder: IMessageBuilder): Promise<void> {
+        const result = builder.getMessage();
+
+        if (!result.id) {
+            throw new Error("Invalid message, can't update a message without an id.");
+        }
+
+        if (!result.sender?.id) {
+            throw new Error('Invalid sender assigned to the message.');
+        }
+
+        if (result.blocks?.length) {
+            result.blocks = UIHelper.assignIds(result.blocks, AppObjectRegistry.get('id') || '');
+        }
+
+        await this.senderFn({
+            method: 'bridges:getMessageBridge:doUpdate',
+            params: [result, AppObjectRegistry.get('id')],
+        });
+    }
+
+    private async _finishRoom(builder: IRoomBuilder): Promise<void> {
+        const result = builder.getRoom();
+
+        if (!result.id) {
+            throw new Error("Invalid room, can't update a room without an id.");
+        }
+
+        if (!result.type) {
+            throw new Error('Invalid type assigned to the room.');
+        }
+
+        if (result.type !== RoomType.LIVE_CHAT) {
+            if (!result.creator || !result.creator.id) {
+                throw new Error('Invalid creator assigned to the room.');
+            }
+
+            if (!result.slugifiedName || !result.slugifiedName.trim()) {
+                throw new Error('Invalid slugifiedName assigned to the room.');
+            }
+        }
+
+        if (!result.displayName || !result.displayName.trim()) {
+            throw new Error('Invalid displayName assigned to the room.');
+        }
+
+        await this.senderFn({
+            method: 'bridges:getRoomBridge:doUpdate',
+            params: [result, builder.getMembersToBeAddedUsernames(), AppObjectRegistry.get('id')],
+        });
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/notifier.ts b/packages/apps-engine/deno-runtime/lib/accessors/notifier.ts
new file mode 100644
index 000000000000..625d68c1039f
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/notifier.ts
@@ -0,0 +1,75 @@
+import type { IMessageBuilder, INotifier } from '@rocket.chat/apps-engine/definition/accessors';
+import type { ITypingOptions } from '@rocket.chat/apps-engine/definition/accessors/INotifier.ts';
+import type { _TypingScope } from '@rocket.chat/apps-engine/definition/accessors/INotifier.ts';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users';
+import { MessageBuilder } from './builders/MessageBuilder.ts';
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import * as Messenger from '../messenger.ts';
+import { require } from "../require.ts";
+
+const { TypingScope } = require('@rocket.chat/apps-engine/definition/accessors/INotifier.js') as {
+    TypingScope: typeof _TypingScope;
+};
+
+export class Notifier implements INotifier {
+    private senderFn: typeof Messenger.sendRequest;
+
+    constructor(senderFn: typeof Messenger.sendRequest) {
+        this.senderFn = senderFn;
+    }
+
+    public async notifyUser(user: IUser, message: IMessage): Promise<void> {
+        if (!message.sender || !message.sender.id) {
+            const appUser = await this.getAppUser();
+
+            message.sender = appUser;
+        }
+
+        await this.callMessageBridge('doNotifyUser', [user, message, AppObjectRegistry.get<string>('id')]);
+    }
+
+    public async notifyRoom(room: IRoom, message: IMessage): Promise<void> {
+        if (!message.sender || !message.sender.id) {
+            const appUser = await this.getAppUser();
+
+            message.sender = appUser;
+        }
+
+        await this.callMessageBridge('doNotifyRoom', [room, message, AppObjectRegistry.get<string>('id')]);
+    }
+
+    public async typing(options: ITypingOptions): Promise<() => Promise<void>> {
+        options.scope = options.scope || TypingScope.Room;
+
+        if (!options.username) {
+            const appUser = await this.getAppUser();
+            options.username = (appUser && appUser.name) || '';
+        }
+
+        const appId = AppObjectRegistry.get<string>('id');
+
+        await this.callMessageBridge('doTyping', [{ ...options, isTyping: true }, appId]);
+
+        return async () => {
+            await this.callMessageBridge('doTyping', [{ ...options, isTyping: false }, appId]);
+        };
+    }
+
+    public getMessageBuilder(): IMessageBuilder {
+        return new MessageBuilder();
+    }
+
+    private async callMessageBridge(method: string, params: Array<unknown>): Promise<void> {
+        await this.senderFn({
+            method: `bridges:getMessageBridge:${method}`,
+            params,
+        });
+    }
+
+    private async getAppUser(): Promise<IUser | undefined> {
+        const response = await this.senderFn({ method: 'bridges:getUserBridge:doGetAppUser', params: [AppObjectRegistry.get<string>('id')] });
+        return response.result;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/tests/AppAccessors.test.ts b/packages/apps-engine/deno-runtime/lib/accessors/tests/AppAccessors.test.ts
new file mode 100644
index 000000000000..04592eadd3db
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/tests/AppAccessors.test.ts
@@ -0,0 +1,122 @@
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { assertEquals } from 'https://deno.land/std@0.203.0/assert/assert_equals.ts';
+
+import { AppAccessors } from '../mod.ts';
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+
+describe('AppAccessors', () => {
+    let appAccessors: AppAccessors;
+    const senderFn = (r: object) =>
+        Promise.resolve({
+            id: Math.random().toString(36).substring(2),
+            jsonrpc: '2.0',
+            result: r,
+            serialize() {
+                return JSON.stringify(this);
+            },
+        });
+
+    beforeEach(() => {
+        appAccessors = new AppAccessors(senderFn);
+        AppObjectRegistry.clear();
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+    });
+
+    it('creates the correct format for IRead calls', async () => {
+        const roomRead = appAccessors.getReader().getRoomReader();
+        const room = await roomRead.getById('123');
+
+        assertEquals(room, {
+            params: ['123'],
+            method: 'accessor:getReader:getRoomReader:getById',
+        });
+    });
+
+    it('creates the correct format for IEnvironmentRead calls from IRead', async () => {
+        const reader = appAccessors.getReader().getEnvironmentReader().getEnvironmentVariables();
+        const room = await reader.getValueByName('NODE_ENV');
+
+        assertEquals(room, {
+            params: ['NODE_ENV'],
+            method: 'accessor:getReader:getEnvironmentReader:getEnvironmentVariables:getValueByName',
+        });
+    });
+
+    it('creates the correct format for IEvironmentRead calls', async () => {
+        const envRead = appAccessors.getEnvironmentRead();
+        const env = await envRead.getServerSettings().getValueById('123');
+
+        assertEquals(env, {
+            params: ['123'],
+            method: 'accessor:getEnvironmentRead:getServerSettings:getValueById',
+        });
+    });
+
+    it('creates the correct format for IEvironmentWrite calls', async () => {
+        const envRead = appAccessors.getEnvironmentWrite();
+        const env = await envRead.getServerSettings().incrementValue('123', 6);
+
+        assertEquals(env, {
+            params: ['123', 6],
+            method: 'accessor:getEnvironmentWrite:getServerSettings:incrementValue',
+        });
+    });
+
+    it('creates the correct format for IConfigurationModify calls', async () => {
+        const configModify = appAccessors.getConfigurationModify();
+        const command = await configModify.slashCommands.modifySlashCommand({
+            command: 'test',
+            i18nDescription: 'test',
+            i18nParamsExample: 'test',
+            providesPreview: true,
+        });
+
+        assertEquals(command, {
+            params: [
+                {
+                    command: 'test',
+                    i18nDescription: 'test',
+                    i18nParamsExample: 'test',
+                    providesPreview: true,
+                },
+            ],
+            method: 'accessor:getConfigurationModify:slashCommands:modifySlashCommand',
+        });
+    });
+
+    it('correctly stores a reference to a slashcommand object and sends a request via proxy', async () => {
+        const configExtend = appAccessors.getConfigurationExtend();
+
+        const slashcommand = {
+            command: 'test',
+            i18nDescription: 'test',
+            i18nParamsExample: 'test',
+            providesPreview: true,
+            executor() {
+                return Promise.resolve();
+            },
+        };
+
+        const result = await configExtend.slashCommands.provideSlashCommand(slashcommand);
+
+        assertEquals(AppObjectRegistry.get('slashcommand:test'), slashcommand);
+
+        // The function will not be serialized and sent to the main process
+        delete result.params[0].executor;
+
+        assertEquals(result, {
+            method: 'accessor:getConfigurationExtend:slashCommands:provideSlashCommand',
+            params: [
+                {
+                    command: 'test',
+                    i18nDescription: 'test',
+                    i18nParamsExample: 'test',
+                    providesPreview: true,
+                },
+            ],
+        });
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyCreator.test.ts b/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyCreator.test.ts
new file mode 100644
index 000000000000..5927869e6c84
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyCreator.test.ts
@@ -0,0 +1,106 @@
+// deno-lint-ignore-file no-explicit-any
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { assertSpyCall, spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
+import { assert, assertEquals, assertNotInstanceOf } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+import { ModifyCreator } from '../modify/ModifyCreator.ts';
+
+describe('ModifyCreator', () => {
+    const senderFn = (r: any) =>
+        Promise.resolve({
+            id: Math.random().toString(36).substring(2),
+            jsonrpc: '2.0',
+            result: r,
+            serialize() {
+                return JSON.stringify(this);
+            },
+        });
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('id', 'deno-test');
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+    });
+
+    it('sends the correct payload in the request to create a message', async () => {
+        const spying = spy(senderFn);
+        const modifyCreator = new ModifyCreator(spying);
+        const messageBuilder = modifyCreator.startMessage();
+
+        // Importing types from the Apps-Engine is problematic, so we'll go with `any` here
+        messageBuilder
+            .setRoom({ id: '123' } as any)
+            .setSender({ id: '456' } as any)
+            .setText('Hello World')
+            .setUsernameAlias('alias')
+            .setAvatarUrl('https://avatars.com/123');
+
+        // We can't get a legitimate return value here, so we ignore it
+        // but we need to know that the request sent was well formed
+        await modifyCreator.finish(messageBuilder);
+
+        assertSpyCall(spying, 0, {
+            args: [
+                {
+                    method: 'bridges:getMessageBridge:doCreate',
+                    params: [
+                        {
+                            room: { id: '123' },
+                            sender: { id: '456' },
+                            text: 'Hello World',
+                            alias: 'alias',
+                            avatarUrl: 'https://avatars.com/123',
+                        },
+                        'deno-test',
+                    ],
+                },
+            ],
+        });
+    });
+
+    it('sends the correct payload in the request to upload a buffer', async () => {
+        const modifyCreator = new ModifyCreator(senderFn);
+
+        const result = await modifyCreator.getUploadCreator().uploadBuffer(new Uint8Array([1, 2, 3, 4]), 'text/plain');
+
+        assertEquals(result, {
+            method: 'accessor:getModifier:getCreator:getUploadCreator:uploadBuffer',
+            params: [new Uint8Array([1, 2, 3, 4]), 'text/plain'],
+        });
+    });
+
+    it('sends the correct payload in the request to create a visitor', async () => {
+        const modifyCreator = new ModifyCreator(senderFn);
+
+        const result = (await modifyCreator.getLivechatCreator().createVisitor({
+            token: 'random token',
+            username: 'random username for visitor',
+            name: 'Random Visitor',
+        })) as any; // We modified the send function so it changed the original return type of the function
+
+        assertEquals(result, {
+            method: 'accessor:getModifier:getCreator:getLivechatCreator:createVisitor',
+            params: [
+                {
+                    token: 'random token',
+                    username: 'random username for visitor',
+                    name: 'Random Visitor',
+                },
+            ],
+        });
+    });
+
+    // This test is important because if we return a promise we break API compatibility
+    it('does not return a promise for calls of the createToken() method of the LivechatCreator', () => {
+        const modifyCreator = new ModifyCreator(senderFn);
+
+        const result = modifyCreator.getLivechatCreator().createToken();
+
+        assertNotInstanceOf(result, Promise);
+        assert(typeof result === 'string', `Expected "${result}" to be of type "string", but got "${typeof result}"`);
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyExtender.test.ts b/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyExtender.test.ts
new file mode 100644
index 000000000000..1ec056e02ce3
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyExtender.test.ts
@@ -0,0 +1,120 @@
+// deno-lint-ignore-file no-explicit-any
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { assertSpyCall, spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
+
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+import { ModifyExtender } from '../modify/ModifyExtender.ts';
+
+describe('ModifyExtender', () => {
+    let extender: ModifyExtender;
+
+    const senderFn = (r: any) =>
+        Promise.resolve({
+            id: Math.random().toString(36).substring(2),
+            jsonrpc: '2.0',
+            result: structuredClone(r),
+            serialize() {
+                return JSON.stringify(this);
+            },
+        });
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('id', 'deno-test');
+        extender = new ModifyExtender(senderFn);
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+    });
+
+    it('correctly formats requests for the extend message requests', async () => {
+        const _spy = spy(extender, 'senderFn' as keyof ModifyExtender);
+
+        const messageExtender = await extender.extendMessage('message-id', { _id: 'user-id' } as any);
+
+        assertSpyCall(_spy, 0, {
+            args: [
+                {
+                    method: 'bridges:getMessageBridge:doGetById',
+                    params: ['message-id', 'deno-test'],
+                },
+            ],
+        });
+
+        messageExtender.addCustomField('key', 'value');
+
+        await extender.finish(messageExtender);
+
+        assertSpyCall(_spy, 1, {
+            args: [
+                {
+                    method: 'bridges:getMessageBridge:doUpdate',
+                    params: [messageExtender.getMessage(), 'deno-test'],
+                },
+            ],
+        });
+
+        _spy.restore();
+    });
+
+    it('correctly formats requests for the extend room requests', async () => {
+        const _spy = spy(extender, 'senderFn' as keyof ModifyExtender);
+
+        const roomExtender = await extender.extendRoom('room-id', { _id: 'user-id' } as any);
+
+        assertSpyCall(_spy, 0, {
+            args: [
+                {
+                    method: 'bridges:getRoomBridge:doGetById',
+                    params: ['room-id', 'deno-test'],
+                },
+            ],
+        });
+
+        roomExtender.addCustomField('key', 'value');
+
+        await extender.finish(roomExtender);
+
+        assertSpyCall(_spy, 1, {
+            args: [
+                {
+                    method: 'bridges:getRoomBridge:doUpdate',
+                    params: [roomExtender.getRoom(), [], 'deno-test'],
+                },
+            ],
+        });
+
+        _spy.restore();
+    });
+
+    it('correctly formats requests for the extend video conference requests', async () => {
+        const _spy = spy(extender, 'senderFn' as keyof ModifyExtender);
+
+        const videoConferenceExtender = await extender.extendVideoConference('video-conference-id');
+
+        assertSpyCall(_spy, 0, {
+            args: [
+                {
+                    method: 'bridges:getVideoConferenceBridge:doGetById',
+                    params: ['video-conference-id', 'deno-test'],
+                },
+            ],
+        });
+
+        videoConferenceExtender.setStatus(4);
+
+        await extender.finish(videoConferenceExtender);
+
+        assertSpyCall(_spy, 1, {
+            args: [
+                {
+                    method: 'bridges:getVideoConferenceBridge:doUpdate',
+                    params: [videoConferenceExtender.getVideoConference(), 'deno-test'],
+                },
+            ],
+        });
+
+        _spy.restore();
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyUpdater.test.ts b/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyUpdater.test.ts
new file mode 100644
index 000000000000..313275c967cf
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/accessors/tests/ModifyUpdater.test.ts
@@ -0,0 +1,128 @@
+// deno-lint-ignore-file no-explicit-any
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { assertSpyCall, spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
+import { assertEquals } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+
+import { AppObjectRegistry } from '../../../AppObjectRegistry.ts';
+import { ModifyUpdater } from '../modify/ModifyUpdater.ts';
+
+describe('ModifyUpdater', () => {
+    let modifyUpdater: ModifyUpdater;
+
+    const senderFn = (r: any) =>
+        Promise.resolve({
+            id: Math.random().toString(36).substring(2),
+            jsonrpc: '2.0',
+            result: structuredClone(r),
+            serialize() {
+                return JSON.stringify(this);
+            },
+        });
+
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('id', 'deno-test');
+        modifyUpdater = new ModifyUpdater(senderFn);
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+    });
+
+    it('correctly formats requests for the update message flow', async () => {
+        const _spy = spy(modifyUpdater, 'senderFn' as keyof ModifyUpdater);
+
+        const messageBuilder = await modifyUpdater.message('123', { id: '456' } as any);
+
+        assertSpyCall(_spy, 0, {
+            args: [
+                {
+                    method: 'bridges:getMessageBridge:doGetById',
+                    params: ['123', 'deno-test'],
+                },
+            ],
+        });
+
+        messageBuilder.setUpdateData(
+            {
+                id: '123',
+                room: { id: '123' },
+                sender: { id: '456' },
+                text: 'Hello World',
+            },
+            {
+                id: '456',
+            },
+        );
+
+        await modifyUpdater.finish(messageBuilder);
+
+        assertSpyCall(_spy, 1, {
+            args: [
+                {
+                    method: 'bridges:getMessageBridge:doUpdate',
+                    params: [messageBuilder.getMessage(), 'deno-test'],
+                },
+            ],
+        });
+
+        _spy.restore();
+    });
+
+    it('correctly formats requests for the update room flow', async () => {
+        const _spy = spy(modifyUpdater, 'senderFn' as keyof ModifyUpdater);
+
+        const roomBuilder = await modifyUpdater.room('123', { id: '456' } as any);
+
+        assertSpyCall(_spy, 0, {
+            args: [
+                {
+                    method: 'bridges:getRoomBridge:doGetById',
+                    params: ['123', 'deno-test'],
+                },
+            ],
+        });
+
+        roomBuilder.setData({
+            id: '123',
+            type: 'c',
+            displayName: 'Test Room',
+            slugifiedName: 'test-room',
+            creator: { id: '456' },
+        });
+
+        roomBuilder.setMembersToBeAddedByUsernames(['username1', 'username2']);
+
+        // We need to sneak in the id as the `modifyUpdater.room` call won't have legitimate data
+        roomBuilder.getRoom().id = '123';
+
+        await modifyUpdater.finish(roomBuilder);
+
+        assertSpyCall(_spy, 1, {
+            args: [
+                {
+                    method: 'bridges:getRoomBridge:doUpdate',
+                    params: [roomBuilder.getRoom(), roomBuilder.getMembersToBeAddedUsernames(), 'deno-test'],
+                },
+            ],
+        });
+    });
+
+    it('correctly formats requests to UserUpdater methods', async () => {
+        const result = await modifyUpdater.getUserUpdater().updateStatusText({ id: '123' } as any, 'Hello World') as any;
+
+        assertEquals(result, {
+            method: 'accessor:getModifier:getUpdater:getUserUpdater:updateStatusText',
+            params: [{ id: '123' }, 'Hello World'],
+        });
+    });
+
+    it('correctly formats requests to LivechatUpdater methods', async () => {
+        const result = await modifyUpdater.getLivechatUpdater().closeRoom({ id: '123' } as any, 'close it!') as any;
+
+        assertEquals(result, {
+            method: 'accessor:getModifier:getUpdater:getLivechatUpdater:closeRoom',
+            params: [{ id: '123' }, 'close it!'],
+        });
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/lib/ast/mod.ts b/packages/apps-engine/deno-runtime/lib/ast/mod.ts
new file mode 100644
index 000000000000..09f4994f2bad
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/ast/mod.ts
@@ -0,0 +1,64 @@
+import { generate } from "astring";
+// @deno-types="../../acorn.d.ts"
+import { Program, parse } from "acorn";
+// @deno-types="../../acorn-walk.d.ts"
+import { fullAncestor } from "acorn-walk";
+
+import * as operations from "./operations.ts";
+import type { WalkerState } from "./operations.ts";
+
+function fixAst(ast: Program): boolean {
+    const pendingOperations = [
+        operations.fixLivechatIsOnlineCalls,
+        operations.checkReassignmentOfModifiedIdentifiers,
+        operations.fixRoomUsernamesCalls,
+    ];
+
+    // Have we touched the tree?
+    let isModified = false;
+
+    while (pendingOperations.length) {
+        const ops = pendingOperations.splice(0);
+        const state: WalkerState = {
+            isModified: false,
+            functionIdentifiers: new Set<string>(),
+        };
+
+        fullAncestor(ast, (node, state, ancestors, type) => {
+            ops.forEach(operation => operation(node, state, ancestors, type));
+        }, undefined, state);
+
+        if (state.isModified) {
+            isModified = true;
+        }
+
+        if (state.functionIdentifiers.size) {
+            pendingOperations.push(
+                operations.buildFixModifiedFunctionsOperation(state.functionIdentifiers),
+                operations.checkReassignmentOfModifiedIdentifiers
+            );
+        }
+    }
+
+    return isModified;
+}
+
+export function fixBrokenSynchronousAPICalls(appSource: string): string {
+    const astRootNode = parse(appSource, {
+        ecmaVersion: 2017,
+        // Allow everything, we don't want to complain if code is badly written
+        // Also, since the code itself has been transpiled, the chance of getting
+        // shenanigans is lower
+        allowReserved: true,
+        allowReturnOutsideFunction: true,
+        allowImportExportEverywhere: true,
+        allowAwaitOutsideFunction: true,
+        allowSuperOutsideMethod: true,
+    });
+
+    if (fixAst(astRootNode)) {
+        return generate(astRootNode);
+    }
+
+    return appSource;
+}
diff --git a/packages/apps-engine/deno-runtime/lib/ast/operations.ts b/packages/apps-engine/deno-runtime/lib/ast/operations.ts
new file mode 100644
index 000000000000..d3886348041f
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/ast/operations.ts
@@ -0,0 +1,239 @@
+// @deno-types="../../acorn.d.ts"
+import { AnyNode, AssignmentExpression, AwaitExpression, Expression, Function, Identifier, MethodDefinition, Property } from 'acorn';
+// @deno-types="../../acorn-walk.d.ts"
+import { FullAncestorWalkerCallback } from 'acorn-walk';
+
+export type WalkerState = {
+    isModified: boolean;
+    functionIdentifiers: Set<string>;
+};
+
+export function getFunctionIdentifier(ancestors: AnyNode[], functionNodeIndex: number) {
+    const parent = ancestors[functionNodeIndex - 1];
+
+    // If there is a parent node and it's not a computed property, we can try to
+    // extract an identifier for our function from it. This needs to be done first
+    // because when functions are assigned to named symbols, this will be the only
+    // way to call it, even if the function itself has an identifier
+    // Consider the following block:
+    //
+    // const foo = function bar() {}
+    //
+    // Even though the function itself has a name, the only way to call it in the
+    // program is wiht `foo()`
+    if (parent && !(parent as Property | MethodDefinition).computed) {
+        // Several node types can have an id prop of type Identifier
+        const { id } = parent as unknown as { id?: Identifier };
+        if (id?.type === 'Identifier') {
+            return id.name;
+        }
+
+        // Usually assignments to object properties (MethodDefinition, Property)
+        const { key } = parent as MethodDefinition | Property;
+        if (key?.type === 'Identifier') {
+            return key.name;
+        }
+
+        // Variable assignments have left hand side that can be used as Identifier
+        const { left } = parent as AssignmentExpression;
+
+        // Simple assignment: `const fn = () => {}`
+        if (left?.type === 'Identifier') {
+            return left.name;
+        }
+
+        // Object property assignment: `obj.fn = () => {}`
+        if (left?.type === 'MemberExpression' && !left.computed) {
+            return (left.property as Identifier).name;
+        }
+    }
+
+    // nodeIndex needs to be the index of a Function node (either FunctionDeclaration or FunctionExpression)
+    const currentNode = ancestors[functionNodeIndex] as Function;
+
+    // Function declarations or expressions can be directly named
+    if (currentNode.id?.type === 'Identifier') {
+        return currentNode.id.name;
+    }
+}
+
+export function wrapWithAwait(node: Expression) {
+    if (!node.type.endsWith('Expression')) {
+        throw new Error(`Can't wrap "${node.type}" with await`);
+    }
+
+    const innerNode: Expression = { ...node };
+
+    node.type = 'AwaitExpression';
+    // starting here node has become an AwaitExpression
+    (node as AwaitExpression).argument = innerNode;
+
+    Object.keys(node).forEach((key) => !['type', 'argument'].includes(key) && delete node[key as keyof AnyNode]);
+}
+
+export function asyncifyScope(ancestors: AnyNode[], state: WalkerState) {
+    const functionNodeIndex = ancestors.findLastIndex((n) => 'async' in n);
+    if (functionNodeIndex === -1) return;
+
+    // At this point this is a node with an "async" property, so it has to be
+    // of type Function - let TS know about that
+    const functionScopeNode = ancestors[functionNodeIndex] as Function;
+
+    if (functionScopeNode.async) {
+        return;
+    }
+
+    functionScopeNode.async = true;
+
+    // If the parent of a function node is a call expression, we're talking about an IIFE
+    // Should we care about this case as well?
+    // const parentNode = ancestors[functionScopeIndex-1];
+    // if (parentNode?.type === 'CallExpression' && ancestors[functionScopeIndex-2] && ancestors[functionScopeIndex-2].type !== 'AwaitExpression') {
+    //   pendingOperations.push(buildFunctionPredicate(getFunctionIdentifier(ancestors, functionScopeIndex-2)));
+    // }
+
+    const identifier = getFunctionIdentifier(ancestors, functionNodeIndex);
+
+    // We can't fix calls of functions which name we can't determine at compile time
+    if (!identifier) return;
+
+    state.functionIdentifiers.add(identifier);
+}
+
+export function buildFixModifiedFunctionsOperation(functionIdentifiers: Set<string>): FullAncestorWalkerCallback<WalkerState> {
+    return function _fixModifiedFunctionsOperation(node, state, ancestors) {
+        if (node.type !== 'CallExpression') return;
+
+        let isWrappable = false;
+
+        // This node is a simple call to a function, like `fn()`
+        isWrappable = node.callee.type === 'Identifier' && functionIdentifiers.has(node.callee.name);
+
+        // This node is a call to an object property or instance method, like `obj.fn()`, but not computed like `obj[fn]()`
+        isWrappable ||=
+            node.callee.type === 'MemberExpression' &&
+            !node.callee.computed &&
+            node.callee.property?.type === 'Identifier' &&
+            functionIdentifiers.has(node.callee.property.name);
+
+        // This is a weird dereferencing technique used by bundlers, and since we'll be dealing with bundled sources we have to check for it
+        // e.g. `r=(0,fn)(e)`
+        if (!isWrappable && node.callee.type === 'SequenceExpression') {
+            const [, secondExpression] = node.callee.expressions;
+            isWrappable = secondExpression?.type === 'Identifier' && functionIdentifiers.has(secondExpression.name);
+            isWrappable ||=
+                secondExpression?.type === 'MemberExpression' &&
+                !secondExpression.computed &&
+                secondExpression.property.type === 'Identifier' &&
+                functionIdentifiers.has(secondExpression.property.name);
+        }
+
+        if (!isWrappable) return;
+
+        // ancestors[ancestors.length-1] === node, so here we're checking for parent node
+        const parentNode = ancestors[ancestors.length - 2];
+        if (!parentNode || parentNode.type === 'AwaitExpression') return;
+
+        wrapWithAwait(node);
+        asyncifyScope(ancestors, state);
+
+        state.isModified = true;
+    };
+}
+
+export const checkReassignmentOfModifiedIdentifiers: FullAncestorWalkerCallback<WalkerState> = (node, { functionIdentifiers }, _ancestors) => {
+    if (node.type === 'AssignmentExpression') {
+        if (node.operator !== '=') return;
+
+        let identifier = '';
+
+        if (node.left.type === 'Identifier') identifier = node.left.name;
+
+        if (node.left.type === 'MemberExpression' && !node.left.computed) {
+            identifier = (node.left.property as Identifier).name;
+        }
+
+        if (!identifier || node.right.type !== 'Identifier' || !functionIdentifiers.has(node.right.name)) return;
+
+        functionIdentifiers.add(identifier);
+
+        return;
+    }
+
+    if (node.type === 'VariableDeclarator') {
+        if (node.id.type !== 'Identifier' || functionIdentifiers.has(node.id.name)) return;
+
+        if (node.init?.type !== 'Identifier' || !functionIdentifiers.has(node.init?.name)) return;
+
+        functionIdentifiers.add(node.id.name);
+
+        return;
+    }
+
+    // "Property" is for plain objects, "PropertyDefinition" is for classes
+    // but both share the same structure
+    if (node.type === 'Property' || node.type === 'PropertyDefinition') {
+        if (node.key.type !== 'Identifier' || functionIdentifiers.has(node.key.name)) return;
+
+        if (node.value?.type !== 'Identifier' || !functionIdentifiers.has(node.value.name)) return;
+
+        functionIdentifiers.add(node.key.name);
+
+        return;
+    }
+};
+
+export const fixLivechatIsOnlineCalls: FullAncestorWalkerCallback<WalkerState> = (node, state, ancestors) => {
+    if (node.type !== 'MemberExpression' || node.computed) return;
+
+    if ((node.property as Identifier).name !== 'isOnline') return;
+
+    if (node.object.type !== 'CallExpression') return;
+
+    if (node.object.callee.type !== 'MemberExpression') return;
+
+    if ((node.object.callee.property as Identifier).name !== 'getLivechatReader') return;
+
+    let parentIndex = ancestors.length - 2;
+    let targetNode = ancestors[parentIndex];
+
+    if (targetNode.type !== 'CallExpression') {
+        targetNode = node;
+    } else {
+        parentIndex--;
+    }
+
+    // If we're already wrapped with an await, nothing to do
+    if (ancestors[parentIndex].type === 'AwaitExpression') return;
+
+    // If we're in the middle of a chained member access, we can't wrap with await
+    if (ancestors[parentIndex].type === 'MemberExpression') return;
+
+    wrapWithAwait(targetNode);
+    asyncifyScope(ancestors, state);
+
+    state.isModified = true;
+};
+
+export const fixRoomUsernamesCalls: FullAncestorWalkerCallback<WalkerState> = (node, state, ancestors) => {
+    if (node.type !== 'MemberExpression' || node.computed) return;
+
+    if ((node.property as Identifier).name !== 'usernames') return;
+
+    let parentIndex = ancestors.length - 2;
+    let targetNode = ancestors[parentIndex];
+
+    if (targetNode.type !== 'CallExpression') {
+        targetNode = node;
+    } else {
+        parentIndex--;
+    }
+
+    // If we're already wrapped with an await, nothing to do
+    if (ancestors[parentIndex].type === 'AwaitExpression') return;
+
+    wrapWithAwait(targetNode);
+    asyncifyScope(ancestors, state);
+
+    state.isModified = true;
+}
diff --git a/packages/apps-engine/deno-runtime/lib/ast/tests/data/ast_blocks.ts b/packages/apps-engine/deno-runtime/lib/ast/tests/data/ast_blocks.ts
new file mode 100644
index 000000000000..330d2bf52620
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/ast/tests/data/ast_blocks.ts
@@ -0,0 +1,436 @@
+// @deno-types="../../../../acorn.d.ts"
+import { AnyNode, ClassDeclaration, ExpressionStatement, FunctionDeclaration, VariableDeclaration } from 'acorn';
+
+/**
+ * Partial AST blocks to support testing.
+ * `start` and `end` properties are omitted for brevity.
+ */
+
+type TestNodeExcerpt<N extends AnyNode = AnyNode> = {
+    code: string;
+    node: N;
+};
+
+export const FunctionDeclarationFoo: TestNodeExcerpt<FunctionDeclaration> = {
+    code: 'function foo() {}',
+    node: {
+        type: 'FunctionDeclaration',
+        id: {
+            type: 'Identifier',
+            name: 'foo',
+        },
+        expression: false,
+        generator: false,
+        async: false,
+        params: [],
+        body: {
+            type: 'BlockStatement',
+            body: [],
+        },
+    },
+};
+
+export const ConstFooAssignedFunctionExpression: TestNodeExcerpt<VariableDeclaration> = {
+    code: 'const foo = function() {}',
+    node: {
+        type: 'VariableDeclaration',
+        kind: 'const',
+        declarations: [
+            {
+                type: 'VariableDeclarator',
+                id: {
+                    type: 'Identifier',
+                    name: 'foo',
+                },
+                init: {
+                    type: 'FunctionExpression',
+                    id: null,
+                    expression: false,
+                    generator: false,
+                    async: false,
+                    params: [],
+                    body: {
+                        type: 'BlockStatement',
+                        body: [],
+                    },
+                },
+            },
+        ],
+    },
+};
+
+export const AssignmentExpressionOfArrowFunctionToFooIdentifier: TestNodeExcerpt<ExpressionStatement> = {
+    code: 'foo = () => {}',
+    node: {
+        type: 'ExpressionStatement',
+        expression: {
+            type: 'AssignmentExpression',
+            operator: '=',
+            left: {
+                type: 'Identifier',
+                name: 'foo',
+            },
+            right: {
+                type: 'ArrowFunctionExpression',
+                id: null,
+                expression: false,
+                generator: false,
+                async: false,
+                params: [],
+                body: {
+                    type: 'BlockStatement',
+                    body: [],
+                },
+            },
+        },
+    },
+};
+
+export const AssignmentExpressionOfNamedFunctionToFooMemberExpression: TestNodeExcerpt<ExpressionStatement> = {
+    code: 'obj.foo = function bar() {}',
+    node: {
+        type: 'ExpressionStatement',
+        expression: {
+            type: 'AssignmentExpression',
+            operator: '=',
+            left: {
+                type: 'MemberExpression',
+                object: {
+                    type: 'Identifier',
+                    name: 'a',
+                },
+                property: {
+                    type: 'Identifier',
+                    name: 'foo',
+                },
+                computed: false,
+                optional: false,
+            },
+            right: {
+                type: 'FunctionExpression',
+                id: null,
+                expression: false,
+                generator: false,
+                async: false,
+                params: [],
+                body: {
+                    type: 'BlockStatement',
+                    body: [],
+                },
+            },
+        },
+    },
+};
+
+export const MethodDefinitionOfFooInClassBar: TestNodeExcerpt<ClassDeclaration> = {
+    code: 'class Bar { foo() {} }',
+    node: {
+        type: 'ClassDeclaration',
+        id: {
+            type: 'Identifier',
+            name: 'Bar',
+        },
+        superClass: null,
+        body: {
+            type: 'ClassBody',
+            body: [
+                {
+                    type: 'MethodDefinition',
+                    key: {
+                        type: 'Identifier',
+                        name: 'foo',
+                    },
+                    value: {
+                        type: 'FunctionExpression',
+                        id: null,
+                        expression: false,
+                        generator: false,
+                        async: false,
+                        params: [],
+                        body: {
+                            type: 'BlockStatement',
+                            body: [],
+                        },
+                    },
+                    kind: 'method',
+                    computed: false,
+                    static: false,
+                },
+            ],
+        },
+    },
+};
+
+export const SimpleCallExpressionOfFoo: TestNodeExcerpt<ExpressionStatement> = {
+    code: 'foo()',
+    node: {
+        type: 'ExpressionStatement',
+        expression: {
+            type: 'CallExpression',
+            callee: {
+                type: 'Identifier',
+                name: 'foo',
+            },
+            arguments: [],
+            optional: false,
+        },
+    },
+};
+
+export const SyncFunctionDeclarationWithAsyncCallExpression: TestNodeExcerpt<FunctionDeclaration> = {
+    // NOTE: this is invalid syntax, it won't be parsed by acorn
+    // but it can be an intermediary state of the AST after we run
+    // `wrapWithAwait` on "bar" call expressions, for instance
+    code: 'function foo() { return () => await bar() }',
+    node: {
+        type: 'FunctionDeclaration',
+        id: {
+            type: 'Identifier',
+            name: 'foo',
+        },
+        expression: false,
+        generator: false,
+        async: false,
+        params: [],
+        body: {
+            type: 'BlockStatement',
+            body: [
+                {
+                    type: 'ReturnStatement',
+                    argument: {
+                        type: 'ArrowFunctionExpression',
+                        id: null,
+                        expression: true,
+                        generator: false,
+                        async: false,
+                        params: [],
+                        body: {
+                            type: 'AwaitExpression',
+                            argument: {
+                                type: 'CallExpression',
+                                callee: {
+                                    type: 'Identifier',
+                                    name: 'bar',
+                                },
+                                arguments: [],
+                                optional: false,
+                            },
+                        },
+                    },
+                },
+            ],
+        },
+    },
+};
+
+export const AssignmentOfFooToBar: TestNodeExcerpt<ExpressionStatement> = {
+    code: 'bar = foo',
+    node: {
+        type: 'ExpressionStatement',
+        expression: {
+            type: 'AssignmentExpression',
+            operator: '=',
+            left: {
+                type: 'Identifier',
+                name: 'bar',
+            },
+            right: {
+                type: 'Identifier',
+                name: 'foo',
+            },
+        },
+    },
+};
+
+export const AssignmentOfFooToBarMemberExpression: TestNodeExcerpt<ExpressionStatement> = {
+    code: 'obj.bar = foo',
+    node: {
+        type: 'ExpressionStatement',
+        expression: {
+            type: 'AssignmentExpression',
+            operator: '=',
+            left: {
+                type: 'MemberExpression',
+                computed: false,
+                optional: false,
+                object: {
+                    type: 'Identifier',
+                    name: 'obj',
+                },
+                property: {
+                    type: 'Identifier',
+                    name: 'bar',
+                },
+            },
+            right: {
+                type: 'Identifier',
+                name: 'foo',
+            },
+        },
+    },
+};
+
+export const AssignmentOfFooToBarVariableDeclarator: TestNodeExcerpt<VariableDeclaration> = {
+    code: 'const bar = foo',
+    node: {
+        type: 'VariableDeclaration',
+        kind: 'const',
+        declarations: [
+            {
+                type: 'VariableDeclarator',
+                id: {
+                    type: 'Identifier',
+                    name: 'bar',
+                },
+                init: {
+                    type: 'Identifier',
+                    name: 'foo',
+                },
+            },
+        ],
+    },
+};
+
+export const AssignmentOfFooToBarPropertyDefinition: TestNodeExcerpt<ClassDeclaration> = {
+    code: 'class baz { bar = foo }',
+    node: {
+        type: 'ClassDeclaration',
+        id: {
+            type: 'Identifier',
+            name: 'baz',
+        },
+        superClass: null,
+        body: {
+            type: 'ClassBody',
+            body: [
+                {
+                    type: 'PropertyDefinition',
+                    static: false,
+                    computed: false,
+                    key: {
+                        type: 'Identifier',
+                        name: 'bar',
+                    },
+                    value: {
+                        type: 'Identifier',
+                        name: 'foo',
+                    },
+                },
+            ],
+        },
+    },
+};
+
+const fixSimpleCallExpressionCode = `
+function bar() {
+    const a = foo();
+
+    return a;
+}`;
+
+export const FixSimpleCallExpression: TestNodeExcerpt<FunctionDeclaration> = {
+    code: fixSimpleCallExpressionCode,
+    node: {
+        type: 'FunctionDeclaration',
+        id: {
+            type: 'Identifier',
+            name: 'bar',
+        },
+        expression: false,
+        generator: false,
+        async: false,
+        params: [],
+        body: {
+            type: 'BlockStatement',
+            body: [
+                {
+                    type: 'VariableDeclaration',
+                    kind: 'const',
+                    declarations: [
+                        {
+                            type: 'VariableDeclarator',
+                            id: {
+                                type: 'Identifier',
+                                name: 'a',
+                            },
+                            init: {
+                                type: 'CallExpression',
+                                callee: {
+                                    type: 'Identifier',
+                                    name: 'foo',
+                                },
+                                arguments: [],
+                                optional: false,
+                            },
+                        },
+                    ],
+                },
+                {
+                    type: 'ReturnStatement',
+                    argument: {
+                        type: 'Identifier',
+                        name: 'a',
+                    },
+                },
+            ],
+        },
+    },
+};
+
+export const ArrowFunctionDerefCallExpression: TestNodeExcerpt<VariableDeclaration> = {
+    // NOTE: this call strategy is widely used by bundlers; it's used to sever the `this`
+    // reference in the method from the object that contains it. This is mostly because
+    // the bundler wants to ensure that it does not messes up the bindings in the code it
+    // generates.
+    //
+    // This would be similar to doing `foo.call(undefined)`
+    code: 'const bar = () => (0, e.foo)();',
+    node: {
+        type: 'VariableDeclaration',
+        kind: 'const',
+        declarations: [
+            {
+                type: 'VariableDeclarator',
+                id: {
+                    type: 'Identifier',
+                    name: 'bar',
+                },
+                init: {
+                    type: 'ArrowFunctionExpression',
+                    id: null,
+                    expression: true,
+                    generator: false,
+                    async: false,
+                    params: [],
+                    body: {
+                        type: 'CallExpression',
+                        optional: false,
+                        arguments: [],
+                        callee: {
+                            type: 'SequenceExpression',
+                            expressions: [
+                                {
+                                    type: 'Literal',
+                                    value: 0,
+                                },
+                                {
+                                    type: 'MemberExpression',
+                                    object: {
+                                        type: 'Identifier',
+                                        name: 'e',
+                                    },
+                                    property: {
+                                        type: 'Identifier',
+                                        name: 'foo',
+                                    },
+                                    computed: false,
+                                    optional: false,
+                                },
+                            ],
+                        },
+                    },
+                },
+            },
+        ],
+    },
+};
diff --git a/packages/apps-engine/deno-runtime/lib/ast/tests/operations.test.ts b/packages/apps-engine/deno-runtime/lib/ast/tests/operations.test.ts
new file mode 100644
index 000000000000..2b00c271f730
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/ast/tests/operations.test.ts
@@ -0,0 +1,245 @@
+import { assertEquals, assertThrows } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+
+import { WalkerState, asyncifyScope, buildFixModifiedFunctionsOperation, checkReassignmentOfModifiedIdentifiers, getFunctionIdentifier, wrapWithAwait } from '../operations.ts';
+import {
+    ArrowFunctionDerefCallExpression,
+    AssignmentExpressionOfArrowFunctionToFooIdentifier,
+    AssignmentExpressionOfNamedFunctionToFooMemberExpression,
+    AssignmentOfFooToBar,
+    AssignmentOfFooToBarMemberExpression,
+    AssignmentOfFooToBarPropertyDefinition,
+    AssignmentOfFooToBarVariableDeclarator,
+    ConstFooAssignedFunctionExpression,
+    FixSimpleCallExpression,
+    FunctionDeclarationFoo,
+    MethodDefinitionOfFooInClassBar,
+    SimpleCallExpressionOfFoo,
+    SyncFunctionDeclarationWithAsyncCallExpression,
+} from './data/ast_blocks.ts';
+import { AnyNode, ArrowFunctionExpression, AssignmentExpression, AwaitExpression, Expression, MethodDefinition, ReturnStatement, VariableDeclaration } from '../../../acorn.d.ts';
+import { assertNotEquals } from 'https://deno.land/std@0.203.0/assert/assert_not_equals.ts';
+
+describe('getFunctionIdentifier', () => {
+    it(`identifies the name "foo" for the code \`${FunctionDeclarationFoo.code}\``, () => {
+        // ancestors array is built by the walking lib
+        const nodeAncestors = [FunctionDeclarationFoo.node];
+        const functionNodeIndex = 0;
+        assertEquals('foo', getFunctionIdentifier(nodeAncestors, functionNodeIndex));
+    });
+
+    it(`identifies the name "foo" for the code \`${ConstFooAssignedFunctionExpression.code}\``, () => {
+        // ancestors array is built by the walking lib
+        const nodeAncestors = [
+            ConstFooAssignedFunctionExpression.node, // VariableDeclaration
+            ConstFooAssignedFunctionExpression.node.declarations[0], // VariableDeclarator
+            ConstFooAssignedFunctionExpression.node.declarations[0].init! // FunctionExpression
+        ];
+        const functionNodeIndex = 2;
+        assertEquals('foo', getFunctionIdentifier(nodeAncestors, functionNodeIndex));
+    });
+
+    it(`identifies the name "foo" for the code \`${AssignmentExpressionOfArrowFunctionToFooIdentifier.code}\``, () => {
+        // ancestors array is built by the walking lib
+        const nodeAncestors = [
+            AssignmentExpressionOfArrowFunctionToFooIdentifier.node, // ExpressionStatement
+            AssignmentExpressionOfArrowFunctionToFooIdentifier.node.expression, // AssignmentExpression
+            (AssignmentExpressionOfArrowFunctionToFooIdentifier.node.expression as AssignmentExpression).right, // ArrowFunctionExpression
+        ];
+        const functionNodeIndex = 2;
+        assertEquals('foo', getFunctionIdentifier(nodeAncestors, functionNodeIndex));
+    });
+
+    it(`identifies the name "foo" for the code \`${AssignmentExpressionOfNamedFunctionToFooMemberExpression.code}\``, () => {
+        // ancestors array is built by the walking lib
+        const nodeAncestors = [
+            AssignmentExpressionOfNamedFunctionToFooMemberExpression.node, // ExpressionStatement
+            AssignmentExpressionOfNamedFunctionToFooMemberExpression.node.expression, // AssignmentExpression
+            (AssignmentExpressionOfNamedFunctionToFooMemberExpression.node.expression as AssignmentExpression).right, // FunctionExpression
+        ];
+        const functionNodeIndex = 2;
+        assertEquals('foo', getFunctionIdentifier(nodeAncestors, functionNodeIndex));
+    });
+
+    it(`identifies the name "foo" for the code \`${MethodDefinitionOfFooInClassBar.code}\``, () => {
+        // ancestors array is built by the walking lib
+        const nodeAncestors = [
+            MethodDefinitionOfFooInClassBar.node, // ClassDeclaration
+            MethodDefinitionOfFooInClassBar.node.body, // ClassBody
+            MethodDefinitionOfFooInClassBar.node.body!.body[0], // MethodDefinition
+            (MethodDefinitionOfFooInClassBar.node.body!.body[0] as MethodDefinition).value, // FunctionExpression
+        ];
+        const functionNodeIndex = 3;
+        assertEquals('foo', getFunctionIdentifier(nodeAncestors, functionNodeIndex));
+    });
+});
+
+describe('wrapWithAwait', () => {
+    it('wraps a call expression with await', () => {
+        const node = structuredClone(SimpleCallExpressionOfFoo.node.expression);
+        wrapWithAwait(node);
+
+        assertEquals('AwaitExpression', node.type);
+        assertNotEquals(SimpleCallExpressionOfFoo.node.expression.type, node.type);
+        assertEquals(SimpleCallExpressionOfFoo.node.expression, (node as AwaitExpression).argument);
+    });
+
+    it('throws if node is not an expression', () => {
+        const node = structuredClone(SimpleCallExpressionOfFoo.node);
+        assertThrows(() => wrapWithAwait(node as unknown as Expression));
+    })
+});
+
+describe('asyncifyScope', () => {
+    it('makes only the first function scope async', () => {
+        const node = structuredClone(SyncFunctionDeclarationWithAsyncCallExpression.node);
+        const ancestors: AnyNode[] = [
+            node, // FunctionDeclaration
+            node.body, // BlockStatement
+            node.body!.body[0], // ReturnStatement
+            (node.body!.body[0] as ReturnStatement).argument!, // ArrowFunctionExpression
+            ((node.body!.body[0] as ReturnStatement).argument! as ArrowFunctionExpression).body, // AwaitExpression
+            (((node.body!.body[0] as ReturnStatement).argument! as ArrowFunctionExpression).body as AwaitExpression).argument, // CallExpression
+        ];
+        const state: WalkerState = {
+            isModified: false,
+            functionIdentifiers: new Set(),
+        }
+
+        asyncifyScope(ancestors, state);
+
+        // Assert the function did indeed change the expression to async
+        assertEquals(((node.body.body[0] as ReturnStatement).argument as ArrowFunctionExpression).async, true)
+
+        // Assert the function did NOT change all ancestors in the chain
+        assertEquals(node.async, false);
+
+        // Assert it couldn't find a function identifier
+        assertEquals(state.functionIdentifiers.size, 0);
+    });
+});
+
+describe('checkReassignmentofModifiedIdentifiers', () => {
+    it(`identifies the reassignment of "foo" in the code "${AssignmentOfFooToBar.code}"`, () => {
+        const node = structuredClone(AssignmentOfFooToBar.node);
+        const ancestors: AnyNode[] = [
+            node, // ExpressionStatement
+            node.expression, // AssignmentExpression
+            (node.expression as AssignmentExpression).right, // Identifier
+        ];
+        const state: WalkerState = {
+            isModified: true,
+            functionIdentifiers: new Set(['foo']),
+        }
+
+        checkReassignmentOfModifiedIdentifiers(node.expression, state, ancestors, '');
+
+        assertEquals(state.functionIdentifiers.has('bar'), true);
+    });
+
+    it(`identifies the reassignment of "foo" in the code "${AssignmentOfFooToBarMemberExpression.code}"`, () => {
+        const node = structuredClone(AssignmentOfFooToBarMemberExpression.node);
+        const ancestors: AnyNode[] = [
+            node, // ExpressionStatement
+            node.expression, // AssignmentExpression
+            (node.expression as AssignmentExpression).right, // Identifier
+        ];
+        const state: WalkerState = {
+            isModified: true,
+            functionIdentifiers: new Set(['foo']),
+        }
+
+        checkReassignmentOfModifiedIdentifiers(node.expression, state, ancestors, '');
+
+        assertEquals(state.functionIdentifiers.has('bar'), true);
+    });
+
+    it(`identifies the reassignment of "foo" in the code "${AssignmentOfFooToBarVariableDeclarator.code}"`, () => {
+        const node = structuredClone(AssignmentOfFooToBarVariableDeclarator.node);
+        const ancestors: AnyNode[] = [
+            node, // VariableDeclaration
+            node.declarations[0], // VariableDeclarator
+        ];
+        const state: WalkerState = {
+            isModified: true,
+            functionIdentifiers: new Set(['foo']),
+        }
+
+        checkReassignmentOfModifiedIdentifiers(node.declarations[0], state, ancestors, '');
+
+        assertEquals(state.functionIdentifiers.has('bar'), true);
+    });
+
+    it(`identifies the reassignment of "foo" in the code "${AssignmentOfFooToBarPropertyDefinition.code}"`, () => {
+        const node = structuredClone(AssignmentOfFooToBarPropertyDefinition.node);
+        const ancestors: AnyNode[] = [
+            node, // ClassDeclaration
+            node.body, // ClassBody
+            node.body.body[0], // PropertyDefinition
+        ];
+        const state: WalkerState = {
+            isModified: true,
+            functionIdentifiers: new Set(['foo']),
+        }
+
+        checkReassignmentOfModifiedIdentifiers(node.body.body[0], state, ancestors, '');
+
+        assertEquals(state.functionIdentifiers.has('bar'), true);
+    });
+});
+
+describe('buildFixModifiedFunctionsOperation', function() {
+    const state: WalkerState = {
+        isModified: false,
+        functionIdentifiers: new Set(['foo']),
+    };
+
+    const fixFunction = buildFixModifiedFunctionsOperation(state.functionIdentifiers);
+
+    beforeEach(() => {
+        state.isModified = false;
+        state.functionIdentifiers = new Set(['foo']);
+    });
+
+    it(`fixes calls of "foo" in the code "${FixSimpleCallExpression.code}"`, () => {
+        const node = structuredClone(FixSimpleCallExpression.node);
+        const ancestors: AnyNode[] = [
+            node, // FunctionDeclaration
+            node.body, // BlockStatement
+            node.body.body[0], // VariableDeclaration
+            (node.body.body[0] as VariableDeclaration).declarations[0], // VariableDeclarator
+            (node.body.body[0] as VariableDeclaration).declarations[0].init!, // CallExpression
+        ];
+
+        fixFunction(ancestors[4], state, ancestors, '');
+
+        assertEquals(state.isModified, true);
+        assertEquals(state.functionIdentifiers.has('bar'), true);
+        assertNotEquals(FixSimpleCallExpression.node, node);
+        assertEquals(node.async, true);
+        assertEquals(ancestors[4].type, 'AwaitExpression');
+    });
+
+    it(`fixes calls of "foo" in the code "${ArrowFunctionDerefCallExpression.code}"`, () => {
+        const node = structuredClone(ArrowFunctionDerefCallExpression.node);
+        const ancestors: AnyNode[] = [
+            node, // VariableDeclaration
+            node.declarations[0], // VariableDeclarator
+            node.declarations[0].init!, // ArrowFunctionExpression
+            (node.declarations[0].init as ArrowFunctionExpression).body, // CallExpression
+        ];
+
+        fixFunction(ancestors[3], state, ancestors, '');
+
+        // Recorded that a modification has been made
+        assertEquals(state.isModified, true);
+        // Recorded that the enclosing scope of the call also requires fixing
+        assertEquals(state.functionIdentifiers.has('bar'), true);
+        // Original node and fixed node are different
+        assertNotEquals(ArrowFunctionDerefCallExpression.node, node);
+        // The function call is now await'ed
+        assertEquals(ancestors[3].type, 'AwaitExpression');
+        // The parent function of the call is now marked as async
+        assertEquals((ancestors[2] as ArrowFunctionExpression).async, true);
+    });
+})
diff --git a/packages/apps-engine/deno-runtime/lib/codec.ts b/packages/apps-engine/deno-runtime/lib/codec.ts
new file mode 100644
index 000000000000..288db46169dc
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/codec.ts
@@ -0,0 +1,43 @@
+import { Buffer } from 'node:buffer';
+import { Decoder, Encoder, ExtensionCodec } from '@msgpack/msgpack';
+
+import type { App as _App } from '@rocket.chat/apps-engine/definition/App.ts';
+import { require } from "./require.ts";
+
+const { App } = require('@rocket.chat/apps-engine/definition/App.js') as {
+    App: typeof _App;
+};
+
+const extensionCodec = new ExtensionCodec();
+
+extensionCodec.register({
+    type: 0,
+    encode: (object: unknown) => {
+        // We don't care about functions, but also don't want to throw an error
+        if (typeof object === 'function' || object instanceof App) {
+            return new Uint8Array(0);
+        }
+
+        return null;
+    },
+    decode: (_data: Uint8Array) => undefined,
+});
+
+// Since Deno doesn't have Buffer by default, we need to use Uint8Array
+extensionCodec.register({
+    type: 1,
+    encode: (object: unknown) => {
+        if (object instanceof Buffer) {
+            return new Uint8Array(object.buffer, object.byteOffset, object.byteLength);
+        }
+
+        return null;
+    },
+    // msgpack will reuse the Uint8Array instance, so WE NEED to copy it instead of simply creating a view
+    decode: (data: Uint8Array) => {
+        return Buffer.from(data);
+    },
+});
+
+export const encoder = new Encoder({ extensionCodec });
+export const decoder = new Decoder({ extensionCodec });
diff --git a/packages/apps-engine/deno-runtime/lib/logger.ts b/packages/apps-engine/deno-runtime/lib/logger.ts
new file mode 100644
index 000000000000..ea2701c70230
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/logger.ts
@@ -0,0 +1,142 @@
+import stackTrace from 'stack-trace';
+import { AppObjectRegistry } from '../AppObjectRegistry.ts';
+
+export interface StackFrame {
+    getTypeName(): string;
+    getFunctionName(): string;
+    getMethodName(): string;
+    getFileName(): string;
+    getLineNumber(): number;
+    getColumnNumber(): number;
+    isNative(): boolean;
+    isConstructor(): boolean;
+}
+
+enum LogMessageSeverity {
+    DEBUG = 'debug',
+    INFORMATION = 'info',
+    LOG = 'log',
+    WARNING = 'warning',
+    ERROR = 'error',
+    SUCCESS = 'success',
+}
+
+type Entry = {
+    caller: string;
+    severity: LogMessageSeverity;
+    method: string;
+    timestamp: Date;
+    args: Array<unknown>;
+};
+
+interface ILoggerStorageEntry {
+    appId: string;
+    method: string;
+    entries: Array<Entry>;
+    startTime: Date;
+    endTime: Date;
+    totalTime: number;
+    _createdAt: Date;
+}
+
+export class Logger {
+    private entries: Array<Entry>;
+    private start: Date;
+    private method: string;
+
+    constructor(method: string) {
+        this.method = method;
+        this.entries = [];
+        this.start = new Date();
+    }
+
+    public debug(...args: Array<unknown>): void {
+        this.addEntry(LogMessageSeverity.DEBUG, this.getStack(stackTrace.get()), ...args);
+    }
+
+    public info(...args: Array<unknown>): void {
+        this.addEntry(LogMessageSeverity.INFORMATION, this.getStack(stackTrace.get()), ...args);
+    }
+
+    public log(...args: Array<unknown>): void {
+        this.addEntry(LogMessageSeverity.LOG, this.getStack(stackTrace.get()), ...args);
+    }
+
+    public warn(...args: Array<unknown>): void {
+        this.addEntry(LogMessageSeverity.WARNING, this.getStack(stackTrace.get()), ...args);
+    }
+
+    public error(...args: Array<unknown>): void {
+        this.addEntry(LogMessageSeverity.ERROR, this.getStack(stackTrace.get()), ...args);
+    }
+
+    public success(...args: Array<unknown>): void {
+        this.addEntry(LogMessageSeverity.SUCCESS, this.getStack(stackTrace.get()), ...args);
+    }
+
+    private addEntry(severity: LogMessageSeverity, caller: string, ...items: Array<unknown>): void {
+        const i = items.map((args) => {
+            if (args instanceof Error) {
+                return JSON.stringify(args, Object.getOwnPropertyNames(args));
+            }
+            if (typeof args === 'object' && args !== null && 'stack' in args) {
+                return JSON.stringify(args, Object.getOwnPropertyNames(args));
+            }
+            if (typeof args === 'object' && args !== null && 'message' in args) {
+                return JSON.stringify(args, Object.getOwnPropertyNames(args));
+            }
+            const str = JSON.stringify(args, null, 2);
+            return str ? JSON.parse(str) : str; // force call toJSON to prevent circular references
+        });
+
+        this.entries.push({
+            caller,
+            severity,
+            method: this.method,
+            timestamp: new Date(),
+            args: i,
+        });
+    }
+
+    private getStack(stack: Array<StackFrame>): string {
+        let func = 'anonymous';
+
+        if (stack.length === 1) {
+            return func;
+        }
+
+        const frame = stack[1];
+
+        if (frame.getMethodName() === null) {
+            func = 'anonymous OR constructor';
+        } else {
+            func = frame.getMethodName();
+        }
+
+        if (frame.getFunctionName() !== null) {
+            func = `${func} -> ${frame.getFunctionName()}`;
+        }
+
+        return func;
+    }
+
+    private getTotalTime(): number {
+        return new Date().getTime() - this.start.getTime();
+    }
+
+    public hasEntries(): boolean {
+        return this.entries.length > 0;
+    }
+
+    public getLogs(): ILoggerStorageEntry {
+        return {
+            appId: AppObjectRegistry.get('id')!,
+            method: this.method,
+            entries: this.entries,
+            startTime: this.start,
+            endTime: new Date(),
+            totalTime: this.getTotalTime(),
+            _createdAt: new Date(),
+        };
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/messenger.ts b/packages/apps-engine/deno-runtime/lib/messenger.ts
new file mode 100644
index 000000000000..1e9ffe05c6c5
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/messenger.ts
@@ -0,0 +1,199 @@
+import { writeAll } from "https://deno.land/std@0.216.0/io/write_all.ts";
+
+import * as jsonrpc from 'jsonrpc-lite';
+
+import { AppObjectRegistry } from '../AppObjectRegistry.ts';
+import type { Logger } from './logger.ts';
+import { encoder } from './codec.ts';
+
+export type RequestDescriptor = Pick<jsonrpc.RequestObject, 'method' | 'params'>;
+
+export type NotificationDescriptor = Pick<jsonrpc.NotificationObject, 'method' | 'params'>;
+
+export type SuccessResponseDescriptor = Pick<jsonrpc.SuccessObject, 'id' | 'result'>;
+
+export type ErrorResponseDescriptor = Pick<jsonrpc.ErrorObject, 'id' | 'error'>;
+
+export type JsonRpcRequest = jsonrpc.IParsedObjectRequest | jsonrpc.IParsedObjectNotification;
+export type JsonRpcResponse = jsonrpc.IParsedObjectSuccess | jsonrpc.IParsedObjectError;
+
+export function isRequest(message: jsonrpc.IParsedObject): message is JsonRpcRequest {
+    return message.type === 'request' || message.type === 'notification';
+}
+
+export function isResponse(message: jsonrpc.IParsedObject): message is JsonRpcResponse {
+    return message.type === 'success' || message.type === 'error';
+}
+
+export function isErrorResponse(message: jsonrpc.JsonRpc): message is jsonrpc.ErrorObject {
+    return message instanceof jsonrpc.ErrorObject;
+}
+
+const COMMAND_PONG = '_zPONG';
+
+export const RPCResponseObserver = new EventTarget();
+
+export const Queue = new (class Queue {
+    private queue: Uint8Array[] = [];
+    private isProcessing = false;
+
+    private async processQueue() {
+        if (this.isProcessing) {
+            return;
+        }
+
+        this.isProcessing = true;
+
+        while (this.queue.length) {
+            const message = this.queue.shift();
+
+            if (message) {
+                await Transport.send(message);
+            }
+        }
+
+        this.isProcessing = false;
+    }
+
+    public enqueue(message: jsonrpc.JsonRpc | typeof COMMAND_PONG) {
+        this.queue.push(encoder.encode(message));
+        this.processQueue();
+    }
+});
+
+export const Transport = new (class Transporter {
+    private selectedTransport: Transporter['stdoutTransport'] | Transporter['noopTransport'];
+
+    constructor() {
+        this.selectedTransport = this.stdoutTransport.bind(this);
+    }
+
+    private async stdoutTransport(message: Uint8Array): Promise<void> {
+        await writeAll(Deno.stdout, message);
+    }
+
+    private async noopTransport(_message: Uint8Array): Promise<void> {}
+
+    public selectTransport(transport: 'stdout' | 'noop'): void {
+        switch (transport) {
+            case 'stdout':
+                this.selectedTransport = this.stdoutTransport.bind(this);
+                break;
+            case 'noop':
+                this.selectedTransport = this.noopTransport.bind(this);
+                break;
+        }
+    }
+
+    public send(message: Uint8Array): Promise<void> {
+        return this.selectedTransport(message);
+    }
+})();
+
+export function parseMessage(message: string | Record<string, unknown>) {
+    let parsed: jsonrpc.IParsedObject | jsonrpc.IParsedObject[];
+
+    if (typeof message === 'string') {
+        parsed = jsonrpc.parse(message);
+    } else {
+        parsed = jsonrpc.parseObject(message);
+    }
+
+    if (Array.isArray(parsed)) {
+        throw jsonrpc.error(null, jsonrpc.JsonRpcError.invalidRequest(null));
+    }
+
+    if (parsed.type === 'invalid') {
+        throw jsonrpc.error(null, parsed.payload);
+    }
+
+    return parsed;
+}
+
+export async function sendInvalidRequestError(): Promise<void> {
+    const rpc = jsonrpc.error(null, jsonrpc.JsonRpcError.invalidRequest(null));
+
+    await Queue.enqueue(rpc);
+}
+
+export async function sendInvalidParamsError(id: jsonrpc.ID): Promise<void> {
+    const rpc = jsonrpc.error(id, jsonrpc.JsonRpcError.invalidParams(null));
+
+    await Queue.enqueue(rpc);
+}
+
+export async function sendParseError(): Promise<void> {
+    const rpc = jsonrpc.error(null, jsonrpc.JsonRpcError.parseError(null));
+
+    await Queue.enqueue(rpc);
+}
+
+export async function sendMethodNotFound(id: jsonrpc.ID): Promise<void> {
+    const rpc = jsonrpc.error(id, jsonrpc.JsonRpcError.methodNotFound(null));
+
+    await Queue.enqueue(rpc);
+}
+
+export async function errorResponse({ error: { message, code = -32000, data = {} }, id }: ErrorResponseDescriptor): Promise<void> {
+    const logger = AppObjectRegistry.get<Logger>('logger');
+
+    if (logger?.hasEntries()) {
+        data.logs = logger.getLogs();
+    }
+
+    const rpc = jsonrpc.error(id, new jsonrpc.JsonRpcError(message, code, data));
+
+    await Queue.enqueue(rpc);
+}
+
+export async function successResponse({ id, result }: SuccessResponseDescriptor): Promise<void> {
+    const payload = { value: result } as Record<string, unknown>;
+    const logger = AppObjectRegistry.get<Logger>('logger');
+
+    if (logger?.hasEntries()) {
+        payload.logs = logger.getLogs();
+    }
+
+    const rpc = jsonrpc.success(id, payload);
+
+    await Queue.enqueue(rpc);
+}
+
+export function pongResponse(): Promise<void> {
+    return Promise.resolve(Queue.enqueue(COMMAND_PONG));
+}
+
+export async function sendRequest(requestDescriptor: RequestDescriptor): Promise<jsonrpc.SuccessObject> {
+    const request = jsonrpc.request(Math.random().toString(36).slice(2), requestDescriptor.method, requestDescriptor.params);
+
+    // TODO: add timeout to this
+    const responsePromise = new Promise((resolve, reject) => {
+        const handler = (event: Event) => {
+            if (event instanceof ErrorEvent) {
+                reject(event.error);
+            }
+
+            if (event instanceof CustomEvent) {
+                resolve(event.detail);
+            }
+
+            RPCResponseObserver.removeEventListener(`response:${request.id}`, handler);
+        };
+
+        RPCResponseObserver.addEventListener(`response:${request.id}`, handler);
+    });
+
+    await Queue.enqueue(request);
+
+    return responsePromise as Promise<jsonrpc.SuccessObject>;
+}
+
+export function sendNotification({ method, params }: NotificationDescriptor) {
+    const request = jsonrpc.notification(method, params);
+
+    Queue.enqueue(request);
+}
+
+export function log(params: jsonrpc.RpcParams) {
+    sendNotification({ method: 'log', params });
+}
diff --git a/packages/apps-engine/deno-runtime/lib/require.ts b/packages/apps-engine/deno-runtime/lib/require.ts
new file mode 100644
index 000000000000..3288ecf67ffa
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/require.ts
@@ -0,0 +1,14 @@
+import { createRequire } from 'node:module';
+
+const _require = createRequire(import.meta.url);
+
+export const require = (mod: string) => {
+    // When we try to import something from the apps-engine, we resolve the path using import maps from Deno
+    // However, the import maps are configured to look at the source folder for typescript files, but during
+    // runtime those files are not available
+    if (mod.startsWith('@rocket.chat/apps-engine')) {
+        mod = import.meta.resolve(mod).replace('file://', '').replace('src/', '');
+    }
+
+    return _require(mod);
+}
diff --git a/packages/apps-engine/deno-runtime/lib/room.ts b/packages/apps-engine/deno-runtime/lib/room.ts
new file mode 100644
index 000000000000..b7423cdd31ff
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/room.ts
@@ -0,0 +1,104 @@
+import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
+import type { RoomType } from '@rocket.chat/apps-engine/definition/rooms/RoomType.ts';
+import type { IUser } from '@rocket.chat/apps-engine/definition/users/IUser.ts';
+import type { AppManager } from '@rocket.chat/apps-engine/server/AppManager.ts';
+
+const PrivateManager = Symbol('RoomPrivateManager');
+
+export class Room {
+    public id: string | undefined;
+
+    public displayName?: string;
+
+    public slugifiedName: string | undefined;
+
+    public type: RoomType | undefined;
+
+    public creator: IUser | undefined;
+
+    public isDefault?: boolean;
+
+    public isReadOnly?: boolean;
+
+    public displaySystemMessages?: boolean;
+
+    public messageCount?: number;
+
+    public createdAt?: Date;
+
+    public updatedAt?: Date;
+
+    public lastModifiedAt?: Date;
+
+    public customFields?: { [key: string]: unknown };
+
+    public userIds?: Array<string>;
+
+    private _USERNAMES: Promise<Array<string>> | undefined;
+
+    private [PrivateManager]: AppManager | undefined;
+
+    /**
+     * @deprecated
+     */
+    public get usernames(): Promise<Array<string>> {
+        if (!this._USERNAMES) {
+            this._USERNAMES = this[PrivateManager]?.getBridges().getInternalBridge().doGetUsernamesOfRoomById(this.id);
+        }
+
+        return this._USERNAMES || Promise.resolve([]);
+    }
+
+    public set usernames(usernames) {}
+
+    public constructor(room: IRoom, manager: AppManager) {
+        Object.assign(this, room);
+
+        Object.defineProperty(this, PrivateManager, {
+            configurable: false,
+            enumerable: false,
+            writable: false,
+            value: manager,
+        });
+    }
+
+    get value(): object {
+        return {
+            id: this.id,
+            displayName: this.displayName,
+            slugifiedName: this.slugifiedName,
+            type: this.type,
+            creator: this.creator,
+            isDefault: this.isDefault,
+            isReadOnly: this.isReadOnly,
+            displaySystemMessages: this.displaySystemMessages,
+            messageCount: this.messageCount,
+            createdAt: this.createdAt,
+            updatedAt: this.updatedAt,
+            lastModifiedAt: this.lastModifiedAt,
+            customFields: this.customFields,
+            userIds: this.userIds,
+        };
+    }
+
+    public async getUsernames(): Promise<Array<string>> {
+        // Get usernames
+        if (!this._USERNAMES) {
+            this._USERNAMES = await this[PrivateManager]?.getBridges().getInternalBridge().doGetUsernamesOfRoomById(this.id);
+        }
+
+        return this._USERNAMES || [];
+    }
+
+    public toJSON() {
+        return this.value;
+    }
+
+    public toString() {
+        return this.value;
+    }
+
+    public valueOf() {
+        return this.value;
+    }
+}
diff --git a/packages/apps-engine/deno-runtime/lib/roomFactory.ts b/packages/apps-engine/deno-runtime/lib/roomFactory.ts
new file mode 100644
index 000000000000..8c270eeb86b9
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/roomFactory.ts
@@ -0,0 +1,27 @@
+import type { IRoom } from "@rocket.chat/apps-engine/definition/rooms/IRoom.ts";
+import type { AppManager } from "@rocket.chat/apps-engine/server/AppManager.ts";
+
+import { AppAccessors } from "./accessors/mod.ts";
+import { Room } from "./room.ts";
+import { JsonRpcError } from "jsonrpc-lite";
+
+const getMockAppManager = (senderFn: AppAccessors['senderFn']) => ({
+    getBridges: () => ({
+        getInternalBridge: () => ({
+            doGetUsernamesOfRoomById: (roomId: string) => {
+                return senderFn({
+                    method: 'bridges:getInternalBridge:doGetUsernamesOfRoomById',
+                    params: [roomId],
+                }).then((result) => result.result).catch((err) => {
+                    throw new JsonRpcError(`Error getting usernames of room: ${err}`, -32000);
+                })
+            },
+        }),
+    }),
+});
+
+export default function createRoom(room: IRoom, senderFn: AppAccessors['senderFn']) {
+    const mockAppManager = getMockAppManager(senderFn);
+
+    return new Room(room, mockAppManager as unknown as AppManager);
+}
diff --git a/packages/apps-engine/deno-runtime/lib/sanitizeDeprecatedUsage.ts b/packages/apps-engine/deno-runtime/lib/sanitizeDeprecatedUsage.ts
new file mode 100644
index 000000000000..91cf6587e741
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/sanitizeDeprecatedUsage.ts
@@ -0,0 +1,20 @@
+import { fixBrokenSynchronousAPICalls } from "./ast/mod.ts";
+
+function hasPotentialDeprecatedUsage(source: string) {
+    return (
+        // potential usage of Room.usernames getter
+        source.includes('.usernames') ||
+        // potential usage of LivechatRead.isOnline method
+        source.includes('.isOnline(') ||
+        // potential usage of LivechatCreator.createToken method
+        source.includes('.createToken(')
+    )
+}
+
+export function sanitizeDeprecatedUsage(source: string) {
+    if (!hasPotentialDeprecatedUsage(source)) {
+        return source;
+    }
+
+    return fixBrokenSynchronousAPICalls(source);
+}
diff --git a/packages/apps-engine/deno-runtime/lib/tests/logger.test.ts b/packages/apps-engine/deno-runtime/lib/tests/logger.test.ts
new file mode 100644
index 000000000000..f69a728e79af
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/tests/logger.test.ts
@@ -0,0 +1,111 @@
+import { assertEquals } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { Logger } from "../logger.ts";
+
+describe('Logger', () => {
+    it('getLogs should return an array of entries', () => {
+        const logger = new Logger('test');
+        logger.info('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.method, 'test');
+    })
+
+    it('should be able to add entries of different severity', () => {
+        const logger = new Logger('test');
+        logger.info('test');
+        logger.debug('test');
+        logger.error('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 3);
+        assertEquals(logs.entries[0].severity, 'info');
+        assertEquals(logs.entries[1].severity, 'debug');
+        assertEquals(logs.entries[2].severity, 'error');
+    })
+
+    it('should be able to add an info entry', () => {
+        const logger = new Logger('test');
+        logger.info('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'info');
+    });
+
+    it('should be able to add an debug entry', () => {
+        const logger = new Logger('test');
+        logger.debug('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'debug');
+    });
+
+    it('should be able to add an error entry', () => {
+        const logger = new Logger('test');
+        logger.error('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'error');
+    });
+
+    it('should be able to add an success entry', () => {
+        const logger = new Logger('test');
+        logger.success('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'success');
+    });
+
+    it('should be able to add an warning entry', () => {
+        const logger = new Logger('test');
+        logger.warn('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'warning');
+    });
+
+    it('should be able to add an log entry', () => {
+        const logger = new Logger('test');
+        logger.log('test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'log');
+    });
+
+    it('should be able to add an entry with multiple arguments', () => {
+        const logger = new Logger('test');
+        logger.log('test', 'test', 'test');
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].args[1], 'test');
+        assertEquals(logs.entries[0].args[2], 'test');
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'log');
+    });
+
+    it('should be able to add an entry with multiple arguments of different types', () => {
+        const logger = new Logger('test');
+        logger.log('test', 1, true, { foo: 'bar' });
+        const logs = logger.getLogs();
+        assertEquals(logs.entries.length, 1);
+        assertEquals(logs.entries[0].args[0], 'test');
+        assertEquals(logs.entries[0].args[1], 1);
+        assertEquals(logs.entries[0].args[2], true);
+        assertEquals(logs.entries[0].args[3], { foo: 'bar' });
+        assertEquals(logs.entries[0].method, 'test');
+        assertEquals(logs.entries[0].severity, 'log');
+    });
+
+})
diff --git a/packages/apps-engine/deno-runtime/lib/tests/messenger.test.ts b/packages/apps-engine/deno-runtime/lib/tests/messenger.test.ts
new file mode 100644
index 000000000000..9b4f128380bc
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/lib/tests/messenger.test.ts
@@ -0,0 +1,96 @@
+import { assertEquals, assertObjectMatch } from 'https://deno.land/std@0.203.0/assert/mod.ts';
+import { afterAll, beforeEach, describe, it } from 'https://deno.land/std@0.203.0/testing/bdd.ts';
+import { spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
+
+import * as Messenger from '../messenger.ts';
+import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
+import { Logger } from '../logger.ts';
+
+describe('Messenger', () => {
+    beforeEach(() => {
+        AppObjectRegistry.clear();
+        AppObjectRegistry.set('logger', new Logger('test'));
+        AppObjectRegistry.set('id', 'test');
+        Messenger.Transport.selectTransport('noop');
+    });
+
+    afterAll(() => {
+        AppObjectRegistry.clear();
+        Messenger.Transport.selectTransport('stdout');
+    });
+
+    it('should add logs to success responses', async () => {
+        const theSpy = spy(Messenger.Queue, 'enqueue');
+
+        const logger = AppObjectRegistry.get<Logger>('logger') as Logger;
+
+        logger.info('test');
+
+        await Messenger.successResponse({ id: 'test', result: 'test' });
+
+        assertEquals(theSpy.calls.length, 1);
+
+        const [responseArgument] = theSpy.calls[0].args;
+
+        assertObjectMatch(responseArgument, {
+            jsonrpc: '2.0',
+            id: 'test',
+            result: {
+                value: 'test',
+                logs: {
+                    appId: 'test',
+                    method: 'test',
+                    entries: [
+                        {
+                            severity: 'info',
+                            method: 'test',
+                            args: ['test'],
+                            caller: 'anonymous OR constructor',
+                        },
+                    ],
+                },
+            },
+        });
+
+        theSpy.restore();
+    });
+
+    it('should add logs to error responses', async () => {
+        const theSpy = spy(Messenger.Queue, 'enqueue');
+
+        const logger = AppObjectRegistry.get<Logger>('logger') as Logger;
+
+        logger.info('test');
+
+        await Messenger.errorResponse({ id: 'test', error: { code: -32000, message: 'test' } });
+
+        assertEquals(theSpy.calls.length, 1);
+
+        const [responseArgument] = theSpy.calls[0].args;
+
+        assertObjectMatch(responseArgument, {
+            jsonrpc: '2.0',
+            id: 'test',
+            error: {
+                code: -32000,
+                message: 'test',
+                data: {
+                    logs: {
+                        appId: 'test',
+                        method: 'test',
+                        entries: [
+                            {
+                                severity: 'info',
+                                method: 'test',
+                                args: ['test'],
+                                caller: 'anonymous OR constructor',
+                            },
+                        ],
+                    },
+                },
+            },
+        });
+
+        theSpy.restore();
+    });
+});
diff --git a/packages/apps-engine/deno-runtime/main.ts b/packages/apps-engine/deno-runtime/main.ts
new file mode 100644
index 000000000000..09be5258ecd0
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/main.ts
@@ -0,0 +1,129 @@
+if (!Deno.args.includes('--subprocess')) {
+    Deno.stderr.writeSync(
+        new TextEncoder().encode(`
+            This is a Deno wrapper for Rocket.Chat Apps. It is not meant to be executed stand-alone;
+            It is instead meant to be executed as a subprocess by the Apps-Engine framework.
+       `),
+    );
+    Deno.exit(1001);
+}
+
+import { JsonRpcError } from 'jsonrpc-lite';
+import type { App } from '@rocket.chat/apps-engine/definition/App.ts';
+
+import * as Messenger from './lib/messenger.ts';
+import { decoder } from './lib/codec.ts';
+import { AppObjectRegistry } from './AppObjectRegistry.ts';
+import { Logger } from './lib/logger.ts';
+
+import slashcommandHandler from './handlers/slashcommand-handler.ts';
+import videoConferenceHandler from './handlers/videoconference-handler.ts';
+import apiHandler from './handlers/api-handler.ts';
+import handleApp from './handlers/app/handler.ts';
+import handleScheduler from './handlers/scheduler-handler.ts';
+
+type Handlers = {
+    app: typeof handleApp;
+    api: typeof apiHandler;
+    slashcommand: typeof slashcommandHandler;
+    videoconference: typeof videoConferenceHandler;
+    scheduler: typeof handleScheduler;
+    ping: (method: string, params: unknown) => 'pong';
+};
+
+const COMMAND_PING = '_zPING';
+
+async function requestRouter({ type, payload }: Messenger.JsonRpcRequest): Promise<void> {
+    const methodHandlers: Handlers = {
+        app: handleApp,
+        api: apiHandler,
+        slashcommand: slashcommandHandler,
+        videoconference: videoConferenceHandler,
+        scheduler: handleScheduler,
+        ping: (_method, _params) => 'pong',
+    };
+
+    // We're not handling notifications at the moment
+    if (type === 'notification') {
+        return Messenger.sendInvalidRequestError();
+    }
+
+    const { id, method, params } = payload;
+
+    const logger = new Logger(method);
+    AppObjectRegistry.set('logger', logger);
+
+    const app = AppObjectRegistry.get<App>('app');
+
+    if (app) {
+        // Same logic as applied in the ProxiedApp class previously
+        (app as unknown as Record<string, unknown>).logger = logger;
+    }
+
+    const [methodPrefix] = method.split(':') as [keyof Handlers];
+    const handler = methodHandlers[methodPrefix];
+
+    if (!handler) {
+        return Messenger.errorResponse({
+            error: { message: 'Method not found', code: -32601 },
+            id,
+        });
+    }
+
+    const result = await handler(method, params);
+
+    if (result instanceof JsonRpcError) {
+        return Messenger.errorResponse({ id, error: result });
+    }
+
+    return Messenger.successResponse({ id, result });
+}
+
+function handleResponse(response: Messenger.JsonRpcResponse): void {
+    let event: Event;
+
+    if (response.type === 'error') {
+        event = new ErrorEvent(`response:${response.payload.id}`, {
+            error: response.payload,
+        });
+    } else {
+        event = new CustomEvent(`response:${response.payload.id}`, {
+            detail: response.payload,
+        });
+    }
+
+    Messenger.RPCResponseObserver.dispatchEvent(event);
+}
+
+async function main() {
+    Messenger.sendNotification({ method: 'ready' });
+
+    for await (const message of decoder.decodeStream(Deno.stdin.readable)) {
+        try {
+            // Process PING command first as it is not JSON RPC
+            if (message === COMMAND_PING) {
+                Messenger.pongResponse();
+                continue;
+            }
+
+            const JSONRPCMessage = Messenger.parseMessage(message as Record<string, unknown>);
+
+            if (Messenger.isRequest(JSONRPCMessage)) {
+                void requestRouter(JSONRPCMessage);
+                continue;
+            }
+
+            if (Messenger.isResponse(JSONRPCMessage)) {
+                handleResponse(JSONRPCMessage);
+            }
+        } catch (error) {
+            if (Messenger.isErrorResponse(error)) {
+                await Messenger.errorResponse(error);
+            } else {
+                await Messenger.sendParseError();
+            }
+        }
+    }
+}
+
+main();
diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json
new file mode 100644
index 000000000000..c229ff447000
--- /dev/null
+++ b/packages/apps-engine/package.json
@@ -0,0 +1,132 @@
+{
+    "name": "@rocket.chat/apps-engine",
+    "version": "1.47.0-alpha",
+    "description": "The engine code for the Rocket.Chat Apps which manages, runs, translates, coordinates and all of that.",
+    "main": "index",
+    "typings": "index",
+    "scripts": {
+        "start": "run-s .:build:clean .:build:watch",
+        "testunit": "run-p .:test:node .:test:deno",
+        ".:test:node": "NODE_ENV=test ts-node ./tests/runner.ts",
+        ".:test:deno": "cd deno-runtime && deno task test",
+        "lint": "run-p .:lint:eslint .:lint:deno",
+        ".:lint:eslint": "eslint .",
+        ".:lint:deno": "deno lint --ignore=deno-runtime/.deno deno-runtime/",
+        "fix-lint": "eslint . --fix",
+        "build": "run-s .:build:clean .:build:default .:build:deno-cache",
+        ".:build:clean": "rimraf client definition server",
+        ".:build:default": "tsc -p tsconfig.json",
+        ".:build:deno-cache": "node scripts/deno-cache.js",
+        ".:build:watch": "yarn .:build:default --watch",
+        "typecheck": "tsc -p tsconfig.json --noEmit",
+        "bundle": "node scripts/bundle.js",
+        "gen-doc": "typedoc",
+        "prepack": "yarn bundle"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/RocketChat/Rocket.Chat.Apps-engine.git"
+    },
+    "keywords": [
+        "rocket.chat",
+        "team chat",
+        "apps engine"
+    ],
+    "files": [
+        "client/**",
+        "definition/**",
+        "deno-runtime/**",
+        "lib/**",
+        "scripts/**",
+        "server/**"
+    ],
+    "publishConfig": {
+        "access": "public"
+    },
+    "author": {
+        "name": "Rocket.Chat",
+        "url": "https://rocket.chat/"
+    },
+    "contributors": [
+        {
+            "name": "Bradley Hilton",
+            "email": "bradley.hilton@rocket.chat"
+        },
+        {
+            "name": "Rodrigo Nascimento",
+            "email": "rodrigo.nascimento@rocket.chat"
+        },
+        {
+            "name": "Douglas Gubert",
+            "email": "douglas.gubert@rocket.chat"
+        }
+    ],
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/RocketChat/Rocket.Chat.Apps-engine/issues"
+    },
+    "homepage": "https://github.com/RocketChat/Rocket.Chat.Apps-engine#readme",
+    "devDependencies": {
+        "@rocket.chat/eslint-config": "workspace:~",
+        "@rocket.chat/ui-kit": "workspace:~",
+        "@types/adm-zip": "^0.5.0",
+        "@types/debug": "^4.1.12",
+        "@types/lodash.clonedeep": "^4.5.7",
+        "@types/nedb": "^1.8.12",
+        "@types/node": "^18.0.0",
+        "@types/semver": "^5.5.0",
+        "@types/stack-trace": "0.0.29",
+        "@types/uuid": "~8.3.4",
+        "@typescript-eslint/eslint-plugin": "~5.60.1",
+        "@typescript-eslint/parser": "~5.60.1",
+        "alsatian": "^2.4.0",
+        "browserify": "^16.5.2",
+        "eslint": "~8.45.0",
+        "nedb": "^1.8.0",
+        "npm-run-all": "^4.1.5",
+        "nyc": "^14.1.1",
+        "rimraf": "^6.0.1",
+        "tap-bark": "^1.0.0",
+        "ts-node": "^6.2.0",
+        "typedoc": "~0.24.8",
+        "typescript": "~5.1.6",
+        "uglify-es": "^3.3.9"
+    },
+    "dependencies": {
+        "@msgpack/msgpack": "3.0.0-beta2",
+        "adm-zip": "^0.5.9",
+        "cryptiles": "^4.1.3",
+        "debug": "^4.3.4",
+        "esbuild": "^0.20.2",
+        "jose": "^4.11.1",
+        "jsonrpc-lite": "^2.2.0",
+        "lodash.clonedeep": "^4.5.0",
+        "semver": "^5.7.1",
+        "stack-trace": "0.0.10",
+        "uuid": "~8.3.2"
+    },
+    "peerDependencies": {
+        "@rocket.chat/ui-kit": "workspace:^"
+    },
+    "nyc": {
+        "include": [
+            "src/*.ts",
+            "src/server/**/*.ts"
+        ],
+        "extension": [
+            ".ts"
+        ],
+        "reporter": [
+            "lcov",
+            "json",
+            "html"
+        ],
+        "all": true
+    },
+    "volta": {
+        "extends": "../../package.json"
+    },
+    "installConfig": {
+        "hoistingLimits": "workspaces"
+    }
+}
diff --git a/packages/apps-engine/scripts/bundle.js b/packages/apps-engine/scripts/bundle.js
new file mode 100644
index 000000000000..a7f8932bec12
--- /dev/null
+++ b/packages/apps-engine/scripts/bundle.js
@@ -0,0 +1,35 @@
+const fs = require('fs');
+const path = require('path');
+const { Readable } = require('stream');
+
+const browserify = require('browserify');
+const { minify } = require('uglify-es');
+
+const targetDir = path.join(__dirname, '..', 'client');
+
+// browserify accepts either a stream or a file path
+const glue = new Readable({
+    read() {
+        console.log('read');
+        this.push("window.AppsEngineUIClient = require('./AppsEngineUIClient').AppsEngineUIClient;");
+        this.push(null);
+    },
+});
+
+async function main() {
+    const bundle = await new Promise((resolve, reject) =>
+        browserify(glue, {
+            basedir: targetDir,
+        }).bundle((err, bundle) => {
+            if (err) return reject(err);
+
+            resolve(bundle.toString());
+        }),
+    );
+
+    const result = minify(bundle);
+
+    fs.writeFileSync(path.join(targetDir, 'AppsEngineUIClient.min.js'), result.code);
+}
+
+main();
diff --git a/packages/apps-engine/scripts/deno-cache.js b/packages/apps-engine/scripts/deno-cache.js
new file mode 100644
index 000000000000..acf2f4b977b4
--- /dev/null
+++ b/packages/apps-engine/scripts/deno-cache.js
@@ -0,0 +1,25 @@
+const childProcess = require('child_process');
+const path = require('path');
+
+try {
+    childProcess.execSync('deno info');
+} catch (e) {
+    console.error(
+        'Could not execute "deno" in the system. It is now a requirement for the Apps-Engine framework, and Rocket.Chat apps will not work without it.\n',
+        'Make sure to install Deno and run the installation process for the Apps-Engine again. More info on https://docs.deno.com/runtime/manual/getting_started/installation',
+    );
+    process.exit(1);
+}
+
+const rootPath = path.join(__dirname, '..');
+const denoRuntimePath = path.join(rootPath, 'deno-runtime');
+const DENO_DIR = process.env.DENO_DIR ?? path.join(rootPath, '.deno-cache');
+
+childProcess.execSync('deno cache main.ts', {
+    cwd: denoRuntimePath,
+    env: {
+        DENO_DIR,
+        PATH: process.env.PATH,
+    },
+    stdio: 'inherit',
+});
diff --git a/packages/apps-engine/src/client/AppClientManager.ts b/packages/apps-engine/src/client/AppClientManager.ts
new file mode 100644
index 000000000000..5d409f148f5f
--- /dev/null
+++ b/packages/apps-engine/src/client/AppClientManager.ts
@@ -0,0 +1,28 @@
+import type { IAppInfo } from '../definition/metadata';
+import { AppServerCommunicator } from './AppServerCommunicator';
+import { AppsEngineUIHost } from './AppsEngineUIHost';
+
+export class AppClientManager {
+    private apps: Array<IAppInfo>;
+
+    constructor(private readonly appsEngineUIHost: AppsEngineUIHost, private readonly communicator?: AppServerCommunicator) {
+        if (!(appsEngineUIHost instanceof AppsEngineUIHost)) {
+            throw new Error('The appClientUIHost must extend appClientUIHost');
+        }
+
+        if (communicator && !(communicator instanceof AppServerCommunicator)) {
+            throw new Error('The communicator must extend AppServerCommunicator');
+        }
+
+        this.apps = [];
+    }
+
+    public async load(): Promise<void> {
+        this.apps = await this.communicator.getEnabledApps();
+        console.log('Enabled apps:', this.apps);
+    }
+
+    public async initialize(): Promise<void> {
+        this.appsEngineUIHost.initialize();
+    }
+}
diff --git a/packages/apps-engine/src/client/AppServerCommunicator.ts b/packages/apps-engine/src/client/AppServerCommunicator.ts
new file mode 100644
index 000000000000..fae400bc7ff7
--- /dev/null
+++ b/packages/apps-engine/src/client/AppServerCommunicator.ts
@@ -0,0 +1,16 @@
+import type { IAppInfo } from '../definition/metadata';
+
+export abstract class AppServerCommunicator {
+    public abstract getEnabledApps(): Promise<Array<IAppInfo>>;
+
+    public abstract getDisabledApps(): Promise<Array<IAppInfo>>;
+
+    // Map<appId, Map<language, translations>>
+    public abstract getLanguageAdditions(): Promise<Map<string, Map<string, object>>>;
+
+    // Map<appId, Array<commands>>
+    public abstract getSlashCommands(): Promise<Map<string, Array<string>>>;
+
+    // Map<appId, Array<to-be-determined>>
+    public abstract getContextualBarButtons(): Promise<Map<string, Array<object>>>;
+}
diff --git a/packages/apps-engine/src/client/AppsEngineUIClient.ts b/packages/apps-engine/src/client/AppsEngineUIClient.ts
new file mode 100644
index 000000000000..620be5e21d01
--- /dev/null
+++ b/packages/apps-engine/src/client/AppsEngineUIClient.ts
@@ -0,0 +1,70 @@
+import { ACTION_ID_LENGTH, MESSAGE_ID } from './constants';
+import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from './definition';
+import { AppsEngineUIMethods } from './definition/AppsEngineUIMethods';
+import { randomString } from './utils';
+
+/**
+ * Represents the SDK provided to the external component.
+ */
+export class AppsEngineUIClient {
+    private listener: (this: Window, ev: MessageEvent) => any;
+
+    private callbacks: Map<string, (response: any) => any>;
+
+    constructor() {
+        this.listener = () => console.log('init');
+        this.callbacks = new Map();
+    }
+
+    /**
+     * Get the current user's information.
+     *
+     * @return the information of the current user.
+     */
+    public getUserInfo(): Promise<IExternalComponentUserInfo> {
+        return this.call(AppsEngineUIMethods.GET_USER_INFO);
+    }
+
+    /**
+     * Get the current room's information.
+     *
+     * @return the information of the current room.
+     */
+    public getRoomInfo(): Promise<IExternalComponentRoomInfo> {
+        return this.call(AppsEngineUIMethods.GET_ROOM_INFO);
+    }
+
+    /**
+     * Initialize the app  SDK for communicating with Rocket.Chat
+     */
+    public init(): void {
+        this.listener = ({ data }) => {
+            if (!data?.hasOwnProperty(MESSAGE_ID)) {
+                return;
+            }
+
+            const {
+                [MESSAGE_ID]: { id, payload },
+            } = data;
+
+            if (this.callbacks.has(id)) {
+                const resolve = this.callbacks.get(id);
+
+                if (typeof resolve === 'function') {
+                    resolve(payload);
+                }
+                this.callbacks.delete(id);
+            }
+        };
+        window.addEventListener('message', this.listener);
+    }
+
+    private call(action: string, payload?: any): Promise<any> {
+        return new Promise((resolve) => {
+            const id = randomString(ACTION_ID_LENGTH);
+
+            window.parent.postMessage({ [MESSAGE_ID]: { action, payload, id } }, '*');
+            this.callbacks.set(id, resolve);
+        });
+    }
+}
diff --git a/packages/apps-engine/src/client/AppsEngineUIHost.ts b/packages/apps-engine/src/client/AppsEngineUIHost.ts
new file mode 100644
index 000000000000..02f82f236ed2
--- /dev/null
+++ b/packages/apps-engine/src/client/AppsEngineUIHost.ts
@@ -0,0 +1,78 @@
+import { MESSAGE_ID } from './constants';
+import type { IAppsEngineUIResponse, IExternalComponentRoomInfo, IExternalComponentUserInfo } from './definition';
+import { AppsEngineUIMethods } from './definition';
+
+type HandleActionData = IExternalComponentUserInfo | IExternalComponentRoomInfo;
+
+/**
+ * Represents the host which handles API calls from external components.
+ */
+export abstract class AppsEngineUIHost {
+    /**
+     * The message emitter who calling the API.
+     */
+    private responseDestination!: Window;
+
+    constructor() {
+        this.initialize();
+    }
+
+    /**
+     * initialize the AppClientUIHost by registering window `message` listener
+     */
+    public initialize() {
+        window.addEventListener('message', async ({ data, source }) => {
+            if (!data?.hasOwnProperty(MESSAGE_ID)) {
+                return;
+            }
+
+            this.responseDestination = source as Window;
+
+            const {
+                [MESSAGE_ID]: { action, id },
+            } = data;
+
+            switch (action) {
+                case AppsEngineUIMethods.GET_USER_INFO:
+                    this.handleAction(action, id, await this.getClientUserInfo());
+                    break;
+                case AppsEngineUIMethods.GET_ROOM_INFO:
+                    this.handleAction(action, id, await this.getClientRoomInfo());
+                    break;
+            }
+        });
+    }
+
+    /**
+     * Get the current user's information.
+     */
+    public abstract getClientUserInfo(): Promise<IExternalComponentUserInfo>;
+
+    /**
+     * Get the opened room's information.
+     */
+    public abstract getClientRoomInfo(): Promise<IExternalComponentRoomInfo>;
+
+    /**
+     * Handle the action sent from the external component.
+     * @param action the name of the action
+     * @param id the unique id of the  API call
+     * @param data The data that will return to the caller
+     */
+    private async handleAction(action: AppsEngineUIMethods, id: string, data: HandleActionData): Promise<void> {
+        if (this.responseDestination instanceof MessagePort || this.responseDestination instanceof ServiceWorker) {
+            return;
+        }
+
+        this.responseDestination.postMessage(
+            {
+                [MESSAGE_ID]: {
+                    id,
+                    action,
+                    payload: data,
+                } as IAppsEngineUIResponse,
+            },
+            '*',
+        );
+    }
+}
diff --git a/packages/apps-engine/src/client/constants/index.ts b/packages/apps-engine/src/client/constants/index.ts
new file mode 100644
index 000000000000..bd7f2e779ca1
--- /dev/null
+++ b/packages/apps-engine/src/client/constants/index.ts
@@ -0,0 +1,6 @@
+/**
+ * The id length of each action.
+ */
+export const ACTION_ID_LENGTH = 80;
+
+export const MESSAGE_ID = 'rc-apps-engine-ui';
diff --git a/packages/apps-engine/src/client/definition/AppsEngineUIMethods.ts b/packages/apps-engine/src/client/definition/AppsEngineUIMethods.ts
new file mode 100644
index 000000000000..df150f9ce62b
--- /dev/null
+++ b/packages/apps-engine/src/client/definition/AppsEngineUIMethods.ts
@@ -0,0 +1,7 @@
+/**
+ * The actions provided by the AppClientSDK.
+ */
+export enum AppsEngineUIMethods {
+    GET_USER_INFO = 'getUserInfo',
+    GET_ROOM_INFO = 'getRoomInfo',
+}
diff --git a/packages/apps-engine/src/client/definition/IAppsEngineUIResponse.ts b/packages/apps-engine/src/client/definition/IAppsEngineUIResponse.ts
new file mode 100644
index 000000000000..dff7289226a4
--- /dev/null
+++ b/packages/apps-engine/src/client/definition/IAppsEngineUIResponse.ts
@@ -0,0 +1,19 @@
+import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from './index';
+
+/**
+ * The response to the AppClientSDK's API call.
+ */
+export interface IAppsEngineUIResponse {
+    /**
+     * The name of the action
+     */
+    action: string;
+    /**
+     * The unique id of the API call
+     */
+    id: string;
+    /**
+     * The data that will return to the caller
+     */
+    payload: IExternalComponentUserInfo | IExternalComponentRoomInfo;
+}
diff --git a/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts b/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts
new file mode 100644
index 000000000000..32ca449e9650
--- /dev/null
+++ b/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts
@@ -0,0 +1,16 @@
+import type { IRoom } from '../../definition/rooms';
+import type { IExternalComponentUserInfo } from './IExternalComponentUserInfo';
+
+type ClientRoomInfo = Pick<IRoom, 'id' | 'slugifiedName'>;
+
+/**
+ * Represents the room's information returned to the
+ * external component.
+ */
+export interface IExternalComponentRoomInfo extends ClientRoomInfo {
+    /**
+     * the list that contains all the users belonging
+     * to this room.
+     */
+    members: Array<IExternalComponentUserInfo>;
+}
diff --git a/packages/apps-engine/src/client/definition/IExternalComponentUserInfo.ts b/packages/apps-engine/src/client/definition/IExternalComponentUserInfo.ts
new file mode 100644
index 000000000000..9212f5b39876
--- /dev/null
+++ b/packages/apps-engine/src/client/definition/IExternalComponentUserInfo.ts
@@ -0,0 +1,14 @@
+import type { IUser } from '../../definition/users';
+
+type ClientUserInfo = Pick<IUser, 'id' | 'username'>;
+
+/**
+ * Represents the user's information returned to
+ * the external component.
+ */
+export interface IExternalComponentUserInfo extends ClientUserInfo {
+    /**
+     * the avatar URL of the Rocket.Chat user
+     */
+    avatarUrl: string;
+}
diff --git a/packages/apps-engine/src/client/definition/index.ts b/packages/apps-engine/src/client/definition/index.ts
new file mode 100644
index 000000000000..70a1fe884a6a
--- /dev/null
+++ b/packages/apps-engine/src/client/definition/index.ts
@@ -0,0 +1,4 @@
+export * from './AppsEngineUIMethods';
+export * from './IExternalComponentUserInfo';
+export * from './IExternalComponentRoomInfo';
+export * from './IAppsEngineUIResponse';
diff --git a/packages/apps-engine/src/client/index.ts b/packages/apps-engine/src/client/index.ts
new file mode 100644
index 000000000000..2ebfee0264d2
--- /dev/null
+++ b/packages/apps-engine/src/client/index.ts
@@ -0,0 +1,4 @@
+import { AppClientManager } from './AppClientManager';
+import { AppServerCommunicator } from './AppServerCommunicator';
+
+export { AppClientManager, AppServerCommunicator };
diff --git a/packages/apps-engine/src/client/utils/index.ts b/packages/apps-engine/src/client/utils/index.ts
new file mode 100644
index 000000000000..f5e851e7d50f
--- /dev/null
+++ b/packages/apps-engine/src/client/utils/index.ts
@@ -0,0 +1,18 @@
+/**
+ * Generate a random string with the specified length.
+ * @param length the length for the generated random string.
+ */
+export function randomString(length: number): string {
+    const buffer: Array<string> = [];
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+    for (let i = 0; i < length; i++) {
+        buffer.push(chars[getRandomInt(chars.length)]);
+    }
+
+    return buffer.join('');
+}
+
+function getRandomInt(max: number): number {
+    return Math.floor(Math.random() * Math.floor(max));
+}
diff --git a/packages/apps-engine/src/definition/App.ts b/packages/apps-engine/src/definition/App.ts
new file mode 100644
index 000000000000..0044f35134b6
--- /dev/null
+++ b/packages/apps-engine/src/definition/App.ts
@@ -0,0 +1,236 @@
+import { AppStatus } from './AppStatus';
+import type { IApp } from './IApp';
+import type {
+    IAppAccessors,
+    IAppInstallationContext,
+    IAppUninstallationContext,
+    IConfigurationExtend,
+    IConfigurationModify,
+    IEnvironmentRead,
+    IHttp,
+    ILogger,
+    IModify,
+    IPersistence,
+    IRead,
+    IAppUpdateContext,
+} from './accessors';
+import type { IAppAuthorInfo } from './metadata/IAppAuthorInfo';
+import type { IAppInfo } from './metadata/IAppInfo';
+import type { ISetting } from './settings';
+import type { ISettingUpdateContext } from './settings/ISettingUpdateContext';
+
+export abstract class App implements IApp {
+    private status: AppStatus = AppStatus.UNKNOWN;
+
+    /**
+     * Create a new App, this is called whenever the server starts up and initiates the Apps.
+     * Note, your implementation of this class should call `super(name, id, version)` so we have it.
+     * Also, please use the `initialize()` method to do items instead of the constructor as the constructor
+     * *might* be called more than once but the `initialize()` will only be called once.
+     */
+    public constructor(private readonly info: IAppInfo, private readonly logger: ILogger, private readonly accessors?: IAppAccessors) {
+        this.logger.debug(
+            `Constructed the App ${this.info.name} (${this.info.id})`,
+            `v${this.info.version} which depends on the API v${this.info.requiredApiVersion}!`,
+            `Created by ${this.info.author.name}`,
+        );
+
+        this.setStatus(AppStatus.CONSTRUCTED);
+    }
+
+    public async getStatus(): Promise<AppStatus> {
+        return this.status;
+    }
+
+    /**
+     * Get the name of this App.
+     *
+     * @return {string} the name
+     */
+    public getName(): string {
+        return this.info.name;
+    }
+
+    /**
+     * Gets the sluggified name of this App.
+     *
+     * @return {string} the name slugged
+     */
+    public getNameSlug(): string {
+        return this.info.nameSlug;
+    }
+
+    /**
+     * Gets the username of this App's app user.
+     *
+     * @return {string} the username of the app user
+     *
+     * @deprecated This method will be removed in the next major version.
+     * Please use read.getUserReader().getAppUser() instead.
+     */
+    public getAppUserUsername(): string {
+        return `${this.info.nameSlug}.bot`;
+    }
+
+    /**
+     * Get the ID of this App, please see <link> for how to obtain an ID for your App.
+     *
+     * @return {number} the ID
+     */
+    public getID(): string {
+        return this.info.id;
+    }
+
+    /**
+     * Get the version of this App, using http://semver.org/.
+     *
+     * @return {string} the version
+     */
+    public getVersion(): string {
+        return this.info.version;
+    }
+
+    /**
+     * Get the description of this App, mostly used to show to the clients/administrators.
+     *
+     * @return {string} the description
+     */
+    public getDescription(): string {
+        return this.info.description;
+    }
+
+    /**
+     * Gets the API Version which this App depends on (http://semver.org/).
+     * This property is used for the dependency injections.
+     *
+     * @return {string} the required api version
+     */
+    public getRequiredApiVersion(): string {
+        return this.info.requiredApiVersion;
+    }
+
+    /**
+     * Gets the information regarding the author/maintainer of this App.
+     *
+     * @return author information
+     */
+    public getAuthorInfo(): IAppAuthorInfo {
+        return this.info.author;
+    }
+
+    /**
+     * Gets the entirity of the App's information.
+     *
+     * @return App information
+     */
+    public getInfo(): IAppInfo {
+        return this.info;
+    }
+
+    /**
+     * Gets the ILogger instance for this App.
+     *
+     * @return the logger instance
+     */
+    public getLogger(): ILogger {
+        return this.logger;
+    }
+
+    public getAccessors(): IAppAccessors {
+        return this.accessors;
+    }
+
+    /**
+     * Method which will be called when the App is initialized. This is the recommended place
+     * to add settings and slash commands. If an error is thrown, all commands will be unregistered.
+     */
+    public async initialize(configurationExtend: IConfigurationExtend, environmentRead: IEnvironmentRead): Promise<void> {
+        await this.extendConfiguration(configurationExtend, environmentRead);
+    }
+
+    /**
+     * Method which is called when this App is enabled and can be called several
+     * times during this instance's life time. Once after the `initialize()` is called,
+     * pending it doesn't throw an error, and then anytime the App is enabled by the user.
+     * If this method, `onEnable()`, returns false, then this App will not
+     * actually be enabled (ex: a setting isn't configured).
+     *
+     * @return whether the App should be enabled or not
+     */
+    public async onEnable(environment: IEnvironmentRead, configurationModify: IConfigurationModify): Promise<boolean> {
+        return true;
+    }
+
+    /**
+     * Method which is called when this App is disabled and it can be called several times.
+     * If this App was enabled and then the user disabled it, this method will be called.
+     */
+    public async onDisable(configurationModify: IConfigurationModify): Promise<void> {}
+
+    /**
+     * Method which is called when the App is uninstalled and it is called one single time.
+     *
+     * This method will NOT be called when an App is getting disabled manually, ONLY when
+     * it's being uninstalled from Rocket.Chat.
+     */
+    public async onUninstall(context: IAppUninstallationContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void> {}
+
+    /**
+     * Method which is called when the App is installed and it is called one single time.
+     *
+     * This method is NOT called when the App is updated.
+     */
+    public async onInstall(context: IAppInstallationContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void> {}
+
+    /**
+     * Method which is called when the App is updated and it is called one single time.
+     *
+     * This method is NOT called when the App is installed.
+     */
+    public async onUpdate(context: IAppUpdateContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void> {}
+
+    /**
+     * Method which is called whenever a setting which belongs to this App has been updated
+     * by an external system and not this App itself. The setting passed is the newly updated one.
+     *
+     * @param setting the setting which was updated
+     * @param configurationModify the accessor to modifiy the system
+     * @param reader the reader accessor
+     * @param http an accessor to the outside world
+     */
+    public async onSettingUpdated(setting: ISetting, configurationModify: IConfigurationModify, read: IRead, http: IHttp): Promise<void> {}
+
+    /**
+     * Method which is called before a setting which belongs to this App is going to be updated
+     * by an external system and not this App itself. The setting passed is the newly updated one.
+     *
+     * @param setting the setting which is going to be updated
+     * @param configurationModify the accessor to modifiy the system
+     * @param reader the reader accessor
+     * @param http an accessor to the outside world
+     */
+    public async onPreSettingUpdate(context: ISettingUpdateContext, configurationModify: IConfigurationModify, read: IRead, http: IHttp): Promise<ISetting> {
+        return context.newSetting;
+    }
+
+    /**
+     * Method will be called during initialization. It allows for adding custom configuration options and defaults
+     * @param configuration
+     */
+    protected async extendConfiguration(configuration: IConfigurationExtend, environmentRead: IEnvironmentRead): Promise<void> {}
+
+    /**
+     * Sets the status this App is now at, use only when 100% true (it's protected for a reason).
+     *
+     * @param status the new status of this App
+     */
+    protected async setStatus(status: AppStatus): Promise<void> {
+        this.logger.debug(`The status is now: ${status}`);
+        this.status = status;
+    }
+
+    // Avoid leaking references if object is serialized (e.g. to be sent over IPC)
+    public toJSON(): Record<string, any> {
+        return this.info;
+    }
+}
diff --git a/packages/apps-engine/src/definition/AppStatus.ts b/packages/apps-engine/src/definition/AppStatus.ts
new file mode 100644
index 000000000000..31638a8d0f1c
--- /dev/null
+++ b/packages/apps-engine/src/definition/AppStatus.ts
@@ -0,0 +1,65 @@
+export enum AppStatus {
+    /** The status is known, aka not been constructed the proper way. */
+    UNKNOWN = 'unknown',
+    /** The App has been constructed but that's it. */
+    CONSTRUCTED = 'constructed',
+    /** The App's `initialize()` was called and returned true. */
+    INITIALIZED = 'initialized',
+    /** The App's `onEnable()` was called, returned true, and this was done automatically (system start up). */
+    AUTO_ENABLED = 'auto_enabled',
+    /** The App's `onEnable()` was called, returned true, and this was done by the user such as installing a new one. */
+    MANUALLY_ENABLED = 'manually_enabled',
+    /**
+     * The App was disabled due to an error while attempting to compile it.
+     * An attempt to enable it again will fail, as it needs to be updated.
+     */
+    COMPILER_ERROR_DISABLED = 'compiler_error_disabled',
+    /**
+     * The App was disable due to its license being invalid
+     */
+    INVALID_LICENSE_DISABLED = 'invalid_license_disabled',
+    /**
+     * The app was disabled due to an invalid installation or validation in its signature.
+     */
+    INVALID_INSTALLATION_DISABLED = 'invalid_installation_disabled',
+    /** The App was disabled due to an unrecoverable error being thrown. */
+    ERROR_DISABLED = 'error_disabled',
+    /** The App was manually disabled by a user. */
+    MANUALLY_DISABLED = 'manually_disabled',
+    INVALID_SETTINGS_DISABLED = 'invalid_settings_disabled',
+    /** The App was disabled due to other circumstances. */
+    DISABLED = 'disabled',
+}
+
+export class AppStatusUtilsDef {
+    public isEnabled(status: AppStatus): boolean {
+        switch (status) {
+            case AppStatus.AUTO_ENABLED:
+            case AppStatus.MANUALLY_ENABLED:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public isDisabled(status: AppStatus): boolean {
+        switch (status) {
+            case AppStatus.COMPILER_ERROR_DISABLED:
+            case AppStatus.ERROR_DISABLED:
+            case AppStatus.MANUALLY_DISABLED:
+            case AppStatus.INVALID_SETTINGS_DISABLED:
+            case AppStatus.INVALID_LICENSE_DISABLED:
+            case AppStatus.INVALID_INSTALLATION_DISABLED:
+            case AppStatus.DISABLED:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public isError(status: AppStatus): boolean {
+        return [AppStatus.ERROR_DISABLED, AppStatus.COMPILER_ERROR_DISABLED].includes(status);
+    }
+}
+
+export const AppStatusUtils = new AppStatusUtilsDef();
diff --git a/packages/apps-engine/src/definition/IApp.ts b/packages/apps-engine/src/definition/IApp.ts
new file mode 100644
index 000000000000..53faff9647f4
--- /dev/null
+++ b/packages/apps-engine/src/definition/IApp.ts
@@ -0,0 +1,90 @@
+import type { AppStatus } from './AppStatus';
+import type { IAppAccessors } from './accessors';
+import type { ILogger } from './accessors/ILogger';
+import type { IAppAuthorInfo } from './metadata/IAppAuthorInfo';
+import type { IAppInfo } from './metadata/IAppInfo';
+
+export interface IApp {
+    /**
+     * Gets the status of this App.
+     *
+     * @return {AppStatus} the status/state of the App
+     */
+    getStatus(): Promise<AppStatus>;
+
+    /**
+     * Get the name of this App.
+     *
+     * @return {string} the name
+     */
+    getName(): string;
+
+    /**
+     * Gets the sluggified name of this App.
+     *
+     * @return {string} the name slugged
+     */
+    getNameSlug(): string;
+
+    /**
+     * Gets the username of this App's app user.
+     *
+     * @return {string} the username of the app user
+     *
+     * @deprecated This method will be removed in the next major version.
+     * Please use read.getAppUser instead.
+     */
+    getAppUserUsername(): string;
+
+    /**
+     * Get the ID of this App, please see <link> for how to obtain an ID for your App.
+     *
+     * @return {number} the ID
+     */
+    getID(): string;
+
+    /**
+     * Get the version of this App, using http://semver.org/.
+     *
+     * @return {string} the version
+     */
+    getVersion(): string;
+
+    /**
+     * Get the description of this App, mostly used to show to the clients/administrators.
+     *
+     * @return {string} the description
+     */
+    getDescription(): string;
+
+    /**
+     * Gets the API Version which this App depends on (http://semver.org/).
+     * This property is used for the dependency injections.
+     *
+     * @return {string} the required api version
+     */
+    getRequiredApiVersion(): string;
+
+    /**
+     * Gets the information regarding the author/maintainer of this App.
+     *
+     * @return author information
+     */
+    getAuthorInfo(): IAppAuthorInfo;
+
+    /**
+     * Gets the entirity of the App's information.
+     *
+     * @return App information
+     */
+    getInfo(): IAppInfo;
+
+    /**
+     * Gets the ILogger instance for this App.
+     *
+     * @return the logger instance
+     */
+    getLogger(): ILogger;
+
+    getAccessors(): IAppAccessors;
+}
diff --git a/packages/apps-engine/src/definition/LICENSE b/packages/apps-engine/src/definition/LICENSE
new file mode 100644
index 000000000000..42ea81dc8cdb
--- /dev/null
+++ b/packages/apps-engine/src/definition/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015-2023 Rocket.Chat Technologies Corp.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/apps-engine/src/definition/accessors/IApiExtend.ts b/packages/apps-engine/src/definition/accessors/IApiExtend.ts
new file mode 100644
index 000000000000..ab3210105e9c
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IApiExtend.ts
@@ -0,0 +1,16 @@
+import type { IApi } from '../api';
+
+/**
+ * This accessor provides methods for adding a custom api.
+ * It is provided during the initialization of your App
+ */
+
+export interface IApiExtend {
+    /**
+     * Adds an api which can be called by external services lateron.
+     * Should an api already exists an error will be thrown.
+     *
+     * @param api the command information
+     */
+    provideApi(api: IApi): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IAppAccessors.ts b/packages/apps-engine/src/definition/accessors/IAppAccessors.ts
new file mode 100644
index 000000000000..c2ea3bfcacea
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IAppAccessors.ts
@@ -0,0 +1,11 @@
+import type { IEnvironmentRead, IHttp, IRead } from '.';
+import type { IApiEndpointMetadata } from '../api';
+import type { IEnvironmentWrite } from './IEnvironmentWrite';
+
+export interface IAppAccessors {
+    readonly environmentReader: IEnvironmentRead;
+    readonly environmentWriter: IEnvironmentWrite;
+    readonly reader: IRead;
+    readonly http: IHttp;
+    readonly providedApiEndpoints: Array<IApiEndpointMetadata>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IAppInstallationContext.ts b/packages/apps-engine/src/definition/accessors/IAppInstallationContext.ts
new file mode 100644
index 000000000000..0ca1c08ba0dc
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IAppInstallationContext.ts
@@ -0,0 +1,5 @@
+import type { IUser } from '../users';
+
+export interface IAppInstallationContext {
+    user: IUser;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IAppUninstallationContext.ts b/packages/apps-engine/src/definition/accessors/IAppUninstallationContext.ts
new file mode 100644
index 000000000000..96ddbfa03298
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IAppUninstallationContext.ts
@@ -0,0 +1,5 @@
+import type { IUser } from '../users';
+
+export interface IAppUninstallationContext {
+    user: IUser;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IAppUpdateContext.ts b/packages/apps-engine/src/definition/accessors/IAppUpdateContext.ts
new file mode 100644
index 000000000000..d0bcf7ea280b
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IAppUpdateContext.ts
@@ -0,0 +1,6 @@
+import type { IUser } from '../users';
+
+export interface IAppUpdateContext {
+    user?: IUser;
+    oldAppVersion: string;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ICloudWorkspaceRead.ts b/packages/apps-engine/src/definition/accessors/ICloudWorkspaceRead.ts
new file mode 100644
index 000000000000..c78749fae59b
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ICloudWorkspaceRead.ts
@@ -0,0 +1,24 @@
+import type { IWorkspaceToken } from '../cloud/IWorkspaceToken';
+
+/**
+ * Accessor that enables apps to read information
+ * related to the Cloud connectivity of the workspace.
+ *
+ * Methods in this accessor will usually connect to the
+ * Rocket.Chat Cloud, which means they won't work properly
+ * in air-gapped environment.
+ *
+ * This accessor available via `IRead` object, which is
+ * usually received as a parameter wherever it's available.
+ */
+export interface ICloudWorkspaceRead {
+    /**
+     * Returns an access token that can be used to access
+     * Cloud Services on the workspace's behalf.
+     *
+     * @param scope The scope that the token should be authorized with
+     *
+     * @RequiresPermission cloud.workspace-token; scopes: Array<string>
+     */
+    getWorkspaceToken(scope: string): Promise<IWorkspaceToken>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IConfigurationExtend.ts b/packages/apps-engine/src/definition/accessors/IConfigurationExtend.ts
new file mode 100644
index 000000000000..a58f127a0421
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IConfigurationExtend.ts
@@ -0,0 +1,36 @@
+import type { IApiExtend } from './IApiExtend';
+import type { IExternalComponentsExtend } from './IExternalComponentsExtend';
+import type { IHttpExtend } from './IHttp';
+import type { ISchedulerExtend } from './ISchedulerExtend';
+import type { ISettingsExtend } from './ISettingsExtend';
+import type { ISlashCommandsExtend } from './ISlashCommandsExtend';
+import type { IUIExtend } from './IUIExtend';
+import type { IVideoConfProvidersExtend } from './IVideoConfProvidersExtend';
+
+/**
+ * This accessor provides methods for declaring the configuration
+ * of your App. It is provided during initialization of your App.
+ */
+export interface IConfigurationExtend {
+    /** Accessor for customing the handling of IHttp requests and responses your App causes. */
+    readonly http: IHttpExtend;
+
+    /** Accessor for declaring the settings your App provides. */
+    readonly settings: ISettingsExtend;
+
+    /** Accessor for declaring the commands which your App provides. */
+    readonly slashCommands: ISlashCommandsExtend;
+
+    /** Accessor for declaring api endpoints. */
+    readonly api: IApiExtend;
+
+    readonly externalComponents: IExternalComponentsExtend;
+
+    /** Accessor for declaring tasks that can be scheduled (like cron) */
+    readonly scheduler: ISchedulerExtend;
+    /** Accessor for registering different elements in the host UI */
+    readonly ui: IUIExtend;
+
+    /** Accessor for declaring the videoconf providers which your App provides. */
+    readonly videoConfProviders: IVideoConfProvidersExtend;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IConfigurationModify.ts b/packages/apps-engine/src/definition/accessors/IConfigurationModify.ts
new file mode 100644
index 000000000000..d0f818e2e028
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IConfigurationModify.ts
@@ -0,0 +1,18 @@
+import type { ISchedulerModify } from './ISchedulerModify';
+import type { IServerSettingsModify } from './IServerSettingsModify';
+import type { ISlashCommandsModify } from './ISlashCommandsModify';
+
+/**
+ * This accessor provides methods for modifying the configuration
+ * of Rocket.Chat. It is provided during "onEnable" of your App.
+ */
+export interface IConfigurationModify {
+    /** Accessor for modifying the settings inside of Rocket.Chat. */
+    readonly serverSettings: IServerSettingsModify;
+
+    /** Accessor for modifying the slash commands inside of Rocket.Chat. */
+    readonly slashCommands: ISlashCommandsModify;
+
+    /** Accessor for modifying schedulers */
+    readonly scheduler: ISchedulerModify;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IDiscussionBuilder.ts b/packages/apps-engine/src/definition/accessors/IDiscussionBuilder.ts
new file mode 100644
index 000000000000..51dc0c2c4f92
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IDiscussionBuilder.ts
@@ -0,0 +1,25 @@
+import type { IRoomBuilder } from '.';
+import type { IMessage } from '../messages';
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IRoom } from '../rooms';
+
+/**
+ * Interface for building out a room.
+ * Please note, a room creator, name, and type must be set otherwise you will NOT
+ * be able to successfully save the room object.
+ */
+export interface IDiscussionBuilder extends IRoomBuilder {
+    kind: RocketChatAssociationModel.DISCUSSION;
+
+    setParentRoom(parentRoom: IRoom): IDiscussionBuilder;
+
+    getParentRoom(): IRoom;
+
+    setParentMessage(parentMessage: IMessage): IDiscussionBuilder;
+
+    getParentMessage(): IMessage;
+
+    setReply(reply: string): IDiscussionBuilder;
+
+    getReply(): string;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IEmailCreator.ts b/packages/apps-engine/src/definition/accessors/IEmailCreator.ts
new file mode 100644
index 000000000000..d5d051bc2dff
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IEmailCreator.ts
@@ -0,0 +1,10 @@
+import type { IEmail } from '../email';
+
+export interface IEmailCreator {
+    /**
+     * Sends an email through Rocket.Chat
+     *
+     * @param email the email data
+     */
+    send(email: IEmail): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IEnvironmentRead.ts b/packages/apps-engine/src/definition/accessors/IEnvironmentRead.ts
new file mode 100644
index 000000000000..81b50bee77c4
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IEnvironmentRead.ts
@@ -0,0 +1,27 @@
+import type { IEnvironmentalVariableRead } from './IEnvironmentalVariableRead';
+import type { IServerSettingRead } from './IServerSettingRead';
+import type { ISettingRead } from './ISettingRead';
+
+/**
+ * Allows read-access to the App's settings,
+ * the certain server's settings along with environmental
+ * variables all of which are not user created.
+ */
+export interface IEnvironmentRead {
+    /** Gets an instance of the App's settings reader. */
+    getSettings(): ISettingRead;
+
+    /**
+     * Gets an instance of the Server's Settings reader.
+     * Please note: Due to security concerns, only a subset of settings
+     * are accessible.
+     */
+    getServerSettings(): IServerSettingRead;
+
+    /**
+     * Gets an instance of the Environmental Variables reader.
+     * Please note: Due to security concerns, only a subset of
+     * them are readable.
+     */
+    getEnvironmentVariables(): IEnvironmentalVariableRead;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IEnvironmentWrite.ts b/packages/apps-engine/src/definition/accessors/IEnvironmentWrite.ts
new file mode 100644
index 000000000000..ab1869ab67cb
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IEnvironmentWrite.ts
@@ -0,0 +1,10 @@
+import type { IServerSettingUpdater } from './IServerSettingUpdater';
+import type { ISettingUpdater } from './ISettingUpdater';
+
+/**
+ * Allows write-access to the App's settings,
+ */
+export interface IEnvironmentWrite {
+    getSettings(): ISettingUpdater;
+    getServerSettings(): IServerSettingUpdater;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IEnvironmentalVariableRead.ts b/packages/apps-engine/src/definition/accessors/IEnvironmentalVariableRead.ts
new file mode 100644
index 000000000000..3bb77b033e83
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IEnvironmentalVariableRead.ts
@@ -0,0 +1,11 @@
+/** A reader for reading the Environmental Variables. */
+export interface IEnvironmentalVariableRead {
+    /** Gets the value for a variable. */
+    getValueByName(envVarName: string): Promise<string>;
+
+    /** Checks to see if Apps can access the given variable name. */
+    isReadable(envVarName: string): Promise<boolean>;
+
+    /** Checks to see if any value is set for the given variable name. */
+    isSet(envVarName: string): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IExternalComponentsExtend.ts b/packages/apps-engine/src/definition/accessors/IExternalComponentsExtend.ts
new file mode 100644
index 000000000000..6a3dc781056f
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IExternalComponentsExtend.ts
@@ -0,0 +1,17 @@
+import type { IExternalComponent } from '../externalComponent';
+
+/**
+ * This accessor provides a method for registering external
+ * components. This is provided during the initialization of your App.
+ */
+export interface IExternalComponentsExtend {
+    /**
+     * Register an external component to the system.
+     * If you call this method twice and the component
+     * has the same name as before, the first one will be
+     * overwritten as the names provided **must** be unique.
+     *
+     * @param externalComponent the external component to be registered
+     */
+    register(externalComponent: IExternalComponent): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IHttp.ts b/packages/apps-engine/src/definition/accessors/IHttp.ts
new file mode 100644
index 000000000000..8c5eeb9a4d55
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IHttp.ts
@@ -0,0 +1,202 @@
+import type { IPersistence } from './IPersistence';
+import type { IRead } from './IRead';
+
+/**
+ * The Http package allows users to call out to an external web service.
+ * Based off of: https://github.com/meteor-typings/meteor/blob/master/1.4/main.d.ts#L869
+ */
+export interface IHttp {
+    get(url: string, options?: IHttpRequest): Promise<IHttpResponse>;
+
+    post(url: string, options?: IHttpRequest): Promise<IHttpResponse>;
+
+    put(url: string, options?: IHttpRequest): Promise<IHttpResponse>;
+
+    del(url: string, options?: IHttpRequest): Promise<IHttpResponse>;
+
+    patch(url: string, options?: IHttpRequest): Promise<IHttpResponse>;
+}
+
+export enum RequestMethod {
+    GET = 'get',
+    POST = 'post',
+    PUT = 'put',
+    DELETE = 'delete',
+    HEAD = 'head',
+    OPTIONS = 'options',
+    PATCH = 'patch',
+}
+
+export interface IHttpRequest {
+    content?: string;
+    data?: any;
+    query?: string;
+    params?: {
+        [key: string]: string;
+    };
+    auth?: string;
+    headers?: {
+        [key: string]: string;
+    };
+    timeout?: number;
+    /**
+     * The encoding to be used on response data.
+     *
+     * If null, the body is returned as a Buffer. Anything else (including the default value of undefined)
+     * will be passed as the encoding parameter to toString() (meaning this is effectively 'utf8' by default).
+     * (Note: if you expect binary data, you should set encoding: null.)
+     */
+    encoding?: string | null;
+    /**
+     * if `true`, requires SSL certificates be valid.
+     *
+     * Defaul: `true`;
+     */
+    strictSSL?: boolean;
+    /**
+     * If `true`, the server certificate is verified against the list of supplied CAs.
+     *
+     * Default: `true`.
+     *
+     * https://nodejs.org/api/tls.html#tls_tls_connect_options_callback
+     */
+    rejectUnauthorized?: boolean;
+}
+
+export interface IHttpResponse {
+    url: string;
+    method: RequestMethod;
+    statusCode: number;
+    headers?: {
+        [key: string]: string;
+    };
+    content?: string;
+    data?: any;
+}
+
+export interface IHttpExtend {
+    /**
+     * A method for providing a single header which is added to every request.
+     *
+     * @param key the name of the header
+     * @param value the header's content
+     */
+    provideDefaultHeader(key: string, value: string): void;
+
+    /**
+     * A method for providing more than one header which are added to every request.
+     *
+     * @param headers an object with strings as the keys (header name) and strings as values (header content)
+     */
+    provideDefaultHeaders(headers: { [key: string]: string }): void;
+
+    /**
+     * A method for providing a single query parameter which is added to every request.
+     *
+     * @param key the name of the query parameter
+     * @param value the query parameter's content
+     */
+    provideDefaultParam(key: string, value: string): void;
+
+    /**
+     * A method for providing more than one query parameters which are added to every request.
+     *
+     * @param headers an object with strings as the keys (parameter name) and strings as values (parameter content)
+     */
+    provideDefaultParams(params: { [key: string]: string }): void;
+
+    /**
+     * Method for providing a function which is called before every request is called out to the final destination.
+     * This can be called more than once which means there can be more than one handler. The order provided is the order called.
+     * Note: if this handler throws an error when it is executed then the request will be aborted.
+     *
+     * @param handler the instance of the IHttpPreRequestHandler
+     */
+    providePreRequestHandler(handler: IHttpPreRequestHandler): void;
+
+    /**
+     * Method for providing a function which is called after every response is got from the url and before the result is returned.
+     * This can be called more than once which means there can be more than one handler. The order provided is the order called.
+     * Note: if this handler throws an error when it is executed then the respone will not be returned
+     *
+     * @param handler the instance of the IHttpPreResponseHandler
+     */
+    providePreResponseHandler(handler: IHttpPreResponseHandler): void;
+
+    /**
+     * A method for getting all of the default headers provided, the value is a readonly and any modifications done will be ignored.
+     * Please use the provider methods for adding them.
+     */
+    getDefaultHeaders(): Map<string, string>;
+
+    /**
+     * A method for getting all of the default parameters provided, the value is a readonly and any modifications done will be ignored.
+     * Please use the provider methods for adding them.
+     */
+    getDefaultParams(): Map<string, string>;
+
+    /**
+     * A method for getting all of the pre-request handlers provided, the value is a readonly and any modifications done will be ignored.
+     * Please use the provider methods for adding them.
+     */
+    getPreRequestHandlers(): Array<IHttpPreRequestHandler>;
+
+    /**
+     * A method for getting all of the pre-response handlers provided, the value is a readonly and any modifications done will be ignored.
+     * Please use the provider methods for adding them.
+     */
+    getPreResponseHandlers(): Array<IHttpPreResponseHandler>;
+}
+
+export interface IHttpPreRequestHandler {
+    executePreHttpRequest(url: string, request: IHttpRequest, read: IRead, persistence: IPersistence): Promise<IHttpRequest>;
+}
+
+export interface IHttpPreResponseHandler {
+    executePreHttpResponse(response: IHttpResponse, read: IRead, persistence: IPersistence): Promise<IHttpResponse>;
+}
+
+export enum HttpStatusCode {
+    CONTINUE = 100,
+    SWITCHING_PROTOCOLS = 101,
+    OK = 200,
+    CREATED = 201,
+    ACCEPTED = 202,
+    NON_AUTHORITATIVE_INFORMATION = 203,
+    NO_CONTENT = 204,
+    RESET_CONTENT = 205,
+    PARTIAL_CONTENT = 206,
+    MULTIPLE_CHOICES = 300,
+    MOVED_PERMANENTLY = 301,
+    FOUND = 302,
+    SEE_OTHER = 303,
+    NOT_MODIFIED = 304,
+    USE_PROXY = 305,
+    TEMPORARY_REDIRECT = 307,
+    BAD_REQUEST = 400,
+    UNAUTHORIZED = 401,
+    PAYMENT_REQUIRED = 402,
+    FORBIDDEN = 403,
+    NOT_FOUND = 404,
+    METHOD_NOT_ALLOWED = 405,
+    NOT_ACCEPTABLE = 406,
+    PROXY_AUTHENTICATION_REQUIRED = 407,
+    REQUEST_TIMEOUT = 408,
+    CONFLICT = 409,
+    GONE = 410,
+    LENGTH_REQUIRED = 411,
+    PRECONDITION_FAILED = 412,
+    REQUEST_ENTITY_TOO_LARGE = 413,
+    REQUEST_URI_TOO_LONG = 414,
+    UNSUPPORTED_MEDIA_TYPE = 415,
+    REQUESTED_RANGE_NOT_SATISFIABLE = 416,
+    EXPECTATION_FAILED = 417,
+    UNPROCESSABLE_ENTITY = 422,
+    TOO_MANY_REQUESTS = 429,
+    INTERNAL_SERVER_ERROR = 500,
+    NOT_IMPLEMENTED = 501,
+    BAD_GATEWAY = 502,
+    SERVICE_UNAVAILABLE = 503,
+    GATEWAY_TIMEOUT = 504,
+    HTTP_VERSION_NOT_SUPPORTED = 505,
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILivechatCreator.ts b/packages/apps-engine/src/definition/accessors/ILivechatCreator.ts
new file mode 100644
index 000000000000..56a3ec17ec27
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ILivechatCreator.ts
@@ -0,0 +1,43 @@
+import type { ILivechatRoom, IVisitor } from '../livechat';
+import type { IUser } from '../users';
+
+export interface IExtraRoomParams {
+    source?: ILivechatRoom['source'];
+    customFields?: {
+        [key: string]: unknown;
+    };
+}
+
+export interface ILivechatCreator {
+    /**
+     * Creates a room to connect the `visitor` to an `agent`.
+     *
+     * This method uses the Livechat routing method configured
+     * in the server
+     *
+     * @param visitor The Livechat Visitor that started the conversation
+     * @param agent The agent responsible for the room
+     */
+    createRoom(visitor: IVisitor, agent: IUser, extraParams?: IExtraRoomParams): Promise<ILivechatRoom>;
+
+    /**
+     * @deprecated Use `createAndReturnVisitor` instead.
+     * Creates a Livechat visitor
+     *
+     * @param visitor Data of the visitor to be created
+     */
+    createVisitor(visitor: IVisitor): Promise<string>;
+
+    /**
+     * Creates a Livechat visitor
+     *
+     * @param visitor Data of the visitor to be created
+     */
+    createAndReturnVisitor(visitor: IVisitor): Promise<IVisitor | undefined>;
+
+    /**
+     * Creates a token to be used when
+     * creating a new livechat visitor
+     */
+    createToken(): string;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILivechatMessageBuilder.ts b/packages/apps-engine/src/definition/accessors/ILivechatMessageBuilder.ts
new file mode 100644
index 000000000000..c36b078f53a6
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ILivechatMessageBuilder.ts
@@ -0,0 +1,219 @@
+import type { ILivechatMessage, IVisitor } from '../livechat';
+import type { IMessageAttachment } from '../messages';
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+import type { IMessageBuilder } from './IMessageBuilder';
+
+/**
+ * Interface for building out a livechat message.
+ * Please note, that a room and sender must be associated otherwise you will NOT
+ * be able to successfully save the message object.
+ */
+export interface ILivechatMessageBuilder {
+    kind: RocketChatAssociationModel.LIVECHAT_MESSAGE;
+
+    /**
+     * Provides a convient way to set the data for the message.
+     * Note: Providing an "id" field here will be ignored.
+     *
+     * @param message the message data to set
+     */
+    setData(message: ILivechatMessage): ILivechatMessageBuilder;
+
+    /**
+     * Sets the room where this message should be sent to.
+     *
+     * @param room the room where to send
+     */
+    setRoom(room: IRoom): ILivechatMessageBuilder;
+
+    /**
+     * Gets the room where this message was sent to.
+     */
+    getRoom(): IRoom;
+
+    /**
+     * Sets the sender of this message.
+     *
+     * @param sender the user sending the message
+     */
+    setSender(sender: IUser): ILivechatMessageBuilder;
+
+    /**
+     * Gets the User which sent the message.
+     */
+    getSender(): IUser;
+
+    /**
+     * Sets the text of the message.
+     *
+     * @param text the actual text
+     */
+    setText(text: string): ILivechatMessageBuilder;
+
+    /**
+     * Gets the message text.
+     */
+    getText(): string;
+
+    /**
+     * Sets the emoji to use for the avatar, this overwrites the current avatar
+     * whether it be the user's or the avatar url provided.
+     *
+     * @param emoji the emoji code
+     */
+    setEmojiAvatar(emoji: string): ILivechatMessageBuilder;
+
+    /**
+     * Gets the emoji used for the avatar.
+     */
+    getEmojiAvatar(): string;
+
+    /**
+     * Sets the url which to display for the avatar, this overwrites the current
+     * avatar whether it be the user's or an emoji one.
+     *
+     * @param avatarUrl image url to use as the avatar
+     */
+    setAvatarUrl(avatarUrl: string): ILivechatMessageBuilder;
+
+    /**
+     * Gets the url used for the avatar.
+     */
+    getAvatarUrl(): string;
+
+    /**
+     * Sets the display text of the sender's username that is visible.
+     *
+     * @param alias the username alias to display
+     */
+    setUsernameAlias(alias: string): ILivechatMessageBuilder;
+
+    /**
+     * Gets the display text of the sender's username that is visible.
+     */
+    getUsernameAlias(): string;
+
+    /**
+     * Adds one attachment to the message's list of attachments, this will not
+     * overwrite any existing ones but just adds.
+     *
+     * @param attachment the attachment to add
+     */
+    addAttachment(attachment: IMessageAttachment): ILivechatMessageBuilder;
+
+    /**
+     * Sets the attachments for the message, replacing and destroying all of the current attachments.
+     *
+     * @param attachments array of the attachments
+     */
+    setAttachments(attachments: Array<IMessageAttachment>): ILivechatMessageBuilder;
+
+    /**
+     * Gets the attachments array for the message
+     */
+    getAttachments(): Array<IMessageAttachment>;
+
+    /**
+     * Replaces an attachment at the given position (index).
+     * If there is no attachment at that position, there will be an error thrown.
+     *
+     * @param position the index of the attachment to replace
+     * @param attachment the attachment to replace with
+     */
+    replaceAttachment(position: number, attachment: IMessageAttachment): ILivechatMessageBuilder;
+
+    /**
+     * Removes an attachment at the given position (index).
+     * If there is no attachment at that position, there will be an error thrown.
+     *
+     * @param position the index of the attachment to remove
+     */
+    removeAttachment(position: number): ILivechatMessageBuilder;
+
+    /**
+     * Sets the user who is editing this message.
+     * This is required if you are modifying an existing message.
+     *
+     * @param user the editor
+     */
+    setEditor(user: IUser): ILivechatMessageBuilder;
+
+    /**
+     * Gets the user who edited the message
+     */
+    getEditor(): IUser;
+
+    /**
+     * Sets whether this message can group with others.
+     * This is desirable if you want to avoid confusion with other integrations.
+     *
+     * @param groupable whether this message can group with others
+     */
+    setGroupable(groupable: boolean): ILivechatMessageBuilder;
+
+    /**
+     * Gets whether this message can group with others.
+     */
+    getGroupable(): boolean;
+
+    /**
+     * Sets whether this message should have any URLs in the text
+     * parsed by Rocket.Chat and get the details added to the message's
+     * attachments.
+     *
+     * @param parseUrls whether URLs should be parsed in this message
+     */
+    setParseUrls(parseUrls: boolean): ILivechatMessageBuilder;
+
+    /**
+     * Gets whether this message should have its URLs parsed
+     */
+    getParseUrls(): boolean;
+
+    /**
+     * Set the token of the livechat visitor that
+     * sent the message
+     *
+     * @param token The Livechat visitor's token
+     */
+    setToken(token: string): ILivechatMessageBuilder;
+
+    /**
+     * Gets the token of the livechat visitor that
+     * sent the message
+     */
+    getToken(): string;
+
+    /**
+     * If the sender of the message is a Livechat Visitor,
+     * set the visitor who sent the message.
+     *
+     * If you set the visitor property of a message, the
+     * sender will be emptied
+     *
+     * @param visitor The visitor who sent the message
+     */
+    setVisitor(visitor: IVisitor): ILivechatMessageBuilder;
+
+    /**
+     * Get the visitor who sent the message,
+     * if any
+     */
+    getVisitor(): IVisitor;
+
+    /**
+     * Gets the resulting message that has been built up to the point of calling it.
+     *
+     * *Note:* This will error out if the Room has not been defined OR if the room
+     * is not of type RoomType.LIVE_CHAT.
+     */
+    getMessage(): ILivechatMessage;
+
+    /**
+     * Returns a message builder based on the
+     * livechat message of this builder
+     */
+    getMessageBuilder(): IMessageBuilder;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILivechatRead.ts b/packages/apps-engine/src/definition/accessors/ILivechatRead.ts
new file mode 100644
index 000000000000..a756d162c337
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ILivechatRead.ts
@@ -0,0 +1,38 @@
+import type { IDepartment } from '../livechat';
+import type { ILivechatRoom } from '../livechat/ILivechatRoom';
+import type { IVisitor } from '../livechat/IVisitor';
+import type { IMessage } from '../messages';
+
+export interface ILivechatRead {
+    /**
+     * Gets online status of the livechat.
+     * @param departmentId (optional) the id of the livechat department
+     * @deprecated use `isOnlineAsync` instead
+     */
+    isOnline(departmentId?: string): boolean;
+    /**
+     * Gets online status of the livechat.
+     * @param departmentId (optional) the id of the livechat department
+     */
+    isOnlineAsync(departmentId?: string): Promise<boolean>;
+    getDepartmentsEnabledWithAgents(): Promise<Array<IDepartment>>;
+    getLivechatRooms(visitor: IVisitor, departmentId?: string): Promise<Array<ILivechatRoom>>;
+    getLivechatOpenRoomsByAgentId(agentId: string): Promise<Array<ILivechatRoom>>;
+    getLivechatTotalOpenRoomsByAgentId(agentId: string): Promise<number>;
+    /**
+     * @deprecated This method does not adhere to the conversion practices applied
+     * elsewhere in the Apps-Engine and will be removed in the next major version.
+     * Prefer the alternative methods to fetch visitors.
+     */
+    getLivechatVisitors(query: object): Promise<Array<IVisitor>>;
+    getLivechatVisitorById(id: string): Promise<IVisitor | undefined>;
+    getLivechatVisitorByEmail(email: string): Promise<IVisitor | undefined>;
+    getLivechatVisitorByToken(token: string): Promise<IVisitor | undefined>;
+    getLivechatVisitorByPhoneNumber(phoneNumber: string): Promise<IVisitor | undefined>;
+    getLivechatDepartmentByIdOrName(value: string): Promise<IDepartment | undefined>;
+    /**
+     * @experimental we do not encourage the wider usage of this method,
+     * as we're evaluating its performance and fit for the API.
+     */
+    _fetchLivechatRoomMessages(roomId: string): Promise<Array<IMessage>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILivechatUpdater.ts b/packages/apps-engine/src/definition/accessors/ILivechatUpdater.ts
new file mode 100644
index 000000000000..fb75cf9ecf3b
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ILivechatUpdater.ts
@@ -0,0 +1,33 @@
+import type { ILivechatTransferData, IVisitor } from '../livechat';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+
+export interface ILivechatUpdater {
+    /**
+     * Transfer a Livechat visitor to another room
+     *
+     * @param visitor Visitor to be transferred
+     * @param transferData The data to execute the transferring
+     */
+    transferVisitor(visitor: IVisitor, transferData: ILivechatTransferData): Promise<boolean>;
+
+    /**
+     * Closes a Livechat room
+     *
+     * @param room The room to be closed
+     * @param comment The comment explaining the reason for closing the room
+     * @param closer The user that closes the room
+     */
+    closeRoom(room: IRoom, comment: string, closer?: IUser): Promise<boolean>;
+
+    /**
+     * Set a livechat visitor's custom fields by its token
+     * @param token The visitor's token
+     * @param key The key in the custom fields
+     * @param value The value to be set
+     * @param overwrite Whether overwrite or not
+     *
+     * @returns Promise to whether success or not
+     */
+    setCustomFields(token: IVisitor['token'], key: string, value: string, overwrite: boolean): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILogEntry.ts b/packages/apps-engine/src/definition/accessors/ILogEntry.ts
new file mode 100644
index 000000000000..4dc46693b6d9
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ILogEntry.ts
@@ -0,0 +1,22 @@
+export enum LogMessageSeverity {
+    DEBUG = 'debug',
+    INFORMATION = 'info',
+    LOG = 'log',
+    WARNING = 'warning',
+    ERROR = 'error',
+    SUCCESS = 'success',
+}
+
+/**
+ * Message which will be passed to a UI (either in a log or in the application's UI)
+ */
+export interface ILogEntry {
+    /** The function name who did this logging, this is automatically added (can be null). */
+    caller?: string;
+    /** The severity rate, this is automatically added. */
+    severity: LogMessageSeverity;
+    /** When this entry was made. */
+    timestamp: Date;
+    /** The items which were logged. */
+    args: Array<any>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILogger.ts b/packages/apps-engine/src/definition/accessors/ILogger.ts
new file mode 100644
index 000000000000..eac6e531802d
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ILogger.ts
@@ -0,0 +1,29 @@
+import type { AppMethod } from '../metadata/AppMethod';
+import type { ILogEntry } from './ILogEntry';
+
+/**
+ * This logger provides a way to log various levels to the entire system.
+ * When used, the items passed in will be logged to the database. This will
+ * allow people to easily see what happened (users) or debug what went wrong.
+ */
+export interface ILogger {
+    method: `${AppMethod}`;
+
+    debug(...items: Array<any>): void;
+    info(...items: Array<any>): void;
+    log(...items: Array<any>): void;
+    warn(...items: Array<any>): void;
+    error(...items: Array<any>): void;
+    success(...items: Array<any>): void;
+
+    /** Gets the entries logged. */
+    getEntries(): Array<ILogEntry>;
+    /** Gets the method which this logger is for. */
+    getMethod(): `${AppMethod}`;
+    /** Gets when this logger was constructed. */
+    getStartTime(): Date;
+    /** Gets the end time, usually Date.now(). */
+    getEndTime(): Date;
+    /** Gets the amount of time this was a logger, start - Date.now(). */
+    getTotalTime(): number;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IMessageBuilder.ts b/packages/apps-engine/src/definition/accessors/IMessageBuilder.ts
new file mode 100644
index 000000000000..024a4b123ff8
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IMessageBuilder.ts
@@ -0,0 +1,236 @@
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
+
+import type { IMessage, IMessageAttachment } from '../messages';
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IRoom } from '../rooms';
+import type { BlockBuilder, IBlock } from '../uikit';
+import type { IUser } from '../users';
+
+/**
+ * Interface for building out a message.
+ * Please note, that a room and sender must be associated otherwise you will NOT
+ * be able to successfully save the message object.
+ */
+export interface IMessageBuilder {
+    kind: RocketChatAssociationModel.MESSAGE;
+
+    /**
+     * Provides a convenient way to set the data for the message.
+     * Note: Providing an "id" field here will be ignored.
+     *
+     * @param message the message data to set
+     */
+    setData(message: IMessage): IMessageBuilder;
+
+    /**
+     * Provides a convenient way to set the data for the message
+     * keeping the "id" field so as to update the message later.
+     *
+     * @param message the message data to set
+     * @param editor the user who edited the updated message
+     */
+    setUpdateData(message: IMessage, editor: IUser): IMessageBuilder;
+
+    /**
+     * Sets the thread to which this message belongs, if any.
+     *
+     * @param threadId The id of the thread
+     */
+    setThreadId(threadId: string): IMessageBuilder;
+
+    /**
+     * Retrieves the threadId to which this message belongs,
+     * if any.
+     *
+     * If you would like to retrieve the actual message that
+     * the thread originated from, you can use the
+     * `IMessageRead.getById()` method
+     */
+    getThreadId(): string;
+
+    /**
+     * Sets the room where this message should be sent to.
+     *
+     * @param room the room where to send
+     */
+    setRoom(room: IRoom): IMessageBuilder;
+
+    /**
+     * Gets the room where this message was sent to.
+     */
+    getRoom(): IRoom;
+
+    /**
+     * Sets the sender of this message.
+     *
+     * @param sender the user sending the message
+     */
+    setSender(sender: IUser): IMessageBuilder;
+
+    /**
+     * Gets the User which sent the message.
+     */
+    getSender(): IUser;
+
+    /**
+     * Sets the text of the message.
+     *
+     * @param text the actual text
+     */
+    setText(text: string): IMessageBuilder;
+
+    /**
+     * Gets the message text.
+     */
+    getText(): string;
+
+    /**
+     * Sets the emoji to use for the avatar, this overwrites the current avatar
+     * whether it be the user's or the avatar url provided.
+     *
+     * @param emoji the emoji code
+     */
+    setEmojiAvatar(emoji: string): IMessageBuilder;
+
+    /**
+     * Gets the emoji used for the avatar.
+     */
+    getEmojiAvatar(): string;
+
+    /**
+     * Sets the url which to display for the avatar, this overwrites the current
+     * avatar whether it be the user's or an emoji one.
+     *
+     * @param avatarUrl image url to use as the avatar
+     */
+    setAvatarUrl(avatarUrl: string): IMessageBuilder;
+
+    /**
+     * Gets the url used for the avatar.
+     */
+    getAvatarUrl(): string;
+
+    /**
+     * Sets the display text of the sender's username that is visible.
+     *
+     * @param alias the username alias to display
+     */
+    setUsernameAlias(alias: string): IMessageBuilder;
+
+    /**
+     * Gets the display text of the sender's username that is visible.
+     */
+    getUsernameAlias(): string;
+
+    /**
+     * Adds one attachment to the message's list of attachments, this will not
+     * overwrite any existing ones but just adds.
+     *
+     * @param attachment the attachment to add
+     */
+    addAttachment(attachment: IMessageAttachment): IMessageBuilder;
+
+    /**
+     * Sets the attachments for the message, replacing and destroying all of the current attachments.
+     *
+     * @param attachments array of the attachments
+     */
+    setAttachments(attachments: Array<IMessageAttachment>): IMessageBuilder;
+
+    /**
+     * Gets the attachments array for the message
+     */
+    getAttachments(): Array<IMessageAttachment>;
+
+    /**
+     * Replaces an attachment at the given position (index).
+     * If there is no attachment at that position, there will be an error thrown.
+     *
+     * @param position the index of the attachment to replace
+     * @param attachment the attachment to replace with
+     */
+    replaceAttachment(position: number, attachment: IMessageAttachment): IMessageBuilder;
+
+    /**
+     * Removes an attachment at the given position (index).
+     * If there is no attachment at that position, there will be an error thrown.
+     *
+     * @param position the index of the attachment to remove
+     */
+    removeAttachment(position: number): IMessageBuilder;
+
+    /**
+     * Sets the user who is editing this message.
+     * This is required if you are modifying an existing message.
+     *
+     * @param user the editor
+     */
+    setEditor(user: IUser): IMessageBuilder;
+
+    /**
+     * Gets the user who edited the message
+     */
+    getEditor(): IUser;
+
+    /**
+     * Sets whether this message can group with others.
+     * This is desirable if you want to avoid confusion with other integrations.
+     *
+     * @param groupable whether this message can group with others
+     */
+    setGroupable(groupable: boolean): IMessageBuilder;
+
+    /**
+     * Gets whether this message can group with others.
+     */
+    getGroupable(): boolean;
+
+    /**
+     * Sets whether this message should have any URLs in the text
+     * parsed by Rocket.Chat and get the details added to the message's
+     * attachments.
+     *
+     * @param parseUrls whether URLs should be parsed in this message
+     */
+    setParseUrls(parseUrls: boolean): IMessageBuilder;
+
+    /**
+     * Gets whether this message should have its URLs parsed
+     */
+    getParseUrls(): boolean;
+
+    /**
+     * Gets the resulting message that has been built up to the point of calling it.
+     *
+     * *Note:* This will error out if the Room has not been defined.
+     */
+    getMessage(): IMessage;
+
+    /**
+     * Adds a block collection to the message's
+     * own collection
+     */
+    addBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>): IMessageBuilder;
+
+    /**
+     * Sets the block collection of the message
+     *
+     * @param blocks
+     */
+    setBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>): IMessageBuilder;
+
+    /**
+     * Gets the block collection of the message
+     */
+    getBlocks(): Array<IBlock | LayoutBlock>;
+
+    /**
+     * Adds a custom field to the message.
+     * Note: This key can not already exist or it will throw an error.
+     * Note: The key must not contain a period in it, an error will be thrown.
+     *
+     * @param key the name of the custom field
+     * @param value the value of this custom field
+     */
+    addCustomField(key: string, value: any): IMessageBuilder;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IMessageExtender.ts b/packages/apps-engine/src/definition/accessors/IMessageExtender.ts
new file mode 100644
index 000000000000..7db010bae081
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IMessageExtender.ts
@@ -0,0 +1,36 @@
+import type { IMessage, IMessageAttachment } from '../messages';
+import type { RocketChatAssociationModel } from '../metadata';
+
+export interface IMessageExtender {
+    kind: RocketChatAssociationModel.MESSAGE;
+
+    /**
+     * Adds a custom field to the message.
+     * Note: This key can not already exist or it will throw an error.
+     * Note: The key must not contain a period in it, an error will be thrown.
+     *
+     * @param key the name of the custom field
+     * @param value the value of this custom field
+     */
+    addCustomField(key: string, value: any): IMessageExtender;
+
+    /**
+     * Adds a single attachment to the message.
+     *
+     * @param attachment the item to add
+     */
+    addAttachment(attachment: IMessageAttachment): IMessageExtender;
+
+    /**
+     * Adds all of the provided attachments to the message.
+     *
+     * @param attachments an array of attachments
+     */
+    addAttachments(attachments: Array<IMessageAttachment>): IMessageExtender;
+
+    /**
+     * Gets the resulting message that has been extended at the point of calling it.
+     * Note: modifying the returned value will have no effect.
+     */
+    getMessage(): IMessage;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IMessageRead.ts b/packages/apps-engine/src/definition/accessors/IMessageRead.ts
new file mode 100644
index 000000000000..10c99d26388b
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IMessageRead.ts
@@ -0,0 +1,15 @@
+import type { IMessage } from '../messages/index';
+import type { IRoom } from '../rooms/IRoom';
+import type { IUser } from '../users/IUser';
+
+/**
+ * This accessor provides methods for accessing
+ * messages in a read-only-fashion.
+ */
+export interface IMessageRead {
+    getById(id: string): Promise<IMessage | undefined>;
+
+    getSenderUser(messageId: string): Promise<IUser | undefined>;
+
+    getRoom(messageId: string): Promise<IRoom | undefined>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IMessageUpdater.ts b/packages/apps-engine/src/definition/accessors/IMessageUpdater.ts
new file mode 100644
index 000000000000..b21baacae04f
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IMessageUpdater.ts
@@ -0,0 +1,21 @@
+import type { Reaction } from '../messages';
+
+export interface IMessageUpdater {
+    /**
+     * Add a reaction to a message
+     *
+     * @param messageId the id of the message
+     * @param userId the id of the user
+     * @param reaction the reaction
+     */
+    addReaction(messageId: string, userId: string, reaction: Reaction): Promise<void>;
+
+    /**
+     * Remove a reaction from a message
+     *
+     * @param messageId the id of the message
+     * @param userId the id of the user
+     * @param reaction the reaction
+     */
+    removeReaction(messageId: string, userId: string, reaction: Reaction): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IModerationModify.ts b/packages/apps-engine/src/definition/accessors/IModerationModify.ts
new file mode 100644
index 000000000000..6b0f54968a04
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IModerationModify.ts
@@ -0,0 +1,27 @@
+import type { IMessage } from '../messages';
+import type { IUser } from '../users';
+
+export interface IModerationModify {
+    /**
+     * Provides a way for Apps to report a message.
+     * @param messageId the messageId to report
+     * @param description the description of the report
+     * @param userId the userId to be reported
+     * @param appId the app id
+     */
+    report(messageId: string, description: string, userId: string, appId: string): Promise<void>;
+
+    /**
+     * Provides a way for Apps to dismiss reports by message id.
+     * @param messageId the messageId to dismiss reports
+     * @param appId the app id
+     */
+    dismissReportsByMessageId(messageId: IMessage['id'], reason: string, action: string, appId: string): Promise<void>;
+
+    /**
+     * Provides a way for Apps to dismiss reports by user id.
+     * @param userId the userId to dismiss reports
+     * @param appId the app id
+     */
+    dismissReportsByUserId(userId: IUser['id'], reason: string, action: string, appId: string): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IModify.ts b/packages/apps-engine/src/definition/accessors/IModify.ts
new file mode 100644
index 000000000000..e76e4cc76824
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IModify.ts
@@ -0,0 +1,45 @@
+import type { IModerationModify } from './IModerationModify';
+import type { IModifyCreator } from './IModifyCreator';
+import type { IModifyDeleter } from './IModifyDeleter';
+import type { IModifyExtender } from './IModifyExtender';
+import type { IModifyUpdater } from './IModifyUpdater';
+import type { INotifier } from './INotifier';
+import type { IOAuthAppsModify } from './IOAuthAppsModify';
+import type { ISchedulerModify } from './ISchedulerModify';
+import type { IUIController } from './IUIController';
+
+export interface IModify {
+    getCreator(): IModifyCreator;
+
+    getDeleter(): IModifyDeleter;
+
+    getExtender(): IModifyExtender;
+
+    getUpdater(): IModifyUpdater;
+
+    /**
+     * Gets the accessor for sending notifications to a user or users in a room.
+     *
+     * @returns the notifier accessor
+     */
+    getNotifier(): INotifier;
+    /**
+     * Gets the accessor for interacting with the UI
+     */
+    getUiController(): IUIController;
+
+    /**
+     * Gets the accessor for creating scheduled jobs
+     */
+    getScheduler(): ISchedulerModify;
+
+    /**
+     * Gets the accessor for creating OAuth apps
+     */
+    getOAuthAppsModifier(): IOAuthAppsModify;
+    /**
+     * Gets the accessor for modifying moderation
+     * @returns the moderation accessor
+     */
+    getModerationModifier(): IModerationModify;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IModifyCreator.ts b/packages/apps-engine/src/definition/accessors/IModifyCreator.ts
new file mode 100644
index 000000000000..6c2acd50493c
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IModifyCreator.ts
@@ -0,0 +1,100 @@
+import type { ILivechatMessage } from '../livechat';
+import type { IMessage } from '../messages';
+import type { IRoom } from '../rooms';
+import type { BlockBuilder } from '../uikit';
+import type { IBotUser } from '../users/IBotUser';
+import type { AppVideoConference } from '../videoConferences';
+import type { IDiscussionBuilder } from './IDiscussionBuilder';
+import type { IEmailCreator } from './IEmailCreator';
+import type { ILivechatCreator } from './ILivechatCreator';
+import type { ILivechatMessageBuilder } from './ILivechatMessageBuilder';
+import type { IMessageBuilder } from './IMessageBuilder';
+import type { IRoomBuilder } from './IRoomBuilder';
+import type { IUploadCreator } from './IUploadCreator';
+import type { IUserBuilder } from './IUserBuilder';
+import type { IVideoConferenceBuilder } from './IVideoConferenceBuilder';
+
+export interface IModifyCreator {
+    /**
+     * Get the creator object responsible for the
+     * Livechat integrations
+     */
+    getLivechatCreator(): ILivechatCreator;
+
+    /**
+     * Get the creator object responsible for the upload.
+     */
+    getUploadCreator(): IUploadCreator;
+
+    /**
+     * Gets the creator object responsible for email sending
+     */
+    getEmailCreator(): IEmailCreator;
+
+    /**
+     * @deprecated please prefer the rocket.chat/ui-kit components
+     *
+     * Gets a new instance of a BlockBuilder
+     */
+    getBlockBuilder(): BlockBuilder;
+    /**
+     * Starts the process for building a new message object.
+     *
+     * @param data (optional) the initial data to pass into the builder,
+     *          the `id` property will be ignored
+     * @return an IMessageBuilder instance
+     */
+    startMessage(data?: IMessage): IMessageBuilder;
+
+    /**
+     * Starts the process for building a new livechat message object.
+     *
+     * @param data (optional) the initial data to pass into the builder,
+     *          the `id` property will be ignored
+     * @return an IMessageBuilder instance
+     */
+    startLivechatMessage(data?: ILivechatMessage): ILivechatMessageBuilder;
+
+    /**
+     * Starts the process for building a new room.
+     *
+     * @param data (optional) the initial data to pass into the builder,
+     *          the `id` property will be ignored
+     * @return an IRoomBuilder instance
+     */
+    startRoom(data?: IRoom): IRoomBuilder;
+
+    /**
+     * Starts the process for building a new discussion.
+     *
+     * @param data (optional) the initial data to pass into the builder,
+     *          the `id` property will be ignored
+     * @return an IDiscussionBuilder instance
+     */
+    startDiscussion(data?: Partial<IRoom>): IDiscussionBuilder;
+
+    /**
+     * Starts the process for building a new video conference.
+     *
+     * @param data (optional) the initial data to pass into the builder,
+     * @return an IVideoConferenceBuilder instance
+     */
+    startVideoConference(data?: Partial<AppVideoConference>): IVideoConferenceBuilder;
+
+    /**
+     * Starts the process for building a new bot user.
+     *
+     * @param data (optional) the initial data to pass into the builder,
+     *          the `id` property will be ignored
+     * @return an IUserBuilder instance
+     */
+    startBotUser(data?: Partial<IBotUser>): IUserBuilder;
+
+    /**
+     * Finishes the creating process, saving the object to the database.
+     *
+     * @param builder the builder instance
+     * @return the resulting `id` of the resulting object
+     */
+    finish(builder: IMessageBuilder | ILivechatMessageBuilder | IRoomBuilder | IDiscussionBuilder | IVideoConferenceBuilder | IUserBuilder): Promise<string>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IModifyDeleter.ts b/packages/apps-engine/src/definition/accessors/IModifyDeleter.ts
new file mode 100644
index 000000000000..7d1103ba13f3
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IModifyDeleter.ts
@@ -0,0 +1,12 @@
+import type { IMessage } from '../messages';
+import type { IUser, UserType } from '../users';
+
+export interface IModifyDeleter {
+    deleteRoom(roomId: string): Promise<void>;
+
+    deleteUsers(appId: Exclude<IUser['appId'], undefined>, userType: UserType.APP | UserType.BOT): Promise<boolean>;
+
+    deleteMessage(message: IMessage, user: IUser): Promise<void>;
+
+    removeUsersFromRoom(roomId: string, usernames: Array<string>): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IModifyExtender.ts b/packages/apps-engine/src/definition/accessors/IModifyExtender.ts
new file mode 100644
index 000000000000..786b23975407
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IModifyExtender.ts
@@ -0,0 +1,40 @@
+import type { IUser } from '../users';
+import type { IMessageExtender } from './IMessageExtender';
+import type { IRoomExtender } from './IRoomExtender';
+import type { IVideoConferenceExtender } from './IVideoConferenceExtend';
+
+export interface IModifyExtender {
+    /**
+     * Modifies a message in a non-destructive way: Properties can be added to it,
+     * but existing properties cannot be changed.
+     *
+     * @param messageId the id of the message to be extended
+     * @param updater the user who is updating/extending the message
+     * @return the extender instance for the message
+     */
+    extendMessage(messageId: string, updater: IUser): Promise<IMessageExtender>;
+
+    /**
+     * Modifies a room in a non-destructive way: Properties can be added to it,
+     * but existing properties cannot be changed.
+     *
+     * @param roomId the id of the room to be extended
+     * @param updater the user who is updating/extending the room
+     * @return the extender instance for the room
+     */
+    extendRoom(roomId: string, updater: IUser): Promise<IRoomExtender>;
+
+    /**
+     * Modifies a video conference in a non-destructive way: Properties can be added to it,
+     * but existing properties cannot be changed.
+     */
+    extendVideoConference(id: string): Promise<IVideoConferenceExtender>;
+
+    /**
+     * Finishes the extending process, saving the object to the database.
+     * Note: If there is an issue or error while updating, this will throw an error.
+     *
+     * @param extender the extender instance
+     */
+    finish(extender: IRoomExtender | IMessageExtender | IVideoConferenceExtender): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IModifyUpdater.ts b/packages/apps-engine/src/definition/accessors/IModifyUpdater.ts
new file mode 100644
index 000000000000..60dcf90b2df7
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IModifyUpdater.ts
@@ -0,0 +1,52 @@
+import type { IUser } from '../users';
+import type { ILivechatUpdater } from './ILivechatUpdater';
+import type { IMessageBuilder } from './IMessageBuilder';
+import type { IMessageUpdater } from './IMessageUpdater';
+import type { IRoomBuilder } from './IRoomBuilder';
+import type { IUserUpdater } from './IUserUpdater';
+
+export interface IModifyUpdater {
+    /**
+     * Get the updater object responsible for the
+     * Livechat integrations
+     */
+    getLivechatUpdater(): ILivechatUpdater;
+
+    /**
+     * Gets the update object responsible for
+     * methods that update users
+     */
+    getUserUpdater(): IUserUpdater;
+
+    /**
+     * Get the updater object responsible for
+     * methods that update messages
+     */
+    getMessageUpdater(): IMessageUpdater;
+
+    /**
+     * Modifies an existing message.
+     * Raises an exception if a non-existent messageId is supplied
+     *
+     * @param messageId the id of the existing message to modfiy and build
+     * @param updater the user who is updating the message
+     */
+    message(messageId: string, updater: IUser): Promise<IMessageBuilder>;
+
+    /**
+     * Modifies an existing room.
+     * Raises an exception if a non-existent roomId is supplied
+     *
+     * @param roomId the id of the existing room to modify and build
+     * @param updater the user who is updating the room
+     */
+    room(roomId: string, updater: IUser): Promise<IRoomBuilder>;
+
+    /**
+     * Finishes the updating process, saving the object to the database.
+     * Note: If there is an issue or error while updating, this will throw an error.
+     *
+     * @param builder the builder instance
+     */
+    finish(builder: IMessageBuilder | IRoomBuilder): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/INotifier.ts b/packages/apps-engine/src/definition/accessors/INotifier.ts
new file mode 100644
index 000000000000..a41fb22c4ff6
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/INotifier.ts
@@ -0,0 +1,63 @@
+import type { IMessage } from '../messages';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+import type { IMessageBuilder } from './IMessageBuilder';
+
+export enum TypingScope {
+    Room = 'room',
+}
+
+export interface ITypingOptions {
+    /**
+     * The typing scope where the typing message should be presented,
+     * TypingScope.Room by default.
+     */
+    scope?: TypingScope;
+    /**
+     * The id of the typing scope
+     *
+     * TypingScope.Room <-> room.id
+     */
+    id: string;
+    /**
+     * The name of the user who is typing the message
+     *
+     * **Note**: If not provided, it will use app assigned
+     * user's name by default.
+     */
+    username?: string;
+}
+
+export interface INotifier {
+    /**
+     * Notifies the provided user of the provided message.
+     *
+     * **Note**: Notifications only are shown to the user if they are
+     * online and it only stays around for the duration of their session.
+     *
+     * @param user The user who should be notified
+     * @param message The message with the content to notify the user about
+     */
+    notifyUser(user: IUser, message: IMessage): Promise<void>;
+
+    /**
+     * Notifies all of the users in the provided room.
+     *
+     * **Note**: Notifications only are shown to those online
+     * and it only stays around for the duration of their session.
+     *
+     * @param room The room which to notify the users in
+     * @param message The message content to notify users about
+     */
+    notifyRoom(room: IRoom, message: IMessage): Promise<void>;
+
+    /**
+     * Notifies all of the users a typing indicator in the provided scope.
+     *
+     * @returns a cancellation function to stop typing
+     */
+    typing(options: ITypingOptions): Promise<() => Promise<void>>;
+
+    /** Gets a new message builder for building a notification message. */
+    getMessageBuilder(): IMessageBuilder;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IOAuthApp.ts b/packages/apps-engine/src/definition/accessors/IOAuthApp.ts
new file mode 100644
index 000000000000..1c2edbe19c95
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IOAuthApp.ts
@@ -0,0 +1,13 @@
+export interface IOAuthApp {
+    id: string;
+    name: string;
+    active: boolean;
+    clientId?: string;
+    clientSecret?: string;
+    redirectUri: string;
+    createdAt?: string;
+    updatedAt?: string;
+    createdBy: { username: string; id: string };
+}
+
+export type IOAuthAppParams = Omit<IOAuthApp, 'id' | 'createdAt' | 'updatedAt' | 'createdBy' | 'appId'>;
diff --git a/packages/apps-engine/src/definition/accessors/IOAuthAppsModify.ts b/packages/apps-engine/src/definition/accessors/IOAuthAppsModify.ts
new file mode 100644
index 000000000000..72d0a4ddce5a
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IOAuthAppsModify.ts
@@ -0,0 +1,23 @@
+import type { IOAuthAppParams } from './IOAuthApp';
+
+export interface IOAuthAppsModify {
+    /**
+     * Create an OAuthApp
+     * @param OAuthApp - the OAuth app to create, in case the clientId and the clientSecret is not sent it will generate automatically
+     * @param appId - the app id
+     */
+    createOAuthApp(OAuthApp: IOAuthAppParams, appId: string): Promise<string>;
+    /**
+     * Update the OAuth app info
+     * @param OAuthApp - OAuth data that will be updated
+     * @param id - OAuth app id
+     * @param appId - the app id
+     */
+    updateOAuthApp(OAuthApp: IOAuthAppParams, id: string, appId: string): Promise<void>;
+    /**
+     * Deletes the OAuth app
+     * @param id - OAuth app id
+     * @param appId - the app id
+     */
+    deleteOAuthApp(id: string, appId: string): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IOAuthAppsReader.ts b/packages/apps-engine/src/definition/accessors/IOAuthAppsReader.ts
new file mode 100644
index 000000000000..97d544cd9366
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IOAuthAppsReader.ts
@@ -0,0 +1,16 @@
+import type { IOAuthApp } from './IOAuthApp';
+
+export interface IOAuthAppsReader {
+    /**
+     * Returns the OAuth app info by its id
+     * @param id - OAuth app id
+     * @param appId - the app id
+     */
+    getOAuthAppById(id: string, appId: string): Promise<IOAuthApp>;
+    /**
+     * Returns the OAuth app info by its name
+     * @param name - OAuth app name
+     * @param appId - the app id
+     */
+    getOAuthAppByName(name: string, appId: string): Promise<Array<IOAuthApp>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IPersistence.ts b/packages/apps-engine/src/definition/accessors/IPersistence.ts
new file mode 100644
index 000000000000..30f1d676539e
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IPersistence.ts
@@ -0,0 +1,97 @@
+import type { RocketChatAssociationRecord } from '../metadata';
+
+/**
+ * Provides an accessor write data to the App's persistent storage.
+ * A App only has access to its own persistent storage and does not
+ * have access to any other App's.
+ */
+export interface IPersistence {
+    /**
+     * Creates a new record in the App's persistent storage, returning the resulting "id".
+     *
+     * @param data the actual data to store, must be an object otherwise it will error out.
+     * @return the resulting record's id
+     */
+    create(data: object): Promise<string>;
+
+    /**
+     * Creates a new record in the App's persistent storage with the associated information
+     * being provided.
+     *
+     * @param data the actual data to store, must be an object otherwise it will error out
+     * @param association the association data which includes the model and record id
+     * @return the resulting record's id
+     */
+    createWithAssociation(data: object, association: RocketChatAssociationRecord): Promise<string>;
+
+    /**
+     * Creates a new record in the App's persistent storage with the data being
+     * associated with more than one Rocket.Chat record.
+     *
+     * @param data the actual data to store, must be an object otherwise it will error out
+     * @param associations an array of association data which includes the model and record id
+     * @return the resulting record's id
+     */
+    createWithAssociations(data: object, associations: Array<RocketChatAssociationRecord>): Promise<string>;
+
+    /**
+     * Updates an existing record with the data provided in the App's persistent storage.
+     * This will throw an error if the record doesn't currently exist or if the data is not an object.
+     *
+     * @param id the data record's id
+     * @param data the actual data to store, must be an object otherwise it will error out
+     * @param upsert whether a record should be created if the id to be updated does not exist
+     * @return the id of the updated/upserted record
+     */
+    update(id: string, data: object, upsert?: boolean): Promise<string>;
+
+    /**
+     * Updates an existing record with the data provided in the App's persistent storage which are
+     * associated with provided information.
+     * This will throw an error if the record doesn't currently exist or if the data is not an object.
+     *
+     * @param association the association record
+     * @param data the actual data to store, must be an object otherwise it will error out
+     * @param upsert whether a record should be created if the id to be updated does not exist
+     * @return the id of the updated/upserted record
+     */
+    updateByAssociation(association: RocketChatAssociationRecord, data: object, upsert?: boolean): Promise<string>;
+
+    /**
+     * Updates an existing record with the data provided in the App's persistent storage which are
+     * associated with more than one Rocket.Chat record.
+     * This will throw an error if the record doesn't currently exist or if the data is not an object.
+     *
+     * @param associations an array of association data which includes the model and record id
+     * @param data the actual data to store, must be an object otherwise it will error out
+     * @param upsert whether a record should be created if the id to be updated does not exist
+     * @return the id of the updated/upserted record
+     */
+    updateByAssociations(associations: Array<RocketChatAssociationRecord>, data: object, upsert?: boolean): Promise<string>;
+
+    /**
+     * Removes a record by the provided id and returns the removed record.
+     *
+     * @param id of the record to remove
+     * @return the data record which was removed
+     */
+    remove(id: string): Promise<object>;
+
+    /**
+     * Removes all of the records in persistent storage which are associated with the provided information.
+     *
+     * @param association the information about the association for the records to be removed
+     * @return the data of the removed records
+     */
+    removeByAssociation(association: RocketChatAssociationRecord): Promise<Array<object>>;
+
+    /**
+     * Removes all of the records in persistent storage which are associated with the provided information.
+     * More than one association acts like an AND which means a record in persistent storage must have all
+     * of the associations to be considered a match.
+     *
+     * @param associations the information about the associations for the records to be removed
+     * @return the data of the removed records
+     */
+    removeByAssociations(associations: Array<RocketChatAssociationRecord>): Promise<Array<object>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IPersistenceRead.ts b/packages/apps-engine/src/definition/accessors/IPersistenceRead.ts
new file mode 100644
index 000000000000..d0d1178a44d0
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IPersistenceRead.ts
@@ -0,0 +1,40 @@
+import type { RocketChatAssociationRecord } from '../metadata';
+
+/**
+ * Provides a read-only accessor for the App's persistent storage.
+ * A App only has access to its own persistent storage and does not
+ * have access to any other App's.
+ */
+export interface IPersistenceRead {
+    /**
+     * Retrieves a record from the App's persistent storage by the provided id.
+     * A "falsey" value (undefined or null or false) is returned should nothing exist
+     * in the storage by the provided id.
+     *
+     * @param id the record to get's id
+     * @return the record if it exists, falsey if not
+     */
+    read(id: string): Promise<object>;
+
+    /**
+     * Retrieves a record from the App's persistent storage by the provided id.
+     * An empty array is returned should there be no records associated with the
+     * data provided.
+     *
+     * @param association the association record to query the persistent storage for
+     * @return array of the records if any exists, empty array if none exist
+     */
+    readByAssociation(association: RocketChatAssociationRecord): Promise<Array<object>>;
+
+    /**
+     * Retrieves a record from the App's persistent storage by the provided id.
+     * Providing more than one association record acts like an AND which means a record
+     * in persistent storage must have all of the associations to be considered a match.
+     * An empty array is returned should there be no records associated with the
+     * data provided.
+     *
+     * @param associations the association records to query the persistent storage for
+     * @return array of the records if any exists, empty array if none exist
+     */
+    readByAssociations(associations: Array<RocketChatAssociationRecord>): Promise<Array<object>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IRead.ts b/packages/apps-engine/src/definition/accessors/IRead.ts
new file mode 100644
index 000000000000..17f66d6218dc
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IRead.ts
@@ -0,0 +1,52 @@
+import type { ICloudWorkspaceRead } from './ICloudWorkspaceRead';
+import type { IEnvironmentRead } from './IEnvironmentRead';
+import type { ILivechatRead } from './ILivechatRead';
+import type { IMessageRead } from './IMessageRead';
+import type { INotifier } from './INotifier';
+import type { IOAuthAppsReader } from './IOAuthAppsReader';
+import type { IPersistenceRead } from './IPersistenceRead';
+import type { IRoleRead } from './IRoleRead';
+import type { IRoomRead } from './IRoomRead';
+import type { IThreadRead } from './IThreadRead';
+import type { IUploadRead } from './IUploadRead';
+import type { IUserRead } from './IUserRead';
+import type { IVideoConferenceRead } from './IVideoConferenceRead';
+
+/**
+ * The IRead accessor provides methods for accessing the
+ * Rocket.Chat's environment in a read-only-fashion.
+ * It is safe to be injected in multiple places, idempotent and extensible
+ */
+export interface IRead {
+    /** Gets the IEnvironmentRead instance, contains settings and environmental variables. */
+    getEnvironmentReader(): IEnvironmentRead;
+
+    /** Gets the IThreadRead instance */
+
+    getThreadReader(): IThreadRead;
+
+    /** Gets the IMessageRead instance. */
+    getMessageReader(): IMessageRead;
+
+    /** Gets the IPersistenceRead instance. */
+    getPersistenceReader(): IPersistenceRead;
+
+    /** Gets the IRoomRead instance. */
+    getRoomReader(): IRoomRead;
+
+    /** Gets the IUserRead instance. */
+    getUserReader(): IUserRead;
+
+    /** Gets the INotifier for notifying users/rooms. */
+    getNotifier(): INotifier;
+
+    getLivechatReader(): ILivechatRead;
+    getUploadReader(): IUploadRead;
+    getCloudWorkspaceReader(): ICloudWorkspaceRead;
+
+    getVideoConferenceReader(): IVideoConferenceRead;
+
+    getOAuthAppsReader(): IOAuthAppsReader;
+
+    getRoleReader(): IRoleRead;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IRoleRead.ts b/packages/apps-engine/src/definition/accessors/IRoleRead.ts
new file mode 100644
index 000000000000..fb56ed306a32
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IRoleRead.ts
@@ -0,0 +1,27 @@
+import type { IRole } from '../roles';
+
+/**
+ * Interface for reading roles.
+ */
+export interface IRoleRead {
+    /**
+     * Retrieves a role by its id or name.
+     * @param idOrName The id or name of the role to retrieve.
+     * @param appId The id of the app.
+     * @returns The role, if found.
+     * @returns null if no role is found.
+     * @throws If there is an error while retrieving the role.
+     */
+    getOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null>;
+
+    /**
+     * Retrieves all custom roles.
+     * @param appId The id of the app.
+     * @returns All custom roles.
+     * @throws If there is an error while retrieving the roles.
+     * @throws If the app does not have the necessary permissions.
+     * @see IRole.protected
+     * @see AppPermissions.role.read
+     */
+    getCustomRoles(appId: string): Promise<Array<IRole>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IRoomBuilder.ts b/packages/apps-engine/src/definition/accessors/IRoomBuilder.ts
new file mode 100644
index 000000000000..b92955896380
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IRoomBuilder.ts
@@ -0,0 +1,186 @@
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IRoom, RoomType } from '../rooms';
+import type { IUser } from '../users';
+
+/**
+ * Interface for building out a room.
+ * Please note, a room creator, name, and type must be set otherwise you will NOT
+ * be able to successfully save the room object.
+ */
+export interface IRoomBuilder {
+    kind: RocketChatAssociationModel.ROOM | RocketChatAssociationModel.DISCUSSION;
+
+    /**
+     * Provides a convient way to set the data for the room.
+     * Note: Providing an "id" field here will be ignored.
+     *
+     * @param room the room data to set
+     */
+    setData(room: Partial<IRoom>): IRoomBuilder;
+
+    /**
+     * Sets the display name of this room.
+     *
+     * @param name the display name of the room
+     */
+    setDisplayName(name: string): IRoomBuilder;
+
+    /**
+     * Gets the display name of this room.
+     */
+    getDisplayName(): string;
+
+    /**
+     * Sets the slugified name of this room, it must align to the rules of Rocket.Chat room
+     * names otherwise there will be an error thrown (no spaces, special characters, etc).
+     *
+     * @param name the slugified name
+     */
+    setSlugifiedName(name: string): IRoomBuilder;
+
+    /**
+     * Gets the slugified name of this room.
+     */
+    getSlugifiedName(): string;
+
+    /**
+     * Sets the room's type.
+     *
+     * @param type the room type
+     */
+    setType(type: RoomType): IRoomBuilder;
+
+    /**
+     * Gets the room's type.
+     */
+    getType(): RoomType;
+
+    /**
+     * Sets the creator of the room.
+     *
+     * @param creator the user who created the room
+     */
+    setCreator(creator: IUser): IRoomBuilder;
+
+    /**
+     * Gets the room's creator.
+     */
+    getCreator(): IUser;
+
+    /**
+     * Adds a user to the room, these are by username until further notice.
+     *
+     * @param username the user's username to add to the room
+     * @deprecated in favor of `addMemberToBeAddedByUsername`. This method will be removed on version 2.0.0
+     */
+    addUsername(username: string): IRoomBuilder;
+
+    /**
+     * Sets the usernames of who are joined to the room.
+     *
+     * @param usernames the list of usernames
+     * @deprecated in favor of `setMembersByUsernames`. This method will be removed on version 2.0.0
+     */
+    setUsernames(usernames: Array<string>): IRoomBuilder;
+
+    /**
+     * Gets the usernames of users in the room.
+     * @deprecated in favor of `getMembersUsernames`. This method will be removed on version 2.0.0
+     */
+    getUsernames(): Array<string>;
+
+    /**
+     * Adds a member to the room by username
+     *
+     * @param username the user's username to add to the room
+     */
+    addMemberToBeAddedByUsername(username: string): IRoomBuilder;
+
+    /**
+     * Sets a list of members to the room by usernames
+     *
+     * @param usernames the list of usernames
+     */
+    setMembersToBeAddedByUsernames(usernames: Array<string>): IRoomBuilder;
+
+    /**
+     * Gets the list of usernames of the members who are been added to the room
+     */
+    getMembersToBeAddedUsernames(): Array<string>;
+
+    /**
+     * Sets whether this room should be a default room or not.
+     * This means that new users will automatically join this room
+     * when they join the server.
+     *
+     * @param isDefault room should be default or not
+     */
+    setDefault(isDefault: boolean): IRoomBuilder;
+
+    /**
+     * Gets whether this room is a default room or not.
+     */
+    getIsDefault(): boolean;
+
+    /**
+     * Sets whether this room should be in read only state or not.
+     * This means that users without the required permission to talk when
+     * a room is muted will not be able to talk but instead will only be
+     * able to read the contents of the room.
+     *
+     * @param isReadOnly whether it should be read only or not
+     */
+    setReadOnly(isReadOnly: boolean): IRoomBuilder;
+
+    /**
+     * Gets whether this room is on read only state or not.
+     */
+    getIsReadOnly(): boolean;
+
+    /**
+     * Sets whether this room should display the system messages (like user join, etc)
+     * or not. This means that whenever a system event, such as joining or leaving, happens
+     * then Rocket.Chat won't send the message to the channel.
+     *
+     * @param displaySystemMessages whether the messages should display or not
+     */
+    setDisplayingOfSystemMessages(displaySystemMessages: boolean): IRoomBuilder;
+
+    /**
+     * Gets whether this room should display the system messages or not.
+     */
+    getDisplayingOfSystemMessages(): boolean;
+
+    /**
+     * Adds a custom field to the room.
+     * Note: This will replace an existing field with the same key should it exist already.
+     *
+     * @param key the name of the key
+     * @param value the value of the custom field
+     */
+    addCustomField(key: string, value: object): IRoomBuilder;
+
+    /**
+     * Sets the entire custom field property to an object provided. This will overwrite
+     * every existing key/values which are unrecoverable.
+     *
+     * @param fields the data to set
+     */
+    setCustomFields(fields: { [key: string]: object }): IRoomBuilder;
+
+    /**
+     * Gets the custom field property of the room.
+     */
+    getCustomFields(): { [key: string]: object };
+
+    /**
+     * Gets user ids of members from a direct message
+     */
+    getUserIds(): Array<string>;
+
+    /**
+     * Gets the resulting room that has been built up to the point of calling this method.
+     * Note: modifying the returned value will have no effect.
+     */
+    getRoom(): IRoom;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IRoomExtender.ts b/packages/apps-engine/src/definition/accessors/IRoomExtender.ts
new file mode 100644
index 000000000000..4135c63edd13
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IRoomExtender.ts
@@ -0,0 +1,40 @@
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+
+export interface IRoomExtender {
+    kind: RocketChatAssociationModel.ROOM;
+
+    /**
+     * Adds a custom field to the room.
+     * Note: This key can not already exist or it will throw an error.
+     * Note: The key must not contain a period in it, an error will be thrown.
+     *
+     * @param key the name of the custom field
+     * @param value the value of this custom field
+     */
+    addCustomField(key: string, value: any): IRoomExtender;
+
+    /**
+     * Adds a user to the room.
+     *
+     * @param user the user which is to be added to the room
+     */
+    addMember(user: IUser): IRoomExtender;
+
+    /**
+     * Get a list of users being added to the room.
+     */
+    getMembersBeingAdded(): Array<IUser>;
+
+    /**
+     * Get a list of usernames of users being added to the room.
+     */
+    getUsernamesOfMembersBeingAdded(): Array<string>;
+
+    /**
+     * Gets the resulting room that has been extended at the point of calling this.
+     * Note: modifying the returned value will have no effect.
+     */
+    getRoom(): IRoom;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IRoomRead.ts b/packages/apps-engine/src/definition/accessors/IRoomRead.ts
new file mode 100644
index 000000000000..f4e0df33239d
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IRoomRead.ts
@@ -0,0 +1,93 @@
+import type { GetMessagesOptions } from '../../server/bridges/RoomBridge';
+import type { IMessageRaw } from '../messages/index';
+import type { IRoom } from '../rooms/index';
+import type { IUser } from '../users/index';
+
+/**
+ * This accessor provides methods for accessing
+ * rooms in a read-only-fashion.
+ */
+export interface IRoomRead {
+    /**
+     * Gets a room by an id.
+     *
+     * @param id the id of the room
+     * @returns the room
+     */
+    getById(id: string): Promise<IRoom | undefined>;
+
+    /**
+     * Gets just the creator of the room by the room's id.
+     *
+     * @param id the id of the room
+     * @returns the creator of the room
+     */
+    getCreatorUserById(id: string): Promise<IUser | undefined>;
+
+    /**
+     * Gets a room by its name.
+     *
+     * @param name the name of the room
+     * @returns the room
+     */
+    getByName(name: string): Promise<IRoom | undefined>;
+
+    /**
+     * Gets just the creator of the room by the room's name.
+     *
+     * @param name the name of the room
+     * @returns the creator of the room
+     */
+    getCreatorUserByName(name: string): Promise<IUser | undefined>;
+
+    /**
+     * Retrieves an array of messages from the specified room.
+     *
+     * @param roomId The unique identifier of the room from which to retrieve messages.
+     * @param options Optional parameters for retrieving messages:
+     *                - limit: The maximum number of messages to retrieve. Maximum 100
+     *                - skip: The number of messages to skip (for pagination).
+     *                - sort: An object defining the sorting order of the messages. Each key is a field to sort by, and the value is either "asc" for ascending order or "desc" for descending order.
+     * @returns A Promise that resolves to an array of IMessage objects representing the messages in the room.
+     */
+    getMessages(roomId: string, options?: Partial<GetMessagesOptions>): Promise<Array<IMessageRaw>>;
+
+    /**
+     * Gets an iterator for all of the users in the provided room.
+     *
+     * @param roomId the room's id
+     * @returns an iterator for the users in the room
+     */
+    getMembers(roomId: string): Promise<Array<IUser>>;
+
+    /**
+     * Gets a direct room with all usernames
+     * @param usernames all usernames belonging to the direct room
+     * @returns the room
+     */
+    getDirectByUsernames(usernames: Array<string>): Promise<IRoom>;
+
+    /**
+     * Get a list of the moderators of a given room
+     *
+     * @param roomId the room's id
+     * @returns a list of the users with the moderator role in the room
+     */
+    getModerators(roomId: string): Promise<Array<IUser>>;
+
+    /**
+     * Get a list of the owners of a given room
+     *
+     * @param roomId the room's id
+     * @returns a list of the users with the owner role in the room
+     */
+    getOwners(roomId: string): Promise<Array<IUser>>;
+
+    /**
+     * Get a list of the leaders of a given room
+     *
+     * @param roomId the room's id
+     * @returns a list of the users with the leader role in the room
+     */
+    getLeaders(roomId: string): Promise<Array<IUser>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISchedulerExtend.ts b/packages/apps-engine/src/definition/accessors/ISchedulerExtend.ts
new file mode 100644
index 000000000000..fc003e34b587
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISchedulerExtend.ts
@@ -0,0 +1,11 @@
+import type { IProcessor } from '../scheduler';
+
+export interface ISchedulerExtend {
+    /**
+     * Register processors that can be scheduled to run
+     *
+     * @param {Array<IProcessor>} processors An array of processors
+     * @returns List of task ids run at startup, or void no startup run is set
+     */
+    registerProcessors(processors: Array<IProcessor>): Promise<void | Array<string>>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISchedulerModify.ts b/packages/apps-engine/src/definition/accessors/ISchedulerModify.ts
new file mode 100644
index 000000000000..04faa8700799
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISchedulerModify.ts
@@ -0,0 +1,31 @@
+import type { IOnetimeSchedule, IRecurringSchedule } from '../scheduler';
+
+/**
+ * This accessor provides methods to work with the Job Scheduler
+ */
+export interface ISchedulerModify {
+    /**
+     * Schedules a registered processor to run _once_.
+     *
+     * @param {IOnetimeSchedule} job
+     * @returns jobid as string
+     */
+    scheduleOnce(job: IOnetimeSchedule): Promise<void | string>;
+    /**
+     * Schedules a registered processor to run in recurrencly according to a given interval
+     *
+     * @param {IRecurringSchedule} job
+     * @returns jobid as string
+     */
+    scheduleRecurring(job: IRecurringSchedule): Promise<void | string>;
+    /**
+     * Cancels a running job given its jobId
+     *
+     * @param {string} jobId
+     */
+    cancelJob(jobId: string): Promise<void>;
+    /**
+     * Cancels all the running jobs from the app
+     */
+    cancelAllJobs(): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IServerSettingRead.ts b/packages/apps-engine/src/definition/accessors/IServerSettingRead.ts
new file mode 100644
index 000000000000..ecb7af279241
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IServerSettingRead.ts
@@ -0,0 +1,43 @@
+import type { ISetting } from '../settings/ISetting';
+
+/**
+ * Reader for the settings inside of the server (Rocket.Chat).
+ * Only a subset of them are exposed to Apps.
+ */
+export interface IServerSettingRead {
+    /**
+     * Gets a server setting by id.
+     * Please note: a error will be thrown if not found
+     * or trying to access one that isn't exposed.
+     *
+     * @param id the id of the setting to get
+     * @return the setting
+     */
+    getOneById(id: string): Promise<ISetting>;
+
+    /**
+     * Gets a server setting's value by id.
+     * Please note: a error will be thrown if not found
+     * or trying to access one that isn't exposed.
+     *
+     * @param id the id of the setting to get
+     * @return the setting's value
+     */
+    getValueById(id: string): Promise<any>;
+
+    /**
+     * Gets all of the server settings which are exposed
+     * to the Apps.
+     *
+     * @return an iterator of the exposed settings
+     */
+    getAll(): Promise<IterableIterator<ISetting>>;
+
+    /**
+     * Checks if the server setting for the id provided is readable,
+     * will return true or false and won't throw an error.
+     *
+     * @param id the server setting id
+     */
+    isReadableById(id: string): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IServerSettingUpdater.ts b/packages/apps-engine/src/definition/accessors/IServerSettingUpdater.ts
new file mode 100644
index 000000000000..766285c25953
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IServerSettingUpdater.ts
@@ -0,0 +1,6 @@
+import type { ISetting } from '../settings/ISetting';
+
+export interface IServerSettingUpdater {
+    updateOne(setting: ISetting): Promise<void>;
+    incrementValue(id: ISetting['id'], value?: number): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IServerSettingsModify.ts b/packages/apps-engine/src/definition/accessors/IServerSettingsModify.ts
new file mode 100644
index 000000000000..400bd5ae211f
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IServerSettingsModify.ts
@@ -0,0 +1,40 @@
+import type { ISetting } from '../settings';
+
+/**
+ * This accessor provides methods to change default setting options
+ * of Rocket.Chat in a compatible way. It is provided during
+ * your App's "onEnable".
+ */
+export interface IServerSettingsModify {
+    /**
+     * Hides an existing settings group.
+     *
+     * @param name The technical name of the group
+     */
+    hideGroup(name: string): Promise<void>;
+
+    /**
+     * Hides a setting. This does not influence the actual functionality (the setting will still
+     * have its value and can be programatically read), but the administrator will not be able to see it anymore
+     *
+     * @param id the id of the setting to hide
+     */
+    hideSetting(id: string): Promise<void>;
+
+    /**
+     * Modifies the configured value of another setting, please use it with caution as an invalid
+     * setting configuration could cause a Rocket.Chat instance to become unstable.
+     *
+     * @param setting the modified setting (id must be provided)
+     */
+    modifySetting(setting: ISetting): Promise<void>;
+
+    /**
+     * Increases the setting value by the specified amount.
+     * To be used only with statistic settings that track the amount of times an action has been performed
+     *
+     * @param id the id of the existing Rocket.Chat setting
+     * @param value how much should the count be increased by. Defaults to 1.
+     */
+    incrementValue(id: ISetting['id'], value?: number): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISettingRead.ts b/packages/apps-engine/src/definition/accessors/ISettingRead.ts
new file mode 100644
index 000000000000..142ee895b161
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISettingRead.ts
@@ -0,0 +1,23 @@
+import type { ISetting } from '../settings/index';
+
+/**
+ * This accessor provides methods for accessing
+ * App settings in a read-only-fashion.
+ */
+export interface ISettingRead {
+    /**
+     * Gets the App's setting by the provided id.
+     * Does not throw an error but instead will return undefined it doesn't exist.
+     *
+     * @param id the id of the setting
+     */
+    getById(id: string): Promise<ISetting>;
+
+    /**
+     * Gets the App's setting value by the provided id.
+     * Note: this will throw an error if the setting doesn't exist
+     *
+     * @param id the id of the setting value to get
+     */
+    getValueById(id: string): Promise<any>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISettingUpdater.ts b/packages/apps-engine/src/definition/accessors/ISettingUpdater.ts
new file mode 100644
index 000000000000..3826286df6c9
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISettingUpdater.ts
@@ -0,0 +1,5 @@
+import type { ISetting } from '../settings/ISetting';
+
+export interface ISettingUpdater {
+    updateValue(id: ISetting['id'], value: ISetting['value']): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISettingsExtend.ts b/packages/apps-engine/src/definition/accessors/ISettingsExtend.ts
new file mode 100644
index 000000000000..249776379645
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISettingsExtend.ts
@@ -0,0 +1,17 @@
+import type { ISetting } from '../settings/index';
+
+/**
+ * This accessor provides methods for adding custom settings,
+ * which are displayed on your App's page.
+ * This is provided on initialization of your App.
+ */
+export interface ISettingsExtend {
+    /**
+     * Adds a setting which can be configured by an administrator.
+     * Settings can only be added to groups which have been provided by this App earlier
+     * and if a group is not provided, the setting will appear outside of a group.
+     *
+     * @param setting the setting
+     */
+    provideSetting(setting: ISetting): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISlashCommandsExtend.ts b/packages/apps-engine/src/definition/accessors/ISlashCommandsExtend.ts
new file mode 100644
index 000000000000..4895e61bf96f
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISlashCommandsExtend.ts
@@ -0,0 +1,16 @@
+import type { ISlashCommand } from '../slashcommands';
+
+/**
+ * This accessor provides methods for adding custom slash commands.
+ * It is provided during the initialization of your App
+ */
+
+export interface ISlashCommandsExtend {
+    /**
+     * Adds a slash command which can be used during conversations lateron.
+     * Should a command already exists an error will be thrown.
+     *
+     * @param slashCommand the command information
+     */
+    provideSlashCommand(slashCommand: ISlashCommand): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ISlashCommandsModify.ts b/packages/apps-engine/src/definition/accessors/ISlashCommandsModify.ts
new file mode 100644
index 000000000000..b9e3d4c3e615
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/ISlashCommandsModify.ts
@@ -0,0 +1,30 @@
+import type { ISlashCommand } from '../slashcommands';
+
+/**
+ * This accessor provides methods for modifying existing Rocket.Chat slash commands.
+ * It is provided during "onEnable" of your App.
+ */
+export interface ISlashCommandsModify {
+    /**
+     * Modifies an existing command. The command must either be your App's
+     * own command or a system command. One App can not modify another
+     * App's command.
+     *
+     * @param slashCommand the modified slash command
+     */
+    modifySlashCommand(slashCommand: ISlashCommand): Promise<void>;
+
+    /**
+     * Renders an existing slash command un-usable.
+     *
+     * @param command the command's usage without the slash
+     */
+    disableSlashCommand(command: string): Promise<void>;
+
+    /**
+     * Enables an existing slash command to be usable again.
+     *
+     * @param command the command's usage without the slash
+     */
+    enableSlashCommand(command: string): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IThreadRead.ts b/packages/apps-engine/src/definition/accessors/IThreadRead.ts
new file mode 100644
index 000000000000..72ceae996eec
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IThreadRead.ts
@@ -0,0 +1,9 @@
+import type { IMessage } from '../messages/index';
+
+/**
+ * This accessor provides methods for accessing
+ * Thread messages in a read-only-fashion.
+ */
+export interface IThreadRead {
+    getThreadById(id: string): Promise<Array<IMessage> | undefined>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUIController.ts b/packages/apps-engine/src/definition/accessors/IUIController.ts
new file mode 100644
index 000000000000..be7e91f5a05b
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUIController.ts
@@ -0,0 +1,31 @@
+import type { Omit } from '../../lib/utils';
+import type { IUIKitErrorInteraction, IUIKitInteraction, IUIKitSurface } from '../uikit';
+import type { IUIKitContextualBarViewParam, IUIKitModalViewParam } from '../uikit/UIKitInteractionResponder';
+import type { IUser } from '../users';
+
+export type IUIKitInteractionParam = Omit<IUIKitInteraction, 'appId' | 'type'>;
+export type IUIKitErrorInteractionParam = Omit<IUIKitErrorInteraction, 'type' | 'appId' | 'triggerId'>;
+
+export type IUIKitSurfaceViewParam = Omit<IUIKitSurface, 'appId' | 'id'> & Partial<Pick<IUIKitSurface, 'id'>>;
+
+export interface IUIController {
+    /**
+     * @deprecated please prefer the `openSurfaceView` method
+     */
+    openModalView(view: IUIKitModalViewParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+    /**
+     * @deprecated please prefer the `updateSurfaceView` method
+     */
+    updateModalView(view: IUIKitModalViewParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+    /**
+     * @deprecated please prefer the `openSurfaceView` method
+     */
+    openContextualBarView(view: IUIKitContextualBarViewParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+    /**
+     * @deprecated please prefer the `updateSurfaceView` method
+     */
+    updateContextualBarView(view: IUIKitContextualBarViewParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+    setViewError(errorInteraction: IUIKitErrorInteractionParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+    openSurfaceView(view: IUIKitSurfaceViewParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+    updateSurfaceView(view: IUIKitSurfaceViewParam, context: IUIKitInteractionParam, user: IUser): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUIExtend.ts b/packages/apps-engine/src/definition/accessors/IUIExtend.ts
new file mode 100644
index 000000000000..3dca2e32809b
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUIExtend.ts
@@ -0,0 +1,5 @@
+import type { IUIActionButtonDescriptor } from '../ui';
+
+export interface IUIExtend {
+    registerButton(button: IUIActionButtonDescriptor): void;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUploadCreator.ts b/packages/apps-engine/src/definition/accessors/IUploadCreator.ts
new file mode 100644
index 000000000000..25262b42e7d3
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUploadCreator.ts
@@ -0,0 +1,12 @@
+import type { IUpload } from '../uploads';
+import type { IUploadDescriptor } from '../uploads/IUploadDescriptor';
+
+export interface IUploadCreator {
+    /**
+     * Create an upload to a room
+     *
+     * @param buffer A Buffer with the file's content (See [here](https://nodejs.org/api/buffer.html)
+     * @param descriptor The metadata about the upload
+     */
+    uploadBuffer(buffer: Buffer, descriptor: IUploadDescriptor): Promise<IUpload>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUploadRead.ts b/packages/apps-engine/src/definition/accessors/IUploadRead.ts
new file mode 100644
index 000000000000..ce4029a8c0c8
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUploadRead.ts
@@ -0,0 +1,7 @@
+import type { IUpload } from '../uploads';
+
+export interface IUploadRead {
+    getById(id: string): Promise<IUpload>;
+    getBufferById(id: string): Promise<Buffer>;
+    getBuffer(upload: IUpload): Promise<Buffer>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUserBuilder.ts b/packages/apps-engine/src/definition/accessors/IUserBuilder.ts
new file mode 100644
index 000000000000..4e0c52aa893a
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUserBuilder.ts
@@ -0,0 +1,60 @@
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IUser, IUserEmail } from '../users';
+
+/**
+ * Interface for creating a user.
+ * Please note, a username and email provided must be unique else you will NOT
+ * be able to successfully save the user object.
+ */
+export interface IUserBuilder {
+    kind: RocketChatAssociationModel.USER;
+
+    /**
+     * Provides a convient way to set the data for the user.
+     * Note: Providing an "id" field here will be ignored.
+     *
+     * @param user the user data to set
+     */
+    setData(user: Partial<IUser>): IUserBuilder;
+
+    /**
+     * Sets emails of the user
+     *
+     * @param emails the array of email addresses of the user
+     */
+    setEmails(emails: Array<IUserEmail>): IUserBuilder;
+
+    /**
+     * Gets emails of the user
+     */
+    getEmails(): Array<IUserEmail>;
+
+    /**
+     * Sets the display name of this user.
+     *
+     * @param name the display name of the user
+     */
+    setDisplayName(name: string): IUserBuilder;
+
+    /**
+     * Gets the display name of this user.
+     */
+    getDisplayName(): string;
+
+    /**
+     * Sets the username for the user
+     *
+     * @param username username of the user
+     */
+    setUsername(username: string): IUserBuilder;
+
+    /**
+     * Gets the username of this user
+     */
+    getUsername(): string;
+
+    /**
+     * Gets the user
+     */
+    getUser(): Partial<IUser>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUserRead.ts b/packages/apps-engine/src/definition/accessors/IUserRead.ts
new file mode 100644
index 000000000000..33c4c6e455e4
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUserRead.ts
@@ -0,0 +1,22 @@
+import type { IUser } from '../users/index';
+
+/**
+ * This accessor provides methods for accessing
+ * users in a read-only-fashion.
+ */
+export interface IUserRead {
+    getById(id: string): Promise<IUser>;
+
+    getByUsername(username: string): Promise<IUser>;
+
+    /**
+     * Gets the app user of this app.
+     */
+    getAppUser(appId?: string): Promise<IUser | undefined>;
+
+    /**
+     * Gets the user's badge count (unread messages count).
+     * @param uid user's id
+     */
+    getUserUnreadMessageCount(uid: string): Promise<number | undefined>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IUserUpdater.ts b/packages/apps-engine/src/definition/accessors/IUserUpdater.ts
new file mode 100644
index 000000000000..8c57b4dadfa8
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IUserUpdater.ts
@@ -0,0 +1,18 @@
+import type { IUser } from '../users/IUser';
+
+/**
+ * Updating a user is a more granular approach, since
+ * it is one of the more sensitive aspects of Rocket.Chat -
+ * or any other system for that matter.
+ *
+ * Allowing apps to modify _all_ the aspects of a user
+ * would open a critical surface for them to abuse such
+ * power and "take hold" of a server, for instance.
+ */
+export interface IUserUpdater {
+    updateStatusText(user: IUser, statusText: IUser['statusText']): Promise<boolean>;
+    updateStatus(user: IUser, statusText: IUser['statusText'], status: IUser['status']): Promise<boolean>;
+    updateBio(user: IUser, bio: IUser['bio']): Promise<boolean>;
+    updateCustomFields(user: IUser, customFields: IUser['customFields']): Promise<boolean>;
+    deactivate(userId: IUser['id'], confirmRelinquish: boolean): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IVideoConfProvidersExtend.ts b/packages/apps-engine/src/definition/accessors/IVideoConfProvidersExtend.ts
new file mode 100644
index 000000000000..c61224893e11
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IVideoConfProvidersExtend.ts
@@ -0,0 +1,15 @@
+import type { IVideoConfProvider } from '../videoConfProviders';
+
+/**
+ * This accessor provides methods for adding videoconf providers.
+ * It is provided during the initialization of your App
+ */
+
+export interface IVideoConfProvidersExtend {
+    /**
+     * Adds a videoconf provider
+     *
+     * @param provider the provider information
+     */
+    provideVideoConfProvider(provider: IVideoConfProvider): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IVideoConferenceBuilder.ts b/packages/apps-engine/src/definition/accessors/IVideoConferenceBuilder.ts
new file mode 100644
index 000000000000..11b96da0e4ef
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IVideoConferenceBuilder.ts
@@ -0,0 +1,34 @@
+import type { RocketChatAssociationModel } from '../metadata';
+import type { AppVideoConference } from '../videoConferences';
+
+export interface IVideoConferenceBuilder {
+    kind: RocketChatAssociationModel.VIDEO_CONFERENCE;
+
+    setData(call: Partial<AppVideoConference>): IVideoConferenceBuilder;
+
+    setRoomId(rid: string): IVideoConferenceBuilder;
+
+    getRoomId(): string;
+
+    setCreatedBy(userId: string): IVideoConferenceBuilder;
+
+    getCreatedBy(): string;
+
+    setProviderName(name: string): IVideoConferenceBuilder;
+
+    getProviderName(): string;
+
+    setProviderData(data: Record<string, any>): IVideoConferenceBuilder;
+
+    getProviderData(): Record<string, any>;
+
+    setTitle(name: string): IVideoConferenceBuilder;
+
+    getTitle(): string;
+
+    setDiscussionRid(rid: string | undefined): IVideoConferenceBuilder;
+
+    getDiscussionRid(): string | undefined;
+
+    getVideoConference(): AppVideoConference;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IVideoConferenceExtend.ts b/packages/apps-engine/src/definition/accessors/IVideoConferenceExtend.ts
new file mode 100644
index 000000000000..d9b7e5838368
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IVideoConferenceExtend.ts
@@ -0,0 +1,21 @@
+import type { RocketChatAssociationModel } from '../metadata';
+import type { IVideoConferenceUser, VideoConference } from '../videoConferences';
+import type { VideoConferenceMember } from '../videoConferences/IVideoConference';
+
+export interface IVideoConferenceExtender {
+    kind: RocketChatAssociationModel.VIDEO_CONFERENCE;
+
+    setProviderData(value: Record<string, any>): IVideoConferenceExtender;
+
+    setStatus(value: VideoConference['status']): IVideoConferenceExtender;
+
+    setEndedBy(value: IVideoConferenceUser['_id']): IVideoConferenceExtender;
+
+    setEndedAt(value: VideoConference['endedAt']): IVideoConferenceExtender;
+
+    addUser(userId: VideoConferenceMember['_id'], ts?: VideoConferenceMember['ts']): IVideoConferenceExtender;
+
+    setDiscussionRid(rid: VideoConference['discussionRid']): IVideoConferenceExtender;
+
+    getVideoConference(): VideoConference;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IVideoConferenceRead.ts b/packages/apps-engine/src/definition/accessors/IVideoConferenceRead.ts
new file mode 100644
index 000000000000..aa2d53d70590
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IVideoConferenceRead.ts
@@ -0,0 +1,15 @@
+import type { VideoConference } from '../videoConferences/IVideoConference';
+
+/**
+ * This accessor provides methods for accessing
+ * video conferences in a read-only-fashion.
+ */
+export interface IVideoConferenceRead {
+    /**
+     * Gets a video conference by an id.
+     *
+     * @param id the id of the video conference
+     * @returns the video conference
+     */
+    getById(id: string): Promise<VideoConference | undefined>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/index.ts b/packages/apps-engine/src/definition/accessors/index.ts
new file mode 100644
index 000000000000..e98a4208fe13
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/index.ts
@@ -0,0 +1,58 @@
+export * from './IApiExtend';
+export * from './IAppAccessors';
+export * from './IAppInstallationContext';
+export * from './IAppUpdateContext';
+export * from './IAppUninstallationContext';
+export * from './ICloudWorkspaceRead';
+export * from './IConfigurationExtend';
+export * from './IConfigurationModify';
+export * from './IDiscussionBuilder';
+export * from './IEnvironmentalVariableRead';
+export * from './IEnvironmentRead';
+export * from './IEnvironmentWrite';
+export * from './IExternalComponentsExtend';
+export * from './IHttp';
+export * from './ILivechatCreator';
+export * from './ILivechatMessageBuilder';
+export * from './ILivechatRead';
+export * from './ILivechatUpdater';
+export * from './ILogEntry';
+export * from './ILogger';
+export * from './IMessageBuilder';
+export * from './IMessageExtender';
+export * from './IMessageRead';
+export * from './IMessageUpdater';
+export * from './IModify';
+export * from './IModifyCreator';
+export * from './IModifyDeleter';
+export * from './IModifyExtender';
+export * from './IModifyUpdater';
+export * from './INotifier';
+export * from './IPersistence';
+export * from './IPersistenceRead';
+export * from './IRead';
+export * from './IRoleRead';
+export * from './IRoomBuilder';
+export * from './IRoomExtender';
+export * from './IRoomRead';
+export * from './ISchedulerExtend';
+export * from './ISchedulerModify';
+export * from './IServerSettingRead';
+export * from './IServerSettingsModify';
+export * from './IServerSettingUpdater';
+export * from './ISettingRead';
+export * from './ISettingsExtend';
+export * from './ISettingUpdater';
+export * from './ISlashCommandsExtend';
+export * from './ISlashCommandsModify';
+export * from './IUIController';
+export * from './IUIExtend';
+export * from './IUploadCreator';
+export * from './IUploadRead';
+export * from './IUserBuilder';
+export * from './IUserRead';
+export * from './IVideoConferenceBuilder';
+export * from './IVideoConferenceExtend';
+export * from './IVideoConferenceRead';
+export * from './IVideoConfProvidersExtend';
+export * from './IModerationModify';
diff --git a/packages/apps-engine/src/definition/api/ApiEndpoint.ts b/packages/apps-engine/src/definition/api/ApiEndpoint.ts
new file mode 100644
index 000000000000..8ab7610c9b4f
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/ApiEndpoint.ts
@@ -0,0 +1,40 @@
+import type { IApp } from '../IApp';
+import { HttpStatusCode } from '../accessors';
+import type { IApiEndpoint } from './IApiEndpoint';
+import type { IApiResponse, IApiResponseJSON } from './IResponse';
+
+/** Represents an api endpoint that is being provided. */
+export abstract class ApiEndpoint implements IApiEndpoint {
+    /**
+     * The last part of the api URL. Example: https://{your-server-address}/api/apps/public/{your-app-id}/{path}
+     * or https://{your-server-address}/api/apps/private/{your-app-id}/{private-hash}/{path}
+     */
+    public path: string;
+
+    constructor(public app: IApp) {}
+
+    /**
+     * Return response with status 200 (OK) and a optional content
+     * @param content
+     */
+    protected success(content?: any): IApiResponse {
+        return {
+            status: HttpStatusCode.OK,
+            content,
+        };
+    }
+
+    /**
+     * Return a json response adding Content Type header as
+     * application/json if not already provided
+     * @param reponse
+     */
+    protected json(response: IApiResponseJSON): IApiResponse {
+        if (!response.headers || !response.headers['content-type']) {
+            response.headers = response.headers || {};
+            response.headers['content-type'] = 'application/json';
+        }
+
+        return response;
+    }
+}
diff --git a/packages/apps-engine/src/definition/api/IApi.ts b/packages/apps-engine/src/definition/api/IApi.ts
new file mode 100644
index 000000000000..9ad2f42ed5a8
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IApi.ts
@@ -0,0 +1,58 @@
+import type { IApiEndpoint } from './IApiEndpoint';
+
+/**
+ * Represents an api that is being provided.
+ */
+export interface IApi {
+    /**
+     * Provides the visibility method of the URL, see the ApiVisibility descriptions for more information
+     */
+    visibility: ApiVisibility;
+    /**
+     * Provides the visibility method of the URL, see the ApiSecurity descriptions for more information
+     */
+    security: ApiSecurity;
+    /**
+     * Provide enpoints for this api registry
+     */
+    endpoints: Array<IApiEndpoint>;
+}
+
+export enum ApiVisibility {
+    /**
+     * A public Api has a fixed format for a url. Using it enables an
+     * easy to remember structure, however, it also means the url is
+     * intelligently guessed. As a result, we recommend having some
+     * sort of security setup if you must have a public api.Whether
+     * you use the provided security, ApiSecurity, or implement your own.
+     * Url format:
+     * `https://{your-server-address}/api/apps/public/{your-app-id}/{path}`
+     */
+    PUBLIC,
+    /**
+     * Private Api's contain a random value in the url format,
+     * making them harder go guess by default. The random value
+     * will be generated whenever the App is installed on a server.
+     * This means that the URL will not be the same on any server,
+     * but will remain the same throughout the lifecycle of an App
+     * including updates. As a result, if a user uninstalls the App
+     * and reinstalls the App, then the random value will change.
+     * Url format:
+     * `https://{your-server-address}/api/apps/private/{your-app-id}/{random-hash}/{path}`
+     */
+    PRIVATE,
+}
+
+export enum ApiSecurity {
+    /**
+     * No security check will be executed agains the calls made to this URL
+     */
+    UNSECURE,
+    /**
+     * Only calls containing a valid token will be able to execute the api
+     * Mutiple tokens can be generated to access the api, by default one
+     * will be generated automatically.
+     * @param `X-Auth-Token`
+     */
+    // CHECKSUM_SECRET,
+}
diff --git a/packages/apps-engine/src/definition/api/IApiEndpoint.ts b/packages/apps-engine/src/definition/api/IApiEndpoint.ts
new file mode 100644
index 000000000000..b369fc175dc2
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IApiEndpoint.ts
@@ -0,0 +1,47 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IApiEndpointInfo } from './IApiEndpointInfo';
+import type { IApiExample } from './IApiExample';
+import type { IApiRequest } from './IRequest';
+import type { IApiResponse } from './IResponse';
+
+/**
+ * Represents an api endpoint that is being provided.
+ */
+export interface IApiEndpoint {
+    /**
+     * The last part of the api URL. Example: https://{your-server-address}/api/apps/public/{your-app-id}/{path}
+     * or https://{your-server-address}/api/apps/private/{your-app-id}/{private-hash}/{path}
+     */
+    path: string;
+    examples?: { [key: string]: IApiExample };
+    /**
+     * Whether this endpoint requires an authenticated user to access it.
+     *
+     * The authentication will be done by the host server using its own
+     * authentication system.
+     *
+     * If no authentication is provided, the request will be automatically
+     * rejected with a 401 status code.
+     */
+    authRequired?: boolean;
+
+    /**
+     * The methods that are available for this endpoint.
+     * This property is provided by the Runtime and should not be set manually.
+     *
+     * Its values are used on the Apps-Engine to validate the request method.
+     */
+    _availableMethods?: string[];
+
+    /**
+     * Called whenever the publically accessible url for this App is called,
+     * if you handle the methods differently then split it out so your code doesn't get too big.
+     */
+    get?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+    post?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+    put?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+    delete?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+    head?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+    options?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+    patch?(request: IApiRequest, endpoint: IApiEndpointInfo, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<IApiResponse>;
+}
diff --git a/packages/apps-engine/src/definition/api/IApiEndpointInfo.ts b/packages/apps-engine/src/definition/api/IApiEndpointInfo.ts
new file mode 100644
index 000000000000..de9144784b34
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IApiEndpointInfo.ts
@@ -0,0 +1,6 @@
+export interface IApiEndpointInfo {
+    basePath: string;
+    fullPath: string;
+    appId: string;
+    hash?: string;
+}
diff --git a/packages/apps-engine/src/definition/api/IApiEndpointMetadata.ts b/packages/apps-engine/src/definition/api/IApiEndpointMetadata.ts
new file mode 100644
index 000000000000..0ede26045f79
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IApiEndpointMetadata.ts
@@ -0,0 +1,10 @@
+import type { IApiExample } from './IApiExample';
+
+export interface IApiEndpointMetadata {
+    path: string;
+    computedPath: string;
+    methods: Array<string>;
+    examples?: {
+        [key: string]: IApiExample;
+    };
+}
diff --git a/packages/apps-engine/src/definition/api/IApiExample.ts b/packages/apps-engine/src/definition/api/IApiExample.ts
new file mode 100644
index 000000000000..f870d59e643d
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IApiExample.ts
@@ -0,0 +1,19 @@
+/**
+ * Represents the parameters of an api example.
+ */
+export interface IApiExample {
+    params?: { [key: string]: string };
+    query?: { [key: string]: string };
+    headers?: { [key: string]: string };
+    content?: any;
+}
+
+/**
+ * Decorator to describe api examples
+ */
+export function example(options: IApiExample) {
+    return (target: any, propertyKey: string, descriptor: PropertyDescriptor) => {
+        target.examples = target.examples || {};
+        target.examples[propertyKey] = options;
+    };
+}
diff --git a/packages/apps-engine/src/definition/api/IRequest.ts b/packages/apps-engine/src/definition/api/IRequest.ts
new file mode 100644
index 000000000000..027de11b2026
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IRequest.ts
@@ -0,0 +1,16 @@
+import type { RequestMethod } from '../accessors';
+import type { IUser } from '../users';
+
+export interface IApiRequest {
+    method: RequestMethod;
+    headers: { [key: string]: string };
+    query: { [key: string]: string };
+    params: { [key: string]: string };
+    content: any;
+    privateHash?: string;
+    /**
+     * The user that is making the request, as
+     * authenticated by Rocket.Chat's strategy.
+     */
+    user?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/api/IResponse.ts b/packages/apps-engine/src/definition/api/IResponse.ts
new file mode 100644
index 000000000000..8f394b8a93b0
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/IResponse.ts
@@ -0,0 +1,13 @@
+import type { HttpStatusCode } from '../accessors';
+
+export interface IApiResponse {
+    status: HttpStatusCode;
+    headers?: { [key: string]: string };
+    content?: any;
+}
+
+export interface IApiResponseJSON {
+    status: HttpStatusCode;
+    headers?: { [key: string]: string };
+    content?: { [key: string]: any };
+}
diff --git a/packages/apps-engine/src/definition/api/index.ts b/packages/apps-engine/src/definition/api/index.ts
new file mode 100644
index 000000000000..41e4482f2ec6
--- /dev/null
+++ b/packages/apps-engine/src/definition/api/index.ts
@@ -0,0 +1,8 @@
+export { ApiEndpoint } from './ApiEndpoint';
+export { IApi, ApiVisibility, ApiSecurity } from './IApi';
+export { IApiEndpoint } from './IApiEndpoint';
+export { IApiEndpointInfo } from './IApiEndpointInfo';
+export { IApiExample, example } from './IApiExample';
+export { IApiRequest } from './IRequest';
+export { IApiResponse } from './IResponse';
+export { IApiEndpointMetadata } from './IApiEndpointMetadata';
diff --git a/packages/apps-engine/src/definition/app-schema.json b/packages/apps-engine/src/definition/app-schema.json
new file mode 100644
index 000000000000..68c2e0c19edc
--- /dev/null
+++ b/packages/apps-engine/src/definition/app-schema.json
@@ -0,0 +1,75 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Rocket.Chat App",
+    "description": "A Rocket.Chat App declaration for usage inside of Rocket.Chat.",
+    "type": "object",
+    "properties": {
+        "id": {
+            "description": "The App's unique identifier in uuid v4 format. This is optional, although recommended, however if you are going to publish on the App store, you will be assigned one.",
+            "type": "string",
+            "pattern": "^[0-9a-fA-f]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$",
+            "minLength": 36,
+            "maxLength": 36
+        },
+        "name": {
+            "description": "The public visible name of this App.",
+            "type": "string"
+        },
+        "nameSlug": {
+            "description": "A url friendly slugged version of your App's name.",
+            "type": "string",
+            "pattern": "^([a-z]|\\-)+$",
+            "minLength": 3
+        },
+        "version": {
+            "description": "The version of this App which will be used for display publicly and letting users know there is an update. This uses the semver format.",
+            "type": "string",
+            "pattern": "^(?:\\d*)\\.(?:\\d*)\\.(?:\\d*)$",
+            "minLength": 5
+        },
+        "description": {
+            "description": "A description of this App, used to explain what this App does and provides for the user.",
+            "type": "string"
+        },
+        "requiredApiVersion": {
+            "description": "The required version of the App's API which this App depends on. This uses the semver format.",
+            "type": "string",
+            "pattern": "^(?:\\^|~)?(?:\\d*)\\.(?:\\d*)\\.(?:\\d*)$",
+            "minLength": 5
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "description": "The author's name who created this App.",
+                    "type": "string"
+                },
+                "support": {
+                    "description": "The place where people can get support for this App, whether email or website.",
+                    "type": "string"
+                },
+                "homepage": {
+                    "description": "The homepage for this App, it can be a Github or the author's website.",
+                    "type": "string",
+                    "format": "uri"
+                }
+            },
+            "required": ["name", "support"]
+        },
+        "classFile": {
+            "type": "string",
+            "description": "The name of the file which contains your App TypeScript source code.",
+            "pattern": "^.*\\.(ts)$"
+        },
+        "iconFile": {
+            "type": "string",
+            "description": "The name of the file to use as the icon.",
+            "pattern": "^.*\\.(png|jpg|jpeg|gif)$"
+        },
+        "assetsFolder": {
+            "type": "string",
+            "description": "The name of the folder which contains all of your resources, it should not start with a period."
+        }
+    },
+    "required": ["id", "name", "nameSlug", "version", "description", "requiredApiVersion", "author", "classFile", "iconFile"]
+}
diff --git a/packages/apps-engine/src/definition/assets/IAsset.ts b/packages/apps-engine/src/definition/assets/IAsset.ts
new file mode 100644
index 000000000000..30c54ae6565d
--- /dev/null
+++ b/packages/apps-engine/src/definition/assets/IAsset.ts
@@ -0,0 +1,6 @@
+export interface IAsset {
+    name: string;
+    path: string;
+    type: string;
+    public: boolean;
+}
diff --git a/packages/apps-engine/src/definition/assets/IAssetProvider.ts b/packages/apps-engine/src/definition/assets/IAssetProvider.ts
new file mode 100644
index 000000000000..4e1da50222fa
--- /dev/null
+++ b/packages/apps-engine/src/definition/assets/IAssetProvider.ts
@@ -0,0 +1,5 @@
+import type { IAsset } from './IAsset';
+
+export interface IAssetProvider {
+    getAssets(): Array<IAsset>;
+}
diff --git a/packages/apps-engine/src/definition/assets/index.ts b/packages/apps-engine/src/definition/assets/index.ts
new file mode 100644
index 000000000000..98abab64ddf5
--- /dev/null
+++ b/packages/apps-engine/src/definition/assets/index.ts
@@ -0,0 +1,4 @@
+import { IAsset } from './IAsset';
+import { IAssetProvider } from './IAssetProvider';
+
+export { IAsset, IAssetProvider };
diff --git a/packages/apps-engine/src/definition/cloud/IWorkspaceToken.ts b/packages/apps-engine/src/definition/cloud/IWorkspaceToken.ts
new file mode 100644
index 000000000000..40a46bf7e37f
--- /dev/null
+++ b/packages/apps-engine/src/definition/cloud/IWorkspaceToken.ts
@@ -0,0 +1,4 @@
+export interface IWorkspaceToken {
+    token: string;
+    expiresAt: Date;
+}
diff --git a/packages/apps-engine/src/definition/email/IEmail.ts b/packages/apps-engine/src/definition/email/IEmail.ts
new file mode 100644
index 000000000000..ca81b23e5bcc
--- /dev/null
+++ b/packages/apps-engine/src/definition/email/IEmail.ts
@@ -0,0 +1,9 @@
+export interface IEmail {
+    to: string | string[];
+    from: string;
+    replyTo?: string;
+    subject: string;
+    html?: string;
+    text?: string;
+    headers?: string;
+}
diff --git a/packages/apps-engine/src/definition/email/IEmailDescriptor.ts b/packages/apps-engine/src/definition/email/IEmailDescriptor.ts
new file mode 100644
index 000000000000..168bae039168
--- /dev/null
+++ b/packages/apps-engine/src/definition/email/IEmailDescriptor.ts
@@ -0,0 +1,11 @@
+export interface IEmailDescriptor {
+    from?: string | undefined;
+    to?: string | Array<string> | undefined;
+    cc?: string | Array<string> | undefined;
+    bcc?: string | Array<string> | undefined;
+    replyTo?: string | Array<string> | undefined;
+    subject?: string | undefined;
+    text?: string | undefined;
+    html?: string | undefined;
+    headers?: Record<string, string> | undefined;
+}
diff --git a/packages/apps-engine/src/definition/email/IPreEmailSent.ts b/packages/apps-engine/src/definition/email/IPreEmailSent.ts
new file mode 100644
index 000000000000..2d5e40c92851
--- /dev/null
+++ b/packages/apps-engine/src/definition/email/IPreEmailSent.ts
@@ -0,0 +1,25 @@
+import type { IEmailDescriptor, IPreEmailSentContext } from '.';
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+
+/**
+ * Event interface that allows apps to
+ * register as a handler of of the `IPreEmailSent`
+ * event.
+ *
+ * This event is trigger before the mailer sends
+ * an email.
+ *
+ * To prevent the email from being sent, you can
+ * throw an error with a message specifying the
+ * reason for rejection.
+ */
+export interface IPreEmailSent {
+    [AppMethod.EXECUTE_PRE_EMAIL_SENT](
+        context: IPreEmailSentContext,
+        read: IRead,
+        http: IHttp,
+        persis: IPersistence,
+        modify: IModify,
+    ): Promise<IEmailDescriptor>;
+}
diff --git a/packages/apps-engine/src/definition/email/IPreEmailSentContext.ts b/packages/apps-engine/src/definition/email/IPreEmailSentContext.ts
new file mode 100644
index 000000000000..7427424f88eb
--- /dev/null
+++ b/packages/apps-engine/src/definition/email/IPreEmailSentContext.ts
@@ -0,0 +1,6 @@
+import type { IEmailDescriptor } from './IEmailDescriptor';
+
+export interface IPreEmailSentContext {
+    context: unknown;
+    email: IEmailDescriptor;
+}
diff --git a/packages/apps-engine/src/definition/email/index.ts b/packages/apps-engine/src/definition/email/index.ts
new file mode 100644
index 000000000000..6074ebaec4c3
--- /dev/null
+++ b/packages/apps-engine/src/definition/email/index.ts
@@ -0,0 +1,4 @@
+export * from './IEmailDescriptor';
+export * from './IPreEmailSent';
+export * from './IPreEmailSentContext';
+export * from './IEmail';
diff --git a/packages/apps-engine/src/definition/example-app.json b/packages/apps-engine/src/definition/example-app.json
new file mode 100644
index 000000000000..e78048d1d316
--- /dev/null
+++ b/packages/apps-engine/src/definition/example-app.json
@@ -0,0 +1,13 @@
+{
+    //This is an example of how a app.json file will look like
+    "name": "Testing",
+    "nameSlug": "testing",
+    "description": "Testing description",
+    "version": "1.0.0",
+    "requiredApiVersion": "0.0.1",
+    "author": {
+        "name": "Bradley Hilton",
+        "support": "https://github.com/RocketChat/Rocket.Chat.Apps-engine"
+    },
+    "classFile": "ExampleApp.ts"
+}
diff --git a/packages/apps-engine/src/definition/exceptions/AppsEngineException.ts b/packages/apps-engine/src/definition/exceptions/AppsEngineException.ts
new file mode 100644
index 000000000000..a3e802aa69d8
--- /dev/null
+++ b/packages/apps-engine/src/definition/exceptions/AppsEngineException.ts
@@ -0,0 +1,32 @@
+/**
+ * The internal exception from the framework
+ *
+ * It's used to signal to the outside world that
+ * a _known_ exception has happened during the execution
+ * of the apps.
+ *
+ * It's the base exception for other known classes
+ * such as UserNotAllowedException, which is used
+ * to inform the host that an app identified
+ * that a user cannot perform some action, e.g.
+ * join a room
+ */
+export class AppsEngineException extends Error {
+    public name = 'AppsEngineException';
+
+    public static JSONRPC_ERROR_CODE = -32070;
+
+    public message: string;
+
+    constructor(message?: string) {
+        super();
+        this.message = message;
+    }
+
+    public getErrorInfo() {
+        return {
+            name: this.name,
+            message: this.message,
+        };
+    }
+}
diff --git a/packages/apps-engine/src/definition/exceptions/EssentialAppDisabledException.ts b/packages/apps-engine/src/definition/exceptions/EssentialAppDisabledException.ts
new file mode 100644
index 000000000000..e5043d93e336
--- /dev/null
+++ b/packages/apps-engine/src/definition/exceptions/EssentialAppDisabledException.ts
@@ -0,0 +1,16 @@
+import { AppsEngineException } from '.';
+
+/**
+ * This exception informs the host system that an
+ * app essential to the execution of a system action
+ * is disabled, so the action should be halted.
+ *
+ * Apps can register to be considered essential to
+ * the execution of internal events of the framework
+ * such as `IPreMessageSentPrevent`, `IPreRoomUserJoined`,
+ * etc.
+ *
+ * This is used interally by the framework and is not
+ * intended to be thrown manually by apps.
+ */
+export class EssentialAppDisabledException extends AppsEngineException {}
diff --git a/packages/apps-engine/src/definition/exceptions/FileUploadNotAllowedException.ts b/packages/apps-engine/src/definition/exceptions/FileUploadNotAllowedException.ts
new file mode 100644
index 000000000000..0ae9d98edb3f
--- /dev/null
+++ b/packages/apps-engine/src/definition/exceptions/FileUploadNotAllowedException.ts
@@ -0,0 +1,12 @@
+import { AppsEngineException } from './AppsEngineException';
+
+/**
+ * This exception informs the host system that an
+ * app has determined that a file upload is not
+ * allowed to be completed.
+ *
+ * Currently it is expected to be thrown by the
+ * following events:
+ * - IPreFileUpload
+ */
+export class FileUploadNotAllowedException extends AppsEngineException {}
diff --git a/packages/apps-engine/src/definition/exceptions/InvalidSettingValueException.ts b/packages/apps-engine/src/definition/exceptions/InvalidSettingValueException.ts
new file mode 100644
index 000000000000..2b1a193accb2
--- /dev/null
+++ b/packages/apps-engine/src/definition/exceptions/InvalidSettingValueException.ts
@@ -0,0 +1,8 @@
+import { AppsEngineException } from './AppsEngineException';
+
+/**
+ * This exception informs the host system that an
+ * app has determined that an invalid setting value
+ * is passed.
+ */
+export class InvalidSettingValueException extends AppsEngineException {}
diff --git a/packages/apps-engine/src/definition/exceptions/UserNotAllowedException.ts b/packages/apps-engine/src/definition/exceptions/UserNotAllowedException.ts
new file mode 100644
index 000000000000..d81969d8f62a
--- /dev/null
+++ b/packages/apps-engine/src/definition/exceptions/UserNotAllowedException.ts
@@ -0,0 +1,14 @@
+import { AppsEngineException } from '.';
+
+/**
+ * This exception informs the host system that an
+ * app has determined that an user is not allowed
+ * to perform a specific action.
+ *
+ * Currently it is expected to be thrown by the
+ * following events:
+ * - IPreRoomCreatePrevent
+ * - IPreRoomUserJoined
+ * - IPreRoomUserLeave
+ */
+export class UserNotAllowedException extends AppsEngineException {}
diff --git a/packages/apps-engine/src/definition/exceptions/index.ts b/packages/apps-engine/src/definition/exceptions/index.ts
new file mode 100644
index 000000000000..6129978c2f89
--- /dev/null
+++ b/packages/apps-engine/src/definition/exceptions/index.ts
@@ -0,0 +1,5 @@
+export * from './AppsEngineException';
+export * from './EssentialAppDisabledException';
+export * from './UserNotAllowedException';
+export * from './FileUploadNotAllowedException';
+export * from './InvalidSettingValueException';
diff --git a/packages/apps-engine/src/definition/externalComponent/IExternalComponent.ts b/packages/apps-engine/src/definition/externalComponent/IExternalComponent.ts
new file mode 100644
index 000000000000..7c750e1c7e22
--- /dev/null
+++ b/packages/apps-engine/src/definition/externalComponent/IExternalComponent.ts
@@ -0,0 +1,51 @@
+import type { IExternalComponentOptions } from './IExternalComponentOptions';
+import type { IExternalComponentState } from './IExternalComponentState';
+/**
+ * Represents an external component that is being provided.
+ */
+export interface IExternalComponent {
+    /**
+     * Provides the appId of the app which the external component belongs to.
+     */
+    appId: string;
+    /**
+     * Provides the name of the external component. This key must be unique.
+     */
+    name: string;
+    /**
+     * Provides the description of the external component.
+     */
+    description: string;
+    /**
+     * Provides the icon's url or base64 string.
+     */
+    icon: string;
+    /**
+     * Provides the location which external component needs
+     * to register, see the ExternalComponentLocation descriptions
+     * for the more information.
+     */
+    location: ExternalComponentLocation;
+    /**
+     * Provides the url that external component will load.
+     */
+    url: string;
+    /**
+     * Provides options for the external component.
+     */
+    options?: IExternalComponentOptions;
+    /**
+     * Represents the current state of the external component.
+     * The value is *null* until the ExternalComponentOpened
+     * event is triggered. It doesn't make sense to get its value in
+     * PreExternalComponentOpenedPrevent, PreExternalComponentOpenedModify
+     * and PreExternalComponentOpenedExtend handlers.
+     */
+    state?: IExternalComponentState;
+}
+
+export enum ExternalComponentLocation {
+    CONTEXTUAL_BAR = 'CONTEXTUAL_BAR',
+
+    MODAL = 'MODAL',
+}
diff --git a/packages/apps-engine/src/definition/externalComponent/IExternalComponentOptions.ts b/packages/apps-engine/src/definition/externalComponent/IExternalComponentOptions.ts
new file mode 100644
index 000000000000..2581c047ab43
--- /dev/null
+++ b/packages/apps-engine/src/definition/externalComponent/IExternalComponentOptions.ts
@@ -0,0 +1,10 @@
+export interface IExternalComponentOptions {
+    /**
+     * The width of the external component
+     */
+    width?: number;
+    /**
+     * The height of the external component
+     */
+    height?: number;
+}
diff --git a/packages/apps-engine/src/definition/externalComponent/IExternalComponentState.ts b/packages/apps-engine/src/definition/externalComponent/IExternalComponentState.ts
new file mode 100644
index 000000000000..4c401f3e28d1
--- /dev/null
+++ b/packages/apps-engine/src/definition/externalComponent/IExternalComponentState.ts
@@ -0,0 +1,16 @@
+import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from '../../client/definition';
+
+/**
+ * The state of an external component, which contains the
+ * current user's information and the current room's information.
+ */
+export interface IExternalComponentState {
+    /**
+     * The user who opened this external component
+     */
+    currentUser: IExternalComponentUserInfo;
+    /**
+     * The room where the external component belongs to
+     */
+    currentRoom: IExternalComponentRoomInfo;
+}
diff --git a/packages/apps-engine/src/definition/externalComponent/IPostExternalComponentClosed.ts b/packages/apps-engine/src/definition/externalComponent/IPostExternalComponentClosed.ts
new file mode 100644
index 000000000000..24d224ba2913
--- /dev/null
+++ b/packages/apps-engine/src/definition/externalComponent/IPostExternalComponentClosed.ts
@@ -0,0 +1,16 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IExternalComponent } from './IExternalComponent';
+
+/**
+ * Handler called after an external component is closed.
+ */
+export interface IPostExternalComponentClosed {
+    /**
+     * Method called after an external component is closed.
+     *
+     * @param externalComponent The external component which was closed
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     */
+    executePostExternalComponentClosed(externalComponent: IExternalComponent, read: IRead, http: IHttp, persistence: IPersistence): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/externalComponent/IPostExternalComponentOpened.ts b/packages/apps-engine/src/definition/externalComponent/IPostExternalComponentOpened.ts
new file mode 100644
index 000000000000..8a09ebe711d2
--- /dev/null
+++ b/packages/apps-engine/src/definition/externalComponent/IPostExternalComponentOpened.ts
@@ -0,0 +1,16 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IExternalComponent } from './IExternalComponent';
+
+/**
+ * Handler called after an external component is opened.
+ */
+export interface IPostExternalComponentOpened {
+    /**
+     * Method called after an external component is opened.
+     *
+     * @param externalComponent The external component which was opened
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     */
+    executePostExternalComponentOpened(externalComponent: IExternalComponent, read: IRead, http: IHttp, persistence: IPersistence): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/externalComponent/index.ts b/packages/apps-engine/src/definition/externalComponent/index.ts
new file mode 100644
index 000000000000..acd4bbf44982
--- /dev/null
+++ b/packages/apps-engine/src/definition/externalComponent/index.ts
@@ -0,0 +1,5 @@
+import { IExternalComponent } from './IExternalComponent';
+import { IPostExternalComponentClosed } from './IPostExternalComponentClosed';
+import { IPostExternalComponentOpened } from './IPostExternalComponentOpened';
+
+export { IExternalComponent, IPostExternalComponentClosed, IPostExternalComponentOpened };
diff --git a/packages/apps-engine/src/definition/livechat/IDepartment.ts b/packages/apps-engine/src/definition/livechat/IDepartment.ts
new file mode 100644
index 000000000000..1a59c9835612
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IDepartment.ts
@@ -0,0 +1,17 @@
+export interface IDepartment {
+    id: string;
+    name?: string;
+    email?: string;
+    description?: string;
+    offlineMessageChannelName?: string;
+    requestTagBeforeClosingChat?: false;
+    chatClosingTags?: Array<string>;
+    abandonedRoomsCloseCustomMessage?: string;
+    waitingQueueMessage?: string;
+    departmentsAllowedToForward?: string;
+    enabled: boolean;
+    updatedAt: Date;
+    numberOfAgents: number;
+    showOnOfflineForm: boolean;
+    showOnRegistration: boolean;
+}
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatEventContext.ts b/packages/apps-engine/src/definition/livechat/ILivechatEventContext.ts
new file mode 100644
index 000000000000..b94f07ef0250
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatEventContext.ts
@@ -0,0 +1,7 @@
+import type { IUser } from '../users';
+import type { ILivechatRoom } from './ILivechatRoom';
+
+export interface ILivechatEventContext {
+    agent: IUser;
+    room: ILivechatRoom;
+}
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts b/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts
new file mode 100644
index 000000000000..d7cc5497d70e
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts
@@ -0,0 +1,7 @@
+import type { IMessage } from '../messages/IMessage';
+import type { IVisitor } from './IVisitor';
+
+export interface ILivechatMessage extends IMessage {
+    visitor?: IVisitor;
+    token?: string;
+}
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts b/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts
new file mode 100644
index 000000000000..e3f55142331a
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts
@@ -0,0 +1,55 @@
+import { RoomType } from '../rooms';
+import type { IRoom } from '../rooms/IRoom';
+import type { IUser } from '../users';
+import type { IDepartment } from './IDepartment';
+import type { IVisitor } from './IVisitor';
+
+export enum OmnichannelSourceType {
+    WIDGET = 'widget',
+    EMAIL = 'email',
+    SMS = 'sms',
+    APP = 'app',
+    OTHER = 'other',
+}
+
+interface IOmnichannelSourceApp {
+    type: 'app';
+    id: string;
+    // A human readable alias that goes with the ID, for post analytical purposes
+    alias?: string;
+    // A label to be shown in the room info
+    label?: string;
+    sidebarIcon?: string;
+    defaultIcon?: string;
+}
+type OmnichannelSource =
+    | {
+          type: Exclude<OmnichannelSourceType, 'app'>;
+      }
+    | IOmnichannelSourceApp;
+
+export interface IVisitorChannelInfo {
+    lastMessageTs?: Date;
+    phone?: string;
+}
+
+export interface ILivechatRoom extends IRoom {
+    visitor: IVisitor;
+    visitorChannelInfo?: IVisitorChannelInfo;
+    department?: IDepartment;
+    closer: 'user' | 'visitor' | 'bot';
+    closedBy?: IUser;
+    servedBy?: IUser;
+    responseBy?: IUser;
+    isWaitingResponse: boolean;
+    isOpen: boolean;
+    closedAt?: Date;
+    source?: OmnichannelSource;
+}
+
+export const isLivechatRoom = (room: IRoom): room is ILivechatRoom => {
+    return room.type === RoomType.LIVE_CHAT;
+};
+export const isLivechatFromApp = (room: ILivechatRoom): room is ILivechatRoom & { source: IOmnichannelSourceApp } => {
+    return room.source && room.source.type === 'app';
+};
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatRoomClosedHandler.ts b/packages/apps-engine/src/definition/livechat/ILivechatRoomClosedHandler.ts
new file mode 100644
index 000000000000..dba672ad391b
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatRoomClosedHandler.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatRoom } from './ILivechatRoom';
+
+/**
+ * Handler called after a livechat room is closed.
+ * @deprecated please prefer the IPostLivechatRoomClosed event
+ */
+export interface ILivechatRoomClosedHandler {
+    /**
+     * Method called *after* a livechat room is closed.
+     *
+     * @param livechatRoom The livechat room which is closed.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    [AppMethod.EXECUTE_LIVECHAT_ROOM_CLOSED_HANDLER](data: ILivechatRoom, read: IRead, http: IHttp, persistence: IPersistence): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatTransferData.ts b/packages/apps-engine/src/definition/livechat/ILivechatTransferData.ts
new file mode 100644
index 000000000000..988d0a2ec5fd
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatTransferData.ts
@@ -0,0 +1,8 @@
+import type { IUser } from '../users';
+import type { ILivechatRoom } from './ILivechatRoom';
+
+export interface ILivechatTransferData {
+    currentRoom: ILivechatRoom;
+    targetAgent?: IUser;
+    targetDepartment?: string;
+}
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatTransferEventContext.ts b/packages/apps-engine/src/definition/livechat/ILivechatTransferEventContext.ts
new file mode 100644
index 000000000000..74db472751d4
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatTransferEventContext.ts
@@ -0,0 +1,15 @@
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+import type { IDepartment } from './IDepartment';
+
+export enum LivechatTransferEventType {
+    AGENT = 'agent',
+    DEPARTMENT = 'department',
+}
+
+export interface ILivechatTransferEventContext {
+    type: LivechatTransferEventType;
+    room: IRoom;
+    from: IUser | IDepartment;
+    to: IUser | IDepartment;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatAgentAssigned.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatAgentAssigned.ts
new file mode 100644
index 000000000000..5c322534c9ff
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatAgentAssigned.ts
@@ -0,0 +1,25 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatEventContext } from './ILivechatEventContext';
+
+/**
+ * Handler called after the assignment of a livechat agent.
+ */
+export interface IPostLivechatAgentAssigned {
+    /**
+     * Handler called *after* the assignment of a livechat agent.
+     *
+     * @param data the livechat context data which contains agent's info and room's info.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persis An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    [AppMethod.EXECUTE_POST_LIVECHAT_AGENT_ASSIGNED](
+        context: ILivechatEventContext,
+        read: IRead,
+        http: IHttp,
+        persis: IPersistence,
+        modify?: IModify,
+    ): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatAgentUnassigned.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatAgentUnassigned.ts
new file mode 100644
index 000000000000..2884cfa94b83
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatAgentUnassigned.ts
@@ -0,0 +1,25 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatEventContext } from './ILivechatEventContext';
+
+/**
+ * Handler called after the unassignment of a livechat agent.
+ */
+export interface IPostLivechatAgentUnassigned {
+    /**
+     * Handler called *after* the unassignment of a livechat agent.
+     *
+     * @param data the livechat context data which contains agent's info and room's info.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persis An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    [AppMethod.EXECUTE_POST_LIVECHAT_AGENT_UNASSIGNED](
+        context: ILivechatEventContext,
+        read: IRead,
+        http: IHttp,
+        persis: IPersistence,
+        modify?: IModify,
+    ): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatGuestSaved.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatGuestSaved.ts
new file mode 100644
index 000000000000..2c5edc0b9692
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatGuestSaved.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IVisitor } from './IVisitor';
+
+/**
+ * Handler called after the guest's info get saved.
+ */
+export interface IPostLivechatGuestSaved {
+    /**
+     * Handler called *after* the guest's info get saved.
+     *
+     * @param data the livechat context data which contains guest's info and room's info.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persis An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    [AppMethod.EXECUTE_POST_LIVECHAT_GUEST_SAVED](context: IVisitor, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatRoomClosed.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomClosed.ts
new file mode 100644
index 000000000000..072e02e8c721
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomClosed.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatRoom } from './ILivechatRoom';
+
+/**
+ * Handler called after a livechat room is closed.
+ */
+export interface IPostLivechatRoomClosed {
+    /**
+     * Method called *after* a livechat room is closed.
+     *
+     * @param livechatRoom The livechat room which is closed.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persis An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    [AppMethod.EXECUTE_POST_LIVECHAT_ROOM_CLOSED](room: ILivechatRoom, read: IRead, http: IHttp, persis: IPersistence, modify?: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatRoomSaved.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomSaved.ts
new file mode 100644
index 000000000000..13b6d1cb2e4b
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomSaved.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatRoom } from './ILivechatRoom';
+
+/**
+ * Handler called after the room's info get saved.
+ */
+export interface IPostLivechatRoomSaved {
+    /**
+     * Handler called *after* the room's info get saved.
+     *
+     * @param data the livechat context data which contains room's info.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persis An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    [AppMethod.EXECUTE_POST_LIVECHAT_ROOM_SAVED](context: ILivechatRoom, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatRoomStarted.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomStarted.ts
new file mode 100644
index 000000000000..237dcd9566e9
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomStarted.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatRoom } from './ILivechatRoom';
+
+/**
+ * Handler called after a livechat room is started.
+ */
+export interface IPostLivechatRoomStarted {
+    /**
+     * Method called *after* a livechat room is started.
+     *
+     * @param livechatRoom The livechat room which is started.
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persis An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    [AppMethod.EXECUTE_POST_LIVECHAT_ROOM_STARTED](room: ILivechatRoom, read: IRead, http: IHttp, persis: IPersistence, modify?: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IPostLivechatRoomTransferred.ts b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomTransferred.ts
new file mode 100644
index 000000000000..aa86f8d358d3
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IPostLivechatRoomTransferred.ts
@@ -0,0 +1,13 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { ILivechatTransferEventContext } from './ILivechatTransferEventContext';
+
+export interface IPostLivechatRoomTransferred {
+    [AppMethod.EXECUTE_POST_LIVECHAT_ROOM_TRANSFERRED](
+        context: ILivechatTransferEventContext,
+        read: IRead,
+        http: IHttp,
+        persis: IPersistence,
+        modify: IModify,
+    ): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IVisitor.ts b/packages/apps-engine/src/definition/livechat/IVisitor.ts
new file mode 100644
index 000000000000..db5876dd912d
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IVisitor.ts
@@ -0,0 +1,16 @@
+import type { IVisitorEmail } from './IVisitorEmail';
+import type { IVisitorPhone } from './IVisitorPhone';
+
+export interface IVisitor {
+    id?: string;
+    token: string;
+    username: string;
+    updatedAt?: Date;
+    name: string;
+    department?: string;
+    phone?: Array<IVisitorPhone>;
+    visitorEmails?: Array<IVisitorEmail>;
+    status?: string;
+    customFields?: { [key: string]: any };
+    livechatData?: { [key: string]: any };
+}
diff --git a/packages/apps-engine/src/definition/livechat/IVisitorEmail.ts b/packages/apps-engine/src/definition/livechat/IVisitorEmail.ts
new file mode 100644
index 000000000000..a1e35380666e
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IVisitorEmail.ts
@@ -0,0 +1,3 @@
+export interface IVisitorEmail {
+    address: string;
+}
diff --git a/packages/apps-engine/src/definition/livechat/IVisitorPhone.ts b/packages/apps-engine/src/definition/livechat/IVisitorPhone.ts
new file mode 100644
index 000000000000..fe112777e7d7
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/IVisitorPhone.ts
@@ -0,0 +1,3 @@
+export interface IVisitorPhone {
+    phoneNumber: string;
+}
diff --git a/packages/apps-engine/src/definition/livechat/index.ts b/packages/apps-engine/src/definition/livechat/index.ts
new file mode 100644
index 000000000000..5ea8d9f42885
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/index.ts
@@ -0,0 +1,38 @@
+import { IDepartment } from './IDepartment';
+import { ILivechatEventContext } from './ILivechatEventContext';
+import { ILivechatMessage } from './ILivechatMessage';
+import { ILivechatRoom } from './ILivechatRoom';
+import { ILivechatRoomClosedHandler } from './ILivechatRoomClosedHandler';
+import { ILivechatTransferData } from './ILivechatTransferData';
+import { ILivechatTransferEventContext, LivechatTransferEventType } from './ILivechatTransferEventContext';
+import { IPostLivechatAgentAssigned } from './IPostLivechatAgentAssigned';
+import { IPostLivechatAgentUnassigned } from './IPostLivechatAgentUnassigned';
+import { IPostLivechatGuestSaved } from './IPostLivechatGuestSaved';
+import { IPostLivechatRoomClosed } from './IPostLivechatRoomClosed';
+import { IPostLivechatRoomSaved } from './IPostLivechatRoomSaved';
+import { IPostLivechatRoomStarted } from './IPostLivechatRoomStarted';
+import { IPostLivechatRoomTransferred } from './IPostLivechatRoomTransferred';
+import { IVisitor } from './IVisitor';
+import { IVisitorEmail } from './IVisitorEmail';
+import { IVisitorPhone } from './IVisitorPhone';
+
+export {
+    ILivechatEventContext,
+    ILivechatMessage,
+    ILivechatRoom,
+    IPostLivechatAgentAssigned,
+    IPostLivechatAgentUnassigned,
+    IPostLivechatGuestSaved,
+    IPostLivechatRoomStarted,
+    IPostLivechatRoomClosed,
+    IPostLivechatRoomSaved,
+    IPostLivechatRoomTransferred,
+    ILivechatRoomClosedHandler,
+    ILivechatTransferData,
+    ILivechatTransferEventContext,
+    IDepartment,
+    IVisitor,
+    IVisitorEmail,
+    IVisitorPhone,
+    LivechatTransferEventType,
+};
diff --git a/packages/apps-engine/src/definition/messages/IMessage.ts b/packages/apps-engine/src/definition/messages/IMessage.ts
new file mode 100644
index 000000000000..d7ea6357497a
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessage.ts
@@ -0,0 +1,34 @@
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
+
+import type { IRoom } from '../rooms';
+import type { IBlock } from '../uikit';
+import type { IUser, IUserLookup } from '../users';
+import type { IMessageAttachment } from './IMessageAttachment';
+import type { IMessageFile } from './IMessageFile';
+import type { IMessageReactions } from './IMessageReaction';
+
+export interface IMessage {
+    id?: string;
+    threadId?: string;
+    room: IRoom;
+    sender: IUser;
+    text?: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+    editor?: IUser;
+    editedAt?: Date;
+    emoji?: string;
+    avatarUrl?: string;
+    alias?: string;
+    file?: IMessageFile;
+    attachments?: Array<IMessageAttachment>;
+    reactions?: IMessageReactions;
+    groupable?: boolean;
+    parseUrls?: boolean;
+    customFields?: { [key: string]: any };
+    blocks?: Array<IBlock | LayoutBlock>;
+    starred?: Array<{ _id: string }>;
+    pinned?: boolean;
+    pinnedAt?: Date;
+    pinnedBy?: IUserLookup;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageAction.ts b/packages/apps-engine/src/definition/messages/IMessageAction.ts
new file mode 100644
index 000000000000..3f32e4aa781d
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageAction.ts
@@ -0,0 +1,17 @@
+import type { MessageActionType } from './MessageActionType';
+import type { MessageProcessingType } from './MessageProcessingType';
+
+/**
+ * Interface which represents an action which can be added to a message.
+ */
+export interface IMessageAction {
+    type: MessageActionType;
+    text?: string;
+    url?: string;
+    image_url?: string;
+    is_webview?: boolean;
+    webview_height_ratio?: string;
+    msg?: string;
+    msg_in_chat_window?: boolean;
+    msg_processing_type?: MessageProcessingType;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageAttachment.ts b/packages/apps-engine/src/definition/messages/IMessageAttachment.ts
new file mode 100644
index 000000000000..96dd8aa1fe34
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageAttachment.ts
@@ -0,0 +1,43 @@
+import type { IMessageAction } from './IMessageAction';
+import type { IMessageAttachmentAuthor } from './IMessageAttachmentAuthor';
+import type { IMessageAttachmentField } from './IMessageAttachmentField';
+import type { IMessageAttachmentTitle } from './IMessageAttachmentTitle';
+import type { MessageActionButtonsAlignment } from './MessageActionButtonsAlignment';
+
+/**
+ * Interface which represents an attachment which can be added to a message.
+ */
+export interface IMessageAttachment {
+    /** Causes the image, audio, and video sections to be hidding when this is true. */
+    collapsed?: boolean;
+    /** The color you want the order on the left side to be, supports any valid background-css value. */
+    color?: string; // TODO: Maybe we change this to a Color class which has helper methods?
+    /** The text to display for this attachment. */
+    text?: string;
+    /** Displays the time next to the text portion. */
+    timestamp?: Date;
+    /** Only applicable if the timestamp is provided, as it makes the time clickable to this link. */
+    timestampLink?: string;
+    /** An image that displays to the left of the text, looks better when this is relatively small. */
+    thumbnailUrl?: string;
+    /** Author portion of the attachment. */
+    author?: IMessageAttachmentAuthor;
+    /** Title portion of the attachment. */
+    title?: IMessageAttachmentTitle;
+    /** The image to display, will be "big" and easy to see. */
+    imageUrl?: string;
+    /** Audio file to play, only supports what html's <audio> does. */
+    audioUrl?: string;
+    /** Video file to play, only supports what html's <video> does. */
+    videoUrl?: string;
+    /** The type of attachment this is, although hardly used and only used for `file`s. */
+    type?: string;
+    /** Allows users to describe what the attachment is. */
+    description?: string;
+    /** States how the action buttons are aligned. */
+    actionButtonsAlignment?: MessageActionButtonsAlignment;
+    /** Allows displaying action items, such as buttons, on the attachment. */
+    actions?: Array<IMessageAction>;
+    /** The field property of the attachments allows for "tables" or "columns" to be displayed on messages. */
+    fields?: Array<IMessageAttachmentField>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageAttachmentAuthor.ts b/packages/apps-engine/src/definition/messages/IMessageAttachmentAuthor.ts
new file mode 100644
index 000000000000..a6ec8ca233c1
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageAttachmentAuthor.ts
@@ -0,0 +1,11 @@
+/**
+ * Interface for the author piece of the attachments.
+ */
+export interface IMessageAttachmentAuthor {
+    /** The name of the author. */
+    name?: string;
+    /** Providing this makes the author name clickable and points to this link. */
+    link?: string;
+    /** Displays a tiny icon to the left of the Author’s name. */
+    icon?: string;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageAttachmentField.ts b/packages/apps-engine/src/definition/messages/IMessageAttachmentField.ts
new file mode 100644
index 000000000000..9d45c5a16208
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageAttachmentField.ts
@@ -0,0 +1,11 @@
+/**
+ * The field property of the attachments allows for "tables" or "columns" to be displayed on messages.
+ */
+export interface IMessageAttachmentField {
+    /** Whether this field should be a short field. */
+    short?: boolean;
+    /** The title of this field. */
+    title: string;
+    /** The value of this field, displayed underneath the title value. */
+    value: string;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageAttachmentTitle.ts b/packages/apps-engine/src/definition/messages/IMessageAttachmentTitle.ts
new file mode 100644
index 000000000000..6dbb915b4529
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageAttachmentTitle.ts
@@ -0,0 +1,8 @@
+export interface IMessageAttachmentTitle {
+    /** Title to display for this attachment, displays under the author. */
+    value?: string;
+    /** Providing this makes the title clickable, pointing to this link. */
+    link?: string;
+    /** When this is provided, a download icon appears and clicking this prompts a download. */
+    displayDownloadLink?: boolean;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageDeleteContext.ts b/packages/apps-engine/src/definition/messages/IMessageDeleteContext.ts
new file mode 100644
index 000000000000..a093fb189825
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageDeleteContext.ts
@@ -0,0 +1,17 @@
+import type { IMessage } from '.';
+import type { IUser } from '../users';
+
+/**
+ * The context of execution for the following events:
+ * - IPostMessageDeleted
+ */
+export interface IMessageDeleteContext {
+    /**
+     * The message that was deleted
+     */
+    message: IMessage;
+    /**
+     * The user who deleted the message
+     */
+    user: IUser;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageFile.ts b/packages/apps-engine/src/definition/messages/IMessageFile.ts
new file mode 100644
index 000000000000..10bdd89119b2
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageFile.ts
@@ -0,0 +1,5 @@
+export interface IMessageFile {
+    _id: string;
+    name: string;
+    type: string;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageFollowContext.ts b/packages/apps-engine/src/definition/messages/IMessageFollowContext.ts
new file mode 100644
index 000000000000..d342ce13dd3a
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageFollowContext.ts
@@ -0,0 +1,21 @@
+import type { IMessage } from '.';
+import type { IUser } from '../users';
+
+/**
+ * The context of execution for the following events:
+ * - IPostMessageFollowed
+ */
+export interface IMessageFollowContext {
+    /**
+     * The message that was followed or unfollowed
+     */
+    message: IMessage;
+    /**
+     * The user who follow the message
+     */
+    user: IUser;
+    /**
+     * If the message was followed or unfollowed
+     */
+    isFollowed: boolean;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessagePinContext.ts b/packages/apps-engine/src/definition/messages/IMessagePinContext.ts
new file mode 100644
index 000000000000..53ba7b35fe96
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessagePinContext.ts
@@ -0,0 +1,21 @@
+import type { IMessage } from '.';
+import type { IUser } from '../users';
+
+/**
+ * The context of execution for the following events:
+ * - IPostMessagePinned
+ */
+export interface IMessagePinContext {
+    /**
+     * The message that was pinned or unpinned
+     */
+    message: IMessage;
+    /**
+     * The user who pinned the message
+     */
+    user: IUser;
+    /**
+     * If the message was pinned or unpinned
+     */
+    isPinned: boolean;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageRaw.ts b/packages/apps-engine/src/definition/messages/IMessageRaw.ts
new file mode 100644
index 000000000000..1706b2639f1c
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageRaw.ts
@@ -0,0 +1,40 @@
+import type { IBlock, Block } from '@rocket.chat/ui-kit';
+
+import type { IRoom } from '../rooms';
+import type { IUserLookup } from '../users';
+import type { IMessageAttachment } from './IMessageAttachment';
+import type { IMessageFile } from './IMessageFile';
+import type { IMessageReactions } from './IMessageReaction';
+
+/**
+ * The raw version of a message, without resolved information for relationship fields, i.e.
+ * `room`, `sender` and `editor` are not the complete entity like they are in `IMessage`
+ *
+ * This is used in methods that fetch multiple messages at the same time, as resolving the relationship
+ * fields require additional queries to the database and would hit the system's performance significantly.
+ */
+export interface IMessageRaw {
+    id: string;
+    roomId: IRoom['id'];
+    sender: IUserLookup;
+    createdAt: Date;
+    threadId?: string;
+    text?: string;
+    updatedAt?: Date;
+    editor?: IUserLookup;
+    editedAt?: Date;
+    emoji?: string;
+    avatarUrl?: string;
+    alias?: string;
+    file?: IMessageFile;
+    attachments?: Array<IMessageAttachment>;
+    reactions?: IMessageReactions;
+    groupable?: boolean;
+    parseUrls?: boolean;
+    customFields?: { [key: string]: any };
+    blocks?: Array<IBlock | Block>;
+    starred?: Array<{ _id: string }>;
+    pinned?: boolean;
+    pinnedAt?: Date;
+    pinnedBy?: IUserLookup;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageReaction.ts b/packages/apps-engine/src/definition/messages/IMessageReaction.ts
new file mode 100644
index 000000000000..3f6ceb23524f
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageReaction.ts
@@ -0,0 +1,13 @@
+export type Reaction = `:${string}:`;
+
+/**
+ * Interface which represents a reaction which can be added to a message.
+ */
+// Note: keeping it as string for compatibility
+export interface IMessageReactions {
+    [emoji: string]: Array<IMessageReaction>;
+}
+
+export interface IMessageReaction {
+    usernames?: Array<string>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageReactionContext.ts b/packages/apps-engine/src/definition/messages/IMessageReactionContext.ts
new file mode 100644
index 000000000000..b37860539b8a
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageReactionContext.ts
@@ -0,0 +1,25 @@
+import type { IMessage } from '.';
+import type { IUser } from '../users';
+
+/**
+ * The context of execution for the following events:
+ * - IPostMessageReacted
+ */
+export interface IMessageReactionContext {
+    /**
+     * The reaction itself
+     */
+    reaction: string;
+    /**
+     * If the reaction was removed or added from the message
+     */
+    isReacted: boolean;
+    /**
+     * The message that recieved the reaction
+     */
+    message: IMessage;
+    /**
+     * The user who reacted to the message
+     */
+    user: IUser;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageReportContext.ts b/packages/apps-engine/src/definition/messages/IMessageReportContext.ts
new file mode 100644
index 000000000000..2710dc6c9fd7
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageReportContext.ts
@@ -0,0 +1,21 @@
+import type { IMessage } from '.';
+import type { IUser } from '../users';
+
+/**
+ * The context of execution for the following events:
+ * - IPostMessageReported
+ */
+export interface IMessageReportContext {
+    /**
+     * The message that has been reported
+     */
+    message: IMessage;
+    /**
+     * The user who reported the message
+     */
+    user: IUser;
+    /**
+     * The reason the message was reported
+     */
+    reason: string;
+}
diff --git a/packages/apps-engine/src/definition/messages/IMessageStarContext.ts b/packages/apps-engine/src/definition/messages/IMessageStarContext.ts
new file mode 100644
index 000000000000..932c438c592c
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IMessageStarContext.ts
@@ -0,0 +1,21 @@
+import type { IMessage } from '.';
+import type { IUser } from '../users';
+
+/**
+ * The context of execution for the following events:
+ * - IPostMessageStarred
+ */
+export interface IMessageStarContext {
+    /**
+     * The message that was starred or unstarred
+     */
+    message: IMessage;
+    /**
+     * The user who starred the message
+     */
+    user: IUser;
+    /**
+     * If the message was starred or unstarred
+     */
+    isStarred: boolean;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageDeleted.ts b/packages/apps-engine/src/definition/messages/IPostMessageDeleted.ts
new file mode 100644
index 000000000000..3dd872394b5c
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageDeleted.ts
@@ -0,0 +1,37 @@
+import type { IMessage } from '.';
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessageDeleteContext } from './IMessageDeleteContext';
+
+/** Handler for after a message is deleted. */
+export interface IPostMessageDeleted {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for after the message
+     * has been deleted.
+     *
+     * @param message The deleted message
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param context The context of the message which was deleted
+     * @returns whether to run the executor function
+     */
+    checkPostMessageDeleted?(message: IMessage, read: IRead, http: IHttp, context: IMessageDeleteContext): Promise<boolean>;
+
+    /**
+     * Method called *after* the message has been deleted.
+     *
+     * @param message The deleted message
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param context The context of the message which was deleted
+     */
+    executePostMessageDeleted(
+        message: IMessage,
+        read: IRead,
+        http: IHttp,
+        persistence: IPersistence,
+        modify: IModify,
+        context: IMessageDeleteContext,
+    ): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageFollowed.ts b/packages/apps-engine/src/definition/messages/IPostMessageFollowed.ts
new file mode 100644
index 000000000000..9f1b005154e8
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageFollowed.ts
@@ -0,0 +1,18 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessageFollowContext } from './IMessageFollowContext';
+
+/**
+ * Handler for after a message has been followed or unfollowed
+ */
+export interface IPostMessageFollowed {
+    /**
+     * Method called *after* the message has been followed or unfollowed.
+     *
+     * @param context The context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    executePostMessageFollowed(context: IMessageFollowContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessagePinned.ts b/packages/apps-engine/src/definition/messages/IPostMessagePinned.ts
new file mode 100644
index 000000000000..38bb47647318
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessagePinned.ts
@@ -0,0 +1,18 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessagePinContext } from './IMessagePinContext';
+
+/**
+ * Handler for after a message has been pinned or unpinned
+ */
+export interface IPostMessagePinned {
+    /**
+     * Method called *after* the message has been pinned or unpinned.
+     *
+     * @param context The context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    executePostMessagePinned(context: IMessagePinContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageReacted.ts b/packages/apps-engine/src/definition/messages/IPostMessageReacted.ts
new file mode 100644
index 000000000000..d6f607a22fa1
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageReacted.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessageReactionContext } from './IMessageReactionContext';
+
+/**
+ * Handler for after a message get a reaction or a reaction
+ * got removed
+ */
+export interface IPostMessageReacted {
+    /**
+     * Method called *after* the message has been reacted.
+     *
+     * @param context The context of the reaction
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    executePostMessageReacted(context: IMessageReactionContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageReported.ts b/packages/apps-engine/src/definition/messages/IPostMessageReported.ts
new file mode 100644
index 000000000000..7232b668409c
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageReported.ts
@@ -0,0 +1,18 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessageReportContext } from './IMessageReportContext';
+
+/**
+ * Handler for after a message report
+ */
+export interface IPostMessageReported {
+    /**
+     * Method called *after* the message has been reported.
+     *
+     * @param context The context of the report
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    executePostMessageReported(context: IMessageReportContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageSent.ts b/packages/apps-engine/src/definition/messages/IPostMessageSent.ts
new file mode 100644
index 000000000000..2b58c48a4777
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageSent.ts
@@ -0,0 +1,27 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler for after a message is sent. */
+export interface IPostMessageSent {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for after the message
+     * has been sent.
+     *
+     * @param message The message which was sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the executor function
+     */
+    checkPostMessageSent?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method called *after* the message is sent to the other clients.
+     *
+     * @param message The message which was sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    executePostMessageSent(message: IMessage, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageSentToBot.ts b/packages/apps-engine/src/definition/messages/IPostMessageSentToBot.ts
new file mode 100644
index 000000000000..9a7fc1f331c7
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageSentToBot.ts
@@ -0,0 +1,15 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler for after a dm message is sent to a bot. */
+export interface IPostMessageSentToBot {
+    /**
+     * Method called *after* the message is sent to the other clients.
+     *
+     * @param message The message which was sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    executePostMessageSentToBot(message: IMessage, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageStarred.ts b/packages/apps-engine/src/definition/messages/IPostMessageStarred.ts
new file mode 100644
index 000000000000..54781bd13530
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageStarred.ts
@@ -0,0 +1,18 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessageStarContext } from './IMessageStarContext';
+
+/**
+ * Handler for after a message has been starred or unstarred
+ */
+export interface IPostMessageStarred {
+    /**
+     * Method called *after* the message has been starred or unstarred.
+     *
+     * @param context The context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param modify An accessor to the modifier
+     */
+    executePostMessageStarred(context: IMessageStarContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPostMessageUpdated.ts b/packages/apps-engine/src/definition/messages/IPostMessageUpdated.ts
new file mode 100644
index 000000000000..71e7ec9529ef
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPostMessageUpdated.ts
@@ -0,0 +1,27 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler for after a message is updated. */
+export interface IPostMessageUpdated {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for after the message
+     * has been updated.
+     *
+     * @param message The message which was updated
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the executor function
+     */
+    checkPostMessageUpdated?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method called *after* the message is updated to the other clients.
+     *
+     * @param message The message which was updated
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    executePostMessageUpdated(message: IMessage, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageDeletePrevent.ts b/packages/apps-engine/src/definition/messages/IPreMessageDeletePrevent.ts
new file mode 100644
index 000000000000..12bcb6453607
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageDeletePrevent.ts
@@ -0,0 +1,28 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/**  Handler which is called to determine whether a user is allowed to delete a message or not. */
+export interface IPreMessageDeletePrevent {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be deleted.
+     *
+     * @param message The message which is being deleted
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the prevent or not
+     */
+    checkPreMessageDeletePrevent?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a message from being deleted.
+     *
+     * @param message The message about to be deleted
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns whether to prevent the message from being deleted
+     */
+    executePreMessageDeletePrevent(message: IMessage, read: IRead, http: IHttp, persistence: IPersistence): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageSentExtend.ts b/packages/apps-engine/src/definition/messages/IPreMessageSentExtend.ts
new file mode 100644
index 000000000000..f1885982e4f5
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageSentExtend.ts
@@ -0,0 +1,29 @@
+import type { IHttp, IMessageExtender, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler called when an App wants to enrich a message. */
+export interface IPreMessageSentExtend {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be sent.
+     *
+     * @param message The message which is being sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the execute or not
+     */
+    checkPreMessageSentExtend?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to non-destructively enrich the message.
+     *
+     * @param message The message about to be sent
+     * @param extend An accessor for modifying the message non-destructively
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns the resulting message
+     */
+    executePreMessageSentExtend(message: IMessage, extend: IMessageExtender, read: IRead, http: IHttp, persistence: IPersistence): Promise<IMessage>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageSentModify.ts b/packages/apps-engine/src/definition/messages/IPreMessageSentModify.ts
new file mode 100644
index 000000000000..55efaf8fed20
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageSentModify.ts
@@ -0,0 +1,29 @@
+import type { IHttp, IMessageBuilder, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler called when an App wants to modify a message in a destructive way. */
+export interface IPreMessageSentModify {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be sent.
+     *
+     * @param message The message which is being sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the execute or not
+     */
+    checkPreMessageSentModify?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to destructively modify the message.
+     *
+     * @param message The message about to be sent
+     * @param builder The builder for modifying the message via methods
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @returns the resulting message
+     */
+    executePreMessageSentModify(message: IMessage, builder: IMessageBuilder, read: IRead, http: IHttp, persistence: IPersistence): Promise<IMessage>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageSentPrevent.ts b/packages/apps-engine/src/definition/messages/IPreMessageSentPrevent.ts
new file mode 100644
index 000000000000..a13a73b3cabd
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageSentPrevent.ts
@@ -0,0 +1,28 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/**  Handler which is called to determine whether a user is allowed to send a message or not. */
+export interface IPreMessageSentPrevent {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be sent.
+     *
+     * @param message The message which is being sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the prevent or not
+     */
+    checkPreMessageSentPrevent?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a message from being sent.
+     *
+     * @param message The message about to be sent
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns whether to prevent the message from being sent
+     */
+    executePreMessageSentPrevent(message: IMessage, read: IRead, http: IHttp, persistence: IPersistence): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageUpdatedExtend.ts b/packages/apps-engine/src/definition/messages/IPreMessageUpdatedExtend.ts
new file mode 100644
index 000000000000..5dcabd4face4
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageUpdatedExtend.ts
@@ -0,0 +1,29 @@
+import type { IHttp, IMessageExtender, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler called when an App wants to enrich a message update. */
+export interface IPreMessageUpdatedExtend {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be updated.
+     *
+     * @param message The message which is being updated
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the execute or not
+     */
+    checkPreMessageUpdatedExtend?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to non-destructively enrich the updated message.
+     *
+     * @param message The message about to be updated
+     * @param extend An accessor for modifying the message non-destructively
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns the resulting message
+     */
+    executePreMessageUpdatedExtend(message: IMessage, extend: IMessageExtender, read: IRead, http: IHttp, persistence: IPersistence): Promise<IMessage>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageUpdatedModify.ts b/packages/apps-engine/src/definition/messages/IPreMessageUpdatedModify.ts
new file mode 100644
index 000000000000..ee802f56364a
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageUpdatedModify.ts
@@ -0,0 +1,29 @@
+import type { IHttp, IMessageBuilder, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/** Handler called when an App wants to modify a message update in a destructive way. */
+export interface IPreMessageUpdatedModify {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be updated.
+     *
+     * @param message The message which is being updated
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the execute or not
+     */
+    checkPreMessageUpdatedModify?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to destructively modify the message update.
+     *
+     * @param message The message about to be updated
+     * @param builder The builder for modifying the message via methods
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @returns the resulting message
+     */
+    executePreMessageUpdatedModify(message: IMessage, builder: IMessageBuilder, read: IRead, http: IHttp, persistence: IPersistence): Promise<IMessage>;
+}
diff --git a/packages/apps-engine/src/definition/messages/IPreMessageUpdatedPrevent.ts b/packages/apps-engine/src/definition/messages/IPreMessageUpdatedPrevent.ts
new file mode 100644
index 000000000000..ceb171dc7381
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/IPreMessageUpdatedPrevent.ts
@@ -0,0 +1,28 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IMessage } from './IMessage';
+
+/**  Handler which is called to determine whether a user is allowed to update a message or not. */
+export interface IPreMessageUpdatedPrevent {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for the message
+     * about to be updated.
+     *
+     * @param message The message which is being updated
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @returns whether to run the prevent or not
+     */
+    checkPreMessageUpdatedPrevent?(message: IMessage, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a message from being updated.
+     *
+     * @param message The message about to be updated
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns whether to prevent the message from being updated
+     */
+    executePreMessageUpdatedPrevent(message: IMessage, read: IRead, http: IHttp, persistence: IPersistence): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/messages/MessageActionButtonsAlignment.ts b/packages/apps-engine/src/definition/messages/MessageActionButtonsAlignment.ts
new file mode 100644
index 000000000000..7f9737d1b6da
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/MessageActionButtonsAlignment.ts
@@ -0,0 +1,4 @@
+export enum MessageActionButtonsAlignment {
+    VERTICAL = 'vertical',
+    HORIZONTAL = 'horizontal',
+}
diff --git a/packages/apps-engine/src/definition/messages/MessageActionType.ts b/packages/apps-engine/src/definition/messages/MessageActionType.ts
new file mode 100644
index 000000000000..458716efced1
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/MessageActionType.ts
@@ -0,0 +1,3 @@
+export enum MessageActionType {
+    BUTTON = 'button',
+}
diff --git a/packages/apps-engine/src/definition/messages/MessageProcessingType.ts b/packages/apps-engine/src/definition/messages/MessageProcessingType.ts
new file mode 100644
index 000000000000..206aa8fab8dc
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/MessageProcessingType.ts
@@ -0,0 +1,4 @@
+export enum MessageProcessingType {
+    SendMessage = 'sendMessage',
+    RespondWithMessage = 'respondWithMessage',
+}
diff --git a/packages/apps-engine/src/definition/messages/index.ts b/packages/apps-engine/src/definition/messages/index.ts
new file mode 100644
index 000000000000..61bd32fb2b69
--- /dev/null
+++ b/packages/apps-engine/src/definition/messages/index.ts
@@ -0,0 +1,71 @@
+import { IMessage } from './IMessage';
+import { IMessageAction } from './IMessageAction';
+import { IMessageAttachment } from './IMessageAttachment';
+import { IMessageAttachmentAuthor } from './IMessageAttachmentAuthor';
+import { IMessageAttachmentField } from './IMessageAttachmentField';
+import { IMessageAttachmentTitle } from './IMessageAttachmentTitle';
+import { IMessageDeleteContext } from './IMessageDeleteContext';
+import { IMessageFile } from './IMessageFile';
+import { IMessageFollowContext } from './IMessageFollowContext';
+import { IMessagePinContext } from './IMessagePinContext';
+import { IMessageRaw } from './IMessageRaw';
+import { IMessageReaction, IMessageReactions, Reaction } from './IMessageReaction';
+import { IMessageReactionContext } from './IMessageReactionContext';
+import { IMessageReportContext } from './IMessageReportContext';
+import { IMessageStarContext } from './IMessageStarContext';
+import { IPostMessageDeleted } from './IPostMessageDeleted';
+import { IPostMessageFollowed } from './IPostMessageFollowed';
+import { IPostMessagePinned } from './IPostMessagePinned';
+import { IPostMessageReacted } from './IPostMessageReacted';
+import { IPostMessageReported } from './IPostMessageReported';
+import { IPostMessageSent } from './IPostMessageSent';
+import { IPostMessageStarred } from './IPostMessageStarred';
+import { IPostMessageUpdated } from './IPostMessageUpdated';
+import { IPreMessageDeletePrevent } from './IPreMessageDeletePrevent';
+import { IPreMessageSentExtend } from './IPreMessageSentExtend';
+import { IPreMessageSentModify } from './IPreMessageSentModify';
+import { IPreMessageSentPrevent } from './IPreMessageSentPrevent';
+import { IPreMessageUpdatedExtend } from './IPreMessageUpdatedExtend';
+import { IPreMessageUpdatedModify } from './IPreMessageUpdatedModify';
+import { IPreMessageUpdatedPrevent } from './IPreMessageUpdatedPrevent';
+import { MessageActionButtonsAlignment } from './MessageActionButtonsAlignment';
+import { MessageActionType } from './MessageActionType';
+import { MessageProcessingType } from './MessageProcessingType';
+
+export {
+    IMessage,
+    IMessageAttachment,
+    IMessageAttachmentAuthor,
+    IMessageAttachmentTitle,
+    IMessageAttachmentField,
+    IMessageAction,
+    IMessageFile,
+    IMessageRaw,
+    IMessageReactions,
+    IMessageReaction,
+    IPostMessageDeleted,
+    IPostMessageSent,
+    IPostMessageUpdated,
+    IPreMessageDeletePrevent,
+    IPreMessageSentExtend,
+    IPreMessageSentModify,
+    IPreMessageSentPrevent,
+    IPreMessageUpdatedExtend,
+    IPreMessageUpdatedModify,
+    IPreMessageUpdatedPrevent,
+    IPostMessageReacted,
+    IPostMessageFollowed,
+    IMessageFollowContext,
+    IMessageReactionContext,
+    IPostMessagePinned,
+    IMessagePinContext,
+    IPostMessageStarred,
+    IMessageStarContext,
+    IPostMessageReported,
+    IMessageReportContext,
+    MessageActionButtonsAlignment,
+    MessageActionType,
+    MessageProcessingType,
+    IMessageDeleteContext,
+    Reaction,
+};
diff --git a/packages/apps-engine/src/definition/metadata/AppInterface.ts b/packages/apps-engine/src/definition/metadata/AppInterface.ts
new file mode 100644
index 000000000000..9b85bdb8d275
--- /dev/null
+++ b/packages/apps-engine/src/definition/metadata/AppInterface.ts
@@ -0,0 +1,60 @@
+export enum AppInterface {
+    // Bot
+    IPostMessageSentToBot = 'IPostMessageSentToBot',
+
+    // Messages
+    IPreMessageSentPrevent = 'IPreMessageSentPrevent',
+    IPreMessageSentExtend = 'IPreMessageSentExtend',
+    IPreMessageSentModify = 'IPreMessageSentModify',
+    IPostMessageSent = 'IPostMessageSent',
+    IPreMessageDeletePrevent = 'IPreMessageDeletePrevent',
+    IPostMessageDeleted = 'IPostMessageDeleted',
+    IPreMessageUpdatedPrevent = 'IPreMessageUpdatedPrevent',
+    IPreMessageUpdatedExtend = 'IPreMessageUpdatedExtend',
+    IPreMessageUpdatedModify = 'IPreMessageUpdatedModify',
+    IPostMessageUpdated = 'IPostMessageUpdated',
+    IPostMessageReacted = 'IPostMessageReacted',
+    IPostMessageFollowed = 'IPostMessageFollowed',
+    IPostMessagePinned = 'IPostMessagePinned',
+    IPostMessageStarred = 'IPostMessageStarred',
+    IPostMessageReported = 'IPostMessageReported',
+    // Rooms
+    IPreRoomCreatePrevent = 'IPreRoomCreatePrevent',
+    IPreRoomCreateExtend = 'IPreRoomCreateExtend',
+    IPreRoomCreateModify = 'IPreRoomCreateModify',
+    IPostRoomCreate = 'IPostRoomCreate',
+    IPreRoomDeletePrevent = 'IPreRoomDeletePrevent',
+    IPostRoomDeleted = 'IPostRoomDeleted',
+    IPreRoomUserJoined = 'IPreRoomUserJoined',
+    IPostRoomUserJoined = 'IPostRoomUserJoined',
+    IPreRoomUserLeave = 'IPreRoomUserLeave',
+    IPostRoomUserLeave = 'IPostRoomUserLeave',
+    // External Components
+    IPostExternalComponentOpened = 'IPostExternalComponentOpened',
+    IPostExternalComponentClosed = 'IPostExternalComponentClosed',
+    // Blocks
+    IUIKitInteractionHandler = 'IUIKitInteractionHandler',
+    IUIKitLivechatInteractionHandler = 'IUIKitLivechatInteractionHandler',
+    // Livechat
+    IPostLivechatRoomStarted = 'IPostLivechatRoomStarted',
+    IPostLivechatRoomClosed = 'IPostLivechatRoomClosed',
+    /**
+     * @deprecated please use the AppMethod.EXECUTE_POST_LIVECHAT_ROOM_CLOSED method
+     */
+    ILivechatRoomClosedHandler = 'ILivechatRoomClosedHandler',
+    IPostLivechatAgentAssigned = 'IPostLivechatAgentAssigned',
+    IPostLivechatAgentUnassigned = 'IPostLivechatAgentUnassigned',
+    IPostLivechatRoomTransferred = 'IPostLivechatRoomTransferred',
+    IPostLivechatGuestSaved = 'IPostLivechatGuestSaved',
+    IPostLivechatRoomSaved = 'IPostLivechatRoomSaved',
+    // FileUpload
+    IPreFileUpload = 'IPreFileUpload',
+    // Email
+    IPreEmailSent = 'IPreEmailSent',
+    IPostUserCreated = 'IPostUserCreated',
+    IPostUserUpdated = 'IPostUserUpdated',
+    IPostUserDeleted = 'IPostUserDeleted',
+    IPostUserLoggedIn = 'IPostUserLoggedIn',
+    IPostUserLoggedOut = 'IPostUserLoggedOut',
+    IPostUserStatusChanged = 'IPostUserStatusChanged',
+}
diff --git a/packages/apps-engine/src/definition/metadata/AppMethod.ts b/packages/apps-engine/src/definition/metadata/AppMethod.ts
new file mode 100644
index 000000000000..71a6d0e914cc
--- /dev/null
+++ b/packages/apps-engine/src/definition/metadata/AppMethod.ts
@@ -0,0 +1,102 @@
+export enum AppMethod {
+    _API_EXECUTOR = 'apiExecutor',
+    _CONSTRUCTOR = 'constructor',
+    _COMMAND_EXECUTOR = 'executor',
+    _COMMAND_PREVIEWER = 'previewer',
+    _COMMAND_PREVIEW_EXECUTOR = 'executePreviewItem',
+    _JOB_PROCESSOR = 'jobProcessor',
+    _VIDEOCONF_GENERATE_URL = 'generateUrl',
+    _VIDEOCONF_CUSTOMIZE_URL = 'customizeUrl',
+    _VIDEOCONF_IS_CONFIGURED = 'isFullyConfigured',
+    _VIDEOCONF_NEW = 'onNewVideoConference',
+    _VIDEOCONF_CHANGED = 'onVideoConferenceChanged',
+    _VIDEOCONF_USER_JOINED = 'onUserJoin',
+    _VIDEOCONF_GET_INFO = 'getVideoConferenceInfo',
+    INITIALIZE = 'initialize',
+    ONENABLE = 'onEnable',
+    ONDISABLE = 'onDisable',
+    ONINSTALL = 'onInstall',
+    ONUNINSTALL = 'onUninstall',
+    ONUPDATE = 'onUpdate',
+    ON_PRE_SETTING_UPDATE = 'onPreSettingUpdate',
+    ONSETTINGUPDATED = 'onSettingUpdated',
+    SETSTATUS = 'setStatus',
+    // Message handlers
+    CHECKPREMESSAGESENTPREVENT = 'checkPreMessageSentPrevent',
+    EXECUTEPREMESSAGESENTPREVENT = 'executePreMessageSentPrevent',
+    CHECKPREMESSAGESENTEXTEND = 'checkPreMessageSentExtend',
+    EXECUTEPREMESSAGESENTEXTEND = 'executePreMessageSentExtend',
+    CHECKPREMESSAGESENTMODIFY = 'checkPreMessageSentModify',
+    EXECUTEPREMESSAGESENTMODIFY = 'executePreMessageSentModify',
+    CHECKPOSTMESSAGESENT = 'checkPostMessageSent',
+    EXECUTEPOSTMESSAGESENT = 'executePostMessageSent',
+
+    EXECUTEPOSTMESSAGESENTTOBOT = 'executePostMessageSentToBot',
+
+    CHECKPREMESSAGEDELETEPREVENT = 'checkPreMessageDeletePrevent',
+    EXECUTEPREMESSAGEDELETEPREVENT = 'executePreMessageDeletePrevent',
+    CHECKPOSTMESSAGEDELETED = 'checkPostMessageDeleted',
+    EXECUTEPOSTMESSAGEDELETED = 'executePostMessageDeleted',
+    CHECKPREMESSAGEUPDATEDPREVENT = 'checkPreMessageUpdatedPrevent',
+    EXECUTEPREMESSAGEUPDATEDPREVENT = 'executePreMessageUpdatedPrevent',
+    CHECKPREMESSAGEUPDATEDEXTEND = 'checkPreMessageUpdatedExtend',
+    EXECUTEPREMESSAGEUPDATEDEXTEND = 'executePreMessageUpdatedExtend',
+    CHECKPREMESSAGEUPDATEDMODIFY = 'checkPreMessageUpdatedModify',
+    EXECUTEPREMESSAGEUPDATEDMODIFY = 'executePreMessageUpdatedModify',
+    CHECKPOSTMESSAGEUPDATED = 'checkPostMessageUpdated',
+    EXECUTEPOSTMESSAGEUPDATED = 'executePostMessageUpdated',
+    EXECUTE_POST_MESSAGE_REACTED = 'executePostMessageReacted',
+    EXECUTE_POST_MESSAGE_FOLLOWED = 'executePostMessageFollowed',
+    EXECUTE_POST_MESSAGE_PINNED = 'executePostMessagePinned',
+    EXECUTE_POST_MESSAGE_STARRED = 'executePostMessageStarred',
+    EXECUTE_POST_MESSAGE_REPORTED = 'executePostMessageReported',
+    // Room handlers
+    CHECKPREROOMCREATEPREVENT = 'checkPreRoomCreatePrevent',
+    EXECUTEPREROOMCREATEPREVENT = 'executePreRoomCreatePrevent',
+    CHECKPREROOMCREATEEXTEND = 'checkPreRoomCreateExtend',
+    EXECUTEPREROOMCREATEEXTEND = 'executePreRoomCreateExtend',
+    CHECKPREROOMCREATEMODIFY = 'checkPreRoomCreateModify',
+    EXECUTEPREROOMCREATEMODIFY = 'executePreRoomCreateModify',
+    CHECKPOSTROOMCREATE = 'checkPostRoomCreate',
+    EXECUTEPOSTROOMCREATE = 'executePostRoomCreate',
+    CHECKPREROOMDELETEPREVENT = 'checkPreRoomDeletePrevent',
+    EXECUTEPREROOMDELETEPREVENT = 'executePreRoomDeletePrevent',
+    CHECKPOSTROOMDELETED = 'checkPostRoomDeleted',
+    EXECUTEPOSTROOMDELETED = 'executePostRoomDeleted',
+    EXECUTE_PRE_ROOM_USER_JOINED = 'executePreRoomUserJoined',
+    EXECUTE_POST_ROOM_USER_JOINED = 'executePostRoomUserJoined',
+    EXECUTE_PRE_ROOM_USER_LEAVE = 'executePreRoomUserLeave',
+    EXECUTE_POST_ROOM_USER_LEAVE = 'executePostRoomUserLeave',
+    // External Component handlers
+    EXECUTEPOSTEXTERNALCOMPONENTOPENED = 'executePostExternalComponentOpened',
+    EXECUTEPOSTEXTERNALCOMPONENTCLOSED = 'executePostExternalComponentClosed',
+    // Blockit handlers
+    UIKIT_BLOCK_ACTION = 'executeBlockActionHandler',
+    UIKIT_VIEW_SUBMIT = 'executeViewSubmitHandler',
+    UIKIT_VIEW_CLOSE = 'executeViewClosedHandler',
+    UIKIT_ACTION_BUTTON = 'executeActionButtonHandler',
+    UIKIT_LIVECHAT_BLOCK_ACTION = 'executeLivechatBlockActionHandler',
+    // Livechat
+    EXECUTE_POST_LIVECHAT_ROOM_STARTED = 'executePostLivechatRoomStarted',
+    /**
+     * @deprecated please use the AppMethod.EXECUTE_POST_LIVECHAT_ROOM_CLOSED method
+     */
+    EXECUTE_LIVECHAT_ROOM_CLOSED_HANDLER = 'executeLivechatRoomClosedHandler',
+    EXECUTE_POST_LIVECHAT_ROOM_CLOSED = 'executePostLivechatRoomClosed',
+    EXECUTE_POST_LIVECHAT_AGENT_ASSIGNED = 'executePostLivechatAgentAssigned',
+    EXECUTE_POST_LIVECHAT_AGENT_UNASSIGNED = 'executePostLivechatAgentUnassigned',
+    EXECUTE_POST_LIVECHAT_ROOM_TRANSFERRED = 'executePostLivechatRoomTransferred',
+    EXECUTE_POST_LIVECHAT_GUEST_SAVED = 'executePostLivechatGuestSaved',
+    EXECUTE_POST_LIVECHAT_ROOM_SAVED = 'executePostLivechatRoomSaved',
+    // FileUpload
+    EXECUTE_PRE_FILE_UPLOAD = 'executePreFileUpload',
+    // Email
+    EXECUTE_PRE_EMAIL_SENT = 'executePreEmailSent',
+    // User
+    EXECUTE_POST_USER_CREATED = 'executePostUserCreated',
+    EXECUTE_POST_USER_UPDATED = 'executePostUserUpdated',
+    EXECUTE_POST_USER_DELETED = 'executePostUserDeleted',
+    EXECUTE_POST_USER_LOGGED_IN = 'executePostUserLoggedIn',
+    EXECUTE_POST_USER_LOGGED_OUT = 'executePostUserLoggedOut',
+    EXECUTE_POST_USER_STATUS_CHANGED = 'executePostUserStatusChanged',
+}
diff --git a/packages/apps-engine/src/definition/metadata/IAppAuthorInfo.ts b/packages/apps-engine/src/definition/metadata/IAppAuthorInfo.ts
new file mode 100644
index 000000000000..8af35a853eb9
--- /dev/null
+++ b/packages/apps-engine/src/definition/metadata/IAppAuthorInfo.ts
@@ -0,0 +1,5 @@
+export interface IAppAuthorInfo {
+    name: string;
+    support: string;
+    homepage: string;
+}
diff --git a/packages/apps-engine/src/definition/metadata/IAppInfo.ts b/packages/apps-engine/src/definition/metadata/IAppInfo.ts
new file mode 100644
index 000000000000..af1d0d62fd11
--- /dev/null
+++ b/packages/apps-engine/src/definition/metadata/IAppInfo.ts
@@ -0,0 +1,20 @@
+import type { IPermission } from '../permissions/IPermission';
+import type { AppInterface } from './AppInterface';
+import type { IAppAuthorInfo } from './IAppAuthorInfo';
+
+export interface IAppInfo {
+    id: string;
+    name: string;
+    nameSlug: string;
+    version: string;
+    description: string;
+    requiredApiVersion: string;
+    author: IAppAuthorInfo;
+    classFile: string;
+    iconFile: string;
+    implements: Array<AppInterface>;
+    /** Base64 string of the App's icon. */
+    iconFileContent?: string;
+    essentials?: Array<AppInterface>;
+    permissions?: Array<IPermission>;
+}
diff --git a/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts b/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts
new file mode 100644
index 000000000000..7568488546b6
--- /dev/null
+++ b/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts
@@ -0,0 +1,22 @@
+export enum RocketChatAssociationModel {
+    ROOM = 'room',
+    DISCUSSION = 'discussion',
+    MESSAGE = 'message',
+    LIVECHAT_MESSAGE = 'livechat-message',
+    USER = 'user',
+    FILE = 'file',
+    MISC = 'misc',
+    VIDEO_CONFERENCE = 'video-conference',
+}
+
+export class RocketChatAssociationRecord {
+    constructor(private model: RocketChatAssociationModel, private id: string) {}
+
+    public getModel() {
+        return this.model;
+    }
+
+    public getID() {
+        return this.id;
+    }
+}
diff --git a/packages/apps-engine/src/definition/metadata/index.ts b/packages/apps-engine/src/definition/metadata/index.ts
new file mode 100644
index 000000000000..c6dd656a669b
--- /dev/null
+++ b/packages/apps-engine/src/definition/metadata/index.ts
@@ -0,0 +1,8 @@
+import { AppMethod } from './AppMethod';
+import { IAppAuthorInfo } from './IAppAuthorInfo';
+import { IAppInfo } from './IAppInfo';
+import { RocketChatAssociationModel, RocketChatAssociationRecord } from './RocketChatAssociations';
+
+export * from './AppInterface';
+
+export { AppMethod, IAppAuthorInfo, IAppInfo, RocketChatAssociationModel, RocketChatAssociationRecord };
diff --git a/packages/apps-engine/src/definition/oauth2/IOAuth2.ts b/packages/apps-engine/src/definition/oauth2/IOAuth2.ts
new file mode 100644
index 000000000000..d46fe4dce285
--- /dev/null
+++ b/packages/apps-engine/src/definition/oauth2/IOAuth2.ts
@@ -0,0 +1,136 @@
+import type { URL } from 'url';
+
+import type { IConfigurationExtend, IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IUser } from '../users/IUser';
+
+/**
+ * Authorization data as provided after
+ * token exchange
+ */
+export interface IAuthData {
+    /**
+     * Access token from application
+     */
+    token: string;
+    /**
+     * The token's expiration time in seconds
+     */
+    expiresAt: number;
+    /**
+     * Scope(s) authorized by the user.
+     *
+     * Format can change depending on provider, but usually
+     * when there are more than one scope, they are separated
+     * by a white-space caracter
+     */
+    scope: string;
+    /**
+     * A token that can be used to request a new access token
+     * when the current one has expired.
+     *
+     * Not all providers have a refresh token.
+     */
+    refreshToken?: string;
+}
+
+/**
+ * Options passed to the OAuth2Client object during instantiation.
+ * Describes URLs of the authorization service and optional behavior
+ * for when user responds to the authorization prompt
+ */
+export interface IOAuth2ClientOptions {
+    /**
+     * Alias for the client. This is used to identify the client's resources.
+     * It is used to avoid overwriting other clients' settings or endpoints
+     * when there are multiple.
+     */
+    alias: string;
+    /**
+     * URI to request an access token from
+     */
+    accessTokenUri: string;
+    /**
+     * URI to redirect user for them to authorize access
+     * by the application
+     */
+    authUri: string;
+    /**
+     * URI to request a refreshed access token for user
+     */
+    refreshTokenUri: string;
+    /**
+     * URI to revoke an access token for the user
+     */
+    revokeTokenUri: string;
+
+    /**
+     * Default scopes to be used when requesting access
+     */
+    defaultScopes?: Array<string>;
+    /**
+     * A function that will be executed when the auth
+     * service redirects the user back to our endpoint.
+     */
+    authorizationCallback?: (
+        token: IAuthData | undefined,
+        user: IUser,
+        read: IRead,
+        modify: IModify,
+        http: IHttp,
+        persis: IPersistence,
+    ) => Promise<{ responseContent?: string } | undefined>;
+}
+
+export interface IOAuth2Client {
+    /**
+     * This method will set all necessary configuration for the client
+     *
+     * Please note that you will need to provide the i18n strings for the
+     * settings created. For instance, if you're connecting to Github APIs
+     * and your `alias = 'github'`, you will need to provide the following
+     * translations:
+     *
+     * ```
+     * {
+     *      "github-oauth-client-id": "Client ID to connect to Github",
+     *      "github-oauth-clientsecret": "Client secret to connect to Github"
+     * }
+     * ```
+     *
+     * @param configuration - Configuration extend to set all settings and API endpoints
+     */
+    setup(configuration: IConfigurationExtend): Promise<void>;
+
+    /**
+     * Returns the authorization URL to which the user must
+     * be redirected to in order to authorize access by the
+     * application
+     *
+     * @param user - User to authenticate
+     * @param scopes - Scopes that your app needs access to
+     */
+    getUserAuthorizationUrl(user: IUser, scopes?: Array<string>): Promise<URL>;
+
+    /**
+     * Gets the token information for a specific user, if available.
+     *
+     * @param user
+     */
+    getAccessTokenForUser(user: IUser): Promise<IAuthData | undefined>;
+
+    /**
+     * Refreshes the user's access token
+     *
+     * @param user The user whose token will be refreshed
+     * @param persis Persistence object dependency
+     */
+    refreshUserAccessToken(user: IUser, persis: IPersistence): Promise<IAuthData | undefined>;
+
+    /**
+     * Revokes user's access token in the service provider
+     *
+     * @param user The user whose token will be revoked
+     * @param persis Persistence object dependency
+     */
+    revokeUserAccessToken(user: IUser, persis: IPersistence): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/oauth2/OAuth2.ts b/packages/apps-engine/src/definition/oauth2/OAuth2.ts
new file mode 100644
index 000000000000..9fe3320acc6f
--- /dev/null
+++ b/packages/apps-engine/src/definition/oauth2/OAuth2.ts
@@ -0,0 +1,15 @@
+import { OAuth2Client } from '../../server/oauth2/OAuth2Client';
+import type { App } from '../App';
+import type { IOAuth2ClientOptions } from './IOAuth2';
+
+/**
+ * Placeholder factory for OAuth2Client in case
+ * we need to pass internal stuff to it.
+ *
+ * @param app App that will connect via OAuth2
+ * @param options Options for the OAuth2Client
+ * @returns OAuth2Client instance
+ */
+export function createOAuth2Client(app: App, options: IOAuth2ClientOptions): OAuth2Client {
+    return new OAuth2Client(app, options);
+}
diff --git a/packages/apps-engine/src/definition/permissions/IPermission.ts b/packages/apps-engine/src/definition/permissions/IPermission.ts
new file mode 100644
index 000000000000..af36c2f63624
--- /dev/null
+++ b/packages/apps-engine/src/definition/permissions/IPermission.ts
@@ -0,0 +1,12 @@
+export interface IPermission {
+    name: string;
+    required?: boolean;
+}
+
+export interface INetworkingPermission extends IPermission {
+    domains: Array<string>;
+}
+
+export interface IWorkspaceTokenPermission extends IPermission {
+    scopes: Array<string>;
+}
diff --git a/packages/apps-engine/src/definition/persistence/IPersistenceItem.ts b/packages/apps-engine/src/definition/persistence/IPersistenceItem.ts
new file mode 100644
index 000000000000..80e580dc6e1d
--- /dev/null
+++ b/packages/apps-engine/src/definition/persistence/IPersistenceItem.ts
@@ -0,0 +1,7 @@
+import type { RocketChatAssociationRecord } from '../metadata';
+
+export interface IPersistenceItem {
+    appId: string;
+    data: Record<string, unknown>;
+    associations?: Array<RocketChatAssociationRecord>;
+}
diff --git a/packages/apps-engine/src/definition/persistence/index.ts b/packages/apps-engine/src/definition/persistence/index.ts
new file mode 100644
index 000000000000..22abe9e93c4d
--- /dev/null
+++ b/packages/apps-engine/src/definition/persistence/index.ts
@@ -0,0 +1 @@
+export * from './IPersistenceItem';
diff --git a/packages/apps-engine/src/definition/roles/IRole.ts b/packages/apps-engine/src/definition/roles/IRole.ts
new file mode 100644
index 000000000000..9bc4e98ac6ab
--- /dev/null
+++ b/packages/apps-engine/src/definition/roles/IRole.ts
@@ -0,0 +1,8 @@
+export interface IRole {
+    description: string;
+    mandatory2fa?: boolean;
+    name: string;
+    protected: boolean;
+    scope: 'Users' | 'Subscriptions';
+    id: string;
+}
diff --git a/packages/apps-engine/src/definition/roles/index.ts b/packages/apps-engine/src/definition/roles/index.ts
new file mode 100644
index 000000000000..25918e391cd2
--- /dev/null
+++ b/packages/apps-engine/src/definition/roles/index.ts
@@ -0,0 +1,5 @@
+/**
+ * This module exports the IRole interface for defining roles in Rocket.Chat Apps.
+ * @module definition/roles
+ */
+export * from './IRole';
diff --git a/packages/apps-engine/src/definition/rooms/IPostRoomCreate.ts b/packages/apps-engine/src/definition/rooms/IPostRoomCreate.ts
new file mode 100644
index 000000000000..f66d63fd28e4
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPostRoomCreate.ts
@@ -0,0 +1,27 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IRoom } from './IRoom';
+
+/** Handler for after a room is created. */
+export interface IPostRoomCreate {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for after the room
+     * has been created.
+     *
+     * @param room The room which was created
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @return whether to run the execute or not
+     */
+    checkPostRoomCreate?(room: IRoom, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method called *after* the room has been created.
+     *
+     * @param room The room which was created
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    executePostRoomCreate(room: IRoom, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPostRoomDeleted.ts b/packages/apps-engine/src/definition/rooms/IPostRoomDeleted.ts
new file mode 100644
index 000000000000..2fc399940111
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPostRoomDeleted.ts
@@ -0,0 +1,27 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IRoom } from './IRoom';
+
+/** Handler for after a room is deleted. */
+export interface IPostRoomDeleted {
+    /**
+     * Enables the handler to signal to the Apps framework whether
+     * this handler should actually be executed for after the room
+     * has been deleted.
+     *
+     * @param room The room which was deleted
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @return whether to run the execute or not
+     */
+    checkPostRoomDeleted?(room: IRoom, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method called *after* the room has been deleted.
+     *
+     * @param room The room which was deleted
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    executePostRoomDeleted(room: IRoom, read: IRead, http: IHttp, persistence: IPersistence): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPostRoomUserJoined.ts b/packages/apps-engine/src/definition/rooms/IPostRoomUserJoined.ts
new file mode 100644
index 000000000000..375802632757
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPostRoomUserJoined.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IRoomUserJoinedContext } from './IRoomUserJoinedContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostRoomUserJoined`
+ * event
+ *
+ * This event is triggered after an user succcessfully joined
+ * a room.
+ *
+ * This event does not allow an app to prevent any action from
+ * happening. For that, see its "pre counterpart(s)":
+ *
+ * - IPreRoomUserJoined
+ */
+export interface IPostRoomUserJoined {
+    executePostRoomUserJoined(context: IRoomUserJoinedContext, read: IRead, http: IHttp, persistence: IPersistence, modify?: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPostRoomUserLeave.ts b/packages/apps-engine/src/definition/rooms/IPostRoomUserLeave.ts
new file mode 100644
index 000000000000..2a18368ff637
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPostRoomUserLeave.ts
@@ -0,0 +1,19 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IRoomUserLeaveContext } from './IRoomUserLeaveContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostRoomUserLeave`
+ * event
+ *
+ * This event is triggered after an user succcessfully leaves
+ * a room.
+ *
+ * This event does not allow an app to prevent any action from
+ * happening. For that, see its "pre counterpart(s)":
+ *
+ * - IPreRoomUserLeave
+ */
+export interface IPostRoomUserLeave {
+    executePostRoomUserLeave(context: IRoomUserLeaveContext, read: IRead, http: IHttp, persistence: IPersistence, modify?: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPreRoomCreateExtend.ts b/packages/apps-engine/src/definition/rooms/IPreRoomCreateExtend.ts
new file mode 100644
index 000000000000..767889bafca3
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPreRoomCreateExtend.ts
@@ -0,0 +1,28 @@
+import type { IHttp, IPersistence, IRead, IRoomExtender } from '../accessors';
+import type { IRoom } from './IRoom';
+
+/** Handler called when an App wants to enrich a room. */
+export interface IPreRoomCreateExtend {
+    /**
+     * Checks whether the handler actually shall execute.
+     * This method can basically implement a filter.
+     *
+     * @param room The room which was being created
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @return whether to run the execute or not
+     */
+    checkPreRoomCreateExtend?(room: IRoom, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a room from being created.
+     *
+     * @param room The room about to be created
+     * @param extend An accessor for modifying the room non-destructively
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns the resulting room
+     */
+    executePreRoomCreateExtend(room: IRoom, extend: IRoomExtender, read: IRead, http: IHttp, persistence: IPersistence): Promise<IRoom>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPreRoomCreateModify.ts b/packages/apps-engine/src/definition/rooms/IPreRoomCreateModify.ts
new file mode 100644
index 000000000000..20dced715548
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPreRoomCreateModify.ts
@@ -0,0 +1,28 @@
+import type { IHttp, IPersistence, IRead, IRoomBuilder } from '../accessors';
+import type { IRoom } from './IRoom';
+
+/** Handler called when an App wants to modify a room in a destructive way. */
+export interface IPreRoomCreateModify {
+    /**
+     * Checks whether the handler actually shall execute.
+     * This method can basically implement a filter.
+     *
+     * @param room The room which was being created
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @return whether to run the execute or not
+     */
+    checkPreRoomCreateModify?(room: IRoom, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a room from being created.
+     *
+     * @param room The room about to be created
+     * @param extend The builder for modifying the room via methods
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns the resulting room
+     */
+    executePreRoomCreateModify(room: IRoom, builder: IRoomBuilder, read: IRead, http: IHttp, persistence: IPersistence): Promise<IRoom>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPreRoomCreatePrevent.ts b/packages/apps-engine/src/definition/rooms/IPreRoomCreatePrevent.ts
new file mode 100644
index 000000000000..49fb25187954
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPreRoomCreatePrevent.ts
@@ -0,0 +1,26 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IRoom } from './IRoom';
+
+export interface IPreRoomCreatePrevent {
+    /**
+     * Checks whether the handler actually shall execute.
+     * This method can basically implement a filter.
+     *
+     * @param room The room which was being created
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @return whether to run the execute or not
+     */
+    checkPreRoomCreatePrevent?(room: IRoom, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a room from being created.
+     *
+     * @param room The room about to be created
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns whether to prevent the room from being created
+     */
+    executePreRoomCreatePrevent(room: IRoom, read: IRead, http: IHttp, persistence: IPersistence): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPreRoomDeletePrevent.ts b/packages/apps-engine/src/definition/rooms/IPreRoomDeletePrevent.ts
new file mode 100644
index 000000000000..619c4160b1f0
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPreRoomDeletePrevent.ts
@@ -0,0 +1,26 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IRoom } from './IRoom';
+
+export interface IPreRoomDeletePrevent {
+    /**
+     * Checks whether the handler actually shall execute.
+     * This method can basically implement a filter.
+     *
+     * @param room The room which was being deleted
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @return whether to run the execute or not
+     */
+    checkPreRoomDeletePrevent?(room: IRoom, read: IRead, http: IHttp): Promise<boolean>;
+
+    /**
+     * Method which is to be used to prevent a room from being deleted.
+     *
+     * @param room The room about to be deleted
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence storage
+     * @returns whether to prevent the room from being deleted
+     */
+    executePreRoomDeletePrevent(room: IRoom, read: IRead, http: IHttp, persistence: IPersistence): Promise<boolean>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPreRoomUserJoined.ts b/packages/apps-engine/src/definition/rooms/IPreRoomUserJoined.ts
new file mode 100644
index 000000000000..868afa560711
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPreRoomUserJoined.ts
@@ -0,0 +1,18 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IRoomUserJoinedContext } from './IRoomUserJoinedContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPreRoomUserJoined`
+ * event
+ *
+ * This event is triggered prior to an user succcessfully
+ * joining a room. To prevent the user from executing
+ * such action, an app should throw the `UserNotAllowedException`.
+ *
+ * This event is not triggered before a room has been created. For that,
+ * check the `IPreRoomCreate` events
+ */
+export interface IPreRoomUserJoined {
+    executePreRoomUserJoined(context: IRoomUserJoinedContext, read: IRead, http: IHttp, persistence: IPersistence): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IPreRoomUserLeave.ts b/packages/apps-engine/src/definition/rooms/IPreRoomUserLeave.ts
new file mode 100644
index 000000000000..64848b088463
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IPreRoomUserLeave.ts
@@ -0,0 +1,18 @@
+import type { IHttp, IPersistence, IRead } from '../accessors';
+import type { IRoomUserLeaveContext } from './IRoomUserLeaveContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPreRoomUserLeave`
+ * event
+ *
+ * This event is triggered prior to an user succcessfully
+ * leaving a room. To prevent the user from executing
+ * such action, an app should throw the `UserNotAllowedException`.
+ *
+ * This event is not triggered before a room has been created. For that,
+ * check the `IPreRoomCreate` events
+ */
+export interface IPreRoomUserLeave {
+    executePreRoomUserLeave(context: IRoomUserLeaveContext, read: IRead, http: IHttp, persistence: IPersistence): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IRoom.ts b/packages/apps-engine/src/definition/rooms/IRoom.ts
new file mode 100644
index 000000000000..c62f5d7f093f
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IRoom.ts
@@ -0,0 +1,26 @@
+import type { IUser } from '../users';
+import type { RoomType } from './RoomType';
+
+export interface IRoom {
+    id: string;
+    displayName?: string;
+    slugifiedName: string;
+    type: RoomType;
+    creator: IUser;
+    /**
+     * @deprecated usernames will be removed on version 2.0.0
+     */
+    usernames: Array<string>;
+    userIds?: Array<string>;
+    isDefault?: boolean;
+    isReadOnly?: boolean;
+    displaySystemMessages?: boolean;
+    messageCount?: number;
+    createdAt?: Date;
+    updatedAt?: Date;
+    lastModifiedAt?: Date;
+    description?: string;
+    customFields?: { [key: string]: any };
+    parentRoom?: IRoom;
+    livechatData?: { [key: string]: any };
+}
diff --git a/packages/apps-engine/src/definition/rooms/IRoomUserJoinedContext.ts b/packages/apps-engine/src/definition/rooms/IRoomUserJoinedContext.ts
new file mode 100644
index 000000000000..022e6b1b86c3
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IRoomUserJoinedContext.ts
@@ -0,0 +1,23 @@
+import type { IUser } from '../users';
+import type { IRoom } from './IRoom';
+
+/**
+ * The context of execution for the following events:
+ * - IPreRoomUserJoined
+ * - IPostRoomUserJoined
+ */
+export interface IRoomUserJoinedContext {
+    /**
+     * The user that is being added to the room
+     */
+    joiningUser: IUser;
+    /**
+     * The room to which the user is being added
+     */
+    room: IRoom;
+    /**
+     * The user that has invited `joiningUser` to `room`,
+     * if any.
+     */
+    inviter?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/rooms/IRoomUserLeaveContext.ts b/packages/apps-engine/src/definition/rooms/IRoomUserLeaveContext.ts
new file mode 100644
index 000000000000..9fe153bc8e0a
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/IRoomUserLeaveContext.ts
@@ -0,0 +1,23 @@
+import type { IUser } from '../users';
+import type { IRoom } from './IRoom';
+
+/**
+ * The context of execution for the following events:
+ * - IPreRoomUserLeave
+ * - IPostRoomUserLeave
+ */
+export interface IRoomUserLeaveContext {
+    /**
+     * The user that is leaving the room
+     */
+    leavingUser: IUser;
+    /**
+     * The room that the user is leaving
+     */
+    room: IRoom;
+
+    /**
+     * The user that removed the room member
+     */
+    removedBy?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/rooms/RoomType.ts b/packages/apps-engine/src/definition/rooms/RoomType.ts
new file mode 100644
index 000000000000..5ad738ac144a
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/RoomType.ts
@@ -0,0 +1,6 @@
+export enum RoomType {
+    CHANNEL = 'c',
+    PRIVATE_GROUP = 'p',
+    DIRECT_MESSAGE = 'd',
+    LIVE_CHAT = 'l',
+}
diff --git a/packages/apps-engine/src/definition/rooms/index.ts b/packages/apps-engine/src/definition/rooms/index.ts
new file mode 100644
index 000000000000..be0829d09ffc
--- /dev/null
+++ b/packages/apps-engine/src/definition/rooms/index.ts
@@ -0,0 +1,17 @@
+import { IPostRoomCreate } from './IPostRoomCreate';
+import { IPostRoomDeleted } from './IPostRoomDeleted';
+import { IPreRoomCreateExtend } from './IPreRoomCreateExtend';
+import { IPreRoomCreateModify } from './IPreRoomCreateModify';
+import { IPreRoomCreatePrevent } from './IPreRoomCreatePrevent';
+import { IPreRoomDeletePrevent } from './IPreRoomDeletePrevent';
+import { IRoom } from './IRoom';
+import { RoomType } from './RoomType';
+
+export { IRoom, RoomType, IPostRoomCreate, IPostRoomDeleted, IPreRoomCreateExtend, IPreRoomCreateModify, IPreRoomCreatePrevent, IPreRoomDeletePrevent };
+
+export * from './IPreRoomUserJoined';
+export * from './IPostRoomUserJoined';
+export * from './IRoomUserJoinedContext';
+export * from './IPreRoomUserLeave';
+export * from './IPostRoomUserLeave';
+export * from './IRoomUserLeaveContext';
diff --git a/packages/apps-engine/src/definition/scheduler/IOnetimeSchedule.ts b/packages/apps-engine/src/definition/scheduler/IOnetimeSchedule.ts
new file mode 100644
index 000000000000..f4235f209755
--- /dev/null
+++ b/packages/apps-engine/src/definition/scheduler/IOnetimeSchedule.ts
@@ -0,0 +1,13 @@
+/** Represents a job that runs only once */
+export interface IOnetimeSchedule {
+    /** The schedule's identifier */
+    id: string;
+    /**
+     * The time at which the job will be run.
+     * Values can be a [human-interval](https://github.com/agenda/human-interval) string
+     * or a `Date` object.
+     */
+    when: string | Date;
+    /** An object that can be passed to the processor with custom data */
+    data?: object;
+}
diff --git a/packages/apps-engine/src/definition/scheduler/IProcessor.ts b/packages/apps-engine/src/definition/scheduler/IProcessor.ts
new file mode 100644
index 000000000000..0533805f762f
--- /dev/null
+++ b/packages/apps-engine/src/definition/scheduler/IProcessor.ts
@@ -0,0 +1,45 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+
+/** Represents a processor that is used by the scheduler methods */
+export interface IProcessor {
+    /** The processor's identifier */
+    id: string;
+    /** If provided, the processor will be configured with the setting as soon as it gets registered */
+    startupSetting?: StartupSetting;
+    /** The function that will be run on a given scheudle */
+    processor(jobContext: IJobContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<void>;
+}
+
+/** The `data` object provided to the processor during the registering process */
+export interface IJobContext {
+    [key: string]: any;
+}
+
+type StartupSetting = IOnetimeStartup | IRecurringStartup;
+
+/**
+ * Processor setting for running once after being registered
+ */
+export interface IOnetimeStartup {
+    type: StartupType.ONETIME;
+    when: string | Date;
+    data?: object;
+}
+
+/**
+ * Processor setting for running recurringly after being registered
+ */
+export interface IRecurringStartup {
+    type: StartupType.RECURRING;
+    interval: string | number;
+    skipImmediate?: boolean;
+    data?: object;
+}
+
+/**
+ * Jobs' startup types
+ */
+export enum StartupType {
+    ONETIME = 'onetime',
+    RECURRING = 'recurring',
+}
diff --git a/packages/apps-engine/src/definition/scheduler/IRecurringSchedule.ts b/packages/apps-engine/src/definition/scheduler/IRecurringSchedule.ts
new file mode 100644
index 000000000000..31e3e422e49a
--- /dev/null
+++ b/packages/apps-engine/src/definition/scheduler/IRecurringSchedule.ts
@@ -0,0 +1,17 @@
+/** Represents a job that runs recurrently */
+export interface IRecurringSchedule {
+    /** The schedule's identifier */
+    id: string;
+    /**
+     * The interval at which the job will be run.
+     * Values can be a cron string, a [human-interval](https://github.com/agenda/human-interval) string
+     * or a number.
+     */
+    interval: string | number;
+    /**
+     * Whether the recurring job should start immediately or wait for the interval
+     */
+    skipImmediate?: boolean;
+    /** An object that can be passed to the processor with custom data */
+    data?: object;
+}
diff --git a/packages/apps-engine/src/definition/scheduler/index.ts b/packages/apps-engine/src/definition/scheduler/index.ts
new file mode 100644
index 000000000000..25c2bd3ccc65
--- /dev/null
+++ b/packages/apps-engine/src/definition/scheduler/index.ts
@@ -0,0 +1,3 @@
+export { IOnetimeSchedule } from './IOnetimeSchedule';
+export { IProcessor, IJobContext, IOnetimeStartup, IRecurringStartup, StartupType } from './IProcessor';
+export { IRecurringSchedule } from './IRecurringSchedule';
diff --git a/packages/apps-engine/src/definition/settings/ISetting.ts b/packages/apps-engine/src/definition/settings/ISetting.ts
new file mode 100644
index 000000000000..a80cd447c30b
--- /dev/null
+++ b/packages/apps-engine/src/definition/settings/ISetting.ts
@@ -0,0 +1,47 @@
+import type { SettingType } from './SettingType';
+
+export interface ISetting {
+    /** The id of this setting. */
+    id: string;
+    /** Type of setting this is. */
+    type: SettingType;
+    /** What is the default value (allows a reset button). */
+    packageValue: any;
+    /** Will be the value of this setting. If nothing is set here, then the "packageValue" will be used. */
+    /**
+     * If the setting type is ROOM_PICK, the value will be an array of room ids.
+     * @returns ```js
+     * [{_id: 'rid1'}, {_id: 'rid2'}]
+     * ```
+     */
+    value?: any;
+    /** Whether this setting is required or not. */
+    required: boolean;
+    /** Whether this setting is a public setting or not - administrators can see ones which are not public but users can't. */
+    public: boolean;
+    /** Whether this setting should be hidden from the user/administrator's eyes (can't be hidden and required). */
+    hidden?: boolean;
+    /** The selectable values when the setting's type is "select" or "multiSelect". */
+    values?: Array<ISettingSelectValue>;
+    /** Whether the **string** type is several lines or just one line. */
+    multiline?: boolean;
+    /** The name of the section where to put this setting under. */
+    section?: string;
+    /** Name of the setting in the form of a i18n string. */
+    i18nLabel: string;
+    /** Description of the setting in the form of a i18n string. */
+    i18nDescription?: string;
+    /** An optional alert messages which is shown to the user on this setting. */
+    i18nAlert?: string;
+    /** An optional placeholder which will be shown in the form input field, should be an i18n string. */
+    i18nPlaceholder?: string;
+    /** Date in which this setting was created. */
+    createdAt?: Date;
+    /** The last time the setting was updated at. */
+    updatedAt?: Date;
+}
+
+export interface ISettingSelectValue {
+    key: string;
+    i18nLabel: string;
+}
diff --git a/packages/apps-engine/src/definition/settings/ISettingUpdateContext.ts b/packages/apps-engine/src/definition/settings/ISettingUpdateContext.ts
new file mode 100644
index 000000000000..9610a0c0fb0d
--- /dev/null
+++ b/packages/apps-engine/src/definition/settings/ISettingUpdateContext.ts
@@ -0,0 +1,6 @@
+import type { ISetting } from './ISetting';
+
+export interface ISettingUpdateContext {
+    oldSetting: ISetting;
+    newSetting: ISetting;
+}
diff --git a/packages/apps-engine/src/definition/settings/SettingType.ts b/packages/apps-engine/src/definition/settings/SettingType.ts
new file mode 100644
index 000000000000..95e3bfc7ade6
--- /dev/null
+++ b/packages/apps-engine/src/definition/settings/SettingType.ts
@@ -0,0 +1,14 @@
+export enum SettingType {
+    BOOLEAN = 'boolean',
+    CODE = 'code',
+    COLOR = 'color',
+    FONT = 'font',
+    NUMBER = 'int',
+    SELECT = 'select',
+    STRING = 'string',
+    MULTI_SELECT = 'multiSelect',
+    // Renders an input of type 'password' in the form. IMPORTANT - the value will NOT be encrypted
+    // it will be treated as a password just on the screen
+    PASSWORD = 'password',
+    ROOM_PICK = 'roomPick',
+}
diff --git a/packages/apps-engine/src/definition/settings/index.ts b/packages/apps-engine/src/definition/settings/index.ts
new file mode 100644
index 000000000000..a388d71f7ec6
--- /dev/null
+++ b/packages/apps-engine/src/definition/settings/index.ts
@@ -0,0 +1,4 @@
+import { ISetting, ISettingSelectValue } from './ISetting';
+import { SettingType } from './SettingType';
+
+export { ISetting, ISettingSelectValue, SettingType };
diff --git a/packages/apps-engine/src/definition/slashcommands/ISlashCommand.ts b/packages/apps-engine/src/definition/slashcommands/ISlashCommand.ts
new file mode 100644
index 000000000000..5e24f1d7a1cb
--- /dev/null
+++ b/packages/apps-engine/src/definition/slashcommands/ISlashCommand.ts
@@ -0,0 +1,41 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { ISlashCommandPreview, ISlashCommandPreviewItem } from './ISlashCommandPreview';
+import type { SlashCommandContext } from './SlashCommandContext';
+
+/**
+ * Represents a slash command that is being provided.
+ */
+export interface ISlashCommand {
+    /** The value which determines what the user types. */
+    command: string;
+    /** Example of the parameters or an i18n string. */
+    i18nParamsExample: string;
+    /** i18n string for the description of the command. */
+    i18nDescription: string;
+    /** Optional. Permission value required for the user to have to see/use it. */
+    permission?: string;
+    /** Lets the clients know that this command does provide preview results. */
+    providesPreview: boolean;
+    /**
+     * The function which gets called when a user enters the command.
+     *
+     * *Note*: This will not get called if a preview is defined and
+     * presented to the user and the user interacts with the preview.
+     * When that happens, the `executePreviewItem` function will be called.
+     */
+    executor(context: SlashCommandContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<void>;
+    /**
+     * The function which gets called whenever a user starts typing the command and the `providesPreview` is set to true.
+     * Max amount returned to the client is 10 and no more, period.
+     */
+    previewer?(context: SlashCommandContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<ISlashCommandPreview>;
+    /** The function which gets executed whenever a user selects a preview item. */
+    executePreviewItem?(
+        item: ISlashCommandPreviewItem,
+        context: SlashCommandContext,
+        read: IRead,
+        modify: IModify,
+        http: IHttp,
+        persis: IPersistence,
+    ): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/slashcommands/ISlashCommandPreview.ts b/packages/apps-engine/src/definition/slashcommands/ISlashCommandPreview.ts
new file mode 100644
index 000000000000..877023f22a29
--- /dev/null
+++ b/packages/apps-engine/src/definition/slashcommands/ISlashCommandPreview.ts
@@ -0,0 +1,28 @@
+export interface ISlashCommandPreview {
+    /** The i18n string of the title of the preview. */
+    i18nTitle: string;
+    /** The preview items to show, it can be an empty array. */
+    items: Array<ISlashCommandPreviewItem>;
+}
+
+export interface ISlashCommandPreviewItem {
+    /** An internal id value of the preview item. */
+    id: string;
+    /** The type of preview item this is. */
+    type: SlashCommandPreviewItemType;
+    /** The value of this preview item, url or text (could even be base64). */
+    value: string;
+}
+
+export enum SlashCommandPreviewItemType {
+    /** Represents image preview. Could be `png`, `gif`, etc. */
+    IMAGE = 'image',
+    /** Represents video preview. */
+    VIDEO = 'video',
+    /** Represents audio preview. */
+    AUDIO = 'audio',
+    /** Represents text preview. */
+    TEXT = 'text',
+    /** As the name says, an unknown type (try not to use). */
+    OTHER = 'other',
+}
diff --git a/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts b/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts
new file mode 100644
index 000000000000..c5d96e613f4d
--- /dev/null
+++ b/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts
@@ -0,0 +1,33 @@
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+
+/**
+ * Represents  the slash command's context when a user
+ * executes a slash command.
+ */
+export class SlashCommandContext {
+    constructor(private sender: IUser, private room: IRoom, private params: Array<string>, private threadId?: string, private triggerId?: string) {}
+
+    /** The user who sent the command. */
+    public getSender(): IUser {
+        return this.sender;
+    }
+
+    /** The room where the command was sent in. */
+    public getRoom(): IRoom {
+        return this.room;
+    }
+
+    /** The arguments passed into the command. */
+    public getArguments(): Array<string> {
+        return this.params;
+    }
+
+    public getThreadId(): string | undefined {
+        return this.threadId;
+    }
+
+    public getTriggerId(): string | undefined {
+        return this.triggerId;
+    }
+}
diff --git a/packages/apps-engine/src/definition/slashcommands/index.ts b/packages/apps-engine/src/definition/slashcommands/index.ts
new file mode 100644
index 000000000000..d3d431367a79
--- /dev/null
+++ b/packages/apps-engine/src/definition/slashcommands/index.ts
@@ -0,0 +1,5 @@
+import { ISlashCommand } from './ISlashCommand';
+import { ISlashCommandPreview, ISlashCommandPreviewItem, SlashCommandPreviewItemType } from './ISlashCommandPreview';
+import { SlashCommandContext } from './SlashCommandContext';
+
+export { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem, SlashCommandContext, SlashCommandPreviewItemType };
diff --git a/packages/apps-engine/src/definition/ui/IUIActionButtonDescriptor.ts b/packages/apps-engine/src/definition/ui/IUIActionButtonDescriptor.ts
new file mode 100644
index 000000000000..c17bbdb60de9
--- /dev/null
+++ b/packages/apps-engine/src/definition/ui/IUIActionButtonDescriptor.ts
@@ -0,0 +1,41 @@
+import type { UIActionButtonContext } from './UIActionButtonContext';
+
+export enum RoomTypeFilter {
+    PUBLIC_CHANNEL = 'public_channel',
+    PRIVATE_CHANNEL = 'private_channel',
+    PUBLIC_TEAM = 'public_team',
+    PRIVATE_TEAM = 'private_team',
+    PUBLIC_DISCUSSION = 'public_discussion',
+    PRIVATE_DISCUSSION = 'private_discussion',
+    DIRECT = 'direct',
+    DIRECT_MULTIPLE = 'direct_multiple',
+    LIVE_CHAT = 'livechat',
+}
+
+export enum MessageActionContext {
+    MESSAGE = 'message',
+    MESSAGE_MOBILE = 'message-mobile',
+    THREADS = 'threads',
+    STARRED = 'starred',
+}
+
+export interface IUActionButtonWhen {
+    roomTypes?: Array<RoomTypeFilter>;
+    messageActionContext?: Array<MessageActionContext>;
+    hasOnePermission?: Array<string>;
+    hasAllPermissions?: Array<string>;
+    hasOneRole?: Array<string>;
+    hasAllRoles?: Array<string>;
+}
+
+export interface IUIActionButtonDescriptor {
+    actionId: string;
+    context: UIActionButtonContext;
+    labelI18n: string;
+    variant?: 'danger';
+    when?: IUActionButtonWhen;
+    category?: 'default' | 'ai';
+}
+export interface IUIActionButton extends IUIActionButtonDescriptor {
+    appId: string;
+}
diff --git a/packages/apps-engine/src/definition/ui/UIActionButtonContext.ts b/packages/apps-engine/src/definition/ui/UIActionButtonContext.ts
new file mode 100644
index 000000000000..34958a8a9a32
--- /dev/null
+++ b/packages/apps-engine/src/definition/ui/UIActionButtonContext.ts
@@ -0,0 +1,7 @@
+export enum UIActionButtonContext {
+    MESSAGE_ACTION = 'messageAction',
+    ROOM_ACTION = 'roomAction',
+    MESSAGE_BOX_ACTION = 'messageBoxAction',
+    USER_DROPDOWN_ACTION = 'userDropdownAction',
+    ROOM_SIDEBAR_ACTION = 'roomSideBarAction',
+}
diff --git a/packages/apps-engine/src/definition/ui/index.ts b/packages/apps-engine/src/definition/ui/index.ts
new file mode 100644
index 000000000000..fcb3d2f4f9a5
--- /dev/null
+++ b/packages/apps-engine/src/definition/ui/index.ts
@@ -0,0 +1,2 @@
+export * from './IUIActionButtonDescriptor';
+export * from './UIActionButtonContext';
diff --git a/packages/apps-engine/src/definition/uikit/IUIKitActionHandler.ts b/packages/apps-engine/src/definition/uikit/IUIKitActionHandler.ts
new file mode 100644
index 000000000000..6993f840b88d
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/IUIKitActionHandler.ts
@@ -0,0 +1,77 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUIKitResponse } from './IUIKitInteractionType';
+import type {
+    UIKitActionButtonInteractionContext,
+    UIKitBlockInteractionContext,
+    UIKitViewCloseInteractionContext,
+    UIKitViewSubmitInteractionContext,
+} from './UIKitInteractionContext';
+
+/** Handler for after a message is sent. */
+export interface IUIKitInteractionHandler {
+    /**
+     * Method called when a block action is invoked.
+     *
+     * @param context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    [AppMethod.UIKIT_BLOCK_ACTION]?(
+        context: UIKitBlockInteractionContext,
+        read: IRead,
+        http: IHttp,
+        persistence: IPersistence,
+        modify: IModify,
+    ): Promise<IUIKitResponse>;
+
+    /**
+     * Method called when a modal is submitted.
+     *
+     * @param context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    [AppMethod.UIKIT_VIEW_SUBMIT]?(
+        context: UIKitViewSubmitInteractionContext,
+        read: IRead,
+        http: IHttp,
+        persistence: IPersistence,
+        modify: IModify,
+    ): Promise<IUIKitResponse>;
+
+    /**
+     * Method called when a modal is closed.
+     *
+     * @param context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    [AppMethod.UIKIT_VIEW_CLOSE]?(
+        context: UIKitViewCloseInteractionContext,
+        read: IRead,
+        http: IHttp,
+        persistence: IPersistence,
+        modify: IModify,
+    ): Promise<IUIKitResponse>;
+
+    /**
+     * Method called when an action button is clicked.
+     *
+     * @param context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     * @param modify An accessor to the App's persistence
+     */
+    [AppMethod.UIKIT_ACTION_BUTTON]?(
+        context: UIKitActionButtonInteractionContext,
+        read: IRead,
+        http: IHttp,
+        persistence: IPersistence,
+        modify: IModify,
+    ): Promise<IUIKitResponse>;
+}
diff --git a/packages/apps-engine/src/definition/uikit/IUIKitIncomingInteraction.ts b/packages/apps-engine/src/definition/uikit/IUIKitIncomingInteraction.ts
new file mode 100644
index 000000000000..6fa509552a53
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/IUIKitIncomingInteraction.ts
@@ -0,0 +1,28 @@
+import type { IMessage } from '../messages';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+import type { IUIKitIncomingInteractionActionButton } from './IUIKitIncomingInteractionActionButton';
+import type { IUIKitIncomingInteractionMessageContainer, IUIKitIncomingInteractionModalContainer } from './UIKitIncomingInteractionContainer';
+
+export enum UIKitIncomingInteractionType {
+    BLOCK = 'blockAction',
+    VIEW_SUBMIT = 'viewSubmit',
+    VIEW_CLOSED = 'viewClosed',
+    ACTION_BUTTON = 'actionButton',
+}
+
+/** @deprecated use UIKitIncomingInteraction instead */
+
+export interface IUIKitIncomingInteraction {
+    type: 'blockAction' | 'viewSubmit' | 'viewClosed';
+    container: IUIKitIncomingInteractionModalContainer | IUIKitIncomingInteractionMessageContainer;
+    user: IUser;
+    appId: string;
+    payload: object;
+    actionId?: string;
+    triggerId?: string;
+    room?: IRoom;
+    message?: IMessage;
+}
+
+export type UIKitIncomingInteraction = IUIKitIncomingInteraction | IUIKitIncomingInteractionActionButton;
diff --git a/packages/apps-engine/src/definition/uikit/IUIKitIncomingInteractionActionButton.ts b/packages/apps-engine/src/definition/uikit/IUIKitIncomingInteractionActionButton.ts
new file mode 100644
index 000000000000..beea7181b50b
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/IUIKitIncomingInteractionActionButton.ts
@@ -0,0 +1,78 @@
+import type { IMessage } from '../messages';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+
+interface IUIKitIncomingInteractionActionButtonBase {
+    triggerId: string;
+    type: 'actionButton';
+
+    user: IUser;
+    actionId: string;
+    appId: string;
+
+    payload: Record<string, any>;
+}
+
+interface IUIKitIncomingInteractionActionButtonMessageBox {
+    triggerId: string;
+
+    type: 'actionButton';
+    room: IRoom;
+    tmid?: string;
+
+    user: IUser;
+
+    actionId: string;
+    appId: string;
+
+    payload: {
+        context: 'messageBoxAction';
+        message?: string;
+    };
+}
+
+export const isUIKitIncomingInteractionActionButtonMessageBox = (
+    interaction: IUIKitIncomingInteractionActionButtonBase,
+): interaction is IUIKitIncomingInteractionActionButtonMessageBox => {
+    return interaction.payload.context === 'messageBoxAction';
+};
+
+interface IUIKitIncomingInteractionActionButtonMessage extends IUIKitIncomingInteractionActionButtonBase {
+    room: IRoom;
+    tmid?: string;
+
+    message: IMessage;
+
+    payload: {
+        context: 'messageAction';
+    };
+}
+
+interface IUIKitIncomingInteractionActionButtonRoomSidebar extends IUIKitIncomingInteractionActionButtonBase {
+    room: IRoom;
+
+    payload: {
+        context: 'roomSideBarAction';
+    };
+}
+
+interface IUIKitIncomingInteractionActionButtonRoom extends IUIKitIncomingInteractionActionButtonBase {
+    room: IRoom;
+
+    payload: {
+        context: 'roomAction';
+    };
+}
+
+interface IUIKitIncomingInteractionActionButtonUserDropdown extends IUIKitIncomingInteractionActionButtonBase {
+    payload: {
+        context: 'userDropdownAction';
+    };
+}
+
+export type IUIKitIncomingInteractionActionButton =
+    | IUIKitIncomingInteractionActionButtonMessageBox
+    | IUIKitIncomingInteractionActionButtonMessage
+    | IUIKitIncomingInteractionActionButtonRoomSidebar
+    | IUIKitIncomingInteractionActionButtonRoom
+    | IUIKitIncomingInteractionActionButtonUserDropdown;
diff --git a/packages/apps-engine/src/definition/uikit/IUIKitInteractionType.ts b/packages/apps-engine/src/definition/uikit/IUIKitInteractionType.ts
new file mode 100644
index 000000000000..e4cc09a8ce0f
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/IUIKitInteractionType.ts
@@ -0,0 +1,41 @@
+import type { IUIKitSurface } from './IUIKitSurface';
+
+export enum UIKitInteractionType {
+    MODAL_OPEN = 'modal.open',
+    MODAL_CLOSE = 'modal.close',
+    MODAL_UPDATE = 'modal.update',
+    CONTEXTUAL_BAR_OPEN = 'contextual_bar.open',
+    CONTEXTUAL_BAR_CLOSE = 'contextual_bar.close',
+    CONTEXTUAL_BAR_UPDATE = 'contextual_bar.update',
+    ERRORS = 'errors',
+}
+
+export interface IUIKitResponse {
+    success: boolean;
+}
+
+export interface IUIKitInteraction {
+    type: UIKitInteractionType;
+    triggerId: string;
+    appId: string;
+}
+
+export interface IUIKitErrorInteraction extends IUIKitInteraction {
+    type: UIKitInteractionType.ERRORS;
+    viewId: string;
+    errors: { [field: string]: string };
+}
+
+export interface IUIKitModalInteraction extends IUIKitInteraction {
+    type: UIKitInteractionType.MODAL_OPEN | UIKitInteractionType.MODAL_UPDATE | UIKitInteractionType.MODAL_CLOSE;
+    view: IUIKitSurface;
+}
+
+export interface IUIKitContextualBarInteraction extends IUIKitInteraction {
+    type: UIKitInteractionType.CONTEXTUAL_BAR_OPEN | UIKitInteractionType.CONTEXTUAL_BAR_UPDATE | UIKitInteractionType.CONTEXTUAL_BAR_CLOSE;
+    view: IUIKitSurface;
+}
+
+export interface IUIKitModalResponse extends IUIKitModalInteraction, IUIKitResponse {}
+export interface IUIKitContextualBarResponse extends IUIKitContextualBarInteraction, IUIKitResponse {}
+export interface IUIKitErrorResponse extends IUIKitErrorInteraction, IUIKitResponse {}
diff --git a/packages/apps-engine/src/definition/uikit/IUIKitSurface.ts b/packages/apps-engine/src/definition/uikit/IUIKitSurface.ts
new file mode 100644
index 000000000000..61bd1bf33a06
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/IUIKitSurface.ts
@@ -0,0 +1,22 @@
+import type { ButtonElement, LayoutBlock, TextObject } from '@rocket.chat/ui-kit';
+
+import type { IBlock, IButtonElement, ITextObject } from './blocks';
+
+export enum UIKitSurfaceType {
+    MODAL = 'modal',
+    HOME = 'home',
+    CONTEXTUAL_BAR = 'contextualBar',
+}
+
+export interface IUIKitSurface {
+    appId: string;
+    id: string;
+    type: UIKitSurfaceType;
+    title: ITextObject | TextObject;
+    blocks: Array<IBlock | LayoutBlock>;
+    close?: IButtonElement | ButtonElement;
+    submit?: IButtonElement | ButtonElement;
+    state?: object;
+    clearOnClose?: boolean;
+    notifyOnClose?: boolean;
+}
diff --git a/packages/apps-engine/src/definition/uikit/IUIKitView.ts b/packages/apps-engine/src/definition/uikit/IUIKitView.ts
new file mode 100644
index 000000000000..4c9b5c524544
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/IUIKitView.ts
@@ -0,0 +1,7 @@
+import type { IUIKitSurface } from './IUIKitSurface';
+import { UIKitSurfaceType } from './IUIKitSurface';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export import UIKitViewType = UIKitSurfaceType;
+// Added for backwards compatibility
+export type IUIKitView = IUIKitSurface;
diff --git a/packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionContainer.ts b/packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionContainer.ts
new file mode 100644
index 000000000000..26222907b69a
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionContainer.ts
@@ -0,0 +1,18 @@
+export enum UIKitIncomingInteractionContainerType {
+    MESSAGE = 'message',
+    VIEW = 'view',
+}
+
+export interface IUIKitIncomingInteractionContainer {
+    type: UIKitIncomingInteractionContainerType;
+    id: string;
+}
+export interface IUIKitIncomingInteractionModalContainer extends IUIKitIncomingInteractionContainer {
+    type: UIKitIncomingInteractionContainerType.VIEW;
+}
+export interface IUIKitIncomingInteractionContextualBarContainer extends IUIKitIncomingInteractionContainer {
+    type: UIKitIncomingInteractionContainerType.VIEW;
+}
+export interface IUIKitIncomingInteractionMessageContainer extends IUIKitIncomingInteractionContainer {
+    type: UIKitIncomingInteractionContainerType.MESSAGE;
+}
diff --git a/packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionTypes.ts b/packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionTypes.ts
new file mode 100644
index 000000000000..899d496d7940
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/UIKitIncomingInteractionTypes.ts
@@ -0,0 +1,60 @@
+import type { IMessage } from '../messages';
+import type { IRoom } from '../rooms';
+import { UIActionButtonContext } from '../ui';
+import type { IUser } from '../users';
+import type { IUIKitSurface } from './IUIKitSurface';
+import type {
+    IUIKitIncomingInteractionContextualBarContainer,
+    IUIKitIncomingInteractionMessageContainer,
+    IUIKitIncomingInteractionModalContainer,
+} from './UIKitIncomingInteractionContainer';
+
+export interface IUIKitBaseIncomingInteraction {
+    appId: string;
+    user: IUser;
+    actionId?: string;
+    room?: IRoom;
+    triggerId?: string;
+    threadId?: string;
+}
+
+export interface IUIKitBlockIncomingInteraction extends IUIKitBaseIncomingInteraction {
+    value?: string;
+    message?: IMessage;
+    triggerId: string;
+    actionId: string;
+    blockId: string;
+    room: IUIKitBaseIncomingInteraction['room'];
+    container: IUIKitIncomingInteractionModalContainer | IUIKitIncomingInteractionContextualBarContainer | IUIKitIncomingInteractionMessageContainer;
+}
+
+export interface IUIKitViewSubmitIncomingInteraction extends IUIKitBaseIncomingInteraction {
+    view: IUIKitSurface;
+    triggerId: string;
+}
+
+export interface IUIKitViewCloseIncomingInteraction extends IUIKitBaseIncomingInteraction {
+    view: IUIKitSurface;
+    isCleared: boolean;
+}
+
+export interface IUIKitActionButtonIncomingInteraction extends IUIKitBaseIncomingInteraction {
+    buttonContext: UIActionButtonContext;
+    actionId: string;
+    triggerId: string;
+    room: IRoom;
+    message?: IMessage;
+    threadId?: string;
+}
+
+export interface IUIKitActionButtonMessageBoxIncomingInteraction extends IUIKitActionButtonIncomingInteraction {
+    buttonContext: UIActionButtonContext.MESSAGE_BOX_ACTION;
+    text?: string;
+    threadId?: string;
+}
+
+export function isMessageBoxIncomingInteraction(
+    interaction: IUIKitActionButtonIncomingInteraction,
+): interaction is IUIKitActionButtonMessageBoxIncomingInteraction {
+    return interaction.buttonContext === UIActionButtonContext.MESSAGE_BOX_ACTION;
+}
diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionContext.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionContext.ts
new file mode 100644
index 000000000000..007e408b7196
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionContext.ts
@@ -0,0 +1,69 @@
+import type {
+    IUIKitActionButtonIncomingInteraction,
+    IUIKitActionButtonMessageBoxIncomingInteraction,
+    IUIKitBaseIncomingInteraction,
+    IUIKitBlockIncomingInteraction,
+    IUIKitViewCloseIncomingInteraction,
+    IUIKitViewSubmitIncomingInteraction,
+} from './UIKitIncomingInteractionTypes';
+import { UIKitInteractionResponder } from './UIKitInteractionResponder';
+
+export abstract class UIKitInteractionContext {
+    private baseContext: IUIKitBaseIncomingInteraction;
+
+    private responder: UIKitInteractionResponder;
+
+    constructor(baseContext: IUIKitBaseIncomingInteraction) {
+        const { appId, actionId, room, user, triggerId, threadId } = baseContext;
+
+        this.baseContext = { appId, actionId, room, user, triggerId, threadId };
+
+        this.responder = new UIKitInteractionResponder(this.baseContext);
+    }
+
+    public getInteractionResponder() {
+        return this.responder;
+    }
+
+    public abstract getInteractionData(): IUIKitBaseIncomingInteraction;
+}
+
+export class UIKitBlockInteractionContext extends UIKitInteractionContext {
+    constructor(private readonly interactionData: IUIKitBlockIncomingInteraction) {
+        super(interactionData);
+    }
+
+    public getInteractionData(): IUIKitBlockIncomingInteraction {
+        return this.interactionData;
+    }
+}
+
+export class UIKitViewSubmitInteractionContext extends UIKitInteractionContext {
+    constructor(private readonly interactionData: IUIKitViewSubmitIncomingInteraction) {
+        super(interactionData);
+    }
+
+    public getInteractionData(): IUIKitViewSubmitIncomingInteraction {
+        return this.interactionData;
+    }
+}
+
+export class UIKitViewCloseInteractionContext extends UIKitInteractionContext {
+    constructor(private readonly interactionData: IUIKitViewCloseIncomingInteraction) {
+        super(interactionData);
+    }
+
+    public getInteractionData(): IUIKitViewCloseIncomingInteraction {
+        return this.interactionData;
+    }
+}
+
+export class UIKitActionButtonInteractionContext extends UIKitInteractionContext {
+    constructor(private readonly interactionData: IUIKitActionButtonIncomingInteraction | IUIKitActionButtonMessageBoxIncomingInteraction) {
+        super(interactionData);
+    }
+
+    public getInteractionData(): IUIKitActionButtonIncomingInteraction {
+        return this.interactionData;
+    }
+}
diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts
new file mode 100644
index 000000000000..983228f70250
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts
@@ -0,0 +1,68 @@
+import { v1 as uuid } from 'uuid';
+
+import type { IUIKitErrorInteractionParam } from '../accessors/IUIController';
+import type { IUIKitContextualBarInteraction, IUIKitErrorInteraction, IUIKitInteraction, IUIKitModalInteraction } from './IUIKitInteractionType';
+import { UIKitInteractionType } from './IUIKitInteractionType';
+import type { IUIKitSurface } from './IUIKitSurface';
+import { UIKitSurfaceType } from './IUIKitSurface';
+import type { IUIKitContextualBarViewParam, IUIKitModalViewParam } from './UIKitInteractionResponder';
+
+function isModalInteraction(type: IUIKitInteraction['type']): type is IUIKitModalInteraction['type'] {
+    return [UIKitInteractionType.MODAL_OPEN, UIKitInteractionType.MODAL_UPDATE, UIKitInteractionType.MODAL_CLOSE].includes(type);
+}
+
+export function formatModalInteraction(view: IUIKitModalViewParam, context: IUIKitInteraction): IUIKitModalInteraction {
+    if (!isModalInteraction(context.type)) {
+        throw new Error(`Invalid type "${context.type}" for modal interaction`);
+    }
+
+    return {
+        type: context.type,
+        triggerId: context.triggerId,
+        appId: context.appId,
+        view: {
+            appId: context.appId,
+            type: UIKitSurfaceType.MODAL,
+            id: view.id ? view.id : uuid(),
+            ...view,
+            showIcon: true,
+        } as IUIKitSurface,
+    };
+}
+
+function isContextualBarInteraction(type: IUIKitInteraction['type']): type is IUIKitContextualBarInteraction['type'] {
+    return [UIKitInteractionType.CONTEXTUAL_BAR_OPEN, UIKitInteractionType.CONTEXTUAL_BAR_UPDATE, UIKitInteractionType.CONTEXTUAL_BAR_CLOSE].includes(type);
+}
+
+export function formatContextualBarInteraction(view: IUIKitContextualBarViewParam, context: IUIKitInteraction): IUIKitContextualBarInteraction {
+    if (!isContextualBarInteraction(context.type)) {
+        throw new Error(`Invalid type "${context.type}" for contextual bar interaction`);
+    }
+
+    return {
+        type: context.type,
+        triggerId: context.triggerId,
+        appId: context.appId,
+        view: {
+            appId: context.appId,
+            type: UIKitSurfaceType.CONTEXTUAL_BAR,
+            id: view.id ? view.id : uuid(),
+            ...view,
+            showIcon: true,
+        } as IUIKitSurface,
+    };
+}
+
+export function formatErrorInteraction(errorInteraction: IUIKitErrorInteractionParam, context: IUIKitInteraction): IUIKitErrorInteraction {
+    if (UIKitInteractionType.ERRORS !== context.type) {
+        throw new Error(`Invalid type "${context.type}" for error interaction`);
+    }
+
+    return {
+        appId: context.appId,
+        type: UIKitInteractionType.ERRORS,
+        errors: errorInteraction.errors,
+        viewId: errorInteraction.viewId,
+        triggerId: context.triggerId,
+    };
+}
diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts
new file mode 100644
index 000000000000..dca9782dbd47
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts
@@ -0,0 +1,75 @@
+import type { Omit } from '../../lib/utils';
+import type { IUIKitErrorInteractionParam } from '../accessors/IUIController';
+import type { IUIKitContextualBarResponse, IUIKitErrorResponse, IUIKitModalResponse, IUIKitResponse } from './IUIKitInteractionType';
+import { UIKitInteractionType } from './IUIKitInteractionType';
+import type { IUIKitSurface } from './IUIKitSurface';
+import type { IUIKitBaseIncomingInteraction } from './UIKitIncomingInteractionTypes';
+import { formatContextualBarInteraction, formatModalInteraction } from './UIKitInteractionPayloadFormatter';
+
+export type IUIKitModalViewParam = Omit<IUIKitSurface, 'appId' | 'id' | 'type'> & Partial<Pick<IUIKitSurface, 'id'>>;
+export type IUIKitContextualBarViewParam = Omit<IUIKitSurface, 'appId' | 'id' | 'type'> & Partial<Pick<IUIKitSurface, 'id'>>;
+
+export class UIKitInteractionResponder {
+    constructor(private readonly baseContext: IUIKitBaseIncomingInteraction) {}
+
+    public successResponse(): IUIKitResponse {
+        return {
+            success: true,
+        };
+    }
+
+    public errorResponse(): IUIKitResponse {
+        return {
+            success: false,
+        };
+    }
+
+    public openModalViewResponse(viewData: IUIKitModalViewParam): IUIKitModalResponse {
+        const { appId, triggerId } = this.baseContext;
+
+        return {
+            success: true,
+            ...formatModalInteraction(viewData, { appId, triggerId, type: UIKitInteractionType.MODAL_OPEN }),
+        };
+    }
+
+    public updateModalViewResponse(viewData: IUIKitModalViewParam): IUIKitModalResponse {
+        const { appId, triggerId } = this.baseContext;
+
+        return {
+            success: true,
+            ...formatModalInteraction(viewData, { appId, triggerId, type: UIKitInteractionType.MODAL_UPDATE }),
+        };
+    }
+
+    public openContextualBarViewResponse(viewData: IUIKitContextualBarViewParam): IUIKitContextualBarResponse {
+        const { appId, triggerId } = this.baseContext;
+
+        return {
+            success: true,
+            ...formatContextualBarInteraction(viewData, { appId, triggerId, type: UIKitInteractionType.CONTEXTUAL_BAR_OPEN }),
+        };
+    }
+
+    public updateContextualBarViewResponse(viewData: IUIKitContextualBarViewParam): IUIKitContextualBarResponse {
+        const { appId, triggerId } = this.baseContext;
+
+        return {
+            success: true,
+            ...formatContextualBarInteraction(viewData, { appId, triggerId, type: UIKitInteractionType.CONTEXTUAL_BAR_UPDATE }),
+        };
+    }
+
+    public viewErrorResponse(errorInteraction: IUIKitErrorInteractionParam): IUIKitErrorResponse {
+        const { appId, triggerId } = this.baseContext;
+
+        return {
+            appId,
+            triggerId,
+            success: false,
+            type: UIKitInteractionType.ERRORS,
+            viewId: errorInteraction.viewId,
+            errors: errorInteraction.errors,
+        };
+    }
+}
diff --git a/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts b/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts
new file mode 100644
index 000000000000..4bee521518de
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts
@@ -0,0 +1,196 @@
+import { v1 as uuid } from 'uuid';
+
+import type { Omit } from '../../../lib/utils';
+import type { IActionsBlock, IBlock, IConditionalBlock, IConditionalBlockFilters, IContextBlock, IImageBlock, IInputBlock, ISectionBlock } from './Blocks';
+import { BlockType } from './Blocks';
+import type {
+    IBlockElement,
+    IButtonElement,
+    IImageElement,
+    IInputElement,
+    IInteractiveElement,
+    IMultiStaticSelectElement,
+    IOverflowMenuElement,
+    IPlainTextInputElement,
+    ISelectElement,
+    IStaticSelectElement,
+} from './Elements';
+import { BlockElementType } from './Elements';
+import type { ITextObject } from './Objects';
+import { TextObjectType } from './Objects';
+
+type BlockFunctionParameter<T extends IBlock> = Omit<T, 'type'>;
+type ElementFunctionParameter<T extends IBlockElement> = T extends IInteractiveElement
+    ? Omit<T, 'type' | 'actionId'> | Partial<Pick<T, 'actionId'>>
+    : Omit<T, 'type'>;
+
+type SectionBlockParam = BlockFunctionParameter<ISectionBlock>;
+type ImageBlockParam = BlockFunctionParameter<IImageBlock>;
+type ActionsBlockParam = BlockFunctionParameter<IActionsBlock>;
+type ContextBlockParam = BlockFunctionParameter<IContextBlock>;
+type InputBlockParam = BlockFunctionParameter<IInputBlock>;
+
+type ButtonElementParam = ElementFunctionParameter<IButtonElement>;
+type ImageElementParam = ElementFunctionParameter<IImageElement>;
+type OverflowMenuElementParam = ElementFunctionParameter<IOverflowMenuElement>;
+type PlainTextInputElementParam = ElementFunctionParameter<IPlainTextInputElement>;
+type StaticSelectElementParam = ElementFunctionParameter<IStaticSelectElement>;
+type MultiStaticSelectElementParam = ElementFunctionParameter<IMultiStaticSelectElement>;
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export class BlockBuilder {
+    private readonly blocks: Array<IBlock>;
+
+    constructor(private readonly appId: string) {
+        this.blocks = [];
+    }
+
+    public addSectionBlock(block: SectionBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.SECTION, ...block } as ISectionBlock);
+
+        return this;
+    }
+
+    public addImageBlock(block: ImageBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.IMAGE, ...block } as IImageBlock);
+
+        return this;
+    }
+
+    public addDividerBlock(): BlockBuilder {
+        this.addBlock({ type: BlockType.DIVIDER });
+
+        return this;
+    }
+
+    public addActionsBlock(block: ActionsBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.ACTIONS, ...block } as IActionsBlock);
+
+        return this;
+    }
+
+    public addContextBlock(block: ContextBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.CONTEXT, ...block } as IContextBlock);
+
+        return this;
+    }
+
+    public addInputBlock(block: InputBlockParam): BlockBuilder {
+        this.addBlock({ type: BlockType.INPUT, ...block } as IInputBlock);
+
+        return this;
+    }
+
+    public addConditionalBlock(innerBlocks: BlockBuilder | Array<IBlock>, condition?: IConditionalBlockFilters): BlockBuilder {
+        const render = innerBlocks instanceof BlockBuilder ? innerBlocks.getBlocks() : innerBlocks;
+
+        this.addBlock({ type: BlockType.CONDITIONAL, render, when: condition } as IConditionalBlock);
+
+        return this;
+    }
+
+    public getBlocks() {
+        return this.blocks;
+    }
+
+    public newPlainTextObject(text: string, emoji = false): ITextObject {
+        return {
+            type: TextObjectType.PLAINTEXT,
+            text,
+            emoji,
+        };
+    }
+
+    public newMarkdownTextObject(text: string): ITextObject {
+        return {
+            type: TextObjectType.MARKDOWN,
+            text,
+        };
+    }
+
+    public newButtonElement(info: ButtonElementParam): IButtonElement {
+        return this.newInteractiveElement({
+            type: BlockElementType.BUTTON,
+            ...info,
+        } as IButtonElement);
+    }
+
+    public newImageElement(info: ImageElementParam): IImageElement {
+        return {
+            type: BlockElementType.IMAGE,
+            ...info,
+        };
+    }
+
+    public newOverflowMenuElement(info: OverflowMenuElementParam): IOverflowMenuElement {
+        return this.newInteractiveElement({
+            type: BlockElementType.OVERFLOW_MENU,
+            ...info,
+        } as IOverflowMenuElement);
+    }
+
+    public newPlainTextInputElement(info: PlainTextInputElementParam): IPlainTextInputElement {
+        return this.newInputElement({
+            type: BlockElementType.PLAIN_TEXT_INPUT,
+            ...info,
+        } as IPlainTextInputElement);
+    }
+
+    public newStaticSelectElement(info: StaticSelectElementParam): IStaticSelectElement {
+        return this.newSelectElement({
+            type: BlockElementType.STATIC_SELECT,
+            ...info,
+        } as IStaticSelectElement);
+    }
+
+    public newMultiStaticElement(info: MultiStaticSelectElementParam): IMultiStaticSelectElement {
+        return this.newSelectElement({
+            type: BlockElementType.MULTI_STATIC_SELECT,
+            ...info,
+        } as IMultiStaticSelectElement);
+    }
+
+    private newInteractiveElement<T extends IInteractiveElement>(element: T): T {
+        if (!element.actionId) {
+            element.actionId = this.generateActionId();
+        }
+
+        return element;
+    }
+
+    private newInputElement<T extends IInputElement>(element: T): T {
+        if (!element.actionId) {
+            element.actionId = this.generateActionId();
+        }
+
+        return element;
+    }
+
+    private newSelectElement<T extends ISelectElement>(element: T): T {
+        if (!element.actionId) {
+            element.actionId = this.generateActionId();
+        }
+
+        return element;
+    }
+
+    private addBlock(block: IBlock): void {
+        if (!block.blockId) {
+            block.blockId = this.generateBlockId();
+        }
+
+        block.appId = this.appId;
+
+        this.blocks.push(block);
+    }
+
+    private generateBlockId(): string {
+        return uuid();
+    }
+
+    private generateActionId(): string {
+        return uuid();
+    }
+}
diff --git a/packages/apps-engine/src/definition/uikit/blocks/Blocks.ts b/packages/apps-engine/src/definition/uikit/blocks/Blocks.ts
new file mode 100644
index 000000000000..b872b1e62152
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/blocks/Blocks.ts
@@ -0,0 +1,108 @@
+import type { AccessoryElements, IBlockElement, IImageElement, IInputElement } from './Elements';
+import type { ITextObject } from './Objects';
+
+export enum BlockType {
+    SECTION = 'section',
+    DIVIDER = 'divider',
+    IMAGE = 'image',
+    ACTIONS = 'actions',
+    CONTEXT = 'context',
+    INPUT = 'input',
+    CONDITIONAL = 'conditional',
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IBlock {
+    type: BlockType;
+    appId?: string;
+    blockId?: string;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface ISectionBlock extends IBlock {
+    type: BlockType.SECTION;
+    text: ITextObject;
+    accessory?: AccessoryElements;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IImageBlock extends IBlock {
+    type: BlockType.IMAGE;
+    imageUrl: string;
+    altText: string;
+    title?: ITextObject;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IDividerBlock extends IBlock {
+    type: BlockType.DIVIDER;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IActionsBlock extends IBlock {
+    type: BlockType.ACTIONS;
+    elements: Array<IBlockElement>;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IContextBlock extends IBlock {
+    type: BlockType.CONTEXT;
+    elements: Array<ITextObject | IImageElement>;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IInputBlock extends IBlock {
+    type: BlockType.INPUT;
+    element: IInputElement;
+    label: ITextObject;
+    optional?: boolean;
+}
+
+export enum ConditionalBlockFiltersEngine {
+    ROCKETCHAT = 'rocket.chat',
+    LIVECHAT = 'livechat',
+}
+
+export interface IConditionalBlockFilters {
+    engine?: Array<ConditionalBlockFiltersEngine>;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ *
+ * Declares a block that is only visible when a certain
+ * condition is met.
+ *
+ * The content specified in the `render` property will be
+ * shown.
+ *
+ * No condition will be checked by default, i.e. the block
+ * will be shown in every case like other blocks.
+ *
+ * Currently supported conditions:
+ *      `engine: Array<"rocket.chat" | "omnichannel">` specifies what engine should
+ *      render the block:
+ *          "rocket.chat" for regular Rocket.Chat engine
+ *          "omnichannel" for the Livechat/Omnichannel widget engine
+ *      leave it blank to show the block in both engines
+ */
+
+export interface IConditionalBlock extends IBlock {
+    type: BlockType.CONDITIONAL;
+    when?: IConditionalBlockFilters;
+    render: Array<IBlock>;
+}
diff --git a/packages/apps-engine/src/definition/uikit/blocks/Elements.ts b/packages/apps-engine/src/definition/uikit/blocks/Elements.ts
new file mode 100644
index 000000000000..cc2c51ba0b54
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/blocks/Elements.ts
@@ -0,0 +1,115 @@
+import type { IOptionObject, ITextObject } from './Objects';
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export enum BlockElementType {
+    BUTTON = 'button',
+    IMAGE = 'image',
+    OVERFLOW_MENU = 'overflow',
+    PLAIN_TEXT_INPUT = 'plain_text_input',
+    STATIC_SELECT = 'static_select',
+    MULTI_STATIC_SELECT = 'multi_static_select',
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export enum InputElementDispatchAction {
+    ON_CHARACTER_ENTERED = 'on_character_entered',
+    ON_ITEM_SELECTED = 'on_item_selected',
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IBlockElement {
+    type: BlockElementType;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export type AccessoryElements = IButtonElement | IImageElement | IOverflowMenuElement;
+
+export interface IInteractiveElement extends IBlockElement {
+    actionId: string;
+}
+
+export interface IInputElement extends IBlockElement {
+    actionId: string;
+    placeholder: ITextObject;
+    initialValue?: string | Array<string>;
+    dispatchActionConfig?: Array<InputElementDispatchAction>;
+}
+
+export enum ButtonStyle {
+    PRIMARY = 'primary',
+    DANGER = 'danger',
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IButtonElement extends IInteractiveElement {
+    type: BlockElementType.BUTTON;
+    text: ITextObject;
+    value?: string;
+    url?: string;
+    style?: ButtonStyle;
+    // confirm?: IConfirmationDialogObject;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IImageElement extends IBlockElement {
+    type: BlockElementType.IMAGE;
+    imageUrl: string;
+    altText: string;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IOverflowMenuElement extends IInteractiveElement {
+    type: BlockElementType.OVERFLOW_MENU;
+    options: Array<IOptionObject>;
+    // confirm?: IConfirmationDialogObject;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IPlainTextInputElement extends IInputElement {
+    type: BlockElementType.PLAIN_TEXT_INPUT;
+    initialValue?: string;
+    multiline?: boolean;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface ISelectElement extends IInputElement {
+    type: BlockElementType.STATIC_SELECT | BlockElementType.MULTI_STATIC_SELECT;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IStaticSelectElement extends ISelectElement {
+    type: BlockElementType.STATIC_SELECT;
+    placeholder: ITextObject;
+    options: Array<IOptionObject>;
+    initialValue?: string;
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IMultiStaticSelectElement extends ISelectElement {
+    type: BlockElementType.MULTI_STATIC_SELECT;
+    placeholder: ITextObject;
+    options: Array<IOptionObject>;
+    initialValue?: Array<string>;
+}
diff --git a/packages/apps-engine/src/definition/uikit/blocks/Objects.ts b/packages/apps-engine/src/definition/uikit/blocks/Objects.ts
new file mode 100644
index 000000000000..a99af07d6508
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/blocks/Objects.ts
@@ -0,0 +1,33 @@
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export enum TextObjectType {
+    MARKDOWN = 'mrkdwn',
+    PLAINTEXT = 'plain_text',
+}
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface ITextObject {
+    type: TextObjectType;
+    text: string;
+    emoji?: boolean;
+}
+
+// export interface IConfirmationDialogObject {
+//     title: ITextObject;
+//     text: ITextObject;
+//     confirm: ITextObject;
+//     deny: ITextObject;
+// }
+
+/**
+ * @deprecated please prefer the rocket.chat/ui-kit components
+ */
+export interface IOptionObject {
+    text: ITextObject;
+    value: string;
+
+    url?: string;
+}
diff --git a/packages/apps-engine/src/definition/uikit/blocks/index.ts b/packages/apps-engine/src/definition/uikit/blocks/index.ts
new file mode 100644
index 000000000000..21065e1e6890
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/blocks/index.ts
@@ -0,0 +1,4 @@
+export * from './Blocks';
+export * from './Objects';
+export * from './Elements';
+export * from './BlockBuilder';
diff --git a/packages/apps-engine/src/definition/uikit/index.ts b/packages/apps-engine/src/definition/uikit/index.ts
new file mode 100644
index 000000000000..90eb602e983f
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/index.ts
@@ -0,0 +1,7 @@
+export * from './IUIKitIncomingInteraction';
+export * from './IUIKitSurface';
+export * from './IUIKitActionHandler';
+export * from './IUIKitInteractionType';
+export * from './UIKitInteractionContext';
+export * from './blocks';
+export * from './livechat';
diff --git a/packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatActionHandler.ts b/packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatActionHandler.ts
new file mode 100644
index 000000000000..9c7ce74b720f
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatActionHandler.ts
@@ -0,0 +1,23 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../../accessors';
+import { AppMethod } from '../../metadata';
+import type { IUIKitResponse } from '../IUIKitInteractionType';
+import type { UIKitLivechatBlockInteractionContext } from './UIKitLivechatInteractionContext';
+
+/** Handler for UIKit interactions in the livechat widget. */
+export interface IUIKitLivechatInteractionHandler {
+    /**
+     * Method called when a block action is invoked.
+     *
+     * @param context
+     * @param read An accessor to the environment
+     * @param http An accessor to the outside world
+     * @param persistence An accessor to the App's persistence
+     */
+    [AppMethod.UIKIT_LIVECHAT_BLOCK_ACTION]?(
+        context: UIKitLivechatBlockInteractionContext,
+        read: IRead,
+        http: IHttp,
+        persistence: IPersistence,
+        modify: IModify,
+    ): Promise<IUIKitResponse>;
+}
diff --git a/packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatIncomingInteraction.ts b/packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatIncomingInteraction.ts
new file mode 100644
index 000000000000..0b2c07905c4a
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/livechat/IUIKitLivechatIncomingInteraction.ts
@@ -0,0 +1,17 @@
+import type { IVisitor } from '../../livechat';
+import type { IMessage } from '../../messages';
+import type { IRoom } from '../../rooms';
+import type { UIKitIncomingInteractionType } from '../IUIKitIncomingInteraction';
+import type { IUIKitIncomingInteractionMessageContainer, IUIKitIncomingInteractionModalContainer } from '../UIKitIncomingInteractionContainer';
+
+export interface IUIKitLivechatIncomingInteraction {
+    type: UIKitIncomingInteractionType;
+    container: IUIKitIncomingInteractionModalContainer | IUIKitIncomingInteractionMessageContainer;
+    visitor: IVisitor;
+    appId: string;
+    payload: object;
+    actionId?: string;
+    triggerId?: string;
+    room?: IRoom;
+    message?: IMessage;
+}
diff --git a/packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatIncomingInteractionType.ts b/packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatIncomingInteractionType.ts
new file mode 100644
index 000000000000..0e29d42d70aa
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatIncomingInteractionType.ts
@@ -0,0 +1,22 @@
+import type { IVisitor } from '../../livechat';
+import type { IMessage } from '../../messages';
+import type { IRoom } from '../../rooms';
+import type { IUIKitIncomingInteractionMessageContainer, IUIKitIncomingInteractionModalContainer } from '../UIKitIncomingInteractionContainer';
+
+export interface IUIKitLivechatBaseIncomingInteraction {
+    appId: string;
+    visitor: IVisitor;
+    actionId?: string;
+    room?: IRoom;
+    triggerId?: string;
+}
+
+export interface IUIKitLivechatBlockIncomingInteraction extends IUIKitLivechatBaseIncomingInteraction {
+    value?: string;
+    message?: IMessage;
+    triggerId: string;
+    actionId: string;
+    blockId: string;
+    room: IUIKitLivechatBaseIncomingInteraction['room'];
+    container: IUIKitIncomingInteractionModalContainer | IUIKitIncomingInteractionMessageContainer;
+}
diff --git a/packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatInteractionContext.ts b/packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatInteractionContext.ts
new file mode 100644
index 000000000000..610cdb6594c9
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/livechat/UIKitLivechatInteractionContext.ts
@@ -0,0 +1,33 @@
+import type { IUIKitBaseIncomingInteraction } from '../UIKitIncomingInteractionTypes';
+import { UIKitInteractionResponder } from '../UIKitInteractionResponder';
+import type { IUIKitLivechatBaseIncomingInteraction, IUIKitLivechatBlockIncomingInteraction } from './UIKitLivechatIncomingInteractionType';
+
+export abstract class UIKitLivechatInteractionContext {
+    private baseContext: IUIKitLivechatBaseIncomingInteraction;
+
+    private responder: UIKitInteractionResponder;
+
+    constructor(baseContext: IUIKitLivechatBaseIncomingInteraction) {
+        const { appId, actionId, room, visitor, triggerId } = baseContext;
+
+        this.baseContext = { appId, actionId, room, visitor, triggerId };
+
+        this.responder = new UIKitInteractionResponder(this.baseContext as any as IUIKitBaseIncomingInteraction);
+    }
+
+    public getInteractionResponder() {
+        return this.responder;
+    }
+
+    public abstract getInteractionData(): IUIKitLivechatBaseIncomingInteraction;
+}
+
+export class UIKitLivechatBlockInteractionContext extends UIKitLivechatInteractionContext {
+    constructor(private readonly interactionData: IUIKitLivechatBlockIncomingInteraction) {
+        super(interactionData);
+    }
+
+    public getInteractionData(): IUIKitLivechatBlockIncomingInteraction {
+        return this.interactionData;
+    }
+}
diff --git a/packages/apps-engine/src/definition/uikit/livechat/index.ts b/packages/apps-engine/src/definition/uikit/livechat/index.ts
new file mode 100644
index 000000000000..18a6bcc004e8
--- /dev/null
+++ b/packages/apps-engine/src/definition/uikit/livechat/index.ts
@@ -0,0 +1,4 @@
+export * from './IUIKitLivechatActionHandler';
+export * from './UIKitLivechatIncomingInteractionType';
+export * from './UIKitLivechatInteractionContext';
+export * from './IUIKitLivechatIncomingInteraction';
diff --git a/packages/apps-engine/src/definition/uploads/IFileUploadContext.ts b/packages/apps-engine/src/definition/uploads/IFileUploadContext.ts
new file mode 100644
index 000000000000..b682b7209d12
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/IFileUploadContext.ts
@@ -0,0 +1,6 @@
+import type { IUploadDetails } from './IUploadDetails';
+
+export interface IFileUploadContext {
+    file: IUploadDetails;
+    content: Buffer;
+}
diff --git a/packages/apps-engine/src/definition/uploads/IPreFileUpload.ts b/packages/apps-engine/src/definition/uploads/IPreFileUpload.ts
new file mode 100644
index 000000000000..5a338bd7ce6a
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/IPreFileUpload.ts
@@ -0,0 +1,20 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IFileUploadContext } from './IFileUploadContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPreFileUpload`
+ * event
+ *
+ * This event is triggered prior to an upload succesfully
+ * being saved to the database, but *after* all its contents
+ * have been retrieved by Rocket.Chat.
+ *
+ * To prevent the upload from completing, an app should throw a
+ * `FileUploadNotAllowedException` with a message specifying the
+ * reason for rejection.
+ */
+export interface IPreFileUpload {
+    [AppMethod.EXECUTE_PRE_FILE_UPLOAD](context: IFileUploadContext, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/uploads/IUpload.ts b/packages/apps-engine/src/definition/uploads/IUpload.ts
new file mode 100644
index 000000000000..7c186701a0c3
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/IUpload.ts
@@ -0,0 +1,25 @@
+import type { IVisitor } from '../livechat';
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+import type { StoreType } from './StoreType';
+
+export interface IUpload {
+    id: string;
+    name: string;
+    size: string;
+    type: string;
+    extension: string;
+    etag: string;
+    path: string;
+    token: string;
+    url: string;
+    progress: number;
+    uploading: boolean;
+    complete: boolean;
+    updatedAt: Date;
+    uploadedAt: Date;
+    store: StoreType;
+    room: IRoom;
+    visitor?: IVisitor;
+    user?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/uploads/IUploadDescriptor.ts b/packages/apps-engine/src/definition/uploads/IUploadDescriptor.ts
new file mode 100644
index 000000000000..77621bc7452a
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/IUploadDescriptor.ts
@@ -0,0 +1,24 @@
+import type { IRoom } from '../rooms';
+import type { IUser } from '../users';
+
+export interface IUploadDescriptor {
+    /**
+     * Full filename of the file, including extension name
+     */
+    filename: string;
+    /**
+     * The room where the file to be uploaded
+     */
+    room: IRoom;
+    /**
+     * The user that performed the upload
+     *
+     * NOTE: please ignore this property if you are going
+     * to assign a livechat visitor to perform upload.
+     */
+    user?: IUser | null;
+    /**
+     * The token of a Livechat visitor
+     */
+    visitorToken?: string;
+}
diff --git a/packages/apps-engine/src/definition/uploads/IUploadDetails.ts b/packages/apps-engine/src/definition/uploads/IUploadDetails.ts
new file mode 100644
index 000000000000..f22d02257286
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/IUploadDetails.ts
@@ -0,0 +1,26 @@
+export interface IUploadDetails {
+    /**
+     * Full filename of the file, including extension name
+     */
+    name: string;
+    /**
+     * Size of the file
+     */
+    size: number;
+    /**
+     * MIME type of the file
+     */
+    type: string;
+    /**
+     * The id of the Room that the file will be uploaded to
+     */
+    rid: string;
+    /**
+     * The id of the user that performed the upload
+     */
+    userId: string;
+    /**
+     * The token of a Livechat visitor
+     */
+    visitorToken?: string;
+}
diff --git a/packages/apps-engine/src/definition/uploads/StoreType.ts b/packages/apps-engine/src/definition/uploads/StoreType.ts
new file mode 100644
index 000000000000..4065f5635a66
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/StoreType.ts
@@ -0,0 +1,7 @@
+export enum StoreType {
+    GridFS = 'GridFS:Uploads',
+    AmazonS3 = 'AmazonS3',
+    GoogleCloudStorage = 'GoogleCloudStorage',
+    Webdav = 'Webdav',
+    FileSystem = 'FileSystem',
+}
diff --git a/packages/apps-engine/src/definition/uploads/index.ts b/packages/apps-engine/src/definition/uploads/index.ts
new file mode 100644
index 000000000000..1bdfa8164ca9
--- /dev/null
+++ b/packages/apps-engine/src/definition/uploads/index.ts
@@ -0,0 +1,6 @@
+import { IFileUploadContext } from './IFileUploadContext';
+import { IPreFileUpload } from './IPreFileUpload';
+import { IUpload } from './IUpload';
+import { StoreType } from './StoreType';
+
+export { IFileUploadContext, IPreFileUpload, IUpload, StoreType };
diff --git a/packages/apps-engine/src/definition/users/IBotUser.ts b/packages/apps-engine/src/definition/users/IBotUser.ts
new file mode 100644
index 000000000000..c0babeba3813
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IBotUser.ts
@@ -0,0 +1,6 @@
+import type { IUser } from './IUser';
+import type { UserType } from './UserType';
+
+export interface IBotUser extends Omit<IUser, 'emails'> {
+    type: UserType.BOT | UserType.APP;
+}
diff --git a/packages/apps-engine/src/definition/users/IPostUserCreated.ts b/packages/apps-engine/src/definition/users/IPostUserCreated.ts
new file mode 100644
index 000000000000..27e50614bac9
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IPostUserCreated.ts
@@ -0,0 +1,15 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUserContext } from './IUserContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostUserCreated`
+ * event
+ *
+ * This event is triggered *after* the
+ * user has been saved to the database.
+ */
+export interface IPostUserCreated {
+    [AppMethod.EXECUTE_POST_USER_CREATED](context: IUserContext, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/users/IPostUserDeleted.ts b/packages/apps-engine/src/definition/users/IPostUserDeleted.ts
new file mode 100644
index 000000000000..d2a6fc1fe7e2
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IPostUserDeleted.ts
@@ -0,0 +1,15 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUserContext } from './IUserContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostUserDeleted`
+ * event
+ *
+ * This event is triggered *after* the
+ * user has been removed from the database.
+ */
+export interface IPostUserDeleted {
+    [AppMethod.EXECUTE_POST_USER_CREATED](context: IUserContext, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/users/IPostUserLoggedIn.ts b/packages/apps-engine/src/definition/users/IPostUserLoggedIn.ts
new file mode 100644
index 000000000000..c94351d159e5
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IPostUserLoggedIn.ts
@@ -0,0 +1,15 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUser } from './IUser';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostUserLoggedIn`
+ * event
+ *
+ * This event is triggered *after* the
+ * user logged into Rocket.chat
+ */
+export interface IPostUserLoggedIn {
+    [AppMethod.EXECUTE_POST_USER_LOGGED_IN](context: IUser, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/users/IPostUserLoggedOut.ts b/packages/apps-engine/src/definition/users/IPostUserLoggedOut.ts
new file mode 100644
index 000000000000..a485cc05ef35
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IPostUserLoggedOut.ts
@@ -0,0 +1,15 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUser } from './IUser';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostUserLoggedOut`
+ * event
+ *
+ * This event is triggered *after* the
+ * user logout from the Rocket.chat
+ */
+export interface IPostUserLoggedOut {
+    [AppMethod.EXECUTE_POST_USER_LOGGED_OUT](context: IUser, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/users/IPostUserStatusChanged.ts b/packages/apps-engine/src/definition/users/IPostUserStatusChanged.ts
new file mode 100644
index 000000000000..2d1e94de6ec6
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IPostUserStatusChanged.ts
@@ -0,0 +1,17 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUserStatusContext } from './IUserStatusContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostUserStatusChanged`
+ * event
+ *
+ * This event is triggered *after* the
+ * user changes his status on Rocket.chat
+ * for online, away, busy or offline.
+ * Does **not** trigger when the custom status is changed
+ */
+export interface IPostUserStatusChanged {
+    [AppMethod.EXECUTE_POST_USER_STATUS_CHANGED](context: IUserStatusContext, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/users/IPostUserUpdated.ts b/packages/apps-engine/src/definition/users/IPostUserUpdated.ts
new file mode 100644
index 000000000000..724522785faf
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IPostUserUpdated.ts
@@ -0,0 +1,15 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import { AppMethod } from '../metadata';
+import type { IUserContext } from './IUserContext';
+
+/**
+ * Event interface that allows an app to
+ * register as a handler of the `IPostUserUpdated`
+ * event
+ *
+ * This event is triggered *after* the
+ * user has been saved to the database.
+ */
+export interface IPostUserUpdated {
+    [AppMethod.EXECUTE_POST_USER_CREATED](context: IUserContext, read: IRead, http: IHttp, persis: IPersistence, modify: IModify): Promise<void>;
+}
diff --git a/packages/apps-engine/src/definition/users/IUser.ts b/packages/apps-engine/src/definition/users/IUser.ts
new file mode 100644
index 000000000000..bb19e6fd533f
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUser.ts
@@ -0,0 +1,25 @@
+import type { IUserEmail } from './IUserEmail';
+import type { IUserSettings } from './IUserSettings';
+import type { UserStatusConnection } from './UserStatusConnection';
+import type { UserType } from './UserType';
+
+export interface IUser {
+    id: string;
+    username: string;
+    emails: Array<IUserEmail>;
+    type: UserType;
+    isEnabled: boolean;
+    name: string;
+    roles: Array<string>;
+    bio?: string;
+    status: string;
+    statusConnection: UserStatusConnection;
+    statusText?: string;
+    utcOffset: number;
+    createdAt: Date;
+    updatedAt: Date;
+    lastLoginAt: Date;
+    settings?: IUserSettings;
+    appId?: string;
+    customFields?: { [key: string]: any };
+}
diff --git a/packages/apps-engine/src/definition/users/IUserContext.ts b/packages/apps-engine/src/definition/users/IUserContext.ts
new file mode 100644
index 000000000000..a27bc57f2758
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserContext.ts
@@ -0,0 +1,19 @@
+import type { IUser } from './IUser';
+
+/**
+ * The context of execution for the following events:
+ * - IPostUserCreated
+ * - IPostUserDeleted
+ */
+export interface IUserContext {
+    /**
+     * The user that was affected by
+     * update
+     */
+    user: IUser;
+    /**
+     * The user that performed the
+     * updates
+     */
+    performedBy?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/users/IUserCreationOptions.ts b/packages/apps-engine/src/definition/users/IUserCreationOptions.ts
new file mode 100644
index 000000000000..8c9371fccdd4
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserCreationOptions.ts
@@ -0,0 +1,7 @@
+export interface IUserCreationOptions {
+    avatarUrl?: string;
+    joinDefaultChannels?: boolean;
+    verified?: boolean;
+    requirePasswordChange?: boolean;
+    sendWelcomeEmail?: boolean;
+}
diff --git a/packages/apps-engine/src/definition/users/IUserEmail.ts b/packages/apps-engine/src/definition/users/IUserEmail.ts
new file mode 100644
index 000000000000..064d675037d8
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserEmail.ts
@@ -0,0 +1,4 @@
+export interface IUserEmail {
+    address: string;
+    verified: boolean;
+}
diff --git a/packages/apps-engine/src/definition/users/IUserLookup.ts b/packages/apps-engine/src/definition/users/IUserLookup.ts
new file mode 100644
index 000000000000..9b5f09b0498f
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserLookup.ts
@@ -0,0 +1,5 @@
+export interface IUserLookup {
+    _id: string;
+    username: string;
+    name?: string;
+}
diff --git a/packages/apps-engine/src/definition/users/IUserSettings.ts b/packages/apps-engine/src/definition/users/IUserSettings.ts
new file mode 100644
index 000000000000..73fd7b8f5fbb
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserSettings.ts
@@ -0,0 +1,5 @@
+export interface IUserSettings {
+    preferences?: {
+        language?: string;
+    };
+}
diff --git a/packages/apps-engine/src/definition/users/IUserStatusContext.ts b/packages/apps-engine/src/definition/users/IUserStatusContext.ts
new file mode 100644
index 000000000000..c385f6085468
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserStatusContext.ts
@@ -0,0 +1,23 @@
+import type { IUser } from './IUser';
+
+/**
+ * The context of execution for the following events:
+ * - IPostUserStatusChanged
+ */
+export interface IUserStatusContext {
+    /**
+     * The user that the status
+     * was changed
+     */
+    user: IUser;
+    /**
+     * The new status set by the
+     * user
+     */
+    currentStatus: string;
+    /**
+     * The status previous the
+     * change
+     */
+    previousStatus: string;
+}
diff --git a/packages/apps-engine/src/definition/users/IUserUpdateContex.ts b/packages/apps-engine/src/definition/users/IUserUpdateContex.ts
new file mode 100644
index 000000000000..1d5ec9bc3daf
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserUpdateContex.ts
@@ -0,0 +1,24 @@
+import type { IUser } from './IUser';
+
+/**
+ * The context of execution for the
+ * IPostUserUpdated event
+ */
+export interface IUserUpdateContext {
+    /**
+     * The user that was affected by
+     * update
+     */
+    user: IUser;
+
+    /**
+     * The user that performed the
+     * updates
+     */
+    performedBy?: IUser;
+
+    /**
+     * The user before the update
+     */
+    previousData?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/users/IUserUpdateContext.ts b/packages/apps-engine/src/definition/users/IUserUpdateContext.ts
new file mode 100644
index 000000000000..e606eeb863ad
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/IUserUpdateContext.ts
@@ -0,0 +1,24 @@
+import type { IUser } from './IUser';
+
+/**
+ * The context of execution for the
+ * IPostUserUpdated event
+ */
+export interface IUserUpdateContext {
+    /**
+     * The user who has been affected
+     * by the action
+     */
+    user: IUser;
+
+    /**
+     * The user who performed the
+     * update. Null if it's the user himself
+     */
+    performedBy?: IUser;
+
+    /**
+     * The user data before the update
+     */
+    previousData?: IUser;
+}
diff --git a/packages/apps-engine/src/definition/users/UserStatusConnection.ts b/packages/apps-engine/src/definition/users/UserStatusConnection.ts
new file mode 100644
index 000000000000..303bf2cd0cb1
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/UserStatusConnection.ts
@@ -0,0 +1,9 @@
+export enum UserStatusConnection {
+    OFFLINE = 'offline',
+    ONLINE = 'online',
+    AWAY = 'away',
+    BUSY = 'busy',
+    INVISIBLE = 'invisible',
+    /** This happens for livechat users and rocket.cat. */
+    UNDEFINED = 'undefined',
+}
diff --git a/packages/apps-engine/src/definition/users/UserType.ts b/packages/apps-engine/src/definition/users/UserType.ts
new file mode 100644
index 000000000000..dce3bbbc6d71
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/UserType.ts
@@ -0,0 +1,10 @@
+export enum UserType {
+    /** A user type for Rocket.Chat apps. */
+    APP = 'app',
+    /** The user is a regular user of the system. */
+    USER = 'user',
+    /** A special user type for bots. */
+    BOT = 'bot',
+    /** This usually represents a livechat guest. */
+    UNKNOWN = 'unknown',
+}
diff --git a/packages/apps-engine/src/definition/users/index.ts b/packages/apps-engine/src/definition/users/index.ts
new file mode 100644
index 000000000000..a2b54f7492db
--- /dev/null
+++ b/packages/apps-engine/src/definition/users/index.ts
@@ -0,0 +1,33 @@
+import { IPostUserCreated } from './IPostUserCreated';
+import { IPostUserDeleted } from './IPostUserDeleted';
+import { IPostUserLoggedIn } from './IPostUserLoggedIn';
+import { IPostUserLoggedOut } from './IPostUserLoggedOut';
+import { IPostUserStatusChanged } from './IPostUserStatusChanged';
+import { IPostUserUpdated } from './IPostUserUpdated';
+import { IUser } from './IUser';
+import { IUserContext } from './IUserContext';
+import { IUserCreationOptions } from './IUserCreationOptions';
+import { IUserEmail } from './IUserEmail';
+import { IUserLookup } from './IUserLookup';
+import { IUserStatusContext } from './IUserStatusContext';
+import { IUserUpdateContext } from './IUserUpdateContex';
+import { UserStatusConnection } from './UserStatusConnection';
+import { UserType } from './UserType';
+
+export {
+    IUser,
+    IUserEmail,
+    IUserLookup,
+    IUserCreationOptions,
+    UserStatusConnection,
+    UserType,
+    IPostUserCreated,
+    IPostUserUpdated,
+    IPostUserDeleted,
+    IPostUserLoggedIn,
+    IPostUserLoggedOut,
+    IPostUserStatusChanged,
+    IUserContext,
+    IUserUpdateContext,
+    IUserStatusContext,
+};
diff --git a/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts b/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts
new file mode 100644
index 000000000000..00ca57de8966
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts
@@ -0,0 +1,63 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
+import type { IBlock } from '../uikit';
+import type { VideoConference } from '../videoConferences/IVideoConference';
+import type { IVideoConferenceUser } from '../videoConferences/IVideoConferenceUser';
+import type { IVideoConferenceOptions } from './IVideoConferenceOptions';
+import type { VideoConfData, VideoConfDataExtended } from './VideoConfData';
+
+/**
+ * Represents a video conference provider
+ */
+export interface IVideoConfProvider {
+    name: string;
+
+    capabilities?: {
+        // Indicates if Rocket.Chat can determine if the user's microphone will start muted or not
+        mic?: boolean;
+        // Indicates if Rocket.Chat can determine if the user's camera will start turned on or not
+        cam?: boolean;
+        // Indicates if Rocket.Chat can send a custom title for the video conferences
+        title?: boolean;
+        // Indicates if the provider supports Rocket.Chat's Persistent Chat feature on its conferences.
+        persistentChat?: boolean;
+    };
+
+    // Optional function that can be used to determine if the provider is ready to use or still needs to be configured
+    isFullyConfigured?(read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<boolean>;
+
+    // Optional function to run when a new video conference is created on this provider
+    onNewVideoConference?(call: VideoConference, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<void>;
+
+    // Optional function to run when a video conference from this provider is changed by rocket.chat
+    onVideoConferenceChanged?(call: VideoConference, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<void>;
+
+    // Optional function to run when a new user joins a video conference from this provider
+    onUserJoin?(call: VideoConference, user: IVideoConferenceUser | undefined, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<void>;
+
+    // Optional function to run when the 'info' button of a video conference is clicked - must return blocks for a UiKit modal
+    getVideoConferenceInfo?(
+        call: VideoConference,
+        user: IVideoConferenceUser | undefined,
+        read: IRead,
+        modify: IModify,
+        http: IHttp,
+        persis: IPersistence,
+    ): Promise<Array<IBlock>>;
+
+    /**
+     * The function which gets called when a new video conference url is requested
+     */
+    generateUrl(call: VideoConfData, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<string>;
+    /**
+     * The function which gets called whenever a user join url is requested
+     */
+    customizeUrl(
+        call: VideoConfDataExtended,
+        user: IVideoConferenceUser | undefined,
+        options: IVideoConferenceOptions | undefined,
+        read: IRead,
+        modify: IModify,
+        http: IHttp,
+        persis: IPersistence,
+    ): Promise<string>;
+}
diff --git a/packages/apps-engine/src/definition/videoConfProviders/IVideoConferenceOptions.ts b/packages/apps-engine/src/definition/videoConfProviders/IVideoConferenceOptions.ts
new file mode 100644
index 000000000000..9dccc73f5fff
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConfProviders/IVideoConferenceOptions.ts
@@ -0,0 +1,4 @@
+export interface IVideoConferenceOptions {
+    mic?: boolean;
+    cam?: boolean;
+}
diff --git a/packages/apps-engine/src/definition/videoConfProviders/VideoConfData.ts b/packages/apps-engine/src/definition/videoConfProviders/VideoConfData.ts
new file mode 100644
index 000000000000..dc6f2cc6d47c
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConfProviders/VideoConfData.ts
@@ -0,0 +1,7 @@
+import type { IGroupVideoConference, IVideoConference } from '../videoConferences/IVideoConference';
+
+export type VideoConfData = Pick<IVideoConference, '_id' | 'type' | 'rid' | 'createdBy' | 'providerData' | 'discussionRid'> & {
+    title?: IGroupVideoConference['title'];
+};
+
+export type VideoConfDataExtended = VideoConfData & Required<Pick<IVideoConference, 'url'>>;
diff --git a/packages/apps-engine/src/definition/videoConfProviders/index.ts b/packages/apps-engine/src/definition/videoConfProviders/index.ts
new file mode 100644
index 000000000000..510182514c1f
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConfProviders/index.ts
@@ -0,0 +1,5 @@
+import { IVideoConfProvider } from './IVideoConfProvider';
+import { IVideoConferenceOptions } from './IVideoConferenceOptions';
+import { VideoConfData, VideoConfDataExtended } from './VideoConfData';
+
+export { IVideoConferenceOptions, IVideoConfProvider, VideoConfData, VideoConfDataExtended };
diff --git a/packages/apps-engine/src/definition/videoConferences/AppVideoConference.ts b/packages/apps-engine/src/definition/videoConferences/AppVideoConference.ts
new file mode 100644
index 000000000000..86640e000782
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConferences/AppVideoConference.ts
@@ -0,0 +1,6 @@
+import type { IGroupVideoConference } from './IVideoConference';
+
+// Type for video conferences being created by an app
+export type AppVideoConference = Pick<IGroupVideoConference, 'rid' | 'providerName' | 'providerData' | 'title' | 'discussionRid'> & {
+    createdBy: IGroupVideoConference['createdBy']['_id'];
+};
diff --git a/packages/apps-engine/src/definition/videoConferences/IVideoConference.ts b/packages/apps-engine/src/definition/videoConferences/IVideoConference.ts
new file mode 100644
index 000000000000..6f0286ae29cb
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConferences/IVideoConference.ts
@@ -0,0 +1,56 @@
+import type { IVideoConferenceUser } from './IVideoConferenceUser';
+
+export type VideoConferenceMember = IVideoConferenceUser & {
+    ts: Date;
+    avatarETag?: string;
+};
+
+export enum VideoConferenceStatus {
+    CALLING = 0,
+    STARTED = 1,
+    EXPIRED = 2,
+    ENDED = 3,
+    DECLINED = 4,
+}
+
+export interface IVideoConference {
+    _id: string;
+    _updatedAt: Date;
+    type: 'direct' | 'videoconference' | 'livechat';
+    rid: string;
+    users: Array<VideoConferenceMember>;
+    status: VideoConferenceStatus;
+    messages: {
+        started?: string;
+        ended?: string;
+    };
+    url?: string;
+
+    createdBy: IVideoConferenceUser;
+    createdAt: Date;
+
+    endedBy?: IVideoConferenceUser;
+    endedAt?: Date;
+
+    providerName: string;
+    providerData?: Record<string, any>;
+
+    ringing?: boolean;
+    discussionRid?: string;
+}
+
+export interface IDirectVideoConference extends IVideoConference {
+    type: 'direct';
+}
+
+export interface IGroupVideoConference extends IVideoConference {
+    type: 'videoconference';
+    anonymousUsers: number;
+    title: string;
+}
+
+export interface ILivechatVideoConference extends IVideoConference {
+    type: 'livechat';
+}
+
+export type VideoConference = IDirectVideoConference | IGroupVideoConference | ILivechatVideoConference;
diff --git a/packages/apps-engine/src/definition/videoConferences/IVideoConferenceUser.ts b/packages/apps-engine/src/definition/videoConferences/IVideoConferenceUser.ts
new file mode 100644
index 000000000000..86ab22435699
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConferences/IVideoConferenceUser.ts
@@ -0,0 +1,5 @@
+export interface IVideoConferenceUser {
+    _id: string;
+    username: string;
+    name: string;
+}
diff --git a/packages/apps-engine/src/definition/videoConferences/index.ts b/packages/apps-engine/src/definition/videoConferences/index.ts
new file mode 100644
index 000000000000..1b42fefac870
--- /dev/null
+++ b/packages/apps-engine/src/definition/videoConferences/index.ts
@@ -0,0 +1,5 @@
+import { AppVideoConference } from './AppVideoConference';
+import { IDirectVideoConference, IGroupVideoConference, IVideoConference, VideoConference } from './IVideoConference';
+import { IVideoConferenceUser } from './IVideoConferenceUser';
+
+export { AppVideoConference, IDirectVideoConference, IGroupVideoConference, IVideoConference, IVideoConferenceUser, VideoConference };
diff --git a/packages/apps-engine/src/lib/utils.ts b/packages/apps-engine/src/lib/utils.ts
new file mode 100644
index 000000000000..3e4c50523180
--- /dev/null
+++ b/packages/apps-engine/src/lib/utils.ts
@@ -0,0 +1 @@
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
diff --git a/packages/apps-engine/src/server/AppManager.ts b/packages/apps-engine/src/server/AppManager.ts
new file mode 100644
index 000000000000..69a264f29c1d
--- /dev/null
+++ b/packages/apps-engine/src/server/AppManager.ts
@@ -0,0 +1,1150 @@
+import { Buffer } from 'buffer';
+
+import { AppStatus, AppStatusUtils } from '../definition/AppStatus';
+import type { IAppInfo } from '../definition/metadata';
+import { AppMethod } from '../definition/metadata';
+import type { IPermission } from '../definition/permissions/IPermission';
+import type { IUser } from '../definition/users';
+import { UserType } from '../definition/users';
+import type { IGetAppsFilter } from './IGetAppsFilter';
+import { ProxiedApp } from './ProxiedApp';
+import type { PersistenceBridge, UserBridge } from './bridges';
+import { AppBridges } from './bridges';
+import type { IInternalPersistenceBridge } from './bridges/IInternalPersistenceBridge';
+import type { IInternalUserBridge } from './bridges/IInternalUserBridge';
+import { AppCompiler, AppFabricationFulfillment, AppPackageParser } from './compiler';
+import { InvalidLicenseError } from './errors';
+import { InvalidInstallationError } from './errors/InvalidInstallationError';
+import {
+    AppAccessorManager,
+    AppApiManager,
+    AppExternalComponentManager,
+    AppLicenseManager,
+    AppListenerManager,
+    AppSchedulerManager,
+    AppSettingsManager,
+    AppSlashCommandManager,
+    AppVideoConfProviderManager,
+} from './managers';
+import { AppRuntimeManager } from './managers/AppRuntimeManager';
+import { AppSignatureManager } from './managers/AppSignatureManager';
+import { UIActionButtonManager } from './managers/UIActionButtonManager';
+import type { IMarketplaceInfo } from './marketplace';
+import { defaultPermissions } from './permissions/AppPermissions';
+import type { DenoRuntimeSubprocessController } from './runtime/deno/AppsEngineDenoRuntime';
+import type { IAppStorageItem } from './storage';
+import { AppLogStorage, AppMetadataStorage } from './storage';
+import { AppSourceStorage } from './storage/AppSourceStorage';
+import { AppInstallationSource } from './storage/IAppStorageItem';
+
+export interface IAppInstallParameters {
+    enable: boolean;
+    marketplaceInfo?: IMarketplaceInfo;
+    permissionsGranted?: Array<IPermission>;
+    user: IUser;
+}
+
+export interface IAppUninstallParameters {
+    user: IUser;
+}
+
+export interface IAppManagerDeps {
+    metadataStorage: AppMetadataStorage;
+    logStorage: AppLogStorage;
+    bridges: AppBridges;
+    sourceStorage: AppSourceStorage;
+}
+
+interface IPurgeAppConfigOpts {
+    keepScheduledJobs?: boolean;
+}
+
+export class AppManager {
+    public static Instance: AppManager;
+
+    // apps contains all of the Apps
+    private readonly apps: Map<string, ProxiedApp>;
+
+    private readonly appMetadataStorage: AppMetadataStorage;
+
+    private appSourceStorage: AppSourceStorage;
+
+    private readonly logStorage: AppLogStorage;
+
+    private readonly bridges: AppBridges;
+
+    private readonly parser: AppPackageParser;
+
+    private readonly compiler: AppCompiler;
+
+    private readonly accessorManager: AppAccessorManager;
+
+    private readonly listenerManager: AppListenerManager;
+
+    private readonly commandManager: AppSlashCommandManager;
+
+    private readonly apiManager: AppApiManager;
+
+    private readonly externalComponentManager: AppExternalComponentManager;
+
+    private readonly settingsManager: AppSettingsManager;
+
+    private readonly licenseManager: AppLicenseManager;
+
+    private readonly schedulerManager: AppSchedulerManager;
+
+    private readonly uiActionButtonManager: UIActionButtonManager;
+
+    private readonly videoConfProviderManager: AppVideoConfProviderManager;
+
+    private readonly signatureManager: AppSignatureManager;
+
+    private readonly runtime: AppRuntimeManager;
+
+    private isLoaded: boolean;
+
+    constructor({ metadataStorage, logStorage, bridges, sourceStorage }: IAppManagerDeps) {
+        // Singleton style. There can only ever be one AppManager instance
+        if (typeof AppManager.Instance !== 'undefined') {
+            throw new Error('There is already a valid AppManager instance');
+        }
+
+        if (metadataStorage instanceof AppMetadataStorage) {
+            this.appMetadataStorage = metadataStorage;
+        } else {
+            throw new Error('Invalid instance of the AppMetadataStorage');
+        }
+
+        if (logStorage instanceof AppLogStorage) {
+            this.logStorage = logStorage;
+        } else {
+            throw new Error('Invalid instance of the AppLogStorage');
+        }
+
+        if (bridges instanceof AppBridges) {
+            this.bridges = bridges;
+        } else {
+            throw new Error('Invalid instance of the AppBridges');
+        }
+
+        if (sourceStorage instanceof AppSourceStorage) {
+            this.appSourceStorage = sourceStorage;
+        } else {
+            throw new Error('Invalid instance of the AppSourceStorage');
+        }
+
+        this.apps = new Map<string, ProxiedApp>();
+
+        this.parser = new AppPackageParser();
+        this.compiler = new AppCompiler();
+        this.accessorManager = new AppAccessorManager(this);
+        this.listenerManager = new AppListenerManager(this);
+        this.commandManager = new AppSlashCommandManager(this);
+        this.apiManager = new AppApiManager(this);
+        this.externalComponentManager = new AppExternalComponentManager();
+        this.settingsManager = new AppSettingsManager(this);
+        this.licenseManager = new AppLicenseManager(this);
+        this.schedulerManager = new AppSchedulerManager(this);
+        this.uiActionButtonManager = new UIActionButtonManager(this);
+        this.videoConfProviderManager = new AppVideoConfProviderManager(this);
+        this.signatureManager = new AppSignatureManager(this);
+        this.runtime = new AppRuntimeManager(this);
+
+        this.isLoaded = false;
+        AppManager.Instance = this;
+    }
+
+    /** Gets the instance of the storage connector. */
+    public getStorage(): AppMetadataStorage {
+        return this.appMetadataStorage;
+    }
+
+    /** Gets the instance of the log storage connector. */
+    public getLogStorage(): AppLogStorage {
+        return this.logStorage;
+    }
+
+    /** Gets the instance of the App package parser. */
+    public getParser(): AppPackageParser {
+        return this.parser;
+    }
+
+    /** Gets the compiler instance. */
+    public getCompiler(): AppCompiler {
+        return this.compiler;
+    }
+
+    /** Gets the accessor manager instance. */
+    public getAccessorManager(): AppAccessorManager {
+        return this.accessorManager;
+    }
+
+    /** Gets the instance of the Bridge manager. */
+    public getBridges(): AppBridges {
+        return this.bridges;
+    }
+
+    /** Gets the instance of the listener manager. */
+    public getListenerManager(): AppListenerManager {
+        return this.listenerManager;
+    }
+
+    /** Gets the command manager's instance. */
+    public getCommandManager(): AppSlashCommandManager {
+        return this.commandManager;
+    }
+
+    public getVideoConfProviderManager(): AppVideoConfProviderManager {
+        return this.videoConfProviderManager;
+    }
+
+    public getLicenseManager(): AppLicenseManager {
+        return this.licenseManager;
+    }
+
+    /** Gets the api manager's instance. */
+    public getApiManager(): AppApiManager {
+        return this.apiManager;
+    }
+
+    /** Gets the external component manager's instance. */
+    public getExternalComponentManager(): AppExternalComponentManager {
+        return this.externalComponentManager;
+    }
+
+    /** Gets the manager of the settings, updates and getting. */
+    public getSettingsManager(): AppSettingsManager {
+        return this.settingsManager;
+    }
+
+    public getSchedulerManager(): AppSchedulerManager {
+        return this.schedulerManager;
+    }
+
+    public getUIActionButtonManager(): UIActionButtonManager {
+        return this.uiActionButtonManager;
+    }
+
+    public getSignatureManager(): AppSignatureManager {
+        return this.signatureManager;
+    }
+
+    public getRuntime(): AppRuntimeManager {
+        return this.runtime;
+    }
+
+    /** Gets whether the Apps have been loaded or not. */
+    public areAppsLoaded(): boolean {
+        return this.isLoaded;
+    }
+
+    public setSourceStorage(storage: AppSourceStorage): void {
+        this.appSourceStorage = storage;
+    }
+
+    /**
+     * Goes through the entire loading up process.
+     * Expect this to take some time, as it goes through a very
+     * long process of loading all the Apps up.
+     */
+    public async load(): Promise<boolean> {
+        // You can not load the AppManager system again
+        // if it has already been loaded.
+        if (this.isLoaded) {
+            return true;
+        }
+
+        const items: Map<string, IAppStorageItem> = await this.appMetadataStorage.retrieveAll();
+
+        for (const item of items.values()) {
+            try {
+                const appPackage = await this.appSourceStorage.fetch(item);
+                const unpackageResult = await this.getParser().unpackageApp(appPackage);
+
+                const app = await this.getCompiler().toSandBox(this, item, unpackageResult);
+
+                this.apps.set(item.id, app);
+            } catch (e) {
+                console.warn(`Error while compiling the App "${item.info.name} (${item.id})":`);
+                console.error(e);
+
+                const prl = new ProxiedApp(this, item, {
+                    // Maybe we should have an "EmptyRuntime" class for this?
+                    getStatus() {
+                        return AppStatus.COMPILER_ERROR_DISABLED;
+                    },
+                } as unknown as DenoRuntimeSubprocessController);
+
+                this.apps.set(item.id, prl);
+            }
+        }
+
+        this.isLoaded = true;
+        return true;
+    }
+
+    public async enableAll(): Promise<Array<AppFabricationFulfillment>> {
+        const affs: Array<AppFabricationFulfillment> = [];
+
+        // Let's initialize them
+        for (const rl of this.apps.values()) {
+            const aff = new AppFabricationFulfillment();
+
+            aff.setAppInfo(rl.getInfo());
+            aff.setImplementedInterfaces(rl.getImplementationList());
+            aff.setApp(rl);
+            affs.push(aff);
+
+            if (AppStatusUtils.isDisabled(await rl.getStatus())) {
+                // Usually if an App is disabled before it's initialized,
+                // then something (such as an error) occured while
+                // it was compiled or something similar.
+                // We still have to validate its license, though
+                await rl.validateLicense();
+
+                continue;
+            }
+
+            await this.initializeApp(rl.getStorageItem(), rl, false, true).catch(console.error);
+        }
+
+        // Let's ensure the required settings are all set
+        for (const rl of this.apps.values()) {
+            if (AppStatusUtils.isDisabled(await rl.getStatus())) {
+                continue;
+            }
+
+            if (!this.areRequiredSettingsSet(rl.getStorageItem())) {
+                await rl.setStatus(AppStatus.INVALID_SETTINGS_DISABLED).catch(console.error);
+            }
+        }
+
+        // Now let's enable the apps which were once enabled
+        // but are not currently disabled.
+        for (const app of this.apps.values()) {
+            const status = await app.getStatus();
+            if (!AppStatusUtils.isDisabled(status) && AppStatusUtils.isEnabled(app.getPreviousStatus())) {
+                await this.enableApp(app.getStorageItem(), app, true, app.getPreviousStatus() === AppStatus.MANUALLY_ENABLED).catch(console.error);
+            } else if (!AppStatusUtils.isError(status)) {
+                this.listenerManager.lockEssentialEvents(app);
+                this.uiActionButtonManager.clearAppActionButtons(app.getID());
+            }
+        }
+
+        return affs;
+    }
+
+    public async unload(isManual: boolean): Promise<void> {
+        // If the AppManager hasn't been loaded yet, then
+        // there is nothing to unload
+        if (!this.isLoaded) {
+            return;
+        }
+
+        for (const app of this.apps.values()) {
+            const status = await app.getStatus();
+            if (status === AppStatus.INITIALIZED) {
+                await this.purgeAppConfig(app);
+            } else if (!AppStatusUtils.isDisabled(status)) {
+                await this.disable(app.getID(), isManual ? AppStatus.MANUALLY_DISABLED : AppStatus.DISABLED);
+            }
+
+            this.listenerManager.releaseEssentialEvents(app);
+
+            app.getDenoRuntime().stopApp();
+        }
+
+        // Remove all the apps from the system now that we have unloaded everything
+        this.apps.clear();
+
+        this.isLoaded = false;
+    }
+
+    /** Gets the Apps which match the filter passed in. */
+    public async get(filter?: IGetAppsFilter): Promise<ProxiedApp[]> {
+        let rls: Array<ProxiedApp> = [];
+
+        if (typeof filter === 'undefined') {
+            this.apps.forEach((rl) => rls.push(rl));
+
+            return rls;
+        }
+
+        let nothing = true;
+
+        if (typeof filter.enabled === 'boolean' && filter.enabled) {
+            for (const rl of this.apps.values()) {
+                if (AppStatusUtils.isEnabled(await rl.getStatus())) {
+                    rls.push(rl);
+                }
+            }
+
+            nothing = false;
+        }
+
+        if (typeof filter.disabled === 'boolean' && filter.disabled) {
+            for (const rl of this.apps.values()) {
+                if (AppStatusUtils.isDisabled(await rl.getStatus())) {
+                    rls.push(rl);
+                }
+            }
+
+            nothing = false;
+        }
+
+        if (nothing) {
+            this.apps.forEach((rl) => rls.push(rl));
+        }
+
+        if (typeof filter.ids !== 'undefined') {
+            rls = rls.filter((rl) => filter.ids.includes(rl.getID()));
+        }
+
+        if (typeof filter.name === 'string') {
+            rls = rls.filter((rl) => rl.getName() === filter.name);
+        } else if (filter.name instanceof RegExp) {
+            rls = rls.filter((rl) => (filter.name as RegExp).test(rl.getName()));
+        }
+
+        return rls;
+    }
+
+    /** Gets a single App by the id passed in. */
+    public getOneById(appId: string): ProxiedApp {
+        return this.apps.get(appId);
+    }
+
+    public getPermissionsById(appId: string): Array<IPermission> {
+        const app = this.apps.get(appId);
+
+        if (!app) {
+            return [];
+        }
+        const { permissionsGranted } = app.getStorageItem();
+
+        return permissionsGranted || defaultPermissions;
+    }
+
+    public async enable(id: string): Promise<boolean> {
+        const rl = this.apps.get(id);
+
+        if (!rl) {
+            throw new Error(`No App by the id "${id}" exists.`);
+        }
+
+        const status = await rl.getStatus();
+
+        if (AppStatusUtils.isEnabled(status)) {
+            return true;
+        }
+
+        if (status === AppStatus.COMPILER_ERROR_DISABLED) {
+            throw new Error('The App had compiler errors, can not enable it.');
+        }
+
+        const storageItem = await this.appMetadataStorage.retrieveOne(id);
+
+        if (!storageItem) {
+            throw new Error(`Could not enable an App with the id of "${id}" as it doesn't exist.`);
+        }
+
+        const isSetup = await this.runStartUpProcess(storageItem, rl, true, false);
+
+        if (isSetup) {
+            storageItem.status = await rl.getStatus();
+            // This is async, but we don't care since it only updates in the database
+            // and it should not mutate any properties we care about
+            await this.appMetadataStorage.update(storageItem).catch();
+        }
+
+        return isSetup;
+    }
+
+    public async disable(id: string, status: AppStatus = AppStatus.DISABLED, silent?: boolean): Promise<boolean> {
+        if (!AppStatusUtils.isDisabled(status)) {
+            throw new Error('Invalid disabled status');
+        }
+
+        const app = this.apps.get(id);
+
+        if (!app) {
+            throw new Error(`No App by the id "${id}" exists.`);
+        }
+
+        if (AppStatusUtils.isEnabled(await app.getStatus())) {
+            await app.call(AppMethod.ONDISABLE).catch((e) => console.warn('Error while disabling:', e));
+        }
+
+        await this.purgeAppConfig(app, { keepScheduledJobs: true });
+
+        await app.setStatus(status, silent);
+
+        const storageItem = await this.appMetadataStorage.retrieveOne(id);
+
+        app.getStorageItem().marketplaceInfo = storageItem.marketplaceInfo;
+        await app.validateLicense().catch();
+
+        storageItem.status = await app.getStatus();
+        // This is async, but we don't care since it only updates in the database
+        // and it should not mutate any properties we care about
+        await this.appMetadataStorage.update(storageItem).catch();
+
+        return true;
+    }
+
+    public async addLocal(appId: string): Promise<void> {
+        const storageItem = await this.appMetadataStorage.retrieveOne(appId);
+
+        if (!storageItem) {
+            throw new Error(`App with id ${appId} couldn't be found`);
+        }
+
+        const appPackage = await this.appSourceStorage.fetch(storageItem);
+
+        if (!appPackage) {
+            throw new Error(`Package file for app "${storageItem.info.name}" (${appId}) couldn't be found`);
+        }
+
+        const parsedPackage = await this.getParser().unpackageApp(appPackage);
+        const app = await this.getCompiler().toSandBox(this, storageItem, parsedPackage);
+
+        this.apps.set(app.getID(), app);
+
+        await this.loadOne(appId);
+    }
+
+    public async add(appPackage: Buffer, installationParameters: IAppInstallParameters): Promise<AppFabricationFulfillment> {
+        const { enable = true, marketplaceInfo, permissionsGranted, user } = installationParameters;
+
+        const aff = new AppFabricationFulfillment();
+        const result = await this.getParser().unpackageApp(appPackage);
+        const undoSteps: Array<() => void> = [];
+
+        aff.setAppInfo(result.info);
+        aff.setImplementedInterfaces(result.implemented.getValues());
+
+        const descriptor: IAppStorageItem = {
+            id: result.info.id,
+            info: result.info,
+            status: AppStatus.UNKNOWN,
+            settings: {},
+            implemented: result.implemented.getValues(),
+            installationSource: marketplaceInfo ? AppInstallationSource.MARKETPLACE : AppInstallationSource.PRIVATE,
+            marketplaceInfo,
+            permissionsGranted,
+            languageContent: result.languageContent,
+        };
+
+        try {
+            descriptor.sourcePath = await this.appSourceStorage.store(descriptor, appPackage);
+
+            undoSteps.push(() => this.appSourceStorage.remove(descriptor));
+        } catch (error) {
+            aff.setStorageError('Failed to store app package');
+
+            return aff;
+        }
+
+        // Now that is has all been compiled, let's get the
+        // the App instance from the source.
+        const app = await this.getCompiler().toSandBox(this, descriptor, result);
+
+        undoSteps.push(() =>
+            this.getRuntime()
+                .stopRuntime(app.getDenoRuntime())
+                .catch(() => {}),
+        );
+
+        // Create a user for the app
+        try {
+            await this.createAppUser(result.info);
+
+            undoSteps.push(() => this.removeAppUser(app));
+        } catch (err) {
+            aff.setAppUserError({
+                username: `${result.info.nameSlug}.bot`,
+                message: 'Failed to create an app user for this app.',
+            });
+
+            await Promise.all(undoSteps.map((undoer) => undoer()));
+
+            return aff;
+        }
+
+        descriptor.signature = await this.getSignatureManager().signApp(descriptor);
+        const created = await this.appMetadataStorage.create(descriptor);
+
+        if (!created) {
+            aff.setStorageError('Failed to create the App, the storage did not return it.');
+
+            await Promise.all(undoSteps.map((undoer) => undoer()));
+
+            return aff;
+        }
+
+        this.apps.set(app.getID(), app);
+        aff.setApp(app);
+
+        // Let everyone know that the App has been added
+        await this.bridges
+            .getAppActivationBridge()
+            .doAppAdded(app)
+            .catch(() => {
+                // If an error occurs during this, oh well.
+            });
+
+        await this.installApp(created, app, user);
+
+        // Should enable === true, then we go through the entire start up process
+        // Otherwise, we only initialize it.
+        if (enable) {
+            // Start up the app
+            await this.runStartUpProcess(created, app, false, false);
+        } else {
+            await this.initializeApp(created, app, true);
+        }
+
+        return aff;
+    }
+
+    /**
+     * Uninstalls specified app from the server and remove
+     * all database records regarding it
+     *
+     * @returns the instance of the removed ProxiedApp
+     */
+    public async remove(id: string, uninstallationParameters: IAppUninstallParameters): Promise<ProxiedApp> {
+        const app = this.apps.get(id);
+        const { user } = uninstallationParameters;
+
+        // First remove the app
+        await this.uninstallApp(app, user);
+        await this.removeLocal(id);
+
+        // Then let everyone know that the App has been removed
+        await this.bridges.getAppActivationBridge().doAppRemoved(app).catch();
+
+        return app;
+    }
+
+    /**
+     * Removes the app instance from the local Apps container
+     * and every type of data associated with it
+     */
+    public async removeLocal(id: string): Promise<void> {
+        const app = this.apps.get(id);
+
+        if (AppStatusUtils.isEnabled(await app.getStatus())) {
+            await this.disable(id);
+        }
+
+        await this.purgeAppConfig(app);
+        this.listenerManager.releaseEssentialEvents(app);
+        await this.removeAppUser(app);
+        await (this.bridges.getPersistenceBridge() as IInternalPersistenceBridge & PersistenceBridge).purge(app.getID());
+        await this.appMetadataStorage.remove(app.getID());
+        await this.appSourceStorage.remove(app.getStorageItem()).catch(() => {});
+
+        // Errors here don't really prevent the process from dying, so we don't really need to do anything on the catch
+        await this.getRuntime()
+            .stopRuntime(app.getDenoRuntime())
+            .catch(() => {});
+
+        this.apps.delete(app.getID());
+    }
+
+    public async update(
+        appPackage: Buffer,
+        permissionsGranted: Array<IPermission>,
+        updateOptions: { loadApp?: boolean; user?: IUser } = { loadApp: true },
+    ): Promise<AppFabricationFulfillment> {
+        const aff = new AppFabricationFulfillment();
+        const result = await this.getParser().unpackageApp(appPackage);
+
+        aff.setAppInfo(result.info);
+        aff.setImplementedInterfaces(result.implemented.getValues());
+
+        const old = await this.appMetadataStorage.retrieveOne(result.info.id);
+
+        if (!old) {
+            throw new Error('Can not update an App that does not currently exist.');
+        }
+
+        // If there is any error during disabling, it doesn't really matter
+        await this.disable(old.id).catch(() => {});
+
+        const descriptor: IAppStorageItem = {
+            ...old,
+            createdAt: old.createdAt,
+            id: result.info.id,
+            info: result.info,
+            status: (await this.apps.get(old.id)?.getStatus()) || old.status,
+            languageContent: result.languageContent,
+            settings: old.settings,
+            implemented: result.implemented.getValues(),
+            marketplaceInfo: old.marketplaceInfo,
+            sourcePath: old.sourcePath,
+            permissionsGranted,
+        };
+
+        try {
+            descriptor.sourcePath = await this.appSourceStorage.update(descriptor, appPackage);
+        } catch (error) {
+            aff.setStorageError('Failed to storage app package');
+
+            return aff;
+        }
+
+        descriptor.signature = await this.signatureManager.signApp(descriptor);
+        const stored = await this.appMetadataStorage.update(descriptor);
+
+        // Errors here don't really prevent the process from dying, so we don't really need to do anything on the catch
+        await this.getRuntime()
+            .stopRuntime(this.apps.get(old.id).getDenoRuntime())
+            .catch(() => {});
+
+        const app = await this.getCompiler().toSandBox(this, descriptor, result);
+
+        // Ensure there is an user for the app
+        try {
+            await this.createAppUser(result.info);
+        } catch (err) {
+            aff.setAppUserError({
+                username: `${result.info.nameSlug}.bot`,
+                message: 'Failed to create an app user for this app.',
+            });
+
+            return aff;
+        }
+
+        aff.setApp(app);
+
+        if (updateOptions.loadApp) {
+            await this.updateLocal(stored, app);
+
+            await this.bridges
+                .getAppActivationBridge()
+                .doAppUpdated(app)
+                .catch(() => {});
+        }
+
+        await this.updateApp(app, updateOptions.user, old.info.version);
+
+        return aff;
+    }
+
+    /**
+     * Updates the local instance of an app.
+     *
+     * If the second parameter is a Buffer of an app package,
+     * unpackage and instantiate the app's main class
+     *
+     * With an instance of a ProxiedApp, start it up and replace
+     * the reference in the local app collection
+     */
+    public async updateLocal(stored: IAppStorageItem, appPackageOrInstance: ProxiedApp | Buffer) {
+        const app = await (async () => {
+            if (appPackageOrInstance instanceof Buffer) {
+                const parseResult = await this.getParser().unpackageApp(appPackageOrInstance);
+
+                // Errors here don't really prevent the process from dying, so we don't really need to do anything on the catch
+                await this.getRuntime()
+                    .stopRuntime(this.apps.get(stored.id).getDenoRuntime())
+                    .catch(() => {});
+
+                return this.getCompiler().toSandBox(this, stored, parseResult);
+            }
+
+            return appPackageOrInstance;
+        })();
+
+        await this.purgeAppConfig(app, { keepScheduledJobs: true });
+
+        this.apps.set(app.getID(), app);
+
+        await this.runStartUpProcess(stored, app, false, true);
+    }
+
+    public getLanguageContent(): { [key: string]: object } {
+        const langs: { [key: string]: object } = {};
+
+        this.apps.forEach((rl) => {
+            const content = rl.getStorageItem().languageContent;
+
+            Object.keys(content).forEach((key) => {
+                langs[key] = Object.assign(langs[key] || {}, content[key]);
+            });
+        });
+
+        return langs;
+    }
+
+    public async changeStatus(appId: string, status: AppStatus): Promise<ProxiedApp> {
+        switch (status) {
+            case AppStatus.MANUALLY_DISABLED:
+            case AppStatus.MANUALLY_ENABLED:
+                break;
+            default:
+                throw new Error('Invalid status to change an App to, must be manually disabled or enabled.');
+        }
+
+        const rl = this.apps.get(appId);
+
+        if (!rl) {
+            throw new Error('Can not change the status of an App which does not currently exist.');
+        }
+
+        if (AppStatusUtils.isEnabled(status)) {
+            // Then enable it
+            if (AppStatusUtils.isEnabled(await rl.getStatus())) {
+                throw new Error('Can not enable an App which is already enabled.');
+            }
+
+            await this.enable(rl.getID());
+        } else {
+            if (!AppStatusUtils.isEnabled(await rl.getStatus())) {
+                throw new Error('Can not disable an App which is not enabled.');
+            }
+
+            await this.disable(rl.getID(), AppStatus.MANUALLY_DISABLED);
+        }
+
+        return rl;
+    }
+
+    public async updateAppsMarketplaceInfo(appsOverview: Array<{ latest: IMarketplaceInfo }>): Promise<void> {
+        await Promise.all(
+            appsOverview.map(async ({ latest: appInfo }) => {
+                if (!appInfo.subscriptionInfo) {
+                    return;
+                }
+
+                const app = this.apps.get(appInfo.id);
+
+                if (!app) {
+                    return;
+                }
+
+                const appStorageItem = app.getStorageItem();
+                const subscriptionInfo = appStorageItem.marketplaceInfo?.subscriptionInfo;
+
+                if (subscriptionInfo && subscriptionInfo.license.license === appInfo.subscriptionInfo.license.license) {
+                    return;
+                }
+
+                appStorageItem.marketplaceInfo.subscriptionInfo = appInfo.subscriptionInfo;
+
+                return this.appMetadataStorage.update(appStorageItem);
+            }),
+        ).catch();
+
+        const queue = [] as Array<Promise<void>>;
+
+        this.apps.forEach((app) =>
+            queue.push(
+                app
+                    .validateLicense()
+                    .then(async () => {
+                        if ((await app.getStatus()) !== AppStatus.INVALID_LICENSE_DISABLED) {
+                            return;
+                        }
+
+                        return app.setStatus(AppStatus.DISABLED);
+                    })
+                    .catch(async (error) => {
+                        if (!(error instanceof InvalidLicenseError)) {
+                            console.error(error);
+                            return;
+                        }
+
+                        await this.purgeAppConfig(app);
+
+                        return app.setStatus(AppStatus.INVALID_LICENSE_DISABLED);
+                    })
+                    .then(async () => {
+                        const status = await app.getStatus();
+                        if (status === app.getPreviousStatus()) {
+                            return;
+                        }
+
+                        const storageItem = app.getStorageItem();
+                        storageItem.status = status;
+
+                        return this.appMetadataStorage.update(storageItem).catch(console.error) as Promise<void>;
+                    }),
+            ),
+        );
+
+        await Promise.all(queue);
+    }
+
+    /**
+     * Goes through the entire loading up process.
+     *
+     * @param appId the id of the application to load
+     */
+    public async loadOne(appId: string): Promise<ProxiedApp> {
+        const rl = this.apps.get(appId);
+
+        if (!rl) {
+            throw new Error(`No App found by the id of: "${appId}"`);
+        }
+
+        const item = rl.getStorageItem();
+
+        await this.initializeApp(item, rl, false);
+
+        if (!this.areRequiredSettingsSet(item)) {
+            await rl.setStatus(AppStatus.INVALID_SETTINGS_DISABLED);
+        }
+
+        if (!AppStatusUtils.isDisabled(await rl.getStatus()) && AppStatusUtils.isEnabled(rl.getPreviousStatus())) {
+            await this.enableApp(item, rl, false, rl.getPreviousStatus() === AppStatus.MANUALLY_ENABLED);
+        }
+
+        return this.apps.get(item.id);
+    }
+
+    private async runStartUpProcess(storageItem: IAppStorageItem, app: ProxiedApp, isManual: boolean, silenceStatus: boolean): Promise<boolean> {
+        if ((await app.getStatus()) !== AppStatus.INITIALIZED) {
+            const isInitialized = await this.initializeApp(storageItem, app, true, silenceStatus);
+            if (!isInitialized) {
+                return false;
+            }
+        }
+
+        if (!this.areRequiredSettingsSet(storageItem)) {
+            await app.setStatus(AppStatus.INVALID_SETTINGS_DISABLED, silenceStatus);
+            return false;
+        }
+
+        return this.enableApp(storageItem, app, true, isManual, silenceStatus);
+    }
+
+    private async installApp(_storageItem: IAppStorageItem, app: ProxiedApp, user: IUser): Promise<boolean> {
+        let result: boolean;
+        const context = { user };
+
+        try {
+            await app.call(AppMethod.ONINSTALL, context);
+
+            result = true;
+        } catch (e) {
+            const status = AppStatus.ERROR_DISABLED;
+
+            result = false;
+
+            await app.setStatus(status);
+        }
+
+        return result;
+    }
+
+    private async updateApp(app: ProxiedApp, user: IUser | null, oldAppVersion: string): Promise<boolean> {
+        let result: boolean;
+
+        try {
+            await app.call(AppMethod.ONUPDATE, { oldAppVersion, user });
+
+            result = true;
+        } catch (e) {
+            const status = AppStatus.ERROR_DISABLED;
+
+            result = false;
+
+            await app.setStatus(status);
+        }
+
+        return result;
+    }
+
+    private async initializeApp(storageItem: IAppStorageItem, app: ProxiedApp, saveToDb = true, silenceStatus = false): Promise<boolean> {
+        let result: boolean;
+
+        try {
+            await app.validateLicense();
+            await app.validateInstallation();
+
+            await app.call(AppMethod.INITIALIZE);
+            await app.setStatus(AppStatus.INITIALIZED, silenceStatus);
+
+            result = true;
+        } catch (e) {
+            let status = AppStatus.ERROR_DISABLED;
+
+            if (e instanceof InvalidLicenseError) {
+                status = AppStatus.INVALID_LICENSE_DISABLED;
+            }
+
+            if (e instanceof InvalidInstallationError) {
+                status = AppStatus.INVALID_INSTALLATION_DISABLED;
+            }
+
+            await this.purgeAppConfig(app);
+            result = false;
+
+            await app.setStatus(status, silenceStatus);
+        }
+
+        if (saveToDb) {
+            // This is async, but we don't care since it only updates in the database
+            // and it should not mutate any properties we care about
+            storageItem.status = await app.getStatus();
+            await this.appMetadataStorage.update(storageItem).catch();
+        }
+
+        return result;
+    }
+
+    private async purgeAppConfig(app: ProxiedApp, opts: IPurgeAppConfigOpts = {}) {
+        if (!opts.keepScheduledJobs) {
+            await this.schedulerManager.cleanUp(app.getID());
+        }
+        this.listenerManager.unregisterListeners(app);
+        this.listenerManager.lockEssentialEvents(app);
+        await this.commandManager.unregisterCommands(app.getID());
+        this.externalComponentManager.unregisterExternalComponents(app.getID());
+        await this.apiManager.unregisterApis(app.getID());
+        this.accessorManager.purifyApp(app.getID());
+        this.uiActionButtonManager.clearAppActionButtons(app.getID());
+        this.videoConfProviderManager.unregisterProviders(app.getID());
+    }
+
+    /**
+     * Determines if the App's required settings are set or not.
+     * Should a packageValue be provided and not empty, then it's considered set.
+     */
+    private areRequiredSettingsSet(storageItem: IAppStorageItem): boolean {
+        let result = true;
+
+        for (const setk of Object.keys(storageItem.settings)) {
+            const sett = storageItem.settings[setk];
+            // If it's not required, ignore
+            if (!sett.required) {
+                continue;
+            }
+
+            if (sett.value !== 'undefined' || sett.packageValue !== 'undefined') {
+                continue;
+            }
+
+            result = false;
+        }
+
+        return result;
+    }
+
+    private async enableApp(storageItem: IAppStorageItem, app: ProxiedApp, saveToDb = true, isManual: boolean, silenceStatus = false): Promise<boolean> {
+        let enable: boolean;
+        let status = AppStatus.ERROR_DISABLED;
+
+        try {
+            await app.validateLicense();
+            await app.validateInstallation();
+
+            enable = (await app.call(AppMethod.ONENABLE)) as boolean;
+
+            if (enable) {
+                status = isManual ? AppStatus.MANUALLY_ENABLED : AppStatus.AUTO_ENABLED;
+            } else {
+                status = AppStatus.DISABLED;
+                console.warn(`The App (${app.getID()}) disabled itself when being enabled. \nCheck the "onEnable" implementation for details.`);
+            }
+        } catch (e) {
+            enable = false;
+
+            if (e instanceof InvalidLicenseError) {
+                status = AppStatus.INVALID_LICENSE_DISABLED;
+            }
+
+            if (e instanceof InvalidInstallationError) {
+                status = AppStatus.INVALID_INSTALLATION_DISABLED;
+            }
+
+            console.error(e);
+        }
+
+        if (enable) {
+            await this.commandManager.registerCommands(app.getID());
+            this.externalComponentManager.registerExternalComponents(app.getID());
+            await this.apiManager.registerApis(app.getID());
+            this.listenerManager.registerListeners(app);
+            this.listenerManager.releaseEssentialEvents(app);
+            this.videoConfProviderManager.registerProviders(app.getID());
+        } else {
+            await this.purgeAppConfig(app);
+        }
+
+        if (saveToDb) {
+            storageItem.status = status;
+            // This is async, but we don't care since it only updates in the database
+            // and it should not mutate any properties we care about
+            await this.appMetadataStorage.update(storageItem).catch();
+        }
+
+        await app.setStatus(status, silenceStatus);
+
+        return enable;
+    }
+
+    private async createAppUser(appInfo: IAppInfo): Promise<string> {
+        const appUser = await (this.bridges.getUserBridge() as IInternalUserBridge & UserBridge).getAppUser(appInfo.id);
+
+        if (appUser) {
+            return appUser.id;
+        }
+
+        const userData: Partial<IUser> = {
+            username: `${appInfo.nameSlug}.bot`,
+            name: appInfo.name,
+            roles: ['app'],
+            appId: appInfo.id,
+            type: UserType.APP,
+            status: 'online',
+            isEnabled: true,
+        };
+
+        return (this.bridges.getUserBridge() as IInternalUserBridge & UserBridge).create(userData, appInfo.id, {
+            avatarUrl: appInfo.iconFileContent || appInfo.iconFile,
+            joinDefaultChannels: true,
+            sendWelcomeEmail: false,
+        });
+    }
+
+    private async removeAppUser(app: ProxiedApp): Promise<boolean> {
+        const appUser = await (this.bridges.getUserBridge() as IInternalUserBridge & UserBridge).getAppUser(app.getID());
+
+        if (!appUser) {
+            return true;
+        }
+
+        return (this.bridges.getUserBridge() as IInternalUserBridge & UserBridge).remove(appUser, app.getID());
+    }
+
+    private async uninstallApp(app: ProxiedApp, user: IUser): Promise<boolean> {
+        let result: boolean;
+        const context = { user };
+
+        try {
+            await app.call(AppMethod.ONUNINSTALL, context);
+
+            result = true;
+        } catch (e) {
+            const status = AppStatus.ERROR_DISABLED;
+
+            result = false;
+
+            await app.setStatus(status);
+        }
+
+        return result;
+    }
+}
+
+export const getPermissionsByAppId = (appId: string) => {
+    if (!AppManager.Instance) {
+        console.error('AppManager should be instantiated first');
+        return [];
+    }
+    return AppManager.Instance.getPermissionsById(appId);
+};
diff --git a/packages/apps-engine/src/server/IGetAppsFilter.ts b/packages/apps-engine/src/server/IGetAppsFilter.ts
new file mode 100644
index 000000000000..4c2577ab0191
--- /dev/null
+++ b/packages/apps-engine/src/server/IGetAppsFilter.ts
@@ -0,0 +1,6 @@
+export interface IGetAppsFilter {
+    ids?: Array<string>;
+    name?: string | RegExp;
+    enabled?: boolean;
+    disabled?: boolean;
+}
diff --git a/packages/apps-engine/src/server/ProxiedApp.ts b/packages/apps-engine/src/server/ProxiedApp.ts
new file mode 100644
index 000000000000..86e54e802b2e
--- /dev/null
+++ b/packages/apps-engine/src/server/ProxiedApp.ts
@@ -0,0 +1,154 @@
+import type { AppStatus } from '../definition/AppStatus';
+import { AppsEngineException } from '../definition/exceptions';
+import type { IAppAuthorInfo, IAppInfo } from '../definition/metadata';
+import { AppMethod } from '../definition/metadata';
+import type { AppManager } from './AppManager';
+import { InvalidInstallationError } from './errors/InvalidInstallationError';
+import { AppConsole } from './logging';
+import { AppLicenseValidationResult } from './marketplace/license';
+import type { AppsEngineRuntime } from './runtime/AppsEngineRuntime';
+import { JSONRPC_METHOD_NOT_FOUND, type DenoRuntimeSubprocessController } from './runtime/deno/AppsEngineDenoRuntime';
+import type { IAppStorageItem } from './storage';
+
+export class ProxiedApp {
+    private previousStatus: AppStatus;
+
+    private latestLicenseValidationResult: AppLicenseValidationResult;
+
+    constructor(private readonly manager: AppManager, private storageItem: IAppStorageItem, private readonly appRuntime: DenoRuntimeSubprocessController) {
+        this.previousStatus = storageItem.status;
+    }
+
+    public getRuntime(): AppsEngineRuntime {
+        return this.manager.getRuntime();
+    }
+
+    public getDenoRuntime(): DenoRuntimeSubprocessController {
+        return this.appRuntime;
+    }
+
+    public getStorageItem(): IAppStorageItem {
+        return this.storageItem;
+    }
+
+    public setStorageItem(item: IAppStorageItem): void {
+        this.storageItem = item;
+    }
+
+    public getPreviousStatus(): AppStatus {
+        return this.previousStatus;
+    }
+
+    public getImplementationList(): { [inter: string]: boolean } {
+        return this.storageItem.implemented;
+    }
+
+    public setupLogger(method: `${AppMethod}`): AppConsole {
+        const logger = new AppConsole(method);
+
+        return logger;
+    }
+
+    // We'll need to refactor this method to remove the rest parameters so we can pass an options parameter
+    public async call(method: `${AppMethod}`, ...args: Array<any>): Promise<any> {
+        let options;
+
+        // Pre events need to be fast as they block the user
+        if (method.startsWith('checkPre') || method.startsWith('executePre')) {
+            options = { timeout: 1000 };
+        }
+
+        try {
+            return await this.appRuntime.sendRequest({ method: `app:${method}`, params: args }, options);
+        } catch (e) {
+            if (e.code === AppsEngineException.JSONRPC_ERROR_CODE) {
+                throw new AppsEngineException(e.message);
+            }
+
+            if (e.code === JSONRPC_METHOD_NOT_FOUND) {
+                throw e;
+            }
+
+            // We cannot throw this error as the previous implementation swallowed those
+            // and since the server is not prepared to handle those we might crash it if we throw
+            // Range of JSON-RPC error codes: https://www.jsonrpc.org/specification#error_object
+            if (e.code >= -32999 || e.code <= -32000) {
+                // we really need to receive a logger from rocket.chat
+                console.error('JSON-RPC error received: ', e);
+            }
+        }
+    }
+
+    public async getStatus(): Promise<AppStatus> {
+        return this.appRuntime.getStatus();
+    }
+
+    public async setStatus(status: AppStatus, silent?: boolean): Promise<void> {
+        await this.call(AppMethod.SETSTATUS, status);
+
+        if (!silent) {
+            await this.manager.getBridges().getAppActivationBridge().doAppStatusChanged(this, status);
+        }
+    }
+
+    public getName(): string {
+        return this.storageItem.info.name;
+    }
+
+    public getNameSlug(): string {
+        return this.storageItem.info.nameSlug;
+    }
+
+    // @deprecated This method will be removed in the next major version
+    public getAppUserUsername(): string {
+        return `${this.storageItem.info.nameSlug}.bot`;
+    }
+
+    public getID(): string {
+        return this.storageItem.id;
+    }
+
+    public getVersion(): string {
+        return this.storageItem.info.version;
+    }
+
+    public getDescription(): string {
+        return this.storageItem.info.description;
+    }
+
+    public getRequiredApiVersion(): string {
+        return this.storageItem.info.requiredApiVersion;
+    }
+
+    public getAuthorInfo(): IAppAuthorInfo {
+        return this.storageItem.info.author;
+    }
+
+    public getInfo(): IAppInfo {
+        return this.storageItem.info;
+    }
+
+    public getEssentials(): IAppInfo['essentials'] {
+        return this.getInfo().essentials;
+    }
+
+    public getLatestLicenseValidationResult(): AppLicenseValidationResult {
+        return this.latestLicenseValidationResult;
+    }
+
+    public async validateInstallation(): Promise<void> {
+        try {
+            await this.manager.getSignatureManager().verifySignedApp(this.getStorageItem());
+        } catch (e) {
+            throw new InvalidInstallationError(e.message);
+        }
+    }
+
+    public validateLicense(): Promise<void> {
+        const { marketplaceInfo } = this.getStorageItem();
+
+        this.latestLicenseValidationResult = new AppLicenseValidationResult();
+
+        return this.manager.getLicenseManager().validate(this.latestLicenseValidationResult, marketplaceInfo);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ApiExtend.ts b/packages/apps-engine/src/server/accessors/ApiExtend.ts
new file mode 100644
index 000000000000..4c8951338a90
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ApiExtend.ts
@@ -0,0 +1,11 @@
+import type { IApiExtend } from '../../definition/accessors';
+import type { IApi } from '../../definition/api';
+import type { AppApiManager } from '../managers/AppApiManager';
+
+export class ApiExtend implements IApiExtend {
+    constructor(private readonly manager: AppApiManager, private readonly appId: string) {}
+
+    public provideApi(api: IApi): Promise<void> {
+        return Promise.resolve(this.manager.addApi(this.appId, api));
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/AppAccessors.ts b/packages/apps-engine/src/server/accessors/AppAccessors.ts
new file mode 100644
index 000000000000..911087df4332
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/AppAccessors.ts
@@ -0,0 +1,36 @@
+import type { IAppAccessors, IEnvironmentRead, IEnvironmentWrite, IHttp, IRead } from '../../definition/accessors';
+import type { IApiEndpointMetadata } from '../../definition/api';
+import type { AppManager } from '../AppManager';
+import type { AppAccessorManager } from '../managers/AppAccessorManager';
+import type { AppApiManager } from '../managers/AppApiManager';
+
+export class AppAccessors implements IAppAccessors {
+    private accessorManager: AppAccessorManager;
+
+    private apiManager: AppApiManager;
+
+    constructor(manager: AppManager, private readonly appId: string) {
+        this.accessorManager = manager.getAccessorManager();
+        this.apiManager = manager.getApiManager();
+    }
+
+    public get environmentReader(): IEnvironmentRead {
+        return this.accessorManager.getEnvironmentRead(this.appId);
+    }
+
+    public get environmentWriter(): IEnvironmentWrite {
+        return this.accessorManager.getEnvironmentWrite(this.appId);
+    }
+
+    public get reader(): IRead {
+        return this.accessorManager.getReader(this.appId);
+    }
+
+    public get http(): IHttp {
+        return this.accessorManager.getHttp(this.appId);
+    }
+
+    public get providedApiEndpoints(): Array<IApiEndpointMetadata> {
+        return this.apiManager.listApis(this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts b/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts
new file mode 100644
index 000000000000..fc0e7ba1b8ad
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts
@@ -0,0 +1,11 @@
+import type { ICloudWorkspaceRead } from '../../definition/accessors/ICloudWorkspaceRead';
+import type { IWorkspaceToken } from '../../definition/cloud/IWorkspaceToken';
+import type { CloudWorkspaceBridge } from '../bridges/CloudWorkspaceBridge';
+
+export class CloudWorkspaceRead implements ICloudWorkspaceRead {
+    constructor(private readonly cloudBridge: CloudWorkspaceBridge, private readonly appId: string) {}
+
+    public async getWorkspaceToken(scope: string): Promise<IWorkspaceToken> {
+        return this.cloudBridge.doGetWorkspaceToken(scope, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ConfigurationExtend.ts b/packages/apps-engine/src/server/accessors/ConfigurationExtend.ts
new file mode 100644
index 000000000000..896f3b5e38ee
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ConfigurationExtend.ts
@@ -0,0 +1,24 @@
+import type {
+    IApiExtend,
+    IConfigurationExtend,
+    IExternalComponentsExtend,
+    IHttpExtend,
+    ISchedulerExtend,
+    ISettingsExtend,
+    ISlashCommandsExtend,
+    IUIExtend,
+    IVideoConfProvidersExtend,
+} from '../../definition/accessors';
+
+export class ConfigurationExtend implements IConfigurationExtend {
+    constructor(
+        public readonly http: IHttpExtend,
+        public readonly settings: ISettingsExtend,
+        public readonly slashCommands: ISlashCommandsExtend,
+        public readonly api: IApiExtend,
+        public readonly externalComponents: IExternalComponentsExtend,
+        public readonly scheduler: ISchedulerExtend,
+        public readonly ui: IUIExtend,
+        public readonly videoConfProviders: IVideoConfProvidersExtend,
+    ) {}
+}
diff --git a/packages/apps-engine/src/server/accessors/ConfigurationModify.ts b/packages/apps-engine/src/server/accessors/ConfigurationModify.ts
new file mode 100644
index 000000000000..ade2be312b3a
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ConfigurationModify.ts
@@ -0,0 +1,9 @@
+import type { IConfigurationModify, ISchedulerModify, IServerSettingsModify, ISlashCommandsModify } from '../../definition/accessors';
+
+export class ConfigurationModify implements IConfigurationModify {
+    constructor(
+        public readonly serverSettings: IServerSettingsModify,
+        public readonly slashCommands: ISlashCommandsModify,
+        public readonly scheduler: ISchedulerModify,
+    ) {}
+}
diff --git a/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts b/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts
new file mode 100644
index 000000000000..fa616ce3ca19
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts
@@ -0,0 +1,47 @@
+import type { IDiscussionBuilder } from '../../definition/accessors';
+import type { IMessage } from '../../definition/messages';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import { RoomType } from '../../definition/rooms';
+import type { IRoom } from '../../definition/rooms/IRoom';
+import { RoomBuilder } from './RoomBuilder';
+
+export class DiscussionBuilder extends RoomBuilder implements IDiscussionBuilder {
+    public kind: RocketChatAssociationModel.DISCUSSION;
+
+    private reply: string;
+
+    private parentMessage: IMessage;
+
+    constructor(data?: Partial<IRoom>) {
+        super(data);
+        this.kind = RocketChatAssociationModel.DISCUSSION;
+        this.room.type = RoomType.PRIVATE_GROUP;
+    }
+
+    public setParentRoom(parentRoom: IRoom): IDiscussionBuilder {
+        this.room.parentRoom = parentRoom;
+        return this;
+    }
+
+    public getParentRoom(): IRoom {
+        return this.room.parentRoom;
+    }
+
+    public setReply(reply: string): IDiscussionBuilder {
+        this.reply = reply;
+        return this;
+    }
+
+    public getReply(): string {
+        return this.reply;
+    }
+
+    public setParentMessage(parentMessage: IMessage): IDiscussionBuilder {
+        this.parentMessage = parentMessage;
+        return this;
+    }
+
+    public getParentMessage(): IMessage {
+        return this.parentMessage;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/EmailCreator.ts b/packages/apps-engine/src/server/accessors/EmailCreator.ts
new file mode 100644
index 000000000000..6d481db605e1
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/EmailCreator.ts
@@ -0,0 +1,11 @@
+import type { IEmailCreator } from '../../definition/accessors/IEmailCreator';
+import type { IEmail } from '../../definition/email';
+import type { AppBridges } from '../bridges';
+
+export class EmailCreator implements IEmailCreator {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public async send(email: IEmail): Promise<void> {
+        return this.bridges.getEmailBridge().doSendEmail(email, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/EnvironmentRead.ts b/packages/apps-engine/src/server/accessors/EnvironmentRead.ts
new file mode 100644
index 000000000000..12ad248a8b20
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/EnvironmentRead.ts
@@ -0,0 +1,21 @@
+import type { IEnvironmentalVariableRead, IEnvironmentRead, IServerSettingRead, ISettingRead } from '../../definition/accessors';
+
+export class EnvironmentRead implements IEnvironmentRead {
+    constructor(
+        private readonly settings: ISettingRead,
+        private readonly serverSettings: IServerSettingRead,
+        private readonly envRead: IEnvironmentalVariableRead,
+    ) {}
+
+    public getSettings(): ISettingRead {
+        return this.settings;
+    }
+
+    public getServerSettings(): IServerSettingRead {
+        return this.serverSettings;
+    }
+
+    public getEnvironmentVariables(): IEnvironmentalVariableRead {
+        return this.envRead;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts b/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts
new file mode 100644
index 000000000000..6b6a833b36a6
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts
@@ -0,0 +1,13 @@
+import type { IEnvironmentWrite, IServerSettingUpdater, ISettingUpdater } from '../../definition/accessors';
+
+export class EnvironmentWrite implements IEnvironmentWrite {
+    constructor(private readonly settings: ISettingUpdater, private readonly serverSettings: IServerSettingUpdater) {}
+
+    public getSettings(): ISettingUpdater {
+        return this.settings;
+    }
+
+    public getServerSettings(): IServerSettingUpdater {
+        return this.serverSettings;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts b/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts
new file mode 100644
index 000000000000..2b8b917b7290
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts
@@ -0,0 +1,18 @@
+import type { IEnvironmentalVariableRead } from '../../definition/accessors';
+import type { EnvironmentalVariableBridge } from '../bridges';
+
+export class EnvironmentalVariableRead implements IEnvironmentalVariableRead {
+    constructor(private readonly bridge: EnvironmentalVariableBridge, private readonly appId: string) {}
+
+    public getValueByName(envVarName: string): Promise<string> {
+        return this.bridge.doGetValueByName(envVarName, this.appId);
+    }
+
+    public isReadable(envVarName: string): Promise<boolean> {
+        return this.bridge.doIsReadable(envVarName, this.appId);
+    }
+
+    public isSet(envVarName: string): Promise<boolean> {
+        return this.bridge.doIsSet(envVarName, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts b/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts
new file mode 100644
index 000000000000..29fba0b9353f
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts
@@ -0,0 +1,11 @@
+import type { IExternalComponentsExtend } from '../../definition/accessors';
+import type { IExternalComponent } from '../../definition/externalComponent/IExternalComponent';
+import type { AppExternalComponentManager } from '../managers/AppExternalComponentManager';
+
+export class ExternalComponentsExtend implements IExternalComponentsExtend {
+    constructor(private readonly manager: AppExternalComponentManager, private readonly appId: string) {}
+
+    public async register(externalComponent: IExternalComponent): Promise<void> {
+        return Promise.resolve(this.manager.addExternalComponent(this.appId, externalComponent));
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/Http.ts b/packages/apps-engine/src/server/accessors/Http.ts
new file mode 100644
index 000000000000..c5710e70ec80
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/Http.ts
@@ -0,0 +1,77 @@
+import type { IHttp, IHttpExtend, IHttpRequest, IHttpResponse } from '../../definition/accessors';
+import { RequestMethod } from '../../definition/accessors';
+import type { AppBridges } from '../bridges/AppBridges';
+import type { AppAccessorManager } from '../managers/AppAccessorManager';
+
+export class Http implements IHttp {
+    constructor(
+        private readonly accessManager: AppAccessorManager,
+        private readonly bridges: AppBridges,
+        private readonly httpExtender: IHttpExtend,
+        private readonly appId: string,
+    ) {}
+
+    public get(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, RequestMethod.GET, options);
+    }
+
+    public put(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, RequestMethod.PUT, options);
+    }
+
+    public post(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, RequestMethod.POST, options);
+    }
+
+    public del(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, RequestMethod.DELETE, options);
+    }
+
+    public patch(url: string, options?: IHttpRequest): Promise<IHttpResponse> {
+        return this._processHandler(url, RequestMethod.PATCH, options);
+    }
+
+    private async _processHandler(url: string, method: RequestMethod, options?: IHttpRequest): Promise<IHttpResponse> {
+        let request = options || {};
+
+        if (typeof request.headers === 'undefined') {
+            request.headers = {};
+        }
+
+        this.httpExtender.getDefaultHeaders().forEach((value: string, key: string) => {
+            if (typeof request.headers[key] !== 'string') {
+                request.headers[key] = value;
+            }
+        });
+
+        if (typeof request.params === 'undefined') {
+            request.params = {};
+        }
+
+        this.httpExtender.getDefaultParams().forEach((value: string, key: string) => {
+            if (typeof request.params[key] !== 'string') {
+                request.params[key] = value;
+            }
+        });
+
+        const reader = this.accessManager.getReader(this.appId);
+        const persis = this.accessManager.getPersistence(this.appId);
+
+        for (const handler of this.httpExtender.getPreRequestHandlers()) {
+            request = await handler.executePreHttpRequest(url, request, reader, persis);
+        }
+
+        let response = await this.bridges.getHttpBridge().doCall({
+            appId: this.appId,
+            method,
+            url,
+            request,
+        });
+
+        for (const handler of this.httpExtender.getPreResponseHandlers()) {
+            response = await handler.executePreHttpResponse(response, reader, persis);
+        }
+
+        return response;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/HttpExtend.ts b/packages/apps-engine/src/server/accessors/HttpExtend.ts
new file mode 100644
index 000000000000..3904d3de3906
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/HttpExtend.ts
@@ -0,0 +1,58 @@
+import type { IHttpExtend, IHttpPreRequestHandler, IHttpPreResponseHandler } from '../../definition/accessors';
+
+export class HttpExtend implements IHttpExtend {
+    private headers: Map<string, string>;
+
+    private params: Map<string, string>;
+
+    private requests: Array<IHttpPreRequestHandler>;
+
+    private responses: Array<IHttpPreResponseHandler>;
+
+    constructor() {
+        this.headers = new Map<string, string>();
+        this.params = new Map<string, string>();
+        this.requests = [];
+        this.responses = [];
+    }
+
+    public provideDefaultHeader(key: string, value: string): void {
+        this.headers.set(key, value);
+    }
+
+    public provideDefaultHeaders(headers: { [key: string]: string }): void {
+        Object.keys(headers).forEach((key) => this.headers.set(key, headers[key]));
+    }
+
+    public provideDefaultParam(key: string, value: string): void {
+        this.params.set(key, value);
+    }
+
+    public provideDefaultParams(params: { [key: string]: string }): void {
+        Object.keys(params).forEach((key) => this.params.set(key, params[key]));
+    }
+
+    public providePreRequestHandler(handler: IHttpPreRequestHandler): void {
+        this.requests.push(handler);
+    }
+
+    public providePreResponseHandler(handler: IHttpPreResponseHandler): void {
+        this.responses.push(handler);
+    }
+
+    public getDefaultHeaders(): Map<string, string> {
+        return new Map<string, string>(this.headers);
+    }
+
+    public getDefaultParams(): Map<string, string> {
+        return new Map<string, string>(this.params);
+    }
+
+    public getPreRequestHandlers(): Array<IHttpPreRequestHandler> {
+        return Array.from(this.requests);
+    }
+
+    public getPreResponseHandlers(): Array<IHttpPreResponseHandler> {
+        return Array.from(this.responses);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/LivechatCreator.ts b/packages/apps-engine/src/server/accessors/LivechatCreator.ts
new file mode 100644
index 000000000000..8cd527159662
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/LivechatCreator.ts
@@ -0,0 +1,29 @@
+import type { ILivechatCreator } from '../../definition/accessors';
+import type { IExtraRoomParams } from '../../definition/accessors/ILivechatCreator';
+import type { ILivechatRoom } from '../../definition/livechat/ILivechatRoom';
+import type { IVisitor } from '../../definition/livechat/IVisitor';
+import type { IUser } from '../../definition/users';
+import type { AppBridges } from '../bridges';
+
+export class LivechatCreator implements ILivechatCreator {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public createRoom(visitor: IVisitor, agent: IUser, extraParams?: IExtraRoomParams): Promise<ILivechatRoom> {
+        return this.bridges.getLivechatBridge().doCreateRoom(visitor, agent, this.appId, extraParams);
+    }
+
+    /**
+     * @deprecated Use `createAndReturnVisitor` instead.
+     */
+    public createVisitor(visitor: IVisitor): Promise<string> {
+        return this.bridges.getLivechatBridge().doCreateVisitor(visitor, this.appId);
+    }
+
+    public createAndReturnVisitor(visitor: IVisitor): Promise<IVisitor | undefined> {
+        return this.bridges.getLivechatBridge().doCreateAndReturnVisitor(visitor, this.appId);
+    }
+
+    public createToken(): string {
+        return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts b/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts
new file mode 100644
index 000000000000..a271da344baa
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts
@@ -0,0 +1,191 @@
+import type { ILivechatMessageBuilder, IMessageBuilder } from '../../definition/accessors';
+import type { ILivechatMessage } from '../../definition/livechat/ILivechatMessage';
+import type { IVisitor } from '../../definition/livechat/IVisitor';
+import type { IMessage, IMessageAttachment } from '../../definition/messages';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IRoom } from '../../definition/rooms';
+import { RoomType } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import { MessageBuilder } from './MessageBuilder';
+
+export class LivechatMessageBuilder implements ILivechatMessageBuilder {
+    public kind: RocketChatAssociationModel.LIVECHAT_MESSAGE;
+
+    private msg: ILivechatMessage;
+
+    constructor(message?: ILivechatMessage) {
+        this.kind = RocketChatAssociationModel.LIVECHAT_MESSAGE;
+        this.msg = message || ({} as ILivechatMessage);
+    }
+
+    public setData(data: ILivechatMessage): ILivechatMessageBuilder {
+        delete data.id;
+        this.msg = data;
+
+        return this;
+    }
+
+    public setRoom(room: IRoom): ILivechatMessageBuilder {
+        this.msg.room = room;
+        return this;
+    }
+
+    public getRoom(): IRoom {
+        return this.msg.room;
+    }
+
+    public setSender(sender: IUser): ILivechatMessageBuilder {
+        this.msg.sender = sender;
+        delete this.msg.visitor;
+
+        return this;
+    }
+
+    public getSender(): IUser {
+        return this.msg.sender;
+    }
+
+    public setText(text: string): ILivechatMessageBuilder {
+        this.msg.text = text;
+        return this;
+    }
+
+    public getText(): string {
+        return this.msg.text;
+    }
+
+    public setEmojiAvatar(emoji: string): ILivechatMessageBuilder {
+        this.msg.emoji = emoji;
+        return this;
+    }
+
+    public getEmojiAvatar(): string {
+        return this.msg.emoji;
+    }
+
+    public setAvatarUrl(avatarUrl: string): ILivechatMessageBuilder {
+        this.msg.avatarUrl = avatarUrl;
+        return this;
+    }
+
+    public getAvatarUrl(): string {
+        return this.msg.avatarUrl;
+    }
+
+    public setUsernameAlias(alias: string): ILivechatMessageBuilder {
+        this.msg.alias = alias;
+        return this;
+    }
+
+    public getUsernameAlias(): string {
+        return this.msg.alias;
+    }
+
+    public addAttachment(attachment: IMessageAttachment): ILivechatMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        this.msg.attachments.push(attachment);
+        return this;
+    }
+
+    public setAttachments(attachments: Array<IMessageAttachment>): ILivechatMessageBuilder {
+        this.msg.attachments = attachments;
+        return this;
+    }
+
+    public getAttachments(): Array<IMessageAttachment> {
+        return this.msg.attachments;
+    }
+
+    public replaceAttachment(position: number, attachment: IMessageAttachment): ILivechatMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to replace.`);
+        }
+
+        this.msg.attachments[position] = attachment;
+        return this;
+    }
+
+    public removeAttachment(position: number): ILivechatMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to remove.`);
+        }
+
+        this.msg.attachments.splice(position, 1);
+
+        return this;
+    }
+
+    public setEditor(user: IUser): ILivechatMessageBuilder {
+        this.msg.editor = user;
+        return this;
+    }
+
+    public getEditor(): IUser {
+        return this.msg.editor;
+    }
+
+    public setGroupable(groupable: boolean): ILivechatMessageBuilder {
+        this.msg.groupable = groupable;
+        return this;
+    }
+
+    public getGroupable(): boolean {
+        return this.msg.groupable;
+    }
+
+    public setParseUrls(parseUrls: boolean): ILivechatMessageBuilder {
+        this.msg.parseUrls = parseUrls;
+        return this;
+    }
+
+    public getParseUrls(): boolean {
+        return this.msg.parseUrls;
+    }
+
+    public setToken(token: string): ILivechatMessageBuilder {
+        this.msg.token = token;
+        return this;
+    }
+
+    public getToken(): string {
+        return this.msg.token;
+    }
+
+    public setVisitor(visitor: IVisitor): ILivechatMessageBuilder {
+        this.msg.visitor = visitor;
+        delete this.msg.sender;
+
+        return this;
+    }
+
+    public getVisitor(): IVisitor {
+        return this.msg.visitor;
+    }
+
+    public getMessage(): ILivechatMessage {
+        if (!this.msg.room) {
+            throw new Error('The "room" property is required.');
+        }
+
+        if (this.msg.room.type !== RoomType.LIVE_CHAT) {
+            throw new Error('The room is not a Livechat room');
+        }
+
+        return this.msg;
+    }
+
+    public getMessageBuilder(): IMessageBuilder {
+        return new MessageBuilder(this.msg as IMessage);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/LivechatRead.ts b/packages/apps-engine/src/server/accessors/LivechatRead.ts
new file mode 100644
index 000000000000..3d9421ff9e4c
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/LivechatRead.ts
@@ -0,0 +1,73 @@
+import type { ILivechatRead } from '../../definition/accessors/ILivechatRead';
+import type { IDepartment } from '../../definition/livechat';
+import type { ILivechatRoom } from '../../definition/livechat/ILivechatRoom';
+import type { IVisitor } from '../../definition/livechat/IVisitor';
+import type { IMessage } from '../../definition/messages';
+import type { LivechatBridge } from '../bridges/LivechatBridge';
+
+export class LivechatRead implements ILivechatRead {
+    constructor(private readonly livechatBridge: LivechatBridge, private readonly appId: string) {}
+
+    /**
+     * @deprecated please use the `isOnlineAsync` method instead.
+     * In the next major, this method will be `async`
+     */
+    public isOnline(departmentId?: string): boolean {
+        console.warn("The `LivechatRead.isOnline` method is deprecated and won't behave as intended. Please use `LivechatRead.isOnlineAsync` instead");
+
+        return this.livechatBridge.doIsOnline(departmentId, this.appId);
+    }
+
+    public isOnlineAsync(departmentId?: string): Promise<boolean> {
+        return this.livechatBridge.doIsOnlineAsync(departmentId, this.appId);
+    }
+
+    public getDepartmentsEnabledWithAgents(): Promise<Array<IDepartment>> {
+        return this.livechatBridge.doFindDepartmentsEnabledWithAgents(this.appId);
+    }
+
+    public getLivechatRooms(visitor: IVisitor, departmentId?: string): Promise<Array<ILivechatRoom>> {
+        return this.livechatBridge.doFindRooms(visitor, departmentId, this.appId);
+    }
+
+    public getLivechatTotalOpenRoomsByAgentId(agentId: string): Promise<number> {
+        return this.livechatBridge.doCountOpenRoomsByAgentId(agentId, this.appId);
+    }
+
+    public getLivechatOpenRoomsByAgentId(agentId: string): Promise<Array<ILivechatRoom>> {
+        return this.livechatBridge.doFindOpenRoomsByAgentId(agentId, this.appId);
+    }
+
+    /**
+     * @deprecated This method does not adhere to the conversion practices applied
+     * elsewhere in the Apps-Engine and will be removed in the next major version.
+     * Prefer the alternative methods to fetch visitors.
+     */
+    public getLivechatVisitors(query: object): Promise<Array<IVisitor>> {
+        return this.livechatBridge.doFindVisitors(query, this.appId);
+    }
+
+    public getLivechatVisitorById(id: string): Promise<IVisitor | undefined> {
+        return this.livechatBridge.doFindVisitorById(id, this.appId);
+    }
+
+    public getLivechatVisitorByEmail(email: string): Promise<IVisitor | undefined> {
+        return this.livechatBridge.doFindVisitorByEmail(email, this.appId);
+    }
+
+    public getLivechatVisitorByToken(token: string): Promise<IVisitor | undefined> {
+        return this.livechatBridge.doFindVisitorByToken(token, this.appId);
+    }
+
+    public getLivechatVisitorByPhoneNumber(phoneNumber: string): Promise<IVisitor | undefined> {
+        return this.livechatBridge.doFindVisitorByPhoneNumber(phoneNumber, this.appId);
+    }
+
+    public getLivechatDepartmentByIdOrName(value: string): Promise<IDepartment | undefined> {
+        return this.livechatBridge.doFindDepartmentByIdOrName(value, this.appId);
+    }
+
+    public _fetchLivechatRoomMessages(roomId: string): Promise<Array<IMessage>> {
+        return this.livechatBridge.do_fetchLivechatRoomMessages(this.appId, roomId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/LivechatUpdater.ts b/packages/apps-engine/src/server/accessors/LivechatUpdater.ts
new file mode 100644
index 000000000000..684bdb2903e1
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/LivechatUpdater.ts
@@ -0,0 +1,23 @@
+import type { ILivechatUpdater } from '../../definition/accessors';
+import type { ILivechatRoom, ILivechatTransferData, IVisitor } from '../../definition/livechat';
+import type { IUser } from '../../definition/users';
+import type { AppBridges } from '../bridges';
+
+export class LivechatUpdater implements ILivechatUpdater {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public transferVisitor(visitor: IVisitor, transferData: ILivechatTransferData): Promise<boolean> {
+        return this.bridges.getLivechatBridge().doTransferVisitor(visitor, transferData, this.appId);
+    }
+
+    public closeRoom(room: ILivechatRoom, comment: string, closer?: IUser): Promise<boolean> {
+        return this.bridges.getLivechatBridge().doCloseRoom(room, comment, closer, this.appId);
+    }
+
+    public setCustomFields(token: IVisitor['token'], key: string, value: string, overwrite: boolean): Promise<boolean> {
+        return this.bridges
+            .getLivechatBridge()
+            .doSetCustomFields({ token, key, value, overwrite }, this.appId)
+            .then((result) => result > 0);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/MessageBuilder.ts b/packages/apps-engine/src/server/accessors/MessageBuilder.ts
new file mode 100644
index 000000000000..91b865728b3b
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/MessageBuilder.ts
@@ -0,0 +1,224 @@
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
+
+import type { IMessageBuilder } from '../../definition/accessors';
+import type { IMessage, IMessageAttachment } from '../../definition/messages';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IRoom } from '../../definition/rooms';
+import type { IBlock } from '../../definition/uikit';
+import { BlockBuilder } from '../../definition/uikit';
+import type { IUser } from '../../definition/users';
+
+export class MessageBuilder implements IMessageBuilder {
+    public kind: RocketChatAssociationModel.MESSAGE;
+
+    private msg: IMessage;
+
+    constructor(message?: IMessage) {
+        this.kind = RocketChatAssociationModel.MESSAGE;
+        this.msg = message || ({} as IMessage);
+    }
+
+    public setData(data: IMessage): IMessageBuilder {
+        delete data.id;
+        this.msg = data;
+
+        return this;
+    }
+
+    public setUpdateData(data: IMessage, editor: IUser): IMessageBuilder {
+        this.msg = data;
+        this.msg.editor = editor;
+        this.msg.editedAt = new Date();
+
+        return this;
+    }
+
+    public setThreadId(threadId: string): IMessageBuilder {
+        this.msg.threadId = threadId;
+
+        return this;
+    }
+
+    public getThreadId(): string {
+        return this.msg.threadId;
+    }
+
+    public setRoom(room: IRoom): IMessageBuilder {
+        this.msg.room = room;
+        return this;
+    }
+
+    public getRoom(): IRoom {
+        return this.msg.room;
+    }
+
+    public setSender(sender: IUser): IMessageBuilder {
+        this.msg.sender = sender;
+        return this;
+    }
+
+    public getSender(): IUser {
+        return this.msg.sender;
+    }
+
+    public setText(text: string): IMessageBuilder {
+        this.msg.text = text;
+        return this;
+    }
+
+    public getText(): string {
+        return this.msg.text;
+    }
+
+    public setEmojiAvatar(emoji: string): IMessageBuilder {
+        this.msg.emoji = emoji;
+        return this;
+    }
+
+    public getEmojiAvatar(): string {
+        return this.msg.emoji;
+    }
+
+    public setAvatarUrl(avatarUrl: string): IMessageBuilder {
+        this.msg.avatarUrl = avatarUrl;
+        return this;
+    }
+
+    public getAvatarUrl(): string {
+        return this.msg.avatarUrl;
+    }
+
+    public setUsernameAlias(alias: string): IMessageBuilder {
+        this.msg.alias = alias;
+        return this;
+    }
+
+    public getUsernameAlias(): string {
+        return this.msg.alias;
+    }
+
+    public addAttachment(attachment: IMessageAttachment): IMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        this.msg.attachments.push(attachment);
+        return this;
+    }
+
+    public setAttachments(attachments: Array<IMessageAttachment>): IMessageBuilder {
+        this.msg.attachments = attachments;
+        return this;
+    }
+
+    public getAttachments(): Array<IMessageAttachment> {
+        return this.msg.attachments;
+    }
+
+    public replaceAttachment(position: number, attachment: IMessageAttachment): IMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to replace.`);
+        }
+
+        this.msg.attachments[position] = attachment;
+        return this;
+    }
+
+    public removeAttachment(position: number): IMessageBuilder {
+        if (!this.msg.attachments) {
+            this.msg.attachments = [];
+        }
+
+        if (!this.msg.attachments[position]) {
+            throw new Error(`No attachment found at the index of "${position}" to remove.`);
+        }
+
+        this.msg.attachments.splice(position, 1);
+
+        return this;
+    }
+
+    public setEditor(user: IUser): IMessageBuilder {
+        this.msg.editor = user;
+        return this;
+    }
+
+    public getEditor(): IUser {
+        return this.msg.editor;
+    }
+
+    public setGroupable(groupable: boolean): IMessageBuilder {
+        this.msg.groupable = groupable;
+        return this;
+    }
+
+    public getGroupable(): boolean {
+        return this.msg.groupable;
+    }
+
+    public setParseUrls(parseUrls: boolean): IMessageBuilder {
+        this.msg.parseUrls = parseUrls;
+        return this;
+    }
+
+    public getParseUrls(): boolean {
+        return this.msg.parseUrls;
+    }
+
+    public getMessage(): IMessage {
+        if (!this.msg.room) {
+            throw new Error('The "room" property is required.');
+        }
+
+        return this.msg;
+    }
+
+    public addBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
+        if (!Array.isArray(this.msg.blocks)) {
+            this.msg.blocks = [];
+        }
+
+        if (blocks instanceof BlockBuilder) {
+            this.msg.blocks.push(...blocks.getBlocks());
+        } else {
+            this.msg.blocks.push(...blocks);
+        }
+
+        return this;
+    }
+
+    public setBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
+        if (blocks instanceof BlockBuilder) {
+            this.msg.blocks = blocks.getBlocks();
+        } else {
+            this.msg.blocks = blocks;
+        }
+
+        return this;
+    }
+
+    public getBlocks() {
+        return this.msg.blocks;
+    }
+
+    public addCustomField(key: string, value: any): IMessageBuilder {
+        if (!this.msg.customFields) {
+            this.msg.customFields = {};
+        }
+
+        if (this.msg.customFields[key]) {
+            throw new Error(`The message already contains a custom field by the key: ${key}`);
+        }
+
+        if (key.includes('.')) {
+            throw new Error(`The given key contains a period, which is not allowed. Key: ${key}`);
+        }
+
+        this.msg.customFields[key] = value;
+        return this;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/MessageExtender.ts b/packages/apps-engine/src/server/accessors/MessageExtender.ts
new file mode 100644
index 000000000000..f6105c75ee18
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/MessageExtender.ts
@@ -0,0 +1,50 @@
+import type { IMessageExtender } from '../../definition/accessors';
+import type { IMessage, IMessageAttachment } from '../../definition/messages';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import { Utilities } from '../misc/Utilities';
+
+export class MessageExtender implements IMessageExtender {
+    public readonly kind: RocketChatAssociationModel.MESSAGE;
+
+    constructor(private msg: IMessage) {
+        this.kind = RocketChatAssociationModel.MESSAGE;
+
+        if (!Array.isArray(msg.attachments)) {
+            this.msg.attachments = [];
+        }
+    }
+
+    public addCustomField(key: string, value: any): IMessageExtender {
+        if (!this.msg.customFields) {
+            this.msg.customFields = {};
+        }
+
+        if (this.msg.customFields[key]) {
+            throw new Error(`The message already contains a custom field by the key: ${key}`);
+        }
+
+        if (key.includes('.')) {
+            throw new Error(`The given key contains a period, which is not allowed. Key: ${key}`);
+        }
+
+        this.msg.customFields[key] = value;
+
+        return this;
+    }
+
+    public addAttachment(attachment: IMessageAttachment): IMessageExtender {
+        this.msg.attachments.push(attachment);
+
+        return this;
+    }
+
+    public addAttachments(attachments: Array<IMessageAttachment>): IMessageExtender {
+        this.msg.attachments = this.msg.attachments.concat(attachments);
+
+        return this;
+    }
+
+    public getMessage(): IMessage {
+        return Utilities.deepClone(this.msg);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/MessageRead.ts b/packages/apps-engine/src/server/accessors/MessageRead.ts
new file mode 100644
index 000000000000..90db6a2ba509
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/MessageRead.ts
@@ -0,0 +1,33 @@
+import type { IMessageRead } from '../../definition/accessors';
+import type { IMessage } from '../../definition/messages';
+import type { IRoom } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import type { MessageBridge } from '../bridges/MessageBridge';
+
+export class MessageRead implements IMessageRead {
+    constructor(private messageBridge: MessageBridge, private appId: string) {}
+
+    public getById(id: string): Promise<IMessage> {
+        return this.messageBridge.doGetById(id, this.appId);
+    }
+
+    public async getSenderUser(messageId: string): Promise<IUser> {
+        const msg = await this.messageBridge.doGetById(messageId, this.appId);
+
+        if (!msg) {
+            return undefined;
+        }
+
+        return msg.sender;
+    }
+
+    public async getRoom(messageId: string): Promise<IRoom> {
+        const msg = await this.messageBridge.doGetById(messageId, this.appId);
+
+        if (!msg) {
+            return undefined;
+        }
+
+        return msg.room;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ModerationModify.ts b/packages/apps-engine/src/server/accessors/ModerationModify.ts
new file mode 100644
index 000000000000..0fb97fdedb61
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ModerationModify.ts
@@ -0,0 +1,20 @@
+import type { IModerationModify } from '../../definition/accessors';
+import type { IMessage } from '../../definition/messages';
+import type { IUser } from '../../definition/users';
+import type { ModerationBridge } from '../bridges';
+
+export class ModerationModify implements IModerationModify {
+    constructor(private moderationBridge: ModerationBridge, appId: string) {}
+
+    public report(messageId: string, description: string, userId: string, appId: string): Promise<void> {
+        return this.moderationBridge.doReport(messageId, description, userId, appId);
+    }
+
+    public dismissReportsByMessageId(messageId: IMessage['id'], reason: string, action: string, appId: string): Promise<void> {
+        return this.moderationBridge.doDismissReportsByMessageId(messageId, reason, action, appId);
+    }
+
+    public dismissReportsByUserId(userId: IUser['id'], reason: string, action: string, appId: string): Promise<void> {
+        return this.moderationBridge.doDismissReportsByUserId(userId, reason, action, appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/Modify.ts b/packages/apps-engine/src/server/accessors/Modify.ts
new file mode 100644
index 000000000000..7abd4bc1cd33
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/Modify.ts
@@ -0,0 +1,89 @@
+import type {
+    IModify,
+    IModifyCreator,
+    IModifyDeleter,
+    IModifyExtender,
+    IModifyUpdater,
+    INotifier,
+    ISchedulerModify,
+    IUIController,
+} from '../../definition/accessors';
+import type { IOAuthAppsModify } from '../../definition/accessors/IOAuthAppsModify';
+import type { AppBridges } from '../bridges';
+import { ModerationModify } from './ModerationModify';
+import { ModifyCreator } from './ModifyCreator';
+import { ModifyDeleter } from './ModifyDeleter';
+import { ModifyExtender } from './ModifyExtender';
+import { ModifyUpdater } from './ModifyUpdater';
+import { Notifier } from './Notifier';
+import { OAuthAppsModify } from './OAuthAppsModify';
+import { SchedulerModify } from './SchedulerModify';
+import { UIController } from './UIController';
+
+export class Modify implements IModify {
+    private creator: IModifyCreator;
+
+    private deleter: IModifyDeleter;
+
+    private updater: IModifyUpdater;
+
+    private extender: IModifyExtender;
+
+    private notifier: INotifier;
+
+    private uiController: IUIController;
+
+    private scheduler: ISchedulerModify;
+
+    private oauthApps: IOAuthAppsModify;
+
+    private moderation: ModerationModify;
+
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {
+        this.creator = new ModifyCreator(this.bridges, this.appId);
+        this.deleter = new ModifyDeleter(this.bridges, this.appId);
+        this.updater = new ModifyUpdater(this.bridges, this.appId);
+        this.extender = new ModifyExtender(this.bridges, this.appId);
+        this.notifier = new Notifier(this.bridges.getUserBridge(), this.bridges.getMessageBridge(), this.appId);
+        this.uiController = new UIController(this.appId, this.bridges);
+        this.scheduler = new SchedulerModify(this.bridges.getSchedulerBridge(), this.appId);
+        this.oauthApps = new OAuthAppsModify(this.bridges.getOAuthAppsBridge(), this.appId);
+        this.moderation = new ModerationModify(this.bridges.getModerationBridge(), this.appId);
+    }
+
+    public getCreator(): IModifyCreator {
+        return this.creator;
+    }
+
+    public getDeleter(): IModifyDeleter {
+        return this.deleter;
+    }
+
+    public getUpdater(): IModifyUpdater {
+        return this.updater;
+    }
+
+    public getExtender(): IModifyExtender {
+        return this.extender;
+    }
+
+    public getNotifier(): INotifier {
+        return this.notifier;
+    }
+
+    public getUiController(): IUIController {
+        return this.uiController;
+    }
+
+    public getScheduler(): ISchedulerModify {
+        return this.scheduler;
+    }
+
+    public getOAuthAppsModifier() {
+        return this.oauthApps;
+    }
+
+    public getModerationModifier() {
+        return this.moderation;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ModifyCreator.ts b/packages/apps-engine/src/server/accessors/ModifyCreator.ts
new file mode 100644
index 000000000000..ec829ae98788
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ModifyCreator.ts
@@ -0,0 +1,260 @@
+import type {
+    IDiscussionBuilder,
+    ILivechatCreator,
+    ILivechatMessageBuilder,
+    IMessageBuilder,
+    IModifyCreator,
+    IRoomBuilder,
+    IUploadCreator,
+    IUserBuilder,
+    IVideoConferenceBuilder,
+} from '../../definition/accessors';
+import type { IEmailCreator } from '../../definition/accessors/IEmailCreator';
+import type { ILivechatMessage } from '../../definition/livechat/ILivechatMessage';
+import type { IMessage } from '../../definition/messages';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IRoom } from '../../definition/rooms';
+import { RoomType } from '../../definition/rooms';
+import { BlockBuilder } from '../../definition/uikit';
+import type { IBotUser } from '../../definition/users/IBotUser';
+import { UserType } from '../../definition/users/UserType';
+import type { AppVideoConference } from '../../definition/videoConferences';
+import type { AppBridges } from '../bridges';
+import { UIHelper } from '../misc/UIHelper';
+import { DiscussionBuilder } from './DiscussionBuilder';
+import { EmailCreator } from './EmailCreator';
+import { LivechatCreator } from './LivechatCreator';
+import { LivechatMessageBuilder } from './LivechatMessageBuilder';
+import { MessageBuilder } from './MessageBuilder';
+import { RoomBuilder } from './RoomBuilder';
+import { UploadCreator } from './UploadCreator';
+import { UserBuilder } from './UserBuilder';
+import { VideoConferenceBuilder } from './VideoConferenceBuilder';
+
+export class ModifyCreator implements IModifyCreator {
+    private livechatCreator: LivechatCreator;
+
+    private uploadCreator: UploadCreator;
+
+    private emailCreator: EmailCreator;
+
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {
+        this.livechatCreator = new LivechatCreator(bridges, appId);
+        this.uploadCreator = new UploadCreator(bridges, appId);
+        this.emailCreator = new EmailCreator(bridges, appId);
+    }
+
+    public getLivechatCreator(): ILivechatCreator {
+        return this.livechatCreator;
+    }
+
+    public getUploadCreator(): IUploadCreator {
+        return this.uploadCreator;
+    }
+
+    public getEmailCreator(): IEmailCreator {
+        return this.emailCreator;
+    }
+
+    /**
+     * @deprecated please prefer the rocket.chat/ui-kit components
+     */
+    public getBlockBuilder(): BlockBuilder {
+        return new BlockBuilder(this.appId);
+    }
+
+    public startMessage(data?: IMessage): IMessageBuilder {
+        if (data) {
+            delete data.id;
+        }
+
+        return new MessageBuilder(data);
+    }
+
+    public startLivechatMessage(data?: ILivechatMessage): ILivechatMessageBuilder {
+        if (data) {
+            delete data.id;
+        }
+
+        return new LivechatMessageBuilder(data);
+    }
+
+    public startRoom(data?: IRoom): IRoomBuilder {
+        if (data) {
+            delete data.id;
+        }
+
+        return new RoomBuilder(data);
+    }
+
+    public startDiscussion(data?: Partial<IRoom>): IDiscussionBuilder {
+        if (data) {
+            delete data.id;
+        }
+
+        return new DiscussionBuilder(data);
+    }
+
+    public startVideoConference(data?: Partial<AppVideoConference>): IVideoConferenceBuilder {
+        return new VideoConferenceBuilder(data);
+    }
+
+    public startBotUser(data?: Partial<IBotUser>): IUserBuilder {
+        if (data) {
+            delete data.id;
+
+            const { roles } = data;
+
+            if (roles && roles.length) {
+                const hasRole = roles.map((role) => role.toLocaleLowerCase()).some((role) => role === 'admin' || role === 'owner' || role === 'moderator');
+
+                if (hasRole) {
+                    throw new Error('Invalid role assigned to the user. Should not be admin, owner or moderator.');
+                }
+            }
+
+            if (!data.type) {
+                data.type = UserType.BOT;
+            }
+        }
+
+        return new UserBuilder(data);
+    }
+
+    public finish(
+        builder: IMessageBuilder | ILivechatMessageBuilder | IRoomBuilder | IDiscussionBuilder | IVideoConferenceBuilder | IUserBuilder,
+    ): Promise<string> {
+        switch (builder.kind) {
+            case RocketChatAssociationModel.MESSAGE:
+                return this._finishMessage(builder);
+            case RocketChatAssociationModel.LIVECHAT_MESSAGE:
+                return this._finishLivechatMessage(builder);
+            case RocketChatAssociationModel.ROOM:
+                return this._finishRoom(builder);
+            case RocketChatAssociationModel.DISCUSSION:
+                return this._finishDiscussion(builder as IDiscussionBuilder);
+            case RocketChatAssociationModel.VIDEO_CONFERENCE:
+                return this._finishVideoConference(builder);
+            case RocketChatAssociationModel.USER:
+                return this._finishUser(builder);
+            default:
+                throw new Error('Invalid builder passed to the ModifyCreator.finish function.');
+        }
+    }
+
+    private async _finishMessage(builder: IMessageBuilder): Promise<string> {
+        const result = builder.getMessage();
+        delete result.id;
+
+        if (!result.sender || !result.sender.id) {
+            const appUser = await this.bridges.getUserBridge().doGetAppUser(this.appId);
+
+            if (!appUser) {
+                throw new Error('Invalid sender assigned to the message.');
+            }
+
+            result.sender = appUser;
+        }
+
+        if (result.blocks?.length) {
+            result.blocks = UIHelper.assignIds(result.blocks, this.appId);
+        }
+
+        return this.bridges.getMessageBridge().doCreate(result, this.appId);
+    }
+
+    private _finishLivechatMessage(builder: ILivechatMessageBuilder): Promise<string> {
+        if (builder.getSender() && !builder.getVisitor()) {
+            return this._finishMessage(builder.getMessageBuilder());
+        }
+
+        const result = builder.getMessage();
+        delete result.id;
+
+        if (!result.token && (!result.visitor || !result.visitor.token)) {
+            throw new Error('Invalid visitor sending the message');
+        }
+
+        result.token = result.visitor ? result.visitor.token : result.token;
+
+        return this.bridges.getLivechatBridge().doCreateMessage(result, this.appId);
+    }
+
+    private _finishRoom(builder: IRoomBuilder): Promise<string> {
+        const result = builder.getRoom();
+        delete result.id;
+
+        if (!result.type) {
+            throw new Error('Invalid type assigned to the room.');
+        }
+
+        if (result.type !== RoomType.LIVE_CHAT) {
+            if (!result.creator || !result.creator.id) {
+                throw new Error('Invalid creator assigned to the room.');
+            }
+        }
+
+        if (result.type !== RoomType.DIRECT_MESSAGE) {
+            if (result.type !== RoomType.LIVE_CHAT) {
+                if (!result.slugifiedName || !result.slugifiedName.trim()) {
+                    throw new Error('Invalid slugifiedName assigned to the room.');
+                }
+            }
+
+            if (!result.displayName || !result.displayName.trim()) {
+                throw new Error('Invalid displayName assigned to the room.');
+            }
+        }
+
+        return this.bridges.getRoomBridge().doCreate(result, builder.getMembersToBeAddedUsernames(), this.appId);
+    }
+
+    private _finishDiscussion(builder: IDiscussionBuilder): Promise<string> {
+        const room = builder.getRoom();
+        delete room.id;
+
+        if (!room.creator || !room.creator.id) {
+            throw new Error('Invalid creator assigned to the discussion.');
+        }
+
+        if (!room.slugifiedName || !room.slugifiedName.trim()) {
+            throw new Error('Invalid slugifiedName assigned to the discussion.');
+        }
+
+        if (!room.displayName || !room.displayName.trim()) {
+            throw new Error('Invalid displayName assigned to the discussion.');
+        }
+
+        if (!room.parentRoom || !room.parentRoom.id) {
+            throw new Error('Invalid parentRoom assigned to the discussion.');
+        }
+
+        return this.bridges
+            .getRoomBridge()
+            .doCreateDiscussion(room, builder.getParentMessage(), builder.getReply(), builder.getMembersToBeAddedUsernames(), this.appId);
+    }
+
+    private _finishVideoConference(builder: IVideoConferenceBuilder): Promise<string> {
+        const videoConference = builder.getVideoConference();
+
+        if (!videoConference.createdBy) {
+            throw new Error('Invalid creator assigned to the video conference.');
+        }
+
+        if (!videoConference.providerName?.trim()) {
+            throw new Error('Invalid provider name assigned to the video conference.');
+        }
+
+        if (!videoConference.rid) {
+            throw new Error('Invalid roomId assigned to the video conference.');
+        }
+
+        return this.bridges.getVideoConferenceBridge().doCreate(videoConference, this.appId);
+    }
+
+    private _finishUser(builder: IUserBuilder): Promise<string> {
+        const user = builder.getUser();
+
+        return this.bridges.getUserBridge().doCreate(user, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ModifyDeleter.ts b/packages/apps-engine/src/server/accessors/ModifyDeleter.ts
new file mode 100644
index 000000000000..34a17654b2e0
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ModifyDeleter.ts
@@ -0,0 +1,35 @@
+import type { IModifyDeleter } from '../../definition/accessors';
+import type { IMessage } from '../../definition/messages';
+import type { IUser, UserType } from '../../definition/users';
+import type { AppBridges } from '../bridges';
+
+export class ModifyDeleter implements IModifyDeleter {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public async deleteRoom(roomId: string): Promise<void> {
+        return this.bridges.getRoomBridge().doDelete(roomId, this.appId);
+    }
+
+    public async deleteUsers(appId: Exclude<IUser['appId'], undefined>, userType: UserType.APP | UserType.BOT): Promise<boolean> {
+        return this.bridges.getUserBridge().doDeleteUsersCreatedByApp(appId, userType);
+    }
+
+    public async deleteMessage(message: IMessage, user: IUser): Promise<void> {
+        return this.bridges.getMessageBridge().doDelete(message, user, this.appId);
+    }
+
+    /**
+     * Removes `usernames` from the room's member list
+     *
+     * For performance reasons, it is only possible to remove 50 users in one
+     * call to this method. Removing users is an expensive operation due to the
+     * amount of entity relationships that need to be modified.
+     */
+    public async removeUsersFromRoom(roomId: string, usernames: Array<string>) {
+        if (usernames.length > 50) {
+            throw new Error('A maximum of 50 members can be removed in a single call');
+        }
+
+        return this.bridges.getRoomBridge().doRemoveUsers(roomId, usernames, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ModifyExtender.ts b/packages/apps-engine/src/server/accessors/ModifyExtender.ts
new file mode 100644
index 000000000000..ecf65f2e5571
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ModifyExtender.ts
@@ -0,0 +1,46 @@
+import type { IMessageExtender, IModifyExtender, IRoomExtender, IVideoConferenceExtender } from '../../definition/accessors';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IUser } from '../../definition/users';
+import type { AppBridges } from '../bridges/AppBridges';
+import { MessageExtender } from './MessageExtender';
+import { RoomExtender } from './RoomExtender';
+import { VideoConferenceExtender } from './VideoConferenceExtend';
+
+export class ModifyExtender implements IModifyExtender {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public async extendMessage(messageId: string, updater: IUser): Promise<IMessageExtender> {
+        const msg = await this.bridges.getMessageBridge().doGetById(messageId, this.appId);
+        msg.editor = updater;
+        msg.editedAt = new Date();
+
+        return new MessageExtender(msg);
+    }
+
+    public async extendRoom(roomId: string, updater: IUser): Promise<IRoomExtender> {
+        const room = await this.bridges.getRoomBridge().doGetById(roomId, this.appId);
+        room.updatedAt = new Date();
+
+        return new RoomExtender(room);
+    }
+
+    public async extendVideoConference(id: string): Promise<IVideoConferenceExtender> {
+        const call = await this.bridges.getVideoConferenceBridge().doGetById(id, this.appId);
+        call._updatedAt = new Date();
+
+        return new VideoConferenceExtender(call);
+    }
+
+    public finish(extender: IMessageExtender | IRoomExtender | IVideoConferenceExtender): Promise<void> {
+        switch (extender.kind) {
+            case RocketChatAssociationModel.MESSAGE:
+                return this.bridges.getMessageBridge().doUpdate(extender.getMessage(), this.appId);
+            case RocketChatAssociationModel.ROOM:
+                return this.bridges.getRoomBridge().doUpdate(extender.getRoom(), extender.getUsernamesOfMembersBeingAdded(), this.appId);
+            case RocketChatAssociationModel.VIDEO_CONFERENCE:
+                return this.bridges.getVideoConferenceBridge().doUpdate(extender.getVideoConference(), this.appId);
+            default:
+                throw new Error('Invalid extender passed to the ModifyExtender.finish function.');
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ModifyUpdater.ts b/packages/apps-engine/src/server/accessors/ModifyUpdater.ts
new file mode 100644
index 000000000000..0ae175b01734
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ModifyUpdater.ts
@@ -0,0 +1,106 @@
+import type { ILivechatUpdater, IMessageBuilder, IMessageUpdater, IModifyUpdater, IRoomBuilder } from '../../definition/accessors';
+import type { IUserUpdater } from '../../definition/accessors/IUserUpdater';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import { RoomType } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import type { AppBridges } from '../bridges';
+import { UIHelper } from '../misc/UIHelper';
+import { LivechatUpdater } from './LivechatUpdater';
+import { MessageBuilder } from './MessageBuilder';
+import { RoomBuilder } from './RoomBuilder';
+import { UserUpdater } from './UserUpdater';
+
+export class ModifyUpdater implements IModifyUpdater {
+    private livechatUpdater: ILivechatUpdater;
+
+    private userUpdater: IUserUpdater;
+
+    private messageUpdater: IMessageUpdater;
+
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {
+        this.livechatUpdater = new LivechatUpdater(this.bridges, this.appId);
+        this.userUpdater = new UserUpdater(this.bridges, this.appId);
+    }
+
+    public getLivechatUpdater(): ILivechatUpdater {
+        return this.livechatUpdater;
+    }
+
+    public getUserUpdater(): IUserUpdater {
+        return this.userUpdater;
+    }
+
+    public getMessageUpdater(): IMessageUpdater {
+        return this.messageUpdater;
+    }
+
+    public async message(messageId: string, updater: IUser): Promise<IMessageBuilder> {
+        const msg = await this.bridges.getMessageBridge().doGetById(messageId, this.appId);
+
+        return new MessageBuilder(msg);
+    }
+
+    public async room(roomId: string, updater: IUser): Promise<IRoomBuilder> {
+        const room = await this.bridges.getRoomBridge().doGetById(roomId, this.appId);
+
+        return new RoomBuilder(room);
+    }
+
+    public finish(builder: IMessageBuilder | IRoomBuilder): Promise<void> {
+        switch (builder.kind) {
+            case RocketChatAssociationModel.MESSAGE:
+                return this._finishMessage(builder);
+            case RocketChatAssociationModel.ROOM:
+                return this._finishRoom(builder);
+            default:
+                throw new Error('Invalid builder passed to the ModifyUpdater.finish function.');
+        }
+    }
+
+    private _finishMessage(builder: IMessageBuilder): Promise<void> {
+        const result = builder.getMessage();
+
+        if (!result.id) {
+            throw new Error("Invalid message, can't update a message without an id.");
+        }
+
+        if (!result.sender || !result.sender.id) {
+            throw new Error('Invalid sender assigned to the message.');
+        }
+
+        if (result.blocks?.length) {
+            result.blocks = UIHelper.assignIds(result.blocks, this.appId);
+            // result.blocks = this._assignIds(result.blocks);
+        }
+
+        return this.bridges.getMessageBridge().doUpdate(result, this.appId);
+    }
+
+    private _finishRoom(builder: IRoomBuilder): Promise<void> {
+        const result = builder.getRoom();
+
+        if (!result.id) {
+            throw new Error('Invalid room, can not update a room without an id.');
+        }
+
+        if (!result.type) {
+            throw new Error('Invalid type assigned to the room.');
+        }
+
+        if (result.type !== RoomType.LIVE_CHAT) {
+            if (!result.creator || !result.creator.id) {
+                throw new Error('Invalid creator assigned to the room.');
+            }
+
+            if (!result.slugifiedName || !result.slugifiedName.trim()) {
+                throw new Error('Invalid slugifiedName assigned to the room.');
+            }
+        }
+
+        if (!result.displayName || !result.displayName.trim()) {
+            throw new Error('Invalid displayName assigned to the room.');
+        }
+
+        return this.bridges.getRoomBridge().doUpdate(result, builder.getMembersToBeAddedUsernames(), this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/Notifier.ts b/packages/apps-engine/src/server/accessors/Notifier.ts
new file mode 100644
index 000000000000..8e81cc2e9f2e
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/Notifier.ts
@@ -0,0 +1,49 @@
+import type { IMessageBuilder, INotifier } from '../../definition/accessors';
+import type { ITypingOptions } from '../../definition/accessors/INotifier';
+import { TypingScope } from '../../definition/accessors/INotifier';
+import type { IMessage } from '../../definition/messages';
+import type { IRoom } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import type { MessageBridge, UserBridge } from '../bridges';
+import { MessageBuilder } from './MessageBuilder';
+
+export class Notifier implements INotifier {
+    constructor(private readonly userBridge: UserBridge, private readonly msgBridge: MessageBridge, private readonly appId: string) {}
+
+    public async notifyUser(user: IUser, message: IMessage): Promise<void> {
+        if (!message.sender || !message.sender.id) {
+            const appUser = await this.userBridge.doGetAppUser(this.appId);
+
+            message.sender = appUser;
+        }
+
+        await this.msgBridge.doNotifyUser(user, message, this.appId);
+    }
+
+    public async notifyRoom(room: IRoom, message: IMessage): Promise<void> {
+        if (!message.sender || !message.sender.id) {
+            const appUser = await this.userBridge.doGetAppUser(this.appId);
+
+            message.sender = appUser;
+        }
+
+        await this.msgBridge.doNotifyRoom(room, message, this.appId);
+    }
+
+    public async typing(options: ITypingOptions): Promise<() => Promise<void>> {
+        options.scope = options.scope || TypingScope.Room;
+
+        if (!options.username) {
+            const appUser = await this.userBridge.doGetAppUser(this.appId);
+            options.username = (appUser && appUser.name) || '';
+        }
+
+        this.msgBridge.doTyping({ ...options, isTyping: true }, this.appId);
+
+        return () => this.msgBridge.doTyping({ ...options, isTyping: false }, this.appId);
+    }
+
+    public getMessageBuilder(): IMessageBuilder {
+        return new MessageBuilder();
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts b/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts
new file mode 100644
index 000000000000..71ad047ef66f
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts
@@ -0,0 +1,19 @@
+import type { IOAuthAppParams } from '../../definition/accessors/IOAuthApp';
+import type { IOAuthAppsModify } from '../../definition/accessors/IOAuthAppsModify';
+import type { OAuthAppsBridge } from '../bridges/OAuthAppsBridge';
+
+export class OAuthAppsModify implements IOAuthAppsModify {
+    constructor(private readonly oauthAppsBridge: OAuthAppsBridge, private readonly appId: string) {}
+
+    public async createOAuthApp(oAuthApp: IOAuthAppParams): Promise<string> {
+        return this.oauthAppsBridge.doCreate(oAuthApp, this.appId);
+    }
+
+    public async updateOAuthApp(oAuthApp: IOAuthAppParams, id: string): Promise<void> {
+        return this.oauthAppsBridge.doUpdate(oAuthApp, id, this.appId);
+    }
+
+    public async deleteOAuthApp(id: string): Promise<void> {
+        return this.oauthAppsBridge.doDelete(id, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts b/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts
new file mode 100644
index 000000000000..2075875d2f06
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts
@@ -0,0 +1,15 @@
+import type { IOAuthApp } from '../../definition/accessors/IOAuthApp';
+import type { IOAuthAppsReader } from '../../definition/accessors/IOAuthAppsReader';
+import type { OAuthAppsBridge } from '../bridges/OAuthAppsBridge';
+
+export class OAuthAppsReader implements IOAuthAppsReader {
+    constructor(private readonly oauthAppsBridge: OAuthAppsBridge, private readonly appId: string) {}
+
+    public async getOAuthAppById(id: string): Promise<IOAuthApp> {
+        return this.oauthAppsBridge.doGetByid(id, this.appId);
+    }
+
+    public async getOAuthAppByName(name: string): Promise<Array<IOAuthApp>> {
+        return this.oauthAppsBridge.doGetByName(name, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/Persistence.ts b/packages/apps-engine/src/server/accessors/Persistence.ts
new file mode 100644
index 000000000000..8dc98fa225dd
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/Persistence.ts
@@ -0,0 +1,43 @@
+import type { IPersistence } from '../../definition/accessors';
+import type { RocketChatAssociationRecord } from '../../definition/metadata';
+import type { PersistenceBridge } from '../bridges/PersistenceBridge';
+
+export class Persistence implements IPersistence {
+    constructor(private persistBridge: PersistenceBridge, private appId: string) {}
+
+    public create(data: object): Promise<string> {
+        return this.persistBridge.doCreate(data, this.appId);
+    }
+
+    public createWithAssociation(data: object, association: RocketChatAssociationRecord): Promise<string> {
+        return this.persistBridge.doCreateWithAssociations(data, new Array(association), this.appId);
+    }
+
+    public createWithAssociations(data: object, associations: Array<RocketChatAssociationRecord>): Promise<string> {
+        return this.persistBridge.doCreateWithAssociations(data, associations, this.appId);
+    }
+
+    public update(id: string, data: object, upsert = false): Promise<string> {
+        return this.persistBridge.doUpdate(id, data, upsert, this.appId);
+    }
+
+    public updateByAssociation(association: RocketChatAssociationRecord, data: object, upsert = false): Promise<string> {
+        return this.persistBridge.doUpdateByAssociations(new Array(association), data, upsert, this.appId);
+    }
+
+    public updateByAssociations(associations: Array<RocketChatAssociationRecord>, data: object, upsert = false): Promise<string> {
+        return this.persistBridge.doUpdateByAssociations(associations, data, upsert, this.appId);
+    }
+
+    public remove(id: string): Promise<object> {
+        return this.persistBridge.doRemove(id, this.appId);
+    }
+
+    public removeByAssociation(association: RocketChatAssociationRecord): Promise<Array<object>> {
+        return this.persistBridge.doRemoveByAssociations(new Array(association), this.appId);
+    }
+
+    public removeByAssociations(associations: Array<RocketChatAssociationRecord>): Promise<Array<object>> {
+        return this.persistBridge.doRemoveByAssociations(associations, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/PersistenceRead.ts b/packages/apps-engine/src/server/accessors/PersistenceRead.ts
new file mode 100644
index 000000000000..bd0549d177ad
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/PersistenceRead.ts
@@ -0,0 +1,19 @@
+import type { IPersistenceRead } from '../../definition/accessors';
+import type { RocketChatAssociationRecord } from '../../definition/metadata';
+import type { PersistenceBridge } from '../bridges';
+
+export class PersistenceRead implements IPersistenceRead {
+    constructor(private persistBridge: PersistenceBridge, private appId: string) {}
+
+    public read(id: string): Promise<object> {
+        return this.persistBridge.doReadById(id, this.appId);
+    }
+
+    public readByAssociation(association: RocketChatAssociationRecord): Promise<Array<object>> {
+        return this.persistBridge.doReadByAssociations(new Array(association), this.appId);
+    }
+
+    public readByAssociations(associations: Array<RocketChatAssociationRecord>): Promise<Array<object>> {
+        return this.persistBridge.doReadByAssociations(associations, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/Reader.ts b/packages/apps-engine/src/server/accessors/Reader.ts
new file mode 100644
index 000000000000..735bf4aa8991
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/Reader.ts
@@ -0,0 +1,87 @@
+import type {
+    ICloudWorkspaceRead,
+    IEnvironmentRead,
+    ILivechatRead,
+    IMessageRead,
+    INotifier,
+    IPersistenceRead,
+    IRead,
+    IRoomRead,
+    IUploadRead,
+    IUserRead,
+    IVideoConferenceRead,
+} from '../../definition/accessors';
+import type { IOAuthAppsReader } from '../../definition/accessors/IOAuthAppsReader';
+import type { IRoleRead } from '../../definition/accessors/IRoleRead';
+import type { IThreadRead } from '../../definition/accessors/IThreadRead';
+
+export class Reader implements IRead {
+    constructor(
+        private env: IEnvironmentRead,
+        private message: IMessageRead,
+        private persist: IPersistenceRead,
+        private room: IRoomRead,
+        private user: IUserRead,
+        private noti: INotifier,
+        private livechat: ILivechatRead,
+        private upload: IUploadRead,
+        private cloud: ICloudWorkspaceRead,
+        private videoConf: IVideoConferenceRead,
+
+        private oauthApps: IOAuthAppsReader,
+        private thread: IThreadRead,
+        private role: IRoleRead,
+    ) {}
+
+    public getEnvironmentReader(): IEnvironmentRead {
+        return this.env;
+    }
+
+    public getThreadReader(): IThreadRead {
+        return this.thread;
+    }
+
+    public getMessageReader(): IMessageRead {
+        return this.message;
+    }
+
+    public getPersistenceReader(): IPersistenceRead {
+        return this.persist;
+    }
+
+    public getRoomReader(): IRoomRead {
+        return this.room;
+    }
+
+    public getUserReader(): IUserRead {
+        return this.user;
+    }
+
+    public getNotifier(): INotifier {
+        return this.noti;
+    }
+
+    public getLivechatReader(): ILivechatRead {
+        return this.livechat;
+    }
+
+    public getUploadReader(): IUploadRead {
+        return this.upload;
+    }
+
+    public getCloudWorkspaceReader(): ICloudWorkspaceRead {
+        return this.cloud;
+    }
+
+    public getVideoConferenceReader(): IVideoConferenceRead {
+        return this.videoConf;
+    }
+
+    public getOAuthAppsReader(): IOAuthAppsReader {
+        return this.oauthApps;
+    }
+
+    public getRoleReader(): IRoleRead {
+        return this.role;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/RoleRead.ts b/packages/apps-engine/src/server/accessors/RoleRead.ts
new file mode 100644
index 000000000000..62272edb75e2
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/RoleRead.ts
@@ -0,0 +1,15 @@
+import type { IRoleRead } from '../../definition/accessors/IRoleRead';
+import type { IRole } from '../../definition/roles';
+import type { RoleBridge } from '../bridges';
+
+export class RoleRead implements IRoleRead {
+    constructor(private roleBridge: RoleBridge, private appId: string) {}
+
+    public getOneByIdOrName(idOrName: IRole['id'] | IRole['name']): Promise<IRole | null> {
+        return this.roleBridge.doGetOneByIdOrName(idOrName, this.appId);
+    }
+
+    public getCustomRoles(): Promise<Array<IRole>> {
+        return this.roleBridge.doGetCustomRoles(this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/RoomBuilder.ts b/packages/apps-engine/src/server/accessors/RoomBuilder.ts
new file mode 100644
index 000000000000..a8afab171c68
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/RoomBuilder.ts
@@ -0,0 +1,155 @@
+import type { IRoomBuilder } from '../../definition/accessors';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IRoom, RoomType } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+
+export class RoomBuilder implements IRoomBuilder {
+    public kind: RocketChatAssociationModel.ROOM | RocketChatAssociationModel.DISCUSSION;
+
+    protected room: IRoom;
+
+    private members: Array<string>;
+
+    constructor(data?: Partial<IRoom>) {
+        this.kind = RocketChatAssociationModel.ROOM;
+        this.room = (data || { customFields: {} }) as IRoom;
+        this.members = [];
+    }
+
+    public setData(data: Partial<IRoom>): IRoomBuilder {
+        delete data.id;
+        this.room = data as IRoom;
+
+        return this;
+    }
+
+    public setDisplayName(name: string): IRoomBuilder {
+        this.room.displayName = name;
+        return this;
+    }
+
+    public getDisplayName(): string {
+        return this.room.displayName;
+    }
+
+    public setSlugifiedName(name: string): IRoomBuilder {
+        this.room.slugifiedName = name;
+        return this;
+    }
+
+    public getSlugifiedName(): string {
+        return this.room.slugifiedName;
+    }
+
+    public setType(type: RoomType): IRoomBuilder {
+        this.room.type = type;
+        return this;
+    }
+
+    public getType(): RoomType {
+        return this.room.type;
+    }
+
+    public setCreator(creator: IUser): IRoomBuilder {
+        this.room.creator = creator;
+        return this;
+    }
+
+    public getCreator(): IUser {
+        return this.room.creator;
+    }
+
+    /**
+     * @deprecated
+     */
+    public addUsername(username: string): IRoomBuilder {
+        this.addMemberToBeAddedByUsername(username);
+        return this;
+    }
+
+    /**
+     * @deprecated
+     */
+    public setUsernames(usernames: Array<string>): IRoomBuilder {
+        this.setMembersToBeAddedByUsernames(usernames);
+        return this;
+    }
+
+    /**
+     * @deprecated
+     */
+    public getUsernames(): Array<string> {
+        const usernames = this.getMembersToBeAddedUsernames();
+        if (usernames && usernames.length > 0) {
+            return usernames;
+        }
+        return this.room.usernames || [];
+    }
+
+    public addMemberToBeAddedByUsername(username: string): IRoomBuilder {
+        this.members.push(username);
+        return this;
+    }
+
+    public setMembersToBeAddedByUsernames(usernames: Array<string>): IRoomBuilder {
+        this.members = usernames;
+        return this;
+    }
+
+    public getMembersToBeAddedUsernames(): Array<string> {
+        return this.members;
+    }
+
+    public setDefault(isDefault: boolean): IRoomBuilder {
+        this.room.isDefault = isDefault;
+        return this;
+    }
+
+    public getIsDefault(): boolean {
+        return this.room.isDefault;
+    }
+
+    public setReadOnly(isReadOnly: boolean): IRoomBuilder {
+        this.room.isReadOnly = isReadOnly;
+        return this;
+    }
+
+    public getIsReadOnly(): boolean {
+        return this.room.isReadOnly;
+    }
+
+    public setDisplayingOfSystemMessages(displaySystemMessages: boolean): IRoomBuilder {
+        this.room.displaySystemMessages = displaySystemMessages;
+        return this;
+    }
+
+    public getDisplayingOfSystemMessages(): boolean {
+        return this.room.displaySystemMessages;
+    }
+
+    public addCustomField(key: string, value: object): IRoomBuilder {
+        if (typeof this.room.customFields !== 'object') {
+            this.room.customFields = {};
+        }
+
+        this.room.customFields[key] = value;
+        return this;
+    }
+
+    public setCustomFields(fields: { [key: string]: object }): IRoomBuilder {
+        this.room.customFields = fields;
+        return this;
+    }
+
+    public getCustomFields(): { [key: string]: object } {
+        return this.room.customFields;
+    }
+
+    public getUserIds(): Array<string> {
+        return this.room.userIds;
+    }
+
+    public getRoom(): IRoom {
+        return this.room;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/RoomExtender.ts b/packages/apps-engine/src/server/accessors/RoomExtender.ts
new file mode 100644
index 000000000000..239e4a4f0e35
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/RoomExtender.ts
@@ -0,0 +1,56 @@
+import type { IRoomExtender } from '../../definition/accessors';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IRoom } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import { Utilities } from '../misc/Utilities';
+
+export class RoomExtender implements IRoomExtender {
+    public kind: RocketChatAssociationModel.ROOM;
+
+    private members: Array<IUser>;
+
+    constructor(private room: IRoom) {
+        this.kind = RocketChatAssociationModel.ROOM;
+        this.members = [];
+    }
+
+    public addCustomField(key: string, value: any): IRoomExtender {
+        if (!this.room.customFields) {
+            this.room.customFields = {};
+        }
+
+        if (this.room.customFields[key]) {
+            throw new Error(`The room already contains a custom field by the key: ${key}`);
+        }
+
+        if (key.includes('.')) {
+            throw new Error(`The given key contains a period, which is not allowed. Key: ${key}`);
+        }
+
+        this.room.customFields[key] = value;
+
+        return this;
+    }
+
+    public addMember(user: IUser): IRoomExtender {
+        if (this.members.find((u) => u.username === user.username)) {
+            throw new Error('The user is already in the room.');
+        }
+
+        this.members.push(user);
+
+        return this;
+    }
+
+    public getMembersBeingAdded(): Array<IUser> {
+        return this.members;
+    }
+
+    public getUsernamesOfMembersBeingAdded(): Array<string> {
+        return this.members.map((u) => u.username);
+    }
+
+    public getRoom(): IRoom {
+        return Utilities.deepClone(this.room);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/RoomRead.ts b/packages/apps-engine/src/server/accessors/RoomRead.ts
new file mode 100644
index 000000000000..32786f529e56
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/RoomRead.ts
@@ -0,0 +1,73 @@
+import type { IRoomRead } from '../../definition/accessors';
+import type { IMessageRaw } from '../../definition/messages';
+import type { IRoom } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import type { RoomBridge } from '../bridges';
+import { type GetMessagesOptions, GetMessagesSortableFields } from '../bridges/RoomBridge';
+
+export class RoomRead implements IRoomRead {
+    constructor(private roomBridge: RoomBridge, private appId: string) {}
+
+    public getById(id: string): Promise<IRoom> {
+        return this.roomBridge.doGetById(id, this.appId);
+    }
+
+    public getCreatorUserById(id: string): Promise<IUser> {
+        return this.roomBridge.doGetCreatorById(id, this.appId);
+    }
+
+    public getByName(name: string): Promise<IRoom> {
+        return this.roomBridge.doGetByName(name, this.appId);
+    }
+
+    public getCreatorUserByName(name: string): Promise<IUser> {
+        return this.roomBridge.doGetCreatorByName(name, this.appId);
+    }
+
+    public getMessages(roomId: string, options: Partial<GetMessagesOptions> = {}): Promise<IMessageRaw[]> {
+        if (typeof options.limit !== 'undefined' && (!Number.isFinite(options.limit) || options.limit > 100)) {
+            throw new Error(`Invalid limit provided. Expected number <= 100, got ${options.limit}`);
+        }
+
+        options.limit ??= 100;
+
+        if (options.sort) {
+            this.validateSort(options.sort);
+        }
+
+        return this.roomBridge.doGetMessages(roomId, options as GetMessagesOptions, this.appId);
+    }
+
+    public getMembers(roomId: string): Promise<Array<IUser>> {
+        return this.roomBridge.doGetMembers(roomId, this.appId);
+    }
+
+    public getDirectByUsernames(usernames: Array<string>): Promise<IRoom> {
+        return this.roomBridge.doGetDirectByUsernames(usernames, this.appId);
+    }
+
+    public getModerators(roomId: string): Promise<Array<IUser>> {
+        return this.roomBridge.doGetModerators(roomId, this.appId);
+    }
+
+    public getOwners(roomId: string): Promise<Array<IUser>> {
+        return this.roomBridge.doGetOwners(roomId, this.appId);
+    }
+
+    public getLeaders(roomId: string): Promise<Array<IUser>> {
+        return this.roomBridge.doGetLeaders(roomId, this.appId);
+    }
+
+    // If there are any invalid fields or values, throw
+    private validateSort(sort: Record<string, unknown>) {
+        Object.entries(sort).forEach(([key, value]) => {
+            if (!GetMessagesSortableFields.includes(key as (typeof GetMessagesSortableFields)[number])) {
+                throw new Error(`Invalid key "${key}" used in sort. Available keys for sorting are ${GetMessagesSortableFields.join(', ')}`);
+            }
+
+            if (value !== 'asc' && value !== 'desc') {
+                throw new Error(`Invalid sort direction for field "${key}". Expected "asc" or "desc", got ${value}`);
+            }
+        });
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SchedulerExtend.ts b/packages/apps-engine/src/server/accessors/SchedulerExtend.ts
new file mode 100644
index 000000000000..c6ea866b70b6
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SchedulerExtend.ts
@@ -0,0 +1,11 @@
+import type { ISchedulerExtend } from '../../definition/accessors';
+import type { IProcessor } from '../../definition/scheduler';
+import type { AppSchedulerManager } from '../managers/AppSchedulerManager';
+
+export class SchedulerExtend implements ISchedulerExtend {
+    constructor(private readonly manager: AppSchedulerManager, private readonly appId: string) {}
+
+    public async registerProcessors(processors: Array<IProcessor> = []): Promise<void | Array<string>> {
+        return this.manager.registerProcessors(processors, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SchedulerModify.ts b/packages/apps-engine/src/server/accessors/SchedulerModify.ts
new file mode 100644
index 000000000000..bfbb92e7ffae
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SchedulerModify.ts
@@ -0,0 +1,27 @@
+import type { ISchedulerModify } from '../../definition/accessors';
+import type { IOnetimeSchedule, IRecurringSchedule } from '../../definition/scheduler';
+import type { SchedulerBridge } from '../bridges';
+
+function createProcessorId(jobId: string, appId: string): string {
+    return jobId.includes(`_${appId}`) ? jobId : `${jobId}_${appId}`;
+}
+
+export class SchedulerModify implements ISchedulerModify {
+    constructor(private readonly bridge: SchedulerBridge, private readonly appId: string) {}
+
+    public async scheduleOnce(job: IOnetimeSchedule): Promise<void | string> {
+        return this.bridge.doScheduleOnce({ ...job, id: createProcessorId(job.id, this.appId) }, this.appId);
+    }
+
+    public async scheduleRecurring(job: IRecurringSchedule): Promise<void | string> {
+        return this.bridge.doScheduleRecurring({ ...job, id: createProcessorId(job.id, this.appId) }, this.appId);
+    }
+
+    public async cancelJob(jobId: string): Promise<void> {
+        return this.bridge.doCancelJob(createProcessorId(jobId, this.appId), this.appId);
+    }
+
+    public async cancelAllJobs(): Promise<void> {
+        return this.bridge.doCancelAllJobs(this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ServerSettingRead.ts b/packages/apps-engine/src/server/accessors/ServerSettingRead.ts
new file mode 100644
index 000000000000..5660ac1b1560
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ServerSettingRead.ts
@@ -0,0 +1,34 @@
+import type { IServerSettingRead } from '../../definition/accessors';
+import type { ISetting } from '../../definition/settings';
+import type { ServerSettingBridge } from '../bridges/ServerSettingBridge';
+
+export class ServerSettingRead implements IServerSettingRead {
+    constructor(private readonly settingBridge: ServerSettingBridge, private readonly appId: string) {}
+
+    public getOneById(id: string): Promise<ISetting> {
+        return this.settingBridge.doGetOneById(id, this.appId);
+    }
+
+    public async getValueById(id: string): Promise<any> {
+        const set = await this.settingBridge.doGetOneById(id, this.appId);
+
+        if (typeof set === 'undefined') {
+            throw new Error(`No Server Setting found, or it is unaccessible, by the id of "${id}".`);
+        }
+
+        if (set.value === undefined || set.value === null) {
+            return set.packageValue;
+        }
+
+        return set.value;
+    }
+
+    public getAll(): Promise<IterableIterator<ISetting>> {
+        throw new Error('Method not implemented.');
+        // return this.settingBridge.getAll(this.appId);
+    }
+
+    public isReadableById(id: string): Promise<boolean> {
+        return this.settingBridge.doIsReadableById(id, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts b/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts
new file mode 100644
index 000000000000..d4022ac643b4
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts
@@ -0,0 +1,15 @@
+import type { IServerSettingUpdater } from '../../definition/accessors';
+import type { ISetting } from '../../definition/settings';
+import type { AppBridges } from '../bridges';
+
+export class ServerSettingUpdater implements IServerSettingUpdater {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public async updateOne(setting: ISetting): Promise<void> {
+        await this.bridges.getServerSettingBridge().doUpdateOne(setting, this.appId);
+    }
+
+    public async incrementValue(id: ISetting['id'], value = 1): Promise<void> {
+        await this.bridges.getServerSettingBridge().doIncrementValue(id, value, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts b/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts
new file mode 100644
index 000000000000..3ca999e59f84
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts
@@ -0,0 +1,23 @@
+import type { IServerSettingsModify } from '../../definition/accessors';
+import type { ISetting } from '../../definition/settings';
+import type { ServerSettingBridge } from '../bridges/ServerSettingBridge';
+
+export class ServerSettingsModify implements IServerSettingsModify {
+    constructor(private readonly bridge: ServerSettingBridge, private readonly appId: string) {}
+
+    public async hideGroup(name: string): Promise<void> {
+        await this.bridge.doHideGroup(name, this.appId);
+    }
+
+    public async hideSetting(id: string): Promise<void> {
+        await this.bridge.doHideSetting(id, this.appId);
+    }
+
+    public async modifySetting(setting: ISetting): Promise<void> {
+        await this.bridge.doUpdateOne(setting, this.appId);
+    }
+
+    public async incrementValue(id: ISetting['id'], value = 1): Promise<void> {
+        await this.bridge.doIncrementValue(id, value, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SettingRead.ts b/packages/apps-engine/src/server/accessors/SettingRead.ts
new file mode 100644
index 000000000000..0f61b004abb3
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SettingRead.ts
@@ -0,0 +1,25 @@
+import type { ISettingRead } from '../../definition/accessors';
+import type { ISetting } from '../../definition/settings';
+import type { ProxiedApp } from '../ProxiedApp';
+
+export class SettingRead implements ISettingRead {
+    constructor(private readonly app: ProxiedApp) {}
+
+    public getById(id: string): Promise<ISetting> {
+        return Promise.resolve(this.app.getStorageItem().settings[id]);
+    }
+
+    public async getValueById(id: string): Promise<any> {
+        const set = await this.getById(id);
+
+        if (typeof set === 'undefined') {
+            throw new Error(`Setting "${id}" does not exist.`);
+        }
+
+        if (set.value === undefined || set.value === null) {
+            return set.packageValue;
+        }
+
+        return set.value;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SettingUpdater.ts b/packages/apps-engine/src/server/accessors/SettingUpdater.ts
new file mode 100644
index 000000000000..a4310d9ef6ee
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SettingUpdater.ts
@@ -0,0 +1,22 @@
+import type { ISettingUpdater } from '../../definition/accessors/ISettingUpdater';
+import type { ISetting } from '../../definition/settings';
+import type { ProxiedApp } from '../ProxiedApp';
+import type { AppSettingsManager } from '../managers';
+
+export class SettingUpdater implements ISettingUpdater {
+    constructor(private readonly app: ProxiedApp, private readonly manager: AppSettingsManager) {}
+
+    public async updateValue(id: ISetting['id'], value: ISetting['value']) {
+        if (!this.app.getStorageItem().settings[id]) {
+            return;
+        }
+
+        const setting = this.manager.getAppSetting(this.app.getID(), id);
+
+        this.manager.updateAppSetting(this.app.getID(), {
+            ...setting,
+            updatedAt: new Date(),
+            value,
+        });
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SettingsExtend.ts b/packages/apps-engine/src/server/accessors/SettingsExtend.ts
new file mode 100644
index 000000000000..f83861da7bd3
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SettingsExtend.ts
@@ -0,0 +1,26 @@
+import type { ISettingsExtend } from '../../definition/accessors';
+import type { ISetting } from '../../definition/settings';
+import type { ProxiedApp } from '../ProxiedApp';
+
+export class SettingsExtend implements ISettingsExtend {
+    constructor(private readonly app: ProxiedApp) {}
+
+    public async provideSetting(setting: ISetting): Promise<void> {
+        if (this.app.getStorageItem().settings[setting.id]) {
+            // :see_no_evil:
+            const old = await Promise.resolve(this.app.getStorageItem().settings[setting.id]);
+
+            setting.createdAt = old.createdAt;
+            setting.updatedAt = new Date();
+            setting.value = old.value;
+
+            this.app.getStorageItem().settings[setting.id] = setting;
+
+            return;
+        }
+
+        setting.createdAt = new Date();
+        setting.updatedAt = new Date();
+        this.app.getStorageItem().settings[setting.id] = setting;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts b/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts
new file mode 100644
index 000000000000..4653571443b5
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts
@@ -0,0 +1,11 @@
+import type { ISlashCommandsExtend } from '../../definition/accessors';
+import type { ISlashCommand } from '../../definition/slashcommands';
+import type { AppSlashCommandManager } from '../managers/AppSlashCommandManager';
+
+export class SlashCommandsExtend implements ISlashCommandsExtend {
+    constructor(private readonly manager: AppSlashCommandManager, private readonly appId: string) {}
+
+    public provideSlashCommand(slashCommand: ISlashCommand): Promise<void> {
+        return Promise.resolve(this.manager.addCommand(this.appId, slashCommand));
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts b/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts
new file mode 100644
index 000000000000..690157db6de7
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts
@@ -0,0 +1,19 @@
+import type { ISlashCommandsModify } from '../../definition/accessors';
+import type { ISlashCommand } from '../../definition/slashcommands';
+import type { AppSlashCommandManager } from '../managers';
+
+export class SlashCommandsModify implements ISlashCommandsModify {
+    constructor(private readonly manager: AppSlashCommandManager, private readonly appId: string) {}
+
+    public modifySlashCommand(slashCommand: ISlashCommand): Promise<void> {
+        return Promise.resolve(this.manager.modifyCommand(this.appId, slashCommand));
+    }
+
+    public disableSlashCommand(command: string): Promise<void> {
+        return Promise.resolve(this.manager.disableCommand(this.appId, command));
+    }
+
+    public enableSlashCommand(command: string): Promise<void> {
+        return Promise.resolve(this.manager.enableCommand(this.appId, command));
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ThreadRead.ts b/packages/apps-engine/src/server/accessors/ThreadRead.ts
new file mode 100644
index 000000000000..45cdf9225d01
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ThreadRead.ts
@@ -0,0 +1,11 @@
+import type { IThreadRead } from '../../definition/accessors/IThreadRead';
+import type { IMessage } from '../../definition/messages';
+import type { ThreadBridge } from '../bridges/ThreadBridge';
+
+export class ThreadRead implements IThreadRead {
+    constructor(private threadBridge: ThreadBridge, private appId: string) {}
+
+    public getThreadById(id: string): Promise<Array<IMessage>> {
+        return this.threadBridge.doGetById(id, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UIController.ts b/packages/apps-engine/src/server/accessors/UIController.ts
new file mode 100644
index 000000000000..3fb33f8da318
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UIController.ts
@@ -0,0 +1,106 @@
+import type { IUIController } from '../../definition/accessors';
+import type { IUIKitErrorInteractionParam, IUIKitInteractionParam, IUIKitSurfaceViewParam } from '../../definition/accessors/IUIController';
+import { UIKitInteractionType, UIKitSurfaceType } from '../../definition/uikit';
+import { formatContextualBarInteraction, formatErrorInteraction, formatModalInteraction } from '../../definition/uikit/UIKitInteractionPayloadFormatter';
+import type { IUIKitContextualBarViewParam, IUIKitModalViewParam } from '../../definition/uikit/UIKitInteractionResponder';
+import type { IUser } from '../../definition/users';
+import type { AppBridges, UiInteractionBridge } from '../bridges';
+import { UIHelper } from '../misc/UIHelper';
+
+export class UIController implements IUIController {
+    private readonly uiInteractionBridge: UiInteractionBridge;
+
+    constructor(private readonly appId: string, bridges: AppBridges) {
+        this.uiInteractionBridge = bridges.getUiInteractionBridge();
+    }
+
+    /**
+     * @deprecated please prefer the `openSurfaceView` method
+     */
+    public openModalView(view: IUIKitModalViewParam, context: IUIKitInteractionParam, user: IUser) {
+        return this.openModal(view, context, user);
+    }
+
+    /**
+     * @deprecated please prefer the `updateSurfaceView` method
+     */
+    public updateModalView(view: IUIKitModalViewParam, context: IUIKitInteractionParam, user: IUser) {
+        return this.openModal(view, context, user, true);
+    }
+
+    /**
+     * @deprecated please prefer the `openSurfaceView` method
+     */
+    public openContextualBarView(view: IUIKitContextualBarViewParam, context: IUIKitInteractionParam, user: IUser) {
+        return this.openContextualBar(view, context, user);
+    }
+
+    /**
+     * @deprecated please prefer the `updateSurfaceView` method
+     */
+    public updateContextualBarView(view: IUIKitContextualBarViewParam, context: IUIKitInteractionParam, user: IUser) {
+        return this.openContextualBar(view, context, user, true);
+    }
+
+    public openSurfaceView(view: IUIKitSurfaceViewParam, context: IUIKitInteractionParam, user: IUser) {
+        const blocks = UIHelper.assignIds(view.blocks, this.appId);
+        const viewWithIds = { ...view, blocks };
+
+        switch (view.type) {
+            case UIKitSurfaceType.CONTEXTUAL_BAR:
+                return this.openContextualBar(viewWithIds, context, user);
+            case UIKitSurfaceType.MODAL:
+                return this.openModal(viewWithIds, context, user);
+        }
+    }
+
+    public updateSurfaceView(view: IUIKitSurfaceViewParam, context: IUIKitInteractionParam, user: IUser) {
+        const blocks = UIHelper.assignIds(view.blocks, this.appId);
+        const viewWithIds = { ...view, blocks };
+
+        switch (view.type) {
+            case UIKitSurfaceType.CONTEXTUAL_BAR:
+                return this.openContextualBar(viewWithIds, context, user, true);
+            case UIKitSurfaceType.MODAL:
+                return this.openModal(viewWithIds, context, user, true);
+        }
+    }
+
+    public setViewError(errorInteraction: IUIKitErrorInteractionParam, context: IUIKitInteractionParam, user: IUser) {
+        const interactionContext = {
+            ...context,
+            type: UIKitInteractionType.ERRORS,
+            appId: this.appId,
+        };
+
+        return this.uiInteractionBridge.doNotifyUser(user, formatErrorInteraction(errorInteraction, interactionContext), this.appId);
+    }
+
+    private openContextualBar(view: IUIKitContextualBarViewParam, context: IUIKitInteractionParam, user: IUser, isUpdate = false): Promise<void> {
+        let type = UIKitInteractionType.CONTEXTUAL_BAR_OPEN;
+        if (isUpdate) {
+            type = UIKitInteractionType.CONTEXTUAL_BAR_UPDATE;
+        }
+        const interactionContext = {
+            ...context,
+            type,
+            appId: this.appId,
+        };
+
+        return this.uiInteractionBridge.doNotifyUser(user, formatContextualBarInteraction(view, interactionContext), this.appId);
+    }
+
+    private openModal(view: IUIKitModalViewParam, context: IUIKitInteractionParam, user: IUser, isUpdate = false): Promise<void> {
+        let type = UIKitInteractionType.MODAL_OPEN;
+        if (isUpdate) {
+            type = UIKitInteractionType.MODAL_UPDATE;
+        }
+        const interactionContext = {
+            ...context,
+            type,
+            appId: this.appId,
+        };
+
+        return this.uiInteractionBridge.doNotifyUser(user, formatModalInteraction(view, interactionContext), this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UIExtend.ts b/packages/apps-engine/src/server/accessors/UIExtend.ts
new file mode 100644
index 000000000000..b19db42e7e98
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UIExtend.ts
@@ -0,0 +1,11 @@
+import type { IUIExtend } from '../../definition/accessors';
+import type { IUIActionButtonDescriptor } from '../../definition/ui';
+import type { UIActionButtonManager } from '../managers/UIActionButtonManager';
+
+export class UIExtend implements IUIExtend {
+    constructor(private readonly manager: UIActionButtonManager, private readonly appId: string) {}
+
+    public registerButton(button: IUIActionButtonDescriptor): void {
+        this.manager.registerActionButton(this.appId, button);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UploadCreator.ts b/packages/apps-engine/src/server/accessors/UploadCreator.ts
new file mode 100644
index 000000000000..7316c43fcf3b
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UploadCreator.ts
@@ -0,0 +1,25 @@
+import type { IUploadCreator } from '../../definition/accessors';
+import type { IUpload } from '../../definition/uploads';
+import type { IUploadDescriptor } from '../../definition/uploads/IUploadDescriptor';
+import type { IUploadDetails } from '../../definition/uploads/IUploadDetails';
+import type { AppBridges } from '../bridges';
+
+export class UploadCreator implements IUploadCreator {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public async uploadBuffer(buffer: Buffer, descriptor: IUploadDescriptor): Promise<IUpload> {
+        if (!descriptor.hasOwnProperty('user') && !descriptor.visitorToken) {
+            descriptor.user = await this.bridges.getUserBridge().doGetAppUser(this.appId);
+        }
+
+        const details = {
+            name: descriptor.filename,
+            size: buffer.length,
+            rid: descriptor.room.id,
+            userId: descriptor.user?.id,
+            visitorToken: descriptor.visitorToken,
+        } as IUploadDetails;
+
+        return this.bridges.getUploadBridge().doCreateUpload(details, buffer, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UploadRead.ts b/packages/apps-engine/src/server/accessors/UploadRead.ts
new file mode 100644
index 000000000000..e2d32de3f9b7
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UploadRead.ts
@@ -0,0 +1,21 @@
+import type { IUploadRead } from '../../definition/accessors';
+import type { IUpload } from '../../definition/uploads';
+import type { UploadBridge } from '../bridges/UploadBridge';
+
+export class UploadRead implements IUploadRead {
+    constructor(private readonly uploadBridge: UploadBridge, private readonly appId: string) {}
+
+    public getById(id: string): Promise<IUpload> {
+        return this.uploadBridge.doGetById(id, this.appId);
+    }
+
+    public getBuffer(upload: IUpload): Promise<Buffer> {
+        return this.uploadBridge.doGetBuffer(upload, this.appId);
+    }
+
+    public async getBufferById(id: string): Promise<Buffer> {
+        const upload = await this.uploadBridge.doGetById(id, this.appId);
+
+        return this.uploadBridge.doGetBuffer(upload, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UserBuilder.ts b/packages/apps-engine/src/server/accessors/UserBuilder.ts
new file mode 100644
index 000000000000..99e15851201b
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UserBuilder.ts
@@ -0,0 +1,74 @@
+import type { IUserBuilder } from '../../definition/accessors';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IUser, IUserEmail } from '../../definition/users';
+import type { IUserSettings } from '../../definition/users/IUserSettings';
+
+export class UserBuilder implements IUserBuilder {
+    public kind: RocketChatAssociationModel.USER;
+
+    private user: Partial<IUser>;
+
+    constructor(user?: Partial<IUser>) {
+        this.kind = RocketChatAssociationModel.USER;
+        this.user = user || ({} as Partial<IUser>);
+    }
+
+    public setData(data: Partial<IUser>): IUserBuilder {
+        delete data.id;
+        this.user = data;
+
+        return this;
+    }
+
+    public setEmails(emails: Array<IUserEmail>): IUserBuilder {
+        this.user.emails = emails;
+        return this;
+    }
+
+    public getEmails(): Array<IUserEmail> {
+        return this.user.emails;
+    }
+
+    public setDisplayName(name: string): IUserBuilder {
+        this.user.name = name;
+        return this;
+    }
+
+    public getDisplayName(): string {
+        return this.user.name;
+    }
+
+    public setUsername(username: string): IUserBuilder {
+        this.user.username = username;
+        return this;
+    }
+
+    public getUsername(): string {
+        return this.user.username;
+    }
+
+    public setRoles(roles: Array<string>): IUserBuilder {
+        this.user.roles = roles;
+        return this;
+    }
+
+    public getRoles(): Array<string> {
+        return this.user.roles;
+    }
+
+    public getSettings(): Partial<IUserSettings> {
+        return this.user.settings;
+    }
+
+    public getUser(): Partial<IUser> {
+        if (!this.user.username) {
+            throw new Error('The "username" property is required.');
+        }
+
+        if (!this.user.name) {
+            throw new Error('The "name" property is required.');
+        }
+
+        return this.user;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UserRead.ts b/packages/apps-engine/src/server/accessors/UserRead.ts
new file mode 100644
index 000000000000..4eeb38cc77e3
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UserRead.ts
@@ -0,0 +1,23 @@
+import type { IUserRead } from '../../definition/accessors';
+import type { IUser } from '../../definition/users';
+import type { UserBridge } from '../bridges/UserBridge';
+
+export class UserRead implements IUserRead {
+    constructor(private userBridge: UserBridge, private appId: string) {}
+
+    public getById(id: string): Promise<IUser> {
+        return this.userBridge.doGetById(id, this.appId);
+    }
+
+    public getByUsername(username: string): Promise<IUser> {
+        return this.userBridge.doGetByUsername(username, this.appId);
+    }
+
+    public getAppUser(appId: string = this.appId): Promise<IUser | undefined> {
+        return this.userBridge.doGetAppUser(appId);
+    }
+
+    public getUserUnreadMessageCount(uid: string): Promise<number> {
+        return this.userBridge.doGetUserUnreadMessageCount(uid, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/UserUpdater.ts b/packages/apps-engine/src/server/accessors/UserUpdater.ts
new file mode 100644
index 000000000000..ed10617c6a37
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/UserUpdater.ts
@@ -0,0 +1,28 @@
+import type { IUserUpdater } from '../../definition/accessors/IUserUpdater';
+import type { UserStatusConnection } from '../../definition/users';
+import type { IUser } from '../../definition/users/IUser';
+import type { AppBridges } from '../bridges';
+
+export class UserUpdater implements IUserUpdater {
+    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+
+    public async updateStatusText(user: IUser, statusText: IUser['statusText']) {
+        return this.bridges.getUserBridge().doUpdate(user, { statusText }, this.appId);
+    }
+
+    public async updateStatus(user: IUser, statusText: IUser['statusText'], status: UserStatusConnection) {
+        return this.bridges.getUserBridge().doUpdate(user, { statusText, status }, this.appId);
+    }
+
+    public async updateBio(user: IUser, bio: IUser['bio']) {
+        return this.bridges.getUserBridge().doUpdate(user, { bio }, this.appId);
+    }
+
+    public async updateCustomFields(user: IUser, customFields: IUser['customFields']) {
+        return this.bridges.getUserBridge().doUpdate(user, { customFields }, this.appId);
+    }
+
+    public async deactivate(userId: IUser['id'], confirmRelinquish: boolean) {
+        return this.bridges.getUserBridge().doDeactivate(userId, confirmRelinquish, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts b/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts
new file mode 100644
index 000000000000..e0e895cb57b0
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts
@@ -0,0 +1,11 @@
+import type { IVideoConfProvidersExtend } from '../../definition/accessors';
+import type { IVideoConfProvider } from '../../definition/videoConfProviders';
+import type { AppVideoConfProviderManager } from '../managers/AppVideoConfProviderManager';
+
+export class VideoConfProviderExtend implements IVideoConfProvidersExtend {
+    constructor(private readonly manager: AppVideoConfProviderManager, private readonly appId: string) {}
+
+    public provideVideoConfProvider(provider: IVideoConfProvider): Promise<void> {
+        return Promise.resolve(this.manager.addProvider(this.appId, provider));
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/VideoConferenceBuilder.ts b/packages/apps-engine/src/server/accessors/VideoConferenceBuilder.ts
new file mode 100644
index 000000000000..bd12028b7853
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/VideoConferenceBuilder.ts
@@ -0,0 +1,83 @@
+import type { IVideoConferenceBuilder } from '../../definition/accessors';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { AppVideoConference } from '../../definition/videoConferences';
+
+export class VideoConferenceBuilder implements IVideoConferenceBuilder {
+    public kind: RocketChatAssociationModel.VIDEO_CONFERENCE = RocketChatAssociationModel.VIDEO_CONFERENCE;
+
+    protected call: AppVideoConference;
+
+    constructor(data?: Partial<AppVideoConference>) {
+        this.call = (data || {}) as AppVideoConference;
+    }
+
+    public setData(data: Partial<AppVideoConference>): IVideoConferenceBuilder {
+        this.call = {
+            rid: data.rid,
+            createdBy: data.createdBy,
+            providerName: data.providerName,
+            title: data.title,
+            discussionRid: data.discussionRid,
+        };
+
+        return this;
+    }
+
+    public setRoomId(rid: string): IVideoConferenceBuilder {
+        this.call.rid = rid;
+        return this;
+    }
+
+    public getRoomId(): string {
+        return this.call.rid;
+    }
+
+    public setCreatedBy(userId: string): IVideoConferenceBuilder {
+        this.call.createdBy = userId;
+        return this;
+    }
+
+    public getCreatedBy(): string {
+        return this.call.createdBy;
+    }
+
+    public setProviderName(userId: string): IVideoConferenceBuilder {
+        this.call.providerName = userId;
+        return this;
+    }
+
+    public getProviderName(): string {
+        return this.call.providerName;
+    }
+
+    public setProviderData(data: Record<string, any> | undefined): IVideoConferenceBuilder {
+        this.call.providerData = data;
+        return this;
+    }
+
+    public getProviderData(): Record<string, any> | undefined {
+        return this.call.providerData;
+    }
+
+    public setTitle(userId: string): IVideoConferenceBuilder {
+        this.call.title = userId;
+        return this;
+    }
+
+    public getTitle(): string {
+        return this.call.title;
+    }
+
+    public setDiscussionRid(rid: AppVideoConference['discussionRid']): IVideoConferenceBuilder {
+        this.call.discussionRid = rid;
+        return this;
+    }
+
+    public getDiscussionRid(): AppVideoConference['discussionRid'] {
+        return this.call.discussionRid;
+    }
+
+    public getVideoConference(): AppVideoConference {
+        return this.call;
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/VideoConferenceExtend.ts b/packages/apps-engine/src/server/accessors/VideoConferenceExtend.ts
new file mode 100644
index 000000000000..fd3692614aea
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/VideoConferenceExtend.ts
@@ -0,0 +1,64 @@
+import type { IVideoConferenceExtender } from '../../definition/accessors';
+import { RocketChatAssociationModel } from '../../definition/metadata';
+import type { IVideoConferenceUser, VideoConference } from '../../definition/videoConferences';
+import type { VideoConferenceMember } from '../../definition/videoConferences/IVideoConference';
+import { Utilities } from '../misc/Utilities';
+
+export class VideoConferenceExtender implements IVideoConferenceExtender {
+    public kind: RocketChatAssociationModel.VIDEO_CONFERENCE;
+
+    constructor(private videoConference: VideoConference) {
+        this.kind = RocketChatAssociationModel.VIDEO_CONFERENCE;
+    }
+
+    public setProviderData(value: Record<string, any>): IVideoConferenceExtender {
+        this.videoConference.providerData = value;
+
+        return this;
+    }
+
+    public setStatus(value: VideoConference['status']): IVideoConferenceExtender {
+        this.videoConference.status = value;
+
+        return this;
+    }
+
+    public setEndedBy(value: IVideoConferenceUser['_id']): IVideoConferenceExtender {
+        this.videoConference.endedBy = {
+            _id: value,
+            // Name and username will be loaded automatically by the bridge
+            username: '',
+            name: '',
+        };
+
+        return this;
+    }
+
+    public setEndedAt(value: VideoConference['endedAt']): IVideoConferenceExtender {
+        this.videoConference.endedAt = value;
+
+        return this;
+    }
+
+    public addUser(userId: VideoConferenceMember['_id'], ts?: VideoConferenceMember['ts']): IVideoConferenceExtender {
+        this.videoConference.users.push({
+            _id: userId,
+            ts,
+            // Name and username will be loaded automatically by the bridge
+            username: '',
+            name: '',
+        });
+
+        return this;
+    }
+
+    public setDiscussionRid(rid: VideoConference['discussionRid']): IVideoConferenceExtender {
+        this.videoConference.discussionRid = rid;
+
+        return this;
+    }
+
+    public getVideoConference(): VideoConference {
+        return Utilities.deepClone(this.videoConference);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts b/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts
new file mode 100644
index 000000000000..011e2d2ae844
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts
@@ -0,0 +1,11 @@
+import type { IVideoConferenceRead } from '../../definition/accessors';
+import type { VideoConference } from '../../definition/videoConferences';
+import type { VideoConferenceBridge } from '../bridges';
+
+export class VideoConferenceRead implements IVideoConferenceRead {
+    constructor(private videoConfBridge: VideoConferenceBridge, private appId: string) {}
+
+    public getById(id: string): Promise<VideoConference> {
+        return this.videoConfBridge.doGetById(id, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/index.ts b/packages/apps-engine/src/server/accessors/index.ts
new file mode 100644
index 000000000000..dcc513eba6f8
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/index.ts
@@ -0,0 +1,95 @@
+import { ApiExtend } from './ApiExtend';
+import { AppAccessors } from './AppAccessors';
+import { ConfigurationExtend } from './ConfigurationExtend';
+import { ConfigurationModify } from './ConfigurationModify';
+import { EnvironmentRead } from './EnvironmentRead';
+import { EnvironmentWrite } from './EnvironmentWrite';
+import { EnvironmentalVariableRead } from './EnvironmentalVariableRead';
+import { ExternalComponentsExtend } from './ExternalComponentsExtend';
+import { Http } from './Http';
+import { HttpExtend } from './HttpExtend';
+import { LivechatRead } from './LivechatRead';
+import { MessageBuilder } from './MessageBuilder';
+import { MessageExtender } from './MessageExtender';
+import { MessageRead } from './MessageRead';
+import { ModerationModify } from './ModerationModify';
+import { Modify } from './Modify';
+import { ModifyCreator } from './ModifyCreator';
+import { ModifyExtender } from './ModifyExtender';
+import { ModifyUpdater } from './ModifyUpdater';
+import { Notifier } from './Notifier';
+import { OAuthAppsModify } from './OAuthAppsModify';
+import { OAuthAppsReader } from './OAuthAppsReader';
+import { Persistence } from './Persistence';
+import { PersistenceRead } from './PersistenceRead';
+import { Reader } from './Reader';
+import { RoleRead } from './RoleRead';
+import { RoomBuilder } from './RoomBuilder';
+import { RoomExtender } from './RoomExtender';
+import { RoomRead } from './RoomRead';
+import { SchedulerExtend } from './SchedulerExtend';
+import { SchedulerModify } from './SchedulerModify';
+import { ServerSettingRead } from './ServerSettingRead';
+import { ServerSettingUpdater } from './ServerSettingUpdater';
+import { ServerSettingsModify } from './ServerSettingsModify';
+import { SettingRead } from './SettingRead';
+import { SettingUpdater } from './SettingUpdater';
+import { SettingsExtend } from './SettingsExtend';
+import { SlashCommandsExtend } from './SlashCommandsExtend';
+import { SlashCommandsModify } from './SlashCommandsModify';
+import { UploadRead } from './UploadRead';
+import { UserBuilder } from './UserBuilder';
+import { UserRead } from './UserRead';
+import { VideoConfProviderExtend } from './VideoConfProviderExtend';
+import { VideoConferenceBuilder } from './VideoConferenceBuilder';
+import { VideoConferenceExtender } from './VideoConferenceExtend';
+import { VideoConferenceRead } from './VideoConferenceRead';
+
+export {
+    ApiExtend,
+    AppAccessors,
+    ConfigurationExtend,
+    ConfigurationModify,
+    EnvironmentalVariableRead,
+    EnvironmentRead,
+    EnvironmentWrite,
+    ExternalComponentsExtend,
+    Http,
+    HttpExtend,
+    LivechatRead,
+    MessageBuilder,
+    MessageExtender,
+    MessageRead,
+    ModerationModify,
+    Modify,
+    ModifyCreator,
+    ModifyExtender,
+    ModifyUpdater,
+    Notifier,
+    Persistence,
+    PersistenceRead,
+    Reader,
+    RoleRead,
+    RoomBuilder,
+    RoomExtender,
+    RoomRead,
+    ServerSettingRead,
+    ServerSettingsModify,
+    ServerSettingUpdater,
+    SettingRead,
+    SettingsExtend,
+    SettingUpdater,
+    SlashCommandsExtend,
+    SlashCommandsModify,
+    UploadRead,
+    UserBuilder,
+    UserRead,
+    SchedulerExtend,
+    SchedulerModify,
+    VideoConferenceBuilder,
+    VideoConferenceExtender,
+    VideoConferenceRead,
+    VideoConfProviderExtend,
+    OAuthAppsModify,
+    OAuthAppsReader,
+};
diff --git a/packages/apps-engine/src/server/bridges/ApiBridge.ts b/packages/apps-engine/src/server/bridges/ApiBridge.ts
new file mode 100644
index 000000000000..32f5316d3ce4
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/ApiBridge.ts
@@ -0,0 +1,49 @@
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import type { AppApi } from '../managers/AppApi';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class ApiBridge extends BaseBridge {
+    public async doRegisterApi(api: AppApi, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.registerApi(api, appId);
+        }
+    }
+
+    public async doUnregisterApis(appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.unregisterApis(appId);
+        }
+    }
+
+    /**
+     * Registers an api with the system which is being bridged.
+     *
+     * @param api the api to register
+     * @param appId the id of the app calling this
+     */
+    protected abstract registerApi(api: AppApi, appId: string): Promise<void>;
+
+    /**
+     * Unregisters all provided api's of an app from the bridged system.
+     *
+     * @param appId the id of the app calling this
+     */
+    protected abstract unregisterApis(appId: string): Promise<void>;
+
+    private hasDefaultPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.apis.default)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.apis.default],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/AppActivationBridge.ts b/packages/apps-engine/src/server/bridges/AppActivationBridge.ts
new file mode 100644
index 000000000000..784b2cc4ceab
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/AppActivationBridge.ts
@@ -0,0 +1,35 @@
+import type { AppStatus } from '../../definition/AppStatus';
+import type { ProxiedApp } from '../ProxiedApp';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class AppActivationBridge extends BaseBridge {
+    public async doAppAdded(app: ProxiedApp): Promise<void> {
+        return this.appAdded(app);
+    }
+
+    public async doAppUpdated(app: ProxiedApp): Promise<void> {
+        return this.appUpdated(app);
+    }
+
+    public async doAppRemoved(app: ProxiedApp): Promise<void> {
+        return this.appRemoved(app);
+    }
+
+    public async doAppStatusChanged(app: ProxiedApp, status: AppStatus): Promise<void> {
+        return this.appStatusChanged(app, status);
+    }
+
+    public async doActionsChanged(): Promise<void> {
+        return this.actionsChanged();
+    }
+
+    protected abstract appAdded(app: ProxiedApp): Promise<void>;
+
+    protected abstract appUpdated(app: ProxiedApp): Promise<void>;
+
+    protected abstract appRemoved(app: ProxiedApp): Promise<void>;
+
+    protected abstract appStatusChanged(app: ProxiedApp, status: AppStatus): Promise<void>;
+
+    protected abstract actionsChanged(): Promise<void>;
+}
diff --git a/packages/apps-engine/src/server/bridges/AppBridges.ts b/packages/apps-engine/src/server/bridges/AppBridges.ts
new file mode 100644
index 000000000000..643bdbea1abb
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/AppBridges.ts
@@ -0,0 +1,101 @@
+import type { ApiBridge } from './ApiBridge';
+import type { AppActivationBridge } from './AppActivationBridge';
+import type { AppDetailChangesBridge } from './AppDetailChangesBridge';
+import type { CloudWorkspaceBridge } from './CloudWorkspaceBridge';
+import type { CommandBridge } from './CommandBridge';
+import type { EmailBridge } from './EmailBridge';
+import type { EnvironmentalVariableBridge } from './EnvironmentalVariableBridge';
+import type { HttpBridge } from './HttpBridge';
+import type { IInternalBridge } from './IInternalBridge';
+import type { IInternalFederationBridge } from './IInternalFederationBridge';
+import type { IListenerBridge } from './IListenerBridge';
+import type { LivechatBridge } from './LivechatBridge';
+import type { MessageBridge } from './MessageBridge';
+import type { ModerationBridge } from './ModerationBridge';
+import type { OAuthAppsBridge } from './OAuthAppsBridge';
+import type { PersistenceBridge } from './PersistenceBridge';
+import type { RoleBridge } from './RoleBridge';
+import type { RoomBridge } from './RoomBridge';
+import type { SchedulerBridge } from './SchedulerBridge';
+import type { ServerSettingBridge } from './ServerSettingBridge';
+import type { ThreadBridge } from './ThreadBridge';
+import type { UiInteractionBridge } from './UiInteractionBridge';
+import type { UploadBridge } from './UploadBridge';
+import type { UserBridge } from './UserBridge';
+import type { VideoConferenceBridge } from './VideoConferenceBridge';
+
+export type Bridge =
+    | CommandBridge
+    | ApiBridge
+    | AppDetailChangesBridge
+    | EnvironmentalVariableBridge
+    | HttpBridge
+    | IListenerBridge
+    | LivechatBridge
+    | MessageBridge
+    | PersistenceBridge
+    | AppActivationBridge
+    | RoomBridge
+    | IInternalBridge
+    | ServerSettingBridge
+    | EmailBridge
+    | UploadBridge
+    | UserBridge
+    | UiInteractionBridge
+    | SchedulerBridge
+    | VideoConferenceBridge
+    | OAuthAppsBridge
+    | ModerationBridge
+    | RoleBridge;
+
+export abstract class AppBridges {
+    public abstract getCommandBridge(): CommandBridge;
+
+    public abstract getApiBridge(): ApiBridge;
+
+    public abstract getAppDetailChangesBridge(): AppDetailChangesBridge;
+
+    public abstract getEnvironmentalVariableBridge(): EnvironmentalVariableBridge;
+
+    public abstract getHttpBridge(): HttpBridge;
+
+    public abstract getListenerBridge(): IListenerBridge;
+
+    public abstract getLivechatBridge(): LivechatBridge;
+
+    public abstract getMessageBridge(): MessageBridge;
+
+    public abstract getPersistenceBridge(): PersistenceBridge;
+
+    public abstract getAppActivationBridge(): AppActivationBridge;
+
+    public abstract getRoomBridge(): RoomBridge;
+
+    public abstract getInternalBridge(): IInternalBridge;
+
+    public abstract getInternalFederationBridge(): IInternalFederationBridge;
+
+    public abstract getServerSettingBridge(): ServerSettingBridge;
+
+    public abstract getUploadBridge(): UploadBridge;
+
+    public abstract getEmailBridge(): EmailBridge;
+
+    public abstract getUserBridge(): UserBridge;
+
+    public abstract getUiInteractionBridge(): UiInteractionBridge;
+
+    public abstract getSchedulerBridge(): SchedulerBridge;
+
+    public abstract getCloudWorkspaceBridge(): CloudWorkspaceBridge;
+
+    public abstract getVideoConferenceBridge(): VideoConferenceBridge;
+
+    public abstract getOAuthAppsBridge(): OAuthAppsBridge;
+
+    public abstract getModerationBridge(): ModerationBridge;
+
+    public abstract getThreadBridge(): ThreadBridge;
+
+    public abstract getRoleBridge(): RoleBridge;
+}
diff --git a/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts b/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts
new file mode 100644
index 000000000000..357419c9aa95
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts
@@ -0,0 +1,16 @@
+import type { ISetting } from '../../definition/settings';
+import { BaseBridge } from './BaseBridge';
+
+/**
+ * An abstract class which will contain various methods related to Apps
+ * which are called for various inner detail working changes. This
+ * allows for us to notify various external components of internal
+ * changes.
+ */
+export abstract class AppDetailChangesBridge extends BaseBridge {
+    public doOnAppSettingsChange(appId: string, setting: ISetting): void {
+        return this.onAppSettingsChange(appId, setting);
+    }
+
+    protected abstract onAppSettingsChange(appId: string, setting: ISetting): void;
+}
diff --git a/packages/apps-engine/src/server/bridges/BaseBridge.ts b/packages/apps-engine/src/server/bridges/BaseBridge.ts
new file mode 100644
index 000000000000..7085c3d54db7
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/BaseBridge.ts
@@ -0,0 +1,6 @@
+/**
+ * This class will be used for identification
+ * of the instances the host sends over to
+ * the Apps-Engine
+ */
+export abstract class BaseBridge {}
diff --git a/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts b/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts
new file mode 100644
index 000000000000..bb1caf3a151c
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts
@@ -0,0 +1,30 @@
+import type { IWorkspaceToken } from '../../definition/cloud/IWorkspaceToken';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class CloudWorkspaceBridge extends BaseBridge {
+    public doGetWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken> {
+        if (this.hasCloudTokenPermission(appId)) {
+            return this.getWorkspaceToken(scope, appId);
+        }
+    }
+
+    protected abstract getWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken>;
+
+    private hasCloudTokenPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.cloud['workspace-token'])) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.cloud['workspace-token']],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/CommandBridge.ts b/packages/apps-engine/src/server/bridges/CommandBridge.ts
new file mode 100644
index 000000000000..71b0a971c2e1
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/CommandBridge.ts
@@ -0,0 +1,117 @@
+import type { ISlashCommand } from '../../definition/slashcommands';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class CommandBridge extends BaseBridge {
+    public async doDoesCommandExist(command: string, appId: string): Promise<boolean> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.doesCommandExist(command, appId);
+        }
+    }
+
+    public async doEnableCommand(command: string, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.enableCommand(command, appId);
+        }
+    }
+
+    public async doDisableCommand(command: string, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.disableCommand(command, appId);
+        }
+    }
+
+    public async doModifyCommand(command: ISlashCommand, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.modifyCommand(command, appId);
+        }
+    }
+
+    public async doRegisterCommand(command: ISlashCommand, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.registerCommand(command, appId);
+        }
+    }
+
+    public async doUnregisterCommand(command: string, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.unregisterCommand(command, appId);
+        }
+    }
+
+    /**
+     * Checks if the provided command already exists inside of the
+     * system which is being bridged. This does not check if the app
+     * registered it but it will return whether the supplied command is
+     * already defined by something else or not.
+     *
+     * @param command the command to check if it exists
+     * @param appId the id of the app calling this
+     * @returns whether the command is already in the system
+     */
+    protected abstract doesCommandExist(command: string, appId: string): Promise<boolean>;
+
+    /**
+     * Enables an existing command from the bridged system. The callee
+     * must ensure that the command that's being enabled is defined by
+     * the bridged system and not another App since the bridged system
+     * will not check that.
+     *
+     * @param command the command to enable
+     * @param appId the id of the app calling this
+     */
+    protected abstract enableCommand(command: string, appId: string): Promise<void>;
+
+    /**
+     * Disables an existing command from the bridged system, the callee must
+     * ensure the command disabling is defined by the system and not another
+     * App since the bridged system won't check that.
+     *
+     * @param command the command which to disable
+     * @param appId the id of the app calling this
+     */
+    protected abstract disableCommand(command: string, appId: string): Promise<void>;
+
+    /**
+     * Changes how a system slash command behaves, allows Apps to provide
+     * different executors per system commands.
+     *
+     * @param command the modified slash command
+     * @param appId the id of the app calling this
+     */
+    protected abstract modifyCommand(command: ISlashCommand, appId: string): Promise<void>;
+
+    /**
+     * Registers a command with the system which is being bridged.
+     *
+     * @param command the command to register
+     * @param appId the id of the app calling this
+     * @param toRun the executor which is called when the command is ran
+     */
+    protected abstract registerCommand(command: ISlashCommand, appId: string): Promise<void>;
+
+    /**
+     * Unregisters the provided command from the bridged system.
+     *
+     * @param command the command to unregister
+     * @param appId the id of the app calling this
+     */
+    protected abstract unregisterCommand(command: string, appId: string): Promise<void>;
+
+    private hasDefaultPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.command.default)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.command.default],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/EmailBridge.ts b/packages/apps-engine/src/server/bridges/EmailBridge.ts
new file mode 100644
index 000000000000..c8a5b22e9c86
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/EmailBridge.ts
@@ -0,0 +1,30 @@
+import type { IEmail } from '../../definition/email';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class EmailBridge extends BaseBridge {
+    public async doSendEmail(email: IEmail, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.sendEmail(email, appId);
+        }
+    }
+
+    protected abstract sendEmail(email: IEmail, appId: string): Promise<void>;
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.email.send)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.email.send],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts b/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts
new file mode 100644
index 000000000000..5377dcef6164
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts
@@ -0,0 +1,45 @@
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class EnvironmentalVariableBridge extends BaseBridge {
+    public async doGetValueByName(envVarName: string, appId: string): Promise<string | undefined> {
+        if (this.hasReadPermission(appId)) {
+            return this.getValueByName(envVarName, appId);
+        }
+    }
+
+    public async doIsReadable(envVarName: string, appId: string): Promise<boolean> {
+        if (this.hasReadPermission(appId)) {
+            return this.isReadable(envVarName, appId);
+        }
+    }
+
+    public async doIsSet(envVarName: string, appId: string): Promise<boolean> {
+        if (this.hasReadPermission(appId)) {
+            return this.isSet(envVarName, appId);
+        }
+    }
+
+    protected abstract getValueByName(envVarName: string, appId: string): Promise<string | undefined>;
+
+    protected abstract isReadable(envVarName: string, appId: string): Promise<boolean>;
+
+    protected abstract isSet(envVarName: string, appId: string): Promise<boolean>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.env.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.env.read],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/HttpBridge.ts b/packages/apps-engine/src/server/bridges/HttpBridge.ts
new file mode 100644
index 000000000000..6d02fb15262d
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/HttpBridge.ts
@@ -0,0 +1,37 @@
+import type { IHttpRequest, IHttpResponse, RequestMethod } from '../../definition/accessors';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export interface IHttpBridgeRequestInfo {
+    appId: string;
+    method: RequestMethod;
+    url: string;
+    request: IHttpRequest;
+}
+
+export abstract class HttpBridge extends BaseBridge {
+    public async doCall(info: IHttpBridgeRequestInfo): Promise<IHttpResponse> {
+        if (this.hasDefaultPermission(info.appId)) {
+            return this.call(info);
+        }
+    }
+
+    protected abstract call(info: IHttpBridgeRequestInfo): Promise<IHttpResponse>;
+
+    private hasDefaultPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.networking.default)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.networking.default],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/IInternalBridge.ts b/packages/apps-engine/src/server/bridges/IInternalBridge.ts
new file mode 100644
index 000000000000..23b05f722f65
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/IInternalBridge.ts
@@ -0,0 +1,7 @@
+import type { ISetting } from '../../definition/settings';
+
+export interface IInternalBridge {
+    doGetUsernamesOfRoomById(roomId: string): Promise<Array<string>>;
+    doGetUsernamesOfRoomByIdSync(roomId: string): Array<string>;
+    doGetWorkspacePublicKey(): Promise<ISetting>;
+}
diff --git a/packages/apps-engine/src/server/bridges/IInternalFederationBridge.ts b/packages/apps-engine/src/server/bridges/IInternalFederationBridge.ts
new file mode 100644
index 000000000000..b198d3470be5
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/IInternalFederationBridge.ts
@@ -0,0 +1,15 @@
+export interface IInternalFederationBridge {
+    /**
+     * Get Federation's private key.
+     * For apps engine's internal use
+     *
+     */
+    getPrivateKey(): Promise<string | null>;
+
+    /**
+     * Get Federation's public key.
+     * For apps engine's internal use
+     *
+     */
+    getPublicKey(): Promise<string | null>;
+}
diff --git a/packages/apps-engine/src/server/bridges/IInternalPersistenceBridge.ts b/packages/apps-engine/src/server/bridges/IInternalPersistenceBridge.ts
new file mode 100644
index 000000000000..9a4b5141273d
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/IInternalPersistenceBridge.ts
@@ -0,0 +1,9 @@
+export interface IInternalPersistenceBridge {
+    /**
+     * Purges the App's persistant storage data from the persistent storage.
+     * For apps engine's internal use
+     *
+     * @argument appId the id of the app's data to remove
+     */
+    purge(appId: string): Promise<void>;
+}
diff --git a/packages/apps-engine/src/server/bridges/IInternalSchedulerBridge.ts b/packages/apps-engine/src/server/bridges/IInternalSchedulerBridge.ts
new file mode 100644
index 000000000000..b43b308e4f05
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/IInternalSchedulerBridge.ts
@@ -0,0 +1,8 @@
+export interface IInternalSchedulerBridge {
+    /**
+     * Cancels all the running jobs from the app
+     * For apps-engine's internal use
+     * @param appId the id of the app calling this
+     */
+    cancelAllJobs(appId: string): Promise<void>;
+}
diff --git a/packages/apps-engine/src/server/bridges/IInternalUserBridge.ts b/packages/apps-engine/src/server/bridges/IInternalUserBridge.ts
new file mode 100644
index 000000000000..b863ca2579e0
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/IInternalUserBridge.ts
@@ -0,0 +1,8 @@
+import type { IUser, IUserCreationOptions } from '../../definition/users';
+
+export interface IInternalUserBridge {
+    create(data: Partial<IUser>, appId: string, options?: IUserCreationOptions): Promise<string>;
+    getAppUser(appId?: string): Promise<IUser | undefined>;
+    remove(user: IUser, appId: string): Promise<boolean>;
+    getActiveUserCount(): Promise<number>;
+}
diff --git a/packages/apps-engine/src/server/bridges/IListenerBridge.ts b/packages/apps-engine/src/server/bridges/IListenerBridge.ts
new file mode 100644
index 000000000000..c29674ae257e
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/IListenerBridge.ts
@@ -0,0 +1,10 @@
+import type { IMessage } from '../../definition/messages';
+import type { AppInterface } from '../../definition/metadata';
+import type { IRoom } from '../../definition/rooms';
+import type { UIKitIncomingInteraction } from '../../definition/uikit';
+
+export interface IListenerBridge {
+    messageEvent(int: AppInterface, message: IMessage): Promise<void | boolean | IMessage>;
+    roomEvent(int: AppInterface, room: IRoom): Promise<void | boolean | IRoom>;
+    uiKitInteractionEvent(int: AppInterface, action: UIKitIncomingInteraction): Promise<void | boolean>;
+}
diff --git a/packages/apps-engine/src/server/bridges/InternalBridge.ts b/packages/apps-engine/src/server/bridges/InternalBridge.ts
new file mode 100644
index 000000000000..3d9e3b21f18e
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/InternalBridge.ts
@@ -0,0 +1,22 @@
+import type { ISetting } from '../../definition/settings';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class InternalBridge extends BaseBridge {
+    public doGetUsernamesOfRoomById(roomId: string): Promise<Array<string>> {
+        return this.getUsernamesOfRoomById(roomId);
+    }
+
+    public doGetUsernamesOfRoomByIdSync(roomId: string): Array<string> {
+        return this.getUsernamesOfRoomByIdSync(roomId);
+    }
+
+    public async doGetWorkspacePublicKey(): Promise<ISetting> {
+        return this.getWorkspacePublicKey();
+    }
+
+    protected abstract getUsernamesOfRoomById(roomId: string): Promise<Array<string>>;
+
+    protected abstract getUsernamesOfRoomByIdSync(roomId: string): Array<string>;
+
+    protected abstract getWorkspacePublicKey(): Promise<ISetting>;
+}
diff --git a/packages/apps-engine/src/server/bridges/ListenerBridge.ts b/packages/apps-engine/src/server/bridges/ListenerBridge.ts
new file mode 100644
index 000000000000..1357e75ce99f
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/ListenerBridge.ts
@@ -0,0 +1,18 @@
+import type { IMessage } from '../../definition/messages';
+import type { AppInterface } from '../../definition/metadata';
+import type { IRoom } from '../../definition/rooms';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class ListenerBridge extends BaseBridge {
+    public async doMessageEvent(int: AppInterface, message: IMessage): Promise<void | boolean | IMessage> {
+        return this.messageEvent(int, message);
+    }
+
+    public async doRoomEvent(int: AppInterface, room: IRoom): Promise<void | boolean | IRoom> {
+        return this.roomEvent(int, room);
+    }
+
+    protected abstract messageEvent(int: AppInterface, message: IMessage): Promise<void | boolean | IMessage>;
+
+    protected abstract roomEvent(int: AppInterface, room: IRoom): Promise<void | boolean | IRoom>;
+}
diff --git a/packages/apps-engine/src/server/bridges/LivechatBridge.ts b/packages/apps-engine/src/server/bridges/LivechatBridge.ts
new file mode 100644
index 000000000000..9fc830767545
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/LivechatBridge.ts
@@ -0,0 +1,259 @@
+import type { IExtraRoomParams } from '../../definition/accessors/ILivechatCreator';
+import type { IDepartment, ILivechatMessage, ILivechatRoom, ILivechatTransferData, IVisitor } from '../../definition/livechat';
+import type { IMessage } from '../../definition/messages';
+import type { IUser } from '../../definition/users';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+type LivechatReadPermissions = keyof Pick<
+    typeof AppPermissions,
+    'livechat-department' | 'livechat-message' | 'livechat-room' | 'livechat-status' | 'livechat-visitor'
+>;
+
+type LivechatWritePermissions = keyof Pick<
+    typeof AppPermissions,
+    'livechat-custom-fields' | 'livechat-department' | 'livechat-message' | 'livechat-room' | 'livechat-visitor'
+>;
+
+type LivechatMultiplePermissions = keyof Pick<typeof AppPermissions, 'livechat-department' | 'livechat-message'>;
+
+export abstract class LivechatBridge extends BaseBridge {
+    public doIsOnline(departmentId?: string, appId?: string): boolean {
+        if (this.hasReadPermission(appId, 'livechat-status')) {
+            return this.isOnline(departmentId, appId);
+        }
+    }
+
+    public async doIsOnlineAsync(departmentId?: string, appId?: string): Promise<boolean> {
+        if (this.hasReadPermission(appId, 'livechat-status')) {
+            return this.isOnlineAsync(departmentId, appId);
+        }
+    }
+
+    public async doCreateMessage(message: ILivechatMessage, appId: string): Promise<string> {
+        if (this.hasWritePermission(appId, 'livechat-message')) {
+            return this.createMessage(message, appId);
+        }
+    }
+
+    public async doGetMessageById(messageId: string, appId: string): Promise<ILivechatMessage> {
+        if (this.hasReadPermission(appId, 'livechat-message')) {
+            return this.getMessageById(messageId, appId);
+        }
+    }
+
+    public async doUpdateMessage(message: ILivechatMessage, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId, 'livechat-message')) {
+            return this.updateMessage(message, appId);
+        }
+    }
+
+    /**
+     * @deprecated please use the `doCreateAndReturnVisitor` method instead.
+     */
+    public async doCreateVisitor(visitor: IVisitor, appId: string): Promise<string> {
+        if (this.hasWritePermission(appId, 'livechat-visitor')) {
+            return this.createVisitor(visitor, appId);
+        }
+    }
+
+    public async doCreateAndReturnVisitor(visitor: IVisitor, appId: string): Promise<IVisitor | undefined> {
+        if (this.hasWritePermission(appId, 'livechat-visitor')) {
+            return this.createAndReturnVisitor(visitor, appId);
+        }
+    }
+
+    public async doFindVisitors(query: object, appId: string): Promise<Array<IVisitor>> {
+        if (this.hasReadPermission(appId, 'livechat-visitor')) {
+            return this.findVisitors(query, appId);
+        }
+    }
+
+    public async doFindVisitorById(id: string, appId: string): Promise<IVisitor | undefined> {
+        if (this.hasReadPermission(appId, 'livechat-visitor')) {
+            return this.findVisitorById(id, appId);
+        }
+    }
+
+    public async doFindVisitorByEmail(email: string, appId: string): Promise<IVisitor | undefined> {
+        if (this.hasReadPermission(appId, 'livechat-visitor')) {
+            return this.findVisitorByEmail(email, appId);
+        }
+    }
+
+    public async doFindVisitorByToken(token: string, appId: string): Promise<IVisitor | undefined> {
+        if (this.hasReadPermission(appId, 'livechat-visitor')) {
+            return this.findVisitorByToken(token, appId);
+        }
+    }
+
+    public async doFindVisitorByPhoneNumber(phoneNumber: string, appId: string): Promise<IVisitor | undefined> {
+        if (this.hasReadPermission(appId, 'livechat-visitor')) {
+            return this.findVisitorByPhoneNumber(phoneNumber, appId);
+        }
+    }
+
+    public async doTransferVisitor(visitor: IVisitor, transferData: ILivechatTransferData, appId: string): Promise<boolean> {
+        if (this.hasWritePermission(appId, 'livechat-visitor')) {
+            return this.transferVisitor(visitor, transferData, appId);
+        }
+    }
+
+    public async doCreateRoom(visitor: IVisitor, agent: IUser, appId: string, extraParams?: IExtraRoomParams): Promise<ILivechatRoom> {
+        if (this.hasWritePermission(appId, 'livechat-room')) {
+            return this.createRoom(visitor, agent, appId, extraParams);
+        }
+    }
+
+    public async doCloseRoom(room: ILivechatRoom, comment: string, closer: IUser | undefined, appId: string): Promise<boolean> {
+        if (this.hasWritePermission(appId, 'livechat-room')) {
+            return this.closeRoom(room, comment, closer, appId);
+        }
+    }
+
+    public async doCountOpenRoomsByAgentId(agentId: string, appId: string): Promise<number> {
+        if (this.hasReadPermission(appId, 'livechat-room')) {
+            return this.countOpenRoomsByAgentId(agentId, appId);
+        }
+    }
+
+    public async doFindOpenRoomsByAgentId(agentId: string, appId: string): Promise<Array<ILivechatRoom>> {
+        if (this.hasReadPermission(appId, 'livechat-room')) {
+            return this.findOpenRoomsByAgentId(agentId, appId);
+        }
+    }
+
+    public async doFindRooms(visitor: IVisitor, departmentId: string | null, appId: string): Promise<Array<ILivechatRoom>> {
+        if (this.hasReadPermission(appId, 'livechat-room')) {
+            return this.findRooms(visitor, departmentId, appId);
+        }
+    }
+
+    public async doFindDepartmentByIdOrName(value: string, appId: string): Promise<IDepartment | undefined> {
+        if (this.hasReadPermission(appId, 'livechat-department') || this.hasMultiplePermission(appId, 'livechat-department')) {
+            return this.findDepartmentByIdOrName(value, appId);
+        }
+    }
+
+    public async doFindDepartmentsEnabledWithAgents(appId: string): Promise<Array<IDepartment>> {
+        if (this.hasMultiplePermission(appId, 'livechat-department')) {
+            return this.findDepartmentsEnabledWithAgents(appId);
+        }
+    }
+
+    public async do_fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IMessage>> {
+        if (this.hasMultiplePermission(appId, 'livechat-message')) {
+            return this._fetchLivechatRoomMessages(appId, roomId);
+        }
+    }
+
+    public async doSetCustomFields(data: { token: IVisitor['token']; key: string; value: string; overwrite: boolean }, appId: string): Promise<number> {
+        if (this.hasWritePermission(appId, 'livechat-custom-fields')) {
+            return this.setCustomFields(data, appId);
+        }
+    }
+
+    /**
+     * @deprecated please use the `isOnlineAsync` method instead.
+     * In the next major, this method will be `async`
+     */
+    protected abstract isOnline(departmentId?: string, appId?: string): boolean;
+
+    protected abstract isOnlineAsync(departmentId?: string, appId?: string): Promise<boolean>;
+
+    protected abstract createMessage(message: ILivechatMessage, appId: string): Promise<string>;
+
+    protected abstract getMessageById(messageId: string, appId: string): Promise<ILivechatMessage>;
+
+    protected abstract updateMessage(message: ILivechatMessage, appId: string): Promise<void>;
+
+    /**
+     * @deprecated please use `createAndReturnVisitor` instead.
+     * It returns the created record rather than the ID.
+     */
+    protected abstract createVisitor(visitor: IVisitor, appId: string): Promise<string>;
+
+    protected abstract createAndReturnVisitor(visitor: IVisitor, appId: string): Promise<IVisitor | undefined>;
+
+    /**
+     * @deprecated This method does not adhere to the conversion practices applied
+     * elsewhere in the Apps-Engine and will be removed in the next major version.
+     * Prefer other methods that fetch visitors.
+     */
+    protected abstract findVisitors(query: object, appId: string): Promise<Array<IVisitor>>;
+
+    protected abstract findVisitorById(id: string, appId: string): Promise<IVisitor | undefined>;
+
+    protected abstract findVisitorByEmail(email: string, appId: string): Promise<IVisitor | undefined>;
+
+    protected abstract findVisitorByToken(token: string, appId: string): Promise<IVisitor | undefined>;
+
+    protected abstract findVisitorByPhoneNumber(phoneNumber: string, appId: string): Promise<IVisitor | undefined>;
+
+    protected abstract transferVisitor(visitor: IVisitor, transferData: ILivechatTransferData, appId: string): Promise<boolean>;
+
+    protected abstract createRoom(visitor: IVisitor, agent: IUser, appId: string, extraParams?: IExtraRoomParams): Promise<ILivechatRoom>;
+
+    protected abstract closeRoom(room: ILivechatRoom, comment: string, closer: IUser | undefined, appId: string): Promise<boolean>;
+
+    protected abstract countOpenRoomsByAgentId(agentId: string, appId: string): Promise<number>;
+
+    protected abstract findOpenRoomsByAgentId(agentId: string, appId: string): Promise<Array<ILivechatRoom>>;
+
+    protected abstract findRooms(visitor: IVisitor, departmentId: string | null, appId: string): Promise<Array<ILivechatRoom>>;
+
+    protected abstract findDepartmentByIdOrName(value: string, appId: string): Promise<IDepartment | undefined>;
+
+    protected abstract findDepartmentsEnabledWithAgents(appId: string): Promise<Array<IDepartment>>;
+
+    protected abstract _fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IMessage>>;
+
+    protected abstract setCustomFields(data: { token: IVisitor['token']; key: string; value: string; overwrite: boolean }, appId: string): Promise<number>;
+
+    private hasReadPermission(appId: string, scope: LivechatReadPermissions): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions[scope].read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions[scope].read],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasWritePermission(appId: string, scope: LivechatWritePermissions): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions[scope].write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions[scope].write],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasMultiplePermission(appId: string, scope: LivechatMultiplePermissions): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions[scope].multiple)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions[scope].multiple],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/MessageBridge.ts b/packages/apps-engine/src/server/bridges/MessageBridge.ts
new file mode 100644
index 000000000000..d37fb13cc165
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/MessageBridge.ts
@@ -0,0 +1,116 @@
+import type { ITypingOptions } from '../../definition/accessors/INotifier';
+import type { IMessage, Reaction } from '../../definition/messages';
+import type { IRoom } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export interface ITypingDescriptor extends ITypingOptions {
+    isTyping: boolean;
+}
+
+export abstract class MessageBridge extends BaseBridge {
+    public async doCreate(message: IMessage, appId: string): Promise<string> {
+        if (this.hasWritePermission(appId)) {
+            return this.create(message, appId);
+        }
+    }
+
+    public async doUpdate(message: IMessage, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.update(message, appId);
+        }
+    }
+
+    public async doNotifyUser(user: IUser, message: IMessage, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.notifyUser(user, message, appId);
+        }
+    }
+
+    public async doNotifyRoom(room: IRoom, message: IMessage, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.notifyRoom(room, message, appId);
+        }
+    }
+
+    public async doTyping(options: ITypingDescriptor, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.typing(options, appId);
+        }
+    }
+
+    public async doGetById(messageId: string, appId: string): Promise<IMessage> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(messageId, appId);
+        }
+    }
+
+    public async doDelete(message: IMessage, user: IUser, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.delete(message, user, appId);
+        }
+    }
+
+    public async doAddReaction(messageId: string, userId: string, reaction: Reaction, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.addReaction(messageId, userId, reaction);
+        }
+    }
+
+    public async doRemoveReaction(messageId: string, userId: string, reaction: Reaction, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.removeReaction(messageId, userId, reaction);
+        }
+    }
+
+    protected abstract create(message: IMessage, appId: string): Promise<string>;
+
+    protected abstract update(message: IMessage, appId: string): Promise<void>;
+
+    protected abstract notifyUser(user: IUser, message: IMessage, appId: string): Promise<void>;
+
+    protected abstract notifyRoom(room: IRoom, message: IMessage, appId: string): Promise<void>;
+
+    protected abstract typing(options: ITypingDescriptor, appId: string): Promise<void>;
+
+    protected abstract getById(messageId: string, appId: string): Promise<IMessage>;
+
+    protected abstract delete(message: IMessage, user: IUser, appId: string): Promise<void>;
+
+    protected abstract addReaction(messageId: string, userId: string, reaction: Reaction): Promise<void>;
+
+    protected abstract removeReaction(messageId: string, userId: string, reaction: Reaction): Promise<void>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.message.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.message.read],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.message.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.message.write],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/ModerationBridge.ts b/packages/apps-engine/src/server/bridges/ModerationBridge.ts
new file mode 100644
index 000000000000..ad17e4d6ebef
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/ModerationBridge.ts
@@ -0,0 +1,47 @@
+import type { IMessage } from '../../definition/messages';
+import type { IUser } from '../../definition/users';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class ModerationBridge extends BaseBridge {
+    public async doReport(messageId: IMessage['id'], description: string, userId: string, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.report(messageId, description, userId, appId);
+        }
+    }
+
+    public async doDismissReportsByMessageId(messageId: IMessage['id'], reason: string, action: string, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.dismissReportsByMessageId(messageId, reason, action, appId);
+        }
+    }
+
+    public async doDismissReportsByUserId(userId: IUser['id'], reason: string, action: string, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.dismissReportsByUserId(userId, reason, action, appId);
+        }
+    }
+
+    protected abstract report(messageId: string, description: string, userId: string, appId: string): Promise<void>;
+
+    protected abstract dismissReportsByMessageId(messageId: string, reason: string, action: string, appId: string): Promise<void>;
+
+    protected abstract dismissReportsByUserId(userId: string, reason: string, action: string, appId: string): Promise<void>;
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.moderation.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.moderation.write],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts b/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts
new file mode 100644
index 000000000000..dec6366e3aff
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts
@@ -0,0 +1,85 @@
+import type { IOAuthApp, IOAuthAppParams } from '../../definition/accessors/IOAuthApp';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class OAuthAppsBridge extends BaseBridge {
+    public async doCreate(oAuthApp: IOAuthAppParams, appId: string) {
+        if (this.hasWritePermission(appId)) {
+            return this.create(oAuthApp, appId);
+        }
+    }
+
+    public async doGetByid(id: string, appId: string) {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(id, appId);
+        }
+    }
+
+    public async doGetByName(name: string, appId: string) {
+        if (this.hasReadPermission(appId)) {
+            return this.getByName(name, appId);
+        }
+    }
+
+    public async doUpdate(oAuthApp: IOAuthAppParams, id: string, appId: string) {
+        if (this.hasWritePermission(appId)) {
+            return this.update(oAuthApp, id, appId);
+        }
+    }
+
+    public async doDelete(id: string, appId: string) {
+        if (this.hasWritePermission(appId)) {
+            return this.delete(id, appId);
+        }
+    }
+
+    public async doPurge(appId: string) {
+        if (this.hasWritePermission(appId)) {
+            return this.purge(appId);
+        }
+    }
+
+    protected abstract create(oAuthApp: IOAuthAppParams, appId: string): Promise<string | null>;
+
+    protected abstract getById(id: string, appId: string): Promise<IOAuthApp | null>;
+
+    protected abstract getByName(name: string, appId: string): Promise<Array<IOAuthApp | null>>;
+
+    protected abstract update(oAuthApp: IOAuthAppParams, id: string, appId: string): Promise<void>;
+
+    protected abstract delete(id: string, appId: string): Promise<void>;
+
+    protected abstract purge(appId: string): Promise<void>;
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions['oauth-app'].write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions['oauth-app'].write],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions['oauth-app'].read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions['oauth-app'].read],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/PersistenceBridge.ts b/packages/apps-engine/src/server/bridges/PersistenceBridge.ts
new file mode 100644
index 000000000000..2ab48dd8599b
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/PersistenceBridge.ts
@@ -0,0 +1,161 @@
+import type { RocketChatAssociationRecord } from '../../definition/metadata';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class PersistenceBridge extends BaseBridge {
+    public async doPurge(appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.purge(appId);
+        }
+    }
+
+    public async doCreate(data: object, appId: string): Promise<string> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.create(data, appId);
+        }
+    }
+
+    public async doCreateWithAssociations(data: object, associations: Array<RocketChatAssociationRecord>, appId: string): Promise<string> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.createWithAssociations(data, associations, appId);
+        }
+    }
+
+    public async doReadById(id: string, appId: string): Promise<object> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.readById(id, appId);
+        }
+    }
+
+    public async doReadByAssociations(associations: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object>> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.readByAssociations(associations, appId);
+        }
+    }
+
+    public async doRemove(id: string, appId: string): Promise<object | undefined> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.remove(id, appId);
+        }
+    }
+
+    public async doRemoveByAssociations(associations: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object> | undefined> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.removeByAssociations(associations, appId);
+        }
+    }
+
+    public async doUpdate(id: string, data: object, upsert: boolean, appId: string): Promise<string> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.update(id, data, upsert, appId);
+        }
+    }
+
+    public async doUpdateByAssociations(associations: Array<RocketChatAssociationRecord>, data: object, upsert: boolean, appId: string): Promise<string> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.updateByAssociations(associations, data, upsert, appId);
+        }
+    }
+
+    /**
+     * Purges the App's persistant storage data from the persistent storage.
+     *
+     * @argument appId the id of the app's data to remove
+     */
+    protected abstract purge(appId: string): Promise<void>;
+
+    /**
+     * Creates a new persistant record with the provided data attached.
+     *
+     * @argument data the data to store in persistent storage
+     * @argument appId the id of the app which is storing the data
+     * @returns the id of the stored record
+     */
+    protected abstract create(data: object, appId: string): Promise<string>;
+
+    /**
+     * Creates a new record in the App's persistent storage with the data being
+     * associated with at least one Rocket.Chat record.
+     *
+     * @argument data the data to store in the persistent storage
+     * @argument associations the associations records this data is associated with
+     * @argument appId the id of the app which is storing the data
+     * @returns the id of the stored record
+     */
+    protected abstract createWithAssociations(data: object, associations: Array<RocketChatAssociationRecord>, appId: string): Promise<string>;
+
+    /**
+     * Retrieves from the persistent storage the record by the id provided.
+     *
+     * @argument id the record id to read
+     * @argument appId the id of the app calling this
+     * @returns the data stored in the persistent storage, or undefined
+     */
+    protected abstract readById(id: string, appId: string): Promise<object>;
+
+    /**
+     * Retrieves the data which is associated with the provided records.
+     *
+     * @argument associations the association records to query about
+     * @argument appId the id of the app calling this
+     * @returns an array of records if they exist, an empty array otherwise
+     */
+    protected abstract readByAssociations(associations: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object>>;
+
+    /**
+     * Removes the record which matches the provided id.
+     *
+     * @argument id the id of the record
+     * @argument appId the id of the app calling this
+     * @returns the data being removed
+     */
+    protected abstract remove(id: string, appId: string): Promise<object | undefined>;
+
+    /**
+     * Removes any data which has been associated with the provided records.
+     *
+     * @argument associations the associations which to remove records
+     * @argument appId the id of the app calling this
+     * @returns the data of the removed records
+     */
+    protected abstract removeByAssociations(associations: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object> | undefined>;
+
+    /**
+     * Updates the record in the database, with the option of creating a new one if it doesn't exist.
+     *
+     * @argument id the id of the record to update
+     * @argument data the updated data to set in the record
+     * @argument upsert whether to create if the id doesn't exist
+     * @argument appId the id of the app calling this
+     * @returns the id, whether the new one or the existing one
+     */
+    protected abstract update(id: string, data: object, upsert: boolean, appId: string): Promise<string>;
+
+    /**
+     * Updates the record in the database, with the option of creating a new one if it doesn't exist.
+     *
+     * @argument associations the association records to update
+     * @argument data the updated data to set in the record
+     * @argument upsert whether to create if the id doesn't exist
+     * @argument appId the id of the app calling this
+     * @returns the id, whether the new one or the existing one
+     */
+    protected abstract updateByAssociations(associations: Array<RocketChatAssociationRecord>, data: object, upsert: boolean, appId: string): Promise<string>;
+
+    private hasDefaultPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.persistence.default)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.persistence.default],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/RoleBridge.ts b/packages/apps-engine/src/server/bridges/RoleBridge.ts
new file mode 100644
index 000000000000..2fea98f32818
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/RoleBridge.ts
@@ -0,0 +1,38 @@
+import type { IRole } from '../../definition/roles';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class RoleBridge extends BaseBridge {
+    public async doGetOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null> {
+        if (this.hasReadPermission(appId)) {
+            return this.getOneByIdOrName(idOrName, appId);
+        }
+    }
+
+    public async doGetCustomRoles(appId: string): Promise<Array<IRole>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getCustomRoles(appId);
+        }
+    }
+
+    protected abstract getOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null>;
+
+    protected abstract getCustomRoles(appId: string): Promise<Array<IRole>>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.role.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.role.read],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/RoomBridge.ts b/packages/apps-engine/src/server/bridges/RoomBridge.ts
new file mode 100644
index 000000000000..19fecfab9667
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/RoomBridge.ts
@@ -0,0 +1,179 @@
+import type { IMessage, IMessageRaw } from '../../definition/messages';
+import type { IRoom } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export const GetMessagesSortableFields = ['createdAt'] as const;
+
+export type GetMessagesOptions = {
+    limit: number;
+    skip: number;
+    sort: Record<(typeof GetMessagesSortableFields)[number], 'asc' | 'desc'>;
+};
+
+export abstract class RoomBridge extends BaseBridge {
+    public async doCreate(room: IRoom, members: Array<string>, appId: string): Promise<string> {
+        if (this.hasWritePermission(appId)) {
+            return this.create(room, members, appId);
+        }
+    }
+
+    public async doGetById(roomId: string, appId: string): Promise<IRoom> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(roomId, appId);
+        }
+    }
+
+    public async doGetByName(roomName: string, appId: string): Promise<IRoom> {
+        if (this.hasReadPermission(appId)) {
+            return this.getByName(roomName, appId);
+        }
+    }
+
+    public async doGetCreatorById(roomId: string, appId: string): Promise<IUser | undefined> {
+        if (this.hasReadPermission(appId)) {
+            return this.getCreatorById(roomId, appId);
+        }
+    }
+
+    public async doGetCreatorByName(roomName: string, appId: string): Promise<IUser | undefined> {
+        if (this.hasReadPermission(appId)) {
+            return this.getCreatorByName(roomName, appId);
+        }
+    }
+
+    public async doGetDirectByUsernames(usernames: Array<string>, appId: string): Promise<IRoom | undefined> {
+        if (this.hasReadPermission(appId)) {
+            return this.getDirectByUsernames(usernames, appId);
+        }
+    }
+
+    public async doGetMembers(roomId: string, appId: string): Promise<Array<IUser>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getMembers(roomId, appId);
+        }
+    }
+
+    public async doUpdate(room: IRoom, members: Array<string>, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.update(room, members, appId);
+        }
+    }
+
+    public async doCreateDiscussion(
+        room: IRoom,
+        parentMessage: IMessage | undefined,
+        reply: string | undefined,
+        members: Array<string>,
+        appId: string,
+    ): Promise<string> {
+        if (this.hasWritePermission(appId)) {
+            return this.createDiscussion(room, parentMessage, reply, members, appId);
+        }
+    }
+
+    public async doDelete(room: string, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.delete(room, appId);
+        }
+    }
+
+    public async doGetModerators(roomId: string, appId: string): Promise<Array<IUser>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getModerators(roomId, appId);
+        }
+    }
+
+    public async doGetOwners(roomId: string, appId: string): Promise<Array<IUser>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getOwners(roomId, appId);
+        }
+    }
+
+    public async doGetLeaders(roomId: string, appId: string): Promise<Array<IUser>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getLeaders(roomId, appId);
+        }
+    }
+
+    public async doGetMessages(roomId: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]> {
+        if (this.hasReadPermission(appId)) {
+            return this.getMessages(roomId, options, appId);
+        }
+    }
+
+    public async doRemoveUsers(roomId: string, usernames: Array<string>, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.removeUsers(roomId, usernames, appId);
+        }
+    }
+
+    protected abstract create(room: IRoom, members: Array<string>, appId: string): Promise<string>;
+
+    protected abstract getById(roomId: string, appId: string): Promise<IRoom>;
+
+    protected abstract getByName(roomName: string, appId: string): Promise<IRoom>;
+
+    protected abstract getCreatorById(roomId: string, appId: string): Promise<IUser | undefined>;
+
+    protected abstract getCreatorByName(roomName: string, appId: string): Promise<IUser | undefined>;
+
+    protected abstract getDirectByUsernames(usernames: Array<string>, appId: string): Promise<IRoom | undefined>;
+
+    protected abstract getMembers(roomId: string, appId: string): Promise<Array<IUser>>;
+
+    protected abstract update(room: IRoom, members: Array<string>, appId: string): Promise<void>;
+
+    protected abstract createDiscussion(
+        room: IRoom,
+        parentMessage: IMessage | undefined,
+        reply: string | undefined,
+        members: Array<string>,
+        appId: string,
+    ): Promise<string>;
+
+    protected abstract delete(room: string, appId: string): Promise<void>;
+
+    protected abstract getModerators(roomId: string, appId: string): Promise<Array<IUser>>;
+
+    protected abstract getOwners(roomId: string, appId: string): Promise<Array<IUser>>;
+
+    protected abstract getLeaders(roomId: string, appId: string): Promise<Array<IUser>>;
+
+    protected abstract getMessages(roomId: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]>;
+
+    protected abstract removeUsers(roomId: string, usernames: Array<string>, appId: string): Promise<void>;
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.room.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.room.write],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.room.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.room.read],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/SchedulerBridge.ts b/packages/apps-engine/src/server/bridges/SchedulerBridge.ts
new file mode 100644
index 000000000000..e275ca599433
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/SchedulerBridge.ts
@@ -0,0 +1,62 @@
+import type { IOnetimeSchedule, IProcessor, IRecurringSchedule } from '../../definition/scheduler';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class SchedulerBridge extends BaseBridge {
+    public async doRegisterProcessors(processors: Array<IProcessor> = [], appId: string): Promise<void | Array<string>> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.registerProcessors(processors, appId);
+        }
+    }
+
+    public async doScheduleOnce(job: IOnetimeSchedule, appId: string): Promise<void | string> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.scheduleOnce(job, appId);
+        }
+    }
+
+    public async doScheduleRecurring(job: IRecurringSchedule, appId: string): Promise<void | string> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.scheduleRecurring(job, appId);
+        }
+    }
+
+    public async doCancelJob(jobId: string, appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.cancelJob(jobId, appId);
+        }
+    }
+
+    public async doCancelAllJobs(appId: string): Promise<void> {
+        if (this.hasDefaultPermission(appId)) {
+            return this.cancelAllJobs(appId);
+        }
+    }
+
+    protected abstract registerProcessors(processors: Array<IProcessor>, appId: string): Promise<void | Array<string>>;
+
+    protected abstract scheduleOnce(job: IOnetimeSchedule, appId: string): Promise<void | string>;
+
+    protected abstract scheduleRecurring(job: IRecurringSchedule, appId: string): Promise<void | string>;
+
+    protected abstract cancelJob(jobId: string, appId: string): Promise<void>;
+
+    protected abstract cancelAllJobs(appId: string): Promise<void>;
+
+    private hasDefaultPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.scheduler.default)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.scheduler.default],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts b/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts
new file mode 100644
index 000000000000..b5590bd7033d
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts
@@ -0,0 +1,93 @@
+import type { ISetting } from '../../definition/settings';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class ServerSettingBridge extends BaseBridge {
+    public async doGetAll(appId: string): Promise<Array<ISetting>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getAll(appId);
+        }
+    }
+
+    public async doGetOneById(id: string, appId: string): Promise<ISetting> {
+        if (this.hasReadPermission(appId)) {
+            return this.getOneById(id, appId);
+        }
+    }
+
+    public async doHideGroup(name: string, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.hideGroup(name, appId);
+        }
+    }
+
+    public async doHideSetting(id: string, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.hideSetting(id, appId);
+        }
+    }
+
+    public async doIsReadableById(id: string, appId: string): Promise<boolean> {
+        if (this.hasReadPermission(appId)) {
+            return this.isReadableById(id, appId);
+        }
+    }
+
+    public async doUpdateOne(setting: ISetting, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.updateOne(setting, appId);
+        }
+    }
+
+    public async doIncrementValue(id: ISetting['id'], value: number, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.incrementValue(id, value, appId);
+        }
+    }
+
+    protected abstract getAll(appId: string): Promise<Array<ISetting>>;
+
+    protected abstract getOneById(id: string, appId: string): Promise<ISetting>;
+
+    protected abstract hideGroup(name: string, appId: string): Promise<void>;
+
+    protected abstract hideSetting(id: string, appId: string): Promise<void>;
+
+    protected abstract isReadableById(id: string, appId: string): Promise<boolean>;
+
+    protected abstract updateOne(setting: ISetting, appId: string): Promise<void>;
+
+    protected abstract incrementValue(id: ISetting['id'], value: number, appId: string): Promise<void>;
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.setting.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.setting.write],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.setting.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.setting.read],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/ThreadBridge.ts b/packages/apps-engine/src/server/bridges/ThreadBridge.ts
new file mode 100644
index 000000000000..ccf1f4b1d330
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/ThreadBridge.ts
@@ -0,0 +1,35 @@
+import type { ITypingOptions } from '../../definition/accessors/INotifier';
+import type { IMessage } from '../../definition/messages';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export interface ITypingDescriptor extends ITypingOptions {
+    isTyping: boolean;
+}
+
+export abstract class ThreadBridge extends BaseBridge {
+    public async doGetById(messageId: string, appId: string): Promise<Array<IMessage>> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(messageId, appId);
+        }
+    }
+
+    protected abstract getById(messageId: string, appId: string): Promise<Array<IMessage>>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.threads.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.threads.read],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts b/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts
new file mode 100644
index 000000000000..2d0b6202fc86
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts
@@ -0,0 +1,31 @@
+import type { IUIKitInteraction } from '../../definition/uikit';
+import type { IUser } from '../../definition/users';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class UiInteractionBridge extends BaseBridge {
+    public async doNotifyUser(user: IUser, interaction: IUIKitInteraction, appId: string): Promise<void> {
+        if (this.hasInteractionPermission(appId)) {
+            return this.notifyUser(user, interaction, appId);
+        }
+    }
+
+    protected abstract notifyUser(user: IUser, interaction: IUIKitInteraction, appId: string): Promise<void>;
+
+    private hasInteractionPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.ui.interaction)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.ui.interaction],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/UploadBridge.ts b/packages/apps-engine/src/server/bridges/UploadBridge.ts
new file mode 100644
index 000000000000..14ae85ca41dd
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/UploadBridge.ts
@@ -0,0 +1,62 @@
+import type { IUpload } from '../../definition/uploads';
+import type { IUploadDetails } from '../../definition/uploads/IUploadDetails';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class UploadBridge extends BaseBridge {
+    public async doGetById(id: string, appId: string): Promise<IUpload> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(id, appId);
+        }
+    }
+
+    public async doGetBuffer(upload: IUpload, appId: string): Promise<Buffer> {
+        if (this.hasReadPermission(appId)) {
+            return this.getBuffer(upload, appId);
+        }
+    }
+
+    public async doCreateUpload(details: IUploadDetails, buffer: Buffer, appId: string): Promise<IUpload> {
+        if (this.hasWritePermission(appId)) {
+            return this.createUpload(details, buffer, appId);
+        }
+    }
+
+    protected abstract getById(id: string, appId: string): Promise<IUpload>;
+
+    protected abstract getBuffer(upload: IUpload, appId: string): Promise<Buffer>;
+
+    protected abstract createUpload(details: IUploadDetails, buffer: Buffer, appId: string): Promise<IUpload>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.upload.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.upload.read],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.upload.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.upload.write],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/UserBridge.ts b/packages/apps-engine/src/server/bridges/UserBridge.ts
new file mode 100644
index 000000000000..232f665078ff
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/UserBridge.ts
@@ -0,0 +1,149 @@
+import type { IUser, IUserCreationOptions, UserType } from '../../definition/users';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class UserBridge extends BaseBridge {
+    public async doGetById(id: string, appId: string): Promise<IUser> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(id, appId);
+        }
+    }
+
+    public async doGetByUsername(username: string, appId: string): Promise<IUser> {
+        if (this.hasReadPermission(appId)) {
+            return this.getByUsername(username, appId);
+        }
+    }
+
+    public async doGetAppUser(appId?: string): Promise<IUser | undefined> {
+        return this.getAppUser(appId);
+    }
+
+    public async doCreate(data: Partial<IUser>, appId: string, options?: IUserCreationOptions): Promise<string> {
+        if (this.hasWritePermission(appId)) {
+            return this.create(data, appId, options || {});
+        }
+    }
+
+    public async doRemove(user: IUser, appId: string): Promise<boolean> {
+        if (this.hasWritePermission(appId)) {
+            return this.remove(user, appId);
+        }
+    }
+
+    public async doUpdate(user: IUser, updates: Partial<IUser>, appId: string): Promise<boolean> {
+        if (this.hasWritePermission(appId)) {
+            return this.update(user, updates, appId);
+        }
+    }
+
+    public async doGetUserUnreadMessageCount(uid: string, appId: string): Promise<number> {
+        if (this.hasReadPermission(appId)) {
+            return this.getUserUnreadMessageCount(uid);
+        }
+    }
+
+    public async doDeleteUsersCreatedByApp(appId: string, type: UserType.BOT | UserType.APP): Promise<boolean> {
+        if (this.hasWritePermission(appId)) {
+            return this.deleteUsersCreatedByApp(appId, type);
+        }
+    }
+
+    public async doDeactivate(userId: IUser['id'], confirmRelinquish: boolean, appId: string): Promise<boolean> {
+        if (this.hasWritePermission(appId)) {
+            return this.deactivate(userId, confirmRelinquish, appId);
+        }
+    }
+
+    protected abstract getById(id: string, appId: string): Promise<IUser>;
+
+    protected abstract getByUsername(username: string, appId: string): Promise<IUser>;
+
+    protected abstract getAppUser(appId?: string): Promise<IUser | undefined>;
+
+    protected abstract getActiveUserCount(): Promise<number>;
+
+    protected abstract getUserUnreadMessageCount(uid: string): Promise<number>;
+
+    /**
+     * Creates a user.
+     * @param data the essential data for creating a user
+     * @param appId the id of the app calling this
+     * @param options options for passing extra data
+     */
+    protected abstract create(data: Partial<IUser>, appId: string, options?: IUserCreationOptions): Promise<string>;
+
+    /**
+     * Remove a user.
+     *
+     * @param user the user object to be removed
+     * @param appId the id of the app executing the call
+     */
+    protected abstract remove(user: IUser, appId: string): Promise<boolean>;
+
+    /**
+     * Updates a user.
+     *
+     * Note: the actual methods used by apps to update
+     * user properties are much more granular, but at a
+     * bridge level we can adopt a more practical approach
+     * since it is only accessible internally by the framework
+     *
+     * @param user the user to be updated
+     * @param updates a map of properties to be updated
+     * @param appId the id of the app executing the call
+     */
+    protected abstract update(user: IUser, updates: Partial<IUser>, appId: string): Promise<boolean>;
+
+    /**
+     * Deletes all bot or app users created by the App.
+     * @param appId the App's ID.
+     * @param type the type of the user to be deleted.
+     * @returns true if any user was deleted, false otherwise.
+     */
+    protected abstract deleteUsersCreatedByApp(appId: string, type: UserType.APP | UserType.BOT): Promise<boolean>;
+
+    /**
+     * Deactivates a user.
+     * @param userId the user's ID.
+     * @param confirmRelinquish whether the user confirmed the relinquish of the account.
+     * @param appId the App's ID.
+     * @returns true if the user was deactivated, false otherwise.
+     * @throws {Error} if the user is not found.
+     * @throws {Error} if the user is the last admin.
+     * @throws {Error} if the user is the last owner, if confirmRelinquish is false.
+     */
+    protected abstract deactivate(userId: IUser['id'], confirmRelinquish: boolean, appId: string): Promise<boolean>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.user.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.user.read],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.user.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.user.write],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts b/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts
new file mode 100644
index 000000000000..1a980e437fbe
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts
@@ -0,0 +1,94 @@
+import type { IVideoConfProvider } from '../../definition/videoConfProviders';
+import type { AppVideoConference } from '../../definition/videoConferences/AppVideoConference';
+import type { VideoConference } from '../../definition/videoConferences/IVideoConference';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export abstract class VideoConferenceBridge extends BaseBridge {
+    public async doGetById(callId: string, appId: string): Promise<VideoConference> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(callId, appId);
+        }
+    }
+
+    public async doCreate(call: AppVideoConference, appId: string): Promise<string> {
+        if (this.hasWritePermission(appId)) {
+            return this.create(call, appId);
+        }
+    }
+
+    public async doUpdate(call: VideoConference, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.update(call, appId);
+        }
+    }
+
+    public async doRegisterProvider(info: IVideoConfProvider, appId: string): Promise<void> {
+        if (this.hasProviderPermission(appId)) {
+            return this.registerProvider(info, appId);
+        }
+    }
+
+    public async doUnRegisterProvider(info: IVideoConfProvider, appId: string): Promise<void> {
+        if (this.hasProviderPermission(appId)) {
+            return this.unRegisterProvider(info, appId);
+        }
+    }
+
+    protected abstract create(call: AppVideoConference, appId: string): Promise<string>;
+
+    protected abstract getById(callId: string, appId: string): Promise<VideoConference>;
+
+    protected abstract update(call: VideoConference, appId: string): Promise<void>;
+
+    protected abstract registerProvider(info: IVideoConfProvider, appId: string): Promise<void>;
+
+    protected abstract unRegisterProvider(info: IVideoConfProvider, appId: string): Promise<void>;
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.videoConference.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.videoConference.write],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.videoConference.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.videoConference.read],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasProviderPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.videoConference.provider)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.videoConference.provider],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/index.ts b/packages/apps-engine/src/server/bridges/index.ts
new file mode 100644
index 000000000000..f5550e96f8e0
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/index.ts
@@ -0,0 +1,52 @@
+import { ApiBridge } from './ApiBridge';
+import { AppActivationBridge } from './AppActivationBridge';
+import { AppBridges } from './AppBridges';
+import { AppDetailChangesBridge } from './AppDetailChangesBridge';
+import { CloudWorkspaceBridge } from './CloudWorkspaceBridge';
+import { CommandBridge } from './CommandBridge';
+import { EmailBridge } from './EmailBridge';
+import { EnvironmentalVariableBridge } from './EnvironmentalVariableBridge';
+import { HttpBridge, IHttpBridgeRequestInfo } from './HttpBridge';
+import { IInternalBridge } from './IInternalBridge';
+import { IInternalFederationBridge } from './IInternalFederationBridge';
+import { IListenerBridge } from './IListenerBridge';
+import { LivechatBridge } from './LivechatBridge';
+import { MessageBridge } from './MessageBridge';
+import { ModerationBridge } from './ModerationBridge';
+import { PersistenceBridge } from './PersistenceBridge';
+import { RoleBridge } from './RoleBridge';
+import { RoomBridge } from './RoomBridge';
+import { SchedulerBridge } from './SchedulerBridge';
+import { ServerSettingBridge } from './ServerSettingBridge';
+import { UiInteractionBridge } from './UiInteractionBridge';
+import { UploadBridge } from './UploadBridge';
+import { UserBridge } from './UserBridge';
+import { VideoConferenceBridge } from './VideoConferenceBridge';
+
+export {
+    CloudWorkspaceBridge,
+    EnvironmentalVariableBridge,
+    HttpBridge,
+    IHttpBridgeRequestInfo,
+    IListenerBridge,
+    LivechatBridge,
+    MessageBridge,
+    PersistenceBridge,
+    AppActivationBridge,
+    AppDetailChangesBridge,
+    CommandBridge,
+    ApiBridge,
+    RoomBridge,
+    IInternalBridge,
+    ServerSettingBridge,
+    UserBridge,
+    UploadBridge,
+    EmailBridge,
+    UiInteractionBridge,
+    SchedulerBridge,
+    AppBridges,
+    VideoConferenceBridge,
+    IInternalFederationBridge,
+    ModerationBridge,
+    RoleBridge,
+};
diff --git a/packages/apps-engine/src/server/compiler/AppCompiler.ts b/packages/apps-engine/src/server/compiler/AppCompiler.ts
new file mode 100644
index 000000000000..d1f9ddf8a0c0
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/AppCompiler.ts
@@ -0,0 +1,30 @@
+import * as path from 'path';
+
+import type { AppManager } from '../AppManager';
+import { ProxiedApp } from '../ProxiedApp';
+import type { IAppStorageItem } from '../storage';
+import type { IParseAppPackageResult } from './IParseAppPackageResult';
+
+export class AppCompiler {
+    public normalizeStorageFiles(files: { [key: string]: string }): { [key: string]: string } {
+        const result: { [key: string]: string } = {};
+
+        Object.entries(files).forEach(([name, content]) => {
+            result[name.replace(/\$/g, '.')] = content;
+        });
+
+        return result;
+    }
+
+    public async toSandBox(manager: AppManager, storage: IAppStorageItem, packageResult: IParseAppPackageResult): Promise<ProxiedApp> {
+        if (typeof packageResult.files[path.normalize(storage.info.classFile)] === 'undefined') {
+            throw new Error(`Invalid App package for "${storage.info.name}". Could not find the classFile (${storage.info.classFile}) file.`);
+        }
+
+        const runtime = await manager.getRuntime().startRuntimeForApp(packageResult);
+
+        const app = new ProxiedApp(manager, storage, runtime);
+
+        return app;
+    }
+}
diff --git a/packages/apps-engine/src/server/compiler/AppFabricationFulfillment.ts b/packages/apps-engine/src/server/compiler/AppFabricationFulfillment.ts
new file mode 100644
index 000000000000..24b1a4b557b0
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/AppFabricationFulfillment.ts
@@ -0,0 +1,74 @@
+import type { IAppInfo } from '../../definition/metadata';
+import type { ProxiedApp } from '../ProxiedApp';
+import { AppLicenseValidationResult } from '../marketplace/license';
+
+export class AppFabricationFulfillment {
+    public info: IAppInfo;
+
+    public app: ProxiedApp;
+
+    public implemented: { [int: string]: boolean };
+
+    public licenseValidationResult: AppLicenseValidationResult;
+
+    public storageError: string;
+
+    public appUserError: object;
+
+    constructor() {
+        this.licenseValidationResult = new AppLicenseValidationResult();
+    }
+
+    public setAppInfo(information: IAppInfo): void {
+        this.info = information;
+        this.licenseValidationResult.setAppId(information.id);
+    }
+
+    public getAppInfo(): IAppInfo {
+        return this.info;
+    }
+
+    public setApp(application: ProxiedApp): void {
+        this.app = application;
+    }
+
+    public getApp(): ProxiedApp {
+        return this.app;
+    }
+
+    public setImplementedInterfaces(interfaces: { [int: string]: boolean }): void {
+        this.implemented = interfaces;
+    }
+
+    public getImplementedInferfaces(): { [int: string]: boolean } {
+        return this.implemented;
+    }
+
+    public setStorageError(errorMessage: string): void {
+        this.storageError = errorMessage;
+    }
+
+    public setAppUserError(error: object): void {
+        this.appUserError = error;
+    }
+
+    public getStorageError(): string {
+        return this.storageError;
+    }
+
+    public getAppUserError(): object {
+        return this.appUserError;
+    }
+
+    public hasStorageError(): boolean {
+        return !!this.storageError;
+    }
+
+    public hasAppUserError(): boolean {
+        return !!this.appUserError;
+    }
+
+    public getLicenseValidationResult(): AppLicenseValidationResult {
+        return this.licenseValidationResult;
+    }
+}
diff --git a/packages/apps-engine/src/server/compiler/AppImplements.ts b/packages/apps-engine/src/server/compiler/AppImplements.ts
new file mode 100644
index 000000000000..d61b981b7a02
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/AppImplements.ts
@@ -0,0 +1,27 @@
+import { AppInterface } from '../../definition/metadata/AppInterface';
+import { Utilities } from '../misc/Utilities';
+
+export class AppImplements {
+    private implemented: { [key: string]: boolean };
+
+    constructor() {
+        this.implemented = {};
+        Object.keys(AppInterface).forEach((int) => {
+            this.implemented[int] = false;
+        });
+    }
+
+    public doesImplement(int: string): void {
+        if (int in AppInterface) {
+            this.implemented[int] = true;
+        }
+    }
+
+    public getValues(): { [int: string]: boolean } {
+        return Utilities.deepCloneAndFreeze(this.implemented);
+    }
+
+    public toJSON(): { [int: string]: boolean } {
+        return this.getValues();
+    }
+}
diff --git a/packages/apps-engine/src/server/compiler/AppPackageParser.ts b/packages/apps-engine/src/server/compiler/AppPackageParser.ts
new file mode 100644
index 000000000000..a94dbcf396b5
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/AppPackageParser.ts
@@ -0,0 +1,161 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import * as AdmZip from 'adm-zip';
+import * as semver from 'semver';
+import { v4 as uuidv4 } from 'uuid';
+
+import { AppImplements } from '.';
+import type { IAppInfo } from '../../definition/metadata/IAppInfo';
+import { RequiredApiVersionError } from '../errors';
+import type { IParseAppPackageResult } from './IParseAppPackageResult';
+
+export class AppPackageParser {
+    public static uuid4Regex = /^[0-9a-fA-f]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/;
+
+    private allowedIconExts: Array<string> = ['.png', '.jpg', '.jpeg', '.gif'];
+
+    private appsEngineVersion: string;
+
+    constructor() {
+        this.appsEngineVersion = this.getEngineVersion();
+    }
+
+    public async unpackageApp(appPackage: Buffer): Promise<IParseAppPackageResult> {
+        const zip = new AdmZip(appPackage);
+        const infoZip = zip.getEntry('app.json');
+        let info: IAppInfo;
+
+        if (infoZip && !infoZip.isDirectory) {
+            try {
+                info = JSON.parse(infoZip.getData().toString()) as IAppInfo;
+
+                if (!AppPackageParser.uuid4Regex.test(info.id)) {
+                    info.id = uuidv4();
+                    console.warn(
+                        'WARNING: We automatically generated a uuid v4 id for',
+                        info.name,
+                        'since it did not provide us an id. This is NOT',
+                        'recommended as the same App can be installed several times.',
+                    );
+                }
+            } catch (e) {
+                throw new Error('Invalid App package. The "app.json" file is not valid json.');
+            }
+        } else {
+            throw new Error('Invalid App package. No "app.json" file.');
+        }
+
+        info.classFile = info.classFile.replace('.ts', '.js');
+
+        if (!semver.satisfies(this.appsEngineVersion, info.requiredApiVersion)) {
+            throw new RequiredApiVersionError(info, this.appsEngineVersion);
+        }
+
+        // Load all of the TypeScript only files
+        const files: { [s: string]: string } = {};
+
+        zip.getEntries()
+            .filter((entry) => !entry.isDirectory && entry.entryName.endsWith('.js'))
+            .forEach((entry) => {
+                const norm = path.normalize(entry.entryName);
+
+                // Files which start with `.` are supposed to be hidden
+                if (norm.startsWith('.')) {
+                    return;
+                }
+
+                files[norm] = entry.getData().toString();
+            });
+
+        // Ensure that the main class file exists
+        if (!files[path.normalize(info.classFile)]) {
+            throw new Error(`Invalid App package. Could not find the classFile (${info.classFile}) file.`);
+        }
+
+        const languageContent = this.getLanguageContent(zip);
+
+        // Get the icon's content
+        const iconFile = this.getIconFile(zip, info.iconFile);
+        if (iconFile) {
+            info.iconFileContent = iconFile;
+        }
+
+        const implemented = new AppImplements();
+
+        if (Array.isArray(info.implements)) {
+            info.implements.forEach((interfaceName) => implemented.doesImplement(interfaceName));
+        }
+
+        return {
+            info,
+            files,
+            languageContent,
+            implemented,
+        };
+    }
+
+    private getLanguageContent(zip: AdmZip): { [key: string]: object } {
+        const languageContent: { [key: string]: object } = {};
+
+        zip.getEntries()
+            .filter((entry) => !entry.isDirectory && entry.entryName.startsWith('i18n/') && entry.entryName.endsWith('.json'))
+            .forEach((entry) => {
+                const entrySplit = entry.entryName.split('/');
+                const lang = entrySplit[entrySplit.length - 1].split('.')[0].toLowerCase();
+
+                let content;
+                try {
+                    content = JSON.parse(entry.getData().toString());
+                } catch (e) {
+                    // Failed to parse it, maybe warn them? idk yet
+                }
+
+                languageContent[lang] = Object.assign(languageContent[lang] || {}, content);
+            });
+
+        return languageContent;
+    }
+
+    private getIconFile(zip: AdmZip, filePath: string): string {
+        if (!filePath) {
+            return undefined;
+        }
+
+        const ext = path.extname(filePath);
+        if (!this.allowedIconExts.includes(ext)) {
+            return undefined;
+        }
+
+        const entry = zip.getEntry(filePath);
+
+        if (!entry) {
+            return undefined;
+        }
+
+        if (entry.isDirectory) {
+            return undefined;
+        }
+
+        const base64 = entry.getData().toString('base64');
+
+        return `data:image/${ext.replace('.', '')};base64,${base64}`;
+    }
+
+    private getEngineVersion(): string {
+        const devLocation = path.join(__dirname, '../../../package.json');
+        const prodLocation = path.join(__dirname, '../../package.json');
+
+        let info: { version: string };
+
+        if (fs.existsSync(devLocation)) {
+            info = JSON.parse(fs.readFileSync(devLocation, 'utf8'));
+        } else if (fs.existsSync(prodLocation)) {
+            info = JSON.parse(fs.readFileSync(prodLocation, 'utf8'));
+        } else {
+            throw new Error('Could not find the Apps TypeScript Definition Package Version!');
+        }
+
+        return info.version.replace(/^[^0-9]/, '').split('-')[0];
+    }
+}
diff --git a/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts b/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts
new file mode 100644
index 000000000000..62444988d7c3
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts
@@ -0,0 +1,9 @@
+import type { IAppInfo } from '../../definition/metadata';
+import type { AppImplements } from './AppImplements';
+
+export interface IParseAppPackageResult {
+    info: IAppInfo;
+    files: { [key: string]: string };
+    languageContent: { [key: string]: object };
+    implemented: AppImplements;
+}
diff --git a/packages/apps-engine/src/server/compiler/index.ts b/packages/apps-engine/src/server/compiler/index.ts
new file mode 100644
index 000000000000..466be8c786bf
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/index.ts
@@ -0,0 +1,7 @@
+import { AppCompiler } from './AppCompiler';
+import { AppFabricationFulfillment } from './AppFabricationFulfillment';
+import { AppImplements } from './AppImplements';
+import { AppPackageParser } from './AppPackageParser';
+import { IParseAppPackageResult } from './IParseAppPackageResult';
+
+export { AppCompiler, AppFabricationFulfillment, AppImplements, AppPackageParser, IParseAppPackageResult };
diff --git a/packages/apps-engine/src/server/compiler/modules/index.ts b/packages/apps-engine/src/server/compiler/modules/index.ts
new file mode 100644
index 000000000000..f4829f1e7d0e
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/modules/index.ts
@@ -0,0 +1,55 @@
+import { moduleHandlerFactory } from './networking';
+
+export enum AllowedInternalModules {
+    path = 'path',
+    url = 'url',
+    crypto = 'crypto',
+    buffer = 'buffer',
+    stream = 'stream',
+    net = 'net',
+    http = 'http',
+    https = 'https',
+    zlib = 'zlib',
+    util = 'util',
+    punycode = 'punycode',
+    os = 'os',
+    querystring = 'querystring',
+}
+
+export class ForbiddenNativeModuleAccess extends Error {
+    constructor(module: string, prop: string) {
+        super(`Access to property ${prop} in module ${module} is forbidden`);
+    }
+}
+
+const defaultHandler = () => ({});
+
+const noopHandler = () => ({
+    get: (): undefined => undefined,
+});
+
+const proxyHandlers = {
+    path: defaultHandler,
+    url: defaultHandler,
+    crypto: defaultHandler,
+    buffer: defaultHandler,
+    stream: defaultHandler,
+    net: moduleHandlerFactory('net'),
+    http: moduleHandlerFactory('http'),
+    https: moduleHandlerFactory('https'),
+    zlib: defaultHandler,
+    util: defaultHandler,
+    punycode: defaultHandler,
+    os: noopHandler,
+    querystring: defaultHandler,
+};
+
+export function requireNativeModule(module: AllowedInternalModules, appId: string, requirer: any) {
+    const requiredModule = requirer(module);
+
+    return new Proxy(
+        requiredModule,
+        // Creates a proxy handler that is aware of the appId requiring the module
+        Reflect.apply(proxyHandlers[module], undefined, [appId]),
+    );
+}
diff --git a/packages/apps-engine/src/server/compiler/modules/networking.ts b/packages/apps-engine/src/server/compiler/modules/networking.ts
new file mode 100644
index 000000000000..59966fe9e4ab
--- /dev/null
+++ b/packages/apps-engine/src/server/compiler/modules/networking.ts
@@ -0,0 +1,36 @@
+import type * as http from 'http';
+import type * as https from 'https';
+import type * as net from 'net';
+
+import { ForbiddenNativeModuleAccess } from '.';
+import { PermissionDeniedError } from '../../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../../managers/AppPermissionManager';
+import { AppPermissions } from '../../permissions/AppPermissions';
+
+type IHttp = typeof http;
+type IHttps = typeof https;
+type INet = typeof net;
+
+type NetworkingLibs = IHttp | IHttps | INet;
+
+const networkingModuleBlockList = ['createServer', 'Server'];
+
+export const moduleHandlerFactory = (module: string) => {
+    return (appId: string): ProxyHandler<NetworkingLibs> => ({
+        get(target, prop: string, receiver) {
+            if (networkingModuleBlockList.includes(prop)) {
+                throw new ForbiddenNativeModuleAccess(module, prop);
+            }
+
+            if (!AppPermissionManager.hasPermission(appId, AppPermissions.networking.default)) {
+                throw new PermissionDeniedError({
+                    appId,
+                    missingPermissions: [AppPermissions.networking.default],
+                    methodName: `${module}.${prop}`,
+                });
+            }
+
+            return Reflect.get(target, prop, receiver);
+        },
+    });
+};
diff --git a/packages/apps-engine/src/server/errors/CommandAlreadyExistsError.ts b/packages/apps-engine/src/server/errors/CommandAlreadyExistsError.ts
new file mode 100644
index 000000000000..6cbbc71e6d76
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/CommandAlreadyExistsError.ts
@@ -0,0 +1,9 @@
+export class CommandAlreadyExistsError implements Error {
+    public name = 'CommandAlreadyExists';
+
+    public message: string;
+
+    constructor(command: string) {
+        this.message = `The command "${command}" already exists in the system.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/CommandHasAlreadyBeenTouchedError.ts b/packages/apps-engine/src/server/errors/CommandHasAlreadyBeenTouchedError.ts
new file mode 100644
index 000000000000..27af2deec6ff
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/CommandHasAlreadyBeenTouchedError.ts
@@ -0,0 +1,9 @@
+export class CommandHasAlreadyBeenTouchedError implements Error {
+    public name = 'CommandHasAlreadyBeenTouched';
+
+    public message: string;
+
+    constructor(command: string) {
+        this.message = `The command "${command}" has already been touched by another App.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/CompilerError.ts b/packages/apps-engine/src/server/errors/CompilerError.ts
new file mode 100644
index 000000000000..1897aaffaad0
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/CompilerError.ts
@@ -0,0 +1,9 @@
+export class CompilerError implements Error {
+    public name = 'CompilerError';
+
+    public message: string;
+
+    constructor(detail: string) {
+        this.message = `An error occured while compiling an App: ${detail}`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/InvalidInstallationError.ts b/packages/apps-engine/src/server/errors/InvalidInstallationError.ts
new file mode 100644
index 000000000000..02a11d040a3d
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/InvalidInstallationError.ts
@@ -0,0 +1,5 @@
+export class InvalidInstallationError extends Error {
+    public constructor(message: string) {
+        super(`Invalid app installation: ${message}`);
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/InvalidLicenseError.ts b/packages/apps-engine/src/server/errors/InvalidLicenseError.ts
new file mode 100644
index 000000000000..3a056fee936a
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/InvalidLicenseError.ts
@@ -0,0 +1,7 @@
+import type { AppLicenseValidationResult } from '../marketplace/license/AppLicenseValidationResult';
+
+export class InvalidLicenseError extends Error {
+    public constructor(public readonly validationResult: AppLicenseValidationResult) {
+        super('Invalid app license');
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/MustContainFunctionError.ts b/packages/apps-engine/src/server/errors/MustContainFunctionError.ts
new file mode 100644
index 000000000000..119ea294956a
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/MustContainFunctionError.ts
@@ -0,0 +1,9 @@
+export class MustContainFunctionError implements Error {
+    public name = 'MustContainFunction';
+
+    public message: string;
+
+    constructor(fileName: string, funcName: string) {
+        this.message = `The App (${fileName}) doesn't have a "${funcName}" function which is required.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/MustExtendAppError.ts b/packages/apps-engine/src/server/errors/MustExtendAppError.ts
new file mode 100644
index 000000000000..d014be3c2645
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/MustExtendAppError.ts
@@ -0,0 +1,5 @@
+export class MustExtendAppError implements Error {
+    public name = 'MustExtendApp';
+
+    public message = 'App must extend the "App" abstract class.';
+}
diff --git a/packages/apps-engine/src/server/errors/NotEnoughMethodArgumentsError.ts b/packages/apps-engine/src/server/errors/NotEnoughMethodArgumentsError.ts
new file mode 100644
index 000000000000..df87718d50f1
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/NotEnoughMethodArgumentsError.ts
@@ -0,0 +1,9 @@
+export class NotEnoughMethodArgumentsError implements Error {
+    public readonly name: string = 'NotEnoughMethodArgumentsError';
+
+    public readonly message: string;
+
+    constructor(method: string, requiredCount: number, providedCount: number) {
+        this.message = `The method "${method}" requires ${requiredCount} parameters but was only passed ${providedCount}.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/PathAlreadyExistsError.ts b/packages/apps-engine/src/server/errors/PathAlreadyExistsError.ts
new file mode 100644
index 000000000000..6340cb371120
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/PathAlreadyExistsError.ts
@@ -0,0 +1,9 @@
+export class PathAlreadyExistsError implements Error {
+    public name = 'PathAlreadyExists';
+
+    public message: string;
+
+    constructor(path: string) {
+        this.message = `The api path "${path}" already exists in the system.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/PermissionDeniedError.ts b/packages/apps-engine/src/server/errors/PermissionDeniedError.ts
new file mode 100644
index 000000000000..c1fbc97d9efe
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/PermissionDeniedError.ts
@@ -0,0 +1,25 @@
+import type { IPermission } from '../../definition/permissions/IPermission';
+
+interface IPermissionDeniedErrorParams {
+    appId: string;
+    missingPermissions: Array<IPermission>;
+    methodName?: string;
+    reason?: string;
+    message?: string;
+}
+
+export class PermissionDeniedError extends Error {
+    constructor({ appId, missingPermissions, methodName, reason, message }: IPermissionDeniedErrorParams) {
+        if (message) {
+            super(message);
+        } else {
+            const permissions = missingPermissions.map((permission) => `"${permission.name}"`).join(', ');
+
+            super(
+                `Failed to call the method ${methodName ? `"${methodName}"` : ''} as the app (${appId}) lacks the following permissions:\n` +
+                    `[${permissions}]. Declare them in your app.json to fix the issue.\n` +
+                    `reason: ${reason}`,
+            );
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/RequiredApiVersionError.ts b/packages/apps-engine/src/server/errors/RequiredApiVersionError.ts
new file mode 100644
index 000000000000..c0e689cd6fff
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/RequiredApiVersionError.ts
@@ -0,0 +1,21 @@
+import * as semver from 'semver';
+
+import type { IAppInfo } from '../../definition/metadata';
+
+export class RequiredApiVersionError implements Error {
+    public name = 'RequiredApiVersion';
+
+    public message: string;
+
+    constructor(info: IAppInfo, versionInstalled: string) {
+        let moreInfo = '';
+        if (semver.gt(versionInstalled, info.requiredApiVersion)) {
+            moreInfo = ' Please tell the author to update their App as it is out of date.';
+        }
+
+        this.message =
+            `Failed to load the App "${info.name}" (${info.id}) as it requires ` +
+            `v${info.requiredApiVersion} of the App API however your server comes with ` +
+            `v${versionInstalled}.${moreInfo}`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/VideoConfProviderAlreadyExistsError.ts b/packages/apps-engine/src/server/errors/VideoConfProviderAlreadyExistsError.ts
new file mode 100644
index 000000000000..3e71266396a0
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/VideoConfProviderAlreadyExistsError.ts
@@ -0,0 +1,9 @@
+export class VideoConfProviderAlreadyExistsError implements Error {
+    public name = 'VideoConfProviderAlreadyExists';
+
+    public message: string;
+
+    constructor(name: string) {
+        this.message = `The video conference provider "${name}" was already registered by another App.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/VideoConfProviderNotRegisteredError.ts b/packages/apps-engine/src/server/errors/VideoConfProviderNotRegisteredError.ts
new file mode 100644
index 000000000000..6629831f7a4b
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/VideoConfProviderNotRegisteredError.ts
@@ -0,0 +1,9 @@
+export class VideoConfProviderNotRegisteredError implements Error {
+    public name = 'VideoConfProviderNotRegistered';
+
+    public message: string;
+
+    constructor(providerName: string) {
+        this.message = `The video conference provider "${providerName}" is not registered in the system.`;
+    }
+}
diff --git a/packages/apps-engine/src/server/errors/index.ts b/packages/apps-engine/src/server/errors/index.ts
new file mode 100644
index 000000000000..b30fec4e2cb2
--- /dev/null
+++ b/packages/apps-engine/src/server/errors/index.ts
@@ -0,0 +1,25 @@
+import { CommandAlreadyExistsError } from './CommandAlreadyExistsError';
+import { CommandHasAlreadyBeenTouchedError } from './CommandHasAlreadyBeenTouchedError';
+import { CompilerError } from './CompilerError';
+import { InvalidLicenseError } from './InvalidLicenseError';
+import { MustContainFunctionError } from './MustContainFunctionError';
+import { MustExtendAppError } from './MustExtendAppError';
+import { NotEnoughMethodArgumentsError } from './NotEnoughMethodArgumentsError';
+import { PathAlreadyExistsError } from './PathAlreadyExistsError';
+import { RequiredApiVersionError } from './RequiredApiVersionError';
+import { VideoConfProviderAlreadyExistsError } from './VideoConfProviderAlreadyExistsError';
+import { VideoConfProviderNotRegisteredError } from './VideoConfProviderNotRegisteredError';
+
+export {
+    CommandAlreadyExistsError,
+    CommandHasAlreadyBeenTouchedError,
+    PathAlreadyExistsError,
+    CompilerError,
+    MustContainFunctionError,
+    MustExtendAppError,
+    NotEnoughMethodArgumentsError,
+    RequiredApiVersionError,
+    InvalidLicenseError,
+    VideoConfProviderAlreadyExistsError,
+    VideoConfProviderNotRegisteredError,
+};
diff --git a/packages/apps-engine/src/server/logging/AppConsole.ts b/packages/apps-engine/src/server/logging/AppConsole.ts
new file mode 100644
index 000000000000..becf90ede454
--- /dev/null
+++ b/packages/apps-engine/src/server/logging/AppConsole.ts
@@ -0,0 +1,121 @@
+import * as stackTrace from 'stack-trace';
+
+import type { ILogEntry, ILogger } from '../../definition/accessors';
+import { LogMessageSeverity } from '../../definition/accessors';
+import type { AppMethod } from '../../definition/metadata';
+import type { ILoggerStorageEntry } from './ILoggerStorageEntry';
+
+export class AppConsole implements ILogger {
+    public static toStorageEntry(appId: string, logger: AppConsole): ILoggerStorageEntry {
+        return {
+            appId,
+            method: logger.getMethod(),
+            entries: logger.getEntries(),
+            startTime: logger.getStartTime(),
+            endTime: logger.getEndTime(),
+            totalTime: logger.getTotalTime(),
+            _createdAt: new Date(),
+        };
+    }
+
+    public method: `${AppMethod}`;
+
+    private entries: Array<ILogEntry>;
+
+    private start: Date;
+
+    constructor(method: `${AppMethod}`) {
+        this.method = method;
+        this.entries = [];
+        this.start = new Date();
+    }
+
+    public debug(...items: Array<any>): void {
+        this.addEntry(LogMessageSeverity.DEBUG, this.getFunc(stackTrace.get()), ...items);
+    }
+
+    public info(...items: Array<any>): void {
+        this.addEntry(LogMessageSeverity.INFORMATION, this.getFunc(stackTrace.get()), ...items);
+    }
+
+    public log(...items: Array<any>): void {
+        this.addEntry(LogMessageSeverity.LOG, this.getFunc(stackTrace.get()), ...items);
+    }
+
+    public warn(...items: Array<any>): void {
+        this.addEntry(LogMessageSeverity.WARNING, this.getFunc(stackTrace.get()), ...items);
+    }
+
+    public error(...items: Array<any>): void {
+        this.addEntry(LogMessageSeverity.ERROR, this.getFunc(stackTrace.get()), ...items);
+    }
+
+    public success(...items: Array<any>): void {
+        this.addEntry(LogMessageSeverity.SUCCESS, this.getFunc(stackTrace.get()), ...items);
+    }
+
+    public getEntries(): Array<ILogEntry> {
+        return Array.from(this.entries);
+    }
+
+    public getMethod(): `${AppMethod}` {
+        return this.method;
+    }
+
+    public getStartTime(): Date {
+        return this.start;
+    }
+
+    public getEndTime(): Date {
+        return new Date();
+    }
+
+    public getTotalTime(): number {
+        return this.getEndTime().getTime() - this.getStartTime().getTime();
+    }
+
+    private addEntry(severity: LogMessageSeverity, caller: string, ...items: Array<any>): void {
+        const i = items.map((v) => {
+            if (v instanceof Error) {
+                return JSON.stringify(v, Object.getOwnPropertyNames(v));
+            }
+            if (typeof v === 'object' && typeof v.stack === 'string' && typeof v.message === 'string') {
+                return JSON.stringify(v, Object.getOwnPropertyNames(v));
+            }
+            const str = JSON.stringify(v, null, 2);
+            return str ? JSON.parse(str) : str; // force call toJSON to prevent circular references
+        });
+
+        this.entries.push({
+            caller,
+            severity,
+            timestamp: new Date(),
+            args: i,
+        });
+
+        // This should be a setting? :thinking:
+        // console.log(`${ severity.toUpperCase() }:`, i);
+    }
+
+    private getFunc(stack: Array<stackTrace.StackFrame>): string {
+        let func = 'anonymous';
+
+        if (stack.length === 1) {
+            return func;
+        }
+
+        const frame: stackTrace.StackFrame = stack[1];
+
+        if (frame.getMethodName() === null) {
+            func = 'anonymous OR constructor';
+        } else {
+            func = frame.getMethodName();
+        }
+
+        if (frame.getFunctionName() !== null) {
+            func = `${func} -> ${frame.getFunctionName()}`;
+        }
+
+        return func;
+    }
+}
diff --git a/packages/apps-engine/src/server/logging/ILoggerStorageEntry.ts b/packages/apps-engine/src/server/logging/ILoggerStorageEntry.ts
new file mode 100644
index 000000000000..ed621c2f01d7
--- /dev/null
+++ b/packages/apps-engine/src/server/logging/ILoggerStorageEntry.ts
@@ -0,0 +1,14 @@
+import type { ILogEntry } from '../../definition/accessors';
+import type { AppMethod } from '../../definition/metadata';
+
+export interface ILoggerStorageEntry {
+    appId: string;
+    method: `${AppMethod}`;
+    entries: Array<ILogEntry>;
+    startTime: Date;
+    endTime: Date;
+    totalTime: number;
+    instanceId?: string;
+    // Internal value to be used for sorting
+    _createdAt: Date;
+}
diff --git a/packages/apps-engine/src/server/logging/index.ts b/packages/apps-engine/src/server/logging/index.ts
new file mode 100644
index 000000000000..e17cdd6e9e6c
--- /dev/null
+++ b/packages/apps-engine/src/server/logging/index.ts
@@ -0,0 +1,4 @@
+import { AppConsole } from './AppConsole';
+import { ILoggerStorageEntry } from './ILoggerStorageEntry';
+
+export { AppConsole, ILoggerStorageEntry };
diff --git a/packages/apps-engine/src/server/managers/AppAccessorManager.ts b/packages/apps-engine/src/server/managers/AppAccessorManager.ts
new file mode 100644
index 000000000000..7a100d58da34
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppAccessorManager.ts
@@ -0,0 +1,228 @@
+import type {
+    IConfigurationExtend,
+    IConfigurationModify,
+    IEnvironmentRead,
+    IEnvironmentWrite,
+    IHttp,
+    IHttpExtend,
+    IModify,
+    IPersistence,
+    IRead,
+} from '../../definition/accessors';
+import type { AppManager } from '../AppManager';
+import {
+    ApiExtend,
+    ConfigurationExtend,
+    ConfigurationModify,
+    EnvironmentalVariableRead,
+    EnvironmentRead,
+    EnvironmentWrite,
+    ExternalComponentsExtend,
+    Http,
+    HttpExtend,
+    LivechatRead,
+    MessageRead,
+    Modify,
+    Notifier,
+    OAuthAppsReader,
+    Persistence,
+    PersistenceRead,
+    Reader,
+    RoleRead,
+    RoomRead,
+    SchedulerExtend,
+    SchedulerModify,
+    ServerSettingRead,
+    ServerSettingsModify,
+    ServerSettingUpdater,
+    SettingRead,
+    SettingsExtend,
+    SettingUpdater,
+    SlashCommandsExtend,
+    SlashCommandsModify,
+    UploadRead,
+    UserRead,
+    VideoConferenceRead,
+    VideoConfProviderExtend,
+} from '../accessors';
+import { CloudWorkspaceRead } from '../accessors/CloudWorkspaceRead';
+import { ThreadRead } from '../accessors/ThreadRead';
+import { UIExtend } from '../accessors/UIExtend';
+import type { AppBridges } from '../bridges/AppBridges';
+
+export class AppAccessorManager {
+    private readonly bridges: AppBridges;
+
+    private readonly configExtenders: Map<string, IConfigurationExtend>;
+
+    private readonly envReaders: Map<string, IEnvironmentRead>;
+
+    private readonly envWriters: Map<string, IEnvironmentWrite>;
+
+    private readonly configModifiers: Map<string, IConfigurationModify>;
+
+    private readonly readers: Map<string, IRead>;
+
+    private readonly modifiers: Map<string, IModify>;
+
+    private readonly persists: Map<string, IPersistence>;
+
+    private readonly https: Map<string, IHttp>;
+
+    constructor(private readonly manager: AppManager) {
+        this.bridges = this.manager.getBridges();
+        this.configExtenders = new Map<string, IConfigurationExtend>();
+        this.envReaders = new Map<string, IEnvironmentRead>();
+        this.envWriters = new Map<string, IEnvironmentWrite>();
+        this.configModifiers = new Map<string, IConfigurationModify>();
+        this.readers = new Map<string, IRead>();
+        this.modifiers = new Map<string, IModify>();
+        this.persists = new Map<string, IPersistence>();
+        this.https = new Map<string, IHttp>();
+    }
+
+    /**
+     * Purifies the accessors for the provided App.
+     *
+     * @param appId The id of the App to purge the accessors for.
+     */
+    public purifyApp(appId: string): void {
+        this.configExtenders.delete(appId);
+        this.envReaders.delete(appId);
+        this.envWriters.delete(appId);
+        this.configModifiers.delete(appId);
+        this.readers.delete(appId);
+        this.modifiers.delete(appId);
+        this.persists.delete(appId);
+        this.https.delete(appId);
+    }
+
+    public getConfigurationExtend(appId: string): IConfigurationExtend {
+        if (!this.configExtenders.has(appId)) {
+            const rl = this.manager.getOneById(appId);
+
+            if (!rl) {
+                throw new Error(`No App found by the provided id: ${appId}`);
+            }
+
+            const htt = new HttpExtend();
+            const cmds = new SlashCommandsExtend(this.manager.getCommandManager(), appId);
+            const videoConf = new VideoConfProviderExtend(this.manager.getVideoConfProviderManager(), appId);
+            const apis = new ApiExtend(this.manager.getApiManager(), appId);
+            const sets = new SettingsExtend(rl);
+            const excs = new ExternalComponentsExtend(this.manager.getExternalComponentManager(), appId);
+            const scheduler = new SchedulerExtend(this.manager.getSchedulerManager(), appId);
+            const ui = new UIExtend(this.manager.getUIActionButtonManager(), appId);
+
+            this.configExtenders.set(appId, new ConfigurationExtend(htt, sets, cmds, apis, excs, scheduler, ui, videoConf));
+        }
+
+        return this.configExtenders.get(appId);
+    }
+
+    public getEnvironmentRead(appId: string): IEnvironmentRead {
+        if (!this.envReaders.has(appId)) {
+            const rl = this.manager.getOneById(appId);
+
+            if (!rl) {
+                throw new Error(`No App found by the provided id: ${appId}`);
+            }
+
+            const sets = new SettingRead(rl);
+            const servsets = new ServerSettingRead(this.bridges.getServerSettingBridge(), appId);
+            const env = new EnvironmentalVariableRead(this.bridges.getEnvironmentalVariableBridge(), appId);
+
+            this.envReaders.set(appId, new EnvironmentRead(sets, servsets, env));
+        }
+
+        return this.envReaders.get(appId);
+    }
+
+    public getEnvironmentWrite(appId: string): IEnvironmentWrite {
+        if (!this.envWriters.has(appId)) {
+            const rl = this.manager.getOneById(appId);
+
+            if (!rl) {
+                throw new Error(`No App found by the provided id: ${appId}`);
+            }
+
+            const sets = new SettingUpdater(rl, this.manager.getSettingsManager());
+            const serverSetting = new ServerSettingUpdater(this.bridges, appId);
+
+            this.envWriters.set(appId, new EnvironmentWrite(sets, serverSetting));
+        }
+
+        return this.envWriters.get(appId);
+    }
+
+    public getConfigurationModify(appId: string): IConfigurationModify {
+        if (!this.configModifiers.has(appId)) {
+            this.configModifiers.set(
+                appId,
+                new ConfigurationModify(
+                    new ServerSettingsModify(this.bridges.getServerSettingBridge(), appId),
+                    new SlashCommandsModify(this.manager.getCommandManager(), appId),
+                    new SchedulerModify(this.bridges.getSchedulerBridge(), appId),
+                ),
+            );
+        }
+
+        return this.configModifiers.get(appId);
+    }
+
+    public getReader(appId: string): IRead {
+        if (!this.readers.has(appId)) {
+            const env = this.getEnvironmentRead(appId);
+            const msg = new MessageRead(this.bridges.getMessageBridge(), appId);
+            const persist = new PersistenceRead(this.bridges.getPersistenceBridge(), appId);
+            const room = new RoomRead(this.bridges.getRoomBridge(), appId);
+            const user = new UserRead(this.bridges.getUserBridge(), appId);
+            const noti = new Notifier(this.bridges.getUserBridge(), this.bridges.getMessageBridge(), appId);
+            const livechat = new LivechatRead(this.bridges.getLivechatBridge(), appId);
+            const upload = new UploadRead(this.bridges.getUploadBridge(), appId);
+            const cloud = new CloudWorkspaceRead(this.bridges.getCloudWorkspaceBridge(), appId);
+            const videoConf = new VideoConferenceRead(this.bridges.getVideoConferenceBridge(), appId);
+            const oauthApps = new OAuthAppsReader(this.bridges.getOAuthAppsBridge(), appId);
+
+            const thread = new ThreadRead(this.bridges.getThreadBridge(), appId);
+
+            const role = new RoleRead(this.bridges.getRoleBridge(), appId);
+
+            this.readers.set(appId, new Reader(env, msg, persist, room, user, noti, livechat, upload, cloud, videoConf, oauthApps, thread, role));
+        }
+
+        return this.readers.get(appId);
+    }
+
+    public getModifier(appId: string): IModify {
+        if (!this.modifiers.has(appId)) {
+            this.modifiers.set(appId, new Modify(this.bridges, appId));
+        }
+
+        return this.modifiers.get(appId);
+    }
+
+    public getPersistence(appId: string): IPersistence {
+        if (!this.persists.has(appId)) {
+            this.persists.set(appId, new Persistence(this.bridges.getPersistenceBridge(), appId));
+        }
+
+        return this.persists.get(appId);
+    }
+
+    public getHttp(appId: string): IHttp {
+        if (!this.https.has(appId)) {
+            let ext: IHttpExtend;
+            if (this.configExtenders.has(appId)) {
+                ext = this.configExtenders.get(appId).http;
+            } else {
+                const cf = this.getConfigurationExtend(appId);
+                ext = cf.http;
+            }
+
+            this.https.set(appId, new Http(this, this.bridges, ext, appId));
+        }
+
+        return this.https.get(appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppApi.ts b/packages/apps-engine/src/server/managers/AppApi.ts
new file mode 100644
index 000000000000..20e6cde3b994
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppApi.ts
@@ -0,0 +1,95 @@
+import type { IApi, IApiRequest, IApiResponse } from '../../definition/api';
+import { ApiSecurity, ApiVisibility } from '../../definition/api';
+import type { IApiEndpoint } from '../../definition/api/IApiEndpoint';
+import type { IApiEndpointInfo } from '../../definition/api/IApiEndpointInfo';
+import type { ProxiedApp } from '../ProxiedApp';
+import type { AppLogStorage } from '../storage';
+import type { AppAccessorManager } from './AppAccessorManager';
+
+export class AppApi {
+    public readonly computedPath: string;
+
+    public readonly basePath: string;
+
+    public readonly appId: string;
+
+    public readonly hash?: string;
+
+    public readonly implementedMethods: Array<string>;
+
+    constructor(public app: ProxiedApp, public api: IApi, public endpoint: IApiEndpoint) {
+        this.appId = app.getID();
+
+        switch (this.api.visibility) {
+            case ApiVisibility.PUBLIC:
+                this.basePath = `/api/apps/public/${app.getID()}`;
+                break;
+
+            case ApiVisibility.PRIVATE:
+                this.basePath = `/api/apps/private/${app.getID()}/${app.getStorageItem()._id}`;
+                this.hash = app.getStorageItem()._id;
+                break;
+        }
+
+        this.computedPath = `${this.basePath}/${endpoint.path}`;
+
+        this.implementedMethods = endpoint._availableMethods;
+    }
+
+    public async runExecutor(request: IApiRequest, logStorage: AppLogStorage, accessors: AppAccessorManager): Promise<IApiResponse> {
+        const { path } = this.endpoint;
+
+        const { method } = request;
+
+        if (!this.validateVisibility(request)) {
+            return {
+                status: 404,
+            };
+        }
+
+        if (!this.validateSecurity(request)) {
+            return {
+                status: 401,
+            };
+        }
+
+        const endpoint: IApiEndpointInfo = {
+            basePath: this.basePath,
+            fullPath: this.computedPath,
+            appId: this.appId,
+            hash: this.hash,
+        };
+
+        try {
+            const result = await this.app.getDenoRuntime().sendRequest({
+                method: `api:${path}:${method}`,
+                params: [request, endpoint],
+            });
+
+            return result as IApiResponse;
+        } catch (e) {
+            console.error(e);
+            throw e;
+        }
+    }
+
+    private validateVisibility(request: IApiRequest): boolean {
+        if (this.api.visibility === ApiVisibility.PUBLIC) {
+            return true;
+        }
+
+        if (this.api.visibility === ApiVisibility.PRIVATE) {
+            return this.app.getStorageItem()._id === request.privateHash;
+        }
+
+        return false;
+    }
+
+    private validateSecurity(request: IApiRequest): boolean {
+        if (this.api.security === ApiSecurity.UNSECURE) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppApiManager.ts b/packages/apps-engine/src/server/managers/AppApiManager.ts
new file mode 100644
index 000000000000..03961197198a
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppApiManager.ts
@@ -0,0 +1,165 @@
+import { AppStatusUtils } from '../../definition/AppStatus';
+import { HttpStatusCode } from '../../definition/accessors';
+import type { IApi, IApiEndpointMetadata, IApiRequest, IApiResponse } from '../../definition/api';
+import type { AppManager } from '../AppManager';
+import type { ApiBridge } from '../bridges';
+import { PathAlreadyExistsError } from '../errors';
+import type { AppAccessorManager } from './AppAccessorManager';
+import { AppApi } from './AppApi';
+
+/**
+ * The api manager for the Apps.
+ *
+ * An App will add api's during their `initialize` method.
+ * Then once an App's `onEnable` is called and it returns true,
+ * only then will that App's api's be enabled.
+ */
+export class AppApiManager {
+    private readonly bridge: ApiBridge;
+
+    private readonly accessors: AppAccessorManager;
+
+    // Variable that contains the api's which have been provided by apps.
+    // The key of the top map is app id and the key of the inner map is the path
+    private providedApis: Map<string, Map<string, AppApi>>;
+
+    constructor(private readonly manager: AppManager) {
+        this.bridge = this.manager.getBridges().getApiBridge();
+        this.accessors = this.manager.getAccessorManager();
+        this.providedApis = new Map<string, Map<string, AppApi>>();
+    }
+
+    /**
+     * Adds an to *be* registered. This will *not register* it with the
+     * bridged system yet as this is only called on an App's
+     * `initialize` method and an App might not get enabled.
+     * When adding an api, it can *not* already exist in the system.
+     *
+     * @param appId the app's id which the api belongs to
+     * @param api the api to add to the system
+     */
+    public addApi(appId: string, api: IApi): void {
+        if (api.endpoints.length === 0) {
+            throw new Error('Invalid Api parameter provided, endpoints must contain, at least, one IApiEndpoint.');
+        }
+
+        const app = this.manager.getOneById(appId);
+        if (!app) {
+            throw new Error('App must exist in order for an api to be added.');
+        }
+
+        // Verify the api's path doesn't exist already
+        if (this.providedApis.get(appId)) {
+            api.endpoints.forEach((endpoint) => {
+                if (this.providedApis.get(appId).has(endpoint.path)) {
+                    throw new PathAlreadyExistsError(endpoint.path);
+                }
+            });
+        }
+
+        if (!this.providedApis.has(appId)) {
+            this.providedApis.set(appId, new Map<string, AppApi>());
+        }
+
+        api.endpoints.forEach((endpoint) => {
+            this.providedApis.get(appId).set(endpoint.path, new AppApi(app, api, endpoint));
+        });
+    }
+
+    /**
+     * Registers all of the api's for the provided app inside
+     * of the bridged system which then enables them.
+     *
+     * @param appId The app's id of which to register it's api's with the bridged system
+     */
+    public async registerApis(appId: string): Promise<void> {
+        if (!this.providedApis.has(appId)) {
+            return;
+        }
+
+        await this.bridge.doUnregisterApis(appId);
+        for await (const [, apiApp] of this.providedApis.get(appId).entries()) {
+            await this.registerApi(appId, apiApp);
+        }
+    }
+
+    /**
+     * Unregisters the api's from the system.
+     *
+     * @param appId the appId for the api's to purge
+     */
+    public async unregisterApis(appId: string): Promise<void> {
+        if (this.providedApis.has(appId)) {
+            await this.bridge.doUnregisterApis(appId);
+
+            this.providedApis.delete(appId);
+        }
+    }
+
+    /**
+     * Executes an App's api.
+     *
+     * @param appId the app which is providing the api
+     * @param path the path to be executed in app's api's
+     * @param request the request data to be evaluated byt the app
+     */
+    public async executeApi(appId: string, path: string, request: IApiRequest): Promise<IApiResponse> {
+        const api = this.providedApis.get(appId).get(path);
+
+        if (!api) {
+            return {
+                status: HttpStatusCode.NOT_FOUND,
+            };
+        }
+
+        const app = this.manager.getOneById(appId);
+
+        if (!app || AppStatusUtils.isDisabled(await app.getStatus())) {
+            // Just in case someone decides to do something they shouldn't
+            // let's ensure the app actually exists
+            return {
+                status: HttpStatusCode.NOT_FOUND,
+            };
+        }
+
+        return api.runExecutor(request, this.manager.getLogStorage(), this.accessors);
+    }
+
+    /**
+     * Return a list of api's for a certain app
+     *
+     * @param appId the app which is providing the api
+     */
+    public listApis(appId: string): Array<IApiEndpointMetadata> {
+        const apis = this.providedApis.get(appId);
+
+        if (!apis) {
+            return [];
+        }
+
+        const result = [];
+
+        for (const api of apis.values()) {
+            const metadata: IApiEndpointMetadata = {
+                path: api.endpoint.path,
+                computedPath: api.computedPath,
+                methods: api.implementedMethods,
+                examples: api.endpoint.examples || {},
+            };
+
+            result.push(metadata);
+        }
+
+        return result;
+    }
+
+    /**
+     * Actually goes and provide's the bridged system with the api information.
+     *
+     * @param appId the app which is providing the api
+     * @param info the api's registration information
+     */
+    private async registerApi(appId: string, api: AppApi): Promise<void> {
+        await this.bridge.doRegisterApi(api, appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppExternalComponentManager.ts b/packages/apps-engine/src/server/managers/AppExternalComponentManager.ts
new file mode 100644
index 000000000000..26a1b65e2296
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppExternalComponentManager.ts
@@ -0,0 +1,142 @@
+import type { IExternalComponent } from '../../definition/externalComponent';
+
+/**
+ * The external component manager for the apps.
+ *
+ * An app will register external components during its `initialize` method.
+ * Then once an app's `onEnable` method is called and it returns true,
+ * only then will that app's external components be enabled.
+ */
+export class AppExternalComponentManager {
+    /**
+     * The map that maintains all registered components.
+     * The key of the top map is app id and the key of inner map is the
+     * external component name.
+     */
+    private registeredExternalComponents: Map<string, Map<string, IExternalComponent>>;
+
+    /**
+     * Contains the apps and the external components they have touhed.
+     * The key of the top map is app id and the key of inner map is the
+     * external component name.
+     * Doesn't matter whether the app provided, modified, disabled,
+     * or enabled. As long as an app touched external components, then
+     * they are listed here.
+     */
+    private appTouchedExternalComponents: Map<string, Map<string, IExternalComponent>>;
+
+    constructor() {
+        this.registeredExternalComponents = new Map<string, Map<string, IExternalComponent>>();
+        this.appTouchedExternalComponents = new Map<string, Map<string, IExternalComponent>>();
+    }
+
+    /**
+     * Get all registered components.
+     */
+    public getRegisteredExternalComponents(): Map<string, Map<string, IExternalComponent>> {
+        return this.registeredExternalComponents;
+    }
+
+    /**
+     * Get all external components that apps have registered
+     * before, including disabled apps' external components.
+     */
+    public getAppTouchedExternalComponents(): Map<string, Map<string, IExternalComponent>> {
+        return this.appTouchedExternalComponents;
+    }
+
+    /**
+     * Get all external components of an app by specifying the appId.
+     *
+     * @param appId the id of the app
+     */
+    public getExternalComponents(appId: string): Map<string, IExternalComponent> {
+        if (this.appTouchedExternalComponents.has(appId)) {
+            return this.appTouchedExternalComponents.get(appId);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get an array of external components which are enabled and ready for usage.
+     */
+    public getProvidedComponents(): Array<IExternalComponent> {
+        const registeredExternalComponents = this.getRegisteredExternalComponents();
+        const providedComponents: Array<IExternalComponent> = [];
+
+        registeredExternalComponents.forEach((appExternalComponents) => {
+            Array.from(appExternalComponents.values()).forEach((externalComponent) => {
+                providedComponents.push(externalComponent);
+            });
+        });
+
+        return providedComponents;
+    }
+
+    /**
+     * Add an external component to the appTouchedExternalComponents.
+     * If you call this method twice and the component
+     * has the same name as before, the first one will be
+     * overwritten as the names provided **must** be unique.
+     *
+     * @param appId the id of the app
+     * @param externalComponent the external component about to be added
+     */
+    public addExternalComponent(appId: string, externalComponent: IExternalComponent): void {
+        externalComponent.appId = appId;
+
+        if (!this.appTouchedExternalComponents.get(appId)) {
+            this.appTouchedExternalComponents.set(appId, new Map(Object.entries({ [externalComponent.name]: externalComponent })));
+        } else {
+            const appExternalComponents = this.appTouchedExternalComponents.get(appId);
+
+            appExternalComponents.set(externalComponent.name, externalComponent);
+        }
+    }
+
+    /**
+     * Add enabled apps' external components from the appTouchedExternalComponents
+     * to the registeredExternalComponents.
+     *
+     * @param appId the id of the app
+     */
+    public registerExternalComponents(appId: string): void {
+        if (!this.appTouchedExternalComponents.has(appId)) {
+            return;
+        }
+        const externalComponents = this.appTouchedExternalComponents.get(appId);
+
+        if (externalComponents.size > 0) {
+            this.registeredExternalComponents.set(appId, externalComponents);
+        }
+    }
+
+    /**
+     * Remove all external components of an app from the
+     * registeredExternalComponents by specifying the appId.
+     *
+     * @param appId the id of the app
+     */
+    public unregisterExternalComponents(appId: string): void {
+        if (this.registeredExternalComponents.has(appId)) {
+            this.registeredExternalComponents.delete(appId);
+        }
+    }
+
+    /**
+     * Remove all external components of an app from both the
+     * registeredExternalComponents and the appTouchedComponents
+     * by specifying the appId.
+     *
+     * @param appId the id of the app
+     */
+    public purgeExternalComponents(appId: string): void {
+        if (this.appTouchedExternalComponents.has(appId)) {
+            this.appTouchedExternalComponents.delete(appId);
+        }
+        if (this.registeredExternalComponents.has(appId)) {
+            this.registeredExternalComponents.delete(appId);
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppLicenseManager.ts b/packages/apps-engine/src/server/managers/AppLicenseManager.ts
new file mode 100644
index 000000000000..7ac6ea677b78
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppLicenseManager.ts
@@ -0,0 +1,91 @@
+import type { AppManager } from '../AppManager';
+import type { UserBridge } from '../bridges';
+import type { IInternalUserBridge } from '../bridges/IInternalUserBridge';
+import { InvalidLicenseError } from '../errors';
+import type { IMarketplaceInfo } from '../marketplace';
+import { MarketplacePurchaseType } from '../marketplace/MarketplacePurchaseType';
+import { Crypto } from '../marketplace/license';
+import type { AppLicenseValidationResult } from '../marketplace/license';
+
+enum LicenseVersion {
+    v1 = 1,
+}
+
+export class AppLicenseManager {
+    private readonly crypto: Crypto;
+
+    private readonly userBridge: UserBridge;
+
+    constructor(private readonly manager: AppManager) {
+        this.crypto = new Crypto(this.manager.getBridges().getInternalBridge());
+        this.userBridge = this.manager.getBridges().getUserBridge();
+    }
+
+    public async validate(validationResult: AppLicenseValidationResult, appMarketplaceInfo?: IMarketplaceInfo): Promise<void> {
+        if (!appMarketplaceInfo || appMarketplaceInfo.purchaseType !== MarketplacePurchaseType.PurchaseTypeSubscription) {
+            return;
+        }
+
+        validationResult.setValidated(true);
+
+        const encryptedLicense = appMarketplaceInfo.subscriptionInfo.license.license;
+
+        if (!encryptedLicense) {
+            validationResult.addError('license', 'License for app is invalid');
+
+            throw new InvalidLicenseError(validationResult);
+        }
+
+        let license;
+        try {
+            license = (await this.crypto.decryptLicense(encryptedLicense)) as any;
+        } catch (err) {
+            validationResult.addError('publicKey', err.message);
+
+            throw new InvalidLicenseError(validationResult);
+        }
+
+        switch (license.version) {
+            case LicenseVersion.v1:
+                await this.validateV1(appMarketplaceInfo, license, validationResult);
+                break;
+        }
+    }
+
+    private async validateV1(appMarketplaceInfo: IMarketplaceInfo, license: any, validationResult: AppLicenseValidationResult): Promise<void> {
+        if (license.isBundle && (!appMarketplaceInfo.bundledIn || !appMarketplaceInfo.bundledIn.find((value) => value.bundleId === license.appId))) {
+            validationResult.addError('bundle', 'License issued for a bundle that does not contain the app');
+        } else if (!license.isBundle && license.appId !== appMarketplaceInfo.id) {
+            validationResult.addError('appId', `License hasn't been issued for this app`);
+        }
+
+        const renewal = new Date(license.renewalDate);
+        const expire = new Date(license.expireDate);
+        const now = new Date();
+
+        if (expire < now) {
+            validationResult.addError('expire', 'License is no longer valid and needs to be renewed');
+        }
+
+        const currentActiveUsers = await (this.userBridge as UserBridge & IInternalUserBridge).getActiveUserCount();
+
+        if (license.maxSeats < currentActiveUsers) {
+            validationResult.addError('maxSeats', 'License does not accomodate the current amount of active users. Please increase the number of seats');
+        }
+
+        if (validationResult.hasErrors) {
+            throw new InvalidLicenseError(validationResult);
+        }
+
+        if (renewal < now) {
+            validationResult.addWarning('renewal', 'License has expired and needs to be renewed');
+        }
+
+        if (license.seats < currentActiveUsers) {
+            validationResult.addWarning(
+                'seats',
+                'License does not have enough seats to accommodate the current amount of active users. Please increase the number of seats',
+            );
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppListenerManager.ts b/packages/apps-engine/src/server/managers/AppListenerManager.ts
new file mode 100644
index 000000000000..40c1a78725ed
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppListenerManager.ts
@@ -0,0 +1,1220 @@
+import type { IEmailDescriptor, IPreEmailSentContext } from '../../definition/email';
+import { EssentialAppDisabledException } from '../../definition/exceptions';
+import type { IExternalComponent } from '../../definition/externalComponent';
+import type { ILivechatEventContext, ILivechatRoom, ILivechatTransferEventContext, IVisitor } from '../../definition/livechat';
+import type {
+    IMessage,
+    IMessageDeleteContext,
+    IMessageFollowContext,
+    IMessagePinContext,
+    IMessageReactionContext,
+    IMessageReportContext,
+    IMessageStarContext,
+} from '../../definition/messages';
+import { AppInterface, AppMethod } from '../../definition/metadata';
+import type { IRoom, IRoomUserJoinedContext, IRoomUserLeaveContext } from '../../definition/rooms';
+import { RoomType } from '../../definition/rooms';
+import { UIActionButtonContext } from '../../definition/ui';
+import type { IUIKitResponse, IUIKitSurface, UIKitIncomingInteraction } from '../../definition/uikit';
+import { UIKitIncomingInteractionType } from '../../definition/uikit';
+import { isUIKitIncomingInteractionActionButtonMessageBox } from '../../definition/uikit/IUIKitIncomingInteractionActionButton';
+import type {
+    IUIKitIncomingInteractionMessageContainer,
+    IUIKitIncomingInteractionModalContainer,
+} from '../../definition/uikit/UIKitIncomingInteractionContainer';
+import type { IUIKitLivechatIncomingInteraction } from '../../definition/uikit/livechat';
+import { UIKitLivechatBlockInteractionContext } from '../../definition/uikit/livechat';
+import type { IFileUploadContext } from '../../definition/uploads/IFileUploadContext';
+import type { IUser, IUserContext, IUserStatusContext, IUserUpdateContext } from '../../definition/users';
+import type { AppManager } from '../AppManager';
+import type { ProxiedApp } from '../ProxiedApp';
+import { Utilities } from '../misc/Utilities';
+import { JSONRPC_METHOD_NOT_FOUND } from '../runtime/deno/AppsEngineDenoRuntime';
+import type { AppAccessorManager } from './AppAccessorManager';
+
+interface IListenerExecutor {
+    [AppInterface.IPreMessageSentPrevent]: {
+        args: [IMessage];
+        result: boolean;
+    };
+    [AppInterface.IPreMessageSentExtend]: {
+        args: [IMessage];
+        result: IMessage;
+    };
+    [AppInterface.IPreMessageSentModify]: {
+        args: [IMessage];
+        result: IMessage;
+    };
+    [AppInterface.IPostMessageSent]: {
+        args: [IMessage];
+        result: void;
+    };
+    [AppInterface.IPreMessageDeletePrevent]: {
+        args: [IMessage];
+        result: boolean;
+    };
+    [AppInterface.IPostMessageDeleted]: {
+        args: [IMessageDeleteContext];
+        result: void;
+    };
+    [AppInterface.IPreMessageUpdatedPrevent]: {
+        args: [IMessage];
+        result: unknown;
+    };
+    [AppInterface.IPreMessageUpdatedExtend]: {
+        args: [IMessage];
+        result: boolean;
+    };
+    [AppInterface.IPreMessageUpdatedModify]: {
+        args: [IMessage];
+        result: IMessage;
+    };
+    [AppInterface.IPostMessageUpdated]: {
+        args: [IMessage];
+        result: IMessage;
+    };
+    [AppInterface.IPostMessageReacted]: {
+        args: [IMessageReactionContext];
+        result: void;
+    };
+    [AppInterface.IPostMessageFollowed]: {
+        args: [IMessageFollowContext];
+        result: void;
+    };
+    [AppInterface.IPostMessagePinned]: {
+        args: [IMessagePinContext];
+        result: void;
+    };
+    [AppInterface.IPostMessageStarred]: {
+        args: [IMessageStarContext];
+        result: void;
+    };
+    [AppInterface.IPostMessageReported]: {
+        args: [IMessageReportContext];
+        result: void;
+    };
+    // Rooms
+    [AppInterface.IPreRoomCreatePrevent]: {
+        args: [IRoom];
+        result: boolean;
+    };
+    [AppInterface.IPreRoomCreateExtend]: {
+        args: [IRoom];
+        result: IRoom;
+    };
+    [AppInterface.IPreRoomCreateModify]: {
+        args: [IRoom];
+        result: IRoom;
+    };
+    [AppInterface.IPostRoomCreate]: {
+        args: [IRoom];
+        result: void;
+    };
+    [AppInterface.IPreRoomDeletePrevent]: {
+        args: [IRoom];
+        result: boolean;
+    };
+    [AppInterface.IPostRoomDeleted]: {
+        args: [IRoom];
+        result: void;
+    };
+    [AppInterface.IPreRoomUserJoined]: {
+        args: [IRoomUserJoinedContext];
+        result: void;
+    };
+    [AppInterface.IPostRoomUserJoined]: {
+        args: [IRoomUserJoinedContext];
+        result: void;
+    };
+    [AppInterface.IPreRoomUserLeave]: {
+        args: [IRoomUserLeaveContext];
+        result: void;
+    };
+    [AppInterface.IPostRoomUserLeave]: {
+        args: [IRoomUserLeaveContext];
+        result: void;
+    };
+    // External Components
+    [AppInterface.IPostExternalComponentOpened]: {
+        args: [IExternalComponent];
+        result: void;
+    };
+    [AppInterface.IPostExternalComponentClosed]: {
+        args: [IExternalComponent];
+        result: void;
+    };
+    [AppInterface.IUIKitInteractionHandler]: {
+        args: [UIKitIncomingInteraction];
+        result: IUIKitResponse;
+    };
+    [AppInterface.IUIKitLivechatInteractionHandler]: {
+        args: [IUIKitLivechatIncomingInteraction];
+        result: IUIKitResponse;
+    };
+    // Livechat
+    [AppInterface.IPostLivechatRoomStarted]: {
+        args: [ILivechatRoom];
+        result: void;
+    };
+    /**
+     * @deprecated please prefer the AppInterface.IPostLivechatRoomClosed event
+     */
+    [AppInterface.ILivechatRoomClosedHandler]: {
+        args: [ILivechatRoom];
+        result: void;
+    };
+    [AppInterface.IPostLivechatRoomClosed]: {
+        args: [ILivechatRoom];
+        result: void;
+    };
+    [AppInterface.IPostLivechatRoomSaved]: {
+        args: [ILivechatRoom];
+        result: void;
+    };
+    [AppInterface.IPostLivechatAgentAssigned]: {
+        args: [ILivechatEventContext];
+        result: void;
+    };
+    [AppInterface.IPostLivechatAgentUnassigned]: {
+        args: [ILivechatEventContext];
+        result: void;
+    };
+    [AppInterface.IPostLivechatRoomTransferred]: {
+        args: [ILivechatTransferEventContext];
+        result: void;
+    };
+    [AppInterface.IPostLivechatGuestSaved]: {
+        args: [IVisitor];
+        result: void;
+    };
+    // FileUpload
+    [AppInterface.IPreFileUpload]: {
+        args: [IFileUploadContext];
+        result: void;
+    };
+    // Email
+    [AppInterface.IPreEmailSent]: {
+        args: [IPreEmailSentContext];
+        result: IUIKitResponse;
+    };
+    // User
+    [AppInterface.IPostUserCreated]: {
+        args: [IUserContext];
+        result: void;
+    };
+    [AppInterface.IPostUserUpdated]: {
+        args: [IUserContext];
+        result: void;
+    };
+    [AppInterface.IPostUserDeleted]: {
+        args: [IUserContext];
+        result: void;
+    };
+    [AppInterface.IPostUserLoggedIn]: {
+        args: [IUser];
+        result: void;
+    };
+    [AppInterface.IPostUserLoggedOut]: {
+        args: [IUser];
+        result: void;
+    };
+    [AppInterface.IPostUserStatusChanged]: {
+        args: [IUserStatusContext];
+        result: void;
+    };
+}
+
+// type EventReturn = void | boolean | IMessage | IRoom | IUser | IUIKitResponse | ILivechatRoom | IEmailDescriptor;
+
+export class AppListenerManager {
+    private am: AppAccessorManager;
+
+    private listeners: Map<string, Array<string>>;
+
+    private defaultHandlers = new Map<string, any>();
+
+    /**
+     * Locked events are those who are listed in an app's
+     * "essentials" list but the app is disabled.
+     *
+     * They will throw a EssentialAppDisabledException upon call
+     */
+    private lockedEvents: Map<string, Set<string>>;
+
+    constructor(private readonly manager: AppManager) {
+        this.am = manager.getAccessorManager();
+        this.listeners = new Map<string, Array<string>>();
+        this.lockedEvents = new Map<string, Set<string>>();
+
+        Object.keys(AppInterface).forEach((intt) => {
+            this.listeners.set(intt, []);
+            this.lockedEvents.set(intt, new Set<string>());
+        });
+
+        this.defaultHandlers.set('executeViewClosedHandler', { success: true });
+    }
+
+    public registerListeners(app: ProxiedApp): void {
+        this.unregisterListeners(app);
+
+        Object.entries(app.getImplementationList()).forEach(([event, isImplemented]) => {
+            if (!isImplemented) {
+                return;
+            }
+
+            this.listeners.get(event).push(app.getID());
+        });
+    }
+
+    public unregisterListeners(app: ProxiedApp): void {
+        this.listeners.forEach((apps, int) => {
+            if (apps.includes(app.getID())) {
+                const where = apps.indexOf(app.getID());
+                this.listeners.get(int).splice(where, 1);
+            }
+        });
+    }
+
+    public releaseEssentialEvents(app: ProxiedApp): void {
+        if (!app.getEssentials()) {
+            return;
+        }
+
+        app.getEssentials().forEach((event) => {
+            const lockedEvent = this.lockedEvents.get(event);
+
+            if (!lockedEvent) {
+                return;
+            }
+
+            lockedEvent.delete(app.getID());
+        });
+    }
+
+    public lockEssentialEvents(app: ProxiedApp): void {
+        if (!app.getEssentials()) {
+            return;
+        }
+
+        app.getEssentials().forEach((event) => {
+            const lockedEvent = this.lockedEvents.get(event);
+
+            if (!lockedEvent) {
+                return;
+            }
+
+            lockedEvent.add(app.getID());
+        });
+    }
+
+    public getListeners(int: AppInterface): Array<ProxiedApp> {
+        const results: Array<ProxiedApp> = [];
+
+        for (const appId of this.listeners.get(int)) {
+            results.push(this.manager.getOneById(appId));
+        }
+
+        return results;
+    }
+
+    public isEventBlocked(event: AppInterface): boolean {
+        const lockedEventList = this.lockedEvents.get(event);
+
+        return !!(lockedEventList && lockedEventList.size);
+    }
+
+    public async executeListener<I extends keyof IListenerExecutor>(int: I, data: IListenerExecutor[I]['args'][0]): Promise<IListenerExecutor[I]['result']> {
+        if (this.isEventBlocked(int)) {
+            throw new EssentialAppDisabledException('There is one or more apps that are essential to this event but are disabled');
+        }
+
+        switch (int) {
+            // Messages
+            case AppInterface.IPreMessageSentPrevent:
+                return this.executePreMessageSentPrevent(data as IMessage);
+            case AppInterface.IPreMessageSentExtend:
+                return this.executePreMessageSentExtend(data as IMessage);
+            case AppInterface.IPreMessageSentModify:
+                return this.executePreMessageSentModify(data as IMessage);
+            case AppInterface.IPostMessageSent:
+                this.executePostMessageSent(data as IMessage);
+                return;
+            case AppInterface.IPreMessageDeletePrevent:
+                return this.executePreMessageDeletePrevent(data as IMessage);
+            case AppInterface.IPostMessageDeleted:
+                this.executePostMessageDelete(data as IMessageDeleteContext);
+                return;
+            case AppInterface.IPreMessageUpdatedPrevent:
+                return this.executePreMessageUpdatedPrevent(data as IMessage);
+            case AppInterface.IPreMessageUpdatedExtend:
+                return this.executePreMessageUpdatedExtend(data as IMessage);
+            case AppInterface.IPreMessageUpdatedModify:
+                return this.executePreMessageUpdatedModify(data as IMessage);
+            case AppInterface.IPostMessageUpdated:
+                this.executePostMessageUpdated(data as IMessage);
+                return;
+            case AppInterface.IPostMessageReacted:
+                return this.executePostMessageReacted(data as IMessageReactionContext);
+            case AppInterface.IPostMessageFollowed:
+                return this.executePostMessageFollowed(data as IMessageFollowContext);
+            case AppInterface.IPostMessagePinned:
+                return this.executePostMessagePinned(data as IMessagePinContext);
+            case AppInterface.IPostMessageStarred:
+                return this.executePostMessageStarred(data as IMessageStarContext);
+            case AppInterface.IPostMessageReported:
+                return this.executePostMessageReported(data as IMessageReportContext);
+            // Rooms
+            case AppInterface.IPreRoomCreatePrevent:
+                return this.executePreRoomCreatePrevent(data as IRoom);
+            case AppInterface.IPreRoomCreateExtend:
+                return this.executePreRoomCreateExtend(data as IRoom);
+            case AppInterface.IPreRoomCreateModify:
+                return this.executePreRoomCreateModify(data as IRoom);
+            case AppInterface.IPostRoomCreate:
+                this.executePostRoomCreate(data as IRoom);
+                return;
+            case AppInterface.IPreRoomDeletePrevent:
+                return this.executePreRoomDeletePrevent(data as IRoom);
+            case AppInterface.IPostRoomDeleted:
+                this.executePostRoomDeleted(data as IRoom);
+                return;
+            case AppInterface.IPreRoomUserJoined:
+                return this.executePreRoomUserJoined(data as IRoomUserJoinedContext);
+            case AppInterface.IPostRoomUserJoined:
+                return this.executePostRoomUserJoined(data as IRoomUserJoinedContext);
+            case AppInterface.IPreRoomUserLeave:
+                return this.executePreRoomUserLeave(data as IRoomUserLeaveContext);
+            case AppInterface.IPostRoomUserLeave:
+                return this.executePostRoomUserLeave(data as IRoomUserLeaveContext);
+            // External Components
+            case AppInterface.IPostExternalComponentOpened:
+                this.executePostExternalComponentOpened(data as IExternalComponent);
+                return;
+            case AppInterface.IPostExternalComponentClosed:
+                this.executePostExternalComponentClosed(data as IExternalComponent);
+                return;
+            case AppInterface.IUIKitInteractionHandler:
+                return this.executeUIKitInteraction(data as UIKitIncomingInteraction);
+            case AppInterface.IUIKitLivechatInteractionHandler:
+                return this.executeUIKitLivechatInteraction(data as IUIKitLivechatIncomingInteraction);
+            // Livechat
+            case AppInterface.IPostLivechatRoomStarted:
+                return this.executePostLivechatRoomStarted(data as ILivechatRoom);
+            /**
+             * @deprecated please prefer the AppInterface.IPostLivechatRoomClosed event
+             */
+            case AppInterface.ILivechatRoomClosedHandler:
+                return this.executeLivechatRoomClosedHandler(data as ILivechatRoom);
+            case AppInterface.IPostLivechatRoomClosed:
+                return this.executePostLivechatRoomClosed(data as ILivechatRoom);
+            case AppInterface.IPostLivechatRoomSaved:
+                return this.executePostLivechatRoomSaved(data as ILivechatRoom);
+            case AppInterface.IPostLivechatAgentAssigned:
+                return this.executePostLivechatAgentAssigned(data as ILivechatEventContext);
+            case AppInterface.IPostLivechatAgentUnassigned:
+                return this.executePostLivechatAgentUnassigned(data as ILivechatEventContext);
+            case AppInterface.IPostLivechatRoomTransferred:
+                return this.executePostLivechatRoomTransferred(data as ILivechatTransferEventContext);
+            case AppInterface.IPostLivechatGuestSaved:
+                return this.executePostLivechatGuestSaved(data as IVisitor);
+            // FileUpload
+            case AppInterface.IPreFileUpload:
+                return this.executePreFileUpload(data as IFileUploadContext);
+            // Email
+            case AppInterface.IPreEmailSent:
+                return this.executePreEmailSent(data as IPreEmailSentContext);
+            // User
+            case AppInterface.IPostUserCreated:
+                return this.executePostUserCreated(data as IUserContext);
+            case AppInterface.IPostUserUpdated:
+                return this.executePostUserUpdated(data as IUserContext);
+            case AppInterface.IPostUserDeleted:
+                return this.executePostUserDeleted(data as IUserContext);
+            case AppInterface.IPostUserLoggedIn:
+                return this.executePostUserLoggedIn(data as IUser);
+            case AppInterface.IPostUserLoggedOut:
+                return this.executePostUserLoggedOut(data as IUser);
+            case AppInterface.IPostUserStatusChanged:
+                return this.executePostUserStatusChanged(data as IUserStatusContext);
+            default:
+                console.warn('An invalid listener was called');
+        }
+    }
+
+    // Messages
+    private async executePreMessageSentPrevent(data: IMessage): Promise<boolean> {
+        let prevented = false;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageSentPrevent)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGESENTPREVENT, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (!continueOn) {
+                continue;
+            }
+
+            prevented = (await app.call(AppMethod.EXECUTEPREMESSAGESENTPREVENT, data)) as boolean;
+
+            if (prevented) {
+                return prevented;
+            }
+        }
+
+        return prevented;
+    }
+
+    private async executePreMessageSentExtend(data: IMessage): Promise<IMessage> {
+        let msg = data;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageSentExtend)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGESENTEXTEND, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                msg = await app.call(AppMethod.EXECUTEPREMESSAGESENTEXTEND, msg);
+            }
+        }
+
+        return msg;
+    }
+
+    private async executePreMessageSentModify(data: IMessage): Promise<IMessage> {
+        let msg = data;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageSentModify)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGESENTMODIFY, msg).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                msg = (await app.call(AppMethod.EXECUTEPREMESSAGESENTMODIFY, msg)) as IMessage;
+            }
+        }
+
+        return msg;
+    }
+
+    private async executePostMessageSent(data: IMessage): Promise<void> {
+        // First check if the app implements Bot DM handlers and check if the dm contains more than one user
+        if (data.room.type === RoomType.DIRECT_MESSAGE && data.room.userIds.length > 1) {
+            for (const appId of this.listeners.get(AppInterface.IPostMessageSentToBot)) {
+                const app = this.manager.getOneById(appId);
+
+                const reader = this.am.getReader(appId);
+                const bot = await reader.getUserReader().getAppUser();
+                if (!bot) {
+                    continue;
+                }
+
+                // if the sender is the bot just ignore it
+
+                if (bot.id === data.sender.id) {
+                    continue;
+                }
+                // if the user doesnt belong to the room ignore it
+                if (!data.room.userIds.includes(bot.id)) {
+                    continue;
+                }
+
+                await app.call(AppMethod.EXECUTEPOSTMESSAGESENTTOBOT, data);
+            }
+        }
+
+        for (const appId of this.listeners.get(AppInterface.IPostMessageSent)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPOSTMESSAGESENT, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                await app.call(AppMethod.EXECUTEPOSTMESSAGESENT, data);
+            }
+        }
+    }
+
+    private async executePreMessageDeletePrevent(data: IMessage): Promise<boolean> {
+        let prevented = false;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageDeletePrevent)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGEDELETEPREVENT, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                prevented = (await app.call(AppMethod.EXECUTEPREMESSAGEDELETEPREVENT, data)) as boolean;
+
+                if (prevented) {
+                    return prevented;
+                }
+            }
+        }
+
+        return prevented;
+    }
+
+    private async executePostMessageDelete(data: IMessageDeleteContext): Promise<void> {
+        const context = Utilities.deepCloneAndFreeze(data);
+        const { message } = context;
+
+        for (const appId of this.listeners.get(AppInterface.IPostMessageDeleted)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app
+                .call(
+                    AppMethod.CHECKPOSTMESSAGEDELETED,
+                    // `context` has more information about the event, but
+                    // we had to keep this `message` here for compatibility
+                    message,
+                    context,
+                )
+                .catch((error) => {
+                    // This method is optional, so if it doesn't exist, we should continue
+                    if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                        return true;
+                    }
+
+                    throw error;
+                })) as boolean;
+
+            if (continueOn) {
+                await app.call(AppMethod.EXECUTEPOSTMESSAGEDELETED, message, context);
+            }
+        }
+    }
+
+    private async executePreMessageUpdatedPrevent(data: IMessage): Promise<boolean> {
+        let prevented = false;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageUpdatedPrevent)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGEUPDATEDPREVENT, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                prevented = (await app.call(AppMethod.EXECUTEPREMESSAGEUPDATEDPREVENT, data)) as boolean;
+
+                if (prevented) {
+                    return prevented;
+                }
+            }
+        }
+
+        return prevented;
+    }
+
+    private async executePreMessageUpdatedExtend(data: IMessage): Promise<IMessage> {
+        let msg = data;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageUpdatedExtend)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGEUPDATEDEXTEND, msg).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                msg = await app.call(AppMethod.EXECUTEPREMESSAGEUPDATEDEXTEND, msg);
+            }
+        }
+
+        return msg;
+    }
+
+    private async executePreMessageUpdatedModify(data: IMessage): Promise<IMessage> {
+        let msg = data;
+
+        for (const appId of this.listeners.get(AppInterface.IPreMessageUpdatedModify)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREMESSAGEUPDATEDMODIFY, msg).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                msg = (await app.call(AppMethod.EXECUTEPREMESSAGEUPDATEDMODIFY, msg)) as IMessage;
+            }
+        }
+
+        return msg;
+    }
+
+    private async executePostMessageUpdated(data: IMessage): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostMessageUpdated)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPOSTMESSAGEUPDATED, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                await app.call(AppMethod.EXECUTEPOSTMESSAGEUPDATED, data);
+            }
+        }
+    }
+
+    // Rooms
+    private async executePreRoomCreatePrevent(data: IRoom): Promise<boolean> {
+        let prevented = false;
+
+        for (const appId of this.listeners.get(AppInterface.IPreRoomCreatePrevent)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREROOMCREATEPREVENT, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                prevented = (await app.call(AppMethod.EXECUTEPREROOMCREATEPREVENT, data)) as boolean;
+
+                if (prevented) {
+                    return prevented;
+                }
+            }
+        }
+
+        return prevented;
+    }
+
+    private async executePreRoomCreateExtend(data: IRoom): Promise<IRoom> {
+        let room = data;
+
+        for (const appId of this.listeners.get(AppInterface.IPreRoomCreateExtend)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREROOMCREATEEXTEND, room).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                room = await app.call(AppMethod.EXECUTEPREROOMCREATEEXTEND, room);
+            }
+        }
+
+        return room;
+    }
+
+    private async executePreRoomCreateModify(data: IRoom): Promise<IRoom> {
+        let room = data;
+
+        for (const appId of this.listeners.get(AppInterface.IPreRoomCreateModify)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREROOMCREATEMODIFY, room).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                room = (await app.call(AppMethod.EXECUTEPREROOMCREATEMODIFY, room)) as IRoom;
+            }
+        }
+
+        return data;
+    }
+
+    private async executePostRoomCreate(data: IRoom): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostRoomCreate)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPOSTROOMCREATE, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                await app.call(AppMethod.EXECUTEPOSTROOMCREATE, data);
+            }
+        }
+    }
+
+    private async executePreRoomDeletePrevent(data: IRoom): Promise<boolean> {
+        let prevented = false;
+
+        for (const appId of this.listeners.get(AppInterface.IPreRoomDeletePrevent)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPREROOMDELETEPREVENT, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                prevented = (await app.call(AppMethod.EXECUTEPREROOMDELETEPREVENT, data)) as boolean;
+
+                if (prevented) {
+                    return prevented;
+                }
+            }
+        }
+
+        return prevented;
+    }
+
+    private async executePostRoomDeleted(data: IRoom): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostRoomDeleted)) {
+            const app = this.manager.getOneById(appId);
+
+            const continueOn = (await app.call(AppMethod.CHECKPOSTROOMDELETED, data).catch((error) => {
+                // This method is optional, so if it doesn't exist, we should continue
+                if (error?.code === JSONRPC_METHOD_NOT_FOUND) {
+                    return true;
+                }
+
+                throw error;
+            })) as boolean;
+
+            if (continueOn) {
+                await app.call(AppMethod.EXECUTEPOSTROOMDELETED, data);
+            }
+        }
+    }
+
+    private async executePreRoomUserJoined(externalData: IRoomUserJoinedContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPreRoomUserJoined)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_PRE_ROOM_USER_JOINED, externalData);
+        }
+    }
+
+    private async executePostRoomUserJoined(externalData: IRoomUserJoinedContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostRoomUserJoined)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_ROOM_USER_JOINED, externalData);
+        }
+    }
+
+    private async executePreRoomUserLeave(externalData: IRoomUserLeaveContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPreRoomUserLeave)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_PRE_ROOM_USER_LEAVE, externalData);
+        }
+    }
+
+    private async executePostRoomUserLeave(externalData: IRoomUserLeaveContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostRoomUserLeave)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_ROOM_USER_LEAVE, externalData);
+        }
+    }
+
+    // External Components
+    private async executePostExternalComponentOpened(data: IExternalComponent): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostExternalComponentOpened)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTEPOSTEXTERNALCOMPONENTOPENED, data);
+        }
+    }
+
+    private async executePostExternalComponentClosed(data: IExternalComponent): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostExternalComponentClosed)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTEPOSTEXTERNALCOMPONENTCLOSED, data);
+        }
+    }
+
+    private async executeUIKitInteraction(data: UIKitIncomingInteraction): Promise<IUIKitResponse> {
+        const { appId } = data;
+
+        const app = this.manager.getOneById(appId);
+        const handleError = (method: string) => (error: unknown) => {
+            if ((error as Record<string, number>)?.code === JSONRPC_METHOD_NOT_FOUND) {
+                if (this.defaultHandlers.has(method)) {
+                    console.warn(
+                        `App ${appId} triggered an interaction but it doesn't exist or doesn't have method ${method}. Falling back to default handler.`,
+                    );
+                    return this.defaultHandlers.get(method);
+                }
+
+                console.warn(
+                    `App ${appId} triggered an interaction but it doesn't exist or doesn't have method ${method} and there is no default handler for it.`,
+                );
+                return;
+            }
+
+            throw error;
+        };
+
+        const { actionId, user, triggerId } = data;
+
+        switch (data.type) {
+            case UIKitIncomingInteractionType.BLOCK: {
+                const method = 'executeBlockActionHandler';
+                const { value, blockId } = data.payload as { value: string; blockId: string };
+
+                return app
+                    .call(method, {
+                        appId,
+                        actionId,
+                        blockId,
+                        user,
+                        room: data.room,
+                        triggerId,
+                        value,
+                        message: data.message,
+                        container: data.container,
+                    })
+                    .catch(handleError(method));
+            }
+            case UIKitIncomingInteractionType.VIEW_SUBMIT: {
+                const method = 'executeViewSubmitHandler';
+                const { view } = data.payload as { view: IUIKitSurface };
+
+                return app
+                    .call(method, {
+                        appId,
+                        actionId,
+                        view,
+                        room: data.room,
+                        triggerId,
+                        user,
+                    })
+                    .catch(handleError(method));
+            }
+            case UIKitIncomingInteractionType.VIEW_CLOSED: {
+                const method = 'executeViewClosedHandler';
+                const { view, isCleared } = data.payload as { view: IUIKitSurface; isCleared: boolean };
+
+                return app
+                    .call(method, {
+                        appId,
+                        actionId,
+                        view,
+                        room: data.room,
+                        isCleared,
+                        user,
+                    })
+                    .catch(handleError(method));
+            }
+            case 'actionButton': {
+                const method = 'executeActionButtonHandler';
+
+                if (isUIKitIncomingInteractionActionButtonMessageBox(data)) {
+                    return app
+                        .call(method, {
+                            appId,
+                            actionId,
+                            buttonContext: UIActionButtonContext.MESSAGE_BOX_ACTION,
+                            room: data.room,
+                            triggerId,
+                            user,
+                            threadId: data.tmid,
+                            ...('message' in data.payload && { text: data.payload.message }),
+                        })
+                        .catch(handleError(method));
+                }
+
+                return app
+                    .call(method, {
+                        appId,
+                        actionId,
+                        triggerId,
+                        buttonContext: data.payload.context as UIActionButtonContext,
+                        room: ('room' in data && data.room) || undefined,
+                        user,
+                        ...('message' in data && { message: data.message }),
+                    })
+                    .catch(handleError(method));
+            }
+        }
+    }
+
+    private async executeUIKitLivechatInteraction(data: IUIKitLivechatIncomingInteraction): Promise<IUIKitResponse> {
+        const { appId, type } = data;
+
+        const method = ((interactionType: string) => {
+            switch (interactionType) {
+                case UIKitIncomingInteractionType.BLOCK:
+                    return AppMethod.UIKIT_LIVECHAT_BLOCK_ACTION;
+            }
+        })(type);
+
+        const app = this.manager.getOneById(appId);
+
+        const interactionContext = ((interactionType: UIKitIncomingInteractionType, interactionData: IUIKitLivechatIncomingInteraction) => {
+            const { actionId, message, visitor, room, triggerId, container } = interactionData;
+
+            switch (interactionType) {
+                case UIKitIncomingInteractionType.BLOCK: {
+                    const { value, blockId } = interactionData.payload as { value: string; blockId: string };
+
+                    return new UIKitLivechatBlockInteractionContext({
+                        appId,
+                        actionId,
+                        blockId,
+                        visitor,
+                        room,
+                        triggerId,
+                        value,
+                        message,
+                        container: container as IUIKitIncomingInteractionModalContainer | IUIKitIncomingInteractionMessageContainer,
+                    });
+                }
+            }
+        })(type, data);
+
+        return app.call(method, interactionContext);
+    }
+
+    // Livechat
+    private async executePostLivechatRoomStarted(data: ILivechatRoom): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatRoomStarted)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_ROOM_STARTED, data);
+        }
+    }
+
+    private async executeLivechatRoomClosedHandler(data: ILivechatRoom): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.ILivechatRoomClosedHandler)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_LIVECHAT_ROOM_CLOSED_HANDLER, data);
+        }
+    }
+
+    private async executePostLivechatRoomClosed(data: ILivechatRoom): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatRoomClosed)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_ROOM_CLOSED, data);
+        }
+    }
+
+    private async executePostLivechatAgentAssigned(data: ILivechatEventContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatAgentAssigned)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_AGENT_ASSIGNED, data);
+        }
+    }
+
+    private async executePostLivechatAgentUnassigned(data: ILivechatEventContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatAgentUnassigned)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_AGENT_UNASSIGNED, data);
+        }
+    }
+
+    private async executePostLivechatRoomTransferred(data: ILivechatTransferEventContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatRoomTransferred)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_ROOM_TRANSFERRED, data);
+        }
+    }
+
+    private async executePostLivechatGuestSaved(data: IVisitor): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatGuestSaved)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_GUEST_SAVED, data);
+        }
+    }
+
+    private async executePostLivechatRoomSaved(data: ILivechatRoom): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostLivechatRoomSaved)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_LIVECHAT_ROOM_SAVED, data);
+        }
+    }
+
+    // FileUpload
+    private async executePreFileUpload(data: IFileUploadContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPreFileUpload)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_PRE_FILE_UPLOAD, data);
+        }
+    }
+
+    private async executePreEmailSent(data: IPreEmailSentContext): Promise<IEmailDescriptor> {
+        let descriptor = data.email;
+
+        for (const appId of this.listeners.get(AppInterface.IPreEmailSent)) {
+            const app = this.manager.getOneById(appId);
+
+            descriptor = await app.call(AppMethod.EXECUTE_PRE_EMAIL_SENT, {
+                context: data.context,
+                email: descriptor,
+            });
+        }
+
+        return descriptor;
+    }
+
+    private async executePostMessageReacted(data: IMessageReactionContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostMessageReacted)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_MESSAGE_REACTED, data);
+        }
+    }
+
+    private async executePostMessageFollowed(data: IMessageFollowContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostMessageFollowed)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_MESSAGE_FOLLOWED, data);
+        }
+    }
+
+    private async executePostMessagePinned(data: IMessagePinContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostMessagePinned)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_MESSAGE_PINNED, data);
+        }
+    }
+
+    private async executePostMessageStarred(data: IMessageStarContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostMessageStarred)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_MESSAGE_STARRED, data);
+        }
+    }
+
+    private async executePostMessageReported(data: IMessageReportContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostMessageReported)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_MESSAGE_REPORTED, data);
+        }
+    }
+
+    private async executePostUserCreated(data: IUserContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostUserCreated)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_USER_CREATED, data);
+        }
+    }
+
+    private async executePostUserUpdated(data: IUserUpdateContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostUserUpdated)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_USER_UPDATED, data);
+        }
+    }
+
+    private async executePostUserDeleted(data: IUserContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostUserDeleted)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_USER_DELETED, data);
+        }
+    }
+
+    private async executePostUserLoggedIn(data: IUser): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostUserLoggedIn)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_USER_LOGGED_IN, data);
+        }
+    }
+
+    private async executePostUserLoggedOut(data: IUser): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostUserLoggedOut)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_USER_LOGGED_OUT, data);
+        }
+    }
+
+    private async executePostUserStatusChanged(data: IUserStatusContext): Promise<void> {
+        for (const appId of this.listeners.get(AppInterface.IPostUserStatusChanged)) {
+            const app = this.manager.getOneById(appId);
+
+            await app.call(AppMethod.EXECUTE_POST_USER_STATUS_CHANGED, data);
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppPermissionManager.ts b/packages/apps-engine/src/server/managers/AppPermissionManager.ts
new file mode 100644
index 000000000000..6e9afb3120a5
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppPermissionManager.ts
@@ -0,0 +1,40 @@
+import type { IPermission } from '../../definition/permissions/IPermission';
+import { getPermissionsByAppId } from '../AppManager';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { APPS_ENGINE_RUNTIME_FILE_PREFIX } from '../runtime/AppsEngineRuntime';
+
+export class AppPermissionManager {
+    /**
+     * It returns the declaration of the permission if the app declared, or it returns `undefined`.
+     */
+    public static hasPermission<P extends IPermission>(appId: string, permission: P): P | undefined {
+        if (process.env.NODE_ENV === 'test') {
+            return permission;
+        }
+
+        const grantedPermission = getPermissionsByAppId(appId).find(({ name }) => name === permission.name) as unknown;
+
+        if (!grantedPermission) {
+            return undefined;
+        }
+
+        return grantedPermission as P;
+    }
+
+    public static notifyAboutError(err: Error): void {
+        if (err instanceof PermissionDeniedError) {
+            const { name, message } = err;
+
+            console.error(`${name}: ${message}\n${this.getCallStack()}`);
+        } else {
+            console.error(err);
+        }
+    }
+
+    private static getCallStack(): string {
+        const stack = new Error().stack.toString().split('\n');
+        const appStackIndex = stack.findIndex((position) => position.includes(APPS_ENGINE_RUNTIME_FILE_PREFIX));
+
+        return stack.slice(4, appStackIndex).join('\n');
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppRuntimeManager.ts b/packages/apps-engine/src/server/managers/AppRuntimeManager.ts
new file mode 100644
index 000000000000..64adf9b0a98d
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppRuntimeManager.ts
@@ -0,0 +1,57 @@
+import type { AppManager } from '../AppManager';
+import type { IParseAppPackageResult } from '../compiler';
+import { DenoRuntimeSubprocessController } from '../runtime/deno/AppsEngineDenoRuntime';
+
+export type AppRuntimeParams = {
+    appId: string;
+    appSource: string;
+};
+
+export type ExecRequestContext = {
+    method: string;
+    params: unknown[];
+};
+
+export type ExecRequestOptions = {
+    timeout?: number;
+};
+
+export class AppRuntimeManager {
+    private readonly subprocesses: Record<string, DenoRuntimeSubprocessController> = {};
+
+    constructor(private readonly manager: AppManager) {}
+
+    public async startRuntimeForApp(appPackage: IParseAppPackageResult, options = { force: false }): Promise<DenoRuntimeSubprocessController> {
+        const { id: appId } = appPackage.info;
+
+        if (appId in this.subprocesses && !options.force) {
+            throw new Error('App already has an associated runtime');
+        }
+
+        this.subprocesses[appId] = new DenoRuntimeSubprocessController(this.manager, appPackage);
+
+        await this.subprocesses[appId].setupApp();
+
+        return this.subprocesses[appId];
+    }
+
+    public async runInSandbox(appId: string, execRequest: ExecRequestContext, options?: ExecRequestOptions): Promise<unknown> {
+        const subprocess = this.subprocesses[appId];
+
+        if (!subprocess) {
+            throw new Error('App does not have an associated runtime');
+        }
+
+        return subprocess.sendRequest(execRequest);
+    }
+
+    public async stopRuntime(controller: DenoRuntimeSubprocessController): Promise<void> {
+        await controller.stopApp();
+
+        const appId = controller.getAppId();
+
+        if (appId in this.subprocesses) {
+            delete this.subprocesses[appId];
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppSchedulerManager.ts b/packages/apps-engine/src/server/managers/AppSchedulerManager.ts
new file mode 100644
index 000000000000..5cbd60bcfa33
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppSchedulerManager.ts
@@ -0,0 +1,98 @@
+import { AppStatus } from '../../definition/AppStatus';
+import type { IJobContext, IOnetimeSchedule, IProcessor, IRecurringSchedule } from '../../definition/scheduler';
+import type { AppManager } from '../AppManager';
+import type { IInternalSchedulerBridge } from '../bridges/IInternalSchedulerBridge';
+import type { SchedulerBridge } from '../bridges/SchedulerBridge';
+
+function createProcessorId(jobId: string, appId: string): string {
+    return jobId.includes(`_${appId}`) ? jobId : `${jobId}_${appId}`;
+}
+
+export class AppSchedulerManager {
+    private readonly bridge: SchedulerBridge;
+
+    private registeredProcessors: Map<string, { [processorId: string]: IProcessor }>;
+
+    constructor(private readonly manager: AppManager) {
+        this.bridge = this.manager.getBridges().getSchedulerBridge();
+        this.registeredProcessors = new Map();
+    }
+
+    public async registerProcessors(processors: Array<IProcessor> = [], appId: string): Promise<void | Array<string>> {
+        if (!this.registeredProcessors.get(appId)) {
+            this.registeredProcessors.set(appId, {});
+        }
+
+        return this.bridge.doRegisterProcessors(
+            processors.map((processor) => {
+                const processorId = createProcessorId(processor.id, appId);
+
+                this.registeredProcessors.get(appId)[processorId] = processor;
+
+                return {
+                    id: processorId,
+                    processor: this.wrapProcessor(appId, processorId).bind(this),
+                    startupSetting: processor.startupSetting,
+                };
+            }),
+            appId,
+        );
+    }
+
+    public wrapProcessor(appId: string, processorId: string): IProcessor['processor'] {
+        return async (jobContext: IJobContext) => {
+            const processor = this.registeredProcessors.get(appId)[processorId];
+
+            if (!processor) {
+                throw new Error(`Processor ${processorId} not available`);
+            }
+
+            const app = this.manager.getOneById(appId);
+            const status = await app.getStatus();
+            const previousStatus = app.getPreviousStatus();
+
+            const isNotToRunJob = this.isNotToRunJob(status, previousStatus);
+
+            if (isNotToRunJob) {
+                return;
+            }
+
+            try {
+                await app.getDenoRuntime().sendRequest({
+                    method: `scheduler:${processor.id}`,
+                    params: [jobContext],
+                });
+            } catch (e) {
+                console.error(e);
+                throw e;
+            }
+        };
+    }
+
+    public async scheduleOnce(job: IOnetimeSchedule, appId: string): Promise<void | string> {
+        return this.bridge.doScheduleOnce({ ...job, id: createProcessorId(job.id, appId) }, appId);
+    }
+
+    public async scheduleRecurring(job: IRecurringSchedule, appId: string): Promise<void | string> {
+        return this.bridge.doScheduleRecurring({ ...job, id: createProcessorId(job.id, appId) }, appId);
+    }
+
+    public async cancelJob(jobId: string, appId: string): Promise<void> {
+        return this.bridge.doCancelJob(createProcessorId(jobId, appId), appId);
+    }
+
+    public async cancelAllJobs(appId: string): Promise<void> {
+        return this.bridge.doCancelAllJobs(appId);
+    }
+
+    public async cleanUp(appId: string): Promise<void> {
+        (this.bridge as IInternalSchedulerBridge & SchedulerBridge).cancelAllJobs(appId);
+    }
+
+    private isNotToRunJob(status: AppStatus, previousStatus: AppStatus): boolean {
+        const isAppCurrentDisabled = status === AppStatus.DISABLED || status === AppStatus.MANUALLY_DISABLED;
+        const wasAppDisabled = previousStatus === AppStatus.DISABLED || previousStatus === AppStatus.MANUALLY_DISABLED;
+
+        return (status === AppStatus.INITIALIZED && wasAppDisabled) || isAppCurrentDisabled;
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppSettingsManager.ts b/packages/apps-engine/src/server/managers/AppSettingsManager.ts
new file mode 100644
index 000000000000..b33db9241357
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppSettingsManager.ts
@@ -0,0 +1,55 @@
+import { AppMethod } from '../../definition/metadata';
+import type { ISetting } from '../../definition/settings';
+import type { ISettingUpdateContext } from '../../definition/settings/ISettingUpdateContext';
+import type { AppManager } from '../AppManager';
+import { Utilities } from '../misc/Utilities';
+
+export class AppSettingsManager {
+    constructor(private manager: AppManager) {}
+
+    public getAppSettings(appId: string): { [key: string]: ISetting } {
+        const rl = this.manager.getOneById(appId);
+
+        if (!rl) {
+            throw new Error('No App found by the provided id.');
+        }
+
+        return Utilities.deepCloneAndFreeze(rl.getStorageItem().settings);
+    }
+
+    public getAppSetting(appId: string, settingId: string): ISetting {
+        const settings = this.getAppSettings(appId);
+
+        if (!settings[settingId]) {
+            throw new Error('No setting found for the App by the provided id.');
+        }
+
+        return Utilities.deepCloneAndFreeze(settings[settingId]);
+    }
+
+    public async updateAppSetting(appId: string, setting: ISetting): Promise<void> {
+        const rl = this.manager.getOneById(appId);
+
+        if (!rl) {
+            throw new Error('No App found by the provided id.');
+        }
+
+        const oldSetting = rl.getStorageItem().settings[setting.id];
+        if (!oldSetting) {
+            throw new Error('No setting found for the App by the provided id.');
+        }
+
+        const decoratedSetting = (await rl.call(AppMethod.ON_PRE_SETTING_UPDATE, { oldSetting, newSetting: setting } as ISettingUpdateContext)) || setting;
+
+        decoratedSetting.updatedAt = new Date();
+        rl.getStorageItem().settings[decoratedSetting.id] = decoratedSetting;
+
+        const item = await this.manager.getStorage().update(rl.getStorageItem());
+
+        rl.setStorageItem(item);
+
+        this.manager.getBridges().getAppDetailChangesBridge().doOnAppSettingsChange(appId, decoratedSetting);
+
+        await rl.call(AppMethod.ONSETTINGUPDATED, decoratedSetting);
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppSignatureManager.ts b/packages/apps-engine/src/server/managers/AppSignatureManager.ts
new file mode 100644
index 000000000000..9ac15b9d881e
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppSignatureManager.ts
@@ -0,0 +1,85 @@
+import { createHash } from 'crypto';
+
+import * as jose from 'jose';
+
+import type { AppManager } from '../AppManager';
+import type { IInternalFederationBridge } from '../bridges';
+import type { IAppStorageItem } from '../storage';
+
+export class AppSignatureManager {
+    private readonly federationBridge: IInternalFederationBridge;
+
+    private readonly checksumAlgorithm = 'SHA256';
+
+    private readonly signingAlgorithm = 'RS512';
+
+    private privateKey: string;
+
+    private publicKey: string;
+
+    constructor(private readonly manager: AppManager) {
+        this.federationBridge = this.manager.getBridges().getInternalFederationBridge();
+    }
+
+    public async verifySignedApp(app: IAppStorageItem): Promise<void> {
+        const publicKey = await jose.importSPKI(await this.getPublicKey(), 'pem');
+        const { payload } = await jose.jwtVerify(app.signature, publicKey);
+
+        const checksum = this.calculateChecksumForApp(app);
+
+        if (payload.checksum !== checksum) {
+            throw new Error('Invalid checksum');
+        }
+    }
+
+    public async signApp(app: IAppStorageItem): Promise<string> {
+        const checksum = this.calculateChecksumForApp(app);
+        const privateKey = await jose.importPKCS8(await this.getPrivateKey(), this.signingAlgorithm);
+        const signature = await new jose.SignJWT({ checksum, calg: this.checksumAlgorithm })
+            .setProtectedHeader({ alg: this.signingAlgorithm })
+            .setIssuedAt()
+            .sign(privateKey);
+
+        return signature;
+    }
+
+    private async getPrivateKey(): Promise<string> {
+        if (!this.privateKey) {
+            this.privateKey = await this.federationBridge.getPrivateKey();
+        }
+        return this.privateKey;
+    }
+
+    private async getPublicKey(): Promise<string> {
+        if (!this.publicKey) {
+            this.publicKey = await this.federationBridge.getPublicKey();
+        }
+        return this.publicKey;
+    }
+
+    private calculateChecksumForApp(app: IAppStorageItem, alg = this.checksumAlgorithm): string {
+        return createHash(alg).update(this.getFieldsForChecksum(app)).digest('hex');
+    }
+
+    private getFieldsForChecksum(obj: IAppStorageItem): string {
+        // These fields don't hold valuable information and should NOT invalidate
+        // the checksum
+        const fieldsToIgnore = ['_id', 'status', 'signature', 'updatedAt', 'createdAt', '_updatedAt', '_createdAt', 'settings'];
+
+        // TODO revisit algorithm
+        const allKeys: Array<string> = [];
+        const seen: Record<string, unknown> = {};
+
+        JSON.stringify(obj, (key, value) => {
+            if (!(key in seen)) {
+                allKeys.push(key);
+                seen[key] = null;
+            }
+            return value;
+        });
+
+        const filteredKeys = allKeys.sort().filter((key) => !fieldsToIgnore.includes(key));
+
+        return JSON.stringify(obj, filteredKeys);
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppSlashCommand.ts b/packages/apps-engine/src/server/managers/AppSlashCommand.ts
new file mode 100644
index 000000000000..ef60e1d16877
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppSlashCommand.ts
@@ -0,0 +1,77 @@
+import { AppMethod } from '../../definition/metadata';
+import type { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem, SlashCommandContext } from '../../definition/slashcommands';
+import type { ProxiedApp } from '../ProxiedApp';
+import type { AppLogStorage } from '../storage';
+import type { AppAccessorManager } from './AppAccessorManager';
+
+export class AppSlashCommand {
+    /**
+     * States whether this command has been registered into the Rocket.Chat system or not.
+     */
+    public isRegistered: boolean;
+
+    /**
+     * Declares whether this command has been enabled or not,
+     * does not have to be inside of the Rocket.Chat system if `isRegistered` is false.
+     */
+    public isEnabled: boolean;
+
+    /**
+     * Proclaims whether this command has been disabled or not,
+     * does not have to be inside the Rocket.Chat system if `isRegistered` is false.
+     */
+    public isDisabled: boolean;
+
+    constructor(public app: ProxiedApp, public slashCommand: ISlashCommand) {
+        this.isRegistered = false;
+        this.isEnabled = false;
+        this.isDisabled = false;
+    }
+
+    public hasBeenRegistered(): void {
+        this.isDisabled = false;
+        this.isEnabled = true;
+        this.isRegistered = true;
+    }
+
+    public async runExecutorOrPreviewer(
+        method: AppMethod._COMMAND_EXECUTOR | AppMethod._COMMAND_PREVIEWER,
+        context: SlashCommandContext,
+        logStorage: AppLogStorage,
+        accessors: AppAccessorManager,
+    ): Promise<void | ISlashCommandPreview> {
+        return this.runTheCode(method, logStorage, accessors, context, []);
+    }
+
+    public async runPreviewExecutor(
+        previewItem: ISlashCommandPreviewItem,
+        context: SlashCommandContext,
+        logStorage: AppLogStorage,
+        accessors: AppAccessorManager,
+    ): Promise<void> {
+        await this.runTheCode(AppMethod._COMMAND_PREVIEW_EXECUTOR, logStorage, accessors, context, [previewItem]);
+    }
+
+    private async runTheCode(
+        method: AppMethod._COMMAND_EXECUTOR | AppMethod._COMMAND_PREVIEWER | AppMethod._COMMAND_PREVIEW_EXECUTOR,
+        _logStorage: AppLogStorage,
+        _accessors: AppAccessorManager,
+        context: SlashCommandContext,
+        runContextArgs: Array<any>,
+    ): Promise<void | ISlashCommandPreview> {
+        const { command } = this.slashCommand;
+
+        try {
+            const result = await this.app.getDenoRuntime().sendRequest({
+                method: `slashcommand:${command}:${method}`,
+                params: [...runContextArgs, context],
+            });
+
+            return result as void | ISlashCommandPreview;
+        } catch (e) {
+            // @TODO this needs to be revisited
+            console.error(e);
+            throw e;
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts b/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts
new file mode 100644
index 000000000000..05a93816d35a
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts
@@ -0,0 +1,470 @@
+import { AppStatusUtils } from '../../definition/AppStatus';
+import { AppMethod } from '../../definition/metadata';
+import type { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem } from '../../definition/slashcommands';
+import { SlashCommandContext } from '../../definition/slashcommands';
+import type { AppManager } from '../AppManager';
+import type { CommandBridge } from '../bridges';
+import { CommandAlreadyExistsError, CommandHasAlreadyBeenTouchedError } from '../errors';
+import { Room } from '../rooms/Room';
+import type { AppAccessorManager } from './AppAccessorManager';
+import { AppSlashCommand } from './AppSlashCommand';
+
+/**
+ * The command manager for the Apps.
+ *
+ * An App will add commands during their `initialize` method.
+ * Then once an App's `onEnable` is called and it returns true,
+ * only then will that App's commands be enabled.
+ *
+ * Registered means the command has been provided to the bridged system.
+ */
+export class AppSlashCommandManager {
+    private readonly bridge: CommandBridge;
+
+    private readonly accessors: AppAccessorManager;
+
+    /**
+     * Variable that contains the commands which have been provided by apps.
+     * The key of the top map is app id and the key of the inner map is the command
+     */
+    private providedCommands: Map<string, Map<string, AppSlashCommand>>;
+
+    /**
+     * Contains the commands which have modified the system commands
+     */
+    private modifiedCommands: Map<string, AppSlashCommand>;
+
+    /**
+     * Contains the commands as keys and appId that touched it.
+     * Doesn't matter whether the app provided, modified, disabled, or enabled.
+     * As long as an app touched the command (besides to see if it exists), then it is listed here.
+     */
+    private touchedCommandsToApps: Map<string, string>;
+
+    /**
+     * Contains the apps and the commands they have touched. The key is the appId and value is the commands.
+     * Doesn't matter whether the app provided, modified, disabled, or enabled.
+     * As long as an app touched the command (besides to see if it exists), then it is listed here.
+     */
+    private appsTouchedCommands: Map<string, Array<string>>;
+
+    constructor(private readonly manager: AppManager) {
+        this.bridge = this.manager.getBridges().getCommandBridge();
+        this.accessors = this.manager.getAccessorManager();
+        this.touchedCommandsToApps = new Map<string, string>();
+        this.appsTouchedCommands = new Map<string, Array<string>>();
+        this.providedCommands = new Map<string, Map<string, AppSlashCommand>>();
+        this.modifiedCommands = new Map<string, AppSlashCommand>();
+    }
+
+    /**
+     * Checks whether an App can touch a command or not. There are only two ways an App can touch
+     * a command:
+     * 1. The command has yet to be touched
+     * 2. The app has already touched the command
+     *
+     * When do we consider an App touching a command? Whenever it adds, modifies,
+     * or removes one that it didn't provide.
+     *
+     * @param appId the app's id which to check for
+     * @param command the command to check about
+     * @returns whether or not the app can touch the command
+     */
+    public canCommandBeTouchedBy(appId: string, command: string): boolean {
+        const cmd = command.toLowerCase().trim();
+        return cmd && (!this.touchedCommandsToApps.has(cmd) || this.touchedCommandsToApps.get(cmd) === appId);
+    }
+
+    /**
+     * Determines whether the command is already provided by an App or not.
+     * It is case insensitive.
+     *
+     * @param command the command to check if it exists or not
+     * @returns whether or not it is already provided
+     */
+    public isAlreadyDefined(command: string): boolean {
+        const search = command.toLowerCase().trim();
+        let exists = false;
+
+        this.providedCommands.forEach((cmds) => {
+            if (cmds.has(search)) {
+                exists = true;
+            }
+        });
+
+        return exists;
+    }
+
+    /**
+     * Adds a command to *be* registered. This will *not register* it with the
+     * bridged system yet as this is only called on an App's
+     * `initialize` method and an App might not get enabled.
+     * When adding a command, it can *not* already exist in the system
+     * (to overwrite) and another App can *not* have already touched or provided it.
+     * Apps are on a first come first serve basis for providing and modifying commands.
+     *
+     * @param appId the app's id which the command belongs to
+     * @param command the command to add to the system
+     */
+    public async addCommand(appId: string, command: ISlashCommand): Promise<void> {
+        command.command = command.command.toLowerCase().trim();
+
+        // Ensure the app can touch this command
+        if (!this.canCommandBeTouchedBy(appId, command.command)) {
+            throw new CommandHasAlreadyBeenTouchedError(command.command);
+        }
+
+        // Verify the command doesn't exist already
+        if ((await this.bridge.doDoesCommandExist(command.command, appId)) || this.isAlreadyDefined(command.command)) {
+            throw new CommandAlreadyExistsError(command.command);
+        }
+
+        const app = this.manager.getOneById(appId);
+        if (!app) {
+            throw new Error('App must exist in order for a command to be added.');
+        }
+
+        if (!this.providedCommands.has(appId)) {
+            this.providedCommands.set(appId, new Map<string, AppSlashCommand>());
+        }
+
+        this.providedCommands.get(appId).set(command.command, new AppSlashCommand(app, command));
+
+        // The app has now touched the command, so let's set it
+        this.setAsTouched(appId, command.command);
+    }
+
+    /**
+     * Modifies an existing command. The command must either be the App's
+     * own command or a system command. One App can not modify another
+     * App's command. Apps are on a first come first serve basis as to whether
+     * or not they can touch or provide a command. If App "A" first provides,
+     * or overwrites, a command then App "B" can not touch that command.
+     *
+     * @param appId the app's id of the command to modify
+     * @param command the modified command to replace the current one with
+     */
+    public async modifyCommand(appId: string, command: ISlashCommand): Promise<void> {
+        command.command = command.command.toLowerCase().trim();
+
+        // Ensure the app can touch this command
+        if (!this.canCommandBeTouchedBy(appId, command.command)) {
+            throw new CommandHasAlreadyBeenTouchedError(command.command);
+        }
+
+        const app = this.manager.getOneById(appId);
+        if (!app) {
+            throw new Error('App must exist in order to modify a command.');
+        }
+
+        const hasNotProvidedIt = !this.providedCommands.has(appId) || !this.providedCommands.get(appId).has(command.command);
+
+        // They haven't provided (added) it and the bridged system doesn't have it, error out
+        if (hasNotProvidedIt && !(await this.bridge.doDoesCommandExist(command.command, appId))) {
+            throw new Error('You must first register a command before you can modify it.');
+        }
+
+        if (hasNotProvidedIt) {
+            await this.bridge.doModifyCommand(command, appId);
+            const regInfo = new AppSlashCommand(app, command);
+            regInfo.isDisabled = false;
+            regInfo.isEnabled = true;
+            regInfo.isRegistered = true;
+            this.modifiedCommands.set(command.command, regInfo);
+        } else {
+            this.providedCommands.get(appId).get(command.command).slashCommand = command;
+        }
+
+        this.setAsTouched(appId, command.command);
+    }
+
+    /**
+     * Goes and enables a command in the bridged system. The command
+     * which is being enabled must either be the App's or a system
+     * command which has yet to be touched by an App.
+     *
+     * @param appId the id of the app enabling the command
+     * @param command the command which is being enabled
+     */
+    public async enableCommand(appId: string, command: string): Promise<void> {
+        const cmd = command.toLowerCase().trim();
+
+        // Ensure the app can touch this command
+        if (!this.canCommandBeTouchedBy(appId, cmd)) {
+            throw new CommandHasAlreadyBeenTouchedError(cmd);
+        }
+
+        // Handle if the App provided the command fist
+        if (this.providedCommands.has(appId) && this.providedCommands.get(appId).has(cmd)) {
+            const cmdInfo = this.providedCommands.get(appId).get(cmd);
+
+            // A command marked as disabled can then be "enabled" but not be registered.
+            // This happens when an App is not enabled and they change the status of
+            // command based upon a setting they provide which a User can change.
+            if (!cmdInfo.isRegistered) {
+                cmdInfo.isDisabled = false;
+                cmdInfo.isEnabled = true;
+            }
+
+            return;
+        }
+
+        if (!(await this.bridge.doDoesCommandExist(cmd, appId))) {
+            throw new Error(`The command "${cmd}" does not exist to enable.`);
+        }
+
+        await this.bridge.doEnableCommand(cmd, appId);
+        this.setAsTouched(appId, cmd);
+    }
+
+    /**
+     * Renders an existing slash command un-usable. Whether that command is provided
+     * by the App calling this or a command provided by the bridged system, we don't care.
+     * However, an App can not disable a command which has already been touched
+     * by another App in some way.
+     *
+     * @param appId the app's id which is disabling the command
+     * @param command the command to disable in the bridged system
+     */
+    public async disableCommand(appId: string, command: string): Promise<void> {
+        const cmd = command.toLowerCase().trim();
+
+        // Ensure the app can touch this command
+        if (!this.canCommandBeTouchedBy(appId, cmd)) {
+            throw new CommandHasAlreadyBeenTouchedError(cmd);
+        }
+
+        // Handle if the App provided the command fist
+        if (this.providedCommands.has(appId) && this.providedCommands.get(appId).has(cmd)) {
+            const cmdInfo = this.providedCommands.get(appId).get(cmd);
+
+            // A command marked as enabled can then be "disabled" but not yet be registered.
+            // This happens when an App is not enabled and they change the status of
+            // command based upon a setting they provide which a User can change.
+            if (!cmdInfo.isRegistered) {
+                cmdInfo.isDisabled = true;
+                cmdInfo.isEnabled = false;
+            }
+
+            return;
+        }
+
+        if (!(await this.bridge.doDoesCommandExist(cmd, appId))) {
+            throw new Error(`The command "${cmd}" does not exist to disable.`);
+        }
+
+        await this.bridge.doDisableCommand(cmd, appId);
+        this.setAsTouched(appId, cmd);
+    }
+
+    /**
+     * Registers all of the commands for the provided app inside
+     * of the bridged system which then enables them.
+     *
+     * @param appId The app's id of which to register it's commands with the bridged system
+     */
+    public async registerCommands(appId: string): Promise<void> {
+        if (!this.providedCommands.has(appId)) {
+            return;
+        }
+
+        const commands = this.providedCommands.get(appId);
+        for await (const [, appSlashCommand] of commands) {
+            if (appSlashCommand.isDisabled) {
+                continue;
+            }
+            await this.registerCommand(appId, appSlashCommand);
+        }
+    }
+
+    /**
+     * Unregisters the commands from the system and restores the commands
+     * which the app modified in the system.
+     *
+     * @param appId the appId for the commands to purge
+     */
+    public async unregisterCommands(appId: string): Promise<void> {
+        if (this.providedCommands.has(appId)) {
+            const commands = this.providedCommands.get(appId);
+            for await (const [, appSlashCommand] of commands) {
+                const cmd = appSlashCommand.slashCommand.command;
+                await this.bridge.doUnregisterCommand(cmd, appId);
+                this.touchedCommandsToApps.delete(cmd);
+                if (!this.appsTouchedCommands.has(appId)) {
+                    continue;
+                }
+                const ind = this.appsTouchedCommands.get(appId).indexOf(cmd);
+                this.appsTouchedCommands.get(appId).splice(ind, 1);
+                appSlashCommand.isRegistered = true;
+            }
+
+            this.providedCommands.delete(appId);
+        }
+
+        if (this.appsTouchedCommands.has(appId)) {
+            // The commands inside the appsTouchedCommands should now
+            // only be the ones which the App has enabled, disabled, or modified.
+            // We call restore to enable the commands provided by the bridged system
+            // or unmodify the commands modified by the App
+            this.appsTouchedCommands.get(appId).forEach((cmd) => {
+                // @NOTE this "restore" method isn't present in the bridge
+                // this.bridge.doRestoreCommand(cmd, appId);
+                this.modifiedCommands.get(cmd).isRegistered = false;
+                this.modifiedCommands.delete(cmd);
+                this.touchedCommandsToApps.delete(cmd);
+            });
+
+            this.appsTouchedCommands.delete(appId);
+        }
+    }
+
+    /**
+     * Executes an App's command.
+     *
+     * @param command the command to execute
+     * @param context the context in which the command was entered
+     */
+    public async executeCommand(command: string, context: SlashCommandContext): Promise<void> {
+        const cmd = command.toLowerCase().trim();
+
+        if (!this.shouldCommandFunctionsRun(cmd)) {
+            return;
+        }
+
+        const app = this.manager.getOneById(this.touchedCommandsToApps.get(cmd));
+
+        if (!app || AppStatusUtils.isDisabled(await app.getStatus())) {
+            // Just in case someone decides to do something they shouldn't
+            // let's ensure the app actually exists
+            return;
+        }
+
+        const appCmd = this.retrieveCommandInfo(cmd, app.getID());
+        await appCmd.runExecutorOrPreviewer(AppMethod._COMMAND_EXECUTOR, this.ensureContext(context), this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async getPreviews(command: string, context: SlashCommandContext): Promise<ISlashCommandPreview> {
+        const cmd = command.toLowerCase().trim();
+
+        if (!this.shouldCommandFunctionsRun(cmd)) {
+            return;
+        }
+
+        const app = this.manager.getOneById(this.touchedCommandsToApps.get(cmd));
+
+        if (!app || AppStatusUtils.isDisabled(await app.getStatus())) {
+            // Just in case someone decides to do something they shouldn't
+            // let's ensure the app actually exists
+            return;
+        }
+
+        const appCmd = this.retrieveCommandInfo(cmd, app.getID());
+
+        const result = await appCmd.runExecutorOrPreviewer(
+            AppMethod._COMMAND_PREVIEWER,
+            this.ensureContext(context),
+            this.manager.getLogStorage(),
+            this.accessors,
+        );
+
+        if (!result) {
+            // Failed to get the preview, thus returning is fine
+            return;
+        }
+
+        return result;
+    }
+
+    public async executePreview(command: string, previewItem: ISlashCommandPreviewItem, context: SlashCommandContext): Promise<void> {
+        const cmd = command.toLowerCase().trim();
+
+        if (!this.shouldCommandFunctionsRun(cmd)) {
+            return;
+        }
+
+        const app = this.manager.getOneById(this.touchedCommandsToApps.get(cmd));
+
+        if (!app || AppStatusUtils.isDisabled(await app.getStatus())) {
+            // Just in case someone decides to do something they shouldn't
+            // let's ensure the app actually exists
+            return;
+        }
+
+        const appCmd = this.retrieveCommandInfo(cmd, app.getID());
+        await appCmd.runPreviewExecutor(previewItem, this.ensureContext(context), this.manager.getLogStorage(), this.accessors);
+    }
+
+    private ensureContext(context: SlashCommandContext): SlashCommandContext {
+        // Due to the internal changes for the usernames property, we need to ensure the room
+        // is a class and not just an interface
+        let room: Room;
+        if (context.getRoom() instanceof Room) {
+            room = context.getRoom() as Room;
+        } else {
+            room = new Room(context.getRoom(), this.manager);
+        }
+
+        return new SlashCommandContext(context.getSender(), room, context.getArguments(), context.getThreadId(), context.getTriggerId());
+    }
+
+    /**
+     * Determines if the command's functions should run,
+     * this way the code isn't duplicated three times.
+     *
+     * @param command the lowercase and trimmed command
+     * @returns whether or not to continue
+     */
+    private shouldCommandFunctionsRun(command: string): boolean {
+        // None of the Apps have touched the command to execute,
+        // thus we don't care so exit out
+        if (!this.touchedCommandsToApps.has(command)) {
+            return false;
+        }
+
+        const appId = this.touchedCommandsToApps.get(command);
+        const cmdInfo = this.retrieveCommandInfo(command, appId);
+
+        // Should the command information really not exist
+        // Or if the command hasn't been registered
+        // Or the command is disabled on our side
+        // then let's not execute it, as the App probably doesn't want it yet
+        if (!cmdInfo || !cmdInfo.isRegistered || cmdInfo.isDisabled) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private retrieveCommandInfo(command: string, appId: string): AppSlashCommand {
+        return this.modifiedCommands.get(command) || this.providedCommands.get(appId).get(command);
+    }
+
+    /**
+     * Sets that an App has been touched.
+     *
+     * @param appId the app's id which has touched the command
+     * @param command the command, lowercase and trimmed, which has been touched
+     */
+    private setAsTouched(appId: string, command: string): void {
+        if (!this.appsTouchedCommands.has(appId)) {
+            this.appsTouchedCommands.set(appId, []);
+        }
+
+        if (!this.appsTouchedCommands.get(appId).includes(command)) {
+            this.appsTouchedCommands.get(appId).push(command);
+        }
+
+        this.touchedCommandsToApps.set(command, appId);
+    }
+
+    /**
+     * Actually goes and provide's the bridged system with the command information.
+     *
+     * @param appId the app which is providing the command
+     * @param info the command's registration information
+     */
+    private async registerCommand(appId: string, info: AppSlashCommand): Promise<void> {
+        await this.bridge.doRegisterCommand(info.slashCommand, appId);
+        info.hasBeenRegistered();
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts b/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts
new file mode 100644
index 000000000000..7e74677e1c13
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts
@@ -0,0 +1,105 @@
+import { AppMethod } from '../../definition/metadata';
+import type { IBlock } from '../../definition/uikit';
+import type { IVideoConferenceOptions, IVideoConfProvider, VideoConfData, VideoConfDataExtended } from '../../definition/videoConfProviders';
+import type { VideoConference } from '../../definition/videoConferences';
+import type { IVideoConferenceUser } from '../../definition/videoConferences/IVideoConferenceUser';
+import type { ProxiedApp } from '../ProxiedApp';
+import { JSONRPC_METHOD_NOT_FOUND } from '../runtime/deno/AppsEngineDenoRuntime';
+import type { AppLogStorage } from '../storage';
+import type { AppAccessorManager } from './AppAccessorManager';
+
+export class AppVideoConfProvider {
+    /**
+     * States whether this provider has been registered into the Rocket.Chat system or not.
+     */
+    public isRegistered: boolean;
+
+    constructor(public app: ProxiedApp, public provider: IVideoConfProvider) {
+        this.isRegistered = false;
+    }
+
+    public hasBeenRegistered(): void {
+        this.isRegistered = true;
+    }
+
+    public async runIsFullyConfigured(logStorage: AppLogStorage, accessors: AppAccessorManager): Promise<boolean> {
+        return !!(await this.runTheCode(AppMethod._VIDEOCONF_IS_CONFIGURED, logStorage, accessors, [])) as boolean;
+    }
+
+    public async runGenerateUrl(call: VideoConfData, logStorage: AppLogStorage, accessors: AppAccessorManager): Promise<string> {
+        return (await this.runTheCode(AppMethod._VIDEOCONF_GENERATE_URL, logStorage, accessors, [call])) as string;
+    }
+
+    public async runCustomizeUrl(
+        call: VideoConfDataExtended,
+        user: IVideoConferenceUser | undefined,
+        options: IVideoConferenceOptions = {},
+        logStorage: AppLogStorage,
+        accessors: AppAccessorManager,
+    ): Promise<string> {
+        return (await this.runTheCode(AppMethod._VIDEOCONF_CUSTOMIZE_URL, logStorage, accessors, [call, user, options])) as string;
+    }
+
+    public async runOnNewVideoConference(call: VideoConference, logStorage: AppLogStorage, accessors: AppAccessorManager): Promise<void> {
+        await this.runTheCode(AppMethod._VIDEOCONF_NEW, logStorage, accessors, [call]);
+    }
+
+    public async runOnVideoConferenceChanged(call: VideoConference, logStorage: AppLogStorage, accessors: AppAccessorManager): Promise<void> {
+        await this.runTheCode(AppMethod._VIDEOCONF_CHANGED, logStorage, accessors, [call]);
+    }
+
+    public async runOnUserJoin(
+        call: VideoConference,
+        user: IVideoConferenceUser | undefined,
+        logStorage: AppLogStorage,
+        accessors: AppAccessorManager,
+    ): Promise<void> {
+        await this.runTheCode(AppMethod._VIDEOCONF_USER_JOINED, logStorage, accessors, [call, user]);
+    }
+
+    public async runGetVideoConferenceInfo(
+        call: VideoConference,
+        user: IVideoConferenceUser | undefined,
+        logStorage: AppLogStorage,
+        accessors: AppAccessorManager,
+    ): Promise<Array<IBlock> | undefined> {
+        return (await this.runTheCode(AppMethod._VIDEOCONF_GET_INFO, logStorage, accessors, [call, user])) as Array<IBlock> | undefined;
+    }
+
+    private async runTheCode(
+        method:
+            | AppMethod._VIDEOCONF_GENERATE_URL
+            | AppMethod._VIDEOCONF_CUSTOMIZE_URL
+            | AppMethod._VIDEOCONF_IS_CONFIGURED
+            | AppMethod._VIDEOCONF_NEW
+            | AppMethod._VIDEOCONF_CHANGED
+            | AppMethod._VIDEOCONF_GET_INFO
+            | AppMethod._VIDEOCONF_USER_JOINED,
+        _logStorage: AppLogStorage,
+        _accessors: AppAccessorManager,
+        runContextArgs: Array<any>,
+    ): Promise<string | boolean | Array<IBlock> | undefined> {
+        const provider = this.provider.name;
+
+        try {
+            const result = await this.app.getDenoRuntime().sendRequest({
+                method: `videoconference:${provider}:${method}`,
+                params: runContextArgs,
+            });
+
+            return result as string | boolean | Array<IBlock> | undefined;
+        } catch (e) {
+            if (e?.code === JSONRPC_METHOD_NOT_FOUND) {
+                if (method === AppMethod._VIDEOCONF_IS_CONFIGURED) {
+                    return true;
+                }
+                if (![AppMethod._VIDEOCONF_GENERATE_URL, AppMethod._VIDEOCONF_CUSTOMIZE_URL].includes(method)) {
+                    return undefined;
+                }
+            }
+
+            // @TODO add error handling
+            console.log(e);
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts b/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts
new file mode 100644
index 000000000000..861a5bc5f36f
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts
@@ -0,0 +1,207 @@
+import type { IBlock } from '../../definition/uikit';
+import type { IVideoConferenceOptions, IVideoConfProvider, VideoConfData, VideoConfDataExtended } from '../../definition/videoConfProviders';
+import type { VideoConference } from '../../definition/videoConferences';
+import type { IVideoConferenceUser } from '../../definition/videoConferences/IVideoConferenceUser';
+import type { AppManager } from '../AppManager';
+import type { VideoConferenceBridge } from '../bridges';
+import { VideoConfProviderAlreadyExistsError, VideoConfProviderNotRegisteredError } from '../errors';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissions } from '../permissions/AppPermissions';
+import type { AppAccessorManager } from './AppAccessorManager';
+import { AppPermissionManager } from './AppPermissionManager';
+import { AppVideoConfProvider } from './AppVideoConfProvider';
+
+export class AppVideoConfProviderManager {
+    private readonly accessors: AppAccessorManager;
+
+    private readonly bridge: VideoConferenceBridge;
+
+    private videoConfProviders: Map<string, Map<string, AppVideoConfProvider>>;
+
+    private providerApps: Map<IVideoConfProvider['name'], string>;
+
+    constructor(private readonly manager: AppManager) {
+        this.bridge = this.manager.getBridges().getVideoConferenceBridge();
+        this.accessors = this.manager.getAccessorManager();
+
+        this.videoConfProviders = new Map<string, Map<string, AppVideoConfProvider>>();
+        this.providerApps = new Map<string, string>();
+    }
+
+    public canProviderBeTouchedBy(appId: string, providerName: string): boolean {
+        const key = providerName.toLowerCase().trim();
+        return (key && (!this.providerApps.has(key) || this.providerApps.get(key) === appId)) || false;
+    }
+
+    public isAlreadyDefined(providerName: string): boolean {
+        const search = providerName.toLowerCase().trim();
+
+        for (const [, providers] of this.videoConfProviders) {
+            if (providers.has(search)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public addProvider(appId: string, provider: IVideoConfProvider): void {
+        const app = this.manager.getOneById(appId);
+        if (!app) {
+            throw new Error('App must exist in order for a video conference provider to be added.');
+        }
+
+        if (!AppPermissionManager.hasPermission(appId, AppPermissions.videoConference.provider)) {
+            throw new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.videoConference.provider],
+            });
+        }
+
+        const providerName = provider.name.toLowerCase().trim();
+        if (!this.canProviderBeTouchedBy(appId, providerName)) {
+            throw new VideoConfProviderAlreadyExistsError(provider.name);
+        }
+
+        if (!this.videoConfProviders.has(appId)) {
+            this.videoConfProviders.set(appId, new Map<string, AppVideoConfProvider>());
+        }
+
+        this.videoConfProviders.get(appId)!.set(providerName, new AppVideoConfProvider(app, provider));
+        this.linkAppProvider(appId, providerName);
+    }
+
+    public registerProviders(appId: string): void {
+        if (!this.videoConfProviders.has(appId)) {
+            return;
+        }
+
+        const appProviders = this.videoConfProviders.get(appId);
+        if (!appProviders) {
+            return;
+        }
+
+        for (const [, providerInfo] of appProviders) {
+            this.registerProvider(appId, providerInfo);
+        }
+    }
+
+    public unregisterProviders(appId: string): void {
+        if (!this.videoConfProviders.has(appId)) {
+            return;
+        }
+
+        const appProviders = this.videoConfProviders.get(appId)!;
+        for (const [, providerInfo] of appProviders) {
+            this.unregisterProvider(appId, providerInfo);
+        }
+
+        this.videoConfProviders.delete(appId);
+    }
+
+    public async isFullyConfigured(providerName: string): Promise<boolean> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runIsFullyConfigured(this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async onNewVideoConference(providerName: string, call: VideoConference): Promise<void> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runOnNewVideoConference(call, this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async onVideoConferenceChanged(providerName: string, call: VideoConference): Promise<void> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runOnVideoConferenceChanged(call, this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async onUserJoin(providerName: string, call: VideoConference, user?: IVideoConferenceUser): Promise<void> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runOnUserJoin(call, user, this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async getVideoConferenceInfo(providerName: string, call: VideoConference, user?: IVideoConferenceUser): Promise<Array<IBlock> | undefined> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runGetVideoConferenceInfo(call, user, this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async generateUrl(providerName: string, call: VideoConfData): Promise<string> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runGenerateUrl(call, this.manager.getLogStorage(), this.accessors);
+    }
+
+    public async customizeUrl(
+        providerName: string,
+        call: VideoConfDataExtended,
+        user?: IVideoConferenceUser,
+        options?: IVideoConferenceOptions,
+    ): Promise<string> {
+        const providerInfo = this.retrieveProviderInfo(providerName);
+        if (!providerInfo) {
+            throw new VideoConfProviderNotRegisteredError(providerName);
+        }
+
+        return providerInfo.runCustomizeUrl(call, user, options, this.manager.getLogStorage(), this.accessors);
+    }
+
+    private retrieveProviderInfo(providerName: string): AppVideoConfProvider | undefined {
+        const key = providerName.toLowerCase().trim();
+
+        for (const [, providers] of this.videoConfProviders) {
+            if (!providers.has(key)) {
+                continue;
+            }
+
+            const provider = providers.get(key)!;
+            if (provider.isRegistered) {
+                return provider;
+            }
+        }
+    }
+
+    private linkAppProvider(appId: string, providerName: string): void {
+        this.providerApps.set(providerName, appId);
+    }
+
+    private registerProvider(appId: string, info: AppVideoConfProvider): void {
+        this.bridge.doRegisterProvider(info.provider, appId);
+        info.hasBeenRegistered();
+    }
+
+    private unregisterProvider(appId: string, info: AppVideoConfProvider): void {
+        const key = info.provider.name.toLowerCase().trim();
+
+        this.bridge.doUnRegisterProvider(info.provider, appId);
+        this.providerApps.delete(key);
+
+        info.isRegistered = false;
+
+        const map = this.videoConfProviders.get(appId);
+        if (map) {
+            map.delete(key);
+        }
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/UIActionButtonManager.ts b/packages/apps-engine/src/server/managers/UIActionButtonManager.ts
new file mode 100644
index 000000000000..fac613fbef9f
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/UIActionButtonManager.ts
@@ -0,0 +1,72 @@
+import type { IUIActionButton, IUIActionButtonDescriptor } from '../../definition/ui';
+import type { AppManager } from '../AppManager';
+import type { AppActivationBridge } from '../bridges';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { AppPermissionManager } from './AppPermissionManager';
+
+export class UIActionButtonManager {
+    private readonly activationBridge: AppActivationBridge;
+
+    private registeredActionButtons = new Map<string, Map<string, IUIActionButtonDescriptor>>();
+
+    constructor(manager: AppManager) {
+        this.activationBridge = manager.getBridges().getAppActivationBridge();
+    }
+
+    public registerActionButton(appId: string, button: IUIActionButtonDescriptor) {
+        if (!this.hasPermission(appId)) {
+            return false;
+        }
+
+        if (!this.registeredActionButtons.has(appId)) {
+            this.registeredActionButtons.set(appId, new Map());
+        }
+
+        this.registeredActionButtons.get(appId).set(button.actionId, button);
+
+        this.activationBridge.doActionsChanged();
+
+        return true;
+    }
+
+    public clearAppActionButtons(appId: string) {
+        this.registeredActionButtons.set(appId, new Map());
+        this.activationBridge.doActionsChanged();
+    }
+
+    public getAppActionButtons(appId: string) {
+        return this.registeredActionButtons.get(appId);
+    }
+
+    public getAllActionButtons() {
+        const buttonList: Array<IUIActionButton> = [];
+
+        // Flatten map to a simple list of all buttons
+        this.registeredActionButtons.forEach((appButtons, appId) =>
+            appButtons.forEach((button) =>
+                buttonList.push({
+                    ...button,
+                    appId,
+                }),
+            ),
+        );
+
+        return buttonList;
+    }
+
+    private hasPermission(appId: string) {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.ui.registerButtons)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.ui.registerButtons],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/managers/index.ts b/packages/apps-engine/src/server/managers/index.ts
new file mode 100644
index 000000000000..fdbc5d935452
--- /dev/null
+++ b/packages/apps-engine/src/server/managers/index.ts
@@ -0,0 +1,21 @@
+import { AppAccessorManager } from './AppAccessorManager';
+import { AppApiManager } from './AppApiManager';
+import { AppExternalComponentManager } from './AppExternalComponentManager';
+import { AppLicenseManager } from './AppLicenseManager';
+import { AppListenerManager } from './AppListenerManager';
+import { AppSchedulerManager } from './AppSchedulerManager';
+import { AppSettingsManager } from './AppSettingsManager';
+import { AppSlashCommandManager } from './AppSlashCommandManager';
+import { AppVideoConfProviderManager } from './AppVideoConfProviderManager';
+
+export {
+    AppAccessorManager,
+    AppLicenseManager,
+    AppListenerManager,
+    AppExternalComponentManager,
+    AppSettingsManager,
+    AppSlashCommandManager,
+    AppApiManager,
+    AppSchedulerManager,
+    AppVideoConfProviderManager,
+};
diff --git a/packages/apps-engine/src/server/marketplace/IAppLicenseMetadata.ts b/packages/apps-engine/src/server/marketplace/IAppLicenseMetadata.ts
new file mode 100644
index 000000000000..4b43aa1aa3ee
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/IAppLicenseMetadata.ts
@@ -0,0 +1,5 @@
+export interface IAppLicenseMetadata {
+    license: string;
+    version: number;
+    expireDate: Date;
+}
diff --git a/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts b/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts
new file mode 100644
index 000000000000..3740f5e06f6b
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts
@@ -0,0 +1,24 @@
+import type { IAppInfo } from '../../definition/metadata';
+import type { IMarketplacePricingPlan } from './IMarketplacePricingPlan';
+import type { IMarketplaceSimpleBundleInfo } from './IMarketplaceSimpleBundleInfo';
+import type { IMarketplaceSubscriptionInfo } from './IMarketplaceSubscriptionInfo';
+import type { MarketplacePurchaseType } from './MarketplacePurchaseType';
+
+export interface IMarketplaceInfo extends IAppInfo {
+    categories: Array<string>;
+    status: string;
+    reviewedNote?: string;
+    rejectionNote?: string;
+    isVisible: boolean;
+    isPurchased: boolean;
+    isSubscribed: boolean;
+    isBundled: boolean;
+    createdDate: string;
+    modifiedDate: string;
+    price: number;
+    subscriptionInfo?: IMarketplaceSubscriptionInfo;
+    purchaseType: MarketplacePurchaseType;
+    pricingPlans?: Array<IMarketplacePricingPlan>;
+    bundledIn?: Array<IMarketplaceSimpleBundleInfo>;
+    isEnterpriseOnly?: boolean;
+}
diff --git a/packages/apps-engine/src/server/marketplace/IMarketplacePricingPlan.ts b/packages/apps-engine/src/server/marketplace/IMarketplacePricingPlan.ts
new file mode 100644
index 000000000000..492daa166b01
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/IMarketplacePricingPlan.ts
@@ -0,0 +1,11 @@
+import type { IMarketplacePricingTier } from './IMarketplacePricingTier';
+import type { MarketplacePricingStrategy } from './MarketplacePricingStrategy';
+
+export interface IMarketplacePricingPlan {
+    id: string;
+    enabled: boolean;
+    price: number;
+    isPerSeat: boolean;
+    strategy: MarketplacePricingStrategy;
+    tiers?: Array<IMarketplacePricingTier>;
+}
diff --git a/packages/apps-engine/src/server/marketplace/IMarketplacePricingTier.ts b/packages/apps-engine/src/server/marketplace/IMarketplacePricingTier.ts
new file mode 100644
index 000000000000..10cdc97ed542
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/IMarketplacePricingTier.ts
@@ -0,0 +1,6 @@
+export interface IMarketplacePricingTier {
+    perUnit: boolean;
+    minimum: number;
+    maximum: number;
+    price: number;
+}
diff --git a/packages/apps-engine/src/server/marketplace/IMarketplaceSimpleBundleInfo.ts b/packages/apps-engine/src/server/marketplace/IMarketplaceSimpleBundleInfo.ts
new file mode 100644
index 000000000000..e3a6ef3857b7
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/IMarketplaceSimpleBundleInfo.ts
@@ -0,0 +1,4 @@
+export interface IMarketplaceSimpleBundleInfo {
+    bundleId: string;
+    bundleName: string;
+}
diff --git a/packages/apps-engine/src/server/marketplace/IMarketplaceSubscriptionInfo.ts b/packages/apps-engine/src/server/marketplace/IMarketplaceSubscriptionInfo.ts
new file mode 100644
index 000000000000..5a25f36c7854
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/IMarketplaceSubscriptionInfo.ts
@@ -0,0 +1,15 @@
+import type { IAppLicenseMetadata } from './IAppLicenseMetadata';
+import type { MarketplaceSubscriptionStatus } from './MarketplaceSubscriptionStatus';
+import type { MarketplaceSubscriptionType } from './MarketplaceSubscriptionType';
+
+export interface IMarketplaceSubscriptionInfo {
+    seats: number;
+    maxSeats: number;
+    startDate: string;
+    periodEnd: string;
+    isSubscripbedViaBundle: boolean;
+    endDate?: string;
+    typeOf: MarketplaceSubscriptionType;
+    status: MarketplaceSubscriptionStatus;
+    license: IAppLicenseMetadata;
+}
diff --git a/packages/apps-engine/src/server/marketplace/MarketplacePricingStrategy.ts b/packages/apps-engine/src/server/marketplace/MarketplacePricingStrategy.ts
new file mode 100644
index 000000000000..7b93f165d63a
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/MarketplacePricingStrategy.ts
@@ -0,0 +1,5 @@
+export enum MarketplacePricingStrategy {
+    PricingStrategyOnce = 'once',
+    PricingStrategyMonthly = 'monthly',
+    PricingStrategyYearly = 'yearly',
+}
diff --git a/packages/apps-engine/src/server/marketplace/MarketplacePurchaseType.ts b/packages/apps-engine/src/server/marketplace/MarketplacePurchaseType.ts
new file mode 100644
index 000000000000..85dfcd237575
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/MarketplacePurchaseType.ts
@@ -0,0 +1,4 @@
+export enum MarketplacePurchaseType {
+    PurchaseTypeBuy = 'buy',
+    PurchaseTypeSubscription = 'subscription',
+}
diff --git a/packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionStatus.ts b/packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionStatus.ts
new file mode 100644
index 000000000000..e3d8075b9b1b
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionStatus.ts
@@ -0,0 +1,10 @@
+export enum MarketplaceSubscriptionStatus {
+    // PurchaseSubscriptionStatusTrialing is when the subscription is in the trial phase
+    PurchaseSubscriptionStatusTrialing = 'trialing',
+    // PurchaseSubscriptionStatusActive is when the subscription is active and being billed for
+    PurchaseSubscriptionStatusActive = 'active',
+    // PurchaseSubscriptionStatusCanceled is when the subscription is inactive due to being canceled
+    PurchaseSubscriptionStatusCanceled = 'canceled',
+    // PurchaseSubscriptionStatusPastDue is when the subscription was active but is now past due as a result of incorrect billing information
+    PurchaseSubscriptionStatusPastDue = 'pastDue',
+}
diff --git a/packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionType.ts b/packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionType.ts
new file mode 100644
index 000000000000..94fd26cc1abc
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/MarketplaceSubscriptionType.ts
@@ -0,0 +1,4 @@
+export enum MarketplaceSubscriptionType {
+    SubscriptionTypeApp = 'app',
+    SubscriptionTypeService = 'service',
+}
diff --git a/packages/apps-engine/src/server/marketplace/index.ts b/packages/apps-engine/src/server/marketplace/index.ts
new file mode 100644
index 000000000000..828e95573fa7
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/index.ts
@@ -0,0 +1,8 @@
+import { IAppLicenseMetadata } from './IAppLicenseMetadata';
+import { IMarketplaceInfo } from './IMarketplaceInfo';
+import { IMarketplacePricingPlan } from './IMarketplacePricingPlan';
+import { IMarketplacePricingTier } from './IMarketplacePricingTier';
+import { IMarketplaceSimpleBundleInfo } from './IMarketplaceSimpleBundleInfo';
+import { IMarketplaceSubscriptionInfo } from './IMarketplaceSubscriptionInfo';
+
+export { IAppLicenseMetadata, IMarketplaceInfo, IMarketplacePricingPlan, IMarketplacePricingTier, IMarketplaceSimpleBundleInfo, IMarketplaceSubscriptionInfo };
diff --git a/packages/apps-engine/src/server/marketplace/license/AppLicenseValidationResult.ts b/packages/apps-engine/src/server/marketplace/license/AppLicenseValidationResult.ts
new file mode 100644
index 000000000000..b76a59aab0a4
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/license/AppLicenseValidationResult.ts
@@ -0,0 +1,56 @@
+export class AppLicenseValidationResult {
+    private errors: { [key: string]: string } = {};
+
+    private warnings: { [key: string]: string } = {};
+
+    private validated = false;
+
+    private appId: string;
+
+    public addError(field: string, message: string): void {
+        this.errors[field] = message;
+    }
+
+    public addWarning(field: string, message: string): void {
+        this.warnings[field] = message;
+    }
+
+    public get hasErrors(): boolean {
+        return !!Object.keys(this.errors).length;
+    }
+
+    public get hasWarnings(): boolean {
+        return !!Object.keys(this.warnings).length;
+    }
+
+    public get hasBeenValidated(): boolean {
+        return this.validated;
+    }
+
+    public setValidated(validated: boolean): void {
+        this.validated = validated;
+    }
+
+    public setAppId(appId: string): void {
+        this.appId = appId;
+    }
+
+    public getAppId(): string {
+        return this.appId;
+    }
+
+    public getErrors(): object {
+        return this.errors;
+    }
+
+    public getWarnings(): object {
+        return this.warnings;
+    }
+
+    public toJSON(): object {
+        return {
+            errors: this.errors,
+            warnings: this.warnings,
+        };
+    }
+}
diff --git a/packages/apps-engine/src/server/marketplace/license/Crypto.ts b/packages/apps-engine/src/server/marketplace/license/Crypto.ts
new file mode 100644
index 000000000000..c7595f01b1fb
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/license/Crypto.ts
@@ -0,0 +1,26 @@
+import { publicDecrypt } from 'crypto';
+
+import type { IInternalBridge } from '../../bridges';
+
+export class Crypto {
+    constructor(private readonly internalBridge: IInternalBridge) {}
+
+    public async decryptLicense(content: string): Promise<object> {
+        const publicKeySetting = await this.internalBridge.doGetWorkspacePublicKey();
+
+        if (!publicKeySetting || !publicKeySetting.value) {
+            throw new Error('Public key not available, cannot decrypt'); // TODO: add custom error?
+        }
+
+        const decoded = publicDecrypt(publicKeySetting.value, Buffer.from(content, 'base64'));
+
+        let license;
+        try {
+            license = JSON.parse(decoded.toString());
+        } catch (error) {
+            throw new Error('Invalid license provided');
+        }
+
+        return license;
+    }
+}
diff --git a/packages/apps-engine/src/server/marketplace/license/index.ts b/packages/apps-engine/src/server/marketplace/license/index.ts
new file mode 100644
index 000000000000..573b1e7fbae5
--- /dev/null
+++ b/packages/apps-engine/src/server/marketplace/license/index.ts
@@ -0,0 +1,4 @@
+import { AppLicenseValidationResult } from './AppLicenseValidationResult';
+import { Crypto } from './Crypto';
+
+export { AppLicenseValidationResult, Crypto };
diff --git a/packages/apps-engine/src/server/messages/Message.ts b/packages/apps-engine/src/server/messages/Message.ts
new file mode 100644
index 000000000000..b4c02025974f
--- /dev/null
+++ b/packages/apps-engine/src/server/messages/Message.ts
@@ -0,0 +1,106 @@
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
+
+import type { IMessage, IMessageAttachment, IMessageFile, IMessageReactions } from '../../definition/messages';
+import type { IUser, IUserLookup } from '../../definition/users';
+import type { AppManager } from '../AppManager';
+import { Room } from '../rooms/Room';
+
+export class Message implements IMessage {
+    public id?: string;
+
+    public sender: IUser;
+
+    public text?: string;
+
+    public createdAt?: Date;
+
+    public updatedAt?: Date;
+
+    public editor?: IUser;
+
+    public editedAt?: Date;
+
+    public emoji?: string;
+
+    public avatarUrl?: string;
+
+    public alias?: string;
+
+    public attachments?: Array<IMessageAttachment>;
+
+    public reactions?: IMessageReactions;
+
+    public groupable?: boolean;
+
+    public parseUrls?: boolean;
+
+    public customFields?: { [key: string]: any };
+
+    public threadId?: string;
+
+    public file?: IMessageFile;
+
+    public blocks?: Array<LayoutBlock>;
+
+    public starred?: Array<{ _id: string }>;
+
+    public pinned?: boolean;
+
+    public pinnedAt?: Date;
+
+    public pinnedBy?: IUserLookup;
+
+    private _ROOM: Room;
+
+    public get room(): Room {
+        return this._ROOM;
+    }
+
+    public set room(room) {
+        this._ROOM = new Room(room, this.manager);
+    }
+
+    public constructor(message: IMessage, private manager: AppManager) {
+        Object.assign(this, message);
+    }
+
+    get value(): object {
+        return {
+            id: this.id,
+            sender: this.sender,
+            text: this.text,
+            createdAt: this.createdAt,
+            updatedAt: this.updatedAt,
+            editor: this.editor,
+            editedAt: this.editedAt,
+            emoji: this.emoji,
+            avatarUrl: this.avatarUrl,
+            alias: this.alias,
+            attachments: this.attachments,
+            reactions: this.reactions,
+            groupable: this.groupable,
+            parseUrls: this.parseUrls,
+            customFields: this.customFields,
+            threadId: this.threadId,
+            room: this.room,
+            file: this.file,
+            blocks: this.blocks,
+            starred: this.starred,
+            pinned: this.pinned,
+            pinnedAt: this.pinnedAt,
+            pinnedBy: this.pinnedBy,
+        };
+    }
+
+    public toJSON() {
+        return this.value;
+    }
+
+    public toString() {
+        return this.value;
+    }
+
+    public valueOf() {
+        return this.value;
+    }
+}
diff --git a/packages/apps-engine/src/server/misc/UIHelper.ts b/packages/apps-engine/src/server/misc/UIHelper.ts
new file mode 100644
index 000000000000..833a22daed87
--- /dev/null
+++ b/packages/apps-engine/src/server/misc/UIHelper.ts
@@ -0,0 +1,32 @@
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
+import { v4 as uuid } from 'uuid';
+
+import type { IBlock } from '../../definition/uikit';
+
+export class UIHelper {
+    /**
+     * Assign blockId, appId and actionId to every block/element inside the array
+     * @param blocks the blocks that will be iterated and assigned the ids
+     * @param appId the appId that will be assigned to
+     * @returns the array of block with the ids properties assigned
+     */
+    public static assignIds(blocks: Array<IBlock | LayoutBlock>, appId: string): Array<IBlock | LayoutBlock> {
+        blocks.forEach((block: (IBlock | LayoutBlock) & { appId?: string; blockId?: string; elements?: Array<any> }) => {
+            if (!block.appId) {
+                block.appId = appId;
+            }
+            if (!block.blockId) {
+                block.blockId = uuid();
+            }
+            if (block.elements) {
+                block.elements.forEach((element) => {
+                    if (!element.actionId) {
+                        element.actionId = uuid();
+                    }
+                });
+            }
+        });
+
+        return blocks;
+    }
+}
diff --git a/packages/apps-engine/src/server/misc/Utilities.ts b/packages/apps-engine/src/server/misc/Utilities.ts
new file mode 100644
index 000000000000..5a7baebee6a2
--- /dev/null
+++ b/packages/apps-engine/src/server/misc/Utilities.ts
@@ -0,0 +1,36 @@
+import cloneDeep = require('lodash.clonedeep');
+
+export class Utilities {
+    public static deepClone<T>(item: T): T {
+        return cloneDeep(item);
+    }
+
+    public static deepFreeze<T>(item: any): T {
+        Object.freeze(item);
+
+        Object.getOwnPropertyNames(item).forEach((prop: string) => {
+            if (
+                item.hasOwnProperty(prop) &&
+                item[prop] !== null &&
+                (typeof item[prop] === 'object' || typeof item[prop] === 'function') &&
+                !Object.isFrozen(item[prop])
+            ) {
+                Utilities.deepFreeze(item[prop]);
+            }
+        });
+
+        return item;
+    }
+
+    public static deepCloneAndFreeze<T>(item: T): T {
+        return Utilities.deepFreeze(Utilities.deepClone(item));
+    }
+
+    public static omit(object: { [key: string]: any }, keys: Array<string>) {
+        const cloned = this.deepClone(object);
+        for (const key of keys) {
+            delete cloned[key];
+        }
+        return cloned;
+    }
+}
diff --git a/packages/apps-engine/src/server/oauth2/OAuth2Client.ts b/packages/apps-engine/src/server/oauth2/OAuth2Client.ts
new file mode 100644
index 000000000000..046ce696aedc
--- /dev/null
+++ b/packages/apps-engine/src/server/oauth2/OAuth2Client.ts
@@ -0,0 +1,322 @@
+import { URL } from 'url';
+
+import type { App } from '../../definition/App';
+import type { IConfigurationExtend, IHttp, IModify, IPersistence, IRead } from '../../definition/accessors';
+import { HttpStatusCode } from '../../definition/accessors';
+import type { IApiEndpointInfo, IApiRequest, IApiResponse } from '../../definition/api';
+import { ApiSecurity, ApiVisibility } from '../../definition/api';
+import { RocketChatAssociationModel, RocketChatAssociationRecord } from '../../definition/metadata';
+import type { IAuthData, IOAuth2Client, IOAuth2ClientOptions } from '../../definition/oauth2/IOAuth2';
+import { SettingType } from '../../definition/settings';
+import type { IUser } from '../../definition/users';
+
+export enum GrantType {
+    RefreshToken = 'refresh_token',
+    AuthorizationCode = 'authorization_code',
+}
+
+export class OAuth2Client implements IOAuth2Client {
+    private defaultContents = {
+        success: `<div style="display: flex;align-items: center;justify-content: center; height: 100%;">\
+                        <h1 style="text-align: center; font-family: Helvetica Neue;">\
+                            Authorization went successfully<br>\
+                            You can close this tab now<br>\
+                        </h1>\
+                    </div>`,
+        failed: `<div style="display: flex;align-items: center;justify-content: center; height: 100%;">\
+                    <h1 style="text-align: center; font-family: Helvetica Neue;">\
+                        Oops, something went wrong, please try again or in case it still does not work, contact the administrator.\
+                    </h1>\
+                </div>`,
+    };
+
+    constructor(private readonly app: App, private readonly config: IOAuth2ClientOptions) {}
+
+    public async setup(configuration: IConfigurationExtend): Promise<void> {
+        configuration.api.provideApi({
+            security: ApiSecurity.UNSECURE,
+            visibility: ApiVisibility.PUBLIC,
+            endpoints: [
+                {
+                    path: `${this.config.alias}-callback`,
+                    get: this.handleOAuthCallback.bind(this),
+                },
+            ],
+        });
+
+        await Promise.all([
+            configuration.settings.provideSetting({
+                id: `${this.config.alias}-oauth-client-id`,
+                type: SettingType.STRING,
+                public: true,
+                required: true,
+                packageValue: '',
+                i18nLabel: `${this.config.alias}-oauth-client-id`,
+            }),
+
+            configuration.settings.provideSetting({
+                id: `${this.config.alias}-oauth-clientsecret`,
+                type: SettingType.STRING,
+                public: true,
+                required: true,
+                packageValue: '',
+                i18nLabel: `${this.config.alias}-oauth-client-secret`,
+            }),
+        ]);
+    }
+
+    public async getUserAuthorizationUrl(user: IUser, scopes?: Array<string>): Promise<URL> {
+        const redirectUri = this.app.getAccessors().providedApiEndpoints[0].computedPath.substring(1);
+
+        const siteUrl = await this.getBaseURLWithoutTrailingSlash();
+
+        const finalScopes = ([] as Array<string>).concat(this.config.defaultScopes || [], scopes || []);
+
+        const { authUri } = this.config;
+
+        const clientId = await this.app.getAccessors().reader.getEnvironmentReader().getSettings().getValueById(`${this.config.alias}-oauth-client-id`);
+
+        const url = new URL(authUri, siteUrl);
+
+        url.searchParams.set('response_type', 'code');
+        url.searchParams.set('redirect_uri', `${siteUrl}/${redirectUri}`);
+        url.searchParams.set('state', user.id);
+        url.searchParams.set('client_id', clientId);
+        url.searchParams.set('access_type', 'offline');
+
+        if (finalScopes.length > 0) {
+            url.searchParams.set('scope', finalScopes.join(' '));
+        }
+
+        return url;
+    }
+
+    public async getAccessTokenForUser(user: IUser): Promise<IAuthData | undefined> {
+        const associations = [
+            new RocketChatAssociationRecord(RocketChatAssociationModel.USER, user.id),
+            new RocketChatAssociationRecord(RocketChatAssociationModel.MISC, `${this.config.alias}-oauth-connection`),
+        ];
+
+        const [result] = (await this.app.getAccessors().reader.getPersistenceReader().readByAssociations(associations)) as unknown as Array<
+            IAuthData | undefined
+        >;
+
+        return result;
+    }
+
+    public async refreshUserAccessToken(user: IUser, persis: IPersistence): Promise<IAuthData | undefined> {
+        try {
+            const tokenInfo = await this.getAccessTokenForUser(user);
+
+            if (!tokenInfo) {
+                throw new Error('User has no access token information');
+            }
+
+            if (!tokenInfo.refreshToken) {
+                throw new Error('User token information has no refresh token available');
+            }
+
+            const {
+                config: { refreshTokenUri },
+            } = this;
+
+            const clientId = await this.app.getAccessors().reader.getEnvironmentReader().getSettings().getValueById(`${this.config.alias}-oauth-client-id`);
+
+            const clientSecret = await this.app
+                .getAccessors()
+                .reader.getEnvironmentReader()
+                .getSettings()
+                .getValueById(`${this.config.alias}-oauth-clientsecret`);
+
+            const siteUrl = await this.getBaseURLWithoutTrailingSlash();
+
+            const redirectUri = this.app.getAccessors().providedApiEndpoints[0].computedPath.substring(1);
+
+            const url = new URL(refreshTokenUri);
+
+            url.searchParams.set('client_id', clientId);
+            url.searchParams.set('client_secret', clientSecret);
+            url.searchParams.set('redirect_uri', `${siteUrl}/${redirectUri}`);
+            url.searchParams.set('refresh_token', tokenInfo.refreshToken);
+            url.searchParams.set('grant_type', GrantType.RefreshToken);
+
+            const { content, statusCode } = await this.app.getAccessors().http.post(url.href);
+
+            if (statusCode !== 200) {
+                throw new Error('Request to provider was unsuccessful. Check logs for more information');
+            }
+
+            const { access_token, expires_in, refresh_token, scope } = JSON.parse(content as string);
+
+            if (!access_token) {
+                throw new Error('No access token returned by the provider');
+            }
+
+            const authData: IAuthData = {
+                scope,
+                token: access_token,
+                expiresAt: expires_in,
+                refreshToken: refresh_token || tokenInfo.refreshToken,
+            };
+
+            await this.saveToken(authData, user.id, persis);
+
+            return authData;
+        } catch (error) {
+            this.app.getLogger().error(error);
+            throw error;
+        }
+    }
+
+    public async revokeUserAccessToken(user: IUser, persis: IPersistence): Promise<boolean> {
+        try {
+            const tokenInfo = await this.getAccessTokenForUser(user);
+
+            if (!tokenInfo?.token) {
+                throw new Error('No access token available for this user.');
+            }
+
+            const url = new URL(this.config.revokeTokenUri);
+
+            url.searchParams.set('token', tokenInfo?.token);
+
+            const result = await this.app.getAccessors().http.post(url.href);
+
+            if (result.statusCode !== 200) {
+                throw new Error('Provider did not allow token to be revoked');
+            }
+
+            await this.removeToken({ userId: user.id, persis });
+
+            return true;
+        } catch (error) {
+            this.app.getLogger().error(error);
+            return false;
+        }
+    }
+
+    private async getBaseURLWithoutTrailingSlash(): Promise<string> {
+        const SITE_URL = 'Site_Url';
+        const url = await this.app.getAccessors().environmentReader.getServerSettings().getValueById(SITE_URL);
+
+        if (url.endsWith('/')) {
+            return url.substr(0, url.length - 1);
+        }
+        return url;
+    }
+
+    private async handleOAuthCallback(
+        request: IApiRequest,
+        endpoint: IApiEndpointInfo,
+        read: IRead,
+        modify: IModify,
+        http: IHttp,
+        persis: IPersistence,
+    ): Promise<IApiResponse> {
+        try {
+            const {
+                query: { code, state },
+            } = request;
+
+            const user = await this.app.getAccessors().reader.getUserReader().getById(state);
+
+            if (!user) {
+                throw new Error('User could not be determined.');
+            }
+
+            // User chose not to authorize the access
+            if (!code) {
+                const failedResult = await this.config.authorizationCallback?.(undefined, user, read, modify, http, persis);
+
+                return {
+                    status: HttpStatusCode.UNAUTHORIZED,
+                    content: failedResult?.responseContent || this.defaultContents.failed,
+                };
+            }
+
+            const siteUrl = await this.getBaseURLWithoutTrailingSlash();
+
+            const accessTokenUrl = this.config.accessTokenUri;
+
+            const redirectUri = this.app.getAccessors().providedApiEndpoints[0].computedPath.substring(1);
+
+            const clientId = await this.app.getAccessors().reader.getEnvironmentReader().getSettings().getValueById(`${this.config.alias}-oauth-client-id`);
+
+            const clientSecret = await this.app
+                .getAccessors()
+                .reader.getEnvironmentReader()
+                .getSettings()
+                .getValueById(`${this.config.alias}-oauth-clientsecret`);
+
+            const url = new URL(accessTokenUrl, siteUrl);
+
+            url.searchParams.set('client_id', clientId);
+            url.searchParams.set('redirect_uri', `${siteUrl}/${redirectUri}`);
+            url.searchParams.set('code', code);
+            url.searchParams.set('client_secret', clientSecret);
+            url.searchParams.set('access_type', 'offline');
+            url.searchParams.set('grant_type', GrantType.AuthorizationCode);
+
+            const { content, statusCode } = await http.post(url.href, {
+                headers: { Accept: 'application/json' },
+            });
+
+            // If provider had a server error, nothing we can do
+            if (statusCode >= 500) {
+                throw new Error('Request for access token failed. Check logs for more information');
+            }
+
+            const response = JSON.parse(content as string);
+            const { access_token, expires_in, refresh_token, scope } = response;
+
+            const authData: IAuthData = {
+                scope,
+                token: access_token,
+                expiresAt: expires_in,
+                refreshToken: refresh_token,
+            };
+
+            const result = await this.config.authorizationCallback?.(authData, user, read, modify, http, persis);
+
+            await this.saveToken(authData, user.id, persis);
+
+            return {
+                status: statusCode,
+                content: result?.responseContent || this.defaultContents.success,
+            };
+        } catch (error) {
+            this.app.getLogger().error(error);
+            return {
+                status: HttpStatusCode.INTERNAL_SERVER_ERROR,
+                content: this.defaultContents.failed,
+            };
+        }
+    }
+
+    private async saveToken(authData: IAuthData, userId: string, persis: IPersistence): Promise<string> {
+        const { scope, token, expiresAt, refreshToken } = authData;
+
+        return persis.updateByAssociations(
+            [
+                new RocketChatAssociationRecord(RocketChatAssociationModel.USER, userId),
+                new RocketChatAssociationRecord(RocketChatAssociationModel.MISC, `${this.config.alias}-oauth-connection`),
+            ],
+            {
+                scope,
+                token,
+                expiresAt: expiresAt || '',
+                refreshToken: refreshToken || '',
+            },
+            true, // we want to create the record if it doesn't exist
+        );
+    }
+
+    private async removeToken({ userId, persis }: { userId: string; persis: IPersistence }): Promise<IAuthData> {
+        const [result] = (await persis.removeByAssociations([
+            new RocketChatAssociationRecord(RocketChatAssociationModel.USER, userId),
+            new RocketChatAssociationRecord(RocketChatAssociationModel.MISC, `${this.config.alias}-oauth-connection`),
+        ])) as unknown as Array<IAuthData>;
+
+        return result;
+    }
+}
diff --git a/packages/apps-engine/src/server/permissions/AppPermissions.ts b/packages/apps-engine/src/server/permissions/AppPermissions.ts
new file mode 100644
index 000000000000..a0cc643c7f2b
--- /dev/null
+++ b/packages/apps-engine/src/server/permissions/AppPermissions.ts
@@ -0,0 +1,152 @@
+import type { INetworkingPermission, IPermission, IWorkspaceTokenPermission } from '../../definition/permissions/IPermission';
+
+/**
+ * @description
+ *
+ * App Permission naming rules:
+ *
+ * 'scope-name': {
+ *    'permission-name': { name: 'scope-name.permission-name' }
+ * }
+ *
+ * You can retrive this permission by using:
+ * AppPermissions['scope-name']['permission-name'] -> { name: 'scope-name.permission-name' }
+ *
+ * @example
+ *
+ * AppPermissions.upload.read // { name: 'upload.read', domains: [] }
+ */
+export const AppPermissions = {
+    user: {
+        read: { name: 'user.read' },
+        write: { name: 'user.write' },
+    },
+    upload: {
+        read: { name: 'upload.read' },
+        write: { name: 'upload.write' },
+    },
+    email: {
+        send: { name: 'email.send' },
+    },
+    ui: {
+        interaction: { name: 'ui.interact' },
+        registerButtons: { name: 'ui.registerButtons' },
+    },
+    setting: {
+        read: { name: 'server-setting.read' },
+        write: { name: 'server-setting.write' },
+    },
+    room: {
+        read: { name: 'room.read' },
+        write: { name: 'room.write' },
+    },
+    role: {
+        read: { name: 'role.read' },
+        write: { name: 'role.write' },
+    },
+    message: {
+        read: { name: 'message.read' },
+        write: { name: 'message.write' },
+    },
+    moderation: {
+        read: { name: 'moderation.read' },
+        write: { name: 'moderation.write' },
+    },
+    threads: {
+        read: { name: 'threads.read' },
+    },
+    'livechat-status': {
+        read: { name: 'livechat-status.read' },
+    },
+    'livechat-custom-fields': {
+        write: { name: 'livechat-custom-fields.write' },
+    },
+    'livechat-visitor': {
+        read: { name: 'livechat-visitor.read' },
+        write: { name: 'livechat-visitor.write' },
+    },
+    'livechat-message': {
+        read: { name: 'livechat-message.read' },
+        write: { name: 'livechat-message.write' },
+        multiple: { name: 'livechat-message.multiple' },
+    },
+    'livechat-room': {
+        read: { name: 'livechat-room.read' },
+        write: { name: 'livechat-room.write' },
+    },
+    'livechat-department': {
+        read: { name: 'livechat-department.read' },
+        write: { name: 'livechat-department.write' },
+        multiple: { name: 'livechat-department.multiple' },
+    },
+    env: {
+        read: { name: 'env.read' },
+    },
+    cloud: {
+        'workspace-token': { name: 'cloud.workspace-token', scopes: [] } as IWorkspaceTokenPermission,
+    },
+    // Internal permissions
+    scheduler: {
+        default: { name: 'scheduler' },
+    },
+    networking: {
+        default: { name: 'networking', domains: [] } as INetworkingPermission,
+    },
+    persistence: {
+        default: { name: 'persistence' },
+    },
+    command: {
+        default: { name: 'slashcommand' },
+    },
+    videoConference: {
+        read: { name: 'video-conference.read' },
+        write: { name: 'video-conference.write' },
+        provider: { name: 'video-conference-provider' },
+    },
+    apis: {
+        default: { name: 'api' },
+    },
+    'oauth-app': {
+        read: { name: 'oauth-app.read' },
+        write: { name: 'oauth-app.write' },
+    },
+};
+
+/**
+ * @description
+ * Default permissions for apps
+ * Used to ensure backward compatibility with apps
+ * that were developed before the permission system was introduced.
+ */
+export const defaultPermissions: Array<IPermission> = [
+    AppPermissions.user.read,
+    AppPermissions.user.write,
+    AppPermissions.upload.read,
+    AppPermissions.upload.write,
+    AppPermissions.ui.interaction,
+    AppPermissions.setting.read,
+    AppPermissions.setting.write,
+    AppPermissions.room.read,
+    AppPermissions.room.write,
+    AppPermissions.message.read,
+    AppPermissions.message.write,
+    AppPermissions['livechat-department'].read,
+    AppPermissions['livechat-department'].write,
+    AppPermissions['livechat-room'].read,
+    AppPermissions['livechat-room'].write,
+    AppPermissions['livechat-message'].read,
+    AppPermissions['livechat-message'].write,
+    AppPermissions['livechat-visitor'].read,
+    AppPermissions['livechat-visitor'].write,
+    AppPermissions['livechat-status'].read,
+    AppPermissions['livechat-custom-fields'].write,
+    AppPermissions.scheduler.default,
+    AppPermissions.networking.default,
+    AppPermissions.persistence.default,
+    AppPermissions.env.read,
+    AppPermissions.command.default,
+    AppPermissions.videoConference.provider,
+    AppPermissions.videoConference.read,
+    AppPermissions.videoConference.write,
+    AppPermissions.apis.default,
+];
diff --git a/packages/apps-engine/src/server/rooms/Room.ts b/packages/apps-engine/src/server/rooms/Room.ts
new file mode 100644
index 000000000000..b28b1ba27126
--- /dev/null
+++ b/packages/apps-engine/src/server/rooms/Room.ts
@@ -0,0 +1,104 @@
+import type { IRoom, RoomType } from '../../definition/rooms';
+import type { IUser } from '../../definition/users';
+import type { AppManager } from '../AppManager';
+
+const PrivateManager = Symbol('RoomPrivateManager');
+
+export class Room implements IRoom {
+    public id: string;
+
+    public displayName?: string;
+
+    public slugifiedName: string;
+
+    public type: RoomType;
+
+    public creator: IUser;
+
+    public isDefault?: boolean;
+
+    public isReadOnly?: boolean;
+
+    public displaySystemMessages?: boolean;
+
+    public messageCount?: number;
+
+    public createdAt?: Date;
+
+    public updatedAt?: Date;
+
+    public lastModifiedAt?: Date;
+
+    public customFields?: { [key: string]: any };
+
+    public userIds?: Array<string>;
+
+    private _USERNAMES: Array<string>;
+
+    private [PrivateManager]: AppManager;
+
+    /**
+     * @deprecated
+     */
+    public get usernames(): Array<string> {
+        // Get usernames
+        if (!this._USERNAMES) {
+            this._USERNAMES = this[PrivateManager].getBridges().getInternalBridge().doGetUsernamesOfRoomByIdSync(this.id);
+        }
+
+        return this._USERNAMES;
+    }
+
+    public set usernames(usernames) {}
+
+    public constructor(room: IRoom, manager: AppManager) {
+        Object.assign(this, room);
+
+        Object.defineProperty(this, PrivateManager, {
+            configurable: false,
+            enumerable: false,
+            writable: false,
+            value: manager,
+        });
+    }
+
+    get value(): object {
+        return {
+            id: this.id,
+            displayName: this.displayName,
+            slugifiedName: this.slugifiedName,
+            type: this.type,
+            creator: this.creator,
+            isDefault: this.isDefault,
+            isReadOnly: this.isReadOnly,
+            displaySystemMessages: this.displaySystemMessages,
+            messageCount: this.messageCount,
+            createdAt: this.createdAt,
+            updatedAt: this.updatedAt,
+            lastModifiedAt: this.lastModifiedAt,
+            customFields: this.customFields,
+            userIds: this.userIds,
+        };
+    }
+
+    public async getUsernames(): Promise<Array<string>> {
+        // Get usernames
+        if (!this._USERNAMES) {
+            this._USERNAMES = await this[PrivateManager].getBridges().getInternalBridge().doGetUsernamesOfRoomById(this.id);
+        }
+
+        return this._USERNAMES;
+    }
+
+    public toJSON() {
+        return this.value;
+    }
+
+    public toString() {
+        return this.value;
+    }
+
+    public valueOf() {
+        return this.value;
+    }
+}
diff --git a/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts
new file mode 100644
index 000000000000..72ddc6d7617d
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts
@@ -0,0 +1,21 @@
+import type { App } from '../../definition/App';
+import type { IAppsEngineRuntimeOptions } from './AppsEngineRuntime';
+import { AppsEngineRuntime } from './AppsEngineRuntime';
+
+export class AppsEngineEmptyRuntime extends AppsEngineRuntime {
+    public static async runCode(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any> {
+        throw new Error('Empty runtime does not support code execution');
+    }
+
+    public static runCodeSync(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): any {
+        throw new Error('Empty runtime does not support code execution');
+    }
+
+    constructor(readonly app: App) {
+        super(app, () => {});
+    }
+
+    public async runInSandbox(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any> {
+        return Promise.reject(new Error('Empty runtime does not support execution'));
+    }
+}
diff --git a/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts
new file mode 100644
index 000000000000..dd69f23159f9
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts
@@ -0,0 +1,71 @@
+import * as timers from 'timers';
+import * as vm from 'vm';
+
+import type { App } from '../../definition/App';
+import type { IAppsEngineRuntimeOptions } from './AppsEngineRuntime';
+import { APPS_ENGINE_RUNTIME_DEFAULT_TIMEOUT, AppsEngineRuntime, getFilenameForApp } from './AppsEngineRuntime';
+
+export class AppsEngineNodeRuntime extends AppsEngineRuntime {
+    public static defaultRuntimeOptions = {
+        timeout: APPS_ENGINE_RUNTIME_DEFAULT_TIMEOUT,
+    };
+
+    public static defaultContext = {
+        ...timers,
+        Buffer,
+        console,
+        process: {},
+        exports: {},
+    };
+
+    public static async runCode(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any> {
+        return new Promise((resolve, reject) => {
+            process.nextTick(() => {
+                try {
+                    resolve(this.runCodeSync(code, sandbox, options));
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
+    public static runCodeSync(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): any {
+        return vm.runInNewContext(
+            code,
+            { ...AppsEngineNodeRuntime.defaultContext, ...sandbox },
+            { ...AppsEngineNodeRuntime.defaultRuntimeOptions, ...(options || {}) },
+        );
+    }
+
+    constructor(private readonly app: App, private readonly customRequire: (mod: string) => any) {
+        super(app, customRequire);
+    }
+
+    public async runInSandbox(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any> {
+        return new Promise((resolve, reject) => {
+            process.nextTick(async () => {
+                try {
+                    sandbox ??= {};
+
+                    const result = await vm.runInNewContext(
+                        code,
+                        {
+                            ...AppsEngineNodeRuntime.defaultContext,
+                            ...sandbox,
+                            require: this.customRequire,
+                        },
+                        {
+                            ...AppsEngineNodeRuntime.defaultRuntimeOptions,
+                            filename: getFilenameForApp(options?.filename || this.app.getName()),
+                        },
+                    );
+
+                    resolve(result);
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+}
diff --git a/packages/apps-engine/src/server/runtime/AppsEngineRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineRuntime.ts
new file mode 100644
index 000000000000..3c6041761346
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/AppsEngineRuntime.ts
@@ -0,0 +1,29 @@
+import type { App } from '../../definition/App';
+
+export const APPS_ENGINE_RUNTIME_DEFAULT_TIMEOUT = 1000;
+
+export const APPS_ENGINE_RUNTIME_FILE_PREFIX = '$RocketChat_App$';
+
+export function getFilenameForApp(filename: string): string {
+    return `${APPS_ENGINE_RUNTIME_FILE_PREFIX}_${filename}`;
+}
+
+export abstract class AppsEngineRuntime {
+    public static async runCode(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any> {
+        throw new Error(`Can't call this method on abstract class. Override it in a proper runtime class.`);
+    }
+
+    public static runCodeSync(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): any {
+        throw new Error(`Can't call this method on abstract class. Override it in a proper runtime class.`);
+    }
+
+    constructor(app: App, customRequire: (module: string) => any) {}
+
+    public abstract runInSandbox(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any>;
+}
+
+export interface IAppsEngineRuntimeOptions {
+    timeout?: number;
+    filename?: string;
+    returnAllExports?: boolean;
+}
diff --git a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
new file mode 100644
index 000000000000..8d589c0d2e9e
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
@@ -0,0 +1,568 @@
+import * as child_process from 'child_process';
+import * as path from 'path';
+import { type Readable, EventEmitter } from 'stream';
+
+import debugFactory from 'debug';
+import * as jsonrpc from 'jsonrpc-lite';
+
+import { AppStatus } from '../../../definition/AppStatus';
+import type { AppManager } from '../../AppManager';
+import type { AppBridges } from '../../bridges';
+import type { IParseAppPackageResult } from '../../compiler';
+import type { ILoggerStorageEntry } from '../../logging';
+import type { AppAccessorManager, AppApiManager } from '../../managers';
+import type { AppLogStorage } from '../../storage';
+import { LivenessManager } from './LivenessManager';
+import { ProcessMessenger } from './ProcessMessenger';
+import { bundleLegacyApp } from './bundler';
+import { decoder } from './codec';
+
+const baseDebug = debugFactory('appsEngine:runtime:deno');
+
+export const ALLOWED_ACCESSOR_METHODS = [
+    'getConfigurationExtend',
+    'getEnvironmentRead',
+    'getEnvironmentWrite',
+    'getConfigurationModify',
+    'getReader',
+    'getPersistence',
+    'getHttp',
+    'getModifier',
+] as Array<
+    keyof Pick<
+        AppAccessorManager,
+        | 'getConfigurationExtend'
+        | 'getEnvironmentRead'
+        | 'getEnvironmentWrite'
+        | 'getConfigurationModify'
+        | 'getReader'
+        | 'getPersistence'
+        | 'getHttp'
+        | 'getModifier'
+    >
+>;
+
+// Trying to access environment variables in Deno throws an error where in vm2 it simply returned `undefined`
+// So here we define the allowed envvars to prevent the process (and the compatibility) from breaking
+export const ALLOWED_ENVIRONMENT_VARIABLES = [
+    'NODE_EXTRA_CA_CERTS', // Accessed by the `https` node module
+];
+
+const COMMAND_PONG = '_zPONG';
+
+export const JSONRPC_METHOD_NOT_FOUND = -32601;
+
+export function isValidOrigin(accessor: string): accessor is (typeof ALLOWED_ACCESSOR_METHODS)[number] {
+    return ALLOWED_ACCESSOR_METHODS.includes(accessor as any);
+}
+
+export function getDenoWrapperPath(): string {
+    try {
+        // This path is relative to the compiled version of the Apps-Engine source
+        return require.resolve('../../../deno-runtime/main.ts');
+    } catch {
+        // This path is relative to the original Apps-Engine files
+        return require.resolve('../../../../deno-runtime/main.ts');
+    }
+}
+
+export type DenoRuntimeOptions = {
+    timeout: number;
+};
+
+export class DenoRuntimeSubprocessController extends EventEmitter {
+    private deno: child_process.ChildProcess;
+
+    private state: 'uninitialized' | 'ready' | 'invalid' | 'restarting' | 'unknown' | 'stopped';
+
+    private readonly debug: debug.Debugger;
+
+    private readonly options = {
+        timeout: 10000,
+    };
+
+    private readonly accessors: AppAccessorManager;
+
+    private readonly api: AppApiManager;
+
+    private readonly logStorage: AppLogStorage;
+
+    private readonly bridges: AppBridges;
+
+    private readonly messenger: ProcessMessenger;
+
+    private readonly livenessManager: LivenessManager;
+
+    // We need to keep the appSource around in case the Deno process needs to be restarted
+    constructor(manager: AppManager, private readonly appPackage: IParseAppPackageResult) {
+        super();
+
+        this.debug = baseDebug.extend(appPackage.info.id);
+        this.messenger = new ProcessMessenger(this.debug);
+        this.livenessManager = new LivenessManager({
+            controller: this,
+            messenger: this.messenger,
+            debug: this.debug,
+        });
+
+        this.state = 'uninitialized';
+
+        this.accessors = manager.getAccessorManager();
+        this.api = manager.getApiManager();
+        this.logStorage = manager.getLogStorage();
+        this.bridges = manager.getBridges();
+    }
+
+    public spawnProcess(): void {
+        try {
+            const denoExePath = 'deno';
+
+            const denoWrapperPath = getDenoWrapperPath();
+            // During development, the appsEngineDir is enough to run the deno process
+            const appsEngineDir = path.dirname(path.join(denoWrapperPath, '..'));
+            const DENO_DIR = process.env.DENO_DIR ?? path.join(appsEngineDir, '.deno-cache');
+            // When running in production, we're likely inside a node_modules which the Deno
+            // process must be able to read in order to include files that use NPM packages
+            const parentNodeModulesDir = path.dirname(path.join(appsEngineDir, '..'));
+
+            let hasNetworkingPermission = false;
+
+            // If the app doesn't request any permissions, it gets the default set of permissions, which includes "networking"
+            // If the app requests specific permissions, we need to check whether it requests "networking" or not
+            if (!this.appPackage.info.permissions || this.appPackage.info.permissions.findIndex((p) => p.name === 'networking.default')) {
+                hasNetworkingPermission = true;
+            }
+
+            const options = [
+                'run',
+                hasNetworkingPermission ? '--allow-net' : '',
+                `--allow-read=${appsEngineDir},${parentNodeModulesDir}`,
+                `--allow-env=${ALLOWED_ENVIRONMENT_VARIABLES.join(',')}`,
+                denoWrapperPath,
+                '--subprocess',
+                this.appPackage.info.id,
+            ];
+
+            const environment = {
+                env: {
+                    // We need to pass the PATH, otherwise the shell won't find the deno executable
+                    // But the runtime itself won't have access to the env var because of the parameters
+                    PATH: process.env.PATH,
+                    DENO_DIR,
+                },
+            };
+
+            this.deno = child_process.spawn(denoExePath, options, environment);
+            this.messenger.setReceiver(this.deno);
+            this.livenessManager.attach(this.deno);
+
+            this.debug('Started subprocess %d with options %O and env %O', this.deno.pid, options, environment);
+
+            this.setupListeners();
+        } catch (e) {
+            this.state = 'invalid';
+            console.error(`Failed to start Deno subprocess for app ${this.getAppId()}`, e);
+        }
+    }
+
+    public async killProcess(): Promise<void> {
+        // This field is not populated if the process is killed by the OS
+        if (this.deno.killed) {
+            this.debug('App process was already killed');
+            return;
+        }
+
+        // What else should we do?
+        if (this.deno.kill('SIGKILL')) {
+            // Let's wait until we get confirmation the process exited
+            await new Promise<void>((r) => this.deno.on('exit', r));
+        } else {
+            this.debug('Tried killing the process but failed. Was it already dead?');
+        }
+
+        delete this.deno;
+        this.messenger.clearReceiver();
+    }
+
+    // Debug purposes, could be deleted later
+    emit(eventName: string | symbol, ...args: any[]): boolean {
+        const hadListeners = super.emit(eventName, ...args);
+
+        if (!hadListeners) {
+            this.debug('Emitted but no one listened: ', eventName, args);
+        }
+
+        return hadListeners;
+    }
+
+    public getProcessState() {
+        return this.state;
+    }
+
+    public async getStatus(): Promise<AppStatus> {
+        // If the process has been terminated, we can't get the status
+        if (this.deno.exitCode !== null) {
+            return AppStatus.UNKNOWN;
+        }
+
+        return this.sendRequest({ method: 'app:getStatus', params: [] }) as Promise<AppStatus>;
+    }
+
+    public async setupApp() {
+        this.debug('Setting up app subprocess');
+        this.spawnProcess();
+
+        // If there is more than one file in the package, then it is a legacy app that has not been bundled
+        if (Object.keys(this.appPackage.files).length > 1) {
+            await bundleLegacyApp(this.appPackage);
+        }
+
+        await this.waitUntilReady();
+
+        await this.sendRequest({ method: 'app:construct', params: [this.appPackage] });
+    }
+
+    public async stopApp() {
+        this.debug('Stopping app subprocess');
+
+        this.state = 'stopped';
+
+        await this.killProcess();
+    }
+
+    public async restartApp() {
+        this.debug('Restarting app subprocess');
+
+        this.state = 'restarting';
+
+        await this.killProcess();
+
+        await this.setupApp();
+
+        // setupApp() changes the state to 'ready' - we'll need to workaround that for now
+        this.state = 'restarting';
+
+        await this.sendRequest({ method: 'app:initialize' });
+
+        this.state = 'ready';
+    }
+
+    public getAppId(): string {
+        return this.appPackage.info.id;
+    }
+
+    public async sendRequest(message: Pick<jsonrpc.RequestObject, 'method' | 'params'>, options = this.options): Promise<unknown> {
+        const id = String(Math.random().toString(36)).substring(2);
+
+        const start = Date.now();
+
+        const request = jsonrpc.request(id, message.method, message.params);
+
+        const promise = this.waitForResponse(request, options).finally(() => {
+            this.debug('Request %s for method %s took %dms', id, message.method, Date.now() - start);
+        });
+
+        this.messenger.send(request);
+
+        return promise;
+    }
+
+    private waitUntilReady(): Promise<void> {
+        return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(() => reject(new Error(`[${this.getAppId()}] Timeout: app process not ready`)), this.options.timeout);
+
+            if (this.state === 'ready') {
+                clearTimeout(timeoutId);
+                return resolve();
+            }
+
+            this.once('ready', () => {
+                clearTimeout(timeoutId);
+                return resolve();
+            });
+        });
+    }
+
+    private waitForResponse(req: jsonrpc.RequestObject, options = this.options): Promise<unknown> {
+        return new Promise((resolve, reject) => {
+            const responseCallback = (result: unknown, error: jsonrpc.IParsedObjectError['payload']['error']) => {
+                clearTimeout(timeoutId);
+
+                if (error) {
+                    reject(error);
+                }
+
+                resolve(result);
+            };
+
+            const eventName = `result:${req.id}`;
+
+            const timeoutId = setTimeout(() => {
+                this.off(eventName, responseCallback);
+                reject(new Error(`[${this.getAppId()}] Request "${req.id}" for method "${req.method}" timed out`));
+            }, options.timeout);
+
+            this.once(eventName, responseCallback);
+        });
+    }
+
+    private onReady(): void {
+        this.state = 'ready';
+    }
+
+    private setupListeners(): void {
+        this.deno.stderr.on('data', this.parseError.bind(this));
+        this.deno.on('error', (err) => {
+            this.state = 'invalid';
+            console.error('Failed to startup Deno subprocess', err);
+        });
+        this.once('ready', this.onReady.bind(this));
+        this.parseStdout(this.deno.stdout);
+    }
+
+    // Probable should extract this to a separate file
+    private async handleAccessorMessage({ payload: { method, id, params } }: jsonrpc.IParsedObjectRequest): Promise<jsonrpc.SuccessObject> {
+        const accessorMethods = method.substring(9).split(':'); // First 9 characters are always 'accessor:'
+
+        this.debug('Handling accessor message %o with params %o', accessorMethods, params);
+
+        const managerOrigin = accessorMethods.shift();
+        const tailMethodName = accessorMethods.pop();
+
+        // If we're restarting the app, we can't register resources again, so we
+        // hijack requests for the `ConfigurationExtend` accessor and don't let them through
+        // This needs to be refactored ASAP
+        if (this.state === 'restarting' && managerOrigin === 'getConfigurationExtend') {
+            return jsonrpc.success(id, null);
+        }
+
+        if (managerOrigin === 'api' && tailMethodName === 'listApis') {
+            const result = this.api.listApis(this.appPackage.info.id);
+
+            return jsonrpc.success(id, result);
+        }
+
+        /**
+         * At this point, the accessorMethods array will contain the path to the accessor from the origin (AppAccessorManager)
+         * The accessor is the one that contains the actual method the app wants to call
+         *
+         * Most of the times, it will take one step from origin to accessor
+         * For example, for the call AppAccessorManager.getEnvironmentRead().getServerSettings().getValueById() we'll have
+         * the following:
+         *
+         * ```
+         * const managerOrigin = 'getEnvironmentRead'
+         * const tailMethod = 'getValueById'
+         * const accessorMethods = ['getServerSettings']
+         * ```
+         *
+         * But sometimes there can be more steps, like in the following example:
+         * AppAccessorManager.getReader().getEnvironmentReader().getEnvironmentVariables().getValueByName()
+         * In this case, we'll have:
+         *
+         * ```
+         * const managerOrigin = 'getReader'
+         * const tailMethod = 'getValueByName'
+         * const accessorMethods = ['getEnvironmentReader', 'getEnvironmentVariables']
+         * ```
+         **/
+        // Prevent app from trying to get properties from the manager that
+        // are not intended for public access
+        if (!isValidOrigin(managerOrigin)) {
+            throw new Error(`Invalid accessor namespace "${managerOrigin}"`);
+        }
+
+        // Need to fix typing of return value
+        const getAccessorForOrigin = (
+            accessorMethods: string[],
+            managerOrigin: (typeof ALLOWED_ACCESSOR_METHODS)[number],
+            accessorManager: AppAccessorManager,
+        ) => {
+            const origin = accessorManager[managerOrigin](this.appPackage.info.id);
+
+            if (managerOrigin === 'getHttp' || managerOrigin === 'getPersistence') {
+                return origin;
+            }
+
+            if (managerOrigin === 'getConfigurationExtend' || managerOrigin === 'getConfigurationModify') {
+                return origin[accessorMethods[0] as keyof typeof origin];
+            }
+
+            let accessor = origin;
+
+            // Call all intermediary objects to "resolve" the accessor
+            accessorMethods.forEach((methodName) => {
+                const method = accessor[methodName as keyof typeof accessor] as unknown;
+
+                if (typeof method !== 'function') {
+                    throw new Error(`Invalid accessor method "${methodName}"`);
+                }
+
+                accessor = method.apply(accessor);
+            });
+
+            return accessor;
+        };
+
+        const accessor = getAccessorForOrigin(accessorMethods, managerOrigin, this.accessors);
+
+        const tailMethod = accessor[tailMethodName as keyof typeof accessor] as unknown;
+
+        if (typeof tailMethod !== 'function') {
+            throw new Error(`Invalid accessor method "${tailMethodName}"`);
+        }
+
+        const result = await tailMethod.apply(accessor, params);
+
+        return jsonrpc.success(id, typeof result === 'undefined' ? null : result);
+    }
+
+    private async handleBridgeMessage({ payload: { method, id, params } }: jsonrpc.IParsedObjectRequest): Promise<jsonrpc.SuccessObject | jsonrpc.ErrorObject> {
+        const [bridgeName, bridgeMethod] = method.substring(8).split(':');
+
+        this.debug('Handling bridge message %s().%s() with params %o', bridgeName, bridgeMethod, params);
+
+        const bridge = this.bridges[bridgeName as keyof typeof this.bridges];
+
+        if (!bridgeMethod.startsWith('do') || typeof bridge !== 'function' || !Array.isArray(params)) {
+            throw new Error('Invalid bridge request');
+        }
+
+        const bridgeInstance = bridge.call(this.bridges);
+
+        const methodRef = bridgeInstance[bridgeMethod as keyof typeof bridge] as unknown;
+
+        if (typeof methodRef !== 'function') {
+            throw new Error('Invalid bridge request');
+        }
+
+        let result;
+        try {
+            result = await methodRef.apply(
+                bridgeInstance,
+                // Should the protocol expect the placeholder APP_ID value or should the Deno process send the actual appId?
+                // If we do not expect the APP_ID, the Deno process will be able to impersonate other apps, potentially
+                params.map((value: unknown) => (value === 'APP_ID' ? this.appPackage.info.id : value)),
+            );
+        } catch (error) {
+            this.debug('Error executing bridge method %s().%s() %o', bridgeName, bridgeMethod, error.message);
+            const jsonRpcError = new jsonrpc.JsonRpcError(error.message, -32000, error);
+            return jsonrpc.error(id, jsonRpcError);
+        }
+
+        return jsonrpc.success(id, typeof result === 'undefined' ? null : result);
+    }
+
+    private async handleIncomingMessage(message: jsonrpc.IParsedObjectNotification | jsonrpc.IParsedObjectRequest): Promise<void> {
+        const { method } = message.payload;
+
+        if (method.startsWith('accessor:')) {
+            let result: jsonrpc.SuccessObject | jsonrpc.ErrorObject;
+
+            try {
+                result = await this.handleAccessorMessage(message as jsonrpc.IParsedObjectRequest);
+            } catch (e) {
+                result = jsonrpc.error((message.payload as jsonrpc.RequestObject).id, new jsonrpc.JsonRpcError(e.message, 1000));
+            }
+
+            this.messenger.send(result);
+
+            return;
+        }
+
+        if (method.startsWith('bridges:')) {
+            let result: jsonrpc.SuccessObject | jsonrpc.ErrorObject;
+
+            try {
+                result = await this.handleBridgeMessage(message as jsonrpc.IParsedObjectRequest);
+            } catch (e) {
+                result = jsonrpc.error((message.payload as jsonrpc.RequestObject).id, new jsonrpc.JsonRpcError(e.message, 1000));
+            }
+
+            this.messenger.send(result);
+
+            return;
+        }
+
+        switch (method) {
+            case 'ready':
+                this.emit('ready');
+                break;
+            case 'log':
+                console.log('SUBPROCESS LOG', message);
+                break;
+            default:
+                console.warn('Unrecognized method from sub process');
+                break;
+        }
+    }
+
+    private async handleResultMessage(message: jsonrpc.IParsedObjectError | jsonrpc.IParsedObjectSuccess): Promise<void> {
+        const { id } = message.payload;
+
+        let result: unknown;
+        let error: jsonrpc.IParsedObjectError['payload']['error'] | undefined;
+        let logs: ILoggerStorageEntry;
+
+        if (message.type === 'success') {
+            const params = message.payload.result as { value: unknown; logs?: ILoggerStorageEntry };
+            result = params.value;
+            logs = params.logs;
+        } else {
+            error = message.payload.error;
+            logs = message.payload.error.data?.logs as ILoggerStorageEntry;
+        }
+
+        // Should we try to make sure all result messages have logs?
+        if (logs) {
+            await this.logStorage.storeEntries(logs);
+        }
+
+        this.emit(`result:${id}`, result, error);
+    }
+
+    private async parseStdout(stream: Readable): Promise<void> {
+        for await (const message of decoder.decodeStream(stream)) {
+            this.debug('Received message from subprocess %o', message);
+            try {
+                // Process PONG resonse first as it is not JSON RPC
+                if (message === COMMAND_PONG) {
+                    this.emit('pong');
+                    continue;
+                }
+
+                const JSONRPCMessage = jsonrpc.parseObject(message);
+
+                if (Array.isArray(JSONRPCMessage)) {
+                    throw new Error('Invalid message format');
+                }
+
+                if (JSONRPCMessage.type === 'request' || JSONRPCMessage.type === 'notification') {
+                    this.handleIncomingMessage(JSONRPCMessage).catch((reason) =>
+                        console.error(`[${this.getAppId()}] Error executing handler`, reason, message),
+                    );
+                    continue;
+                }
+
+                if (JSONRPCMessage.type === 'success' || JSONRPCMessage.type === 'error') {
+                    this.handleResultMessage(JSONRPCMessage).catch((reason) => console.error(`[${this.getAppId()}] Error executing handler`, reason, message));
+                    continue;
+                }
+
+                console.error('Unrecognized message type', JSONRPCMessage);
+            } catch (e) {
+                // SyntaxError is thrown when the message is not a valid JSON
+                if (e instanceof SyntaxError) {
+                    console.error(`[${this.getAppId()}] Failed to parse message`);
+                    continue;
+                }
+
+                console.error(`[${this.getAppId()}] Error executing handler`, e, message);
+            }
+        }
+    }
+
+    private async parseError(chunk: Buffer): Promise<void> {
+        console.error('Subprocess stderr', chunk.toString());
+    }
+}
diff --git a/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts b/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts
new file mode 100644
index 000000000000..4fb2433e8e0a
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts
@@ -0,0 +1,184 @@
+import type { ChildProcess } from 'child_process';
+import { EventEmitter } from 'stream';
+
+import type { DenoRuntimeSubprocessController } from './AppsEngineDenoRuntime';
+import type { ProcessMessenger } from './ProcessMessenger';
+
+const COMMAND_PING = '_zPING';
+
+const defaultOptions: LivenessManager['options'] = {
+    pingRequestTimeout: 10000,
+    pingFrequencyInMS: 10000,
+    consecutiveTimeoutLimit: 4,
+    maxRestarts: 3,
+};
+
+/**
+ * Responsible for pinging the Deno subprocess and for restarting it
+ * if something doesn't look right
+ */
+export class LivenessManager {
+    private readonly controller: DenoRuntimeSubprocessController;
+
+    private readonly messenger: ProcessMessenger;
+
+    private readonly debug: debug.Debugger;
+
+    private readonly options: {
+        // How long should we wait for a response to the ping request
+        pingRequestTimeout: number;
+
+        // How long is the delay between ping messages
+        pingFrequencyInMS: number;
+
+        // Limit of times the process can timeout the ping response before we consider it as unresponsive
+        consecutiveTimeoutLimit: number;
+
+        // Limit of times we can try to restart a process
+        maxRestarts: number;
+    };
+
+    private subprocess: ChildProcess;
+
+    // This is the perfect use-case for an AbortController, but it's experimental in Node 14.x
+    private pingAbortController: EventEmitter;
+
+    private pingTimeoutConsecutiveCount = 0;
+
+    private restartCount = 0;
+
+    private restartLog: Record<string, unknown>[] = [];
+
+    constructor(
+        deps: {
+            controller: DenoRuntimeSubprocessController;
+            messenger: ProcessMessenger;
+            debug: debug.Debugger;
+        },
+        options: Partial<LivenessManager['options']> = {},
+    ) {
+        this.controller = deps.controller;
+        this.messenger = deps.messenger;
+        this.debug = deps.debug;
+        this.pingAbortController = new EventEmitter();
+
+        this.options = Object.assign({}, defaultOptions, options);
+    }
+
+    public attach(deno: ChildProcess) {
+        this.subprocess = deno;
+
+        this.pingTimeoutConsecutiveCount = 0;
+
+        this.controller.once('ready', () => this.ping());
+        this.subprocess.once('exit', this.handleExit.bind(this));
+    }
+
+    /**
+     * Start up the process of ping/pong for liveness check
+     *
+     * The message exchange does not use JSON RPC as it adds a lot of overhead
+     * with the creation and encoding of a full object for transfer. By using a
+     * string the process is less intensive.
+     */
+    private ping() {
+        const start = Date.now();
+
+        let aborted = false;
+
+        const setAborted = () => {
+            this.debug('Ping aborted');
+
+            aborted = true;
+        };
+
+        // If we get an abort, ping should not continue
+        this.pingAbortController.once('abort', setAborted);
+
+        new Promise<void>((resolve, reject) => {
+            const onceCallback = () => {
+                this.debug('Ping successful in %d ms', Date.now() - start);
+                clearTimeout(timeoutId);
+                this.pingTimeoutConsecutiveCount = 0;
+                resolve();
+            };
+
+            const timeoutCallback = () => {
+                this.debug('Ping failed in %d ms (consecutive failure #%d)', Date.now() - start, this.pingTimeoutConsecutiveCount);
+                this.controller.off('pong', onceCallback);
+                this.pingTimeoutConsecutiveCount++;
+                reject('timeout');
+            };
+
+            const timeoutId = setTimeout(timeoutCallback, this.options.pingRequestTimeout);
+
+            this.controller.once('pong', onceCallback);
+        })
+            .then(() => !aborted)
+            .catch((reason) => {
+                if (aborted) {
+                    return false;
+                }
+
+                if (reason === 'timeout' && this.pingTimeoutConsecutiveCount >= this.options.consecutiveTimeoutLimit) {
+                    this.debug('Subprocess failed to respond to pings %d consecutive times. Attempting restart...', this.options.consecutiveTimeoutLimit);
+                    this.restartProcess();
+                    return false;
+                }
+
+                return true;
+            })
+            .then((shouldContinue) => {
+                if (!shouldContinue) {
+                    this.pingAbortController.off('abort', setAborted);
+                    return;
+                }
+
+                setTimeout(() => {
+                    if (aborted) return;
+
+                    this.pingAbortController.off('abort', setAborted);
+                    this.ping();
+                }, this.options.pingFrequencyInMS);
+            });
+
+        this.messenger.send(COMMAND_PING);
+    }
+
+    private handleExit(exitCode: number, signal: string) {
+        this.pingAbortController.emit('abort');
+
+        const processState = this.controller.getProcessState();
+        // If the we're restarting the process, or want to stop the process, or it exited cleanly, nothing else for us to do
+        if (processState === 'restarting' || processState === 'stopped' || (exitCode === 0 && !signal)) {
+            return;
+        }
+
+        // Otherwise we try to restart the subprocess, if possible
+        if (signal) {
+            this.debug('App has been killed (%s). Attempting restart #%d...', signal, this.restartCount + 1);
+        } else {
+            this.debug('App has exited with code %d. Attempting restart #%d...', exitCode, this.restartCount + 1);
+        }
+
+        this.restartProcess();
+    }
+
+    private restartProcess() {
+        if (this.restartCount >= this.options.maxRestarts) {
+            this.debug('Limit of restarts reached (%d). Aborting restart...', this.options.maxRestarts);
+            this.controller.stopApp();
+            return;
+        }
+
+        this.pingTimeoutConsecutiveCount = 0;
+        this.restartCount++;
+        this.restartLog.push({
+            restartedAt: new Date(),
+            source: 'liveness-manager',
+            pid: this.subprocess.pid,
+        });
+
+        this.controller.restartApp();
+    }
+}
diff --git a/packages/apps-engine/src/server/runtime/deno/ProcessMessenger.ts b/packages/apps-engine/src/server/runtime/deno/ProcessMessenger.ts
new file mode 100644
index 000000000000..03d03d125323
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/deno/ProcessMessenger.ts
@@ -0,0 +1,48 @@
+import { ChildProcess } from 'child_process';
+
+import type { JsonRpc } from 'jsonrpc-lite';
+
+import { encoder } from './codec';
+
+export class ProcessMessenger {
+    private deno: ChildProcess;
+
+    private _sendStrategy: (message: JsonRpc) => void;
+
+    constructor(private readonly debug: debug.Debugger) {
+        this._sendStrategy = this.strategyError;
+    }
+
+    public get send() {
+        return this._sendStrategy.bind(this);
+    }
+
+    public setReceiver(deno: ChildProcess) {
+        this.deno = deno;
+
+        this.switchStrategy();
+    }
+
+    public clearReceiver() {
+        delete this.deno;
+
+        this.switchStrategy();
+    }
+
+    private switchStrategy() {
+        if (this.deno instanceof ChildProcess) {
+            this._sendStrategy = this.strategySend.bind(this);
+        } else {
+            this._sendStrategy = this.strategyError.bind(this);
+        }
+    }
+
+    private strategyError(_message: JsonRpc) {
+        throw new Error('No process configured to receive a message');
+    }
+
+    private strategySend(message: JsonRpc) {
+        this.debug('Sending message to subprocess %o', message);
+        this.deno.stdin.write(encoder.encode(message));
+    }
+}
diff --git a/packages/apps-engine/src/server/runtime/deno/bundler.ts b/packages/apps-engine/src/server/runtime/deno/bundler.ts
new file mode 100644
index 000000000000..60ecca1a626d
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/deno/bundler.ts
@@ -0,0 +1,90 @@
+import * as path from 'path';
+
+import { build, type PluginBuild, type OnLoadArgs, type OnResolveArgs } from 'esbuild';
+
+import type { IParseAppPackageResult } from '../../compiler';
+
+/**
+ * Some legacy apps that might be installed in workspaces have not been bundled after compilation,
+ * leading to multiple files being sent to the subprocess and requiring further logic to require one another.
+ * This makes running the app in the Deno Runtime much more difficult, so instead we bundle the files at runtime.
+ */
+export async function bundleLegacyApp(appPackage: IParseAppPackageResult) {
+    const buildResult = await build({
+        write: false,
+        bundle: true,
+        minify: true,
+        platform: 'node',
+        target: ['node10'],
+        define: {
+            'global.Promise': 'Promise',
+        },
+        external: ['@rocket.chat/apps-engine/*'],
+        stdin: {
+            contents: appPackage.files[appPackage.info.classFile],
+            sourcefile: appPackage.info.classFile,
+            loader: 'js',
+        },
+        plugins: [
+            {
+                name: 'legacy-app',
+                setup(build: PluginBuild) {
+                    build.onResolve({ filter: /.*/ }, (args: OnResolveArgs) => {
+                        if (args.namespace === 'file') {
+                            return;
+                        }
+
+                        const modulePath = path.join(path.dirname(args.importer), args.path).concat('.js');
+
+                        const hasFile = !!appPackage.files[modulePath];
+
+                        if (hasFile) {
+                            return {
+                                namespace: 'app-source',
+                                path: modulePath,
+                            };
+                        }
+
+                        // require('../') or require('./') are both valid, but aren't included in the files record in the same way
+                        // we need to treat those differently
+                        if (/\.\.?\//.test(args.path)) {
+                            const indexModulePath = modulePath.replace(/\.js$/, `${path.sep}index.js`);
+
+                            if (appPackage.files[indexModulePath]) {
+                                return {
+                                    namespace: 'app-source',
+                                    path: indexModulePath,
+                                };
+                            }
+                        }
+
+                        return {
+                            path: args.path,
+                            external: true,
+                        };
+                    });
+
+                    build.onLoad({ filter: /.*/, namespace: 'app-source' }, (args: OnLoadArgs) => {
+                        if (!appPackage.files[args.path]) {
+                            return {
+                                errors: [
+                                    {
+                                        text: `File ${args.path} could not be found`,
+                                    },
+                                ],
+                            };
+                        }
+
+                        return {
+                            contents: appPackage.files[args.path],
+                        };
+                    });
+                },
+            },
+        ],
+    });
+
+    const [{ text: bundle }] = buildResult.outputFiles;
+
+    appPackage.files = { [appPackage.info.classFile]: bundle };
+}
diff --git a/packages/apps-engine/src/server/runtime/deno/codec.ts b/packages/apps-engine/src/server/runtime/deno/codec.ts
new file mode 100644
index 000000000000..3af728fb105d
--- /dev/null
+++ b/packages/apps-engine/src/server/runtime/deno/codec.ts
@@ -0,0 +1,29 @@
+import { Decoder, Encoder, ExtensionCodec } from '@msgpack/msgpack';
+
+const extensionCodec = new ExtensionCodec();
+
+extensionCodec.register({
+    type: 0,
+    encode: (object: unknown) => {
+        // We don't care about functions, but also don't want to throw an error
+        if (typeof object === 'function') {
+            return new Uint8Array([0]);
+        }
+    },
+    decode: (_data: Uint8Array) => undefined,
+});
+
+// We need to handle Buffers because Deno needs its own decoding
+extensionCodec.register({
+    type: 1,
+    encode: (object: unknown) => {
+        if (object instanceof Buffer) {
+            return new Uint8Array(object.buffer, object.byteOffset, object.byteLength);
+        }
+    },
+    // msgpack will reuse the Uint8Array instance, so WE NEED to copy it instead of simply creating a view
+    decode: (data: Uint8Array) => Buffer.from(data),
+});
+
+export const encoder = new Encoder({ extensionCodec });
+export const decoder = new Decoder({ extensionCodec });
diff --git a/packages/apps-engine/src/server/storage/AppLogStorage.ts b/packages/apps-engine/src/server/storage/AppLogStorage.ts
new file mode 100644
index 000000000000..1c5e4824f4e1
--- /dev/null
+++ b/packages/apps-engine/src/server/storage/AppLogStorage.ts
@@ -0,0 +1,24 @@
+import type { ILoggerStorageEntry } from '../logging';
+
+export interface IAppLogStorageFindOptions {
+    sort?: { [field: string]: number };
+    skip?: number;
+    limit?: number;
+    fields?: { [field: string]: number };
+}
+
+export abstract class AppLogStorage {
+    constructor(private readonly engine: string) {}
+
+    public getEngine() {
+        return this.engine;
+    }
+
+    public abstract find(query: { [field: string]: any }, options?: IAppLogStorageFindOptions): Promise<Array<ILoggerStorageEntry>>;
+
+    public abstract storeEntries(logEntry: ILoggerStorageEntry): Promise<ILoggerStorageEntry>;
+
+    public abstract getEntriesFor(appId: string): Promise<Array<ILoggerStorageEntry>>;
+
+    public abstract removeEntriesFor(appId: string): Promise<void>;
+}
diff --git a/packages/apps-engine/src/server/storage/AppMetadataStorage.ts b/packages/apps-engine/src/server/storage/AppMetadataStorage.ts
new file mode 100644
index 000000000000..51d84e19b390
--- /dev/null
+++ b/packages/apps-engine/src/server/storage/AppMetadataStorage.ts
@@ -0,0 +1,19 @@
+import type { IAppStorageItem } from './IAppStorageItem';
+
+export abstract class AppMetadataStorage {
+    constructor(private readonly engine: string) {}
+
+    public getEngine() {
+        return this.engine;
+    }
+
+    public abstract create(item: IAppStorageItem): Promise<IAppStorageItem>;
+
+    public abstract retrieveOne(id: string): Promise<IAppStorageItem | null>;
+
+    public abstract retrieveAll(): Promise<Map<string, IAppStorageItem>>;
+
+    public abstract update(item: IAppStorageItem): Promise<IAppStorageItem>;
+
+    public abstract remove(id: string): Promise<{ success: boolean }>;
+}
diff --git a/packages/apps-engine/src/server/storage/AppSourceStorage.ts b/packages/apps-engine/src/server/storage/AppSourceStorage.ts
new file mode 100644
index 000000000000..83b62a94d8a2
--- /dev/null
+++ b/packages/apps-engine/src/server/storage/AppSourceStorage.ts
@@ -0,0 +1,40 @@
+import type { IAppStorageItem } from './IAppStorageItem';
+
+export abstract class AppSourceStorage {
+    /**
+     * Stores an app package (zip file) in the underlying
+     * storage provided by the host
+     *
+     * @param item descriptor of the App
+     * @param zip the app package file contents
+     *
+     * @returns the path in which the pacakge has been stored
+     */
+    public abstract store(item: IAppStorageItem, zip: Buffer): Promise<string>;
+
+    /**
+     * Fetches an app's package file contents
+     *
+     * @param item descriptor of the App
+     *
+     * @returns buffer containing the file contents of the app's package
+     */
+    public abstract fetch(item: IAppStorageItem): Promise<Buffer>;
+
+    /**
+     * Updates an app package (zip file) in the underlying
+     * storage provided by the host
+     *
+     * @param item descriptor of the App
+     * @param zip the app package file contents
+     *
+     * @returns the path in which the pacakge has been stored
+     */
+    public abstract update(item: IAppStorageItem, zip: Buffer): Promise<string>;
+
+    /**
+     *
+     * @param item descriptor of the App
+     */
+    public abstract remove(item: IAppStorageItem): Promise<void>;
+}
diff --git a/packages/apps-engine/src/server/storage/IAppStorageItem.ts b/packages/apps-engine/src/server/storage/IAppStorageItem.ts
new file mode 100644
index 000000000000..01670ecb558a
--- /dev/null
+++ b/packages/apps-engine/src/server/storage/IAppStorageItem.ts
@@ -0,0 +1,31 @@
+import type { AppStatus } from '../../definition/AppStatus';
+import type { IAppInfo } from '../../definition/metadata';
+import type { IPermission } from '../../definition/permissions/IPermission';
+import type { ISetting } from '../../definition/settings';
+import type { IMarketplaceInfo } from '../marketplace';
+
+export interface IAppStorageItem {
+    _id?: string;
+    id: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+    status: AppStatus;
+    info: IAppInfo;
+    installationSource: AppInstallationSource;
+    /**
+     * The path that represents where the source of the app storaged.
+     */
+    sourcePath?: string;
+    languageContent: { [key: string]: object };
+    settings: { [id: string]: ISetting };
+    implemented: { [int: string]: boolean };
+    marketplaceInfo?: IMarketplaceInfo;
+    permissionsGranted?: Array<IPermission>;
+    signature?: string;
+    migrated?: boolean;
+}
+
+export enum AppInstallationSource {
+    MARKETPLACE = 'marketplace',
+    PRIVATE = 'private',
+}
diff --git a/packages/apps-engine/src/server/storage/index.ts b/packages/apps-engine/src/server/storage/index.ts
new file mode 100644
index 000000000000..5f0993129bf3
--- /dev/null
+++ b/packages/apps-engine/src/server/storage/index.ts
@@ -0,0 +1,4 @@
+export { AppLogStorage, IAppLogStorageFindOptions } from './AppLogStorage';
+export { AppMetadataStorage } from './AppMetadataStorage';
+export { IAppStorageItem, AppInstallationSource } from './IAppStorageItem';
+export { AppSourceStorage } from './AppSourceStorage';
diff --git a/packages/apps-engine/tests/runner.ts b/packages/apps-engine/tests/runner.ts
new file mode 100644
index 000000000000..ea852e410b90
--- /dev/null
+++ b/packages/apps-engine/tests/runner.ts
@@ -0,0 +1,20 @@
+import { TestRunner, TestSet } from 'alsatian';
+import { TapBark } from 'tap-bark';
+
+(async function _appEngineTestRunner() {
+    const testSet = TestSet.create();
+    testSet.addTestsFromFiles('./**/*.spec.ts');
+
+    const testRunner = new TestRunner();
+
+    if (!process.argv.includes('--no-tap')) {
+        testRunner.outputStream.pipe(TapBark.create().getPipeable()).pipe(process.stdout);
+    } else {
+        testRunner.outputStream.pipe(process.stdout);
+    }
+
+    await testRunner.run(testSet);
+})().catch((e) => {
+    console.error(e);
+    process.exit(1);
+});
diff --git a/packages/apps-engine/tests/server/AppManager.spec.ts b/packages/apps-engine/tests/server/AppManager.spec.ts
new file mode 100644
index 000000000000..250e77686a6c
--- /dev/null
+++ b/packages/apps-engine/tests/server/AppManager.spec.ts
@@ -0,0 +1,122 @@
+import { Expect, SetupFixture, Teardown, Test } from 'alsatian';
+
+import { AppManager } from '../../src/server/AppManager';
+import { AppBridges } from '../../src/server/bridges';
+import { AppCompiler, AppPackageParser } from '../../src/server/compiler';
+import {
+    AppAccessorManager,
+    AppApiManager,
+    AppExternalComponentManager,
+    AppListenerManager,
+    AppSettingsManager,
+    AppSlashCommandManager,
+    AppVideoConfProviderManager,
+} from '../../src/server/managers';
+import type { AppLogStorage, AppMetadataStorage, AppSourceStorage } from '../../src/server/storage';
+import { SimpleClass, TestInfastructureSetup } from '../test-data/utilities';
+
+export class AppManagerTestFixture {
+    private testingInfastructure: TestInfastructureSetup;
+
+    @SetupFixture
+    public setupFixture() {
+        this.testingInfastructure = new TestInfastructureSetup();
+    }
+
+    @Teardown
+    public teardown() {
+        AppManager.Instance = undefined;
+    }
+
+    @Test('Setup of the AppManager')
+    public setupAppManager() {
+        const manager = new AppManager({
+            metadataStorage: this.testingInfastructure.getAppStorage(),
+            logStorage: this.testingInfastructure.getLogStorage(),
+            bridges: this.testingInfastructure.getAppBridges(),
+            sourceStorage: this.testingInfastructure.getSourceStorage(),
+        });
+
+        Expect(manager.getStorage()).toBe(this.testingInfastructure.getAppStorage());
+        Expect(manager.getLogStorage()).toBe(this.testingInfastructure.getLogStorage());
+        // NOTE: manager.getBridges() returns a proxy, so they are vlaue equality instead of reference equality
+        Expect(manager.getBridges()).toEqual(this.testingInfastructure.getAppBridges());
+        Expect(manager.areAppsLoaded()).toBe(false);
+
+        Expect(
+            () =>
+                new AppManager({
+                    metadataStorage: {} as AppMetadataStorage,
+                    logStorage: {} as AppLogStorage,
+                    bridges: {} as AppBridges,
+                    sourceStorage: {} as AppSourceStorage,
+                }),
+        ).toThrowError(Error, 'There is already a valid AppManager instance');
+    }
+
+    @Test('Invalid Storage and Bridge')
+    public invalidInstancesPassed() {
+        const invalid = new SimpleClass();
+
+        Expect(
+            () =>
+                new AppManager({
+                    metadataStorage: invalid as any,
+                    logStorage: invalid as any,
+                    bridges: invalid as any,
+                    sourceStorage: invalid as any,
+                }),
+        ).toThrowError(Error, 'Invalid instance of the AppMetadataStorage');
+
+        Expect(
+            () =>
+                new AppManager({
+                    metadataStorage: this.testingInfastructure.getAppStorage(),
+                    logStorage: invalid as any,
+                    bridges: invalid as any,
+                    sourceStorage: invalid as any,
+                }),
+        ).toThrowError(Error, 'Invalid instance of the AppLogStorage');
+
+        Expect(
+            () =>
+                new AppManager({
+                    metadataStorage: this.testingInfastructure.getAppStorage(),
+                    logStorage: this.testingInfastructure.getLogStorage(),
+                    bridges: invalid as any,
+                    sourceStorage: invalid as any,
+                }),
+        ).toThrowError(Error, 'Invalid instance of the AppBridges');
+
+        Expect(
+            () =>
+                new AppManager({
+                    metadataStorage: this.testingInfastructure.getAppStorage(),
+                    logStorage: this.testingInfastructure.getLogStorage(),
+                    bridges: this.testingInfastructure.getAppBridges(),
+                    sourceStorage: invalid as any,
+                }),
+        ).toThrowError(Error, 'Invalid instance of the AppSourceStorage');
+    }
+
+    @Test('Ensure Managers are Valid Types')
+    public verifyManagers() {
+        const manager = new AppManager({
+            metadataStorage: this.testingInfastructure.getAppStorage(),
+            logStorage: this.testingInfastructure.getLogStorage(),
+            bridges: this.testingInfastructure.getAppBridges(),
+            sourceStorage: this.testingInfastructure.getSourceStorage(),
+        });
+
+        Expect(manager.getParser() instanceof AppPackageParser).toBe(true);
+        Expect(manager.getCompiler() instanceof AppCompiler).toBe(true);
+        Expect(manager.getAccessorManager() instanceof AppAccessorManager).toBe(true);
+        Expect(manager.getBridges() instanceof AppBridges).toBe(true);
+        Expect(manager.getListenerManager() instanceof AppListenerManager).toBe(true);
+        Expect(manager.getCommandManager() instanceof AppSlashCommandManager).toBe(true);
+        Expect(manager.getExternalComponentManager() instanceof AppExternalComponentManager).toBe(true);
+        Expect(manager.getApiManager() instanceof AppApiManager).toBe(true);
+        Expect(manager.getSettingsManager() instanceof AppSettingsManager).toBe(true);
+        Expect(manager.getVideoConfProviderManager() instanceof AppVideoConfProviderManager).toBe(true);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/AppAccessors.spec.ts b/packages/apps-engine/tests/server/accessors/AppAccessors.spec.ts
new file mode 100644
index 000000000000..eb9e9b738caa
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/AppAccessors.spec.ts
@@ -0,0 +1,134 @@
+import { Expect, Setup, SetupFixture, Test } from 'alsatian';
+
+import { AppStatus } from '../../../src/definition/AppStatus';
+import type { AppMethod } from '../../../src/definition/metadata';
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppAccessors } from '../../../src/server/accessors';
+import type { AppBridges } from '../../../src/server/bridges';
+import { AppConsole } from '../../../src/server/logging';
+import type {
+    AppExternalComponentManager,
+    AppSchedulerManager,
+    AppSettingsManager,
+    AppSlashCommandManager,
+    AppVideoConfProviderManager,
+} from '../../../src/server/managers';
+import { AppAccessorManager, AppApiManager } from '../../../src/server/managers';
+import type { UIActionButtonManager } from '../../../src/server/managers/UIActionButtonManager';
+import type { AppsEngineRuntime } from '../../../src/server/runtime/AppsEngineRuntime';
+import type { AppLogStorage } from '../../../src/server/storage';
+import { TestsAppBridges } from '../../test-data/bridges/appBridges';
+import { TestsAppLogStorage } from '../../test-data/storage/logStorage';
+import { TestData } from '../../test-data/utilities';
+
+export class AppAccessorsTestFixture {
+    public static doThrow = false;
+
+    private mockBridges: TestsAppBridges;
+
+    private mockApp: ProxiedApp;
+
+    private mockAccessors: AppAccessorManager;
+
+    private mockManager: AppManager;
+
+    private mockApiManager: AppApiManager;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockBridges = new TestsAppBridges();
+
+        this.mockApp = {
+            getRuntime() {
+                return {} as AppsEngineRuntime;
+            },
+            getID() {
+                return 'testing';
+            },
+            getStatus() {
+                return Promise.resolve(AppStatus.AUTO_ENABLED);
+            },
+            setupLogger(method: AppMethod): AppConsole {
+                return new AppConsole(method);
+            },
+        } as ProxiedApp;
+
+        const bri = this.mockBridges;
+        const app = this.mockApp;
+        this.mockManager = {
+            getBridges(): AppBridges {
+                return bri;
+            },
+            getCommandManager() {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager() {
+                return {} as AppExternalComponentManager;
+            },
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'failMePlease' ? undefined : app;
+            },
+            getLogStorage(): AppLogStorage {
+                return new TestsAppLogStorage();
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+            getSettingsManager() {
+                return {} as AppSettingsManager;
+            },
+        } as AppManager;
+
+        this.mockAccessors = new AppAccessorManager(this.mockManager);
+        const ac = this.mockAccessors;
+        this.mockManager.getAccessorManager = function _getAccessorManager(): AppAccessorManager {
+            return ac;
+        };
+
+        this.mockApiManager = new AppApiManager(this.mockManager);
+        const apiManager = this.mockApiManager;
+        this.mockManager.getApiManager = function _getApiManager(): AppApiManager {
+            return apiManager;
+        };
+    }
+
+    @Setup
+    public setup() {
+        this.mockBridges = new TestsAppBridges();
+        const bri = this.mockBridges;
+        this.mockManager.getBridges = function _refreshedGetBridges(): AppBridges {
+            return bri;
+        };
+
+        this.mockApiManager = new AppApiManager(this.mockManager);
+        const apiManager = this.mockApiManager;
+        this.mockManager.getApiManager = function _refreshedGetApiManager(): AppApiManager {
+            return apiManager;
+        };
+    }
+
+    @Test()
+    public testAppAccessor() {
+        Expect(() => new AppAccessors({} as AppManager, '')).toThrow();
+        Expect(() => new AppAccessors(this.mockManager, 'testing')).not.toThrow();
+
+        const appAccessors = new AppAccessors(this.mockManager, 'testing');
+
+        Expect(appAccessors.environmentReader).toEqual(this.mockAccessors.getEnvironmentRead('testing'));
+        Expect(appAccessors.environmentWriter).toEqual(this.mockAccessors.getEnvironmentWrite('testing'));
+        Expect(appAccessors.reader).toEqual(this.mockAccessors.getReader('testing'));
+        Expect(appAccessors.http).toEqual(this.mockAccessors.getHttp('testing'));
+        Expect(appAccessors.providedApiEndpoints).toEqual(this.mockApiManager.listApis('testing'));
+
+        this.mockApiManager.addApi('testing', TestData.getApi('app-accessor-api'));
+
+        Expect(appAccessors.providedApiEndpoints).toEqual(this.mockApiManager.listApis('testing'));
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ConfigurationExtend.spec.ts b/packages/apps-engine/tests/server/accessors/ConfigurationExtend.spec.ts
new file mode 100644
index 000000000000..96930e025198
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ConfigurationExtend.spec.ts
@@ -0,0 +1,76 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type {
+    IApiExtend,
+    IExternalComponentsExtend,
+    IHttpExtend,
+    ISchedulerExtend,
+    ISettingsExtend,
+    ISlashCommandsExtend,
+    IUIExtend,
+    IVideoConfProvidersExtend,
+} from '../../../src/definition/accessors';
+import { ConfigurationExtend } from '../../../src/server/accessors';
+
+export class ConfigurationExtendTestFixture {
+    private he: IHttpExtend;
+
+    private se: ISettingsExtend;
+
+    private sce: ISlashCommandsExtend;
+
+    private api: IApiExtend;
+
+    private externalComponent: IExternalComponentsExtend;
+
+    private schedulerExtend: ISchedulerExtend;
+
+    private uiExtend: IUIExtend;
+
+    private vcProvidersExtend: IVideoConfProvidersExtend;
+
+    @SetupFixture
+    public setupFixture() {
+        this.he = {} as IHttpExtend;
+        this.se = {} as ISettingsExtend;
+        this.sce = {} as ISlashCommandsExtend;
+        this.api = {} as IApiExtend;
+        this.externalComponent = {} as IExternalComponentsExtend;
+        this.schedulerExtend = {} as ISchedulerExtend;
+        this.uiExtend = {} as IUIExtend;
+        this.vcProvidersExtend = {} as IVideoConfProvidersExtend;
+    }
+
+    @Test()
+    public useConfigurationExtend() {
+        Expect(
+            () =>
+                new ConfigurationExtend(
+                    this.he,
+                    this.se,
+                    this.sce,
+                    this.api,
+                    this.externalComponent,
+                    this.schedulerExtend,
+                    this.uiExtend,
+                    this.vcProvidersExtend,
+                ),
+        ).not.toThrow();
+
+        const se = new ConfigurationExtend(
+            this.he,
+            this.se,
+            this.sce,
+            this.api,
+            this.externalComponent,
+            this.schedulerExtend,
+            this.uiExtend,
+            this.vcProvidersExtend,
+        );
+        Expect(se.http).toBeDefined();
+        Expect(se.settings).toBeDefined();
+        Expect(se.slashCommands).toBeDefined();
+        Expect(se.externalComponents).toBeDefined();
+        Expect(se.videoConfProviders).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ConfigurationModify.spec.ts b/packages/apps-engine/tests/server/accessors/ConfigurationModify.spec.ts
new file mode 100644
index 000000000000..bc9a5dc21286
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ConfigurationModify.spec.ts
@@ -0,0 +1,28 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { ISchedulerModify, IServerSettingsModify, ISlashCommandsModify } from '../../../src/definition/accessors';
+import { ConfigurationModify } from '../../../src/server/accessors';
+
+export class ConfigurationExtendTestFixture {
+    private ssm: IServerSettingsModify;
+
+    private scm: ISlashCommandsModify;
+
+    private scheduler: ISchedulerModify;
+
+    @SetupFixture
+    public setupFixture() {
+        this.ssm = {} as IServerSettingsModify;
+        this.scm = {} as ISlashCommandsModify;
+        this.scheduler = {} as ISchedulerModify;
+    }
+
+    @Test()
+    public useConfigurationModify() {
+        Expect(() => new ConfigurationModify(this.ssm, this.scm, this.scheduler)).not.toThrow();
+
+        const sm = new ConfigurationModify(this.ssm, this.scm, this.scheduler);
+        Expect(sm.serverSettings).toBeDefined();
+        Expect(sm.slashCommands).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/EnvironmentRead.spec.ts b/packages/apps-engine/tests/server/accessors/EnvironmentRead.spec.ts
new file mode 100644
index 000000000000..228b5dec3153
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/EnvironmentRead.spec.ts
@@ -0,0 +1,29 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { IEnvironmentalVariableRead, IServerSettingRead, ISettingRead } from '../../../src/definition/accessors';
+import { EnvironmentRead } from '../../../src/server/accessors';
+
+export class EnvironmentReadTestFixture {
+    private evr: IEnvironmentalVariableRead;
+
+    private ssr: IServerSettingRead;
+
+    private sr: ISettingRead;
+
+    @SetupFixture
+    public setupFixture() {
+        this.evr = {} as IEnvironmentalVariableRead;
+        this.ssr = {} as IServerSettingRead;
+        this.sr = {} as ISettingRead;
+    }
+
+    @Test()
+    public useEnvironmentRead() {
+        Expect(() => new EnvironmentRead(this.sr, this.ssr, this.evr)).not.toThrow();
+
+        const er = new EnvironmentRead(this.sr, this.ssr, this.evr);
+        Expect(er.getSettings()).toBeDefined();
+        Expect(er.getServerSettings()).toBeDefined();
+        Expect(er.getEnvironmentVariables()).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/EnvironmentWrite.spec.ts b/packages/apps-engine/tests/server/accessors/EnvironmentWrite.spec.ts
new file mode 100644
index 000000000000..52d9b752f74c
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/EnvironmentWrite.spec.ts
@@ -0,0 +1,25 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { IServerSettingUpdater, ISettingUpdater } from '../../../src/definition/accessors';
+import { EnvironmentWrite } from '../../../src/server/accessors';
+
+export class EnvironmentWriteTestFixture {
+    private sr: ISettingUpdater;
+
+    private serverSettings: IServerSettingUpdater;
+
+    @SetupFixture
+    public setupFixture() {
+        this.sr = {} as ISettingUpdater;
+        this.serverSettings = {} as IServerSettingUpdater;
+    }
+
+    @Test()
+    public useEnvironmentWrite() {
+        Expect(() => new EnvironmentWrite(this.sr, this.serverSettings)).not.toThrow();
+
+        const er = new EnvironmentWrite(this.sr, this.serverSettings);
+        Expect(er.getSettings()).toBeDefined();
+        Expect(er.getServerSettings()).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/EnvironmentalVariableRead.spec.ts b/packages/apps-engine/tests/server/accessors/EnvironmentalVariableRead.spec.ts
new file mode 100644
index 000000000000..1e577a20f520
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/EnvironmentalVariableRead.spec.ts
@@ -0,0 +1,33 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import { EnvironmentalVariableRead } from '../../../src/server/accessors';
+import type { EnvironmentalVariableBridge } from '../../../src/server/bridges';
+
+export class EnvironmentalVariableReadAccessorTestFixture {
+    private mockEnvVarBridge: EnvironmentalVariableBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockEnvVarBridge = {
+            doGetValueByName(name: string, appId: string): Promise<string> {
+                return Promise.resolve('value');
+            },
+            doIsReadable(name: string, appId: string): Promise<boolean> {
+                return Promise.resolve(true);
+            },
+            doIsSet(name: string, appId: string): Promise<boolean> {
+                return Promise.resolve(false);
+            },
+        } as EnvironmentalVariableBridge;
+    }
+
+    @AsyncTest()
+    public async useEnvironmentalVariableRead() {
+        Expect(() => new EnvironmentalVariableRead(this.mockEnvVarBridge, 'testing')).not.toThrow();
+
+        const evr = new EnvironmentalVariableRead(this.mockEnvVarBridge, 'testing');
+        Expect(await evr.getValueByName('testing')).toBe('value');
+        Expect(await evr.isReadable('testing')).toBeTruthy();
+        Expect(await evr.isSet('testing2')).not.toBeTruthy();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/Http.spec.ts b/packages/apps-engine/tests/server/accessors/Http.spec.ts
new file mode 100644
index 000000000000..4848c9d062cf
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/Http.spec.ts
@@ -0,0 +1,128 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import type {
+    IHttpExtend,
+    IHttpPreRequestHandler,
+    IHttpPreResponseHandler,
+    IHttpRequest,
+    IHttpResponse,
+    IPersistence,
+    IRead,
+} from '../../../src/definition/accessors';
+import { Http, HttpExtend } from '../../../src/server/accessors';
+import type { AppBridges, HttpBridge, IHttpBridgeRequestInfo } from '../../../src/server/bridges';
+import type { AppAccessorManager } from '../../../src/server/managers';
+
+export class HttpAccessorTestFixture {
+    private mockAppId: string;
+
+    private mockHttpBridge: HttpBridge;
+
+    private mockAppBridge: AppBridges;
+
+    private mockHttpExtender: IHttpExtend;
+
+    private mockReader: IRead;
+
+    private mockPersis: IPersistence;
+
+    private mockAccessorManager: AppAccessorManager;
+
+    private mockPreRequestHandler: IHttpPreRequestHandler;
+
+    private mockPreResponseHandler: IHttpPreResponseHandler;
+
+    private mockResponse: IHttpResponse;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockAppId = 'testing-app';
+
+        this.mockResponse = { statusCode: 200 } as IHttpResponse;
+        const res = this.mockResponse;
+        this.mockHttpBridge = {
+            doCall(info: IHttpBridgeRequestInfo): Promise<IHttpResponse> {
+                return Promise.resolve(res);
+            },
+        } as HttpBridge;
+
+        const httpBridge = this.mockHttpBridge;
+        this.mockAppBridge = {
+            getHttpBridge(): HttpBridge {
+                return httpBridge;
+            },
+        } as AppBridges;
+
+        this.mockHttpExtender = new HttpExtend();
+
+        this.mockReader = {} as IRead;
+        this.mockPersis = {} as IPersistence;
+        const reader = this.mockReader;
+        const persis = this.mockPersis;
+        this.mockAccessorManager = {
+            getReader(appId: string): IRead {
+                return reader;
+            },
+            getPersistence(appId: string): IPersistence {
+                return persis;
+            },
+        } as AppAccessorManager;
+
+        this.mockPreRequestHandler = {
+            executePreHttpRequest(url: string, request: IHttpRequest, read: IRead, persistence: IPersistence): Promise<IHttpRequest> {
+                return Promise.resolve(request);
+            },
+        } as IHttpPreRequestHandler;
+
+        this.mockPreResponseHandler = {
+            executePreHttpResponse(response: IHttpResponse, read: IRead, persistence: IPersistence): Promise<IHttpResponse> {
+                return Promise.resolve(response);
+            },
+        } as IHttpPreResponseHandler;
+    }
+
+    @AsyncTest()
+    public async useHttp() {
+        Expect(() => new Http(this.mockAccessorManager, this.mockAppBridge, this.mockHttpExtender, this.mockAppId)).not.toThrow();
+
+        const http = new Http(this.mockAccessorManager, this.mockAppBridge, this.mockHttpExtender, this.mockAppId);
+
+        SpyOn(this.mockHttpBridge, 'doCall');
+        SpyOn(this.mockPreRequestHandler, 'executePreHttpRequest');
+        SpyOn(this.mockPreResponseHandler, 'executePreHttpResponse');
+
+        Expect(await http.get('url-here')).toBeDefined();
+        Expect(await http.post('url-here')).toBeDefined();
+        Expect(await http.put('url-here')).toBeDefined();
+        Expect(await http.del('url-here')).toBeDefined();
+        Expect(await http.get('url-here', { headers: {}, params: {} })).toBeDefined();
+
+        const request1 = {} as IHttpRequest;
+        this.mockHttpExtender.provideDefaultHeader('Auth-Token', 'Bearer asdfasdf');
+        Expect(await http.post('url-here', request1)).toBeDefined();
+        Expect(request1.headers['Auth-Token']).toBe('Bearer asdfasdf');
+        request1.headers['Auth-Token'] = 'mine';
+        Expect(await http.put('url-here', request1)).toBeDefined(); // Check it the default doesn't override provided
+        Expect(request1.headers['Auth-Token']).toBe('mine');
+
+        const request2 = {} as IHttpRequest;
+        this.mockHttpExtender.provideDefaultParam('count', '20');
+        Expect(await http.del('url-here', request2)).toBeDefined();
+        Expect(request2.params.count).toBe('20');
+        request2.params.count = '50';
+        Expect(await http.get('url-here', request2)).toBeDefined(); // Check it the default doesn't override provided
+        Expect(request2.params.count).toBe('50');
+
+        this.mockHttpExtender.providePreRequestHandler(this.mockPreRequestHandler);
+        const request3 = {} as IHttpRequest;
+        Expect(await http.post('url-here', request3)).toBeDefined();
+        Expect(this.mockPreRequestHandler.executePreHttpRequest).toHaveBeenCalledWith('url-here', request3, this.mockReader, this.mockPersis);
+        (this.mockHttpExtender as any).requests = [];
+
+        this.mockHttpExtender.providePreResponseHandler(this.mockPreResponseHandler);
+        Expect(await http.post('url-here')).toBeDefined();
+        Expect(this.mockPreResponseHandler.executePreHttpResponse).toHaveBeenCalledWith(this.mockResponse, this.mockReader, this.mockPersis);
+
+        Expect(this.mockHttpBridge.doCall).toHaveBeenCalled().exactly(11);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/HttpExtend.spec.ts b/packages/apps-engine/tests/server/accessors/HttpExtend.spec.ts
new file mode 100644
index 000000000000..ad805b6ee53f
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/HttpExtend.spec.ts
@@ -0,0 +1,83 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IHttpPreRequestHandler, IHttpPreResponseHandler } from '../../../src/definition/accessors';
+import { HttpExtend } from '../../../src/server/accessors';
+
+export class HttpExtendAccessorTestFixture {
+    @Test()
+    public basicHttpExtend() {
+        Expect(() => new HttpExtend()).not.toThrow();
+
+        const he = new HttpExtend();
+        Expect(he.getDefaultHeaders()).toEqual(new Map());
+        Expect(he.getDefaultParams()).toEqual(new Map());
+        Expect(he.getPreRequestHandlers()).toBeEmpty();
+        Expect(he.getPreResponseHandlers()).toBeEmpty();
+    }
+
+    @Test()
+    public defaultHeadersInHttpExtend() {
+        const he = new HttpExtend();
+
+        Expect(() => he.provideDefaultHeader('Auth', 'token')).not.toThrow();
+        Expect(he.getDefaultHeaders().size).toBe(1);
+        Expect(he.getDefaultHeaders().get('Auth')).toBe('token');
+
+        Expect(() =>
+            he.provideDefaultHeaders({
+                Auth: 'token2',
+                Another: 'thing',
+            }),
+        ).not.toThrow();
+        Expect(he.getDefaultHeaders().size).toBe(2);
+        Expect(he.getDefaultHeaders().get('Auth')).toBe('token2');
+        Expect(he.getDefaultHeaders().get('Another')).toBe('thing');
+    }
+
+    @Test()
+    public defaultParamsInHttpExtend() {
+        const he = new HttpExtend();
+
+        Expect(() => he.provideDefaultParam('id', 'abcdefg')).not.toThrow();
+        Expect(he.getDefaultParams().size).toBe(1);
+        Expect(he.getDefaultParams().get('id')).toBe('abcdefg');
+
+        Expect(() =>
+            he.provideDefaultParams({
+                id: 'zyxwvu',
+                count: '4',
+            }),
+        ).not.toThrow();
+        Expect(he.getDefaultParams().size).toBe(2);
+        Expect(he.getDefaultParams().get('id')).toBe('zyxwvu');
+        Expect(he.getDefaultParams().get('count')).toBe('4');
+    }
+
+    @Test()
+    public preRequestHandlersInHttpExtend() {
+        const he = new HttpExtend();
+
+        const preRequestHandler: IHttpPreRequestHandler = {
+            executePreHttpRequest: function _thing(url, req) {
+                return new Promise((resolve) => resolve(req));
+            },
+        };
+
+        Expect(() => he.providePreRequestHandler(preRequestHandler)).not.toThrow();
+        Expect(he.getPreRequestHandlers()).not.toBeEmpty();
+    }
+
+    @Test()
+    public preResponseHandlersInHttpExtend() {
+        const he = new HttpExtend();
+
+        const preResponseHandler: IHttpPreResponseHandler = {
+            executePreHttpResponse: function _thing(res) {
+                return new Promise((resolve) => resolve(res));
+            },
+        };
+
+        Expect(() => he.providePreResponseHandler(preResponseHandler)).not.toThrow();
+        Expect(he.getPreResponseHandlers()).not.toBeEmpty();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/MessageBuilder.spec.ts b/packages/apps-engine/tests/server/accessors/MessageBuilder.spec.ts
new file mode 100644
index 000000000000..b06e604c833a
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/MessageBuilder.spec.ts
@@ -0,0 +1,125 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IMessage } from '../../../src/definition/messages';
+import type { IUser } from '../../../src/definition/users';
+import { MessageBuilder, UserBuilder } from '../../../src/server/accessors';
+import { TestData } from '../../test-data/utilities';
+
+export class MessageBuilderAccessorTestFixture {
+    @Test()
+    public basicMessageBuilder() {
+        Expect(() => new MessageBuilder()).not.toThrow();
+        Expect(() => new MessageBuilder(TestData.getMessage())).not.toThrow();
+    }
+
+    @Test()
+    public settingOnMessageBuilder() {
+        const mbOnce = new MessageBuilder();
+
+        // setData just replaces the passed in object, so let's treat it differently
+        Expect(mbOnce.setData({ text: 'hello' } as IMessage)).toBe(mbOnce);
+        Expect((mbOnce as any).msg.text).toBe('hello');
+
+        const mbUpdate = new MessageBuilder();
+        const editor = new UserBuilder();
+        editor.setUsername('username');
+        editor.setDisplayName('name');
+
+        // setUpdateData keeps the ID passed in the message object, so let's treat it differently
+        Expect(mbUpdate.setUpdateData({ text: 'hello', id: 'messageID' } as IMessage, editor.getUser() as IUser)).toBe(mbUpdate);
+        Expect((mbUpdate as any).msg.text).toBe('hello');
+        Expect((mbUpdate as any).msg.id).toBe('messageID');
+
+        const msg: IMessage = {} as IMessage;
+        const mb = new MessageBuilder(msg);
+
+        Expect(mb.setThreadId('a random thread id')).toBe(mb);
+        Expect(msg.threadId).toBe('a random thread id');
+        Expect(mb.getThreadId()).toBe('a random thread id');
+
+        Expect(mb.setRoom(TestData.getRoom())).toBe(mb);
+        Expect(msg.room).toEqual(TestData.getRoom());
+        Expect(mb.getRoom()).toEqual(TestData.getRoom());
+
+        Expect(mb.setSender(TestData.getUser())).toBe(mb);
+        Expect(msg.sender).toEqual(TestData.getUser());
+        Expect(mb.getSender()).toEqual(TestData.getUser());
+
+        Expect(mb.setText('testing, yo!')).toBe(mb);
+        Expect(msg.text).toEqual('testing, yo!');
+        Expect(mb.getText()).toEqual('testing, yo!');
+
+        Expect(mb.setEmojiAvatar(':ghost:')).toBe(mb);
+        Expect(msg.emoji).toEqual(':ghost:');
+        Expect(mb.getEmojiAvatar()).toEqual(':ghost:');
+
+        Expect(mb.setAvatarUrl('https://rocket.chat/')).toBe(mb);
+        Expect(msg.avatarUrl).toEqual('https://rocket.chat/');
+        Expect(mb.getAvatarUrl()).toEqual('https://rocket.chat/');
+
+        Expect(mb.setUsernameAlias('Some Bot')).toBe(mb);
+        Expect(msg.alias).toEqual('Some Bot');
+        Expect(mb.getUsernameAlias()).toEqual('Some Bot');
+
+        Expect(msg.attachments).not.toBeDefined();
+        Expect(mb.getAttachments()).not.toBeDefined();
+        Expect(mb.addAttachment({ color: '#0ff' })).toBe(mb);
+        Expect(msg.attachments).toBeDefined();
+        Expect(mb.getAttachments()).toBeDefined();
+        Expect(msg.attachments).not.toBeEmpty();
+        Expect(mb.getAttachments()).not.toBeEmpty();
+
+        Expect(msg.attachments[0].color).toEqual('#0ff');
+        Expect(mb.getAttachments()[0].color).toEqual('#0ff');
+
+        Expect(mb.setAttachments([])).toBe(mb);
+        Expect(msg.attachments).toBeEmpty();
+        Expect(mb.getAttachments()).toBeEmpty();
+
+        delete msg.attachments;
+        Expect(() => mb.replaceAttachment(1, {})).toThrowError(Error, 'No attachment found at the index of "1" to replace.');
+        Expect(mb.addAttachment({})).toBe(mb);
+        Expect(mb.replaceAttachment(0, { color: '#f0f' })).toBe(mb);
+        Expect(msg.attachments[0].color).toEqual('#f0f');
+        Expect(mb.getAttachments()[0].color).toEqual('#f0f');
+
+        Expect(mb.removeAttachment(0)).toBe(mb);
+        Expect(msg.attachments).toBeEmpty();
+        Expect(mb.getAttachments()).toBeEmpty();
+
+        delete msg.attachments;
+        Expect(() => mb.removeAttachment(4)).toThrowError(Error, 'No attachment found at the index of "4" to remove.');
+
+        Expect(mb.setEditor(TestData.getUser('msg-editor-id'))).toBe(mb);
+        Expect(msg.editor).toBeDefined();
+        Expect(mb.getEditor()).toBeDefined();
+        Expect(msg.editor.id).toEqual('msg-editor-id');
+        Expect(mb.getEditor().id).toEqual('msg-editor-id');
+
+        Expect(mb.getMessage()).toBe(msg);
+        delete msg.room;
+        Expect(() => mb.getMessage()).toThrowError(Error, 'The "room" property is required.');
+
+        Expect(mb.setGroupable(true)).toBe(mb);
+        Expect(msg.groupable).toEqual(true);
+        Expect(mb.getGroupable()).toEqual(true);
+
+        Expect(mb.setGroupable(false)).toBe(mb);
+        Expect(msg.groupable).toEqual(false);
+        Expect(mb.getGroupable()).toEqual(false);
+
+        Expect(mb.setParseUrls(true)).toBe(mb);
+        Expect(msg.parseUrls).toEqual(true);
+        Expect(mb.getParseUrls()).toEqual(true);
+
+        Expect(mb.setParseUrls(false)).toBe(mb);
+        Expect(msg.parseUrls).toEqual(false);
+        Expect(mb.getParseUrls()).toEqual(false);
+
+        Expect(mb.addCustomField('thing', 'value')).toBe(mb);
+        Expect(msg.customFields).toBeDefined();
+        Expect(msg.customFields.thing).toBe('value');
+        Expect(() => mb.addCustomField('thing', 'second')).toThrowError(Error, 'The message already contains a custom field by the key: thing');
+        Expect(() => mb.addCustomField('thing.', 'second')).toThrowError(Error, 'The given key contains a period, which is not allowed. Key: thing.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/MessageExtender.spec.ts b/packages/apps-engine/tests/server/accessors/MessageExtender.spec.ts
new file mode 100644
index 000000000000..400b65a66f1b
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/MessageExtender.spec.ts
@@ -0,0 +1,35 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IMessage } from '../../../src/definition/messages';
+import { MessageExtender } from '../../../src/server/accessors';
+import { TestData } from '../../test-data/utilities';
+
+export class MessageExtenderAccessorTestFixture {
+    @Test()
+    public basicMessageExtender() {
+        Expect(() => new MessageExtender({} as IMessage)).not.toThrow();
+        Expect(() => new MessageExtender(TestData.getMessage())).not.toThrow();
+    }
+
+    @Test()
+    public usingMessageExtender() {
+        const msg: IMessage = {} as IMessage;
+        const me = new MessageExtender(msg);
+
+        Expect(msg.attachments).toBeDefined();
+        Expect(msg.attachments).toBeEmpty();
+        Expect(me.addCustomField('thing', 'value')).toBe(me);
+        Expect(msg.customFields).toBeDefined();
+        Expect(msg.customFields.thing).toBe('value');
+        Expect(() => me.addCustomField('thing', 'second')).toThrowError(Error, 'The message already contains a custom field by the key: thing');
+        Expect(() => me.addCustomField('thing.', 'second')).toThrowError(Error, 'The given key contains a period, which is not allowed. Key: thing.');
+
+        Expect(me.addAttachment({})).toBe(me);
+        Expect(msg.attachments.length).toBe(1);
+        Expect(me.addAttachments([{ collapsed: true }, { color: '#f00' }])).toBe(me);
+        Expect(msg.attachments.length).toBe(3);
+
+        Expect(me.getMessage()).not.toBe(msg);
+        Expect(me.getMessage()).toEqual(msg);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/MessageRead.spec.ts b/packages/apps-engine/tests/server/accessors/MessageRead.spec.ts
new file mode 100644
index 000000000000..144926c71592
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/MessageRead.spec.ts
@@ -0,0 +1,58 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { IMessage } from '../../../src/definition/messages';
+import { MessageRead } from '../../../src/server/accessors';
+import type { MessageBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class MessageReadAccessorTestFixture {
+    private msg: IMessage;
+
+    private mockMsgBridgeWithMsg: MessageBridge;
+
+    private mockMsgBridgeNoMsg: MessageBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.msg = TestData.getMessage();
+
+        const theMsg = this.msg;
+        this.mockMsgBridgeWithMsg = {
+            doGetById(id, appId): Promise<IMessage> {
+                return Promise.resolve(theMsg);
+            },
+        } as MessageBridge;
+
+        this.mockMsgBridgeNoMsg = {
+            doGetById(id, appId): Promise<IMessage> {
+                return Promise.resolve(undefined);
+            },
+        } as MessageBridge;
+    }
+
+    @AsyncTest()
+    public async expectDataFromMessageRead() {
+        Expect(() => new MessageRead(this.mockMsgBridgeWithMsg, 'testing-app')).not.toThrow();
+
+        const mr = new MessageRead(this.mockMsgBridgeWithMsg, 'testing-app');
+
+        Expect(await mr.getById('fake')).toBeDefined();
+        Expect(await mr.getById('fake')).toEqual(this.msg);
+
+        Expect(await mr.getSenderUser('fake')).toBeDefined();
+        Expect(await mr.getSenderUser('fake')).toEqual(this.msg.sender);
+
+        Expect(await mr.getRoom('fake')).toBeDefined();
+        Expect(await mr.getRoom('fake')).toEqual(this.msg.room);
+    }
+
+    @AsyncTest()
+    public async doNotExpectDataFromMessageRead() {
+        Expect(() => new MessageRead(this.mockMsgBridgeNoMsg, 'testing')).not.toThrow();
+
+        const nomr = new MessageRead(this.mockMsgBridgeNoMsg, 'testing');
+        Expect(await nomr.getById('fake')).not.toBeDefined();
+        Expect(await nomr.getSenderUser('fake')).not.toBeDefined();
+        Expect(await nomr.getRoom('fake')).not.toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/Modify.spec.ts b/packages/apps-engine/tests/server/accessors/Modify.spec.ts
new file mode 100644
index 000000000000..57e8cd7c1537
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/Modify.spec.ts
@@ -0,0 +1,44 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import { Modify } from '../../../src/server/accessors';
+import type { AppBridges, MessageBridge, ModerationBridge, SchedulerBridge, UiInteractionBridge, UserBridge } from '../../../src/server/bridges';
+import type { OAuthAppsBridge } from '../../../src/server/bridges/OAuthAppsBridge';
+
+export class ModifyAccessorTestFixture {
+    private mockAppBridges: AppBridges;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockAppBridges = {
+            getUserBridge(): UserBridge {
+                return {} as UserBridge;
+            },
+            getMessageBridge(): MessageBridge {
+                return {} as MessageBridge;
+            },
+            getUiInteractionBridge(): UiInteractionBridge {
+                return {} as UiInteractionBridge;
+            },
+            getSchedulerBridge() {
+                return {} as SchedulerBridge;
+            },
+            getOAuthAppsBridge() {
+                return {} as OAuthAppsBridge;
+            },
+            getModerationBridge() {
+                return {} as ModerationBridge;
+            },
+        } as AppBridges;
+    }
+
+    @Test()
+    public useModify() {
+        Expect(() => new Modify(this.mockAppBridges, 'testing')).not.toThrow();
+
+        const md = new Modify(this.mockAppBridges, 'testing');
+        Expect(md.getCreator()).toBeDefined();
+        Expect(md.getExtender()).toBeDefined();
+        Expect(md.getNotifier()).toBeDefined();
+        Expect(md.getUpdater()).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ModifyCreator.spec.ts b/packages/apps-engine/tests/server/accessors/ModifyCreator.spec.ts
new file mode 100644
index 000000000000..688401409fea
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ModifyCreator.spec.ts
@@ -0,0 +1,129 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import type { IMessage } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import { RoomType } from '../../../src/definition/rooms';
+import type { IUser } from '../../../src/definition/users';
+import { UserStatusConnection, UserType } from '../../../src/definition/users';
+import { ModifyCreator } from '../../../src/server/accessors';
+import type { AppBridges, MessageBridge, RoomBridge, UserBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class ModifyCreatorTestFixture {
+    private mockAppId: string;
+
+    private mockRoomBridge: RoomBridge;
+
+    private mockMessageBridge: MessageBridge;
+
+    private mockAppBridge: AppBridges;
+
+    private mockAppUser: IUser;
+
+    private mockUserBridge: UserBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockAppId = 'testing-app';
+
+        this.mockAppUser = {
+            id: 'mockAppUser',
+            isEnabled: true,
+            name: 'mockAppUser',
+            roles: ['app'],
+            status: 'online',
+            statusConnection: UserStatusConnection.UNDEFINED,
+            type: UserType.APP,
+            username: 'mockAppUser',
+            emails: [],
+            utcOffset: -5,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+            lastLoginAt: new Date(),
+        };
+
+        this.mockRoomBridge = {
+            doCreate(room: IRoom, members: Array<string>, appId: string): Promise<string> {
+                return Promise.resolve('roomId');
+            },
+        } as RoomBridge;
+
+        this.mockMessageBridge = {
+            doCreate(msg: IMessage, appId: string): Promise<string> {
+                return Promise.resolve('msgId');
+            },
+        } as MessageBridge;
+
+        this.mockUserBridge = {
+            doGetAppUser: (appId: string) => {
+                return Promise.resolve(this.mockAppUser);
+            },
+        } as UserBridge;
+
+        this.mockAppBridge = {
+            getMessageBridge: () => this.mockMessageBridge,
+            getRoomBridge: () => this.mockRoomBridge,
+            getUserBridge: () => this.mockUserBridge,
+        } as AppBridges;
+    }
+
+    @AsyncTest()
+    public async basicModifyCreator() {
+        Expect(() => new ModifyCreator(this.mockAppBridge, this.mockAppId)).not.toThrow();
+
+        const mc = new ModifyCreator(this.mockAppBridge, this.mockAppId);
+        Expect(mc.startMessage()).toBeDefined();
+        Expect(mc.startMessage({ id: 'value' } as IMessage)).toBeDefined();
+        Expect(mc.startRoom()).toBeDefined();
+        Expect(mc.startRoom({ id: 'value' } as IRoom)).toBeDefined();
+
+        await Expect(() => mc.finish({} as any)).toThrowErrorAsync(Error, 'Invalid builder passed to the ModifyCreator.finish function.');
+    }
+
+    @AsyncTest()
+    public async msgModifyCreator() {
+        const mc = new ModifyCreator(this.mockAppBridge, this.mockAppId);
+
+        const msg = {} as IMessage;
+        const msgBd = mc.startMessage(msg);
+        await Expect(() => mc.finish(msgBd)).toThrowErrorAsync(Error, 'The "room" property is required.');
+        msgBd.setRoom(TestData.getRoom());
+        Expect(msg.room).toBeDefined();
+        await Expect(() => mc.finish(msgBd)).not.toThrowErrorAsync(Error, 'Invalid sender assigned to the message.');
+        msgBd.setSender(TestData.getUser());
+        Expect(msg.sender).toBeDefined();
+
+        const msgBriSpy = SpyOn(this.mockMessageBridge, 'doCreate');
+        Expect(await mc.finish(msgBd)).toBe('msgId');
+        Expect(msgBriSpy).toHaveBeenCalledWith(msg, this.mockAppId);
+        msgBriSpy.restore();
+    }
+
+    @AsyncTest()
+    public async roomModifyCreator() {
+        const mc = new ModifyCreator(this.mockAppBridge, this.mockAppId);
+
+        const room = {} as IRoom;
+        const roomBd = mc.startRoom(room);
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid type assigned to the room.');
+        roomBd.setType(RoomType.CHANNEL);
+        Expect(room.type).toBe(RoomType.CHANNEL);
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid creator assigned to the room.');
+        roomBd.setCreator(TestData.getUser());
+        Expect(room.creator).toBeDefined();
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid slugifiedName assigned to the room.');
+        roomBd.setSlugifiedName('testing-room');
+        Expect(room.slugifiedName).toBe('testing-room');
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid displayName assigned to the room.');
+        roomBd.setDisplayName('Display Name');
+        Expect(room.displayName).toBe('Display Name');
+
+        const roomBriSpy = SpyOn(this.mockRoomBridge, 'doCreate');
+        Expect(await mc.finish(roomBd)).toBe('roomId');
+        Expect(roomBriSpy).toHaveBeenCalledWith(room, roomBd.getMembersToBeAddedUsernames(), this.mockAppId);
+        roomBriSpy.restore();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ModifyExtender.spec.ts b/packages/apps-engine/tests/server/accessors/ModifyExtender.spec.ts
new file mode 100644
index 000000000000..ddf09de6f71b
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ModifyExtender.spec.ts
@@ -0,0 +1,74 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import type { IMessage } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import { ModifyExtender } from '../../../src/server/accessors';
+import type { AppBridges, MessageBridge, RoomBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class ModifyExtenderTestFixture {
+    private mockAppId: string;
+
+    private mockRoomBridge: RoomBridge;
+
+    private mockMessageBridge: MessageBridge;
+
+    private mockAppBridge: AppBridges;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockAppId = 'testing-app';
+
+        this.mockRoomBridge = {
+            doGetById(roomId: string, appId: string): Promise<IRoom> {
+                return Promise.resolve(TestData.getRoom());
+            },
+            doUpdate(room: IRoom, members: Array<string>, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+        } as RoomBridge;
+
+        this.mockMessageBridge = {
+            doGetById(msgId: string, appId: string): Promise<IMessage> {
+                return Promise.resolve(TestData.getMessage());
+            },
+            doUpdate(msg: IMessage, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+        } as MessageBridge;
+
+        const rmBridge = this.mockRoomBridge;
+        const msgBridge = this.mockMessageBridge;
+        this.mockAppBridge = {
+            getMessageBridge() {
+                return msgBridge;
+            },
+            getRoomBridge() {
+                return rmBridge;
+            },
+        } as AppBridges;
+    }
+
+    @AsyncTest()
+    public async useModifyExtender() {
+        Expect(() => new ModifyExtender(this.mockAppBridge, this.mockAppId)).not.toThrow();
+
+        const me = new ModifyExtender(this.mockAppBridge, this.mockAppId);
+
+        SpyOn(this.mockRoomBridge, 'doGetById');
+        SpyOn(this.mockRoomBridge, 'doUpdate');
+        SpyOn(this.mockMessageBridge, 'doGetById');
+        SpyOn(this.mockMessageBridge, 'doUpdate');
+
+        Expect(await me.extendRoom('roomId', TestData.getUser())).toBeDefined();
+        Expect(this.mockRoomBridge.doGetById).toHaveBeenCalledWith('roomId', this.mockAppId);
+        Expect(await me.extendMessage('msgId', TestData.getUser())).toBeDefined();
+        Expect(this.mockMessageBridge.doGetById).toHaveBeenCalledWith('msgId', this.mockAppId);
+
+        await Expect(() => me.finish({} as any)).toThrowErrorAsync(Error, 'Invalid extender passed to the ModifyExtender.finish function.');
+        Expect(await me.finish(await me.extendRoom('roomId', TestData.getUser()))).not.toBeDefined();
+        Expect(this.mockRoomBridge.doUpdate).toHaveBeenCalled();
+        Expect(await me.finish(await me.extendMessage('msgId', TestData.getUser()))).not.toBeDefined();
+        Expect(this.mockMessageBridge.doUpdate).toHaveBeenCalled();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ModifyUpdater.spec.ts b/packages/apps-engine/tests/server/accessors/ModifyUpdater.spec.ts
new file mode 100644
index 000000000000..e4b34de74f30
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ModifyUpdater.spec.ts
@@ -0,0 +1,139 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import type { ILivechatRoom } from '../../../src/definition/livechat/ILivechatRoom';
+import type { IMessage } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import { RoomType } from '../../../src/definition/rooms';
+import { MessageBuilder, ModifyUpdater, RoomBuilder } from '../../../src/server/accessors';
+import type { AppBridges, MessageBridge, RoomBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class ModifyUpdaterTestFixture {
+    private mockAppId: string;
+
+    private mockRoomBridge: RoomBridge;
+
+    private mockMessageBridge: MessageBridge;
+
+    private mockAppBridge: AppBridges;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockAppId = 'testing-app';
+
+        this.mockRoomBridge = {
+            doGetById(roomId: string, appId: string): Promise<IRoom> {
+                return Promise.resolve(TestData.getRoom());
+            },
+            doUpdate(room: IRoom, members: Array<string>, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+        } as RoomBridge;
+
+        this.mockMessageBridge = {
+            doGetById(msgId: string, appId: string): Promise<IMessage> {
+                return Promise.resolve(TestData.getMessage());
+            },
+            doUpdate(msg: IMessage, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+        } as MessageBridge;
+
+        const rmBridge = this.mockRoomBridge;
+        const msgBridge = this.mockMessageBridge;
+        this.mockAppBridge = {
+            getMessageBridge() {
+                return msgBridge;
+            },
+            getRoomBridge() {
+                return rmBridge;
+            },
+        } as AppBridges;
+    }
+
+    @AsyncTest()
+    public async basicModifyUpdater() {
+        Expect(() => new ModifyUpdater(this.mockAppBridge, this.mockAppId)).not.toThrow();
+
+        const mc = new ModifyUpdater(this.mockAppBridge, this.mockAppId);
+        Expect(mc.message('msgId', TestData.getUser())).toBeDefined();
+        Expect(mc.room('roomId', TestData.getUser())).toBeDefined();
+
+        await Expect(() => mc.finish({} as any)).toThrowErrorAsync(Error, 'Invalid builder passed to the ModifyUpdater.finish function.');
+    }
+
+    @AsyncTest()
+    public async msgModifyUpdater() {
+        const mc = new ModifyUpdater(this.mockAppBridge, this.mockAppId);
+
+        const msg = {} as IMessage;
+        const msgBd = new MessageBuilder(msg);
+        await Expect(() => mc.finish(msgBd)).toThrowErrorAsync(Error, 'The "room" property is required.');
+        msgBd.setRoom(TestData.getRoom());
+        Expect(msg.room).toBeDefined();
+        await Expect(() => mc.finish(msgBd)).toThrowErrorAsync(Error, "Invalid message, can't update a message without an id.");
+        msg.id = 'testing-msg';
+        await Expect(() => mc.finish(msgBd)).toThrowErrorAsync(Error, 'Invalid sender assigned to the message.');
+        msgBd.setSender(TestData.getUser());
+        Expect(msg.sender).toBeDefined();
+
+        const msgBriSpy = SpyOn(this.mockMessageBridge, 'doUpdate');
+        Expect(await mc.finish(msgBd)).not.toBeDefined();
+        Expect(msgBriSpy).toHaveBeenCalledWith(msg, this.mockAppId);
+        msgBriSpy.restore();
+    }
+
+    @AsyncTest()
+    public async roomModifyUpdater() {
+        const mc = new ModifyUpdater(this.mockAppBridge, this.mockAppId);
+
+        const room = {} as IRoom;
+        const roomBd = new RoomBuilder(room);
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid room, can not update a room without an id.');
+        room.id = 'testing-room';
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid type assigned to the room.');
+        roomBd.setType(RoomType.CHANNEL);
+        Expect(room.type).toBe(RoomType.CHANNEL);
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid creator assigned to the room.');
+        roomBd.setCreator(TestData.getUser());
+        Expect(room.creator).toBeDefined();
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid slugifiedName assigned to the room.');
+        roomBd.setSlugifiedName('testing-room');
+        Expect(room.slugifiedName).toBe('testing-room');
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid displayName assigned to the room.');
+        roomBd.setDisplayName('Display Name');
+        Expect(room.displayName).toBe('Display Name');
+
+        const roomBriSpy = SpyOn(this.mockRoomBridge, 'doUpdate');
+        Expect(await mc.finish(roomBd)).not.toBeDefined();
+        Expect(roomBriSpy).toHaveBeenCalledWith(room, roomBd.getMembersToBeAddedUsernames(), this.mockAppId);
+        roomBriSpy.restore();
+    }
+
+    @AsyncTest()
+    public async livechatRoomModifyUpdater() {
+        const mc = new ModifyUpdater(this.mockAppBridge, this.mockAppId);
+
+        const room = {} as ILivechatRoom;
+        const roomBd = new RoomBuilder(room);
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid room, can not update a room without an id.');
+        room.id = 'testing-room';
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid type assigned to the room.');
+        roomBd.setType(RoomType.LIVE_CHAT);
+        Expect(room.type).toBe(RoomType.LIVE_CHAT);
+
+        await Expect(() => mc.finish(roomBd)).toThrowErrorAsync(Error, 'Invalid displayName assigned to the room.');
+        roomBd.setDisplayName('Display Name');
+        Expect(room.displayName).toBe('Display Name');
+
+        const roomBriSpy = SpyOn(this.mockRoomBridge, 'doUpdate');
+        Expect(await mc.finish(roomBd)).not.toBeDefined();
+        Expect(roomBriSpy).toHaveBeenCalledWith(room, roomBd.getMembersToBeAddedUsernames(), this.mockAppId);
+        roomBriSpy.restore();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/Notifier.spec.ts b/packages/apps-engine/tests/server/accessors/Notifier.spec.ts
new file mode 100644
index 000000000000..26d9fde7c6cd
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/Notifier.spec.ts
@@ -0,0 +1,37 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { IMessage } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import type { IUser } from '../../../src/definition/users';
+import { MessageBuilder, Notifier } from '../../../src/server/accessors';
+import type { MessageBridge, UserBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class NotifierAccessorTestFixture {
+    private mockUserBridge: UserBridge;
+
+    private mockMsgBridge: MessageBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockMsgBridge = {
+            doNotifyUser(user: IUser, msg: IMessage, appId: string): Promise<void> {
+                // TODO: Spy on these and ensure they're called with the right parameters
+                return Promise.resolve();
+            },
+            doNotifyRoom(room: IRoom, msg: IMessage, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+        } as MessageBridge;
+    }
+
+    @AsyncTest()
+    public async useNotifier() {
+        Expect(() => new Notifier(this.mockUserBridge, this.mockMsgBridge, 'testing')).not.toThrow();
+
+        const noti = new Notifier(this.mockUserBridge, this.mockMsgBridge, 'testing');
+        await Expect(() => noti.notifyRoom(TestData.getRoom(), TestData.getMessage())).not.toThrowAsync();
+        await Expect(() => noti.notifyUser(TestData.getUser(), TestData.getMessage())).not.toThrowAsync();
+        Expect(noti.getMessageBuilder() instanceof MessageBuilder).toBe(true);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/Persistence.spec.ts b/packages/apps-engine/tests/server/accessors/Persistence.spec.ts
new file mode 100644
index 000000000000..d704e7997638
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/Persistence.spec.ts
@@ -0,0 +1,82 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import { RocketChatAssociationModel, RocketChatAssociationRecord } from '../../../src/definition/metadata';
+import { Persistence } from '../../../src/server/accessors';
+import type { PersistenceBridge } from '../../../src/server/bridges';
+
+export class PersistenceAccessorTestFixture {
+    private mockAppId: string;
+
+    private mockPersisBridge: PersistenceBridge;
+
+    private mockAssoc: RocketChatAssociationRecord;
+
+    private data: object;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockAppId = 'testing-app';
+        this.data = { hello: 'world' };
+
+        const theData = this.data;
+        this.mockPersisBridge = {
+            doCreate(data: any, appId: string): Promise<string> {
+                return Promise.resolve('id');
+            },
+            doCreateWithAssociations(data: any, assocs: Array<RocketChatAssociationRecord>, appId: string): Promise<string> {
+                return Promise.resolve('id2');
+            },
+            doUpdate(id: string, data: object, upsert: boolean, appId: string): Promise<string> {
+                return Promise.resolve('id3');
+            },
+            doRemove(id: string, appId: string): Promise<object> {
+                return Promise.resolve(theData);
+            },
+            doRemoveByAssociations(assocs: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object>> {
+                return Promise.resolve([theData]);
+            },
+            doUpdateByAssociations(associations: Array<RocketChatAssociationRecord>, data: object, upsert: boolean, appId: string): Promise<string> {
+                return Promise.resolve('id4');
+            },
+        } as PersistenceBridge;
+        this.mockAssoc = new RocketChatAssociationRecord(RocketChatAssociationModel.USER, 'fake-id');
+    }
+
+    @AsyncTest()
+    public async usePersistenceAccessor() {
+        Expect(() => new Persistence(this.mockPersisBridge, this.mockAppId)).not.toThrow();
+
+        const sp1 = SpyOn(this.mockPersisBridge, 'doCreate');
+        const sp2 = SpyOn(this.mockPersisBridge, 'doCreateWithAssociations');
+        const sp3 = SpyOn(this.mockPersisBridge, 'doUpdate');
+        const sp4 = SpyOn(this.mockPersisBridge, 'doRemove');
+        const sp5 = SpyOn(this.mockPersisBridge, 'doRemoveByAssociations');
+        const sp6 = SpyOn(this.mockPersisBridge, 'doUpdateByAssociations');
+
+        const ps = new Persistence(this.mockPersisBridge, this.mockAppId);
+
+        Expect(await ps.create(this.data)).toBe('id');
+        Expect(this.mockPersisBridge.doCreate).toHaveBeenCalledWith(this.data, this.mockAppId);
+        Expect(await ps.createWithAssociation(this.data, this.mockAssoc)).toBe('id2');
+        Expect(await ps.createWithAssociations(this.data, [this.mockAssoc])).toBe('id2');
+        Expect(this.mockPersisBridge.doCreateWithAssociations).toHaveBeenCalled().exactly(2);
+        Expect(await ps.update('id', this.data)).toBe('id3');
+        Expect(this.mockPersisBridge.doUpdate).toHaveBeenCalledWith('id', this.data, false, this.mockAppId);
+        Expect(await ps.remove('id')).toEqual(this.data);
+        Expect(this.mockPersisBridge.doRemove).toHaveBeenCalledWith('id', this.mockAppId);
+        Expect(await ps.removeByAssociation(this.mockAssoc)).toBeDefined();
+        Expect(await ps.removeByAssociations([this.mockAssoc])).toBeDefined();
+        Expect(this.mockPersisBridge.doRemoveByAssociations).toHaveBeenCalled().exactly(2);
+
+        Expect(await ps.updateByAssociation(this.mockAssoc, this.data)).toBeDefined();
+        Expect(await ps.updateByAssociations([this.mockAssoc], this.data)).toBeDefined();
+        Expect(this.mockPersisBridge.doUpdateByAssociations).toHaveBeenCalled().exactly(2);
+
+        sp1.restore();
+        sp2.restore();
+        sp3.restore();
+        sp4.restore();
+        sp5.restore();
+        sp6.restore();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/PersistenceRead.spec.ts b/packages/apps-engine/tests/server/accessors/PersistenceRead.spec.ts
new file mode 100644
index 000000000000..f9a1a191ded5
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/PersistenceRead.spec.ts
@@ -0,0 +1,31 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { RocketChatAssociationRecord } from '../../../src/definition/metadata';
+import { PersistenceRead } from '../../../src/server/accessors';
+import type { PersistenceBridge } from '../../../src/server/bridges';
+
+export class PersistenceReadTestFixture {
+    private mockPersisBridge: PersistenceBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockPersisBridge = {
+            doReadById(id: string, appId: string): Promise<object> {
+                return Promise.resolve({ id, appId });
+            },
+            doReadByAssociations(assocs: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object>> {
+                return Promise.resolve([{ appId }]);
+            },
+        } as PersistenceBridge;
+    }
+
+    @AsyncTest()
+    public async usePersistenceRead() {
+        Expect(() => new PersistenceRead(this.mockPersisBridge, 'testing')).not.toThrow();
+
+        const pr = new PersistenceRead(this.mockPersisBridge, 'testing');
+        Expect(await pr.read('thing')).toBeDefined();
+        Expect(await pr.readByAssociation({} as RocketChatAssociationRecord)).toBeDefined();
+        Expect(await pr.readByAssociations([{} as RocketChatAssociationRecord])).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/Reader.spec.ts b/packages/apps-engine/tests/server/accessors/Reader.spec.ts
new file mode 100644
index 000000000000..f3aa299880b9
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/Reader.spec.ts
@@ -0,0 +1,112 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type {
+    ICloudWorkspaceRead,
+    IEnvironmentRead,
+    ILivechatRead,
+    IMessageRead,
+    INotifier,
+    IPersistenceRead,
+    IRoleRead,
+    IRoomRead,
+    IUploadRead,
+    IUserRead,
+    IVideoConferenceRead,
+} from '../../../src/definition/accessors';
+import type { IOAuthAppsReader } from '../../../src/definition/accessors/IOAuthAppsReader';
+import type { IThreadRead } from '../../../src/definition/accessors/IThreadRead';
+import { Reader } from '../../../src/server/accessors';
+
+export class ReaderAccessorTestFixture {
+    private env: IEnvironmentRead;
+
+    private msg: IMessageRead;
+
+    private pr: IPersistenceRead;
+
+    private rm: IRoomRead;
+
+    private ur: IUserRead;
+
+    private ni: INotifier;
+
+    private livechat: ILivechatRead;
+
+    private upload: IUploadRead;
+
+    private cloud: ICloudWorkspaceRead;
+
+    private videoConf: IVideoConferenceRead;
+
+    private oauthApps: IOAuthAppsReader;
+
+    private thread: IThreadRead;
+
+    private role: IRoleRead;
+
+    @SetupFixture
+    public setupFixture() {
+        this.env = {} as IEnvironmentRead;
+        this.msg = {} as IMessageRead;
+        this.pr = {} as IPersistenceRead;
+        this.rm = {} as IRoomRead;
+        this.ur = {} as IUserRead;
+        this.ni = {} as INotifier;
+        this.livechat = {} as ILivechatRead;
+        this.upload = {} as IUploadRead;
+        this.cloud = {} as ICloudWorkspaceRead;
+        this.videoConf = {} as IVideoConferenceRead;
+        this.oauthApps = {} as IOAuthAppsReader;
+        this.thread = {} as IThreadRead;
+        this.role = {} as IRoleRead;
+    }
+
+    @Test()
+    public useReader() {
+        Expect(
+            () =>
+                new Reader(
+                    this.env,
+                    this.msg,
+                    this.pr,
+                    this.rm,
+                    this.ur,
+                    this.ni,
+                    this.livechat,
+                    this.upload,
+                    this.cloud,
+                    this.videoConf,
+                    this.oauthApps,
+                    this.thread,
+                    this.role,
+                ),
+        ).not.toThrow();
+
+        const rd = new Reader(
+            this.env,
+            this.msg,
+            this.pr,
+            this.rm,
+            this.ur,
+            this.ni,
+            this.livechat,
+            this.upload,
+            this.cloud,
+            this.videoConf,
+            this.oauthApps,
+            this.thread,
+            this.role,
+        );
+
+        Expect(rd.getEnvironmentReader()).toBeDefined();
+        Expect(rd.getMessageReader()).toBeDefined();
+        Expect(rd.getNotifier()).toBeDefined();
+        Expect(rd.getPersistenceReader()).toBeDefined();
+        Expect(rd.getRoomReader()).toBeDefined();
+        Expect(rd.getUserReader()).toBeDefined();
+        Expect(rd.getLivechatReader()).toBeDefined();
+        Expect(rd.getUploadReader()).toBeDefined();
+        Expect(rd.getVideoConferenceReader()).toBeDefined();
+        Expect(rd.getRoleReader()).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/RoomBuilder.spec.ts b/packages/apps-engine/tests/server/accessors/RoomBuilder.spec.ts
new file mode 100644
index 000000000000..2c3b59f6520e
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/RoomBuilder.spec.ts
@@ -0,0 +1,90 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IRoom } from '../../../src/definition/rooms';
+import { RoomType } from '../../../src/definition/rooms';
+import { RoomBuilder } from '../../../src/server/accessors';
+import { TestData } from '../../test-data/utilities';
+
+export class RoomBuilderAccessorTestFixture {
+    @Test()
+    public basicRoomBuilder() {
+        Expect(() => new RoomBuilder()).not.toThrow();
+        Expect(() => new RoomBuilder(TestData.getRoom())).not.toThrow();
+    }
+
+    @Test()
+    public settingOnRoomBuilder() {
+        const rbOnce = new RoomBuilder();
+
+        // setData just replaces the passed in object, so let's treat it differently
+        Expect(rbOnce.setData({ displayName: 'Testing Channel' } as IRoom)).toBe(rbOnce);
+        Expect((rbOnce as any).room.displayName).toBe('Testing Channel');
+
+        const room: IRoom = {} as IRoom;
+        const rb = new RoomBuilder(room);
+        Expect(rb.setDisplayName('Just a Test')).toBe(rb);
+        Expect(room.displayName).toEqual('Just a Test');
+        Expect(rb.getDisplayName()).toEqual('Just a Test');
+
+        Expect(rb.setSlugifiedName('just_a_test')).toBe(rb);
+        Expect(room.slugifiedName).toEqual('just_a_test');
+        Expect(rb.getSlugifiedName()).toEqual('just_a_test');
+
+        Expect(rb.setType(RoomType.CHANNEL)).toBe(rb);
+        Expect(room.type).toEqual(RoomType.CHANNEL);
+        Expect(rb.getType()).toEqual(RoomType.CHANNEL);
+
+        Expect(rb.setCreator(TestData.getUser())).toBe(rb);
+        Expect(room.creator).toEqual(TestData.getUser());
+        Expect(rb.getCreator()).toEqual(TestData.getUser());
+
+        Expect(rb.addUsername('testing.username')).toBe(rb);
+        Expect(room.usernames).not.toBeDefined();
+        Expect(rb.getUsernames()).not.toBeEmpty();
+        Expect(room.usernames).not.toBeDefined();
+        Expect(rb.getUsernames()[0]).toEqual('testing.username');
+        Expect(rb.addUsername('another.username')).toBe(rb);
+        Expect(room.usernames).not.toBeDefined();
+        Expect(rb.getUsernames().length).toBe(2);
+
+        Expect(rb.setUsernames([])).toBe(rb);
+        Expect(room.usernames).not.toBeDefined();
+        Expect(rb.getUsernames()).toBeEmpty();
+
+        Expect(rb.addMemberToBeAddedByUsername('testing.username')).toBe(rb);
+        Expect(rb.getMembersToBeAddedUsernames()).not.toBeEmpty();
+        Expect(rb.getMembersToBeAddedUsernames()[0]).toEqual('testing.username');
+        Expect(rb.addMemberToBeAddedByUsername('another.username')).toBe(rb);
+        Expect(rb.getMembersToBeAddedUsernames().length).toBe(2);
+
+        Expect(rb.setMembersToBeAddedByUsernames([])).toBe(rb);
+        Expect(rb.getMembersToBeAddedUsernames()).toBeEmpty();
+
+        Expect(rb.setDefault(true)).toBe(rb);
+        Expect(room.isDefault).toBeTruthy();
+        Expect(rb.getIsDefault()).toBeTruthy();
+
+        Expect(rb.setReadOnly(false)).toBe(rb);
+        Expect(room.isReadOnly).not.toBeTruthy();
+        Expect(rb.getIsReadOnly()).not.toBeTruthy();
+
+        Expect(rb.setDisplayingOfSystemMessages(true)).toBe(rb);
+        Expect(room.displaySystemMessages).toBeTruthy();
+        Expect(rb.getDisplayingOfSystemMessages()).toBeTruthy();
+
+        Expect(rb.addCustomField('thing', {})).toBe(rb);
+        Expect(room.customFields).not.toBeEmpty();
+        Expect(rb.getCustomFields()).not.toBeEmpty();
+        Expect(room.customFields.thing).toBeDefined();
+        Expect(rb.getCustomFields().thing).toBeEmpty();
+        Expect(rb.addCustomField('another', { thingy: 'two' })).toBe(rb);
+        Expect(room.customFields.another).toEqual({ thingy: 'two' });
+        Expect(rb.getCustomFields().another).toEqual({ thingy: 'two' });
+
+        Expect(rb.setCustomFields({})).toBe(rb);
+        Expect(room.customFields).toBeEmpty();
+        Expect(rb.getCustomFields()).toBeEmpty();
+
+        Expect(rb.getRoom()).toBe(room);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/RoomExtender.spec.ts b/packages/apps-engine/tests/server/accessors/RoomExtender.spec.ts
new file mode 100644
index 000000000000..ba0cd578fa54
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/RoomExtender.spec.ts
@@ -0,0 +1,38 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IRoom } from '../../../src/definition/rooms';
+import { RoomExtender } from '../../../src/server/accessors';
+import { TestData } from '../../test-data/utilities';
+
+export class RoomExtenderAccessorTestFixture {
+    @Test()
+    public basicRoomExtender() {
+        Expect(() => new RoomExtender({} as IRoom)).not.toThrow();
+        Expect(() => new RoomExtender(TestData.getRoom())).not.toThrow();
+    }
+
+    @Test()
+    public usingRoomExtender() {
+        const room: IRoom = {} as IRoom;
+        const re = new RoomExtender(room);
+
+        Expect(room.customFields).not.toBeDefined();
+        Expect(re.addCustomField('thing', 'value')).toBe(re);
+        Expect(room.customFields).toBeDefined();
+        Expect(room.customFields.thing as any).toBe('value');
+        Expect(() => re.addCustomField('thing', 'second')).toThrowError(Error, 'The room already contains a custom field by the key: thing');
+        Expect(() => re.addCustomField('thing.', 'second')).toThrowError(Error, 'The given key contains a period, which is not allowed. Key: thing.');
+
+        Expect(room.usernames).not.toBeDefined();
+        Expect(re.addMember(TestData.getUser('theId', 'bradley'))).toBe(re);
+        Expect(room.usernames).not.toBeDefined();
+        Expect(re.getMembersBeingAdded()).toBeDefined();
+        Expect(re.getMembersBeingAdded()).not.toBeEmpty();
+        Expect(re.getMembersBeingAdded()[0]).not.toBeEmpty();
+        Expect(re.getMembersBeingAdded()[0].username).toBe('bradley');
+        Expect(() => re.addMember(TestData.getUser('theSameUsername', 'bradley'))).toThrowError(Error, 'The user is already in the room.');
+
+        Expect(re.getRoom()).not.toBe(room);
+        Expect(re.getRoom()).toEqual(room);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/RoomRead.spec.ts b/packages/apps-engine/tests/server/accessors/RoomRead.spec.ts
new file mode 100644
index 000000000000..0fe209a41616
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/RoomRead.spec.ts
@@ -0,0 +1,83 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { IMessageRaw } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import type { IUser } from '../../../src/definition/users';
+import { RoomRead } from '../../../src/server/accessors';
+import type { RoomBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class RoomReadAccessorTestFixture {
+    private room: IRoom;
+
+    private user: IUser;
+
+    private messages: IMessageRaw[];
+
+    private mockRoomBridgeWithRoom: RoomBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.room = TestData.getRoom();
+        this.user = TestData.getUser();
+        this.messages = ['507f1f77bcf86cd799439011', '507f191e810c19729de860ea'].map((id) => TestData.getMessageRaw(id));
+
+        const theRoom = this.room;
+        const theUser = this.user;
+        const theMessages = this.messages;
+        this.mockRoomBridgeWithRoom = {
+            doGetById(id, appId): Promise<IRoom> {
+                return Promise.resolve(theRoom);
+            },
+            doGetByName(name, appId): Promise<IRoom> {
+                return Promise.resolve(theRoom);
+            },
+            doGetCreatorById(id, appId): Promise<IUser> {
+                return Promise.resolve(theUser);
+            },
+            doGetCreatorByName(name, appId): Promise<IUser> {
+                return Promise.resolve(theUser);
+            },
+            doGetDirectByUsernames(usernames, appId): Promise<IRoom> {
+                return Promise.resolve(theRoom);
+            },
+            doGetMembers(name, appId): Promise<Array<IUser>> {
+                return Promise.resolve([theUser]);
+            },
+            doGetMessages(roomId, options, appId): Promise<IMessageRaw[]> {
+                return Promise.resolve(theMessages);
+            },
+        } as RoomBridge;
+    }
+
+    @AsyncTest()
+    public async expectDataFromRoomRead() {
+        Expect(() => new RoomRead(this.mockRoomBridgeWithRoom, 'testing-app')).not.toThrow();
+
+        const rr = new RoomRead(this.mockRoomBridgeWithRoom, 'testing-app');
+
+        Expect(await rr.getById('fake')).toBeDefined();
+        Expect(await rr.getById('fake')).toBe(this.room);
+        Expect(await rr.getByName('testing-room')).toBeDefined();
+        Expect(await rr.getByName('testing-room')).toBe(this.room);
+        Expect(await rr.getCreatorUserById('testing')).toBeDefined();
+        Expect(await rr.getCreatorUserById('testing')).toBe(this.user);
+        Expect(await rr.getCreatorUserByName('testing')).toBeDefined();
+        Expect(await rr.getCreatorUserByName('testing')).toBe(this.user);
+        Expect(await rr.getDirectByUsernames([this.user.username])).toBeDefined();
+        Expect(await rr.getDirectByUsernames([this.user.username])).toBe(this.room);
+        Expect(await rr.getMessages('testing')).toBeDefined();
+        Expect(await rr.getMessages('testing')).toBe(this.messages);
+    }
+
+    @AsyncTest()
+    public async useTheIterators() {
+        Expect(() => new RoomRead(this.mockRoomBridgeWithRoom, 'testing-app')).not.toThrow();
+
+        const rr = new RoomRead(this.mockRoomBridgeWithRoom, 'testing-app');
+
+        Expect(await rr.getMembers('testing')).toBeDefined();
+        Expect((await rr.getMembers('testing')) as Array<IUser>).not.toBeEmpty();
+        Expect((await rr.getMembers('testing'))[0]).toBe(this.user);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ServerSettingRead.spec.ts b/packages/apps-engine/tests/server/accessors/ServerSettingRead.spec.ts
new file mode 100644
index 000000000000..395d1cafdebf
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ServerSettingRead.spec.ts
@@ -0,0 +1,43 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { ISetting } from '../../../src/definition/settings';
+import { ServerSettingRead } from '../../../src/server/accessors';
+import type { ServerSettingBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class ServerSettingReadAccessorTestFixture {
+    private setting: ISetting;
+
+    private mockServerSettingBridge: ServerSettingBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.setting = TestData.getSetting('testing');
+
+        const theSetting = this.setting;
+        this.mockServerSettingBridge = {
+            doGetOneById(id: string, appId: string): Promise<ISetting> {
+                return Promise.resolve(id === 'testing' ? theSetting : undefined);
+            },
+            doIsReadableById(id: string, appId: string): Promise<boolean> {
+                return Promise.resolve(true);
+            },
+        } as ServerSettingBridge;
+    }
+
+    @AsyncTest()
+    public async expectDataFromRoomRead() {
+        Expect(() => new ServerSettingRead(this.mockServerSettingBridge, 'testing-app')).not.toThrow();
+
+        const ssr = new ServerSettingRead(this.mockServerSettingBridge, 'testing-app');
+
+        Expect(await ssr.getOneById('testing')).toBeDefined();
+        Expect(await ssr.getOneById('testing')).toEqual(this.setting);
+        Expect(await ssr.getValueById('testing')).toEqual(this.setting.packageValue);
+        this.setting.value = 'theValue';
+        Expect(await ssr.getValueById('testing')).toBe('theValue');
+        await Expect(async () => ssr.getValueById('fake')).toThrowErrorAsync(Error, 'No Server Setting found, or it is unaccessible, by the id of "fake".');
+        await Expect(() => ssr.getAll()).toThrowErrorAsync(Error, 'Method not implemented.');
+        Expect(await ssr.isReadableById('testing')).toBe(true);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/ServerSettingsModify.spec.ts b/packages/apps-engine/tests/server/accessors/ServerSettingsModify.spec.ts
new file mode 100644
index 000000000000..df806a79d6e7
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/ServerSettingsModify.spec.ts
@@ -0,0 +1,60 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import type { ISetting } from '../../../src/definition/settings';
+import { ServerSettingsModify } from '../../../src/server/accessors';
+import type { ServerSettingBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class ServerSettingsModifyTestFixture {
+    private setting: ISetting;
+
+    private mockAppId: string;
+
+    private mockServerSettingBridge: ServerSettingBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.setting = TestData.getSetting();
+        this.mockAppId = 'testing-app';
+        this.mockServerSettingBridge = {
+            doHideGroup(name: string, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+            doHideSetting(id: string, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+            doUpdateOne(setting: ISetting, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+            doIncrementValue(id: ISetting['id'], value: number, appId: string): Promise<void> {
+                return Promise.resolve();
+            },
+        } as ServerSettingBridge;
+    }
+
+    @AsyncTest()
+    public async useServerSettingsModify() {
+        Expect(() => new ServerSettingsModify(this.mockServerSettingBridge, this.mockAppId)).not.toThrow();
+
+        const sp1 = SpyOn(this.mockServerSettingBridge, 'doHideGroup');
+        const sp2 = SpyOn(this.mockServerSettingBridge, 'doHideSetting');
+        const sp3 = SpyOn(this.mockServerSettingBridge, 'doUpdateOne');
+        const sp4 = SpyOn(this.mockServerSettingBridge, 'doIncrementValue');
+
+        const ssm = new ServerSettingsModify(this.mockServerSettingBridge, this.mockAppId);
+
+        Expect(await ssm.hideGroup('api')).not.toBeDefined();
+        Expect(this.mockServerSettingBridge.doHideGroup).toHaveBeenCalledWith('api', this.mockAppId);
+        Expect(await ssm.hideSetting('api')).not.toBeDefined();
+        Expect(this.mockServerSettingBridge.doHideSetting).toHaveBeenCalledWith('api', this.mockAppId);
+        Expect(await ssm.modifySetting(this.setting)).not.toBeDefined();
+        Expect(this.mockServerSettingBridge.doUpdateOne).toHaveBeenCalledWith(this.setting, this.mockAppId);
+        Expect(await ssm.incrementValue(this.setting.id, 5)).not.toBeDefined();
+        Expect(this.mockServerSettingBridge.doIncrementValue).toHaveBeenCalledWith(this.setting.id, 5, this.mockAppId);
+
+        sp1.restore();
+        sp2.restore();
+        sp3.restore();
+        sp4.restore();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/SettingRead.spec.ts b/packages/apps-engine/tests/server/accessors/SettingRead.spec.ts
new file mode 100644
index 000000000000..fdd0ba7c408f
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/SettingRead.spec.ts
@@ -0,0 +1,40 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { SettingRead } from '../../../src/server/accessors';
+import type { IAppStorageItem } from '../../../src/server/storage';
+import { TestData } from '../../test-data/utilities';
+
+export class SettingReadAccessorTestFixture {
+    private mockStorageItem: IAppStorageItem;
+
+    private mockProxiedApp: ProxiedApp;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockStorageItem = {
+            settings: {},
+        } as IAppStorageItem;
+        this.mockStorageItem.settings.testing = TestData.getSetting('testing');
+
+        const si = this.mockStorageItem;
+        this.mockProxiedApp = {
+            getStorageItem(): IAppStorageItem {
+                return si;
+            },
+        } as ProxiedApp;
+    }
+
+    @AsyncTest()
+    public async appSettingRead() {
+        Expect(() => new SettingRead({} as ProxiedApp)).not.toThrow();
+
+        const sr = new SettingRead(this.mockProxiedApp);
+        Expect(await sr.getById('testing')).toBeDefined();
+        Expect(await sr.getById('testing')).toEqual(TestData.getSetting('testing'));
+        Expect(await sr.getValueById('testing')).toBe('The packageValue');
+        this.mockStorageItem.settings.testing.value = 'my value';
+        Expect(await sr.getValueById('testing')).toBe('my value');
+        await Expect(() => sr.getValueById('superfake')).toThrowErrorAsync(Error, 'Setting "superfake" does not exist.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/SettingsExtend.spec.ts b/packages/apps-engine/tests/server/accessors/SettingsExtend.spec.ts
new file mode 100644
index 000000000000..f8c9ddc5444e
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/SettingsExtend.spec.ts
@@ -0,0 +1,54 @@
+import { AsyncTest, Expect, Test } from 'alsatian';
+
+import type { ISetting } from '../../../src/definition/settings';
+import { SettingType } from '../../../src/definition/settings';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { SettingsExtend } from '../../../src/server/accessors';
+import type { IAppStorageItem } from '../../../src/server/storage';
+
+export class SettingsExtendAccessorTestFixture {
+    @Test()
+    public basicSettingsExtend() {
+        Expect(() => new SettingsExtend({} as ProxiedApp)).not.toThrow();
+    }
+
+    @AsyncTest()
+    public async provideSettingToSettingsExtend(): Promise<void> {
+        const mockedStorageItem: IAppStorageItem = {
+            settings: {},
+        } as IAppStorageItem;
+
+        const mockedApp: ProxiedApp = {
+            getStorageItem: function _getStorageItem() {
+                return mockedStorageItem;
+            },
+        } as ProxiedApp;
+        const se = new SettingsExtend(mockedApp);
+
+        const setting: ISetting = {
+            id: 'testing',
+            type: SettingType.STRING,
+            packageValue: 'thing',
+            required: false,
+            public: false,
+            i18nLabel: 'Testing_Settings',
+        };
+
+        await Expect(() => se.provideSetting(setting)).not.toThrowAsync();
+        Expect(mockedStorageItem.settings).not.toBeEmpty();
+
+        const settingModified: ISetting = {
+            id: 'testing',
+            type: SettingType.STRING,
+            packageValue: 'thing',
+            required: false,
+            public: false,
+            i18nLabel: 'Testing_Thing',
+            value: 'dont-use-me',
+        };
+        await Expect(() => se.provideSetting(settingModified)).not.toThrowAsync();
+        Expect(mockedStorageItem.settings.testing).toBeDefined();
+        Expect(mockedStorageItem.settings.testing.value).not.toBeDefined();
+        Expect(mockedStorageItem.settings.testing.i18nLabel).toBe('Testing_Thing');
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/SlashCommandsExtend.spec.ts b/packages/apps-engine/tests/server/accessors/SlashCommandsExtend.spec.ts
new file mode 100644
index 000000000000..1a4cc0b161c8
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/SlashCommandsExtend.spec.ts
@@ -0,0 +1,47 @@
+import { AsyncTest, Expect, Test } from 'alsatian';
+
+import type { ISlashCommand } from '../../../src/definition/slashcommands';
+import { SlashCommandsExtend } from '../../../src/server/accessors';
+import { CommandAlreadyExistsError } from '../../../src/server/errors';
+import type { AppSlashCommandManager } from '../../../src/server/managers';
+
+export class SlashCommandsExtendAccessorTestFixture {
+    @Test()
+    public basicSlashCommandsExtend() {
+        Expect(() => new SlashCommandsExtend({} as AppSlashCommandManager, 'testing')).not.toThrow();
+    }
+
+    @AsyncTest()
+    public async provideCommandToCommandsExtend(): Promise<void> {
+        const commands = new Map<string, Array<ISlashCommand>>();
+        const mockManager: AppSlashCommandManager = {
+            addCommand(appId: string, command: ISlashCommand) {
+                if (commands.has(appId)) {
+                    const cmds = commands.get(appId);
+                    if (cmds.find((v) => v.command === command.command)) {
+                        throw new CommandAlreadyExistsError(command.command);
+                    }
+
+                    cmds.push(command);
+                    return;
+                }
+
+                commands.set(appId, Array.from([command]));
+            },
+        } as AppSlashCommandManager;
+
+        const se = new SlashCommandsExtend(mockManager, 'testing');
+
+        const mockCommand: ISlashCommand = {
+            command: 'mock',
+            i18nDescription: 'Thing',
+        } as ISlashCommand;
+
+        await Expect(() => se.provideSlashCommand(mockCommand)).not.toThrowAsync();
+        Expect(commands.size).toBe(1);
+        await Expect(() => se.provideSlashCommand(mockCommand)).toThrowErrorAsync(
+            CommandAlreadyExistsError,
+            'The command "mock" already exists in the system.',
+        );
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/SlashCommandsModify.spec.ts b/packages/apps-engine/tests/server/accessors/SlashCommandsModify.spec.ts
new file mode 100644
index 000000000000..9192cb4aea79
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/SlashCommandsModify.spec.ts
@@ -0,0 +1,47 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn } from 'alsatian';
+
+import type { ISlashCommand } from '../../../src/definition/slashcommands';
+import { SlashCommandsModify } from '../../../src/server/accessors';
+import type { AppSlashCommandManager } from '../../../src/server/managers';
+import { TestData } from '../../test-data/utilities';
+
+export class SlashCommandsModifyTestFixture {
+    private cmd: ISlashCommand;
+
+    private mockAppId: string;
+
+    private mockCmdManager: AppSlashCommandManager;
+
+    @SetupFixture
+    public setupFixture() {
+        this.cmd = TestData.getSlashCommand();
+        this.mockAppId = 'testing-app';
+        this.mockCmdManager = {
+            modifyCommand(appId: string, command: ISlashCommand): void {},
+            disableCommand(appId: string, command: string): void {},
+            enableCommand(appId: string, command: string): void {},
+        } as AppSlashCommandManager;
+    }
+
+    @AsyncTest()
+    public async useSlashCommandsModify() {
+        Expect(() => new SlashCommandsModify(this.mockCmdManager, this.mockAppId)).not.toThrow();
+
+        const sp1 = SpyOn(this.mockCmdManager, 'modifyCommand');
+        const sp2 = SpyOn(this.mockCmdManager, 'disableCommand');
+        const sp3 = SpyOn(this.mockCmdManager, 'enableCommand');
+
+        const scm = new SlashCommandsModify(this.mockCmdManager, this.mockAppId);
+
+        Expect(await scm.modifySlashCommand(this.cmd)).not.toBeDefined();
+        Expect(this.mockCmdManager.modifyCommand).toHaveBeenCalledWith(this.mockAppId, this.cmd);
+        Expect(await scm.disableSlashCommand('testing-cmd')).not.toBeDefined();
+        Expect(this.mockCmdManager.disableCommand).toHaveBeenCalledWith(this.mockAppId, 'testing-cmd');
+        Expect(await scm.enableSlashCommand('testing-cmd')).not.toBeDefined();
+        Expect(this.mockCmdManager.enableCommand).toHaveBeenCalledWith(this.mockAppId, 'testing-cmd');
+
+        sp1.restore();
+        sp2.restore();
+        sp3.restore();
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/UserBuilder.spec.ts b/packages/apps-engine/tests/server/accessors/UserBuilder.spec.ts
new file mode 100644
index 000000000000..1a3b245d5773
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/UserBuilder.spec.ts
@@ -0,0 +1,58 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IUser, IUserEmail } from '../../../src/definition/users';
+import { UserBuilder } from '../../../src/server/accessors';
+
+export class UserBuilderAccessorTestFixture {
+    @Test()
+    public basicUserBuilder() {
+        Expect(() => new UserBuilder()).not.toThrow();
+    }
+
+    @Test()
+    public settingOnUserBuilder() {
+        const ubOnce = new UserBuilder();
+        Expect(ubOnce.setData({ name: 'Test User', email: 'testuser@gmail.com', username: 'testuser' } as Partial<IUser>)).toBe(ubOnce);
+        Expect((ubOnce as any).user.name).toBe('Test User');
+        Expect((ubOnce as any).user.username).toBe('testuser');
+        Expect((ubOnce as any).user.email).toBe('testuser@gmail.com');
+
+        const user: Partial<IUser> = {} as Partial<IUser>;
+        const ub = new UserBuilder(user);
+
+        Expect(
+            ub.setEmails([
+                {
+                    address: 'testuser@gmail.com',
+                    verified: false,
+                } as IUserEmail,
+            ]),
+        ).toBe(ub);
+        Expect(user.emails).toEqual([
+            {
+                address: 'testuser@gmail.com',
+                verified: false,
+            } as IUserEmail,
+        ]);
+        Expect(ub.getEmails()).toEqual([
+            {
+                address: 'testuser@gmail.com',
+                verified: false,
+            } as IUserEmail,
+        ]);
+
+        Expect(ub.setDisplayName('Test User')).toBe(ub);
+        Expect(user.name).toEqual('Test User');
+        Expect(ub.getDisplayName()).toEqual('Test User');
+
+        Expect(ub.setUsername('testuser')).toBe(ub);
+        Expect(user.username).toEqual('testuser');
+        Expect(ub.getUsername()).toEqual('testuser');
+
+        Expect(ub.setRoles(['bot'])).toBe(ub);
+        Expect(user.roles).toEqual(['bot']);
+        Expect(ub.getRoles()).toEqual(['bot']);
+
+        Expect(ub.getUser()).toBe(user);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/UserRead.spec.ts b/packages/apps-engine/tests/server/accessors/UserRead.spec.ts
new file mode 100644
index 000000000000..a744ec184156
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/UserRead.spec.ts
@@ -0,0 +1,49 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { IUser } from '../../../src/definition/users';
+import { UserRead } from '../../../src/server/accessors';
+import type { UserBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class UserReadAccessorTestFixture {
+    private user: IUser;
+
+    private mockUserBridge: UserBridge;
+
+    private mockAppId: 'test-appId';
+
+    @SetupFixture
+    public setupFixture() {
+        this.user = TestData.getUser();
+
+        const theUser = this.user;
+        this.mockUserBridge = {
+            doGetById(id, appId): Promise<IUser> {
+                return Promise.resolve(theUser);
+            },
+            doGetByUsername(id, appId): Promise<IUser> {
+                return Promise.resolve(theUser);
+            },
+            doGetAppUser(appId?: string): Promise<IUser> {
+                return Promise.resolve(theUser);
+            },
+        } as UserBridge;
+    }
+
+    @AsyncTest()
+    public async expectDataFromMessageRead() {
+        Expect(() => new UserRead(this.mockUserBridge, 'testing-app')).not.toThrow();
+
+        const ur = new UserRead(this.mockUserBridge, 'testing-app');
+
+        Expect(await ur.getById('fake')).toBeDefined();
+        Expect(await ur.getById('fake')).toEqual(this.user);
+
+        Expect(await ur.getByUsername('username')).toBeDefined();
+        Expect(await ur.getByUsername('username')).toEqual(this.user);
+
+        Expect(await ur.getAppUser(this.mockAppId)).toBeDefined();
+        Expect(await ur.getAppUser(this.mockAppId)).toEqual(this.user);
+        Expect(await ur.getAppUser()).toEqual(this.user);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/VideoConfProviderExtend.spec.ts b/packages/apps-engine/tests/server/accessors/VideoConfProviderExtend.spec.ts
new file mode 100644
index 000000000000..94262baff53b
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/VideoConfProviderExtend.spec.ts
@@ -0,0 +1,38 @@
+import { AsyncTest, Expect, Test } from 'alsatian';
+
+import type { IVideoConfProvider } from '../../../src/definition/videoConfProviders';
+import { VideoConfProviderExtend } from '../../../src/server/accessors';
+import type { AppVideoConfProviderManager } from '../../../src/server/managers';
+
+export class VideoConfProviderExtendAccessorTestFixture {
+    @Test()
+    public basicVideoConfProviderExtend() {
+        Expect(() => new VideoConfProviderExtend({} as AppVideoConfProviderManager, 'testing')).not.toThrow();
+    }
+
+    @AsyncTest()
+    public async provideProviderToVideoConfProviderExtend(): Promise<void> {
+        let providerAdded: IVideoConfProvider | undefined;
+        const mockManager: AppVideoConfProviderManager = {
+            addProvider(appId: string, provider: IVideoConfProvider) {
+                providerAdded = provider;
+            },
+        } as AppVideoConfProviderManager;
+
+        const se = new VideoConfProviderExtend(mockManager, 'testing');
+
+        const mockProvider: IVideoConfProvider = {
+            name: 'test',
+
+            async generateUrl(): Promise<string> {
+                return '';
+            },
+            async customizeUrl(): Promise<string> {
+                return '';
+            },
+        } as IVideoConfProvider;
+
+        await Expect(() => se.provideVideoConfProvider(mockProvider)).not.toThrowAsync();
+        Expect(providerAdded).toBe(mockProvider);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/VideoConferenceBuilder.spec.ts b/packages/apps-engine/tests/server/accessors/VideoConferenceBuilder.spec.ts
new file mode 100644
index 000000000000..cdf48d9b1d50
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/VideoConferenceBuilder.spec.ts
@@ -0,0 +1,108 @@
+import { Expect, Test } from 'alsatian';
+
+import type { AppVideoConference } from '../../../src/definition/videoConferences';
+import { VideoConferenceBuilder } from '../../../src/server/accessors';
+import { TestData } from '../../test-data/utilities';
+
+export class VideoConferenceBuilderAccessorTestFixture {
+    @Test()
+    public basicVideoConferenceBuilderBuilder() {
+        Expect(() => new VideoConferenceBuilder()).not.toThrow();
+        Expect(() => new VideoConferenceBuilder(TestData.getAppVideoConference())).not.toThrow();
+    }
+
+    @Test()
+    public setData() {
+        const builder = new VideoConferenceBuilder();
+
+        Expect(builder.setData({ providerName: 'test-provider' } as AppVideoConference)).toBe(builder);
+        Expect(((builder as any).call as AppVideoConference).providerName).toBe('test-provider');
+    }
+
+    @Test()
+    public setRoomId() {
+        const call = {} as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(builder.setRoomId('roomId')).toBe(builder);
+        Expect(call.rid).toBe('roomId');
+        Expect(builder.getRoomId()).toBe('roomId');
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+
+    @Test()
+    public setCreatedBy() {
+        const call = {} as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(builder.setCreatedBy('userId')).toBe(builder);
+        Expect(call.createdBy).toBe('userId');
+        Expect(builder.getCreatedBy()).toBe('userId');
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+
+    @Test()
+    public setProviderName() {
+        const call = {} as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(builder.setProviderName('test')).toBe(builder);
+        Expect(call.providerName).toBe('test');
+        Expect(builder.getProviderName()).toBe('test');
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+
+    @Test()
+    public setProviderData() {
+        const call = {} as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(builder.setProviderData({ custom: true })).toBe(builder);
+        Expect(call.providerData).toEqual({ custom: true });
+        Expect(builder.getProviderData()).toEqual({ custom: true });
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+
+    @Test()
+    public setTitle() {
+        const call = {} as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(builder.setTitle('Video Conference')).toBe(builder);
+        Expect(call.title).toBe('Video Conference');
+        Expect(builder.getTitle()).toBe('Video Conference');
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+
+    @Test()
+    public setDiscussionRid() {
+        const call = {} as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(builder.setDiscussionRid('testId')).toBe(builder);
+        Expect(call.discussionRid).toBe('testId');
+        Expect(builder.getDiscussionRid()).toBe('testId');
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+
+    @Test()
+    public initialData() {
+        const call = { providerName: 'test' } as AppVideoConference;
+        const builder = new VideoConferenceBuilder(call);
+
+        Expect(call.providerName).toBe('test');
+        Expect(builder.getProviderName()).toBe('test');
+
+        Expect(builder.setProviderName('test2')).toBe(builder);
+        Expect(call.providerName).toBe('test2');
+        Expect(builder.getProviderName()).toBe('test2');
+
+        Expect(builder.getVideoConference()).toBe(call);
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/VideoConferenceExtend.spec.ts b/packages/apps-engine/tests/server/accessors/VideoConferenceExtend.spec.ts
new file mode 100644
index 000000000000..d65411e748d0
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/VideoConferenceExtend.spec.ts
@@ -0,0 +1,81 @@
+import { Expect, Test } from 'alsatian';
+
+import type { VideoConference } from '../../../src/definition/videoConferences';
+import { VideoConferenceExtender } from '../../../src/server/accessors';
+import { TestData } from '../../test-data/utilities';
+
+export class VideoConferenceExtendAccessorTestFixture {
+    @Test()
+    public basicVideoConferenceExtend() {
+        Expect(() => new VideoConferenceExtender({} as VideoConference)).not.toThrow();
+        Expect(() => new VideoConferenceExtender(TestData.getVideoConference())).not.toThrow();
+    }
+
+    @Test()
+    public setProviderData() {
+        const call = {} as VideoConference;
+        const extend = new VideoConferenceExtender(call);
+
+        Expect(call.providerData).not.toBeDefined();
+        Expect(extend.setProviderData({ key: 'test' })).toBe(extend);
+        Expect(call.providerData).toBeDefined();
+        Expect(call.providerData.key).toBe('test');
+
+        Expect(extend.getVideoConference()).not.toBe(call);
+        Expect(extend.getVideoConference()).toEqual(call);
+    }
+
+    @Test()
+    public setStatus() {
+        const call = { status: 0 } as VideoConference;
+        const extend = new VideoConferenceExtender(call);
+
+        Expect(call.status).toBe(0);
+        Expect(extend.setStatus(1)).toBe(extend);
+        Expect(call.status).toBe(1);
+    }
+
+    @Test()
+    public setEndedBy() {
+        const call = {} as VideoConference;
+        const extend = new VideoConferenceExtender(call);
+
+        Expect(call.endedBy).not.toBeDefined();
+        Expect(extend.setEndedBy('userId')).toBe(extend);
+        Expect(call.endedBy).toBeDefined();
+        Expect(call.endedBy._id).toBe('userId');
+    }
+
+    @Test()
+    public setEndedAt() {
+        const call = {} as VideoConference;
+        const extend = new VideoConferenceExtender(call);
+
+        const date = new Date();
+
+        Expect(call.endedAt).not.toBeDefined();
+        Expect(extend.setEndedAt(date)).toBe(extend);
+        Expect(call.endedAt).toBe(date);
+    }
+
+    @Test()
+    public setDiscussionRid() {
+        const call = {} as VideoConference;
+        const extend = new VideoConferenceExtender(call);
+
+        Expect(call.discussionRid).not.toBeDefined();
+        Expect(extend.setDiscussionRid('testId')).toBe(extend);
+        Expect(call.discussionRid).toBe('testId');
+    }
+
+    @Test()
+    public addUser() {
+        const call = { users: [] } as VideoConference;
+        const extend = new VideoConferenceExtender(call);
+
+        Expect(call.users).toBeEmpty();
+        Expect(extend.addUser('userId')).toBe(extend);
+        Expect(call.users).not.toBeEmpty();
+        Expect(call.users[0]._id).toBe('userId');
+    }
+}
diff --git a/packages/apps-engine/tests/server/accessors/VideoConferenceRead.spec.ts b/packages/apps-engine/tests/server/accessors/VideoConferenceRead.spec.ts
new file mode 100644
index 000000000000..fa82351eebb1
--- /dev/null
+++ b/packages/apps-engine/tests/server/accessors/VideoConferenceRead.spec.ts
@@ -0,0 +1,34 @@
+import { AsyncTest, Expect, SetupFixture } from 'alsatian';
+
+import type { VideoConference } from '../../../src/definition/videoConferences';
+import { VideoConferenceRead } from '../../../src/server/accessors';
+import type { VideoConferenceBridge } from '../../../src/server/bridges';
+import { TestData } from '../../test-data/utilities';
+
+export class VideoConferenceReadAccessorTestFixture {
+    private videoConference: VideoConference;
+
+    private mockVideoConfBridge: VideoConferenceBridge;
+
+    @SetupFixture
+    public setupFixture() {
+        this.videoConference = TestData.getVideoConference();
+
+        const call = this.videoConference;
+        this.mockVideoConfBridge = {
+            doGetById(id, appId): Promise<VideoConference> {
+                return Promise.resolve(call);
+            },
+        } as VideoConferenceBridge;
+    }
+
+    @AsyncTest()
+    public async expectDataFromVideoConferenceRead() {
+        Expect(() => new VideoConferenceRead(this.mockVideoConfBridge, 'testing-app')).not.toThrow();
+
+        const read = new VideoConferenceRead(this.mockVideoConfBridge, 'testing-app');
+
+        Expect(await read.getById('fake')).toBeDefined();
+        Expect(await read.getById('fake')).toBe(this.videoConference);
+    }
+}
diff --git a/packages/apps-engine/tests/server/compiler/AppCompiler.spec.ts b/packages/apps-engine/tests/server/compiler/AppCompiler.spec.ts
new file mode 100644
index 000000000000..ac3c36b2d074
--- /dev/null
+++ b/packages/apps-engine/tests/server/compiler/AppCompiler.spec.ts
@@ -0,0 +1,24 @@
+import { Expect, Test } from 'alsatian';
+
+import { AppCompiler } from '../../../src/server/compiler';
+
+export class AppCompilerTestFixture {
+    @Test()
+    public verifyStorageFileToCompiler() {
+        const compiler = new AppCompiler();
+
+        Expect(() => compiler.normalizeStorageFiles({})).not.toThrow();
+
+        const files: { [key: string]: string } = {
+            TestingApp$ts: 'act-like-this-is-real',
+            TestingAppCommand$ts: 'something-here-as well, yay',
+        };
+
+        const expected: { [key: string]: string } = {
+            'TestingApp.ts': files.TestingApp$ts,
+            'TestingAppCommand.ts': files.TestingAppCommand$ts,
+        };
+
+        Expect(compiler.normalizeStorageFiles(files)).toEqual(expected);
+    }
+}
diff --git a/packages/apps-engine/tests/server/compiler/AppFabricationFulfillment.spec.ts b/packages/apps-engine/tests/server/compiler/AppFabricationFulfillment.spec.ts
new file mode 100644
index 000000000000..89b928e9716e
--- /dev/null
+++ b/packages/apps-engine/tests/server/compiler/AppFabricationFulfillment.spec.ts
@@ -0,0 +1,48 @@
+import { Expect, Test } from 'alsatian';
+
+import { AppStatus } from '../../../src/definition/AppStatus';
+import type { IAppInfo } from '../../../src/definition/metadata';
+import { AppInterface } from '../../../src/definition/metadata';
+import type { AppManager } from '../../../src/server/AppManager';
+import { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppFabricationFulfillment } from '../../../src/server/compiler';
+import type { DenoRuntimeSubprocessController } from '../../../src/server/runtime/deno/AppsEngineDenoRuntime';
+import type { IAppStorageItem } from '../../../src/server/storage';
+
+export class AppFabricationFulfillmentTestFixture {
+    @Test()
+    public appFabricationDefinement() {
+        const expctedInfo: IAppInfo = {
+            id: '614055e2-3dba-41fb-be48-c1ff146f5932',
+            name: 'Testing App',
+            nameSlug: 'testing-app',
+            description: 'A Rocket.Chat Application used to test out the various features.',
+            version: '0.0.8',
+            requiredApiVersion: '>=0.9.6',
+            author: {
+                name: 'Bradley Hilton',
+                homepage: 'https://github.com/RocketChat/Rocket.Chat.Apps-ts-definitions',
+                support: 'https://github.com/RocketChat/Rocket.Chat.Apps-ts-definitions/issues',
+            },
+            classFile: 'TestingApp.ts',
+            iconFile: 'testing.jpg',
+            implements: [],
+            permissions: [],
+        };
+
+        Expect(() => new AppFabricationFulfillment()).not.toThrow();
+
+        const aff = new AppFabricationFulfillment();
+        Expect(() => aff.setAppInfo(expctedInfo)).not.toThrow();
+        Expect(aff.getAppInfo()).toEqual(expctedInfo);
+
+        const expectedInter: { [key: string]: boolean } = {};
+        expectedInter[AppInterface.IPreMessageSentPrevent] = true;
+        Expect(() => aff.setImplementedInterfaces(expectedInter)).not.toThrow();
+        Expect(aff.getImplementedInferfaces()).toEqual(expectedInter);
+
+        const fakeApp = new ProxiedApp({} as AppManager, { status: AppStatus.UNKNOWN } as IAppStorageItem, {} as DenoRuntimeSubprocessController);
+        Expect(() => aff.setApp(fakeApp)).not.toThrow();
+        Expect(aff.getApp()).toEqual(fakeApp);
+    }
+}
diff --git a/packages/apps-engine/tests/server/compiler/AppImplements.spec.ts b/packages/apps-engine/tests/server/compiler/AppImplements.spec.ts
new file mode 100644
index 000000000000..c3b672bf6aad
--- /dev/null
+++ b/packages/apps-engine/tests/server/compiler/AppImplements.spec.ts
@@ -0,0 +1,19 @@
+import { Expect, Test } from 'alsatian';
+
+import { AppInterface } from '../../../src/definition/metadata';
+import { AppImplements } from '../../../src/server/compiler';
+
+export class AppImplementsTestFixture {
+    @Test()
+    public appImplements() {
+        Expect(() => new AppImplements()).not.toThrow();
+
+        const impls = new AppImplements();
+
+        Expect(impls.getValues()).toBeDefined();
+        Expect(() => impls.doesImplement(AppInterface.IPreMessageSentPrevent)).not.toThrow();
+        Expect(impls.getValues()[AppInterface.IPreMessageSentPrevent]).toBe(true);
+        Expect(() => impls.doesImplement('Something')).not.toThrow();
+        Expect(impls.getValues().Something).not.toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/CommandAlreadyExistsError.spec.ts b/packages/apps-engine/tests/server/errors/CommandAlreadyExistsError.spec.ts
new file mode 100644
index 000000000000..c6ce486cd5fe
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/CommandAlreadyExistsError.spec.ts
@@ -0,0 +1,13 @@
+import { Expect, Test } from 'alsatian';
+
+import { CommandAlreadyExistsError } from '../../../src/server/errors';
+
+export class CommandAlreadyExistsErrorTestFixture {
+    @Test()
+    public verifyCommandAlreadyExistsError() {
+        const er = new CommandAlreadyExistsError('testing');
+
+        Expect(er.name).toBe('CommandAlreadyExists');
+        Expect(er.message).toBe('The command "testing" already exists in the system.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/CommandHasAlreadyBeenTouchedError.spec.ts b/packages/apps-engine/tests/server/errors/CommandHasAlreadyBeenTouchedError.spec.ts
new file mode 100644
index 000000000000..1de65cf33052
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/CommandHasAlreadyBeenTouchedError.spec.ts
@@ -0,0 +1,13 @@
+import { Expect, Test } from 'alsatian';
+
+import { CommandHasAlreadyBeenTouchedError } from '../../../src/server/errors';
+
+export class CommandHasAlreadyBeenTouchedErrorTestFixture {
+    @Test()
+    public verifyCommandHasAlreadyBeenTouched() {
+        const er = new CommandHasAlreadyBeenTouchedError('testing');
+
+        Expect(er.name).toBe('CommandHasAlreadyBeenTouched');
+        Expect(er.message).toBe('The command "testing" has already been touched by another App.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/CompilerError.spec.ts b/packages/apps-engine/tests/server/errors/CompilerError.spec.ts
new file mode 100644
index 000000000000..b1de19cfcfe7
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/CompilerError.spec.ts
@@ -0,0 +1,13 @@
+import { Expect, Test } from 'alsatian';
+
+import { CompilerError } from '../../../src/server/errors';
+
+export class CompilerErrorTestFixture {
+    @Test()
+    public verifyCompilerError() {
+        const er = new CompilerError('syntax');
+
+        Expect(er.name).toBe('CompilerError');
+        Expect(er.message).toBe('An error occured while compiling an App: syntax');
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/MustContainFunctionError.spec.ts b/packages/apps-engine/tests/server/errors/MustContainFunctionError.spec.ts
new file mode 100644
index 000000000000..0faf679d0c4b
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/MustContainFunctionError.spec.ts
@@ -0,0 +1,13 @@
+import { Expect, Test } from 'alsatian';
+
+import { MustContainFunctionError } from '../../../src/server/errors';
+
+export class MustContainFunctionErrorTestFixture {
+    @Test()
+    public verifyCompilerError() {
+        const er = new MustContainFunctionError('App.ts', 'getVersion');
+
+        Expect(er.name).toBe('MustContainFunction');
+        Expect(er.message).toBe('The App (App.ts) doesn\'t have a "getVersion" function which is required.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/MustExtendAppError.spec.ts b/packages/apps-engine/tests/server/errors/MustExtendAppError.spec.ts
new file mode 100644
index 000000000000..34d88ec84459
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/MustExtendAppError.spec.ts
@@ -0,0 +1,13 @@
+import { Expect, Test } from 'alsatian';
+
+import { MustExtendAppError } from '../../../src/server/errors';
+
+export class MustExtendAppErrorTestFixture {
+    @Test()
+    public verifyCompilerError() {
+        const er = new MustExtendAppError();
+
+        Expect(er.name).toBe('MustExtendApp');
+        Expect(er.message).toBe('App must extend the "App" abstract class.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/NotEnoughMethodArgumentsError.spec.ts b/packages/apps-engine/tests/server/errors/NotEnoughMethodArgumentsError.spec.ts
new file mode 100644
index 000000000000..649e275b2488
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/NotEnoughMethodArgumentsError.spec.ts
@@ -0,0 +1,13 @@
+import { Expect, Test } from 'alsatian';
+
+import { NotEnoughMethodArgumentsError } from '../../../src/server/errors';
+
+export class NotEnoughMethodArgumentsErrorTestFixture {
+    @Test()
+    public verifyCompilerError() {
+        const er = new NotEnoughMethodArgumentsError('enable', 3, 1);
+
+        Expect(er.name).toBe('NotEnoughMethodArgumentsError');
+        Expect(er.message).toBe('The method "enable" requires 3 parameters but was only passed 1.');
+    }
+}
diff --git a/packages/apps-engine/tests/server/errors/RequiredApiVersionError.spec.ts b/packages/apps-engine/tests/server/errors/RequiredApiVersionError.spec.ts
new file mode 100644
index 000000000000..c344638ee56c
--- /dev/null
+++ b/packages/apps-engine/tests/server/errors/RequiredApiVersionError.spec.ts
@@ -0,0 +1,26 @@
+import { Expect, Test } from 'alsatian';
+
+import type { IAppInfo } from '../../../src/definition/metadata';
+import { RequiredApiVersionError } from '../../../src/server/errors';
+
+export class RequiredApiVersionErrorTestFixture {
+    @Test()
+    public verifyCompilerError() {
+        const info = {
+            requiredApiVersion: '1.0.1',
+            name: 'Testing',
+            id: 'fake-id',
+        } as IAppInfo;
+        const er = new RequiredApiVersionError(info, '1.0.0');
+
+        Expect(er.name).toBe('RequiredApiVersion');
+        Expect(er.message).toBe('Failed to load the App "Testing" (fake-id) as it requires v1.0.1 of the App API however your server comes with v1.0.0.');
+
+        const er2 = new RequiredApiVersionError(info, '2.0.0');
+
+        Expect(er2.name).toBe('RequiredApiVersion');
+        Expect(er2.message).toBe(
+            'Failed to load the App "Testing" (fake-id) as it requires v1.0.1 of the App API however your server comes with v2.0.0. Please tell the author to update their App as it is out of date.',
+        );
+    }
+}
diff --git a/packages/apps-engine/tests/server/logging/AppConsole.spec.ts b/packages/apps-engine/tests/server/logging/AppConsole.spec.ts
new file mode 100644
index 000000000000..0dd80a0bb296
--- /dev/null
+++ b/packages/apps-engine/tests/server/logging/AppConsole.spec.ts
@@ -0,0 +1,79 @@
+import { Expect, SpyOn, Test } from 'alsatian';
+import type * as stackTrace from 'stack-trace';
+
+import { LogMessageSeverity } from '../../../src/definition/accessors';
+import { AppMethod } from '../../../src/definition/metadata';
+import { AppConsole } from '../../../src/server/logging';
+
+export class AppConsoleTestFixture {
+    @Test()
+    public basicConsoleMethods() {
+        Expect(() => new AppConsole(AppMethod._CONSTRUCTOR)).not.toThrow();
+
+        const logger = new AppConsole(AppMethod._CONSTRUCTOR);
+        const { entries } = logger as any;
+
+        Expect(() => logger.debug('this is a debug')).not.toThrow();
+        Expect(entries.length).toBe(1);
+        Expect(entries[0].severity).toBe(LogMessageSeverity.DEBUG);
+        Expect(entries[0].args[0]).toBe('this is a debug');
+
+        Expect(() => logger.info('this is an info log')).not.toThrow();
+        Expect(entries.length).toBe(2);
+        Expect(entries[1].severity).toBe(LogMessageSeverity.INFORMATION);
+        Expect(entries[1].args[0]).toBe('this is an info log');
+
+        Expect(() => logger.log('this is a log')).not.toThrow();
+        Expect(entries.length).toBe(3);
+        Expect(entries[2].severity).toBe(LogMessageSeverity.LOG);
+        Expect(entries[2].args[0]).toBe('this is a log');
+
+        Expect(() => logger.warn('this is a warn')).not.toThrow();
+        Expect(entries.length).toBe(4);
+        Expect(entries[3].severity).toBe(LogMessageSeverity.WARNING);
+        Expect(entries[3].args[0]).toBe('this is a warn');
+
+        const e = new Error('just a test');
+        Expect(() => logger.error(e)).not.toThrow();
+        Expect(entries.length).toBe(5);
+        Expect(entries[4].severity).toBe(LogMessageSeverity.ERROR);
+        Expect(entries[4].args[0]).toBe(JSON.stringify(e, Object.getOwnPropertyNames(e)));
+
+        Expect(() => logger.success('this is a success')).not.toThrow();
+        Expect(entries.length).toBe(6);
+        Expect(entries[5].severity).toBe(LogMessageSeverity.SUCCESS);
+        Expect(entries[5].args[0]).toBe('this is a success');
+
+        Expect(() => {
+            class Item {
+                constructor() {
+                    logger.debug('inside');
+                }
+            }
+
+            return new Item();
+        }).not.toThrow();
+
+        Expect(logger.getEntries()).toEqual(entries);
+        Expect(logger.getMethod()).toBe(AppMethod._CONSTRUCTOR);
+        Expect(logger.getStartTime()).toBeDefined();
+        Expect(logger.getEndTime()).toBeDefined();
+        Expect(logger.getTotalTime()).toBeGreaterThan(1);
+
+        const getFuncSpy = SpyOn(logger, 'getFunc');
+        Expect(getFuncSpy.call([{} as stackTrace.StackFrame])).toBe('anonymous');
+        const mockFrames = [];
+        mockFrames.push({} as stackTrace.StackFrame);
+        mockFrames.push({
+            getMethodName() {
+                return 'testing';
+            },
+            getFunctionName() {
+                return null;
+            },
+        } as stackTrace.StackFrame);
+        Expect(getFuncSpy.call(mockFrames)).toBe('testing');
+
+        Expect(AppConsole.toStorageEntry('testing-app', logger)).toBeDefined(); // TODO: better test this
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppAccessorManager.spec.ts b/packages/apps-engine/tests/server/managers/AppAccessorManager.spec.ts
new file mode 100644
index 000000000000..6b2c4ce9fb2b
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppAccessorManager.spec.ts
@@ -0,0 +1,166 @@
+import type { RestorableFunctionSpy } from 'alsatian';
+import { Expect, Setup, SetupFixture, SpyOn, Teardown, Test } from 'alsatian';
+
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import type { AppBridges } from '../../../src/server/bridges';
+import type {
+    AppApiManager,
+    AppExternalComponentManager,
+    AppSchedulerManager,
+    AppSlashCommandManager,
+    AppVideoConfProviderManager,
+} from '../../../src/server/managers';
+import { AppAccessorManager } from '../../../src/server/managers';
+import type { UIActionButtonManager } from '../../../src/server/managers/UIActionButtonManager';
+import { TestsAppBridges } from '../../test-data/bridges/appBridges';
+
+export class AppAccessorManagerTestFixture {
+    private bridges: AppBridges;
+
+    private manager: AppManager;
+
+    private spies: Array<RestorableFunctionSpy>;
+
+    @SetupFixture
+    public setupFixture() {
+        this.bridges = new TestsAppBridges();
+
+        const brds = this.bridges;
+        this.manager = {
+            getBridges() {
+                return brds;
+            },
+            getCommandManager() {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager() {
+                return {} as AppExternalComponentManager;
+            },
+            getApiManager() {
+                return {} as AppApiManager;
+            },
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'testing' ? ({} as ProxiedApp) : undefined;
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+        } as AppManager;
+    }
+
+    @Setup
+    public setup() {
+        this.spies = [];
+        this.spies.push(SpyOn(this.bridges, 'getServerSettingBridge'));
+        this.spies.push(SpyOn(this.bridges, 'getEnvironmentalVariableBridge'));
+        this.spies.push(SpyOn(this.bridges, 'getMessageBridge'));
+        this.spies.push(SpyOn(this.bridges, 'getPersistenceBridge'));
+        this.spies.push(SpyOn(this.bridges, 'getRoomBridge'));
+        this.spies.push(SpyOn(this.bridges, 'getUserBridge'));
+        this.spies.push(SpyOn(this.manager, 'getBridges'));
+        this.spies.push(SpyOn(this.manager, 'getCommandManager'));
+        this.spies.push(SpyOn(this.manager, 'getExternalComponentManager'));
+        this.spies.push(SpyOn(this.manager, 'getApiManager'));
+    }
+
+    @Teardown
+    public teardown() {
+        this.spies.forEach((s) => s.restore());
+    }
+
+    @Test()
+    public basicAppAccessorManager() {
+        Expect(() => new AppAccessorManager(this.manager)).not.toThrow();
+        Expect(() => new AppAccessorManager(this.manager).purifyApp('testing')).not.toThrow();
+    }
+
+    @Test()
+    public configurationExtend() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getConfigurationExtend('testing')).toBeDefined();
+        Expect(() => acm.getConfigurationExtend('fake')).toThrowError(Error, 'No App found by the provided id: fake');
+        Expect(acm.getConfigurationExtend('testing')).toBeDefined();
+
+        Expect(this.manager.getExternalComponentManager).toHaveBeenCalled().exactly(1);
+        Expect(this.manager.getCommandManager).toHaveBeenCalled().exactly(1);
+        Expect(this.manager.getApiManager).toHaveBeenCalled().exactly(1);
+    }
+
+    @Test()
+    public environmentRead() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getEnvironmentRead('testing')).toBeDefined();
+        Expect(() => acm.getEnvironmentRead('fake')).toThrowError(Error, 'No App found by the provided id: fake');
+        Expect(acm.getEnvironmentRead('testing')).toBeDefined();
+
+        Expect(this.bridges.getServerSettingBridge).toHaveBeenCalled().exactly(1);
+        Expect(this.bridges.getEnvironmentalVariableBridge).toHaveBeenCalled().exactly(1);
+    }
+
+    @Test()
+    public configurationModify() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getConfigurationModify('testing')).toBeDefined();
+        Expect(acm.getConfigurationModify('testing')).toBeDefined();
+
+        Expect(this.bridges.getServerSettingBridge).toHaveBeenCalled().exactly(1);
+        Expect(this.manager.getCommandManager).toHaveBeenCalled().exactly(1);
+    }
+
+    @Test()
+    public reader() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getReader('testing')).toBeDefined();
+        Expect(acm.getReader('testing')).toBeDefined();
+
+        Expect(this.bridges.getServerSettingBridge).toHaveBeenCalled().exactly(1);
+        Expect(this.bridges.getEnvironmentalVariableBridge).toHaveBeenCalled().exactly(1);
+        Expect(this.bridges.getPersistenceBridge).toHaveBeenCalled().exactly(1);
+        Expect(this.bridges.getRoomBridge).toHaveBeenCalled().exactly(1);
+        Expect(this.bridges.getUserBridge).toHaveBeenCalled().exactly(2);
+        Expect(this.bridges.getMessageBridge).toHaveBeenCalled().exactly(2);
+    }
+
+    @Test()
+    public modifier() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getModifier('testing')).toBeDefined();
+        Expect(acm.getModifier('testing')).toBeDefined();
+
+        Expect(this.manager.getBridges).toHaveBeenCalled().exactly(1);
+        Expect(this.bridges.getMessageBridge).toHaveBeenCalled().exactly(1);
+    }
+
+    @Test()
+    public persistence() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getPersistence('testing')).toBeDefined();
+        Expect(acm.getPersistence('testing')).toBeDefined();
+
+        Expect(this.bridges.getPersistenceBridge).toHaveBeenCalled().exactly(1);
+    }
+
+    @Test()
+    public http() {
+        const acm = new AppAccessorManager(this.manager);
+
+        Expect(acm.getHttp('testing')).toBeDefined();
+        Expect(acm.getHttp('testing')).toBeDefined();
+
+        (acm as any).https.delete('testing');
+        Expect(acm.getHttp('testing')).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppApi.spec.ts b/packages/apps-engine/tests/server/managers/AppApi.spec.ts
new file mode 100644
index 000000000000..7d10defbf5e9
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppApi.spec.ts
@@ -0,0 +1,28 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { IApi } from '../../../src/definition/api';
+import type { IApiEndpoint } from '../../../src/definition/api/IApiEndpoint';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppApi } from '../../../src/server/managers/AppApi';
+
+export class AppApiRegistrationTestFixture {
+    private mockApp: ProxiedApp;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockApp = {
+            getID() {
+                return 'id';
+            },
+        } as ProxiedApp;
+    }
+
+    @Test()
+    public ensureAppApi() {
+        Expect(() => new AppApi(this.mockApp, {} as IApi, {} as IApiEndpoint)).not.toThrow();
+
+        const ascr = new AppApi(this.mockApp, {} as IApi, {} as IApiEndpoint);
+        Expect(ascr.app).toBeDefined();
+        Expect(ascr.api).toBeDefined();
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppApiManager.spec.ts b/packages/apps-engine/tests/server/managers/AppApiManager.spec.ts
new file mode 100644
index 000000000000..ba939e5a06e1
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppApiManager.spec.ts
@@ -0,0 +1,233 @@
+import type { FunctionSpy, RestorableFunctionSpy } from 'alsatian';
+import { AsyncTest, Expect, Setup, SetupFixture, SpyOn, Teardown, Test } from 'alsatian';
+
+import { AppStatus } from '../../../src/definition/AppStatus';
+import { RequestMethod } from '../../../src/definition/accessors';
+import type { IApi, IApiRequest } from '../../../src/definition/api';
+import type { AppMethod } from '../../../src/definition/metadata';
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import type { AppBridges } from '../../../src/server/bridges';
+import { PathAlreadyExistsError } from '../../../src/server/errors';
+import { AppConsole } from '../../../src/server/logging';
+import type { AppExternalComponentManager, AppSchedulerManager, AppSlashCommandManager, AppVideoConfProviderManager } from '../../../src/server/managers';
+import { AppAccessorManager, AppApiManager } from '../../../src/server/managers';
+import { AppApi } from '../../../src/server/managers/AppApi';
+import type { UIActionButtonManager } from '../../../src/server/managers/UIActionButtonManager';
+import type { AppsEngineRuntime } from '../../../src/server/runtime/AppsEngineRuntime';
+import type { DenoRuntimeSubprocessController } from '../../../src/server/runtime/deno/AppsEngineDenoRuntime';
+import type { AppLogStorage } from '../../../src/server/storage';
+import { TestsAppBridges } from '../../test-data/bridges/appBridges';
+import { TestsAppLogStorage } from '../../test-data/storage/logStorage';
+import { TestData } from '../../test-data/utilities';
+
+export class AppApiManagerTestFixture {
+    public static doThrow = false;
+
+    private mockBridges: TestsAppBridges;
+
+    private mockApp: ProxiedApp;
+
+    private mockAccessors: AppAccessorManager;
+
+    private mockManager: AppManager;
+
+    private spies: Array<RestorableFunctionSpy>;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockBridges = new TestsAppBridges();
+
+        this.mockApp = {
+            getRuntime() {
+                return {
+                    runInSandbox: () => Promise.resolve(true),
+                } as AppsEngineRuntime;
+            },
+            getDenoRuntime() {
+                return {
+                    sendRequest: () => Promise.resolve(true),
+                } as unknown as DenoRuntimeSubprocessController;
+            },
+            getID() {
+                return 'testing';
+            },
+            getStatus() {
+                return Promise.resolve(AppStatus.AUTO_ENABLED);
+            },
+            setupLogger(method: AppMethod): AppConsole {
+                return new AppConsole(method);
+            },
+        } as ProxiedApp;
+
+        const bri = this.mockBridges;
+        const app = this.mockApp;
+        this.mockManager = {
+            getBridges(): AppBridges {
+                return bri;
+            },
+            getCommandManager() {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager() {
+                return {} as AppExternalComponentManager;
+            },
+            getApiManager() {
+                return {} as AppApiManager;
+            },
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'failMePlease' ? undefined : app;
+            },
+            getLogStorage(): AppLogStorage {
+                return new TestsAppLogStorage();
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+        } as AppManager;
+
+        this.mockAccessors = new AppAccessorManager(this.mockManager);
+        const ac = this.mockAccessors;
+        this.mockManager.getAccessorManager = function _getAccessorManager(): AppAccessorManager {
+            return ac;
+        };
+    }
+
+    @Setup
+    public setup() {
+        this.mockBridges = new TestsAppBridges();
+        const bri = this.mockBridges;
+        this.mockManager.getBridges = function _refreshedGetBridges(): AppBridges {
+            return bri;
+        };
+
+        this.spies = [];
+        this.spies.push(SpyOn(this.mockBridges.getApiBridge(), 'doRegisterApi'));
+        this.spies.push(SpyOn(this.mockBridges.getApiBridge(), 'doUnregisterApis'));
+    }
+
+    @Teardown
+    public teardown() {
+        this.spies.forEach((s) => s.restore());
+    }
+
+    @Test()
+    public basicAppApiManager() {
+        Expect(() => new AppApiManager({} as AppManager)).toThrow();
+        Expect(() => new AppApiManager(this.mockManager)).not.toThrow();
+
+        const ascm = new AppApiManager(this.mockManager);
+        Expect((ascm as any).manager).toBe(this.mockManager);
+        Expect((ascm as any).bridge).toBe(this.mockBridges.getApiBridge());
+        Expect((ascm as any).accessors).toBe(this.mockManager.getAccessorManager());
+        Expect((ascm as any).providedApis).toBeDefined();
+        Expect((ascm as any).providedApis.size).toBe(0);
+    }
+
+    @AsyncTest()
+    public async registerApi() {
+        const ascm = new AppApiManager(this.mockManager);
+
+        const api: IApi = TestData.getApi('path');
+        const regInfo = new AppApi(this.mockApp, api, api.endpoints[0]);
+
+        await Expect(() => (ascm as any).registerApi('testing', regInfo)).not.toThrowAsync();
+        Expect(this.mockBridges.getApiBridge().doRegisterApi).toHaveBeenCalledWith(regInfo, 'testing');
+    }
+
+    @Test()
+    public addApi() {
+        const api = TestData.getApi('apipath');
+        const ascm = new AppApiManager(this.mockManager);
+
+        Expect(() => ascm.addApi('testing', api)).not.toThrow();
+        Expect(this.mockBridges.getApiBridge().apis.size).toBe(1);
+        Expect((ascm as any).providedApis.size).toBe(1);
+        Expect((ascm as any).providedApis.get('testing').get('apipath').api).toBe(api);
+
+        Expect(() => ascm.addApi('testing', api)).toThrowError(PathAlreadyExistsError, 'The api path "apipath" already exists in the system.');
+
+        Expect(() => ascm.addApi('failMePlease', TestData.getApi('yet-another'))).toThrowError(Error, 'App must exist in order for an api to be added.');
+        Expect(() => ascm.addApi('testing', TestData.getApi('another-api'))).not.toThrow();
+        Expect((ascm as any).providedApis.size).toBe(1);
+        Expect((ascm as any).providedApis.get('testing').size).toBe(2);
+    }
+
+    @AsyncTest()
+    public async registerApis() {
+        const ascm = new AppApiManager(this.mockManager);
+
+        SpyOn(ascm, 'registerApi');
+
+        ascm.addApi('testing', TestData.getApi('apipath'));
+        const regInfo = (ascm as any).providedApis.get('testing').get('apipath') as AppApi;
+
+        await Expect(() => ascm.registerApis('non-existant')).not.toThrowAsync();
+        await Expect(() => ascm.registerApis('testing')).not.toThrowAsync();
+        Expect((ascm as any).registerApi as FunctionSpy)
+            .toHaveBeenCalledWith('testing', regInfo)
+            .exactly(1);
+        Expect(this.mockBridges.getApiBridge().doRegisterApi).toHaveBeenCalledWith(regInfo, 'testing').exactly(1);
+    }
+
+    @AsyncTest()
+    public async unregisterApis() {
+        const ascm = new AppApiManager(this.mockManager);
+
+        ascm.addApi('testing', TestData.getApi('apipath'));
+
+        await Expect(() => ascm.unregisterApis('non-existant')).not.toThrowAsync();
+        await Expect(() => ascm.unregisterApis('testing')).not.toThrowAsync();
+        Expect(this.mockBridges.getApiBridge().doUnregisterApis).toHaveBeenCalled().exactly(1);
+    }
+
+    @AsyncTest()
+    public async executeApis() {
+        const ascm = new AppApiManager(this.mockManager);
+        ascm.addApi('testing', TestData.getApi('api1'));
+        ascm.addApi('testing', TestData.getApi('api2'));
+        ascm.addApi('testing', TestData.getApi('api3'));
+        ascm.registerApis('testing');
+
+        const request: IApiRequest = {
+            method: RequestMethod.GET,
+            headers: {},
+            query: {},
+            params: {},
+            content: '',
+        };
+
+        await Expect(() => ascm.executeApi('testing', 'nope', request)).not.toThrowAsync();
+        await Expect(() => ascm.executeApi('testing', 'not-exists', request)).not.toThrowAsync();
+        await Expect(() => ascm.executeApi('testing', 'api1', request)).not.toThrowAsync();
+        await Expect(() => ascm.executeApi('testing', 'api2', request)).not.toThrowAsync();
+        await Expect(() => ascm.executeApi('testing', 'api3', request)).not.toThrowAsync();
+    }
+
+    @Test()
+    public listApis() {
+        const ascm = new AppApiManager(this.mockManager);
+
+        Expect(ascm.listApis('testing')).toEqual([]);
+
+        ascm.addApi('testing', TestData.getApi('api1'));
+        ascm.registerApis('testing');
+
+        Expect(() => ascm.listApis('testing')).not.toThrow();
+        Expect(ascm.listApis('testing')).not.toEqual([]);
+        Expect(ascm.listApis('testing')).toEqual([
+            {
+                path: 'api1',
+                computedPath: '/api/apps/public/testing/api1',
+                methods: ['get'],
+                examples: {},
+            },
+        ]);
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppExternalComponentManager.spec.ts b/packages/apps-engine/tests/server/managers/AppExternalComponentManager.spec.ts
new file mode 100644
index 000000000000..8331fb986afa
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppExternalComponentManager.spec.ts
@@ -0,0 +1,154 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { IExternalComponent } from '../../../src/definition/externalComponent/IExternalComponent';
+import { ExternalComponentLocation } from '../../../src/definition/externalComponent/IExternalComponent';
+import { AppExternalComponentManager } from '../../../src/server/managers';
+
+export class AppExternalComponentManagerTestFixture {
+    private mockExternalComponent1: IExternalComponent;
+
+    private mockExternalComponent2: IExternalComponent;
+
+    private mockExternalComponent3: IExternalComponent;
+
+    private mockAppExternalComponentManager: AppExternalComponentManager;
+
+    public register(aecm: AppExternalComponentManager, externalComponent: IExternalComponent): void {
+        const { appId } = externalComponent;
+
+        aecm.addExternalComponent(appId, externalComponent);
+        aecm.registerExternalComponents(appId);
+    }
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockExternalComponent1 = {
+            appId: '1eb382c0-3679-44a6-8af0-18802e342fb1',
+            name: 'TestExternalComponent1',
+            description: 'TestExternalComponent1',
+            url: '',
+            icon: '',
+            location: ExternalComponentLocation.CONTEXTUAL_BAR,
+        } as IExternalComponent;
+        this.mockExternalComponent2 = {
+            appId: '125a944b-9747-4e6e-b029-6e9b26bb3481',
+            name: 'TestExternalComponent2',
+            description: 'TestExternalComponent2',
+            url: '',
+            icon: '',
+            location: ExternalComponentLocation.CONTEXTUAL_BAR,
+        } as IExternalComponent;
+        this.mockExternalComponent3 = {
+            ...this.mockExternalComponent2,
+            appId: this.mockExternalComponent1.appId,
+            name: this.mockExternalComponent2.name,
+            description: 'TestExternalComponent3',
+        } as IExternalComponent;
+        this.mockAppExternalComponentManager = new AppExternalComponentManager();
+        this.mockAppExternalComponentManager.addExternalComponent(this.mockExternalComponent1.appId, this.mockExternalComponent1);
+    }
+
+    @Test()
+    public basicAppExternalComponentManager() {
+        const aecm = new AppExternalComponentManager();
+
+        Expect((aecm as any).registeredExternalComponents.size).toBe(0);
+        Expect((aecm as any).appTouchedExternalComponents.size).toBe(0);
+    }
+
+    @Test()
+    public verifyGetRegisteredExternalComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component = this.mockExternalComponent1;
+
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(0);
+
+        this.register(aecm, component);
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(1);
+    }
+
+    @Test()
+    public verifyGetAppTouchedExternalComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component = this.mockExternalComponent1;
+
+        Expect(aecm.getAppTouchedExternalComponents().size).toBe(0);
+
+        aecm.addExternalComponent(component.appId, component);
+        Expect(aecm.getAppTouchedExternalComponents().size).toBe(1);
+    }
+
+    @Test()
+    public verifyGetExternalComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component = this.mockExternalComponent1;
+
+        Expect(aecm.getExternalComponents(component.appId)).toBe(null);
+        aecm.addExternalComponent(component.appId, component);
+        Expect(aecm.getExternalComponents(component.appId).size).toBe(1);
+    }
+
+    @Test()
+    public verifyGetProvidedComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component1 = this.mockExternalComponent1;
+        const component2 = this.mockExternalComponent2;
+
+        Expect(Array.isArray(aecm.getProvidedComponents())).toBe(true);
+        this.register(aecm, component1);
+        this.register(aecm, component2);
+        Expect(aecm.getProvidedComponents().length).toBe(2);
+    }
+
+    @Test()
+    public verifyAddExternalComponent() {
+        const aecm1 = new AppExternalComponentManager();
+        const component1 = this.mockExternalComponent1;
+        const component3 = this.mockExternalComponent3;
+
+        aecm1.addExternalComponent(component1.appId, component1);
+        Expect(aecm1.getAppTouchedExternalComponents().size).toBe(1);
+        Expect(aecm1.getExternalComponents(component1.appId).size).toBe(1);
+
+        aecm1.addExternalComponent(component1.appId, component3);
+        Expect(aecm1.getExternalComponents(component1.appId).size).toBe(2);
+    }
+
+    @Test()
+    public verifyRegisterExternalComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component = this.mockExternalComponent1;
+
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(0);
+        this.register(aecm, component);
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(1);
+    }
+
+    @Test()
+    public verifyUnregisterExternalComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component = this.mockExternalComponent1;
+
+        this.register(aecm, component);
+        Expect(aecm.getAppTouchedExternalComponents().size).toBe(1);
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(1);
+
+        aecm.unregisterExternalComponents(component.appId);
+        Expect(aecm.getAppTouchedExternalComponents().size).toBe(1);
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(0);
+    }
+
+    @Test()
+    public verifyPurgeExternalComponents() {
+        const aecm = new AppExternalComponentManager();
+        const component = this.mockExternalComponent1;
+
+        this.register(aecm, component);
+        Expect(aecm.getAppTouchedExternalComponents().size).toBe(1);
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(1);
+
+        aecm.purgeExternalComponents(component.appId);
+        Expect(aecm.getAppTouchedExternalComponents().size).toBe(0);
+        Expect(aecm.getRegisteredExternalComponents().size).toBe(0);
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppListenerManager.spec.ts b/packages/apps-engine/tests/server/managers/AppListenerManager.spec.ts
new file mode 100644
index 000000000000..a564be12c7fc
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppListenerManager.spec.ts
@@ -0,0 +1,44 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import { AppInterface } from '../../../src/definition/metadata';
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppListenerManager } from '../../../src/server/managers';
+
+export class AppListenerManagerTestFixture {
+    private mockApp: ProxiedApp;
+
+    private mockManager: AppManager;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockApp = {
+            getID() {
+                return 'testing';
+            },
+            getImplementationList() {
+                return {
+                    [AppInterface.IPostMessageSent]: true,
+                } as { [inte: string]: boolean };
+            },
+        } as ProxiedApp;
+
+        this.mockManager = {
+            getAccessorManager() {},
+            getOneById(appId: string) {
+                return this.mockApp;
+            },
+        } as AppManager;
+    }
+
+    @Test()
+    public basicAppListenerManager() {
+        Expect(() => new AppListenerManager(this.mockManager)).not.toThrow();
+
+        const alm = new AppListenerManager(this.mockManager);
+
+        Expect(alm.getListeners(AppInterface.IPostMessageSent).length).toBe(0);
+        Expect(() => alm.registerListeners(this.mockApp)).not.toThrow();
+        Expect(alm.getListeners(AppInterface.IPostMessageSent).length).toBe(1);
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppSettingsManager.spec.ts b/packages/apps-engine/tests/server/managers/AppSettingsManager.spec.ts
new file mode 100644
index 000000000000..9172f1ffb1dc
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppSettingsManager.spec.ts
@@ -0,0 +1,148 @@
+import { AsyncTest, Expect, SetupFixture, SpyOn, Test } from 'alsatian';
+
+import { AppMethod } from '../../../src/definition/metadata';
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import type { AppBridges } from '../../../src/server/bridges';
+import type {
+    AppApiManager,
+    AppExternalComponentManager,
+    AppSchedulerManager,
+    AppSlashCommandManager,
+    AppVideoConfProviderManager,
+} from '../../../src/server/managers';
+import { AppAccessorManager, AppSettingsManager } from '../../../src/server/managers';
+import type { UIActionButtonManager } from '../../../src/server/managers/UIActionButtonManager';
+import type { AppMetadataStorage, IAppStorageItem } from '../../../src/server/storage';
+import { TestsAppBridges } from '../../test-data/bridges/appBridges';
+import { TestData } from '../../test-data/utilities';
+
+export class AppSettingsManagerTestFixture {
+    private mockStorageItem: IAppStorageItem;
+
+    private mockApp: ProxiedApp;
+
+    private mockBridges: AppBridges;
+
+    private mockAccessors: AppAccessorManager;
+
+    private mockStorage: AppMetadataStorage;
+
+    private mockManager: AppManager;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockStorageItem = {
+            settings: {},
+        } as IAppStorageItem;
+
+        this.mockStorageItem.settings.testing = TestData.getSetting('testing');
+
+        const si = this.mockStorageItem;
+        this.mockApp = {
+            getID() {
+                return 'testing';
+            },
+            getStorageItem() {
+                return si;
+            },
+            setStorageItem(item: IAppStorageItem) {},
+            call(method: AppMethod, ...args: Array<any>): Promise<any> {
+                return Promise.resolve();
+            },
+        } as ProxiedApp;
+
+        this.mockBridges = new TestsAppBridges();
+
+        this.mockStorage = {
+            update(item: IAppStorageItem): Promise<IAppStorageItem> {
+                return Promise.resolve(item);
+            },
+        } as AppMetadataStorage;
+
+        const st = this.mockStorage;
+        const bri = this.mockBridges;
+        const app = this.mockApp;
+        this.mockManager = {
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'testing' ? app : undefined;
+            },
+            getBridges(): AppBridges {
+                return bri;
+            },
+            getStorage(): AppMetadataStorage {
+                return st;
+            },
+            getCommandManager(): AppSlashCommandManager {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager(): AppExternalComponentManager {
+                return {} as AppExternalComponentManager;
+            },
+            getApiManager(): AppApiManager {
+                return {} as AppApiManager;
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+        } as AppManager;
+
+        this.mockAccessors = new AppAccessorManager(this.mockManager);
+        const ac = this.mockAccessors;
+        this.mockManager.getAccessorManager = function _getAccessorManager(): AppAccessorManager {
+            return ac;
+        };
+    }
+
+    @Test()
+    public basicAppSettingsManager() {
+        Expect(() => new AppSettingsManager(this.mockManager)).not.toThrow();
+
+        const asm = new AppSettingsManager(this.mockManager);
+        Expect(asm.getAppSettings('testing')).not.toBe(this.mockStorageItem.settings);
+        Expect(asm.getAppSettings('testing')).toEqual(this.mockStorageItem.settings);
+        Expect(() => asm.getAppSettings('fake')).toThrowError(Error, 'No App found by the provided id.');
+        Expect(() => {
+            asm.getAppSettings('testing').testing.value = 'testing';
+        }).toThrow();
+
+        Expect(asm.getAppSetting('testing', 'testing')).not.toBe(this.mockStorageItem.settings.testing);
+        Expect(asm.getAppSetting('testing', 'testing')).toEqual(this.mockStorageItem.settings.testing);
+        Expect(() => asm.getAppSetting('fake', 'testing')).toThrowError(Error, 'No App found by the provided id.');
+        Expect(() => asm.getAppSetting('testing', 'fake')).toThrowError(Error, 'No setting found for the App by the provided id.');
+        Expect(() => {
+            asm.getAppSetting('testing', 'testing').value = 'testing';
+        }).toThrow();
+    }
+
+    @AsyncTest()
+    public async updatingSettingViaAppSettingsManager() {
+        const asm = new AppSettingsManager(this.mockManager);
+
+        SpyOn(this.mockStorage, 'update');
+        SpyOn(this.mockApp, 'call');
+        SpyOn(this.mockApp, 'setStorageItem');
+        SpyOn(this.mockBridges.getAppDetailChangesBridge(), 'doOnAppSettingsChange');
+
+        await Expect(() => asm.updateAppSetting('fake', TestData.getSetting())).toThrowErrorAsync(Error, 'No App found by the provided id.');
+        await Expect(() => asm.updateAppSetting('testing', TestData.getSetting('fake'))).toThrowErrorAsync(
+            Error,
+            'No setting found for the App by the provided id.',
+        );
+
+        const set = TestData.getSetting('testing');
+        await Expect(() => asm.updateAppSetting('testing', set)).not.toThrowAsync();
+
+        Expect(this.mockStorage.update).toHaveBeenCalledWith(this.mockStorageItem).exactly(1);
+        Expect(this.mockApp.setStorageItem).toHaveBeenCalledWith(this.mockStorageItem).exactly(1);
+        Expect(this.mockBridges.getAppDetailChangesBridge().doOnAppSettingsChange).toHaveBeenCalledWith('testing', set).exactly(1);
+
+        Expect(this.mockApp.call).toHaveBeenCalledWith(AppMethod.ONSETTINGUPDATED, set).exactly(1);
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppSlashCommand.spec.ts b/packages/apps-engine/tests/server/managers/AppSlashCommand.spec.ts
new file mode 100644
index 000000000000..373dce031fd3
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppSlashCommand.spec.ts
@@ -0,0 +1,29 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { ISlashCommand } from '../../../src/definition/slashcommands';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppSlashCommand } from '../../../src/server/managers/AppSlashCommand';
+
+export class AppSlashCommandRegistrationTestFixture {
+    private mockApp: ProxiedApp;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockApp = {} as ProxiedApp;
+    }
+
+    @Test()
+    public ensureAppSlashCommand() {
+        Expect(() => new AppSlashCommand(this.mockApp, {} as ISlashCommand)).not.toThrow();
+
+        const ascr = new AppSlashCommand(this.mockApp, {} as ISlashCommand);
+        Expect(ascr.isRegistered).toBe(false);
+        Expect(ascr.isEnabled).toBe(false);
+        Expect(ascr.isDisabled).toBe(false);
+
+        ascr.hasBeenRegistered();
+        Expect(ascr.isDisabled).toBe(false);
+        Expect(ascr.isEnabled).toBe(true);
+        Expect(ascr.isRegistered).toBe(true);
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppSlashCommandManager.spec.ts b/packages/apps-engine/tests/server/managers/AppSlashCommandManager.spec.ts
new file mode 100644
index 000000000000..ce98215ee420
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppSlashCommandManager.spec.ts
@@ -0,0 +1,469 @@
+import type { FunctionSpy, RestorableFunctionSpy } from 'alsatian';
+import { AsyncTest, Expect, Setup, SetupFixture, SpyOn, Teardown, Test } from 'alsatian';
+
+import { AppStatus } from '../../../src/definition/AppStatus';
+import type { AppMethod } from '../../../src/definition/metadata';
+import type { ISlashCommandPreviewItem } from '../../../src/definition/slashcommands';
+import { SlashCommandContext } from '../../../src/definition/slashcommands';
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import type { AppBridges } from '../../../src/server/bridges';
+import { CommandAlreadyExistsError, CommandHasAlreadyBeenTouchedError } from '../../../src/server/errors';
+import { AppConsole } from '../../../src/server/logging';
+import type { AppApiManager, AppExternalComponentManager, AppSchedulerManager, AppVideoConfProviderManager } from '../../../src/server/managers';
+import { AppAccessorManager, AppSlashCommandManager } from '../../../src/server/managers';
+import { AppSlashCommand } from '../../../src/server/managers/AppSlashCommand';
+import type { UIActionButtonManager } from '../../../src/server/managers/UIActionButtonManager';
+import { Room } from '../../../src/server/rooms/Room';
+import type { AppsEngineRuntime } from '../../../src/server/runtime/AppsEngineRuntime';
+import type { DenoRuntimeSubprocessController } from '../../../src/server/runtime/deno/AppsEngineDenoRuntime';
+import type { AppLogStorage } from '../../../src/server/storage';
+import { TestsAppBridges } from '../../test-data/bridges/appBridges';
+import { TestsAppLogStorage } from '../../test-data/storage/logStorage';
+import { TestData } from '../../test-data/utilities';
+
+export class AppSlashCommandManagerTestFixture {
+    public static doThrow = false;
+
+    private mockBridges: TestsAppBridges;
+
+    private mockApp: ProxiedApp;
+
+    private mockAccessors: AppAccessorManager;
+
+    private mockManager: AppManager;
+
+    private spies: Array<RestorableFunctionSpy>;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockBridges = new TestsAppBridges();
+
+        this.mockApp = {
+            getRuntime() {
+                return {} as AppsEngineRuntime;
+            },
+            getDenoRuntime() {
+                return {
+                    sendRequest: () => {},
+                } as unknown as DenoRuntimeSubprocessController;
+            },
+            getID() {
+                return 'testing';
+            },
+            getStatus() {
+                return Promise.resolve(AppStatus.AUTO_ENABLED);
+            },
+            setupLogger(method: AppMethod): AppConsole {
+                return new AppConsole(method);
+            },
+        } as ProxiedApp;
+
+        const bri = this.mockBridges;
+        const app = this.mockApp;
+        this.mockManager = {
+            getBridges(): AppBridges {
+                return bri;
+            },
+            getCommandManager() {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager(): AppExternalComponentManager {
+                return {} as AppExternalComponentManager;
+            },
+            getApiManager() {
+                return {} as AppApiManager;
+            },
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'failMePlease' ? undefined : app;
+            },
+            getLogStorage(): AppLogStorage {
+                return new TestsAppLogStorage();
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+        } as AppManager;
+
+        this.mockAccessors = new AppAccessorManager(this.mockManager);
+        const ac = this.mockAccessors;
+        this.mockManager.getAccessorManager = function _getAccessorManager(): AppAccessorManager {
+            return ac;
+        };
+    }
+
+    @Setup
+    public setup() {
+        this.mockBridges = new TestsAppBridges();
+        const bri = this.mockBridges;
+        this.mockManager.getBridges = function _refreshedGetBridges(): AppBridges {
+            return bri;
+        };
+
+        this.spies = [];
+        this.spies.push(SpyOn(this.mockBridges.getCommandBridge(), 'doDoesCommandExist'));
+        this.spies.push(SpyOn(this.mockBridges.getCommandBridge(), 'doRegisterCommand'));
+        this.spies.push(SpyOn(this.mockBridges.getCommandBridge(), 'doUnregisterCommand'));
+        this.spies.push(SpyOn(this.mockBridges.getCommandBridge(), 'doEnableCommand'));
+        this.spies.push(SpyOn(this.mockBridges.getCommandBridge(), 'doDisableCommand'));
+    }
+
+    @Teardown
+    public teardown() {
+        this.spies.forEach((s) => s.restore());
+    }
+
+    @Test()
+    public basicAppSlashCommandManager() {
+        Expect(() => new AppSlashCommandManager({} as AppManager)).toThrow();
+        Expect(() => new AppSlashCommandManager(this.mockManager)).not.toThrow();
+
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        Expect((ascm as any).manager).toBe(this.mockManager);
+        Expect((ascm as any).bridge).toBe(this.mockBridges.getCommandBridge());
+        Expect((ascm as any).accessors).toBe(this.mockManager.getAccessorManager());
+        Expect((ascm as any).providedCommands).toBeDefined();
+        Expect((ascm as any).providedCommands.size).toBe(0);
+        Expect((ascm as any).modifiedCommands).toBeDefined();
+        Expect((ascm as any).modifiedCommands.size).toBe(0);
+        Expect((ascm as any).touchedCommandsToApps).toBeDefined();
+        Expect((ascm as any).touchedCommandsToApps.size).toBe(0);
+        Expect((ascm as any).appsTouchedCommands).toBeDefined();
+        Expect((ascm as any).appsTouchedCommands.size).toBe(0);
+    }
+
+    @Test()
+    public canCommandBeTouchedBy() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        Expect(ascm.canCommandBeTouchedBy('testing', 'command')).toBe(true);
+        (ascm as any).touchedCommandsToApps.set('just-a-test', 'anotherAppId');
+        Expect(ascm.canCommandBeTouchedBy('testing', 'just-a-test')).toBe(false);
+    }
+
+    @Test()
+    public isAlreadyDefined() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        const reg = new Map<string, AppSlashCommand>();
+        reg.set('command', new AppSlashCommand(this.mockApp, TestData.getSlashCommand('command')));
+
+        Expect(ascm.isAlreadyDefined('command')).toBe(false);
+        (ascm as any).providedCommands.set('testing', reg);
+        Expect(ascm.isAlreadyDefined('command')).toBe(true);
+        Expect(ascm.isAlreadyDefined('cOMMand')).toBe(true);
+        Expect(ascm.isAlreadyDefined(' command ')).toBe(true);
+        Expect(ascm.isAlreadyDefined('c0mmand')).toBe(false);
+    }
+
+    @Test()
+    public setAsTouched() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        Expect(() => (ascm as any).setAsTouched('testing', 'command')).not.toThrow();
+        Expect((ascm as any).appsTouchedCommands.has('testing')).toBe(true);
+        Expect((ascm as any).appsTouchedCommands.get('testing') as Array<string>).not.toBeEmpty();
+        Expect((ascm as any).appsTouchedCommands.get('testing').length).toBe(1);
+        Expect((ascm as any).touchedCommandsToApps.has('command')).toBe(true);
+        Expect((ascm as any).touchedCommandsToApps.get('command')).toBe('testing');
+        Expect(() => (ascm as any).setAsTouched('testing', 'command')).not.toThrow();
+        Expect((ascm as any).appsTouchedCommands.get('testing').length).toBe(1);
+    }
+
+    @AsyncTest()
+    public async registerCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        const regInfo = new AppSlashCommand(this.mockApp, TestData.getSlashCommand('command'));
+
+        await Expect(() => (ascm as any).registerCommand('testing', regInfo)).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().doRegisterCommand).toHaveBeenCalledWith(regInfo.slashCommand, 'testing');
+        Expect(regInfo.isRegistered).toBe(true);
+        Expect(regInfo.isDisabled).toBe(false);
+        Expect(regInfo.isEnabled).toBe(true);
+    }
+
+    @AsyncTest()
+    public async addCommand() {
+        const cmd = TestData.getSlashCommand('my-cmd');
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(async () => ascm.addCommand('testing', cmd)).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().commands.size).toBe(1);
+        Expect((ascm as any).providedCommands.size).toBe(1);
+        Expect((ascm as any).touchedCommandsToApps.get('my-cmd')).toBe('testing');
+        Expect((ascm as any).appsTouchedCommands.get('testing').length).toBe(1);
+        await Expect(() => ascm.addCommand('another-app', cmd)).toThrowErrorAsync(
+            CommandHasAlreadyBeenTouchedError,
+            'The command "my-cmd" has already been touched by another App.',
+        );
+        await Expect(() => ascm.addCommand('testing', cmd)).toThrowErrorAsync(CommandAlreadyExistsError, 'The command "my-cmd" already exists in the system.');
+        await Expect(() => ascm.addCommand('failMePlease', TestData.getSlashCommand('yet-another'))).toThrowErrorAsync(
+            Error,
+            'App must exist in order for a command to be added.',
+        );
+        await Expect(() => ascm.addCommand('testing', TestData.getSlashCommand('another-command'))).not.toThrowAsync();
+        Expect((ascm as any).providedCommands.size).toBe(1);
+        Expect((ascm as any).providedCommands.get('testing').size).toBe(2);
+        await Expect(() => ascm.addCommand('even-another-app', TestData.getSlashCommand('it-exists'))).toThrowErrorAsync(
+            CommandAlreadyExistsError,
+            'The command "it-exists" already exists in the system.',
+        );
+    }
+
+    @AsyncTest()
+    public async failToModifyAnotherAppsCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        await ascm.addCommand('other-app', TestData.getSlashCommand('my-cmd'));
+
+        await Expect(() => ascm.modifyCommand('testing', TestData.getSlashCommand('my-cmd'))).toThrowErrorAsync(
+            CommandHasAlreadyBeenTouchedError,
+            'The command "my-cmd" has already been touched by another App.',
+        );
+    }
+
+    @AsyncTest()
+    public async failToModifyNonExistantAppCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.modifyCommand('failMePlease', TestData.getSlashCommand('yet-another'))).toThrowErrorAsync(
+            Error,
+            'App must exist in order to modify a command.',
+        );
+    }
+
+    @AsyncTest()
+    public async modifyMyCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.modifyCommand('testing', TestData.getSlashCommand())).toThrowErrorAsync(
+            Error,
+            'You must first register a command before you can modify it.',
+        );
+        await ascm.addCommand('testing', TestData.getSlashCommand('the-cmd'));
+        await Expect(() => ascm.modifyCommand('testing', TestData.getSlashCommand('the-cmd'))).not.toThrowAsync();
+    }
+
+    @AsyncTest()
+    public async modifySystemCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.modifyCommand('brand-new-id', TestData.getSlashCommand('it-exists'))).not.toThrowAsync();
+        Expect((ascm as any).modifiedCommands.size).toBe(1);
+        Expect((ascm as any).modifiedCommands.get('it-exists')).toBeDefined();
+        Expect((ascm as any).touchedCommandsToApps.get('it-exists')).toBe('brand-new-id');
+    }
+
+    @AsyncTest()
+    public async enableMyCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.enableCommand('testing', 'doesnt-exist')).toThrowErrorAsync(Error, 'The command "doesnt-exist" does not exist to enable.');
+        await ascm.addCommand('testing', TestData.getSlashCommand('command'));
+        await Expect(() => ascm.enableCommand('testing', 'command')).not.toThrowAsync();
+        Expect((ascm as any).providedCommands.get('testing').get('command').isDisabled).toBe(false);
+        Expect((ascm as any).providedCommands.get('testing').get('command').isEnabled).toBe(true);
+        await ascm.addCommand('testing', TestData.getSlashCommand('another-command'));
+        (ascm as any).providedCommands.get('testing').get('another-command').isRegistered = true;
+        await Expect(() => ascm.enableCommand('testing', 'another-command')).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().doDoesCommandExist).toHaveBeenCalled().exactly(3);
+    }
+
+    @AsyncTest()
+    public async enableSystemCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.enableCommand('testing', 'it-exists')).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().doEnableCommand).toHaveBeenCalledWith('it-exists', 'testing').exactly(1);
+        Expect(this.mockBridges.getCommandBridge().doDoesCommandExist).toHaveBeenCalled().exactly(1);
+    }
+
+    @AsyncTest()
+    public async failToEnableAnotherAppsCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        await ascm.addCommand('another-app', TestData.getSlashCommand('command'));
+
+        await Expect(() => ascm.enableCommand('my-app', 'command')).toThrowErrorAsync(
+            CommandHasAlreadyBeenTouchedError,
+            'The command "command" has already been touched by another App.',
+        );
+    }
+
+    @AsyncTest()
+    public async disableMyCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.disableCommand('testing', 'doesnt-exist')).toThrowErrorAsync(Error, 'The command "doesnt-exist" does not exist to disable.');
+        await ascm.addCommand('testing', TestData.getSlashCommand('command'));
+        await Expect(() => ascm.disableCommand('testing', 'command')).not.toThrowAsync();
+        Expect((ascm as any).providedCommands.get('testing').get('command').isDisabled).toBe(true);
+        Expect((ascm as any).providedCommands.get('testing').get('command').isEnabled).toBe(false);
+        await ascm.addCommand('testing', TestData.getSlashCommand('another-command'));
+        (ascm as any).providedCommands.get('testing').get('another-command').isRegistered = true;
+        await Expect(() => ascm.disableCommand('testing', 'another-command')).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().doDoesCommandExist).toHaveBeenCalled().exactly(3);
+    }
+
+    @AsyncTest()
+    public async disableSystemCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await Expect(() => ascm.disableCommand('testing', 'it-exists')).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().doDisableCommand).toHaveBeenCalledWith('it-exists', 'testing').exactly(1);
+        Expect(this.mockBridges.getCommandBridge().doDoesCommandExist).toHaveBeenCalled().exactly(1);
+    }
+
+    @AsyncTest()
+    public async failToDisableAnotherAppsCommand() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        await ascm.addCommand('another-app', TestData.getSlashCommand('command'));
+
+        await Expect(() => ascm.disableCommand('my-app', 'command')).toThrowErrorAsync(
+            CommandHasAlreadyBeenTouchedError,
+            'The command "command" has already been touched by another App.',
+        );
+    }
+
+    @AsyncTest()
+    public async registerCommands() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        SpyOn(ascm, 'registerCommand');
+
+        await ascm.addCommand('testing', TestData.getSlashCommand('enabled-command'));
+        const enabledRegInfo = (ascm as any).providedCommands.get('testing').get('enabled-command') as AppSlashCommand;
+        await ascm.addCommand('testing', TestData.getSlashCommand('disabled-command'));
+        await ascm.disableCommand('testing', 'disabled-command');
+        const disabledRegInfo = (ascm as any).providedCommands.get('testing').get('disabled-command') as AppSlashCommand;
+
+        await Expect(() => ascm.registerCommands('non-existant')).not.toThrowAsync();
+        await Expect(() => ascm.registerCommands('testing')).not.toThrowAsync();
+        Expect(enabledRegInfo.isRegistered).toBe(true);
+        Expect(disabledRegInfo.isRegistered).toBe(false);
+        Expect((ascm as any).registerCommand as FunctionSpy)
+            .toHaveBeenCalledWith('testing', enabledRegInfo)
+            .exactly(1);
+        Expect(this.mockBridges.getCommandBridge().doRegisterCommand).toHaveBeenCalledWith(enabledRegInfo.slashCommand, 'testing').exactly(1);
+    }
+
+    @AsyncTest()
+    public async unregisterCommands() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+
+        await ascm.addCommand('testing', TestData.getSlashCommand('command'));
+        await ascm.modifyCommand('testing', TestData.getSlashCommand('it-exists'));
+
+        await Expect(() => ascm.unregisterCommands('non-existant')).not.toThrowAsync();
+        await Expect(() => ascm.unregisterCommands('testing')).not.toThrowAsync();
+        Expect(this.mockBridges.getCommandBridge().doUnregisterCommand).toHaveBeenCalled().exactly(1);
+    }
+
+    @AsyncTest()
+    public async executeCommands() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        await ascm.addCommand('testing', TestData.getSlashCommand('command'));
+        await ascm.addCommand('testing', TestData.getSlashCommand('not-registered'));
+        await ascm.addCommand('testing', TestData.getSlashCommand('disabled-command'));
+        await ascm.disableCommand('testing', 'not-registered');
+        await ascm.registerCommands('testing');
+        (ascm as any).providedCommands.get('testing').get('disabled-command').isDisabled = true;
+        await ascm.modifyCommand('testing', TestData.getSlashCommand('it-exists'));
+
+        const context = new SlashCommandContext(TestData.getUser(), TestData.getRoom(), []);
+
+        await Expect(() => ascm.executeCommand('nope', context)).not.toThrowAsync();
+        await Expect(() => ascm.executeCommand('it-exists', context)).not.toThrowAsync();
+        await Expect(() => ascm.executeCommand('command', context)).not.toThrowAsync();
+        await Expect(() => ascm.executeCommand('not-registered', context)).not.toThrowAsync();
+        await Expect(() => ascm.executeCommand('disabled-command', context)).not.toThrowAsync();
+
+        const classContext = new SlashCommandContext(TestData.getUser(), new Room(TestData.getRoom(), this.mockManager), []);
+        await Expect(() => ascm.executeCommand('it-exists', classContext)).not.toThrowAsync();
+
+        // set it up for no "no app failure"
+        const failedItems = new Map<string, AppSlashCommand>();
+        const asm = new AppSlashCommand(this.mockApp, TestData.getSlashCommand('failure'));
+        asm.hasBeenRegistered();
+        failedItems.set('failure', asm);
+        (ascm as any).providedCommands.set('failMePlease', failedItems);
+        (ascm as any).touchedCommandsToApps.set('failure', 'failMePlease');
+        await Expect(() => ascm.executeCommand('failure', context)).not.toThrowAsync();
+
+        AppSlashCommandManagerTestFixture.doThrow = true;
+        await Expect(() => ascm.executeCommand('command', context)).not.toThrowAsync();
+        AppSlashCommandManagerTestFixture.doThrow = false;
+    }
+
+    @AsyncTest()
+    public async getPreviews() {
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        await ascm.addCommand('testing', TestData.getSlashCommand('command'));
+        await ascm.addCommand('testing', TestData.getSlashCommand('not-registered'));
+        await ascm.addCommand('testing', TestData.getSlashCommand('disabled-command'));
+        await ascm.disableCommand('testing', 'not-registered');
+        await ascm.registerCommands('testing');
+        (ascm as any).providedCommands.get('testing').get('disabled-command').isDisabled = true;
+        await ascm.modifyCommand('testing', TestData.getSlashCommand('it-exists'));
+
+        const context = new SlashCommandContext(TestData.getUser(), TestData.getRoom(), ['testing']);
+
+        await Expect(() => ascm.getPreviews('nope', context)).not.toThrowAsync();
+        await Expect(() => ascm.getPreviews('it-exists', context)).not.toThrowAsync();
+        await Expect(() => ascm.getPreviews('command', context)).not.toThrowAsync();
+        await Expect(() => ascm.getPreviews('not-registered', context)).not.toThrowAsync();
+        await Expect(() => ascm.getPreviews('disabled-command', context)).not.toThrowAsync();
+
+        const classContext = new SlashCommandContext(TestData.getUser(), new Room(TestData.getRoom(), this.mockManager), []);
+        await Expect(() => ascm.getPreviews('it-exists', classContext)).not.toThrowAsync();
+
+        // set it up for no "no app failure"
+        const failedItems = new Map<string, AppSlashCommand>();
+        const asm = new AppSlashCommand(this.mockApp, TestData.getSlashCommand('failure'));
+        asm.hasBeenRegistered();
+        failedItems.set('failure', asm);
+        (ascm as any).providedCommands.set('failMePlease', failedItems);
+        (ascm as any).touchedCommandsToApps.set('failure', 'failMePlease');
+        await Expect(() => ascm.getPreviews('failure', context)).not.toThrowAsync();
+
+        // TODO: Figure out how tests can mock/test the result now that we care about it
+    }
+
+    @AsyncTest()
+    public async executePreview() {
+        const previewItem = {} as ISlashCommandPreviewItem;
+        const ascm = new AppSlashCommandManager(this.mockManager);
+        await ascm.addCommand('testing', TestData.getSlashCommand('command'));
+        await ascm.addCommand('testing', TestData.getSlashCommand('not-registered'));
+        await ascm.addCommand('testing', TestData.getSlashCommand('disabled-command'));
+        await ascm.disableCommand('testing', 'not-registered');
+        await ascm.registerCommands('testing');
+        (ascm as any).providedCommands.get('testing').get('disabled-command').isDisabled = true;
+        await ascm.modifyCommand('testing', TestData.getSlashCommand('it-exists'));
+
+        const context = new SlashCommandContext(TestData.getUser(), TestData.getRoom(), ['testing']);
+
+        await Expect(() => ascm.executePreview('nope', previewItem, context)).not.toThrowAsync();
+        await Expect(() => ascm.executePreview('it-exists', previewItem, context)).not.toThrowAsync();
+        await Expect(() => ascm.executePreview('command', previewItem, context)).not.toThrowAsync();
+        await Expect(() => ascm.executePreview('not-registered', previewItem, context)).not.toThrowAsync();
+        await Expect(() => ascm.executePreview('disabled-command', previewItem, context)).not.toThrowAsync();
+
+        const classContext = new SlashCommandContext(TestData.getUser(), new Room(TestData.getRoom(), this.mockManager), []);
+        await Expect(() => ascm.executePreview('it-exists', previewItem, classContext)).not.toThrowAsync();
+
+        // set it up for no "no app failure"
+        const failedItems = new Map<string, AppSlashCommand>();
+        const asm = new AppSlashCommand(this.mockApp, TestData.getSlashCommand('failure'));
+        asm.hasBeenRegistered();
+        failedItems.set('failure', asm);
+        (ascm as any).providedCommands.set('failMePlease', failedItems);
+        (ascm as any).touchedCommandsToApps.set('failure', 'failMePlease');
+        await Expect(() => ascm.executePreview('failure', previewItem, context)).not.toThrowAsync();
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppVideoConfProvider.spec.ts b/packages/apps-engine/tests/server/managers/AppVideoConfProvider.spec.ts
new file mode 100644
index 000000000000..c9f1c70365d4
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppVideoConfProvider.spec.ts
@@ -0,0 +1,25 @@
+import { Expect, SetupFixture, Test } from 'alsatian';
+
+import type { IVideoConfProvider } from '../../../src/definition/videoConfProviders';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppVideoConfProvider } from '../../../src/server/managers/AppVideoConfProvider';
+
+export class AppSlashCommandRegistrationTestFixture {
+    private mockApp: ProxiedApp;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockApp = {} as ProxiedApp;
+    }
+
+    @Test()
+    public ensureAppVideoConfManager() {
+        Expect(() => new AppVideoConfProvider(this.mockApp, {} as IVideoConfProvider)).not.toThrow();
+
+        const ascr = new AppVideoConfProvider(this.mockApp, {} as IVideoConfProvider);
+        Expect(ascr.isRegistered).toBe(false);
+
+        ascr.hasBeenRegistered();
+        Expect(ascr.isRegistered).toBe(true);
+    }
+}
diff --git a/packages/apps-engine/tests/server/managers/AppVideoConfProviderManager.spec.ts b/packages/apps-engine/tests/server/managers/AppVideoConfProviderManager.spec.ts
new file mode 100644
index 000000000000..417a30660e75
--- /dev/null
+++ b/packages/apps-engine/tests/server/managers/AppVideoConfProviderManager.spec.ts
@@ -0,0 +1,435 @@
+import { AsyncTest, Expect, Setup, SetupFixture, SpyOn, Teardown, Test } from 'alsatian';
+
+import type { AppManager } from '../../../src/server/AppManager';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import type { AppBridges } from '../../../src/server/bridges';
+import { VideoConfProviderAlreadyExistsError, VideoConfProviderNotRegisteredError } from '../../../src/server/errors';
+import type { AppApiManager, AppExternalComponentManager, AppSchedulerManager, AppSlashCommandManager } from '../../../src/server/managers';
+import { AppAccessorManager, AppVideoConfProviderManager } from '../../../src/server/managers';
+import { AppVideoConfProvider } from '../../../src/server/managers/AppVideoConfProvider';
+import type { UIActionButtonManager } from '../../../src/server/managers/UIActionButtonManager';
+import type { AppLogStorage } from '../../../src/server/storage';
+import { TestsAppBridges } from '../../test-data/bridges/appBridges';
+import { TestsAppLogStorage } from '../../test-data/storage/logStorage';
+import { TestData } from '../../test-data/utilities';
+
+export class AppVideoConfProviderManagerTestFixture {
+    public static doThrow = false;
+
+    private mockBridges: TestsAppBridges;
+
+    private mockApp: ProxiedApp;
+
+    private mockAccessors: AppAccessorManager;
+
+    private mockManager: AppManager;
+
+    @SetupFixture
+    public setupFixture() {
+        this.mockBridges = new TestsAppBridges();
+
+        this.mockApp = TestData.getMockApp('testing', 'testing');
+
+        const bri = this.mockBridges;
+        const app = this.mockApp;
+        this.mockManager = {
+            getBridges(): AppBridges {
+                return bri;
+            },
+            getCommandManager() {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager(): AppExternalComponentManager {
+                return {} as AppExternalComponentManager;
+            },
+            getApiManager() {
+                return {} as AppApiManager;
+            },
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'failMePlease' ? undefined : app;
+            },
+            getLogStorage(): AppLogStorage {
+                return new TestsAppLogStorage();
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+        } as AppManager;
+
+        this.mockAccessors = new AppAccessorManager(this.mockManager);
+        const ac = this.mockAccessors;
+        this.mockManager.getAccessorManager = function _getAccessorManager(): AppAccessorManager {
+            return ac;
+        };
+    }
+
+    @Setup
+    public setup() {}
+
+    @Teardown
+    public teardown() {}
+
+    @Test()
+    public basicAppVideoConfProviderManager() {
+        Expect(() => new AppVideoConfProviderManager({} as AppManager)).toThrow();
+        Expect(() => new AppVideoConfProviderManager(this.mockManager)).not.toThrow();
+
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        Expect((manager as any).manager).toBe(this.mockManager);
+        Expect((manager as any).accessors).toBe(this.mockManager.getAccessorManager());
+        Expect((manager as any).videoConfProviders).toBeDefined();
+        Expect((manager as any).videoConfProviders.size).toBe(0);
+    }
+
+    @Test()
+    public addProvider() {
+        const provider = TestData.getVideoConfProvider();
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        Expect(() => manager.addProvider('testing', provider)).not.toThrow();
+        Expect((manager as any).videoConfProviders.size).toBe(1);
+        Expect(() => manager.addProvider('failMePlease', provider)).toThrowError(Error, 'App must exist in order for a video conference provider to be added.');
+        Expect((manager as any).videoConfProviders.size).toBe(1);
+    }
+
+    @Test()
+    public ignoreAppsWithoutProviders() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        Expect(() => manager.registerProviders('non-existant')).not.toThrow();
+    }
+
+    @Test()
+    public registerProviders() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        manager.addProvider('firstApp', TestData.getVideoConfProvider());
+        const appInfo = (manager as any).videoConfProviders.get('firstApp') as Map<string, AppVideoConfProvider>;
+        Expect(appInfo).toBeDefined();
+        const regInfo = appInfo.get('test');
+        Expect(regInfo).toBeDefined();
+
+        Expect(regInfo.isRegistered).toBe(false);
+        Expect(() => manager.registerProviders('firstApp')).not.toThrow();
+        Expect(regInfo.isRegistered).toBe(true);
+    }
+
+    @Test()
+    public registerTwoProviders() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        manager.addProvider('firstApp', TestData.getVideoConfProvider());
+        manager.addProvider('firstApp', TestData.getVideoConfProvider('another-test'));
+        const firstApp = (manager as any).videoConfProviders.get('firstApp') as Map<string, AppVideoConfProvider>;
+        Expect(firstApp).toBeDefined();
+        const firstRegInfo = firstApp.get('test');
+        Expect(firstRegInfo).toBeDefined();
+        const secondRegInfo = firstApp.get('another-test');
+        Expect(secondRegInfo).toBeDefined();
+
+        Expect(firstRegInfo.isRegistered).toBe(false);
+        Expect(secondRegInfo.isRegistered).toBe(false);
+        Expect(() => manager.registerProviders('firstApp')).not.toThrow();
+        Expect(firstRegInfo.isRegistered).toBe(true);
+        Expect(secondRegInfo.isRegistered).toBe(true);
+    }
+
+    @Test()
+    public registerProvidersFromMultipleApps() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        manager.addProvider('firstApp', TestData.getVideoConfProvider());
+        manager.addProvider('firstApp', TestData.getVideoConfProvider('another-test'));
+        manager.addProvider('secondApp', TestData.getVideoConfProvider('test3'));
+
+        const firstApp = (manager as any).videoConfProviders.get('firstApp') as Map<string, AppVideoConfProvider>;
+        Expect(firstApp).toBeDefined();
+        const firstRegInfo = firstApp.get('test');
+        const secondRegInfo = firstApp.get('another-test');
+        Expect(firstRegInfo).toBeDefined();
+        Expect(secondRegInfo).toBeDefined();
+        const secondApp = (manager as any).videoConfProviders.get('secondApp') as Map<string, AppVideoConfProvider>;
+        Expect(secondApp).toBeDefined();
+        const thirdRegInfo = secondApp.get('test3');
+        Expect(thirdRegInfo).toBeDefined();
+
+        Expect(firstRegInfo.isRegistered).toBe(false);
+        Expect(secondRegInfo.isRegistered).toBe(false);
+        Expect(() => manager.registerProviders('firstApp')).not.toThrow();
+        Expect(firstRegInfo.isRegistered).toBe(true);
+        Expect(secondRegInfo.isRegistered).toBe(true);
+        Expect(thirdRegInfo.isRegistered).toBe(false);
+        Expect(() => manager.registerProviders('secondApp')).not.toThrow();
+        Expect(thirdRegInfo.isRegistered).toBe(true);
+    }
+
+    @Test()
+    public failToRegisterSameProvider() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        manager.addProvider('firstApp', TestData.getVideoConfProvider());
+
+        Expect(() => manager.addProvider('secondApp', TestData.getVideoConfProvider('test'))).toThrowError(
+            VideoConfProviderAlreadyExistsError,
+            `The video conference provider "test" was already registered by another App.`,
+        );
+    }
+
+    @Test()
+    public unregisterProviders() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+        const regInfo = (manager as any).videoConfProviders.get('testing').get('test') as AppVideoConfProvider;
+        Expect(() => manager.registerProviders('testing')).not.toThrow();
+
+        Expect(() => manager.unregisterProviders('non-existant')).not.toThrow();
+        Expect(regInfo.isRegistered).toBe(true);
+        Expect(() => manager.unregisterProviders('testing')).not.toThrow();
+        Expect(regInfo.isRegistered).toBe(false);
+    }
+
+    @AsyncTest()
+    public async failToGenerateUrlWithoutProvider() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        const call = TestData.getVideoConfData();
+
+        await Expect(async () => manager.generateUrl('test', call)).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "test" is not registered in the system.`,
+        );
+
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+
+        await Expect(() => manager.generateUrl('test', call)).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "test" is not registered in the system.`,
+        );
+    }
+
+    @AsyncTest()
+    public async generateUrl() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+        manager.registerProviders('testing');
+
+        const call = TestData.getVideoConfData();
+
+        SpyOn(AppVideoConfProvider.prototype, 'runGenerateUrl').andReturn('test/first-call');
+        const url = await manager.generateUrl('test', call);
+        await Expect(url).toBe('test/first-call');
+    }
+
+    @AsyncTest()
+    public async generateUrlWithMultipleProvidersAvailable() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+        manager.addProvider('testing', TestData.getVideoConfProvider('test2'));
+        manager.registerProviders('testing');
+        manager.addProvider('secondApp', TestData.getVideoConfProvider('differentProvider'));
+        manager.registerProviders('secondApp');
+
+        const call = TestData.getVideoConfData();
+
+        const cases: any = [
+            {
+                name: 'test',
+                call,
+                runGenerateUrl: 'test/first-call',
+                result: 'test/first-call',
+            },
+            {
+                name: 'test2',
+                call,
+                runGenerateUrl: 'test2/first-call',
+                result: 'test2/first-call',
+            },
+            {
+                name: 'differentProvider',
+                call,
+                runGenerateUrl: 'differentProvider/first-call',
+                result: 'differentProvider/first-call',
+            },
+        ];
+
+        for (const c of cases) {
+            SpyOn(AppVideoConfProvider.prototype, 'runGenerateUrl').andReturn(c.runGenerateUrl);
+            await Expect(await manager.generateUrl(c.name, c.call)).toBe(c.result);
+        }
+    }
+
+    @AsyncTest()
+    public async failToGenerateUrlWithUnknownProvider() {
+        const call = TestData.getVideoConfData();
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        await Expect(() => manager.generateUrl('unknownProvider', call)).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "unknownProvider" is not registered in the system.`,
+        );
+    }
+
+    @AsyncTest()
+    public async failToGenerateUrlWithUnregisteredProvider() {
+        const call = TestData.getVideoConfData();
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        manager.addProvider('unregisteredApp', TestData.getVideoConfProvider('unregisteredProvider'));
+        await Expect(() => manager.generateUrl('unregisteredProvider', call)).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "unregisteredProvider" is not registered in the system.`,
+        );
+    }
+
+    @AsyncTest()
+    public async failToCustomizeUrlWithoutProvider() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        const call = TestData.getVideoConfDataExtended();
+        const user = TestData.getVideoConferenceUser();
+
+        await Expect(() => manager.customizeUrl('test', call, user, {})).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "test" is not registered in the system.`,
+        );
+
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+
+        await Expect(() => manager.customizeUrl('test', call, user, {})).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "test" is not registered in the system.`,
+        );
+    }
+
+    @AsyncTest()
+    public async customizeUrl() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+        manager.registerProviders('testing');
+
+        const call = TestData.getVideoConfDataExtended();
+        const user = TestData.getVideoConferenceUser();
+
+        const cases: any = [
+            {
+                name: 'test',
+                call,
+                user,
+                options: {},
+                runCustomizeUrl: 'test/first-call#caller',
+                result: 'test/first-call#caller',
+            },
+            {
+                name: 'test',
+                call,
+                user: undefined,
+                options: {},
+                runCustomizeUrl: 'test/first-call#',
+                result: 'test/first-call#',
+            },
+        ];
+
+        for (const c of cases) {
+            SpyOn(AppVideoConfProvider.prototype, 'runCustomizeUrl').andReturn(c.runCustomizeUrl);
+            await Expect(await manager.customizeUrl(c.name, c.call, c.user, c.options)).toBe(c.result);
+        }
+    }
+
+    @AsyncTest()
+    public async customizeUrlWithMultipleProvidersAvailable() {
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+        manager.addProvider('testing', TestData.getVideoConfProvider());
+        manager.addProvider('testing', TestData.getVideoConfProvider('test2'));
+        manager.registerProviders('testing');
+        manager.addProvider('secondApp', TestData.getVideoConfProvider('differentProvider'));
+        manager.registerProviders('secondApp');
+
+        const call = TestData.getVideoConfDataExtended();
+        const user = TestData.getVideoConferenceUser();
+
+        const cases = [
+            {
+                name: 'test',
+                call,
+                user,
+                options: {},
+                runCustomizeUrl: 'test/first-call#caller',
+                result: 'test/first-call#caller',
+            },
+            {
+                name: 'test',
+                call,
+                user: undefined,
+                options: {},
+                runCustomizeUrl: 'test/first-call#',
+                result: 'test/first-call#',
+            },
+            {
+                name: 'test2',
+                call,
+                user,
+                options: {},
+                runCustomizeUrl: 'test2/first-call#caller',
+                result: 'test2/first-call#caller',
+            },
+            {
+                name: 'test2',
+                call,
+                user: undefined,
+                options: {},
+                runCustomizeUrl: 'test2/first-call#',
+                result: 'test2/first-call#',
+            },
+            {
+                name: 'differentProvider',
+                call,
+                user,
+                options: {},
+                runCustomizeUrl: 'differentProvider/first-call#caller',
+                result: 'differentProvider/first-call#caller',
+            },
+            {
+                name: 'differentProvider',
+                call,
+                user: undefined,
+                options: {},
+                runCustomizeUrl: 'differentProvider/first-call#',
+                result: 'differentProvider/first-call#',
+            },
+        ];
+
+        for (const c of cases) {
+            SpyOn(AppVideoConfProvider.prototype, 'runCustomizeUrl').andReturn(c.runCustomizeUrl);
+            await Expect(await manager.customizeUrl(c.name, c.call, c.user, c.options)).toBe(c.result);
+        }
+    }
+
+    @AsyncTest()
+    public async failToCustomizeUrlWithUnknownProvider() {
+        const call = TestData.getVideoConfDataExtended();
+        const user = TestData.getVideoConferenceUser();
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        await Expect(() => manager.customizeUrl('unknownProvider', call, user, {})).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "unknownProvider" is not registered in the system.`,
+        );
+    }
+
+    @AsyncTest()
+    public async failToCustomizeUrlWithUnregisteredProvider() {
+        const call = TestData.getVideoConfDataExtended();
+        const user = TestData.getVideoConferenceUser();
+        const manager = new AppVideoConfProviderManager(this.mockManager);
+
+        manager.addProvider('unregisteredApp', TestData.getVideoConfProvider('unregisteredProvider'));
+        await Expect(() => manager.customizeUrl('unregisteredProvider', call, user, {})).toThrowErrorAsync(
+            VideoConfProviderNotRegisteredError,
+            `The video conference provider "unregisteredProvider" is not registered in the system.`,
+        );
+    }
+}
diff --git a/packages/apps-engine/tests/server/misc/Utilities.spec.ts b/packages/apps-engine/tests/server/misc/Utilities.spec.ts
new file mode 100644
index 000000000000..fcf3fac168ca
--- /dev/null
+++ b/packages/apps-engine/tests/server/misc/Utilities.spec.ts
@@ -0,0 +1,69 @@
+import { Expect, Test } from 'alsatian';
+
+import { Utilities } from '../../../src/server/misc/Utilities';
+
+export class UtilitiesTestFixture {
+    private expectedInfo = {
+        id: '614055e2-3dba-41fb-be48-c1ff146f5932',
+        name: 'Testing App',
+        nameSlug: 'testing-app',
+        description: 'A Rocket.Chat Application used to test out the various features.',
+        version: '0.0.8',
+        requiredApiVersion: '>=0.9.6',
+        author: {
+            name: 'Bradley Hilton',
+            homepage: 'https://github.com/RocketChat/Rocket.Chat.Apps-ts-definitions',
+            support: 'https://github.com/RocketChat/Rocket.Chat.Apps-ts-definitions/issues',
+        },
+        classFile: 'TestingApp.ts',
+        iconFile: 'testing.jpg',
+    };
+
+    @Test()
+    public testDeepClone() {
+        Expect(() => Utilities.deepClone(this.expectedInfo)).not.toThrow();
+        const info = Utilities.deepClone(this.expectedInfo);
+
+        Expect(info).toEqual(this.expectedInfo);
+        info.name = 'New Testing App';
+        Expect(info.name).toEqual('New Testing App');
+        Expect(info.author.name).toEqual(this.expectedInfo.author.name);
+    }
+
+    @Test()
+    public testDeepFreeze() {
+        Expect(() => {
+            this.expectedInfo.name = 'New Testing App';
+        }).not.toThrow();
+        Expect(() => {
+            this.expectedInfo.author.name = 'Bradley H';
+        }).not.toThrow();
+        Expect(this.expectedInfo.name).toEqual('New Testing App');
+        Expect(this.expectedInfo.author.name).toEqual('Bradley H');
+
+        Expect(() => Utilities.deepFreeze(this.expectedInfo)).not.toThrow();
+
+        Expect(() => {
+            this.expectedInfo.name = 'Old Testing App';
+        }).toThrow();
+        Expect(() => {
+            this.expectedInfo.author.name = 'Bradley';
+        }).toThrow();
+        Expect(this.expectedInfo.name).toEqual('New Testing App');
+        Expect(this.expectedInfo.author.name).toEqual('Bradley H');
+    }
+
+    @Test()
+    public testDeepCloneAndFreeze() {
+        Expect(() => Utilities.deepCloneAndFreeze({})).not.toThrow();
+
+        const info = Utilities.deepCloneAndFreeze(this.expectedInfo);
+        Expect(info).toEqual(this.expectedInfo);
+        Expect(info).not.toBe(this.expectedInfo);
+        Expect(info.author.name).toEqual(this.expectedInfo.author.name);
+        Expect(info.author.name).toEqual('Bradley H'); // was changed on testDeepFreeze
+        Expect(() => {
+            info.author.name = 'Bradley Hilton';
+        }).toThrow();
+    }
+}
diff --git a/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts b/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts
new file mode 100644
index 000000000000..0e9c1f7f8786
--- /dev/null
+++ b/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts
@@ -0,0 +1,222 @@
+import * as fs from 'fs/promises';
+import * as path from 'path';
+
+import { TestFixture, Setup, Expect, AsyncTest, SpyOn, Any, AsyncSetupFixture, Teardown } from 'alsatian';
+import type { SuccessObject } from 'jsonrpc-lite';
+
+import { UserStatusConnection, UserType } from '../../../src/definition/users';
+import type { AppManager } from '../../../src/server/AppManager';
+import type { IParseAppPackageResult } from '../../../src/server/compiler';
+import { AppAccessorManager, AppApiManager } from '../../../src/server/managers';
+import { DenoRuntimeSubprocessController } from '../../../src/server/runtime/deno/AppsEngineDenoRuntime';
+import { TestInfastructureSetup } from '../../test-data/utilities';
+
+@TestFixture('DenoRuntimeSubprocessController')
+export class DenuRuntimeSubprocessControllerTestFixture {
+    private manager: AppManager;
+
+    private controller: DenoRuntimeSubprocessController;
+
+    private appPackage: IParseAppPackageResult;
+
+    @AsyncSetupFixture
+    public async fixture() {
+        const infrastructure = new TestInfastructureSetup();
+        this.manager = infrastructure.getMockManager();
+
+        const accessors = new AppAccessorManager(this.manager);
+
+        this.manager.getAccessorManager = () => accessors;
+
+        const api = new AppApiManager(this.manager);
+
+        this.manager.getApiManager = () => api;
+
+        const appPackage = await fs.readFile(path.join(__dirname, '../../test-data/apps/hello-world-test_0.0.1.zip'));
+
+        this.appPackage = await this.manager.getParser().unpackageApp(appPackage);
+    }
+
+    @Setup
+    public setup() {
+        this.controller = new DenoRuntimeSubprocessController(this.manager, this.appPackage);
+        this.controller.setupApp();
+    }
+
+    @Teardown
+    public teardown() {
+        this.controller.stopApp();
+    }
+
+    @AsyncTest('correctly identifies a call to the HTTP accessor')
+    public async testHttpAccessor() {
+        const spy = SpyOn(this.manager.getBridges().getHttpBridge(), 'doCall');
+
+        // eslint-disable-next-line
+        const r = await this.controller['handleAccessorMessage']({
+            type: 'request' as any,
+            payload: {
+                jsonrpc: '2.0',
+                id: 'test',
+                method: 'accessor:getHttp:get',
+                params: ['https://google.com', { content: "{ test: 'test' }" }],
+                serialize: () => '',
+            },
+        });
+
+        Expect(this.manager.getBridges().getHttpBridge().doCall).toHaveBeenCalledWith(
+            Any(Object).thatMatches({
+                appId: '9c1d62ca-e40f-456f-8601-17c823a16c68',
+                method: 'get',
+                url: 'https://google.com',
+            }),
+        );
+
+        Expect(r.result).toEqual({
+            method: 'get',
+            url: 'https://google.com',
+            content: "{ test: 'test' }",
+            statusCode: 200,
+            headers: {},
+        });
+
+        spy.restore();
+    }
+
+    @AsyncTest('correctly identifies a call to the IRead accessor')
+    public async testIReadAccessor() {
+        const spy = SpyOn(this.manager.getBridges().getUserBridge(), 'doGetByUsername');
+
+        spy.andReturn(
+            Promise.resolve({
+                id: 'id',
+                username: 'rocket.cat',
+                isEnabled: true,
+                emails: [],
+                name: 'name',
+                roles: [],
+                type: UserType.USER,
+                active: true,
+                utcOffset: 0,
+                status: 'offline',
+                statusConnection: UserStatusConnection.OFFLINE,
+                lastLoginAt: new Date(),
+                createdAt: new Date(),
+                updatedAt: new Date(),
+            }),
+        );
+
+        // eslint-disable-next-line
+        const { id, result } = await this.controller['handleAccessorMessage']({
+            type: 'request' as any,
+            payload: {
+                jsonrpc: '2.0',
+                id: 'test',
+                method: 'accessor:getReader:getUserReader:getByUsername',
+                params: ['rocket.cat'],
+                serialize: () => '',
+            },
+        });
+
+        Expect(this.manager.getBridges().getUserBridge().doGetByUsername).toHaveBeenCalledWith('rocket.cat', '9c1d62ca-e40f-456f-8601-17c823a16c68');
+
+        Expect(id).toBe('test');
+        Expect((result as any).username).toEqual('rocket.cat');
+    }
+
+    @AsyncTest('correctly identifies a call to the IEnvironmentReader accessor via IRead')
+    public async testIEnvironmentReaderAccessor() {
+        // eslint-disable-next-line
+        const { id, result } = await this.controller['handleAccessorMessage']({
+            type: 'request' as any,
+            payload: {
+                jsonrpc: '2.0',
+                id: 'requestId',
+                method: 'accessor:getReader:getEnvironmentReader:getServerSettings:getOneById',
+                params: ['setting test id'],
+                serialize: () => '',
+            },
+        });
+
+        Expect(id).toBe('requestId');
+        Expect((result as any).id).toEqual('setting test id');
+    }
+
+    @AsyncTest('correctly identifies a call to create a visitor via the LivechatCreator')
+    public async testLivechatCreator() {
+        const spy = SpyOn(this.manager.getBridges().getLivechatBridge(), 'doCreateVisitor');
+
+        spy.andReturn(Promise.resolve('random id'));
+
+        // eslint-disable-next-line
+        const { id, result } = await this.controller['handleAccessorMessage']({
+            type: 'request' as any,
+            payload: {
+                jsonrpc: '2.0',
+                id: 'requestId',
+                method: 'accessor:getModifier:getCreator:getLivechatCreator:createVisitor',
+                params: [
+                    {
+                        id: 'random id',
+                        token: 'random token',
+                        username: 'random username for visitor',
+                        name: 'Random Visitor',
+                    },
+                ],
+                serialize: () => '',
+            },
+        });
+
+        // Making sure `handleAccessorMessage` correctly identified which accessor it should resolve to
+        // and that it passed the correct arguments to the bridge method
+        Expect(this.manager.getBridges().getLivechatBridge().doCreateVisitor).toHaveBeenCalledWith(
+            Any(Object).thatMatches({
+                id: 'random id',
+                token: 'random token',
+                username: 'random username for visitor',
+                name: 'Random Visitor',
+            }),
+            '9c1d62ca-e40f-456f-8601-17c823a16c68',
+        );
+
+        Expect(id).toBe('requestId');
+        Expect(result).toEqual('random id');
+
+        spy.restore();
+    }
+
+    @AsyncTest('correctly identifies a call to the message bridge')
+    public async testMessageBridge() {
+        const spy = SpyOn(this.manager.getBridges().getMessageBridge(), 'doCreate');
+
+        spy.andReturn(Promise.resolve('random-message-id'));
+
+        const messageParam = {
+            room: { id: '123' },
+            sender: { id: '456' },
+            text: 'Hello World',
+            alias: 'alias',
+            avatarUrl: 'https://avatars.com/123',
+        };
+
+        // eslint-disable-next-line
+        const response = await this.controller['handleBridgeMessage']({
+            type: 'request' as any,
+            payload: {
+                jsonrpc: '2.0',
+                id: 'requestId',
+                method: 'bridges:getMessageBridge:doCreate',
+                params: [messageParam, 'APP_ID'],
+                serialize: () => '',
+            },
+        });
+        const { id, result } = response as SuccessObject;
+
+        Expect(this.manager.getBridges().getMessageBridge().doCreate).toHaveBeenCalledWith(messageParam, '9c1d62ca-e40f-456f-8601-17c823a16c68');
+
+        Expect(id).toBe('requestId');
+        Expect(result).toEqual('random-message-id');
+
+        spy.restore();
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/README.md b/packages/apps-engine/tests/test-data/README.md
new file mode 100644
index 000000000000..d02811b01243
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/README.md
@@ -0,0 +1,2 @@
+# What is this folder?
+This contains data, classes, and implementations of pieces that the user of this package would have to implement.
diff --git a/packages/apps-engine/tests/test-data/apps/hello-world-test_0.0.1.zip b/packages/apps-engine/tests/test-data/apps/hello-world-test_0.0.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..df9e608838972f812d5e9f400a6bfa3e8174d222
GIT binary patch
literal 10309
zcmaKS1#lh9lBJlgB#W6Xi<z0hw(yFXW$_g=Gcz+YGcz+YSYTO<7USA)=KcTX@6KjN
zMOR06c4cOt=*Y@E@=}mc7+_#<aA0EI;i?@`#MMABFfgUx1Mqt=*ytNt=$jZD8Mv0K
z(2Pz`1M3v*sK(@`Wa($6rasfn%F$6#Ey+xcD$N0Dr08j;CZ-|Fm=;)<S;4{*ObYy3
zBw!?l+JYq7f`UkcuvCh$RA9cjVPQ!Czczx&|Bsak-BB9)ey>OZ4hHty9<a~GmX_A4
z)^?UgO2+mM!ZtPx=JuXZ{8CWNC_(Pt;?j)(X7@&YVP5=Mks3Y&mMm^jiYe)&c;okW
zU=<3~_<i{OY@~3lJVM@P|2V4O3S4z*&qsaexM^@%%r7g4uS5?-hT}PtZ4VpUPj=0b
z=UO$+F{}a~_aC6>nj5D8MI}z4s{&Js2h&i!8P0$m!hs-8#`x;Q>KuZny&L-sa{bgN
zjcAykG5qy@@j{^$BTn8(YCN_8KeilH#o<Iv6Mn#brXfuF71N=h{PD6@^!nWgftGN_
z|MD5`zoY%z&3_5p@0tEzURr~+W0>XonNR}n-w<e7opu#O)}WO!LvT?L;mDU;DX^lf
zP63F@@4U5|qJhP~Ixn_(H@zf^R7;xFVhyNWHKz-6YD%0OY?Uue6;(5?EmkKOp{tEI
zF|db2883y^(T8bNn6sXV1SI!!wRvw}f;;Sok}Jky;+8h3k$_?B_C@1qIJM1Q3U^1@
zZW4&0o;BByF;;HAlzgL|ggv1Qr2Kh+^12&Ir8m+3!;D)OSto>N+wlUzv3&0a#_7D3
zwN@c(nPNnY(PNu6_6x@k8k*MzouE<lfQ*zINq#4429_IM7K~|}QgOIPoKdPrv2^NW
z{SiHYu-pEn!(1d2lsjgKO_ZfC6}mi*5=3t2Bmd1d8=@XXGN!9%I-%EZ*ucWQhx6|d
z{szkB@A2=DhC7C<{wtopCx1d}W@rs!umPD=syy?ehv8@Q*jZ#mNr@$dp;0F@6cCao
zl5*7Bt*WMt#xVtPtF+n^NY?$pI|(;VS>l@5U-=xOufC*Zhc7d01Y&(Yf4O}9F!juL
z@k?O(z;o;V*Or&dymbpVWa0-ZNHDPN#`35vupS03Fp~QNxpw0b(ap_8mV9?eM8`Pw
zQl&5<l1mppI4Bx=`pk?BHYO%hYwPLGX+cVRTK*O{Rx~jAvlq$zYuU2nu^QrKg0oy^
z@$W9L0v)vNZT*mrCXkU{$4*O{T<ccxMn4dvS~Cb8UqE*n4*Kr`a67#h(7DhgPv~6*
z059=GapO-uYNum4?)*tP76S*|rzqS#-E_n%KOyWbO3a^Uvscg>z#Zr{QNEQ3Qm9ME
zq)`lhe%w$0G=@+CnQJv!WxQ^YyH^EU5r9BeP|#o#%2vYe>0Tc<AMa3s9^G~EMY?;n
z!gUHhLLud1H;hW^Q!`@28i_o-XO!x2RS0Sl|B4g;Vkk=HCnU!^rd;P*33&D_`gN<>
z%f9s$QsT|czDq_6(;uV6GmC?}s1-D87<3)HAkH_y!ShUo&BOYz&YXLL&7;ar3j3qL
zP#FpLbZ7d(TnLxCS#PK6D03eKwv}Z=Jx*ulszBWP_3^bwR&ev&^GgbJ)U-h;M*5Ln
zNY<)Lu#DnXGAfVfDPk*!j5_CPIowam3|xWFQ@5@}n{69daMqFPQwAw3an=g_U7dI*
zgLF|QbQb+ZNd0VF03wlruaz!Fh~U#_mzwVOSreZ2L?j&xI;6xtryN_MgaxDV5q=$%
zKS{w~pJZiG&xg=4H*RhnVG40eg_h|`ud;aDrpQ-f!bQ^Vt*#vg3#xZRq{?|~^OUxC
zS!0rk^91vOU#T7C@N7Hx$}utZkBpDkRTQsa4_9`*4xL=bV<9ZnB(zsL(j6ZS-_$Pp
zB&+h%lM>jtsk(Qu+)g<2{L<M70!olFWDuFt&7O9YHn?R80=M;YDdJl<8C6f9#w$ZZ
zr;A7%%y%Jmmcp)|s~hIgDdh<`@qkIubC<p>lA2(vO+%?Z-W_Lc_=Hz(gh^mhgwzyA
z=;bScmW>Qms!M|{hcSg{P}DCPp2klS2@S(nn+uQ^4agwSxpck{3;vl*wz*zVMG^*0
z>p@Fao6_k!e(h6E(V|CKqfX+e+g(NU>{hzJW?cCa5q#Idr6f8W%%b0&=#Mm6pMyc@
zY9-!HqHe0%9?q=_16eoS!Trj_K)2AD$<8JeNbRed=!_n&Z0$DV7#(8gZ`$-yxJbfC
zwiDm+jCqsh?5=O;G1AVtc}2C=%Pl4;QVr&*T7BQhmBK$Iv$7nQ8MA-b*A0bWYsA%y
z*Cd)e`|$&cB;9g|Rk}9s@oR6a1HyM3%DgU#N#XacqYpqEB)@I+sP3zFmvP(H=A|)m
z7cdq5bo|v7CWbN=)zTEEI+Fa-^(7O~^&XQqO<wr5YT`%YGnoX#;uq92@Mc<8;qXq9
zo)ucz>(^;__L>c+5_UBQSh2;InG&r?uUoNF=H>98aS6pp3Q-L|sF7!+*8J`%HSv{F
zlM%@IVB_1~%CNE1`1bOeSkqHDTAsJmzg9S)+f8XpZi#7rq)_E2aovjiHZdhj(IziN
zH7s)$G=-zMYT`DNRHtFVi*@39u>`8<Scv6BUfxk6kk4zp{1wU7)8$eP<R6#o!V8ES
zH_uZPFBnUzuLFSf`~P6jr;UoF)0wDVfSa)_jCX?*An%^Me!e78@c|O|lg-C<W3rR5
zTXEm4two?G2}ioLO!7CDMj+$>95Sf-y}snhVdu0VWnq2=N&_~~)YH)$)`nPv2p#;8
zvCh=gByJ;iP-^Am311T;Nlwm+Utr|A$cmMlx9NVK3{4H)ce$Rjkiz30OdwnS6mhmU
zg7i6D*$1Sx%Au}(Gc-ex#M?J9rTz#R*S|ZAQNwB1GubhdN={3pe$wcT3U9_$8TN*#
z^(9tp3WZ7zEjT)U^R8A3^JkOcv~pt5W*27C^{1;}Ep(M<K9o!eQ=Vhe;Y%c+CHJCF
zggep%^nOOC8?m_g7p;!2bEyZ^ww)~vRct%Yo~*oh-+2#O>WQJgu0~aLFCkAiY+f=F
zU-@`%@Z84(J_c0TD0hEBJpHH};$5$$KXsaAQ&I{m{v?wAq`C(eG_gfO<n5XfC$EX7
z_~k1Ddh<CZ;RurtJ0(Lg_eBmvu_6u+reQ1ma7s0Cr{l^b9<LgJB4{97>2)$z6S?#b
z6~L)N>L5VdlxP4XM!b;=StPxAKfv?oSpc`F0r_)Rdf@{u&xe`r9^q?=9sS}z3c7cV
zd2!C0bYgdc4N0;#rwu6}Nxz|;@LRcD@MyF+T<NHC)N#`B>_5lwfPWLsLNEr8y)-pX
z`e46*wuf@b*yA{zdY6#5RR%`p*^gFSeATc_HG&og8+oGy$u7%lmBBHH+39WItuu*!
zwSRKETOhQtH|Q`C*-OTuq)>k&^^RXH=(Ao`9f8p0qUC|UQJB|?b~LN)ot1&imuma=
zV!w`g)$A7(Q(iYOPZ<!Rhd*2t;@*;Z^ri!Hav~e5aX<LVB)ZA?X=;;^04e*yMn()U
z(5ag#F@j_B?54Luru1M;Z&Q9kcx(L~l8r)H@gm<`3V0Ek8hn4ZX(r54^}J5$K>XCA
zrBy~PG*#%OFN1Z0mUeP&KZZ>3sHE~%N5Un3mS1D|TKT>fiqD+WDGk7Asf5w2qyI9r
zeveeyhpprV4a87JAWMbzZ1grXZ|+miKSy2?HM-Mf4Rdksjiw*8lsJ<3+Jn9EU7dM9
z+}mmOF|zF@?W7Dk5Kf=O7&Fn27$)9jFWw5pf^lXJexILq^r|s2kVU6gzoACPQOr_8
zzD!`QwC?e^IW*)pS-Q6!NW`8n#>gd4#+W;3e|l3+r+K>4exlRSLUP+=04R_Q;EO&k
zIS5obo#l_$AfoSF48ysdC>2v4Q8bGoMNZxBpZyvkUthDYuh~$v>WrN#f{nV`w0->I
z;6&m2ye&$CCm=7{Xh9G%;EYFaZ*tmCOp^1F*G9(V@l9<P7`vt0bi7YemUg&U#d>--
z%GS|jGDkvGyO%Sy_4&P3svn;tBQCko?R8cy0cJwmd@WU^{ZU!##q;QLLAaP^?tsqD
z|N8-^`a#6bM+%uP8Q;~y=Cy1;j@ls6iG?xLtRGr2V?QIDDpHZCoKO<d<Kd+)%!gGc
z{ioBmGH%;>*z2jdP_a(BR)Oe9ud?m_QsSYn?g5JFN(RXc-#mR9IlKr%(^W}!d{atb
z;W0YKIR}Ja^Y~?_6@YXihKBVUUIbl{5G~h3==~6hR>?X+*?eM4FRA$zAxUz1X9gQ_
zfD+fwzOPT-4+~GMlioY&PnsIb4A`97O;=<@F;^dKCPyc0@2<Ux-aq`w8Nb=y2EM_A
zfte!wGiPl0kDL+pch30VdmegAYeS3QyAEqmqn25G-bUP;m-pbnbD~A9H99kDe-{-^
z7{Dt9PDsq?dmz5E*E5NVqpG8-=CS5Hs&)qCu(S({T-F31{QJ|e_s#p;*k;AGee=VK
z;CucA?S1xgz5Xr~tf0d(Nax|phHijv_37q9<UQ#0q2KzAJ%h07rP*o~1jjSFMM!8z
zYbU5h6to~X@+#g%atL@^78FE2v?hnQaQ4Qvr5kT}kVBc!o@N~D@C=<lRO%pag?$@B
zAm}`asA|ytTK$~ZMVwrf{A}#5FHb;EAR&=KnGbC_J1`(;%%D+4rkKG=Q7SWy5v<`D
z6D!aJ4?NIAg+e<YPYkbQUrDiUCQl&B<J-XDuuU@xO1;p4T*ak1VSc~W?Y`b>zlDwY
z&VTa()nnj<ze4gmZ_w-ewcWuxD<A0{AXvY}zM)SK$G=05aYUC`;^kTL;`{rHjEy9x
z^rnZBW^Q-$7&-A{XNuJOcKf4hoR|*E;YH{*%rBiL&Z;P#)$g=c=;>!ZO^B6t!psOl
zk<P)k?7ih48F8uWA`7!3JMhN&mU|pD@g*uo4pyF7j6xZ(L%llt1+Fj<2|#ET{4^$V
z&{6taSLh>esTZ@VSK?hhShsCk&*M_p6vnB}DV^ln`p@eavh@6N3Uep~x^da4oIXXv
zEm9`q)_m7`qmNM#j!=C+c^%1`GskyRmr7kydFyi;@5u}GO^iCIRdB&P-lbbhhx<1k
z#dKj2x@EKEf-=H@sZby-#QqxWL+Cb(sQpfH$MNJWQFskAjfjnvUwi8uXkNYB$;FgQ
z#9Y6jxs0#vx={{JT5*28x`G+F5A@xOlpE>A7?-Z2Rbf}0x)cwRg17cbVFf2ZyC88H
z2i+IhKqONT<_}C<7g=KMtcM6n4AOjEgg^F7hf#YrU3feq!7I@PKa>m1Xf|7|wz5VG
z(4CQk&crxhhkJm2v;3TLTDkkM8}Q}yT$|IAFzTJ6Uf*Fy;<g-Nm+{8|M);haA23yO
zs;6DG3j0CPKzaWI!e#dY;Hfol36<qiME4Lo#Y;_+)*IuYc@pi$udnm<0r|DV?nL?5
z8ct_imnQuzcL!#42)L6JLVs;%gC1`tt9o#1JFq|F=LWNBJoQD`4@B!txI9AyK@_2{
zGg2W@O(x396r&z_3sPF*;8a$sLi6SO2V99($5?tByadg~*45lAfGauy!Pc7=E#!Pv
zzxzCq!=1b_1j39=VJXZTB-#?R(HS9e3Mp2xkDL(033HjvXgEx9ok5e_a`i-=7Bg-9
z_Bq_JZL1C&4GTboq)#3^;Tpd#6->Cl5PgRVYn!OiO?=SFfVsxbcjAt!DmWLXaw7S;
zQAk2g6CYZ`Kz7PxMWL0SXzYoB5g>GH$G=R-%YW)*sxCDAr8fRssSwv@gRahJ*}}$}
z#L|sT7&BX;$;43p(3z6fD*k3Y5$}4u54mhL58#W1tazqdfaIM@rz~}ocD8BJImG*R
zGlN;y;e!;XX0QN7vG#S)#I3Zr7H+ZL-q8=_jlyCjmW0KQQDbdeY1Leow~$FdF1N)U
zy3K3Nb+aY<Tl;<oeg&;RKw)|5@awrw##D?JuU(T$@em)_YLLR&D8&Xje687T-gS<s
zWtuC*xTP1*g?uPfs<sfzaGC=CRv_)*5moZ!aTwXa*MI|7T{4ST+l<{lVoYOvuR5)+
z;WAyJtmX1-J_eiD(@2=Id$J~uoJ<j@_Q5SKg>U5?hYIzRa1}mgPE;xNF`#cVFGAS3
z&~0o@+}S2a9v(%5&~!ocs#8lZ4n>ekT0yBUci6}=d#m@ZNwR2nUIp<3{N~GGi07({
z?F53f_X@O(U3NDD>IWBCy|lrAx9Z8+#O=;Q$_FyDP&*p^ad@gJh^SPw@be#<y`a$T
z@KEZXvesye6I&P5PVvKtHZeRIH^mPdK_Ly_3V8<j2@ROdtAoT_D$)0zJKD%5pW6i@
zWc`Qlx|2=XX{#D5XTk`b1;Z-lxV@--Ot5pJE#0U+_?Sm_&oSX;lFrRxaM#jEq7_p@
zPpz1TG-x$r_eYaOpF6gl>y?6r@bR`c=)W=ISOA!>S_8&d^Y)L(Hrd+PtrO(c5sqiI
zc76@ZRAiFRVv|xoIT+cIdij<LM!@jg`_)^{72L+6!4~XE$KcUmhuK<X42JeSzj3K^
zhp3WU7|i{|;fYl*w2w0NF>P$6DG97i+5cLj0;C9t=t=uhyaJ=P`&===Y#Y2C>%!fg
zaiK61o-JrMeKZK7X!a}+fI8AnH$i<LIfQr{X3eL4bcf!tU)1_3&Y0X>5V7C~v3t<q
zKLVnzM=>f$OeXwTuO+z_(W6hZTNao!A<eu2u!M7E5?2W>Sl6s;#^o(CMYo}N{7xD2
zo#Jg!M>Jc~xD)7HQAeEm2G??qroA6rNF1GKr0dz(g}fp_+Zye`5cllzlcv=jdO4$c
zLjV!~sDuQ3SXe^~KhDh5v11F@@n@siHa-G-^X1$TO17Gb_)<z-GW&Y`2R%UaNuD1{
zMZ6ESiT5Y;I_be^cM5CQBtgSF^|yVU37F&Lh|7I0JgUv`XqBfPUt~qcV>U7s&=LmM
zI8r`_zV)(h?f{)-s;9!f%3%mT@Ouax(=C^)D<5<Q5)~QmsA>BeJA{W5glAykd0kuR
zwBcjq2cpeSP4Aob_%LmOhJ_%(23_t>U^Gy0-h0AdxBk4JF^ongzJpG}zxr2Nq0q%I
zTQA3GkPP%wv*q}vf#<aG=ZEf-Xqd74Fm*wua=Q-;yIIuYn>$od7L#ZKDe1ph3}2Xc
z>0I;n)Xl?q%t&jbJGqJ-IOF+5Ad>4U(jtU`Ig7qu2c;$oQmU+uo(Zx};s=-M6M8*z
z?!!sn%nzX7$oFnj5O<pilbfgX0?s9}#gL^q1<aAiF4zp|+X+PPg$-$_oSLt0ciEuT
zR`t(5X&=}qB?(n#{d~@mUpb<|W5pjsQGL-O+#6p+Sd50?$837p6Nrizi^aU?UfIOC
z!^#RiNgVW9vT%3!<jSa_(1uJFSteevq}mIgy3igXX?uHGRu8{i(ol~;Q;ihU!n4MX
zAZDH^D_svoqSv@E1rd`0)(kDG91`6gG%&p_ZJ))oda*pJY0G(Yqj4WU2)3+g!Zy=^
z&0v$dywYW=;W<VWm!II|Ad<pC<9NuTdxcB8*9s&ogf=4_pWzt3dfFi2pfnG^G-58O
zNvu4JGDmRDJ{?>`j@qMY=WY}XKGBYQoHq4L^60{^<V41<*;@N}8XJ0u>#%{hW;fVt
zzVYbB(>!e$+Nes@m=)8GlUkPo##^SYy55O0=4wB++&~z(FT2azJa7pbm8v{yNyKld
zu{Ad=ZRbWMw%@A~{!DDKaU^%~+P?$n$o}w)VZgnFF&Opk^XFhieFq{&+=$Gkc;pyk
ztHnT8(pwS@El7~eDI0dB^84Z0bmjpYuX!e1AD;omhHM@s&`FI_Q3k)*xHM%*gN$a2
zocO!#i@%f&FNK$r{~PN!ewXY_qTRiA&Jzpw*dKHZRW~w(8cel$Sb9Iz^X4=@FVPZb
z%Y6i?rtWQQF{-ACQC&vG-vqkDVVxMV12D`8+sVuGxw`qtZB)urA0BR;7`a17o)lKI
z*aNF?U`K+Ma_pS(g;mSMYDra(wjlWEpdDJHIA`+Mo3`!F%IK<niB!!e3}Cq9$ApX|
zafXLF1hSR_KDDY()#~ZX#be-MYeQusSk(6sskVw<#kH%XXzVYqCY!{=U%1?ucAg-)
zIXau`bNDOZ!Vd>P6FM{3H`8cQ^SV}{9MM!@UKdpE{rak#fRw~WHV37|rK#aWeU-sH
zOwM?ZGMThH8L_2c*fQYbU%<Z;Pf)f(&3M&vHvG)k*<vEI3d?}Kuyqfsdk)%@0PP>C
zQ`FOYCS86uo9e9%i}-<PK4x${!6zVSjZi73Kp{C3nSrL!1y@`!!Z4U1Wly3$O%gl6
z<h@T%MXu85A3#UE%*H5v%6P3jGEaLJ=n_4*&xCil(b-APkOPXVLW!@(I-uBDa1*I8
zmz7Ye#a#Zni4!lvO~Rx&nyUhZ=)s5g43-j5q%kE@UtnRNi%l3^Ge>4f=~EqjbP-M=
zC_9bMjV37YLdV}0@ziiV5*-ct(1Vid)%KC_vG$$yqrX=iCT`GeRQB`O(LKQ)lR?Us
z7jxaIj+gRLSNk(>M?k)E1aj`aXD#J*#}_w4o6-hXtEd^t2q3e{2d3>7o^(Sg`jXp}
z{bCQ-o(QWpfvQjC4zwi&`eVqz&k<JOp*3zis}LuVfb)4pQ%Jl0FW;I;X+3G@6Zo(v
zh9iOAzrNV>(uTh9r?_3K#ykzdxkBZ+B_{1P#?l<m+O{!UxL={ECCD0^(?OHZg9Idm
zxW%JYHh|^{EJFfe9ihz)6|ZijP##b%AqV4;q32k_?iw_Fj9$7h*Q&f;K)Hu5?eJx~
z>uhGqH;EY=QZL~S!H5t^5or5%;}k>kIqkA_0&didK$4_&|AZaG2b42#O9og=2^m%O
z1uJ>@ZC0E*%$eY!L{@b+ao@C}64BtTBc6KR`D7LKM;DBzDYQ)|%B;#Z7sDC<n<WB*
z(DrZ!2t1$=ejZCj>0sZgT|5sj21|0bU99D+Rj%q-n-1Vdf(Qqdp0Sx~<z0m*7bpV@
z!x?}vfN_ChzU9I~d(53JmGR^m_Sk4^Wk)L$OxZ?@`Zjg^odbP(iLr|rhuqEzxoG#i
zY!IyClSR1iH`Cnos>PPI857NU<sUrhk>gy3_sS+CX4R|hQPh65P8+0#LLutjrL&n0
z(ipRgb7v2h`tI|a)NVgH<VwyzHKw&!yFN2+`(;<(Jd7Optp%g!(_Xpv@{YCIl{pXQ
zo+jFMM4%e#2SKeZ9`vE-FoTH~C5;3O8-8i%Nkj^dSYN4D-#kLYFcn+b@l#YSHm;cA
zQJPSN+6n%iO!iPKrcJ|fq4ll{cm{nlzARq673qY1wZqYd-vr#ke6C}rfaKPp8hW&m
zO{Nu^zvDJ#;8Zv}W6M+xGwZvKTQCryuC>pv7_7BE*@Pi8a0tXp_25~m(0F*fR)eG2
zX^TENdWKkD?>(yrynjH(&e&QL^>M$y?p`S`7d?b4sXrd-N;=Z%RYoD5qIGLjUBESJ
zFX9&*Q=}uQSWx`Ek0aMIn`yGoDx}aX;zP5+t8L)@uvbyG;`8fDQLRx0!)xb@&e&a6
z@NwTZ!a^Z?TU>j4-NzXtyQa;uf>gO9bsxWRD<ajD?!t9-FcOyxD`r6rGFy$spixQq
z5<ok-g_ExtwTDmE5<4&Jx3Fz^NedPWL#Hp^hMniryD8<6a$a4jw@H?+IonV1Ya5zt
zFYc4)on%jmK*n-ixk#9&`!VSuXGvMH%MI*%hrwN12DNB(h^U!QE?dx-xE45hGQIF^
zC<g<`4#v2kkDIX+@TGZi9D-sqc;p{jy5(BqmJZm^SB4#*JsX@9+p}dwU$$pN@ACOY
zh`$Jy7=6td4xG-wa~T83Kw5t${si8ne7*WD$l5XU$m!7Sr*zI^Lu2|4N@Xu~fHT=V
zJ5Q%ZlVAO(uMX^xLoJE5Ptvj7%>J*MzQgP&Bp0*W;BiFtj2_xQ0-tyv?kT@-U!>>z
zZgn1hv>K-?i9jkUQ76=13{yP{>Q^nX+WXSmJeg34Mc9q}7?gZApuey-S%<C#?6I4S
zFV-{Ev)bexKB5@sz_oA6jdJIEM2B`4d~YMTS&iBL`UWvKgJUjyfebsq9isq9O0!Zx
zWp}1ap0=$vdMMdop$=zVBZoQm90&V#H<4*q<&$%`P!(52^^NM7t-~T`QfW<Yil)jp
zCpD2J-z(d%YrZ!88yWv+XVae+D7L=_6N}G|0$o1b{q^&GMeA8m;D;7+@MxS_?XeB0
z-Ee=hw`kYR+}o6eb2Ky&Noz5nks8rb11qvRJL8>ESSyt~HLXnFdB#gB#VHp0l2Sl*
z=_xOWqv{#A_mt;#^QFVvc){@fq|}1@sMAhw$;rP;X`t{dqUX4<u^<(WCqv5x1T3XD
z4g!j;`xicF;2m%gUl059lv7Z;x#nDLdQ7s?avppT5dyC9rM3SEn<xIBhfB2EHMg$Y
z85Nx4Uf%h-in~pA5opm@zUe^^*XIG=fU`JD1qtt7vbm--R#VyVr3Z|2vh%2r0)kA0
znbuEal9eT6^q^yMxgN(!4lS06+L-VpHSd?wl}p{lZEUxOWtOg$PVnvL&L#;}JLmSg
zy-41JDfKqW0UHG=3zts6sRF`@{E&2tomO5mSj)BHOpglQF$xp0p48-aocmB5H3AnS
zxo7#+!aX&z2{4Kh6|-(@w|A^9T{49S6^Li#>3d0_%Gxi-UqtnJks^Y~UPd*<Bku1m
z@2ArcT^-4H6`anWzK7qh;UG1fV^;M$*;dT&#iv!m#SO*=4xw@tt3Tq9l9+xRa@tn&
zsvn)P2kc5pDfRCj4jxgLHZ~%R1Vc((P=5&_O()~#+jqoq+xX^D!q#oYnl;(;W@PJo
zENN1M>uh4^x|ZrL%n!e88cMSXwM$x`jfOZ$0BL!?aPrMqF85VoOy2@o<`<e_z>3;x
zqLN8sk1(pJo`OnW@YHm_xbO4boisoAa&R+dHx+{060yth55JY^twx4J(7hg=<I*hY
zyg55^n+h%XC&LX4rX@vpK3E7NH1^>!i6gjg2!^<79?Ds^eY>qtF_a$8V6Fjrn5*)f
zir-_lne(4`?xDVQFR5>(MNUf=60d6cJlhxq2%^Ov7vGkyS|_6UQ^{PVMywl*nrpex
zijClu(#E*riKP^#-%&$2^-0)ptXz}GMiP`a95K|9G!G)X9Lik#1Xj=&Sd2DPfP1Hj
z-hk{M3awt>sns6*F5H2h0=u<+K?MOES59AuJ3P0kqj;S|1No4)kwn3P?9Ff{u6Edm
zX?P!vB<krh@FCiK6cws+k+&KnL@@{2s;G6$IAQ(#*oy*)oEgW+Zmch6`n@UTIAShx
z@uNOI<PxlM+yOm!&SkTbI6<3Ob-m24+&lBGn{7(XFr?t<8mvPz-0*Sgm7KpmPJZ=0
z<!Dj~JZWk0WVAzM`ECt#N}HJ!@!Vk20`Yedp6(_0&2~cqwYm&2lJjY6-G$Kz&OA=J
zY6~F1v?i}I%<0a-g0z1ytUIP;vdU~b`c7~bRm0M=%VIY9D^oBx2M<b59q_ueZyK6P
zG`e-9O;8B5x122q8bJs=-%adGeek9-eRw^Kw9xrE?-p=R9Qfcbc;A)aa{2rwpY*Pg
z<050|#k1QOvu}6d-IAHjeUKZpdmovnzfj$X<z2G+5X;l*#kixWAo$V$q-v+Qk&svb
zbP1cVW!V#mcw0=Wd=xxL8!?i3q4xH&ILQNgGE09Q(@WtKwQ%_4?3_zqRb?y-Oh3<|
ztF&sv+^)#d$Ti$Ck6#IJQDCA-4Ng_Tq_L$E_f_%}l5W^@tGgTm;}FQ#nOR*h=Nyvi
zV2{uU>9SUQ$k#jnDu+l+X=5kYX;oW;{d9ykmrcje@_rZrlXg$`A$;8j3xylv22>nR
zn8RJhC|7d?gN2$qPve$0E3n3#l<?T(I5H8WSsfzNu3x62OV_6EB1?1Jq1m(^%2XJ4
z1>Z}=d0w4;(((#=ua8|0eAu7Iebsl#em^e(q@+RTwXYRH7esQQlRXg(2TWX1W5n@{
z#{)k*#w!;<u$Ap8qNY(q#SF{nL9I7(-8NIXeCF=sp`(5?_1BSP_<V0`Q>9DO+BnSQ
z(ffnj#%-6M<MsP&;>0E|0O~79JS5rGDl#4*VznHo4{cN-O;tTO%#ze^M;s%IOhQrH
z6lt*szZDnHhQ=I(7ULppna>c(2BcgzN}Gx_y^REHtxK}MJrS2h*9$fl5_i$q;s$S+
z$as^}ynE{;cg0;8+gb75xjBT;E5_(zfa2yS15l3HA#f6j&<}M0KZ~`Af%EG<ym)?{
zMZ-HD@Y$+^$d#YvXHC@X83<zsEg2UN04Bc2T4zqb+;xK<hi@;s-><y?l=VgOHqBG8
z!N7Rr{(ohC#DACd|ElOmMhPSIF`<axbBm9*Wl}U@I_&q^!+pYaD3KOLho<iQ{dMG>
zk?Y+ryx%IqJl6JpMS!n<<n1eo9;6f6HpAQWf#0Z<b0ik2h^Zb(q4%uS`=IC0Iy+CR
zSK)eNu!41c(JT?>yi0zCT=5twwI+k1k_!!)iPe$tz1ExFQ=WZB!yu=&#zKJI9BBQ=
z2_^nrsPNw=-v1u|JD&yV_gx43--MQLW+s1mp&ipHE6R)*c+V%EcvZGr3_!!D0YH*C
zR`Q6Af{SE6jM<_nFFI4^(w8i!zY-D?yINNquu1rJMB#B`y9=(TtJ9XtZsk@sQ-!Cm
z^YRK#p$C6G{MD4k<((u|C!$}rSz*Bfo8jt1NqHWyMSz*{`DZbk!VQr48q^0B+FfJW
z9MgE9SZbo8l((Gxwc*9*yX;~234+EaIVOb#Nf%J4T2?Ltmm~V<JzVH(O}^k!;iNvu
zaw5z8P*9!tK4{0S#a!RJJ(4?x_)iGvNs~55emiLP7o`UrLJ;zQXQlmq>@R8X{d4*U
zM@?Spe=7bbsqDYhz`z=O-F{F1Ulg;y-|#m@>z_=cKYXIUrNI~U+t9xWTmRJh!$SIJ
zujzkk^+Noclk`umKYgfwLitZ0>ThZAz5R{f|EnwYpX&bv(I343Ee*aC<o{Ct3pfAN
n{A2DvWB&(ae@laJ?5F>LoV*k?%%9t^zmN3a5lEo;bM=1!zI|*n

literal 0
HcmV?d00001

diff --git a/packages/apps-engine/tests/test-data/apps/testing-app_0.0.8.zip b/packages/apps-engine/tests/test-data/apps/testing-app_0.0.8.zip
new file mode 100644
index 0000000000000000000000000000000000000000..51d82f85853db5ef960e1db8492f8a501e4133d9
GIT binary patch
literal 37318
zcmYhgV{j%+w1penwryi#8xz~Mt%+?+Y)ow1dSlzRlQ+2EsayA)+f|LKUVrwg_2b#y
z%5vZk7$6`pFdz-;dGemstT!28ARx%lARzD{ARtUm#-_H$mgZ(A-lghO4x20}-KX>r
zuWQkbpOu6d5(_VLL_V}G@OVL3t7xWC6w;GX_(!{46we+G9ol?NO<De0%$mPB(3^wT
z-8s7E+4zDfwMFbj)7V%;R1pq_TQD$T_<%=e)N|o-`)n#~)Q>3UMr?pI`@}A=A|a6*
zzDbET8tg)XR2ANTRwQ!4q7ofS$H4>a-W;TOYKUOWZ)afXHkV%B`gF4c1x4#gCv)M&
zFCBl7RkUd2*7q~3F_=lY3g#8<+QZt(jc2OrYD8p0O9Wq!ueHP2wpuS*n6k&m26fD9
zQy>DdpYx0|DclA)NpU$sw|eId55&7Jq<Dm606EV<Wh<8a)>cRzi6M|&j*auLXP@TQ
zu%#P?KI=(Y9w{Mj>(a>Ht08vU&qpW3-f+@XesJUN+ugn!Q9HxakbfKkUim+v_^Ki2
zy2|5lYV518GJ$i#+K|_^c>zISTkJ{BIPLAui=41*hk<$>mB_A*WK+%84q|I^9`TsV
z?Sgr!$!=mA=xF@(h@)PEaLDEznJ5tT{wckbQ?xXhZC~}|84FbH$Bi<ENh7toK@(Gs
zeEm5RCqwX!4l^r&`-LgXMyuaY0kz0eHw&yVWk-WtqlvpCQt^xKju-upIw97T$R(es
z5nx>g;}WJ+`Qo&+t}GVvbKrT7r_O@mP^&ll0GI#{m0>FSf}*(n3E(j1SvRH<wL2%l
zob-IFO|rFF4LgQL%`za=2)JU;>dOnIR8@OH0f^iFLHD?9#zD220*cs6DR&`M70%Az
zxc}zR6t!poO=q*Q-VKRoGZ5gOnh9ZSu6{JRhg#?|KtAPfXzAB3{d#U{b9_3Wha@{K
z%3aMW`D!sxt^u0zI1OyxVp#0`dC$_U)BFKd{@?r(hK0)a%dr)0{FmDhP!JH<|8^A#
z5pe|xCVR8E!~vTjVFdA8Af~Dx{Rr`#9E?44n6NZ>kL22hR>=-0{krpaZ=+mc&vDTZ
z%cEDtVA3*0ZUbRBiXb0b<lrwM)(imnjufX>xHqylhrAj^LbOP`u|)ii1%ZpJag`xf
zP_dtW#i=b5w!COTbBQ~QdKh8VLMA7_iJ{kl*=&1*pa|LUTvF|Dp;PL52BTu%i29Wp
z@WGx-@w%@N4^vfdq*EveZ?kn-B51ne+-Hm-NZ)~S=LW1hekg<Eh*<0Jdu&&Tt**ph
zqbufdf7Bs3Rp9_EHRs|E@&62n@yn3ci^Sd=g8>2grUd~({LcV2b5}QO2TKtrCnh)7
zWgUCRLoT%M-oD@nA|qV)RJ%okwhQ~)hl5rq0_w<~YtW1kF}Y@dB$;}W3p&L6EjPJr
zy43`;_c}una;pRY!7>jQ$<pecCOwMkwZxNbBz1Nn)P_moRf8SXO+#|ltiRloWdjpF
zPa2iAkQrB^)37CezlzzCJ-t7Hy$mC_;V?Bq#JwM8Mv_UZs6ALWe?Xt<RAsWlY_Kah
zgg?=mjC|q4lk5w>Og~WZSuoDDrF_|-zf8|b%_aXsaGDZ*`Qx6Dd73Z!Fc%WUKCMN$
zhvPun_F{J4heM1mHv#!EDO4RQU3p_jj^Wz4UAKRArc*L}xv>Qr>S<U_P&Bd(ba@Fa
z*n{+&8n!qKS7HiSseWv=T;ameM*C_Rv3GjLWWjft0TN=qpJ)vjx%w@dx-Y_8T7as`
z!;^>-i>e6+lL5BvZzze1`DeqCq^dGS=sWlFUD3sE5K5-Qzmk5Tf~<U>R%gh8-9e~C
z788wSNBe|4ZA5Syg)LUAh3bHaxJ|)%_vlG#Bo5Q<=$r5lz2Y0#Z8Iw(Px<Exxh%C4
z^b2_$GvrozZ+g@a=}XTs-B}`woUB1o?nZ}Jw;CS%kaA*6pq}88YptHG%0p7~!yf^J
zh84K`SZnr(MGtT;8B4{gr!jRo^<@eI2Wy<hAYr@2yi6ey-2BbSXD^nMk#mY8!NLp0
zH;9F%f|NwwYWX1pF_o9gj!oO?Gy4QR;YjC^Z{8#}Gqq2(feKWp5A5SCH4Nd+n0|=M
z{Tpt)va7dRY#v1C%lOWr-;Q@vZwHM)*IOZb7Jvth0qmkR86Jj{7?p*OVgMO5mOK!s
z{fVA=!D(zDwV2QTQ<k(cky6zr|C#-VZYivqqMX7KYQ&NA{SB3DY;Be7r!lXCz@u&R
z@t-PpQ|>(>N`ky~#afesdE2y7Q)x#`10hQ!ltBaMtZ~F^betg5tHbQZgr{f)6ySOH
zHhb{u55^{`VE4{)K#HlyLo=y=RlI?vRdN1m=7x4w%c40KW?f-{uR$}$LnV*pdh%TL
z#sgj@^SIb+`U^}`n_!mgjP0h4VK^EWOv=(6(zGG{JBQqblDv!5Vant8yZL6Gx~o%o
z87c_nn&A<~3(x5nGI8%^VxZeNH}S8dFK)sIMn7UAxABNux-H~q3hU2<1rnMXHw3rL
zB3>^=-_<=f-66%Q@x<O`_2!wm(f^husoJ6_Yv*pC;-?Ocq=Dt&Mk4VJ9j2v8auO%D
zvO1YdS-n4(I(O(&9`V#&qI%e}T+8^;MfN9{pv{2((_j9i-bP|3XlueYg2&oBXm5`<
zDZ$xbP-*4Yp8>8070b_;kD_r)11|t}z^-DixDPgAmUqz^)^^O)j-yoZ&0EIQqZ0Ps
zY^;3PIYJx)6o(0OD!vCx>og)h;LDFvZTl@QY{|ebbyH8Qrq#NOhnJatr#7Jt`*(Ki
zbt>fV=lY9vZ-TJplsEAU^IP?57rmwB4+?rooe^W0<u#dFW~>=44p2pu9M;2TUD?p(
zTK^1^2~R*9KE<YOsKTfR9k9o}|9wzIWxZFaBU;P{+9F>m!m}UmI6KaTtqVW6Xm5uS
zq1rSH5#LwlX*8#Aq<?Z{$L>Jx_T1u2$_DDP&p417zLCE*r&T@CMA}SI0&{cf<L1K?
z>jUitiE%=+-ksx$4mptgkU-2)zMHo=rpx(c*I7IT|F%=`H+OR2T`}Y`hqKO(9TJIm
z&2o|Rgt=vt4xn+VGi0SMVFFU2T|UkK%p8sITjgD*XlZ)Y>nObo^|8R6>_iJpV|FU~
zP|o5t{CTkrP|E-bwxI@4dH^@U#?ZS9LZlBtdI?8_o>S~{QF}+od@**Ta?f4sZqb+J
zc#Yo<aTPWN{@InKMxfuU%Dd<qnx{nBRAYU1B=KoX-_+%eY@tPev7AJQ$~vRaKL<?z
znqd$6itPI#`EVN)O*F{cjF(!*Sg35uVLPVg=elo9ch)1Vg7JRa@*<8)n4JY~7Y}fa
z<4@R4Us|P0bML*IRU`mv?;xsOXPBWqJm#7ZFQAIj_P#InjD895>*235N4>!21qgs%
z#@<em3cR^_Y;D82qo>6^1BZrg4Z%-DqDx=Uow#BRk<N_Ub_H<l0c(hA^ddDlG&tR|
z^2pjS_+RM#T(P$OqqcuWX%ar$JPte!@dqx$w+F;k^D5NcTeTk88*$ucvM~lO3k92H
zVkDvMew+Ti@2)0N&ZJIIGYw^6u7bo6PjHjT7hEC#@m)^ydHE-F5eMuM@!V1qzSgji
zu&(ePmpBYSrfk!=Q}zYbe4~EK3nKGjCQmrCe=(i?<m;kEe=;8=8#GOmr0BN~rLh7l
z*qvM7U4e^nI|GA7^qNjXzCgorxi*LrfpZ6@mI>wyw-Bok3*z>#ktRxFz*^Z6vB(sh
z$BD4X>AOf~&O)f04T$0(i;<wt5r^)DByOmNf6k^_X9xpTBllPo#(!7VsV<Z1p#;sH
ziqN^$4g~``5*piCsu{v+=>~*8;Bz0moq3(F(EDFXNmG@rq#zQ6H8bUT>RmA>f+{ek
z6F_rt+W$n+&dpHj1FXXcQAyxyY01GJXvtOipHGaX`7(2-yFWqMB{6jBReUpYC_v=+
z%jZ0(F?NH6XM-M8FT^k^&{PwLsa;W6&{JuM#i<C=NKujrkF-jRb8P%nL(153H2cRO
ze$P4lF;zWIR&|>f4gVMaZ>Aq|+Y|)lIbuwOg?J$BJ74q$8C!3zBxK`}_DP?2>CDdW
zP{LK*GYL{M9<TR0#7kTma!}NGbc>(MWma^xO?(v!^A}hAhvZ!0AwD|;EYF<gRbqkG
zV0x3tW@>Tt3o0cz+~Z)$UFHG^7`*}p-VQp10{dQ*INhtd#{j$Dq}U_!_+i^1+-pX4
zxl-5W)VX?An%m-2xEfQx4|^p}S0CCGII-G&Whq6wSNwGuGU2HDr7VB9iak+1b=nE&
z=3dhkaC@lh2mJqt=YNn-xk?Sb^gq&3{15rC{*QQ6&E5V7d|V|Q-0lBEAN!dGxDXZ;
zsJ-p-@e>u|!jKJHR1*~r(KhAl78o0fD3a7(Uvho2bH=eRKWL%ariJvq=2-E9hOei}
zd55X~^d9m9Nnu7fkEB(&nUOdG8M{EPOin={r{I+q9s3Mz$#h1I3iwWW&`Hk2WJE4r
zDiV(EB!b7xvMp;Ur}B6hG9uF2I!HPqW>^U%xOU8>`S)x)LaS2j^39v-I|OhP+3gJ7
z|NqCb|ATTh7+$7i{}sjXUqALA(SaEM$8a{Tjt-?sB8o#SC=#y%VQKEy6!tpvvLu)k
z!+0pZW0@4-)^_}dvK1HGQJa#8w%tuX`P4!HXR7cNqcl5-#+ewqmf$cwjnZ@pgN(+|
z1I4WF+D8-pI<6@Rwm$hMA7tkf!pH{4;h7HWr<E|OQNO6t-Vw~i`!gJSVtl@P8vu5_
zj}51ke1znfGDNU!J!TTAozVbeWXOvZcoZH7G;)dL6)3-cQs(5+_S?-qUqOV;>D{4*
zcl+#;WX)JI(w2@8#Mt9k!hZ3pI<(LMBp*@uX`7_&>z<pdL(6o0tMvv+TcO(M&0>t^
zk}P$!jWWdq1${-sn3b$54diL{X&}2Q1)T6ireCK|mLj@<DYyPMOO@BBXz=KZ>3%2w
z^Ldt;N7fhE{}&JtkjVdh{Li}o9sko4m^#|q8#|b}GXJ0Ke{%G{n*R=v|4nOF9*6&x
zz<~UZB#dHH6V@99L@e_E?T+34U$|znak3ol_EghdPiA5|1>qVMN8c1rQ9${-#l@RV
zB0fq*jw(MhcP-2@cf^oI0xAlI4iRaUZH5AdPVq;Y%2Ir0|FqXLpy_71i`{W0`*p=n
zM=CJK-$VU+W4Bhd#XX)$ia8L3$g0ZrA9$@^2iV-_JE&efxEjc6oqm_c*T!>x`}?Xh
z@Wjy2(_y>Q|8j+}k}nW^nUIdohOUzD^>%S?t54|%8|Mcz5VphRa5Rpu?RHM(_xyrT
z`)g2M<~jA>Ox&NT_D_U@9{<v}i<1`m=Af!(&Dwc`jw_IQ@LG^sgPxbgt-uk0F1LeW
zhsW1NZa!cSI*5MtzYFItBmiUOrDoliU9ZdY#xp**wWEL^!*@>n)E%cl+b}$N-EIn;
z13L?wjBFLorZ<pE(;xQ;G_wptV^unH4cN{2@r#4MX#`$PA?@B&Bm0Z??{)cT-_m!;
z&LwxPL6`UO%5{DXvsGa0x0>7Y%=RU>!{>En-_pX47sL159Tj27uxs(Efy|S<Ub0Fb
zwi@D0_nqR-0aq*ir%TLyfR*mC{WB%5u>W;A!iH@#h`F%(;BA*~&=2lhDi&3?kclh%
zsmufWrKoTspqYb!km&MQ;&`MqAexGU(%TzdQtxk`U-6mz+L$ckQaG3&&D-OTIs464
zUjWak+XETHiaP}j@8xVt$|7sC)wo8#(LQBRtDb3+C11nCQvx<t=}(EP7WFeq<C-#T
zi6<H|Qj9FBW!w4OHazAvM?*Z|z4zzvXRA8G&XY#}t>?A;X{fZTJ9+l?71@@d8aYro
zdWorB0Ug+U!efsd=$+vGj_e<-FaE*`^hDsONc5vBK%K?T8&!L>x+#FXxaOTkGvhAy
zp-NWqq`=>r+6@qD?{Mm6@O2GZU6cH6*qaaHI-87#ZbUg1T}Ax)lF<y_C>^IBHnB71
zz6&6_B*wA6N~N1?h#-<^#b}!)g?BEg=~%^&?-E>?H~L*%439L|))R8cp}plie!i={
zo(DV&V{L|u@l!WQ>@Ij!?qouYB*A$b9cMtLPEhsJZk$s{7GwTW)MFtv5Qkdt7wu0w
zYlXEX+%93N&Qpm{IBNa<dn@bFpVIG4r~P}wGDP<{Ewn$XQiIDDC}PF(dL;Xy(5-}1
z$K`~smVA;sd{nsIShIjc5PyJgz)??mrJzb*pE`%MKQ%2#1b}??R`Q+6$!kJ3KTW$0
z_(tA#$RK89Tk}jc6j3n@vIxr6vxJ=2S5k-ol(Sckv+K5*<ZRSPD&fxC#zx(Nt`4Q6
ziqc7vWGLzgsoxIH<m($2E*FAt&VHE-z0J294~`E6i4;jH$Bg_OTVp}Sv%uikN`Gfc
z*lM#r8`C``@i^m$*lWU|&1cz!*KtqlIQRkTbkG~ql7X$(Mq{TNC5dj#PL6I8y+dO)
z<<-=Q{9EYss=$n9d~b<gpWVNNi_ULsV5IGK-Bo(q&TF9^73Vr7{}=)n5k0O9WXd56
z<(e39_ZNmqGAdqZG;pA;Sy}0xl$uy&V`$*YrDrjb`RvO_uZ#~Bcr%01)NgEUKz4L8
zrr=w%raZN54TPW1i%1K<Yo8@XNZ;=)!f`1>ZeMa`3%3)kyHA~dkHH%<%8Qz}jQ^Uq
z$%4g8Lc2Sa46**bn(&6MGU;G`lsVU(_F+cFD@V)xS#+TsF{bx2Amm9y*y1-oaW2)y
zrgryQ$VHQTCtB}_y0%$2-I^*s&3Mag4tpAUvm)fY_EKKcu+|B|gY(ZotGpuR2|4T`
z@zS#1^MiJ8j=@@sA9t2XkdIPRc6t0d>BMIS`zA$z-aymKxt+lymyF#M743I(3T9e5
z&S1J#etN-b9d=c;<PwK(IipVIUh`fP*@>;&7xI(@7YWH9^|Ftl;rvM|4g8$*woSFS
z$8_V2pb2}{3yVrGn=iCn|6@hnL+6>aru5#-{=-=in{Wj<t)a8cX_x`%zs5|wd8I4w
z3?i?n*cMv?hPHAKF)%{gbL|yl9OBgmM*RND4YN&nS%r9@g15O??!6E=ex$i^edj_`
z)HyCsYFdkVn?x>Jh<Zmqy_Y*oedwSD$ooSdHdj*e5brekp}T{ts;WLS_EjrQ*igK%
z86b6Gy>k7NsO3+gX81n=Uax)QH#3Rd5UHOqU&P6ufNr$ECmGo~(QO*=AhKHiKOBp8
zBzPOihX$*T>x!=S%xaSMH;V)R+{J>Gnz}yEi*q0KL4y1#Fo!^Vc<uC#LFl!<HA<K-
zgjQ1`YQp&tS3k_vh<hCf#E?p7&jT0q^w3{PH_E3?OCb*^mrlU8p=5O+$9KCLZ32OO
z9bS3!3S+0$Tf8VVta?ixK5ea%&Xx8>ewi8xe5z8e7G-X<E%t(a;O~#O8M}D*7pUJj
z|C#V<zXO0LKTp|AeKPXZ|6-5}NNQQ%+J8kDxI0C8l$G>HtQA%2(KD5R@JC*JaO*Xw
zP^s`m@5zSRlbtNjNVmoGp~S3kx8O?ttEEs(M07iQ`gD&1Zr_0XK#(WqXe6tbGmN{w
zX?uPPf@={9ftxNRdk6dWkX}$`L%aGVWpZP68O$}5>|h^VdYS^Zeko+{D?SnvG#Fvj
zK-Mu%S;&5}KN=)28ei{UYWwB?hX^}W>xnt3elsw@O5TU{V6PY9IdDsgDBaE>meNH=
zswW<J?BSJsXO<rGa^`h2Q1(hBYn3cSDa~u+?B8j@%NW#}s|QASBF}^-huPJjr5(02
zz;@qe?mVhg7t)5wY0@WM+mC>ZPhLy7et?H|1l4FK$Nxn(J%M~xJecxbU|`0CFA}E0
z`B6uFD3O3O1O&*<<q)U&F@Z`Vg5HN1iFq(jJ$6DKhvuygYorI_LDzynGi#yg>_>Q_
zDi@Q!Q%kIX<L;|Qay)eW$?fKuUy{{!B;aa%1r3Xh*GGdWa;L_UEG~{4#_25S{4^aC
zL-tW0GBCO)DKStnUS9hEp~$Ts?>%8{GzEK>vxha-66eDlYQpgnqTp+jiDQP9Yj>Ev
zO&20y$g{Ugy7)T)*`*}A(uN%kt@#KC2^oQQn?GjEz}z{)7jI{ZMul1C3~d~hPy702
zFQ7{DP0S2>eb8ePF+et!KPR~UC}<Q=fNa($9HFS!i~rfPLDU0P{mhXdH9m`1x5Frj
zH4+|k4jqA|1eu7*iS{d##&R+9PlOtaqMOo0p0#r5ox?!}CJ}{jjuQ$3Zqtzr0%#$u
zkA}TwcK>y4>2sp7gvTbmuKlQC+eetlNUqgG)Nvuu#UjyU>y^E2Wq6kL(JmSq8ykM{
zi^!flSN9ovTYVts9ydgaqi<UI0vVat9G@9<RNk;$iT78=P^mp<08Mv{O>SNujJ_V<
zYD;Of7P2uN4<7vCr~Rqmn6-H5s)OQjuUEx5Wr58$mCcMZ^XEpJB`N;t>Gsbf9EL&(
zBT3^JlWN2R$yBOM&MC3=2>T!1R-DJ~B=&p{36|{)ZCI0JK;)nCeK5)?()fIMry4vB
z90CsA4-LkZ5js|lTrj`@-rWR`&IK=YEf-vhO9`gU5ljFIW*>6gF4k&IxTS$1*x8`v
z<;#VZ!20_8n&hkPsy#GQd|$fz-}l*d&gM}Qot?8&_kvazB)QsfdJ0Iz`Ke=2p}18q
z1GRhi?sxpsx+wpOM6$ep9mP|^Szs}E8>QOPxIZN6glMCm{@oQ+gTVyVI)tA^<~f5o
z&9^}1c8{=)DjqJ6;2?cj<c#JC#fCK$-bLjngEbKH-ZX*lj5L>IlBw*}l8sEenf}R>
zTD}H~Uv-rzqMI+nl>?7N?<ssa&8^w`fwSSm=c`R8Nd>9DC!FxQ;@z<XgOHGFm*Np{
zJ$bKMTkstILZ#1zSpG|fCGXl&ym1QMF;YOqBgj55$FAD3wT~v)v=Y4ajV*-UDw1tO
zXn(+Le2zP*llFE$aTNnW#on9S)kNYn({jK&<f$mc>1krxR-~T#_xbLBJpBtqBljiZ
z-cnn&8bP!;Srx-ZA_ys)`s_rpROg4qFMZ3il3VxhTXA?O%-r%W0-@44%lJ7P5(=|@
zeksU+RK09=<I-`Np&Pa5V?5De8#QME|4S6RB|J1L^;{jG?EHv8D5rZA$y(^k!+0&l
zHYCp+cD?32?7}v8iN<irEdB`1Ffb{_DLP&U_2T|Tz(Xh|G1G^z=xYaeP4cKpCD&^s
zui{;D((fG1+xw@0hzI{wBEKYT!-0u*_qamS`-Gp1A5~83?S57i6Z0nCSbx-iifox^
zGh!nnh@W-+Zl7R~gKAyp7ccXx`C#;LD~ms!Ge?~tLsd)vTQSh;Q!!Kd=qh#buJOW7
zS)YRr2jfT=foC%Prclu)cmrk0L)#;Kc>1?*rcOu|*=-P7Nq}47mz_k<W@GYChyCTc
za{gKG2>A;0GA0)lT?O$%Mo{)k9C%VjP!g<II=Y+*_bE_t0@+ork0n3HBYLhFU0$~u
zYxOPBVV4eOb8vw4`^H|#6}PO7p$4pBhke~fIpI&C-`D-gia}D$Wet*LRt=XS6(RK9
zdoyseaK<<KU%I8IsBb*lh=IMv^)JuRunoaq<<4f^5PB_XFsGw&lf|NAt-SV`on&gG
zOB;fgPsdWX1Y3rOsYuHt?hdDcLM%^P2iwQ_>Q>&XYhU@Y=1Kz5v4~l~JJu+Dr#vIJ
zi=7?Hn>o8-%*4u{w=n=!T=GhyvtoJ43F1VnH-V|p=I*Hx_-_q3<~YXCKk69bQ4M96
zR8(-8Db_dr-MmL8fK;a;kz2gTpnxuC05i}Le&gmec!h`<&)xCm8S$xsdZuQx43MkH
zdM4yhXK8-B1ztF+dyBwLF>p5c8i3<Q9n%mH$1c9q@X=)m7O5nO{*4Ge$gx)0=TG0v
ztf--SYr&bGG-CWy872VTW0_@6VtB!3CqPevj=+d1YfC#U!?iloGIO_1^_wxr<R#Cs
zo==(1olowMs0<>gI*eQJdS0LQY<N-yMN5mi{nnNeb(Vt5!CBlHzHYVcXoyBSxnqhc
zXi)Zt;irkr&W*;ud#j3(gZQ<Ew1z<uk*MS~^2?8gvg}rQqT&0CVjhcPnT&|@ht6JD
zin!cE(dyv@1}3GOw4T(^`w$-hDh+qt&xeoQBr#V5gQu_NVnl>NHA6V_q}^I~;09av
zQuk?fP1{i;g;9)5ApfnW-M%ryiA3Wsc0=jTWm}JSO*D!L?&lo`q~I34tO&Rx!`V$Y
zK)RuLC$2Y*QI-I}@M$>ysPI;8>)m9@sulMRVd$D6Bd0m|{Kr|#MgNBj=OSa*0VPJ2
zewq)FhtWx1e=4#BVoA3hSt)Yier~n)NZvDeSNlkZQ)rEJ)Z@AY1DQ8=I*=n9o|R`S
zm`M<~cXqWR&<OT5r04PZVry$@_RJc{wd9p-THqMu$L^$G$@(|BcF%Y()3u@j&ynNQ
zqKcZz%@KO21N;^DhO)-l96O35i3l=!^uE0-lc0kbJ|a48+@ffA9`Cw<YW0AU;3T0<
zz-~3cH19fMl>!iMNFH8Zo`9d~OLUA*BStVQNUV}69gy#(#p?My7!>V|Y-X6C%?KFv
zfm_Wx=Z3iYosL`&RW6@CP86Q5OuxLnF=P}7XZJ_HosDp-D`6M4X5x%3$1xAjLm$1$
z;GPgSuLk915T@Qno<Lw3Lhm1Ml08n|w_5_@lXSUM3sz*~MD^jUt$2VHU~j#^G_Z%!
zV>KgWm#w2l0BoiKD?o=xw4&aPKy>(mbIcgMjV+sjCiqIxt_Dqg=1b6H6LcNG9Tf<+
z)(*#QIQh-&9Q!YZv1(MFLVMI#i_jukIImmpskmklHdAdD>8$nHB4}!2QuK?&&j6)E
zH;s-{9DIG%khTZq$?gK}(0U_Q7uQJXxTCaa(5dVDzRHuI#a%E%CSfaqY=977_B`Nh
z^agBW(t~t5PjH@O^arg!txM~@>rdKsuAH#ER{t$3`TAEeFyxuqb|@ogd1bhac-Nq=
z^ZTJZj<m5$9TB21cG(V2D5b2?ad+tAfGq&al+`2jdULbPS@Pe!s>??PNG`l<SHsJ$
zf%nJQ%S)N<wp401Ill8bdJh5E^|G8mY@~A=`sVHsu6}&ZLV^uaR_svx^6W*?_0T~L
z6Q~4rZeHM(E5fk<uWv4N=W0EdinrIr>)l}VT)uC^JOnIWBmdbunO8j}*I(rufzm?v
zJ*u8Q`Ud(4Bf~K+KjVEWl!s*t&0~VvWhw|i;!FjXkGs^dJ?S9HgL7F3w#<BiB*->O
zqob0g^%_6wBOls?p>7sVvD#wzfAXt;o+_{&u-&&mo))d0UNO1PX?c0|*DE>ez#Det
z`k&ZQTruL(bU_vitObSz7K~HI-qR5zem=BORy`ikN#w>aeaZ!gD*JAp34#?EBZp0u
z{}v@<QnwkOc@gghh(4PYi9CdLslJhAsIPVLRy}d9X!zpGg3B;*+l@F%GF={|mpV@K
z(c9gLN(N7l)c6hD{M!*Obs78*zEN`jC_3GaBW{P8-&L-KhddUul`bWkPZ)DJLU8~s
zB`n*Gw~@6&-(_79?;bV31$OskWG^n{S3c->Ny)LPiolWEznqftVba<d9tJnfbn!``
z5z8^5(t8akjrBHL5i#4{Zb8ejJmL`q1Pmalb>A1$5EsMIpy=!H4M`GF=#9IBK<t&(
z1x9=~$Hmr^7p>fP1N;5|l_X~3KOB|Ij&!;R^aV5rP32(aTfZYk7Qi72r>jTnOpnwh
zjIpX+qH7>i@A~nOSjYX@QTq~AW1ii5T;0K;r?IR)nj@Q9=0)OlYeK4Er)aTR5+K(M
zN73qhdl5muHGN37Ft1LqyKUoJmV==d@mBvLpb}Q~{3=Nga$)6BIt?b(+`V2~u_m;3
zzveD=K4)@1zl5&0xa}9fOLyj(w6=E%3=J5^jsDGHxv#swDkuLBLqEtDBTD4+Rc(do
z#?G6nZ$nXO>jlYjZIS2Fem@=f#C@Un#a2N<D8YUVQU?>E$xzBu*3EtLda&Vndp@q(
zc)qER%K5z^OUX@2glC+orBY540PCe=*fNpR?L;^|*dF3dH?hmP9-B<uOhBibq}m;Y
zvF1wLSej|h>WD9!YN{;LC`@(s@0`)`s0)gN$|)kS+vp3<f^awg+B^x1lT0nv4m>}N
z6*pazrfa|uQSp($#wdp||CjTpH8gJUWqJz~q2tY+@6gr5yN%cEu^3z4a#jt4lG1gG
z!QtAr+uCvkKq8}3w(F7)>(ub_Uk##mG-)Sz#tqd%pXBJh&jV>y#GU)O#GU0|YtTv=
z>rjZOPwIh|(8A+Ga)XmV>=y?!Ozj!pbP8lR_43E8E?E^e-Egr(8`LI?Mrc=zs+y=K
zs!lOMv?}7;RV{dXh-Upce~Ig{ZooG3J{+x%s!N3pkVhqsEMzwbO4Tv(xk6$?L)h+W
z3}e1C8Z;`_QtJNm3qH6Lz{W2EV5gWBIXGOPcps|>ZeJ-;K=l4C-g6{g3zvO+z;yaW
zlyLHdTra}83MS>jG*9-E-XbHRC)Xz&XX@~Q!E=WgC2(}^SWA#}y)hNr7N@mnQ0<Q|
zkSM=CnJe2wWICP3hef(C6l9I+;@fpcPlnL<U0sBK<NwnBazZQ#Y!m;-fCaj!{JZ_f
z5xvyq+lpD@p(D5iQ>snRzymD-80jE+$Avpjp!Ihw+L+dGdQ&SPj`?fgrdW!x_DJW7
zsy1&Ku9k*7l^o~polj>^PA?sTS#h7#*d?yI^U7P#;Zi#pNwzZEdn$o2l28Od(FjOG
zA<i*5IWc(G2@{v<xl=ZtlJt91k52-X`I+QUxD$>v+!*m+@s#J~GVXe7Q(c1_gi9m_
zae8C)S|=B~TiGCiDHjM-V;;|^B2PSl)gzi|Cq-@kVzI1loxJswdnx3fF3@a6lVLd!
zTYEm)YY>0GA~>8qIAmFW{=+1BiLucj>wM;!asaU$a1BB%HT%|T)L9An6lE6^P;{1y
zUN@8?HJV7>_UWbYvS5G~usx@fDXSqMl+HMNGWTqj7W9LuL+(yA9qvYiQKEHk<7Hdg
zTMf41YlGdHqWku@ZTZNIM3}`OfI&73Sf@~~dn25fr-rO-vsZI&p+ewNJR*Z<PMV8U
zNeM-9me0|GLSKTG=$?2c(pO?8k$5!ORy)m>T>{-RmPW*h#uEc)Z9LC}&x&0Ck0Cu4
zYj+&DA}OF$2n0jALOiV#kLW|*tbSMVMyF|O6iKZWr>B!L3bggGH-)fPVL07EbAXgm
z($?Zs%o!pu8zZ%n&@P=UVho6bIF2WX_^6Xb_82XNI?#M8kS-sGEQ7fiAcHz=yjG`x
z#=$sabs7G!L@xhjILV>E89UdtNuT^`alS3C5?S7mD)fke+fU7wjcT^-ptWrb9x;w=
z618ElJ-QVzANIA!YUuIqsg%D%S%Z!#-a=V))8){Jm>hdSJKI)=m){xbl0zdCH=E&{
ztXNU;lN@MU+<ltV_CfPxV$MF#i}8qyc>-j1>!}30=CY-<j{RVR{1QI%kDc0iydt-T
z36p$bTKXtE&-m%>o^58`RXBA{a`mbINE2qGydbWteMmL0+V}Lq_FE7oePPqK1(WJU
zRKFm%I<t7%d>ZX^TRw6N4Wp;`&~2FYm=-6sVAz(ej94z4JT9<RIBBI%E*fQ2_U8Yc
zwSN^^h}mq|RJl@wzi=aIabtpCHXOjypq>;lRDncZ!TgYd{8P<P%@AE3|4fXFm(<|J
z5pJw}B7J;YfN%px93^pcK^3?BAwg*fMnFzGclE}uQc5trS9w9@wJ4qI!(-g2^*a~0
zd>3C+2P^~<mVx(CE-K5$^PA>bp=$ZL`&N8>nx0nbS^Q_S!hPxwQlLMIk_1NmW8HH)
zEY{JS`ZeCKy(aiKWi)l*KokFW0_<SQvaw|nV?)ayEZz7z+VE?9u3kAcuVZMdYWs_k
zTs<Y|RLRwWwwWl2lIlUW_SqUb3p8$#R93?;nER)Ry>(ywVMv37pigT<wKH&ifupKn
zu%S5o`0sJ=SN<cfqP;9*N<HJrQ|UX)-moi1^iZC^e3tK_iA-B+BM=<FZ?2v|0Y@NO
zBYf5%LG(>Vs=gf?T@Vl8m*zRYG&7<OhxNgRFPK1w;QBjhdcXe4fvA%I%wN93BS~!=
z$AiHkMbtR+Y3$#@gf`0ROcDSCY>bd4WT>4>T<Uz+yM8V8w*0zJI#5YimD!LudG}Wh
zNdOfe;{8rX+zlVnFLb>}-=~f?<Yg}x%4Knpr9mR1hZoU>R*mOo0;R^St2+Cc&#oJJ
z&s)k&gVatHzW?MKxQNJWUBeR5)N2LVtgnOA^@#66WUyTvXNV3+PHvR!PcsBxMOxuG
zyYX5#f~dk~rB;Y0_)Wl4DxRHheWo9o$8MvR?6HujszmtgI~>0lzS=<1p{_pqHafb;
zco?r#=PCE#@2?VdtG42cW9cWtbuh%qPyJ=-DZGp9>pHx%*`F3l%^==;aWK7jHte?7
z?yipe9BQ@LF<K1}XL$dducGWVaCJS<+SxBk*7)?T!*a5sVebfAu`{sW4$is$lmuVk
zi(5X{Y*J^;+l)p-A{)+`*U=dEZg8ErNo#tQ1vts#q&nzTIB(iO)b8o;Qhr)Z**fp2
z><3;BUfOQ8T%BEw{jy^1Bkwo4T|1w_5z3&~Re=lP#l?ZaGy?~k1MujVT8keK!o{@^
z^R(IMZE?|*d)cfVgbDr3(78nHc@M5F<SYjTve}nJjSk|jSRkufCep-j6$91-*Tp)>
zSoh|gYixGUGzUNIfh-{;iOzlaZdM#4NbliROBU7TT+s6&M4CkBm+T`*;h8)yOOEb{
zF5xP8kO;+e3uitEh=9@bh0ncp8^I2EdXnN;$416Pc-GJ_$^r&WTE=uYL-b?(o}D!`
zOCKzo6t=sV!+`hSfcw|mjG*S&$7H&3VUw-I!CTzn$@Mw&j7Wp6kvp1=CSCimL(MHb
zFWm`ES?_^+G!RV78quD6O_<owK%MbDxq;Hn(3jkiqZBm0I>iRZjukOK+YLOS-oLO0
zccW-l4PQr;^EPIs5*Bletj+f2IS)2oB@f!}5M^C(Y+rSF$Qf#CO!D@~M!CnbvL;!4
z-1dwcCLZu`OrWAB<r?L&XT`@@H;xH|B-o!{Nxv;CS`q8qW3oEddxrZE$qnPfT+2Vu
zf^gqxIreuELx%5XL-E#7A9ypPLu$X8D-VBOMJ3jhPTw{t0IF>!WM|(aW#QnckJr~m
zaY7V|FqTl>uU7E@@^QK1zkvtY!+})IN5s${b+upA+xkD}i2>Hokgba}S@GUuKl2AE
zdDU>=o%N#iqp0M*yIR+E!iiG2N$6YYIj(h1_JucYn<r&nBFSR>>HP3T{V^%A$aW7Q
zZ+X1y7igWD;ETmfpxgT8R^d(B_%^xqbtSRjh`w`)v>9TE;T>)U3EjzoLhC}OWohdE
z)6ny1l=~+k(`uZzpj{(+K3d1wdx3`Jbz@KfBDgiSXYbXzz{}tT)D`zGLoGAQFw_t)
zO))AO9Cg*3qJ|C7dhba?A*b+3fj`E&rMkg2MX0gc=>hZqh#9k_PD!{z#Upy1z_qXs
zXg<Iu{GM0|FhAORHEUf~`35@y?UmJOa=7ocLjk)1CmNOc*9V^xs$Nk&&J{KgXBuv=
zHm{ml)K&Ixd9FXMUwttJg$fiDy{9Z>;zuPpb~zm962NgO_3x1V)!Gq<s(VSrLmw4Z
z$rv-<P2UtzzEM`n1*VZtCY1&9MW(Ko3OQjfyfjU4XRwP%(Nf+t3&`iqt#?si>?Hsm
zhgB-j@^Mi<Y!5V5UEO+!<8(+_-Tp##sow7nU%H?dU=LcefrvLj2{9#7`WdtC!Mm;l
z?=p*LFEI5ED-l@o_;=$2jHde<uEpBm4GQsUHJ4`BRp7#1^a7_1i_(f!09W6bj;4mE
zGzqrQKFcgp0Ba~7e((XJLOT0k(;DM7A>l0{Cy?QSE@DhBT)ki_T=1D-p1*PZUf|^0
zJ3#mJ!vkiL!~xdSJMmZq%%ZmTz<Rp!!Zl4lEB{ps_DEXS^J#DK;ZOM+iSwc>xuJ_I
zRbc(Mn~Q<v$rmrQiFK^?Gf(wvPk_~5)E_r+xP)<}iI{@S8bVm#C-&Jw0+)Zk$bit;
z$9~ngjhf=yc3ZmhJP3=v;Mv3Yg}1X3G4Wei_?`clK!Mv4+m_pwXV|&zyWb~XT=T@A
zvmayp``1$YSObc5{1tIF1rTeQ%bkH?2(Qvd64Z`zYUrnP24Wu5OP@a6OC6W$7<yrd
zY!BL(aHpo(%?w#?*Nr>6j~j98_cwtUZ|L*C1A*$(hks=SnsVrVoe#QW@-v$>&p9`B
zPF9|PeoI9H5ic*AQtYU|ibefvK=no0{}l=Ks^#(|IJbpARt>KVAnyt}oFm2_hP6vA
z`D?y!17@At>8?q++Pru@VWUCc*X}-4%TI}hiQ$3Mg?g(;{!71^mod1h|IL?Z#YkJb
z&qHnxMRXmaY&$r{Z!YrxhaHH}u;;kQ&p0LGJ9O4lUR~!WX5>`lk2j3*D?@tPic8(x
zYmGMzaa}MX{CWeOJ^x_2H9I0OS*!)AY=xOy-BLfCdY&+RMg8NcFK6JB{j&(Zs9A_5
zv;17W={jUd*cGG(*LlR|sd1cP3tC!bg;prTF6%cmU)JJ)@`5zYZ7oaJC$7j6BC3<s
zjVd$`Wd%KNaeNmtrAo52A=|$`dK6u}$1CXy8o)%*UKPy4Q%(Cg5($Mj?OFSR<R(m;
z^q8<8lY~!7VfiN0vaeCyVZF9<?f+125E(^Ps0;au>Tfokn~^rvUf6hbJ9s1@HXK2E
z+T^Va+Gj%C%9~D6%U=KsT()Oi+IAZAJ!B!kOJ52454&qd5f&#5@h3f}FR73WkBsg<
zteJl?Hfm^%=2!jMZfVJl?FiHYZtxB!!dzpGMFIts)uTUa*SWHZqmS6~7QVBm;7X#$
z=8i7cax9!dc8Q2$SUgk0Rf2NcF|yla8~|haNcdOep1a}?n9gHZm7ebM;?(k1ty9SN
z2~-wx+@28qxM2i!+*`ZQkFpP`BgoUtnG6#+3$T`-ilrsR23pIb>;wN*UL<t?H3Y$r
z`&hk6j6J%!;SA>d;T|?c@lOdmL_)g_#=M-fvD9=9kiAU7$Dvk7@*rn({oV8=oqk3@
z>tC;2DAXW|Tmlq;RhKKeJv1;d9iERq2}X3FaW+-2?OMP;_&CT`DOr*v+;91sZM;gN
zsh1{gdX2ICnW8!p3LE?mxQ<L^oi72L)%MN#1<m98Pm7nhZ5z4f>X+;KFu;as`xwzn
zC(Q?wl@?w)N?3P2IE`X}I!5Gt1LT6Rx`Q|5fM`xe*N*?r1Ubi?5;m#Nmn;Got4%NF
zZtshNl~CSMhmqeT0vmsC>{U)-P^s6oZ@B0X`Bh^ln~Xar6`tAO-8IkyrS7v5c-m6#
zLpq0ou#a@G<$QI2pyriV(^BI~tR1mfpH6`8kiS&Eu+M!mhBlc`t42E(HCk1Wr1!<K
zTRI1~F&{fJfBz}u`q09Pgtz5wxr@NEfl<D<(B7HL(iS!8VaVz(=tNA33}7E6+!G*1
zDOPl@?8qw_y*@R%-Fx>SsvEy%mZA5n18&%M2;k!{=&#>Js62YhDPA0vo*0QaW|S|U
zt$JpqGcNQpCKWEKA<iN~=g4$+)SIEyo5P3w4EhfX>5_VsxZM<y3cMCk8lx`=aVn-^
z&}f<5k$F>g1$00d#>QMI+5ICB=z)?t?7lQV+CCVCFYB9-^m9n>0wkAT<y>C+juPWb
zuNN`si*xK~w4mmiwN<rA9&*Uf6cX3svhC?`f(K!%px;F!;6`#>EnfXz?TSD5(TzHP
zjWn5F?6VA9j1F+vq<aDiiG>p!!P|zX=H4E@N^W)Fl?jTlm`c2Gd(lSOuxFclbsPRx
z@pdtW?Gd+_4zABlvGZL~@lftvO3dj9S@uI?qGt38s)}yaKn-z1g2Sgmi>p$|$A5sy
z@G0QBIzi_*>}N>E7_ur5fu#+-RWvN~-X>Imj%zU>LJFL4=+l86zWG|3!mQWKU0mhF
zEFE$#(6Y|gux^t+xKvxbjN>p;0uK%vjT_MRh6B&O+Z%y|Y}Qw=afDH;qp*60h?gAj
zr+PNXgRoMxVFml|3!NE?EbEyoZ>~Vr|I2gX^>v;G{+SeYndjQU%Dp!^*AMpf3u%_i
zt2g4utNq(I5zjzpZb<9nTgKFpoC`*U%bun(Q<oq^ApcQH)81~?NJ*#EZAT?No>xmw
zURo-^yl|{hlaRi0(WN-nS)|YtZiAVgI!@0H3^KKp1u`4WyJLz7sz2<3PD3ogl-pHk
za<SE*MAvjoK>d4otcC2da_ZyLjkdJ+hWs9B#bLbzxp!ss2Jo8V@`;szI?m>$0jR%W
z%Wq0RL9e?B>e8<1`kP1}JqSfj)T-=PhUG_9uSEa_fyAVH`SLtOfp~e=P!+&1!S42v
zOY18lq|UF~@<UckN8|GeY%C!x#fYPGU!-SL@c7{WH_@12nd$R`0idLg(ncVfJ1f9%
z-^uWg$n~ioyu>d&)s2xPlwH-2wf$TBuH9Otx}kU*(8-$;h6PmeZ>UF7zpcP{-;QOr
z&Hu3#0XH*V(Lf5^6bn<(QGTj#w9%)qdqm{aE+f#!2MOOgUl@X71`YPw2tcop2vfpi
zltqrRD=JL`x86~*F*g35$qRH`a!-3W>34?4&(|Mw%c9dtf5cn;#g?ITdK1^?$r>ho
zeK<t(wKXyz-)pd4&9Eyev;hP^bWb^(B#Mn)T&bq-tyDp)2~fbgw#E_GAlh-?kk-@<
z56}1X=a0&bGyLITC#BW*&%2bE&_u*-*eBBPS(s}yU_MgZ72PKuXP2zw^au8z4rKEm
z^Wr>jXB^gEmT%|5?{H;REbqdm5aA%R!0@w?T_#+iX7PUx33&fK<FOLr-|UgD{-q`Y
zLxx{H|LO*9evHkDOb73F9sZ9S?PA3$&ENYH1M<o}c5E?NCZGECWvG%u<E!i4mHnW4
z(b)U6>SpE^50eS>+O$3;mz{SWHvB+U&;g9hC{L!)LAfc)wL*61pCHpXvItmAR9Rm`
z<5#1iMmY1jDjMfTeWTx+m>w0ZX@gd3PZG$wGElu@wp;mZbcx&qt&?Q4Z;Msd%iLf{
zRg8^IK6Ev&;8Onw0m9qj8pFino>aGyC&ATaDwR3c$hS==ovDXNh_(h6j?^2q+LSYE
zc@|H?c1%2YC@-;m!O;V15b6sB(Wa*DvkMH7zLT|(i4^wKnJ97N+OM^c<(R;CwRC)N
zbA0R@kgU$nnnJdtNPO~4%aV=vD8E+jF46Ua7x#_6b%C=|klydgSPu)Nig^~!kySaO
zoC_34Pmgb?^x`3%1gWgO6Q@FqGWUWOpc&@C<z`Iq`3GO=jI0tC`}E00M2;C1!`%?P
zs%i>xy3AFhz@@@%M~v0#-^6#c-rnX4WM|*J)XGqTpP2JP9LW>(njlbm7Z(^QlkSlo
zs6{iWB*8Mb&0|z7>Q5&<1Bl(8z>0@p=JO`cdh}Fgb{vjH+R<oGcsFh_Gl*8T<Ie-S
zw<V;nh_GKq(_3(MTw7903l$-qF2biNDXW+%tkBlh4{BUw{NRPacMUgXhC<Y-Ma4WV
zZy)-a4}v%m!Em9doO2caZBiEY4!qhO9?E?bI|2BG9=taMJ#Mq}?zyis8M~(-NHF3u
zZ#he>-ay-y==?WAq$S5ea=Sj^o5xPRHd_{6yzhc{z5Vs+R#?m0pfJaLwp4}fA!-6<
z8S=4*@QiJr1z}x}?wAr_cQ@|Jz1^PbzPlbNY-gP#-(jo^{|aYH-I3IDV@H@Y4;f5A
zv$V)Dj9}xlo*So)_LHEC9u`Q$!?j9`0^r^o`lW+?1MEzQk=}+?KDfDOCnlKv4mDpO
z4apfw4VpY(p0Na21~M7E0odymk2!(${zdVsBobnv;>~Z>qr<KDE+^~Jcf9=HQgLTE
zz&}e1O%MsRJy_u^hs-x^MG;8pAHGmruY*bWpkQ3|yp0n6IZ2R)3JGy&H!s40?Z(1r
z2g{=9zFww#APGA-T~<YZEVy;QjuhMNsFkyfNFD9MHww(F@agR&;JET=2VLi2y?*T0
z#w+@h51)bL4jkI+Ur`H>$LxNjGQWKMZfmRZEfrsUX?I`n(Q&70$X$^SPA){EXN5Gh
zRWt6vET<Bk>mN*9(>2byXvzJ1fYrbXLydT>%Q{uJ%LJMn&+2hmv45az3~iD|bTZ+A
z0p&XbmWBFmKU=c9yeA4|gucZ}$DcC&e3TZ?owNazU=F;7H40ODaV_)vi|=$`*lMAK
zwQlr^Cc69!EsD*2y3?qh<If3;G)9dKwKN@?=CI5gJB!}rByV`IfiXtGmAH++KJ}Ug
z6zh>)s=hWAnnVt~P)Vv~4Fu=q9cWcrN#2trOoFX>6Sm7}H3pA1m=G5$o~vdM2t1?z
zj$|$BhQXu0Y(*-Sy6H*Yzm`^s4RqI7I}cj_n^+t3$;Rr17ctKb2tV{Zs(x_sdr6#)
zT;E}*hKu2}uR>G<efsg0{VHz{ZqiCNKc~yrIurSESCuK+uUI;C;!Rpz9?{99<g&4F
zZ?dymfO<I8h^0f6<L*XBi!Rzx#(ANU+uu+K#kg#IRpKU^Bo4Vl5*(16ZjD&mboO7t
zB8o_?{ALt$+7(k2uXodb_L}c}i%BB-6Q|b9NR2$80qp6{Z<Y0wD((C*9w9@)_*e<2
zNy+%y*gAt)&(8h5ubtkyh{oT7!g4Gztqb?}sWE{Q?I1E<FnN)a`EqMjui^b*k^k+(
z%`!5FS_qn1F(BB?pC&WJ!bdb%Sc2M>;#e04-DVT;!WFMu=MG)ux!P@i^m&Qq-!o9=
zypX(IYzUEOM*CeoTejD`EU?8%n!?D(bMuQt$Fb#Hq?bahNFNOQpI~!V_50Tz@;?*_
z4QC1Y>w>hS&Mj`DHpY=&Ky~y)!1BG>U)BWkB&U$BfPa;!@ttr=5~+-L8fXRZ|2@-V
zNng*oYnpNW3c^Oi8U|u=vs~l0t~e~%!k)NbdQU{lN>V<E6?PR=C`!fhe~Mp$tHDCt
z&X5)%X!u%3y+%VV`z7YDO;xk*{?QH209o{37J%MGr<;{lys1IR;z_=K>)*;{b6%zo
zq)ST!@~>YaJtct(t+Lys5bD)zb?4!aP6uSKWfh^n4K@!R+?~W|{1Nfpq{W*Z2uF_-
zX>@o<g{k@3L36IRken$qt(xb#Hx)EFLUUqn1MbT&Qj$paaW1a0GOYspr0Q+|85NKc
zK>$Wgd@2#*OzR*R>#TQduLgNvDm!20p5cP7p8{>n?-w#|B`!}_pQa`#>pen$1v*ag
zF=cZhV);JX1X>_iq1S3wd-Q8nw^?Jz^7LRe&IT&M`0WN4mU`ZKkJ7ylh|(eQDP!|5
zt+Kjvpf(i*Ke{X4)p7RsCqYQ_@(dd?7-S)K^7eX{au}(vge8+&DUSU>Qb1_TNDTU=
z9mr+bujgWnSl^-JEj5upjsTs(W8SAYHvXAqlG<dZ7z89AlacYZK5IXVA_*iP<u<E9
zR@S>_#|>%_V(=EG*=24;;f<q!*_zpR+g_h#%XnO8gp&jc&8^x{)&M9{>vV&gRlV6T
zq98MpcYde1T$1A43$smm)|}paXhtufJ7)FCnpT{oHS1Kb=_U#w5r1BdY;??~%D@J8
zLG}ppxk9KT{GQ49c<Wt{!{J58^ZI`PEkM%0H^wT<yIS|)2&-n$u=30;;vG%u5h!e*
zc%T}twXN6>a4A84vD~P|dg?ez*XPY}GpR)s7JIMA+*+mVPh}iMKN>IEi=25=SU-pZ
zn@heb`5>9B5rJRAp!zm$%SxCgk?Ws8^`BtJE5N<T-n;tkC0S#|p;pZ{WmDyiRL!7l
zlB<^m3e%J9ZboMIvHLF;$NwQoR%KdcS$RCn=Ix3y4=S`{bJFOy*Y*4K^S7-s-(4{q
zH=905L(UE4(dF<MeLYz7lUJyDQE6PV?vs$v_HLVoeNSXbHPqtAJP}e4m*5h!g=Y&j
z)~yt|30V;a((8<iE<(7~l@GED?oS$RZCx{xiif&KF<8&#;ooMYT9m?rSL>5<@?p^L
z$Wm`IO46zZJlde%iuDEcxQ@G!!#B0LAFha2*A)>_;&cnippkWAy)65=PGIPQu+*87
z5Id@khS0aIe20=f#jimpsoc4ezi{qI*TKTy@rfMfPh9U^0EPKcNrpyG-(jC_`ua0>
z=-l>iw%SQl#ll2>_*XQ98!p)%m9s5PZ@~7UoyM`AFOI+dK5P5FHXyv?Dc+dc^#+d~
zDAu(G>J%LC@pQ5QP4ZF*R7$iA*UxwxC|*YDnBsQxTFIY<EuRMq>xvY!tbq(r4Oxka
zNj7?Ep8BC-clh5=MLm9A_PtAUV>ZA_=&NuxG&J9wj@5g5nB(H;0G%Dt8$^%j^(!@n
zE0xG{RE|zmPs1F=oC3y&C<=}tis*}kamu;}2TN_;@T+>uluN+Fo9g>3;Z_SfO_J#L
z#4627pV{nlgI>vLezfwLqh9H6ocXXap(5yBcNk&Q#oRz^A%O=RZ1vD<PowrZuaul#
zI}j)~Qc_sHo&};a4^gq&Q`N`lek{|f-MAN=OXy5+_xNLs+WO<>v)D=ts~?3i5xj+J
zqxk}pq9R)}u^O0mD6noo;TSx4d#r`}zehj-;JPQrcM%V|hOQC(7KT5u`{B|73lKP!
zTs31JYJ;em#?Ahz?Ho8cU}XBly;~z?40g8q^xSgv<Hg&Ox|)NuW!ma);2F#Jd;BX=
zH<k~^#$*~>g2yb%Rh-}PgY?V3_wQpVK6O_Rhfyn02K5#>wT%7k?R5w&mpb1|@px-@
z)!=!I@pg|izhOE5;EAQ@(+tFhLuR|o`q1!U$U<^^p#I?Nl98fBivT`jqVlBe5x)@|
zu?Q4eGw|btME&DP3PeuYYmwf=$*Eg#AAY3yAUY&xv1VnYySeJ`%oaE2BQemc`=vv2
zcEM7=*FE4JnceE3dM>6uLhFn}@ZO_W!LmkX8^UQDR^%G&P+^2)Z`rc+{46=AYqBzm
z$6DsCl?*k7xzKsM`64vA3xkFLOXH!&d>Cmiej|om(O51n>4cB>pL~^WIv0iO1j(iI
z&+nr)#|S$)BbvhybYzh4CdkW%CdyI|-8(omm3f||OB*9D9aE);sJjHXq_0GA3K3I+
zRrmGcM1&I-*ScX)mP-IOETLi7J;TE@XVnL?M;pdAzC5t7zBxTi^PTNc{HK1gsxLw9
z`|A~jIpLO^tVi8KOi+$oL#<fV_cV%O?urce^c+=&<bpNxrFKN;9b8chyT5Q|97XPm
ztUa*ye0T~cRzTqT@6%S%2Hf7iX5Dd$DP^?WSF<RQPRKK4TIg*oTUO(9Dc`F%+&*i1
z9eXl-Ec#-w`?vot)2_5<c4PX2q2kNvkYJ1X9s`b!4Lq8Jvr2DjalCd3*q%473N~x9
zXf-X<NY2Y~JK@VvaO!5FykC1x)=0T-ABddFh1V_icVN|El|ZnxX0D`t%iSQeDSx1(
zxK?KTB9nT03s{Q23Z9|y2~FMykte-FA<M5q>L6+??l7wp*;YxM`p}?`e^L0sHMI+P
zpGu4e3|CtTGL*u2Xtg+|t65|<lsJBaElx#eHI;kK@lB1RYZ+IWpSTDV78SwmGz@g8
z43nzLzM%D@Z&(*AKB!(0uGhIM!LqcAbOGnE;bwp#q{=L9wDbLqFhM{6P@1oabhL5G
za={`ii9~u(*bToMI%Vaq^Tnmke$;5wrs1}4hU6M^a*)!8D4+xhqZJ1p-Oa26c#nW(
zS$-blEF<Ld*<ZDXK9kw8R*ngEXWcKyhxw)B{S9P{n{S@z=!xCOV5d`MImBo56~v{!
z>{U)LClVuW;G#dNGjuR}9R+VdBaz<^xLLK)J=}y%YZe4iwwXaXW001%R>?Dkx6&0;
z5|o}fJIU@U|7%11QOPY3&im_-tURw(>_KtRX?&>O6pR`_N$4it%Nmr1ZP_SQHwLag
zf;1U+SNheADAI24^{{5}B#TDzXK;_kkCF$?rh;D7?W?;Y)82F(dGzF@@8*JlIQ&^&
z`M9jqbjoQiDbi^oGlX^kRlB@zn9p;dKt2g;?JCGNEpJmd{ZP>EUYdl}^NtX0QONc&
zUnX0+3SbmBh2mEgoWhFWL17oEeW@k?T`~dyH_Q>Nj>1okY|_;=_`(vUAf*XOGF28i
zB(Qhd2|0oe{(}Ww->oS3H9ffyiCJUQDre%n1i*zRuan&eeU`PeyH$i%%TkOV4#``m
zC6E_8hpz@;JpvwvC)Z{kU@w4k+kLtQ-wy&#Ee)f5yNw@8uudvF0HysMSUJxT9=4Cu
z^_Y-}h&f}nYW0gz^Mg<w`zH0oKhX((bBsZnFlkZ!7x%WwE#OQ)vz_CbCgE38Th_vL
zam5PpU9l|Rj(E@-j<eP)^G{m^r~BiFq)wU}_(T1(2deI(z9Vkt^)Anp77x6aln3{1
z*fBIX2^@%31zMsj&ErC525-K5W98AWhRRc5(n}8SeLVlB*@lQadX0kRWu7Ll@!fA{
zbW5Lfi-f5jg<^_NHt||!wWHg|pWuXTYyFZnF-i8R#CLL@;ATSoU6v=NklxIdLOn{-
zw~;*<u||>Eme-Y)><?zn(J?h`2lBQii8hy;%Cbv1>XtS!FqC7KTOQGgFE55}YR79l
zf(IGr&ku`mEpNDEBxg}TZui`{<DgP58@*5E8DTQuJ?Ok59<d%Kc*5+`keHaykS;TQ
zda-b&yfcl|xcRM7GohT|<}$Bm>M(UXS57mdM<#C}thiGbxDHMMen1)7RGRE*<#WSY
zEYFy8CW8(ir?Z7Mxj`|8@93w8mk;aMQTEJ4@zO4FT9loKI-=vn%I<OAF>d)keXsn=
zp*!f>tbkoQpAOxSW-&xgmKDQBa#vGZHtw!r_0Aakuk3$bzs9;^H27*k;K{y+jLB#f
z*Fk2+37BvH_=y@G8S9<kT|4*&x45KGeth~z6XTVRqb_VlGYBM1pEyphgHK!EvU6I_
zA~nbBGWIBzqa@d=T+3&-x|J!FAxyDPYcqrAYon)oc<_71fx64Ksgu1L__!+fj8J8B
zYjwprlwYLu+t!M=)hxYQjDpeZXx8C%n^c=8(7zr`=5_3}O3NP4)js?h*cf>U(82ez
z9Hs0a6%Ni8eKBD-y4bb@4;nlkw^I=HVf@7xtt0UjJ{*bmX^EcR2Nn7T4-2qY`08A#
zn7(sK%g2?(%V@le5rYR!rRdd;<iGF`<%Z>VwzUWp4TA=;yw(+u8m;LjSx)@o=?W56
zON<kK=7ZFzV7Gcff1K`yZ3;L0g|Y27=a$xI3t{GA@_POi2Lz*58F6LWokx_Ah2G%m
zZh~udf$@%|3Uf1~IcO>pLtUgYEh0UavRpYEKj91iD7Xt1G*|7Mxh7$Y+HjO1X=xr5
z%+F#sR>mh{Kp+AE*Gn+bG8T&xN?Ti*@Qm&71(SDOr<?;4kjU)xZ0+nUOX>#*@7|5*
z=nzTTew(56mL}kmMA3GgB<$4ak1x5>y#dbDI#mt<UCNvKH`I%iJtsB-o$tj117HF9
z?PIqUL6z08+_;D*!Sf^f$6)WkZ)?<P31#WmJNv(ow42nq{tOdB_ylQpbL~`d1<3VG
zYY^WzKT<H+aCx~+O;=uQ$zDG`czy!zples49k?E!eJ2M^-)HTFE$?KY(#)Hv?daH0
zwEj2G68wAIXRsh*|Jp{6t?*t~Rh>eXB$}iHyEB9h-sp;dNZNTWj}a8KA6?m*PCoop
z!Y~VV8j$6$(NHV;PP!55;n9|{*&tji@p25kXC%wc%P#d&5x)ttw*!LY>KN(c3m>aw
zpEu!~7B(dy|6Ag7Ku%6r?rI4MK_2Po+;!&J5!Ey34F2fu5<O);l-|5y<BjmTpX_y?
zA8pC;pd|YlVzCw8JT~viFz~~i)Lhw9T4zwC@w{YabW7tSUi=ck*$jWitx9Z?=(hG9
z!CKShj#z(sK}n9AY+4X#yPq!9AJofOA3H8KSR!~KQI+Pyi!^IGkB!{-2xGAH7n6IG
z(infnHr-ZCN@25+PR-*(9*K=tUII*bPuky9lNyt&vP6%Z^k>xr^=vWE=*PtI{H_7P
z)*#7YjO~Sj6agrOp&c>SUgnSSNiY@FR}+sJFY;Tl>~<P#)+V-F7{jwrB`t-<c&t!n
zUfHx_%j!PjYdd4Latv-QkfD6<({2LAU~=lyO!lK0x9^%`g%LhN3~Yp*0y+KwWeDEc
zbwRY9_zM6)%MfsdwS#%8-C09It4R<oWB9dnDZ({Crq`vX6s@?%&QFEUFLt*%Ha^N=
zob;^W8fi<0$NRjE`I*gNwldJ#%~-^_wSQdH+_1*r+SC^=K_nL!5;;#q5J0Oyz6$Cq
zzcWsk`C@B!7Iar!GkzF`EQMnB7=zuFomULNyqyh|@s|J^&YTt4C18xJGf)X1^8|Z$
zdEY5snYY5Zv7<$&vqi*6-AX)g5jnI<c{@%j@h*T@cAiLK;k@>Yt(`B=Mq@S&R($ns
zeNy1aU*l}A?=H7sp01TQdpAdfp3eB0dEG!9d%FA874UuV*PI-PpQ4Wc0sq@u;yz<r
zwhT?u4t?Zb|07mio7Liq<;Mw)(;EV<g)6MGiHLpBkEldD8N;KdN0Zxm_@_i>`$-k9
z1%)2`!k|pc+SChJ{&UL=sRbB5SWb~IA=~0;qBUUQ6xB@k`$mJ^@AgpwYbC1d<ORKo
zW05VhT)KYU_DJz=j3J6Ru87^KEPVJb_&@lEgnvNHoX9WcPe-(SCda@`GSAS1mGa$O
zhw<CllFn$w6|&xq-Ms~yeOoohF0wk>F|6OQpt@=j?rjo7S9qJ$6o50LH##l}TE@1z
zu{>EP<y`_=+X@%j8=Ua33f6TT<x~lWt{Hj4<wJ*Fr&QE|vq`nG=jw=KbPGH~S_%N@
zo)WHGYoRL>Dp;_$M)@yQP0=yE&EBz(>l#Wzj7;BXGJ!$t>0b%8WZ6o&TZ~8CMexg(
zopb+x&AoS6Q`y!(o*73SMP(ELrH)kTB25UzLXj>tbOw-?5PA)5!~vvBmlmW2Qs@K-
zEg}K}0#XtnH0hntAqnN@%$>P&@7#Oe_qosW{XNgS{y673=h=Ioeb(A*eb(OVtbGjp
z5<Eaz+TcK&(PjTy`Qzf{>Bc>k@7L5C#sV6~c}Cu1l2ZM#F}>ETegZjSQp*Fm+6lr?
z|0t~zNo-Kmbs>SDFgjvdGob~Ndp97ZbwzsVt;Yt7pGLMFW(H5N26bkuxA1q?Jz+lD
z17-2^LjJ%|m6_2EG1IEWaa3xMNAXnP&g!9f!o?~o;n;-Kd{3tYsSdW2W0#C3KheWG
zm-$S7PEKeYJrz2>!`Ntt(e(sZnGwR6-NJHY`6!;G7Eh^t=Bgpx_j^aUcE4OVN%z5u
zK&Wq4>L5~}L|{@+EI8eBc*U!Z>$ZNfGl@lFRUo1n-S@eED*}*TEd*Xo#iolM=)R1h
z)>tXst!YI>d%?@pUU@(qsZvzQW5;PKpK{TIi)nMvxAg;>D%LvPDAOT<J0WBiZ$WoM
zajfk?O?79|Fr47%tS>Xc9aX{JKJp0&TosAhTt=2*9A7-^JISG^U0$25y}bb{C}>5u
zW6EQCx~HdAQp3DoI(_&ImJl@0V$D7{6a_bnMg<;FpQT6YF&`rLGwHs-sfVXXk2~M}
zCqs{lj)uVkz=FIkKRhG^4Jmj+%(4iEJB|)Um`@w*h7LUK%%6h&TshkYaA}1W3$R^%
zRctWPhis>_-xOr;s#V+jTgGFsl%)6X8IQ)b^sTi`60YlD!v(N?7X*@>O|i(eGYDhw
zu!(-04no%kx+y69kjR?&zbV7HMRo3YnctKYQIn+LV>YZKh_2sWS6z){TJeQNCz!d%
zx*?IN0h0CDhCa_dgX)BS{R@^>$0f~!TP3eH78ls3%a=D>8-7&PNY~Qe{8XA4plePb
zZK!$oot{jZC%CUD$k?H0r&}Xa{7z%+uU{`A=1Y}oWe$(Nifa7<UhvzZuF~uadc4zY
ztC!beINBBEOGvx9D0p0Q7*NGEKS-QvZ%L0`Z0`<94aTGJ4Ng4_gMtm;k9kDN$emxJ
zn5?IS2lLL6T3S2y4%hY^$Eo>PNvYv70<tJGr|Z3{EZ&&|B2IADs=;T8i^<OYbWsG7
zJr6M}_uPaSNbUaU-#6}Vb+_LBqq)5u^NhoW)@~!WkGs{>FTxX=x(THPn~T||HR|UW
zt1Q=KT{F!>AVF24)Aw&|FE`us6~Dg(Hz{y)IgPm%HvQz0R?4v9I^sq19D|q=<4!Wf
zr2OtP``)0m4J*I&!mbhk;Np1|QcR_upP(2(P#BsYkRdl!0rw`nZcO!Qks7vqK3=NR
z#5_-Vb-M=NuCkdB?YZu-#C`@qkGznqyy_i?wPn;0$^s?Fm#%bm3Jp16UbQUo=V?`d
z>lR!wQWIj;d)vF^euqS+L@AAbEA4LvOwH9*)TJz+_acglU7LoQJt2DZe73SZg8ERP
znrtd_5Z-z(2Bs;MDPu5}=i5l2v7&OX>ZPw&lZC_r9e%aT77xUik>hya86c=&-~0%4
z*=%c}^6s*ER!%Ysm9v?wR5WRM>0NHjO?~O`YiJ{vgAMaDK<o_muNg%DLigTeF`3@m
z;CyaTOz;}ofvG|>jVL0^YnBn149L^PWW?aK<c9T_PA@2KFV&*LK!QlSDYitOzkOoY
z!lYC9qg&AKy0ywZCrHySevbBd^!)>l&IsgAK|(49X0PXw2!u2wzjM=PsQjr^VO86>
zma>$qGoLaM@ds~y?x4B1`vwMnMOB6GspaU@+>11$kTXD+4n|z`Kq@F4*x)g`6=WXt
z&e0tvRi8PQ#N|7U(<X&t!b2HpQYSsBMxX%iFF*gSxgRV73N&4L>{j0z4_FS!Vr9K}
zd%PT!Pd1iS`w=m_dzcz|)lpepxe%*)Zn~8VlyITupW0t{*9>^s<xH&DxSdxyGHJf6
z+72IGs`iO5ex$7u<iLT?T@flvLuI1if|<@4db$!md6`l~NHS9MR?fseS}LbFr7^+e
z=YQoby-3HxBiFpl+6Lbt{h>NDQ_BN>jq>lrvH6uv)t&Jpbq-C7hV~r`ulCYIH0T1^
zRqTp<tJV&M-8y>HeYg%wg`g0}+JS*VyUv6s30POZT(Z-FsEbU*hJVOtH(gMGxO6YD
zc@T8uW=%=7Nnq2Lj#MfcHkWENJ_F2&x;XuBqQBh9y5bozu{4e`t7A=r#Upist^<A5
z(;JkK(mzy#XJtXzW!@HoBUDpa(Dun2dGY-5=GE$vCOgUIMmUKdSl2bsE!J8$kC?t*
z&XEb-D@#Pqdbe|kUF;m7m1&rnfz6y&kT&)T@&f3a;s~@^&eQN;R3~pT)sXz)o|}Ju
z)bQ=qcyap|wNx6&ehtKjlH<b~UDx}FiryHTe>}Wc?f_Y_c8|MeecPfj_`J<p9DhWM
zZRH5Oe$ZcY@f>#~nMeW>7!Ao@HeuS%j4UXe{b!dpr_y|T2FvI%cT(!wJsf6a+;TP*
z4BhpttRy9<XoI9CFGpM0buq`yykGUk-7~NDCz&$*5yUumDXOA0_lM8EA|1j6eAlXJ
zl}XNEXD||{Z7QxZm#La%6eK-`KQTz`iIsHpembwyUulSUI91iDJvPL-&pxF3^N%j`
z-CJ9m^glY?!fkExR!=YAs2W$g+dK5QkvD3JZoI7%r+MYqj8)kURrnEftoq+c>tY1i
zua*Se1x@g4z)TFX_ovXUr8=Tk-`fPX+XX<|qsK(X%4PL-b)zJ+Lg#H%-d5@XrTQUU
zZoiPPIr7ba0cnjZG{?ttGri>4?b|&%?Wt<F!H$Vkns0pGd8UT#ZnQe|2pow?sVw5E
ztdX6dY@|)1eV)huXV>y~js4POwP6fnCQhKtHFc&alSApPc78b6>-UGz9XsQZS9iv%
zO{NU7)3<HceJp5-?1-eaiAKII9}CPDidQ?<txH$kI%uQ^2r78nUf5Px?j}rjBNqy@
zF%$qr*&u?Pslg*6*aRJy;AeHs+hkswAr*zyX2%;Xu9iZRRK$GhpDBXhS)^Q6Vx3_j
z(S0BYaPuPSyD2|eP*&h0+{x(sxdt)SP}*eYC1Qt5aIQ8NmtL;9V2f^cJXXO4Nl|pC
zgCdoUdK=~5HAn_WI8>W01ntzSmtF2Mx(!F0#4RGGfWB!Y3(HrB^>FdhSc>$k1<M&x
zUco<}Ex%tQ=`)-(X#B7{(|Jh12IfG}rF`fhM8y?-^#pU~Qjqd$FDkFm)r*_~==ynT
zgvTX=hZALD?A_k0jI<4cp0~LekjmAb6cgtNp!S7bypo?c=E~JVh%s;Y9bZE~2Y%N)
zqtWBWBT$P@>9R&^Neqnuo8k;&z?=D<BJ+5y0D$v0(cT5ZM*4bVEbULzjWs9?ri@+q
zWY_hE;qqS064p{W@`dsUHfw14L{Hbn!j95OD>(ynt5S@0_KOquTFU46Yx%^F=T0U<
z7dQpGrUE!MS5NN;+S+mUDNS~s>g`~1mj0V!q947JW4U3nklXk9j^?8>#0bg;qlD*n
zu5^gpnQ^k|DDd{+^p`-!oH+Lv67Vc}Qt8%cGpCKsOZn%AxH9fGC<0E^Ek5PF%Oms~
zi!Vsif@@7hswPAwJfEpmGT;O2#iQE0e;fX;tzl!(v2r8cD-Y7uM^26HeXd4Fjk%CM
znt!Ql%jjzMXB=SaceBgSXn)&T<JEMkRJC0_wn2>XmSj4*aoNNmb9f5f-e)ChC1^63
zXhLFJw5aWJCE$7{9ESfFtNFdC^k8uAHSFGJ@Pz1ufLU`H?@C5j<04{E6slz~E+oQy
zwZ+w|8$YdlttZUGN~R3Dbc3L-?Pgg~Cjx4QU%9>+mn-16pNNd0IAUF6<Vl~*%nrm=
z4^F9vWii_D5$Ak+#)gcVnonfbX3%?2vgbb1MnlEU$&2DS&f935v#=@gk82CxUrPpN
zImTOWrBcaH5L<pnr(_CfA+Q)QGueIgf{r+T27nfv<||D;KIF`z&ju@2O;L`g3Z!5E
zy#>Koulx{Wqb8e#F461dg47G51s3z;rQaSVtWFfNQLVM*$|Wrf-15?M0?z=TTg;kl
z7^LHeGe8okqbbFQtgY;o>`=Ht<{YX2i2xHDCT=yiz(svFPncR|RlmYJVQ0X`JbPOd
z)0E5C>FpUE+dt?$Y!224z0!VLiZN;hKmXQQ04#`dUJ<Z0MS-8YNPezs2uiRt#>#_>
zgj!rml}e_lG%jsvzA)CF0^&MPxTV&}!h~=Gsb?VbN9S$SWqHn5xiQI?iug}_Ai#^2
zjJ`Y{aiXqUda`4C(5sD9(1KsdER8X7XwcRKTz<u&?xzM0ot#bOO;*t=oZNMzbD+3q
zN1*f5+Z=+$ZH7O9Ef!O^yT^Q`In*XC`5&vLP2Y3L81tJ=&}Tmwk6bLrT4(u{7e(2p
zO)SfD=&@wrDsXI@evg6vkl0eUtDjOMwiWU>blt<73f>wKW8@RpJ)bY4_A}=2wtlLF
zl>$ZCLaG7YRp1ODA+g_c#Gq)ou6G6)Ph2~_Sa<UbkdZ-MIKJ4^9C?D{z<&w!(4}PL
zmRY|GY8(yy4`ryXZwiUp5D6duh5Jhf^yz_@wmcO=TY+u$X=A~K-g~ab4GPIaN|U$H
zLxVA`>Tjyr=aLdk^Sg>`iL~P8KJE``=<}8PhnJ*GvhIYptOy;6N1XxgD|96Zu=W_|
z>belu30mVD^$F^J3+45)!@hEAU_`ll$FZU8p}ttqYzy|+Sr7XKtv7oQXi`f7r-!+=
zyS3v^(3*RnKffb^&AbWGd?)BZbi1Y?QHb?PR#(zU9e85Vs(|k=dKDtmSz%)eZBA5P
ztrsF12ELhxjCFxsRYq}ZiMx*5f&9xg5+&2lB%AT)gNoN0(Wd9yYjzubq(IIg!QZ2M
zt-0VsdYUkk#TiQFe%#zxuh2~H`3c0{kN*s+D)#og?82!=UR9ZyH;HKh%tj?}iLN*C
zm|w%rYzx}9mi$xXeR$PRM|{dznb<h3;=~85#|Db}8{3Q&DT#pffzQrI(0iS+{abq>
zE7vX!u(u2^f~K&dAjOr6!)MAHl#N3*pRzVrb{<d;u3NM^dYpftvl}0K8YBGXAHp>k
zZ@*<9Ffi=de5Nk;3Ea5;<aU#qsiT?MB$s_e2Z6cq8XJ7Mn;AQx&U$^QV=ti=2y&fO
zwA8j$jQ!Bv_NZ-1)TDHFz(_2plR5DH!&JS8eVxSN`2mB59{F9PWucv=>>Nw0n8+b*
zykki4x=dLr2c5RS(yyn7B7J!VI435DbDhkPA`+{m@-u0;oFlmTRmtgaRQioh?GkKp
z)q;QBmChKpg}B3vW1_l3-=7`-_IA9t7x=?xOjj!VSX7G9$1Khr2OWysVIHeAT#Rhu
zR3E;jGYOfb3QYjx#hK{pd0*aq^cDZcuH=l*I$l&J|B`@?d>fM>RjKPR$<z?Xq+k@}
zAO@tZO$yaU*Ty#_2{y=%8EDHvRDjIVC?=_26N^3fGW&+Q^(MJ#z4iXHr`*~sUndIb
z7ydR;(6(v(lxCsg+|<dUwPs{tq<(pQWIiXet~>lmeHzsOmhY`1k|-MgLHyAtVlZyQ
z&%U6l-yl)h$Y`e8(L{CIb66u-P>mxixPmEaGMe@h5zN%5Ct%g5)?Svlu^n;RFOubB
zxf(sdD-}2Lbo)Ca2(py1fya}8qxi8U<qLr#T)X7j)MC;Kmq#=V4@AT?V_m)1M$=7E
zCm!)Uy#x2LRO%-k`OJmt=nFKE{}{F&O}L#;bKrnCgdLt=tlS1xKx;@n-1CNu1w%aZ
zLkg?wFO}`m!W1?Grw;w}Wv$lh92R;*J||J=AAaTjIhk+|d4J!<wb+jo0Sa@K)9vQf
z=J!5c^;s46>*hY841-6<3b{I42PW$eUOug>vl6>62k)oDn#GQ0BDW-$@in_X0xr8G
zcy#vI_A+v`_}3Zb(w>#Kp<#;Q>p}g;BpBFtwT(`i`&ktR%K9X;d2y&|Hv@L%&Cma=
zt^w#$B6ZpLGU+Mgj`hooS9?2-jUVm6ANC!!(hA9@W7bo90^veFxeqDO`{l6q1siI@
z_@chZo)0`b?Tvq*8D&~?S0y-N#hR`Ro7PO&!yMh^EX(j2>N#ali|R?})uuQk>n(K*
zZJgMw*E!cNsL9yQ0tKs7*MlnZ+xXK2qytjA8@dwYSa#gOB$;+M%CYhJ<fjiFlTjq|
zY>z(jv03~Of5tfT$HE53qGrJ+(v?war<kK;ZbT5XXV&X?fBLh`?MIuP5pR!?$IV{J
z4@3saU99T-udZ3&DG-GXO=T2*o|fNPnL;5qj^@;*N>P|(B8|;;1CmsDbu}vY@);nd
z@NVgDzhX?|^VYn$f}Aq|Cm!c9(<Jb`ZP+pn`cltwb6;#pTX3&=+IKcY-l)*?*>Bq}
zj2}3}m3;YoHv&a!8^b#aUgsD4C};cl@tdc6256glf!N%f#~LrdDbTS(H=)Y|`DxF`
zM6qD>F)7zJz^XCmqk-d`Vqx&k^4`=ns%QTsC(7|r_`QwG{C4AcYW(jNnhKgWKcTxY
zJt4KJL=M)MoEmNShE);T%3yE4_xD{M7wv1HX!;hX$!f>mJkCLfX-?Y?9{_+$h!}-K
ziRGc-R~iG9Rab=rw-#m(m)SqL1~_;9RRsZl25>V2rpOn_v`P4CGBoi4BS#@!@nWo+
zA-M)Y(i=uvifncTz|1Zd>YQy!C@_?pzfU(Ty*$Cx8oQ-i`I#JPZMD|fc^ICyig&pp
zV4xX36a0Qb8sS@LT<a@j5$`F>R+7QRwb9Qjv)IGj4!pB0Ins*8SdaH_sx;?$w^DgQ
z`*~-8XBeN!dWC<uX8%8Y<vX~{&t8S#pVd+TJ+imMqQO4-6FEHr<(|9g4j-hy6oY9R
z%-4sHnwYS#Qb8CD=Fe4J998j%PVe>m4_&2TcV*FhY4^0R{-J_pG3MdF_^0Q(JhA4Y
z&vs-kKY-Y6IoJZlZjg2F#G#p1#}Y)4K%y@wz4?2a%x1@N$IKC~&4kIk{>8>@xC)oG
zis?$1b7Y)-dCngGl4|mm6~D_HSfiFX)&8*XiN^bDVLG0n&xdAr?N)jv7UUGva#?lT
zwj&$Hif?~O6{x(L^SOI6AuU%L*mEV<Gh@WOF6XN017Tfx-=kCXwXXPzoH@P$i`j+r
zGXRU#kQgDvlyb?iU(-9)3d&?*<rBc85uNLS`!$fjwpwPowen5ULhiNK56&%+?QShK
zf9w#K2%Nx4U4MWoo9jfS-*OHxb~CFeV5+Jznm=)e_zaonU+`PoNw>KuT0Wq%nEcDm
zZ>yx}rSF|0)cN<vnVJbk`sD&^UODAi4Pee`v93ok>MM<t)=VVetpK&q<+@uP;&E|t
zPv>mGRniEwSybzF8HN-Cv4W95E#K2E_zhIcFlw>l^Lu=X;ThmXuF(3AYd)1>!1bz`
z2{}@hpRru`YOPs`NKIT(e)x}3jXP5dE1ug1={=ca{DC?<o03$pO}Rs2jRFF(1z_Yv
zfzAL?qM_;qr*bzWTLM`ngQ{)6PHcx%;IxcA=avt=PRIK)95k6}y82p=pZ-zI2vk}o
zD$@-7##B!i=;IKkOoU`MG1C9OHRyt{bi|&$$V+V^YY_q@_xXSzouAXUkq9xs^Bvbh
z?9*=w?z6adK3HC<VbkmkrlXtzayKVEx&AarfFC9W0=w${=T5n9Na9T|Zweg*oSujT
zh_d|!3I1?sB32w~EV<^(4DS)E{h+o&$saaWmhNG>Ce6hcTa=_77$?b(>O+cUNUKG)
zUCotBb#1xn{KeTZ!HkZ@ytN!sNi9LX_)BU@JqR{|%+ETs96I2~$uYf!69dY|4ol$e
z%DtsaRzS6q-Imy6B_@rbV(BWKPQ015u8^;yS<tR7+x_P)_7Y`v#E9%BhN1Xz+8Mwo
z>UoF1*-q42@ZfD8>tnxie!);1ihyVa+BFH)ThJ5Jhn6cr;%%_EFAg%jUfJpe3apHh
z&{$2Mycd%nTqe8K)AJrAVp-xlo9*9z)(MyjFur+pnsHXMW;3m2Nxr+WKn=~UgQ&!D
zG5U5veA0DeG!xjMW^IVcS7Nm*NnqAgZOOQ;=bpu>C{%QSIY~}a_>F)+Y2ZeEMQvsY
zPi^0ua9I|Tu_N1S8A;@->S6gF!#0H5t%&dl`Gpu08a^0GKgN!3n1k{dH^hgDzN=E+
zBxRr;PvHuW)Pho^w9DbX@lihQFQ2fE|B5?}IOi|x=j__<Eon`4mBZ{6I+T~n4H%l-
z^cmd0lq#%RS~XCXas>~0`To%>hLxsKHkmKO?kW(AmWQo=nI&^Ur53twtx4xT@x3CE
zw*7QX<QMF?GqmOhJp&ozyR1pxsBO=ERJN;2b<(e!0p_o4fv$3;uF%^c>j4+I87%p0
zO;*?5#-yfQK%haM4kejA!x@X}gEp}lT-Afmjw15iXR=1J+sq|9<K6t^&zq~8$_t%a
zDh6?z5X+#6jMC{D{$GJ|0~9>WCK0{Z3m0&X!(q{>F>|a-kA;e5O<KfTyuayg-;UdT
zd(BuZ)-4B+xm@;igjs?g8_JiJpnsz#1eTQ$oJ9_wEStVW=g5frdiv(C2h3E;1@hay
zKipc&0?rU3`6j;2gVSi=vtlOHseGCueYe>6`&zk<L>mZH;dzQ{sru5>0O{u2X;6@3
zX8sWm)VTP=NN}C`RtSUKdh*jcN2lrLZ_fZb7h-m=OqaV+o^pT^j0Qr-WX=H6ikuB&
z)e|@7!1?7*i9Dq*l6f?6=m6EP-YEM12s_OvitN#V;oujk++Y9H*?O}xQ|;wtL%k=w
z&HK%noy}}x*E1WUquQAZV^Bo@jCk|S`Y#g~eD-VFX$rXxCwkJ()VO{~ux(a$34C)(
zX^e|vreO5xh|xcxG$C@czQ^xcS!G(9bH(H~v5qv4_OgARU2P9x$Zg{V?=e#0cW#xA
zjr-}oZ(^yfrjLth57-#OB~-4|Cana#t*z}97A?!DC`3ybv6gm<SR$G%bi|y>9Z@>f
zt*k$_xxnx9SF`S&5G$SL2u3t*?=&>Q2TOEz^tp+?@hMrVWW9a?WwbEsp{eb=ytZd`
z$y||TVLOq%WV&Gd<zAikD{>-f44jlYs7jG_)EFs-Xzg^dWPRE@etdtry0(|ipf$^B
zOUJay+&SLd4-?kjlh>esnC!mYd92Li98$$N0b1WZp_=Vj{OdlEe~?`nk&c(7pqbio
z`NLKr7*ZV7)wlP?oE=JNWD1<yb+ECR+PiI^W2~v|T}zRvz1`^TJnP$8*H@^yT<{s&
z)<Nb7ayz<b8II86%Xmi-O}TzpYSj}X_GWW*$at)hW;dHWJ^+?GVGUBUcMEAYo^ss>
z34UtiLXP1|`;AJXlB94;l_kGuPC<d)(-&^FKgD=QNVeCUOEFYYF(fLJN>_A#mOkxe
zzv3HxGq2cQgf;K^YlDsqsgi?&mXn1I>G9-WdZn}aA=#UUx3T~5TIXNn$H3IRFr}W3
zqm?`!<=v^F7g8o1`G%tp8^kWUlaod^6MCU+Yvo_@B2uahjQto7UN^KXDY+Ck+7K%h
zDadVt61nNs(P%7t$1bZH`D|R4teD|cmc{Pq|0*g#A?&Bn0krig#(F_~JB<uohqvBS
zS|*gA0gT0V5^lThRt0|d?hH_1j6X5Kcgx#1_I0f@oI8y(I|J<7o&oNDtpgM#1+o9)
zJij2Y&UD1nBdRawPg+lpaEh!<8(2w`X*X9TF40?KjCFg5r%`TS>~~_}HQ1m8dNk)b
zq7eV$svALOi}P;Rn);5sA|{C51e2SE#2Ze(3o76*<^Q-vt=v+utqO5PoEU_D^K0E)
z?zYv=cl*&@l!mN*?c<Bx_hEy-HFxn^g~>#83>0B#xzZ)Gr9jcqHB%q3*|+-=W~acZ
zucj{Yet?sw0@18;0}95<pye3l=%Dlr8FhC2#e;8Wvzf4%`Su>yN~+Mel%C%Q+Bc#D
z33!NKwDnAV0*Z<=amUwy$j4bX4I0nu72^Y?$;JFzQ$`+c=!C$^EwK%mQ(a0#OWADr
zUfR@`X_&FnTZ1#e)oXRy`#y(HW}8480ip2e%)<SLp%a+U;a*y=pg%qb<oHFGuyELU
zjJm5ZB?h0aK}I@<ByYNAx&ry%vk(yFp`Is9^i4|-az}#uQU1IKw@#haDmd}x7l-m`
zPpQ_W<;{*AA)V<I-r6POqc;7$7v!mvz0Q+PAvAS7aN7P$u5J4<W-<KabSRi3bW+BB
zx{OwI?tOnn|LzlqYl%B4G8$Gpt{e}}0Iz<D6C*xuj6Q*f;x(-_BY*sNiuN~>1<%jV
z488?lrA|sU9D3ws+)v8PR}~Fr8Ox^_I6r}HNL(Xdc-qW0uoCg$s~T+HeV%Fjgu!S>
zYd&6@Z{I7OM^`Q~8R+H8*pgle-Sb9coqvjFw5lJCv#x0QIxBqu9LGAtDKM=!e>^a-
z)E83J=c*Brx_>!mDA|s6H@oqNp>zfDj)R=6E$1qS93(3uMUKC|xn#9_8A-K^Lvv9m
zB}Vgek_pl>R<>JyJd}f1$EN;!+Rn;LBf|=?#5h_?g1p1Y=M0W(c6+4Ii;h^8WXb|)
zJv61WM;4fueu9f3*3D3P9=OpBjOLfbXPWYAL~_Hc>~p2=k0srqH$vA2#GTNw)6<t_
z@(D=*537Gs{^$Q6o#U~L!7|$x$I8EfK;JVxaYu*ed@y)Q^iS;eJt~HMpm9p}TJ>&R
zU(N{VjeGc8mG2r=6;Dd11VSTb7165;Ht$adtnoW8dOGWjs_>Kb@s{k|wg98{mNJFS
z&Ug5lX^PS!3$-ztdC)xYW$=p0=?mRsNx4ZG!pJ0j^tLs2;WRJ=%u09^?JPXvBHi^R
z$sP{RGpk&vHu^N3S**@%UQp{CSDe4rIwh5$V&0zbh!r1D8Cnq}V(;<W7(x@Hru@~3
zk9V|bGoQ!bud@cE9V>yBAG<!@-&Msrqo*hEDlf^hef;~=UaRm+!4XQCdg~X-#MZs#
zmO;hzH3->sJGXM-R2_;VwA>qR{xR?nA1r<b@aSGWt(`g?^XDI}3>A{i3k|KAR?9uq
zo{(8<S$Visy)JS5dF*9jP|?-F^ro!Hc%|7p+?xBZ%VzP8x#Yo-q?wQZd1L|@5y^XQ
zB8NhyNaPwun*h%VKtAi(?DAJ=l6w}396G>t8g*WsRTNsb?mfoap95(cr~%)i!}qEy
zJ-zQ^P3Ct5OvUR!y5=ec{!8?)-cSl%o>dNMoW#bxD)T%_lrZS52KrcLiVehBvKxYW
z<}FgTy-JCPe%hYL!a0|7Rs%GzN@uwhIRZZ%rI^WEDZ(?(0O9XU?mqmzd%XT)7u5rE
z97~At<KHfD57~Yse}jjml1}`h;tKjw@pLoE$lBdSwYhc6n<?HkDeJ{W;T2C<o{x@Z
z-1%g+`_)73scnz0UmL?fukBuV_b;z+vn@i+>;<Qx)c6HUN{eD*<}Jtk>yx}20(yfB
zii_y1F=e@IBp6j;Bg89vNtSFeu@91kjev7vmXd+>3jTj<MYG0^Oq!fcKXT<>Z7DNm
z6Wd_?>TUD2-`s39bS6*rHm-CX%cNSEug*=a2hq{A&j87%Hs$F0ykOqCdYP%zgyoxO
zfVL;4L&288pO4BJX;#)tb&G^)W4DvT?@yS}hjTLAHV|$8orcggQ`$#XYZP?z*&Qre
z+v;?ID$E(s=b=<a%Qf86To*qcO!!GDq?W!|<sfknZ*C3ik3C5c+tGyfm2O8At(==~
zrmZB<;z6MO+QXKfR>k%hifJz$?F2!UKLa$l&fqN%H7<td+T<=qd}8Nbxa*qIJU=1t
zaR#`4iNzWd?#D>`S}r85DgD~Re_`gI^vx3bZ63z8)KXYVdpR{Ol+5*}*A`Y?x?z=E
zJsUsbl7FhEqN_P_6KYGn{+%&*UQk+{X$I`m-|ZI+x@TZKVldFQiM`L`va`M8CN=--
z@2`Td)_dq^wsT`@ImX=(b)Q?+bS6!Z<EW{YR4c4y@$Gb;`5F?eXPFel*#5K#_GB31
z`q!?V>+}q30sCmM)D)KJ%xu~|ZMRN|Ib`)Pt5njEiHK7X1D{-4?{7Dl*zS1n7Lyr`
zGRcQCc8w`db7B4Sx8&F?l(b<7=%J~3uWhIUP+LTtf#ZWt%YwDFl9>53YDN%$+5EEd
z1pIL)hv1+z26{PmtUS%Hi7X~i`TJkY{s)v~UM<9TIkeVBjh%Beb%n;6Ef9`wGb<{5
z2Q|)=P#s^#eQDD7Hs#x9FP(Ehi6*0Vtf?-c80&X0=cB28>8IOWrxrn>4ku1KNN@$m
zZKUz4h)P+SiY>IqjHyfoA?FLZJ~8VP(Bx`vT?}>z5pmdeI0H<(Ck%k`Ardlg%!bsD
z%W|p2kev%7t6705-$R{;%tzns7=pOOY+I|9Zufb7g+1oYV9i#bvQq)2i2a?eW3`J?
zpYFnd$C{+G-LV;s800XpBaiPA!O0bOWTqF=ha8d-N}IBl*2M8Cn%H+VCb0!aNip(4
z*7EM@N@K){-{f5mrr?OsOxAne2`T@*C;QK&BWeCHc^ZN8bRgXgz$<F!I@s$nchxHP
z2bBkLwvl?J_w9Bq)Fe0lwdS{Fg9JA1%yHwWlqBxiM3`QNPzXWnNMs3O)a|bp%>@b7
zB3~YD^7`@j@;5ea(GKeTi%wZz{rZ(oBpprV*Twfr6<`G<7tK1wo^S@JbKBy*THjF9
z>UZ~PNV-$w86d9W>up_?;|t#beIR~lnN!*?Au&d@?TB>|=fYEv?g>OG;2dOMySe*2
z=~pmRYH;1E5_Q$OvX!4%S?tMb3#nel?F>*`eDbCHgtPF)btLTJAvuI<cRH6!IDs~k
ztG0A2ZBLE89-p28oLdr<HnZy8MuG=l%s7rZQu3-VKBZ`|7KsJO(6fbpc&wVfcE_?k
zq+e;esGPU$^}q7u-_iNf{HNDN4h4={e5*ea&j7f74|K3#XC?7S#yZdW0P{F?@ZVHY
zC|nzsN_TR~^KBH_Fih=gObyxF;kq-pmCc~xTYQA)zuk$|OBU9b1MNPFvH$+}YX2GC
zZ<0|$YW}&bGv@XUt!y`j2Patd?(2$iO=)ul`ikoGdU;;(->5bp8Ac=6@JZ(QLxz)k
zlXG_({5gh9om=08jF`niEgPn_we^Xj)%s8KA(qLt4jFIN;3!7|XTC5bUi3{!0ezdc
zu<tUzz3y|}k7YISwsoSA>dhw(KxF}c1x*%fdu1^*O<%3VGQWlF>t0*u9AhI6_~yUw
zH63aRtBH)+3zu5$I?t9uUl_*J0FGCuZZDPg60BZNYJPYuRnTt`k%FlwU$b0WDPdKC
zmPh0xKcPlos_ng=uK5mm8&#^kpRQiM$h4e$+oDp6*pen_k3g4rzeXbnzNkG!+51Sn
zw>>V&;<bZRr7K(MYLVJnzFEF#R$V>=RjO3Gue{OKj+vWR5zp^e_OLZ<_O2wkbX{!_
zVbTf!8ZSq6)}N*u6=nM`2AX%~`7n!K{VzQS_XPqNr{}5M??4#){Ig1h)oWoBl;%q(
zR!L3QL{=WJe5p;lx~FkkJ6Zz<yy8)lb$kNFhPvnH*wm$yD>>Mkh@RUIlVFof1tzgi
z;qh8k+PIEWg^P*u<DPcqF)>dZye&RX)fon|>~*upD_heSVrIP-5$^T7E%Pn-OEaWl
zE3+_Z*$^g<Ve;7MBLtckrqRZi%t(EIHD~|}m9UhmQYnp+E(O+V!9}kLyL;S%gBB=4
z5?kY-9NAMRVCEvuY~C1$PR?v(WX4n({~gAE9jUGPh~moC@L8-*|7y)*eJ8OKH|7uI
z{L;V6ucC4M7d~7BJP}vq|4=KXZtYr(EP%~-BV<>S_7om4Woq-WO*9%XZR)M<Q{!Y5
zKWPVkZY)dMKL1=af~oUiCqg&K6a!ZiCEsz347V*LE2*oO%;9!a2e84D&!&%1W&#iY
zc!-9imjR=q1hxeP#%=~V;RV)>>js^MJN8mGS)IyYn`7T*jQxWhyIur)li!LJ4y^J~
zPOReFE32&={UwJdSjv&PM)lGG_NdPDA>iK-eMW|K0f{hg?*%lNnAidFOOcukqUHz^
zFSZx&RLxyp7m8gqR$t{O=GCiLBDrZPDx=vc%}bBh#iKNPqD8C-w>~{?A2>~0+1$?W
ze2!nlYHRnZg9OG;A{V$gywkkT01O;cZ(!mD<2FO_oQ(xl#f`NbdMmh($1Bt6iF(TW
z0SPO%Z#JQQF)SstDsNBI(=qdQrAV^+jCK2=ux+0EH#gfy<>+d3kVRk>Pg@tuE<t|S
zW=lA~vs7|I3I(5Zp<L~@Y-bJyb+K~0d7v59S!q;myKZPW6>Y7&`S#7&4(#vKjq`Q+
z0TNZj>UYSK#k@X`H)ntw3Vm&@U1xyH0~@;CevkjkoQr95Pp<l$S7GZV#^*(M@+Wvw
zn4PPc)Qj>5mYs)fVrw${)giI5-kypwetI|)GAoF?HfnO$G_KgO>(8XG?~GJbRJshn
zf-Z)J-@dO|3H?Fepq8bcs~*g!ozaa+4Dm!bwb-)%785-3?=$NdVn?WrSK)V+txK)n
zwatr9O)m7nitFq{7hmDc@IO<o_`xmeP=UUnQ>U1H^b!5*&Vc_T1<KeFJ@J}o=WymQ
zOuQlO;zzrtorPwTN0l4`P1Y!LsURepDJUE$t@`P3K1Ttp(HSi;074S1CCLuANU{HJ
zd^%QyM~(!xalt|~b;rRY^N7W-5cjm9=~NUxwwzknI_FlGFNeW^epxBMS+bm10eU!r
zT$qR+o@8xkkh>fwTIQjvn1mxZa|?SeIDrq+y}|2`+!CYc?Plq8>TJ<C)ZSEuER4Mw
zJ!nN{iks1l-i;pDY;|oNVKe#}nzru7u(F2aRcjY^)#;kg=+!auUBzvTlDWtV<No|S
z`m_PLuwHNk%iW|TS^dcyPgHn%)t|@3jU_2i%Fl^p0`))XS!_y*fd&ZbT1$Q!?LG2!
zj)OKqK6sPKjr(SBm-S4Oy;LLCamLB)Ce7-qIjurB^DJC@NC-PaUyLxDhFvO!W~{BC
z%=m+v{0(Undu^wA*I`3J5z{CVtW3!1&6FHa%Tx%;YjPdc^Wkb22a?^BKYR+`gVPLQ
z&pqPbH1H7S?Bs+siKPDc2SbH}ZxFe`Wroo$%N<%DC`|;KhN6^?QFYOl7ylqOWFPTN
z?%iL7AYUiAeAh`(h|d?}y$-?!nJ0HQUVT&9yTO>CsZ$_nTS$UEv9LN+=brcT;ZEJ$
z#(4pq;&P=jru>57P5(}+|AFefy<9Z{FFr^4c2gKv@prO`Ckyn~yIQmx(~p6ijvOZ|
z0pI*o=AB<VzkYLmXoT6J3FTs?@&H)uIy)ZWi=*Oqif41+R&~chg5BL3g6gZQi%<m-
z2`2R=*gO#{gGyU{6F02GyZ_i&<jHJX&Go7rbTR~T-QsY+@M%e$E(aL0!Ed0xCZ2{j
z<PeVVE$xVoZ^^|!hnn#8%;Ojh`d-#_lQgKzaE5lGg*HTk_B^^&Wf+MF>9Pq8+oLgi
zW_-wd-YJ<=<g|SFLrc<^w6R<YFZcjM>#DaO-slExUsVD(m#lFnxzP{%LPz1rl+v)c
zpdHJ*rj}4t0n8!wIu5zpNZ8F1pRRPO^RhDYU6Ue1Xuks2Mm%_ae(gz#XBoZKAKY@N
zNF5XL4~s|kq{vO=sO@{Y811-mt+^jf7+7ogT^sh#-mfbtq!m?MWTXD&1Ne*aGav))
zZ+osXtoish+|3>iO=M4Vm@tgd83IZ=_JCEltwwNkA!#B|qOLg#J6>tBp*oLj^<5X?
zerZh%=Q&b~SBm(k%HIJJnk{rwMikht-A|2yLk9O}ixA0AwAiTQ%_`-y0aEhCseyPy
z_w3UDVibI1Px5|gn~xnB6lRng{)~+`#^NAc(4L$@gN4t}v4{XKi`m&*D^JUYy4DZ+
zD$W2hC~D~$K)k#Q2b`(y_NNsA+L_ZV%O#9e<6Q)aRZL1SDdfVenRCTagRhYpX6pV)
z`4g*PJ!aA?B$VlCc4>6ESy?GV%hM5K>2l)$WL0m2+<pr86Bh3J6>f%Jmxxl4VWuPf
z{55yN0%NQf)`Tb_NemqEg`~CXix$Y+#Su+bNGWFk9S(%bJAbG+FML~sH1=I(yJrMK
zT1{RawOXZ$2^x_w^)&2}?2jte#ccEq_VaOkaxL?g2!W5qFaM;rpzUY%0hJK8292AN
zuFo}O*Y+#MVM`OY6{@5>gLKreFcL0{PsZ4-+U84oT5*J1TwFP|E2Envos(nl=s!7X
z+x5iuu0HEYpQKhI_WpCYjN@UBBHXW&V{Kh$SX0Xu4NW>o2Wd)`B3(p*AVm~H@BIn^
zX%adZq=U48bdZipkD-PlMS7P20-+;PLI<fzf8oAcy!XBNb7sD8*4}&0teHJO=A5OH
z$5q<rTM}}2{~J4*q;s5e_tU6NZG98Fpk2MlUW96gOuk`FtXzQkcy*`ECE!KOw&KNw
zq+M-pU5cg1%KqS`;4Q@xdHqx9%VJ<b@WV(#xDO>zBPGsw59my=75ws;@EY($jz229
zzN}^okN-yBv9J>5&m&GRsCx^oNrdFaMdxPBeeZXpesr2edlQC}gJP*1d5d?!cb2}0
zJZNazAY2}^1rRK$v^CT~ng=5M=ia8+K2O(3SB8lI%>riNRLhE$q8baZH1{#>TIUku
zn&j0|SG>FI;-T=d=U_hAJn^#tU#|6!=(G&LC)qGVcSM9|!Vva@4wQ(@yV6GbaFe(0
zb80Fb6;Tey2KyaBEG10xHP&=O<qenJcxuZY)z_O)e3jku7}*DHe(%ZX*tL&5KDEB7
z<45oekQFycPi@0rL-jGn{@kw#`Xr_1ICHcaQVW||(D0#l6^^8%3ZH!aTd~H<8@N2G
z7HQXo*5%_l^znt;5Q3o6G2a|z<`3G{1F9E|`<n4p1YS`^E7|t<LH-yXE+MZ_mnaTR
z{vAT5yB)Y<$KpbDy3ADAE5sG$!o%;Fq)b?UdfWdde*eP^k##%17)U@uObpl)?)Z`I
zdqce;N!4m=THac^L=Jgu0ne8x$}U&k1YF>r*_q2DxJGp_LZnS0{WH#3?zbptUYzmg
zV~U#if(}4hV5U-tbuyAAVyL1KLy(0e;@lh<P$z8QVWr!~dpUgC)oNwa+{w9?Ka#O=
zNndEK&mM4Wy0oXQj>@U!c!WF2>#|uz&w5^iXGM_Z9Izt>2Hi+EZJ!C}taH;sS@7Zt
z&<Pqz_<f2aiyt`mFAUK#i{?*mz>2sr8Ldo{__UGPMrgX3?>%M5@G1B~@@&}*gR812
zm`f{o!8B$oqL$xNQ7k(}w-eQO$gNDw@C=k*#;kQXopZ^Yn_M!U;f>vXqMk}ChoigT
zw-mzq^@Di~F$MLI?!8RC!P=;1mXVT`jGR&&Ht%e!w@ND6FlvD5FoeQrF3V0R(dMPB
zAa{4Rz+G;raMcSU>v}Yu?gm$v%Frze%IbP0{%czf(K3U>ZUBarJf>WdPM~>!wht%(
zS<r<v)YL9SvK(bv#p`bvmbmMi9CyEBOVc|T+(uRp=%_hB7Ho6#<8v~{fNowTak5-_
zthY5r%Pg^1dzi??oa8Jpf!cCH!Xd5u87P7|QTM+0E}W4Zxw`_D>R(hag^I;amE)s2
zU_7!caa-f(-`j&fFUf69tj8ay*D4y6$p3gW+4TeM=8~!?%oH%d-K1(}K(hnsT~*o{
zCGRVTZD7izH!ymXYkM<AUEE#FH_B1T^itgeEz6Fiy#>xX1<Fwpq|Lm+VcXz%(>LUU
zfe+i*-rG0f1~_Z@JX`&dojZDeGd`@;YnYB${wp6my4R7oV2?S+BGha!DTKs0^lZLS
zug0$^P%vo)2*ev&*APzHzYnS3R<ogsJvG0mgO&<}q};6hvU#+YyVay~$&@R40P|Ib
zoL^FQ7KAP&3ZMfXl3VG7pHWv7z2;s>fFEo|e^7jKV!kqmx&!VEZPk-)RtAH{nU!$0
zj*jgzQ3}OgWf{QJY5|=sgC_djP9Gso=Ec<?rI(KBU*wEc4n=B(Txgo-ALtO-9lYqj
zvq{!+=+kU5XMtWxwJ6ZS#67ieu9?NnpRA3B$>5#i&cGS@ui=veQ&A(D$*y1N18+Vv
zmfhX*=}Ft2T|hez8G&$K>*&d2ptB&+wfkSxie)i##VOOz25M4%Tq8DN=0TAb>w46t
z1phYK-)ORRJ%O>2iZS7)|J?Vmg1BPUO2be9k^gFGa`ZH`Y0<Tlw-874o+6dyEUAlJ
zldhcjg`1>qSK_Ns1om_(uhGBciFk4l{tcb(dnAEyJ2ZRqMC46Oc=m4Y?$g3}o>Yu?
zkKk*wX<7N$2CMZq<OKb2D>Ya5<5ZI2h7;ccasNtM&;0|^@Cs?`Z$7`Bd^BTOZ8zll
zDfGe<IXAy@85VoV8QU<&dZ-*Q10a54tR~MyzK%b;hz<iX@S%%YPluF^CRl4f-&5Z_
z<oyKQpEX+41Z<nee61x=DrjyrE$F6HIar1!i+k6%)N(A-ZDj~NBIJ)oJSSPr-tyx<
zYGDX^T0%eP$#mqV=98W*UI?cccp$th?_E=e$XouBv1nQVN;}3mV{(+ymjZ25G4iYQ
zEYYo<gt>Pm<%gi#FAbfEexe^#?&X1lrIeC_ZyF1@E^C>xKSjm{diL5bE`Fqq=1P7R
z7qyXzm?$bM$f*<RS7<DA^C%uZ!|yq(=utJ*Yv*k=XeFsj#R$f@boI%?)J+!5vEp;Y
z@MAOHagp@LRAxCd_u>-R>Q&jS`3BXD8{p+|3ZcW4Bh5}kSu9f>>kLp;96BE+g_r3~
z^vzu8qJ%m@@dj;pM=M+DBNAo`eMpJ{H0#dbLxp#PCkvOzx19m%<A9~rN->SW1c{1!
z;bI%tYDqoSH`C@mM0``Sfrt|k?Y1{AkM<SfLJ+QvBuRAG+ZA?FQ~gCh114Wx_8$yP
zPFxcHDXL8LyY@2eWa;t|R>PVX9{^zgReM?QztYJX&RRBZPWJBZ_RbKjN_UKID`Z-P
ztZ7Byg*({<u@`falTiwt5#^nz8tF}m+hSmN6_;XO75<|Ozl1I99{}1t#JGWbvU|oE
zUC=PYy7Sf<YnPWRBu$gyv4jVCk;D9C!<>D%6y>|9hkIkvhlJ1q{$BS<i6rr50tj;K
zLsk|jKduL=N>AhG@Ldm7Vt`__hmmy+_ZfGwUV8gQ8I6I#vBcZ;Jp3~>GMp7P%T1&t
z(L5wXM1l?yc4;VR%Laa%{gfwyj*Oe&`l*(ssJ~-gY8b>z%%DE~t(-6NYkbnUy7h6&
z2sfXt;tao+e>#QJ;y2Zi=XPW{x4vcjLCohefAYfi&&0*3?%G*M4(#MMylm<)8)|rn
zP#dOv9?0s0-oGz0HdT3BqSrI#BRQ<Eot%Wzd-k!#`#T?R#43E5<8NUtkzCh5_wTIE
zx1A5ER@x~iQ?r%Z#kBKJ=&;OAdSuhuV$=v^@W<`iG))U(!tW=&#0eE`u1_;$C-?k#
zeR!>%-pYj`njdtAUaybv=6x<BuHf&1Vj)m^$WXYm?@#R`KrZBX$KHp<DWR*DdC}s)
zO~ClXo};gi3by1IxiVyxe&%*Z&kgp_=?AmZRQ;SHl7QYa@r8%|wS0Gi#=1j6CQw>I
z$l^kLKt2XO<#aan7!CH+v}+Kxc6C@ACJFDA`zK{KRLbgpU@2pZrOd7WLm5MR54(So
zMn~QGchVTHVi?P5HYIOQmkSD%vzg#Kg<BQMCo^Saa5Hfv^4vc8$~)=0;LB2wczZp5
zC!SJ$Q3iI;^)%#TZ^u@afJ-%LD)$QotMVHP2Y{06J66kCRK12f2fxinmeOkKk7%Ki
z7|Io3(I|~%^ur|??kXy_8#3sql2_u&lN>bdcHacsQ!X2Tk3MXdS9BBAIMJ}qsmS1n
zPVF&$B)LIGO%P2a;~?@hO(QJ=d&j8IxOudw^HULR2XOQaxqHlB-_U?Tr>bGVe0c1U
zbllN|Qua8U<u>bxlZ7<%LiMwi?zL=v8M9mJM~xk}@h-f=0purp;A(5HC@D*3*VBs6
z8JHhUrZto9pP4SjN84!6)r8YoS6D=5PY7pDly|betm%o2*%{M6S<erf3ENuvMv$jH
zeUvc%6e|vysEe#JX`w%OfO_Ix5I>%oM9hB1FFpON4Vj(t*xj&oqq5d_<c4{+6foI}
z=|cp5jwA(4IK&V6k~*yKX0?C}U(gQgB1sztOQR(?^(RDy(84qh^I&Kod!~3(Ad%hT
z!QNL*T<7E<XiQYsxmbb(1`>T5vL9o$+#M+>@K`XhpIY;6r_}K>`kf9l<Ag9wRkiF5
zPjB3z)GV_Y+hIvuSs!w@28JK5z}8w5RV9^+{CaY_%KkTNuB6$8Ywf0laRGqhYXAV*
zpX%*45FrP5XGl!a0OW?~_3j;+&IphR@fKcQcm%cnTU9>lCoD8OK2H%RV8@rFMe7aT
z&z)}`R%&&$W~Vi;+>-`hvf-R}IeJ*E&LZtC=%4ip>Oy=e7heVOKmv{NVRELH@eGS9
zns;@5IenXy;K44>lC07bJD>vmu`GR@B6dB(nKa6jEDDoVoT1WL3SyBc^8~N{{7!@v
zKGdWYZA1k02JP=flvchYRtffh)jT9d42<}yN=etTO3X+eWi&xCiywLoeBb1I*oBjR
zNSQWWd2!kf?YzT?ss@Ev@=uY^`;&~3f(jm>RhfHtp;W(_u0&40rIhFM=8yO}U#(U$
z?%q<-ii^2G1&N{hIU}+pN8MT!U&Rp4O);ic(tlrD6dC#a1gy(zGyV#Gx1+o<xL7jO
zK{M0_L^moyqr7;kQ*skU`Z0h7Rb!_gNhOSc?C009xag8P+#`owI}&!p(R{{UVCNQZ
z)V=7_V+dR&;Whx0+ZxR(Yq;Luqxr%`b6q-7LzD5;Xi!>%VQ|$|lA+R{3Vockf68Yn
zp-{WyXkf%N;I3Us0Y_Jt%W6wdIA$BO3r&<-tMoe~4y=~jmk8Bo+NyHBc)*+O0llZ~
zim~s4?{6X^*i&=Pw{g&SA4F?9uRnhAng1nOP}p{m#GRZ#S~(GRk(BDh%&6N_${d}J
zc@s|Kvpvb)KNPjinkHCAnlLZkA6-vikZso03VWO%$So@;B;RZfe%+)k9sM{!IRHls
zgo7)GM+*QD5dkXnv(>ymh;FB1sYOW$0FYv-^=Cl_UDbqKEWwVJwl>yQ&|iU9oNNJ!
zy_>>z3Bm4W#DAi&Ph?OF)|}2Gc_sBnLQdAd!eG9sYGx4(^W8)Mzy%)wK>iO{D;@yw
zN8*%salz)xU!hkXwcvWB`B;bs)+7BtpjFsK@ds4b#>2xNV(b10;_37+8&~cTv@gIM
zSiB%MMr;&+6=YB}HX2K;->WtCw`aibiT<x{*vhYCJ(nM)006+wPEM8(Yj@#aVOIhF
z3M2TXaV~#~h1rWrL4JV{0j?mgxTXz>p#Xql#J{J5jS>Lx`0u$w$ic<-Z(slaEb^y2
zWRMot)L$X~|C7nTjr}`I{cS8H>VJ*>PtN+)+|{7|y?y;{?ql>H@8OTlObbMS-Quo>
OP727zP7!tNRqH?O{<*~f

literal 0
HcmV?d00001

diff --git a/packages/apps-engine/tests/test-data/bridges/OAuthAppsBridge.ts b/packages/apps-engine/tests/test-data/bridges/OAuthAppsBridge.ts
new file mode 100644
index 000000000000..81d29443b710
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/OAuthAppsBridge.ts
@@ -0,0 +1,28 @@
+import type { IOAuthApp, IOAuthAppParams } from '../../../src/definition/accessors/IOAuthApp';
+import { OAuthAppsBridge } from '../../../src/server/bridges/OAuthAppsBridge';
+
+export class TestOAuthAppsBridge extends OAuthAppsBridge {
+    protected create(oAuthApp: IOAuthAppParams, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected getById(id: string, appId: string): Promise<IOAuthApp> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected getByName(name: string, appId: string): Promise<Array<IOAuthApp>> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected update(oAuthApp: IOAuthAppParams, id: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected delete(id: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected purge(appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/activationBridge.ts b/packages/apps-engine/tests/test-data/bridges/activationBridge.ts
new file mode 100644
index 000000000000..5ddecaa23cc7
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/activationBridge.ts
@@ -0,0 +1,25 @@
+import type { AppStatus } from '../../../src/definition/AppStatus';
+import type { ProxiedApp } from '../../../src/server/ProxiedApp';
+import { AppActivationBridge } from '../../../src/server/bridges';
+
+export class TestsActivationBridge extends AppActivationBridge {
+    public async appAdded(app: ProxiedApp): Promise<void> {
+        console.log(`The App ${app.getName()} (${app.getID()}) has been added.`);
+    }
+
+    public async appUpdated(app: ProxiedApp): Promise<void> {
+        console.log(`The App ${app.getName()} (${app.getID()}) has been updated.`);
+    }
+
+    public async appRemoved(app: ProxiedApp): Promise<void> {
+        console.log(`The App ${app.getName()} (${app.getID()}) has been removed.`);
+    }
+
+    public async appStatusChanged(app: ProxiedApp, status: AppStatus): Promise<void> {
+        console.log(`The App ${app.getName()} (${app.getID()}) status has changed to: ${status}`);
+    }
+
+    protected async actionsChanged(): Promise<void> {
+        console.log('The actions have changed.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/apiBridge.ts b/packages/apps-engine/tests/test-data/bridges/apiBridge.ts
new file mode 100644
index 000000000000..ddca79ed66d5
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/apiBridge.ts
@@ -0,0 +1,37 @@
+import type { IApi } from '../../../src/definition/api';
+import { ApiBridge } from '../../../src/server/bridges';
+import type { AppApi } from '../../../src/server/managers/AppApi';
+import { TestData } from '../utilities';
+
+export class TestsApiBridge extends ApiBridge {
+    public apis: Map<string, Map<string, IApi>>;
+
+    constructor() {
+        super();
+        this.apis = new Map<string, Map<string, IApi>>();
+        this.apis.set('appId', new Map<string, IApi>());
+        this.apis.get('appId').set('it-exists', TestData.getApi('it-exists'));
+    }
+
+    public async registerApi(api: AppApi, appId: string): Promise<void> {
+        if (!this.apis.has(appId)) {
+            this.apis.set(appId, new Map<string, IApi>());
+        }
+
+        if (this.apis.get(appId)) {
+            api.api.endpoints.forEach((endpoint) => {
+                if (this.apis.get(appId).has(endpoint.path)) {
+                    throw new Error(`Api "${api.endpoint.path}" has already been registered for app ${appId}.`);
+                }
+            });
+
+            api.api.endpoints.forEach((endpoint) => {
+                this.apis.get(appId).set(api.endpoint.path, api.api);
+            });
+        }
+    }
+
+    public async unregisterApis(appId: string): Promise<void> {
+        this.apis.delete(appId);
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/appBridges.ts b/packages/apps-engine/tests/test-data/bridges/appBridges.ts
new file mode 100644
index 000000000000..e8e89f864101
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/appBridges.ts
@@ -0,0 +1,228 @@
+import type {
+    AppActivationBridge,
+    AppDetailChangesBridge,
+    EnvironmentalVariableBridge,
+    HttpBridge,
+    IInternalBridge,
+    IListenerBridge,
+    LivechatBridge,
+    MessageBridge,
+    ModerationBridge,
+    PersistenceBridge,
+    RoleBridge,
+    RoomBridge,
+    SchedulerBridge,
+    ServerSettingBridge,
+    UiInteractionBridge,
+    UploadBridge,
+    UserBridge,
+    VideoConferenceBridge,
+} from '../../../src/server/bridges';
+import { AppBridges } from '../../../src/server/bridges';
+import type { CloudWorkspaceBridge } from '../../../src/server/bridges/CloudWorkspaceBridge';
+import type { EmailBridge } from '../../../src/server/bridges/EmailBridge';
+import type { IInternalFederationBridge } from '../../../src/server/bridges/IInternalFederationBridge';
+import type { OAuthAppsBridge } from '../../../src/server/bridges/OAuthAppsBridge';
+import type { ThreadBridge } from '../../../src/server/bridges/ThreadBridge';
+import { TestOAuthAppsBridge } from './OAuthAppsBridge';
+import { TestsActivationBridge } from './activationBridge';
+import { TestsApiBridge } from './apiBridge';
+import { TestsAppDetailChangesBridge } from './appDetailChanges';
+import { TestAppCloudWorkspaceBridge } from './cloudBridge';
+import { TestsCommandBridge } from './commandBridge';
+import { TestsEmailBridge } from './emailBridge';
+import { TestsEnvironmentalVariableBridge } from './environmentalVariableBridge';
+import { TestsHttpBridge } from './httpBridge';
+import { TestsInternalBridge } from './internalBridge';
+import { TestsInternalFederationBridge } from './internalFederationBridge';
+import { TestLivechatBridge } from './livechatBridge';
+import { TestsMessageBridge } from './messageBridge';
+import { TestsModerationBridge } from './moderationBridge';
+import { TestsPersisBridge } from './persisBridge';
+import { TestsRoleBridge } from './roleBridge';
+import { TestsRoomBridge } from './roomBridge';
+import { TestSchedulerBridge } from './schedulerBridge';
+import { TestsServerSettingBridge } from './serverSettingBridge';
+import { TestsThreadBridge } from './threadBridge';
+import { TestsUiIntegrationBridge } from './uiIntegrationBridge';
+import { TestUploadBridge } from './uploadBridge';
+import { TestsUserBridge } from './userBridge';
+import { TestsVideoConferenceBridge } from './videoConferenceBridge';
+
+export class TestsAppBridges extends AppBridges {
+    private readonly appDetails: TestsAppDetailChangesBridge;
+
+    private readonly cmdBridge: TestsCommandBridge;
+
+    private readonly apiBridge: TestsApiBridge;
+
+    private readonly setsBridge: TestsServerSettingBridge;
+
+    private readonly envBridge: TestsEnvironmentalVariableBridge;
+
+    private readonly rlActBridge: TestsActivationBridge;
+
+    private readonly msgBridge: TestsMessageBridge;
+
+    private readonly moderationBridge: TestsModerationBridge;
+
+    private readonly persisBridge: TestsPersisBridge;
+
+    private readonly roleBridge: TestsRoleBridge;
+
+    private readonly roomBridge: TestsRoomBridge;
+
+    private readonly internalBridge: TestsInternalBridge;
+
+    private readonly userBridge: TestsUserBridge;
+
+    private readonly httpBridge: TestsHttpBridge;
+
+    private readonly livechatBridge: TestLivechatBridge;
+
+    private readonly uploadBridge: TestUploadBridge;
+
+    private readonly emailBridge: EmailBridge;
+
+    private readonly uiIntegrationBridge: TestsUiIntegrationBridge;
+
+    private readonly schedulerBridge: TestSchedulerBridge;
+
+    private readonly cloudWorkspaceBridge: TestAppCloudWorkspaceBridge;
+
+    private readonly videoConfBridge: TestsVideoConferenceBridge;
+
+    private readonly oauthBridge: OAuthAppsBridge;
+
+    private readonly internalFederationBridge: IInternalFederationBridge;
+
+    private readonly threadBridge: ThreadBridge;
+
+    constructor() {
+        super();
+        this.appDetails = new TestsAppDetailChangesBridge();
+        this.cmdBridge = new TestsCommandBridge();
+        this.apiBridge = new TestsApiBridge();
+        this.setsBridge = new TestsServerSettingBridge();
+        this.envBridge = new TestsEnvironmentalVariableBridge();
+        this.rlActBridge = new TestsActivationBridge();
+        this.msgBridge = new TestsMessageBridge();
+        this.moderationBridge = new TestsModerationBridge();
+        this.persisBridge = new TestsPersisBridge();
+        this.roleBridge = new TestsRoleBridge();
+        this.roomBridge = new TestsRoomBridge();
+        this.internalBridge = new TestsInternalBridge();
+        this.userBridge = new TestsUserBridge();
+        this.httpBridge = new TestsHttpBridge();
+        this.livechatBridge = new TestLivechatBridge();
+        this.uploadBridge = new TestUploadBridge();
+        this.uiIntegrationBridge = new TestsUiIntegrationBridge();
+        this.schedulerBridge = new TestSchedulerBridge();
+        this.cloudWorkspaceBridge = new TestAppCloudWorkspaceBridge();
+        this.videoConfBridge = new TestsVideoConferenceBridge();
+        this.oauthBridge = new TestOAuthAppsBridge();
+        this.internalFederationBridge = new TestsInternalFederationBridge();
+        this.threadBridge = new TestsThreadBridge();
+        this.emailBridge = new TestsEmailBridge();
+    }
+
+    public getCommandBridge(): TestsCommandBridge {
+        return this.cmdBridge;
+    }
+
+    public getApiBridge(): TestsApiBridge {
+        return this.apiBridge;
+    }
+
+    public getServerSettingBridge(): ServerSettingBridge {
+        return this.setsBridge;
+    }
+
+    public getEnvironmentalVariableBridge(): EnvironmentalVariableBridge {
+        return this.envBridge;
+    }
+
+    public getAppDetailChangesBridge(): AppDetailChangesBridge {
+        return this.appDetails;
+    }
+
+    public getHttpBridge(): HttpBridge {
+        return this.httpBridge;
+    }
+
+    public getListenerBridge(): IListenerBridge {
+        throw new Error('Method not implemented.');
+    }
+
+    public getMessageBridge(): MessageBridge {
+        return this.msgBridge;
+    }
+
+    public getModerationBridge(): ModerationBridge {
+        return this.moderationBridge;
+    }
+
+    public getPersistenceBridge(): PersistenceBridge {
+        return this.persisBridge;
+    }
+
+    public getAppActivationBridge(): AppActivationBridge {
+        return this.rlActBridge;
+    }
+
+    public getThreadBridge(): ThreadBridge {
+        return this.threadBridge;
+    }
+
+    public getRoleBridge(): RoleBridge {
+        return this.roleBridge;
+    }
+
+    public getRoomBridge(): RoomBridge {
+        return this.roomBridge;
+    }
+
+    public getInternalBridge(): IInternalBridge {
+        return this.internalBridge;
+    }
+
+    public getUserBridge(): UserBridge {
+        return this.userBridge;
+    }
+
+    public getLivechatBridge(): LivechatBridge {
+        return this.livechatBridge;
+    }
+
+    public getEmailBridge(): EmailBridge {
+        return this.emailBridge;
+    }
+
+    public getUploadBridge(): UploadBridge {
+        return this.uploadBridge;
+    }
+
+    public getUiInteractionBridge(): UiInteractionBridge {
+        return this.uiIntegrationBridge;
+    }
+
+    public getSchedulerBridge(): SchedulerBridge {
+        return this.schedulerBridge;
+    }
+
+    public getCloudWorkspaceBridge(): CloudWorkspaceBridge {
+        return this.cloudWorkspaceBridge;
+    }
+
+    public getVideoConferenceBridge(): VideoConferenceBridge {
+        return this.videoConfBridge;
+    }
+
+    public getOAuthAppsBridge(): OAuthAppsBridge {
+        return this.oauthBridge;
+    }
+
+    public getInternalFederationBridge(): IInternalFederationBridge {
+        return this.internalFederationBridge;
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/appDetailChanges.ts b/packages/apps-engine/tests/test-data/bridges/appDetailChanges.ts
new file mode 100644
index 000000000000..fbf74446969e
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/appDetailChanges.ts
@@ -0,0 +1,6 @@
+import type { ISetting } from '../../../src/definition/settings';
+import { AppDetailChangesBridge } from '../../../src/server/bridges';
+
+export class TestsAppDetailChangesBridge extends AppDetailChangesBridge {
+    public onAppSettingsChange(appId: string, setting: ISetting): void {}
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/cloudBridge.ts b/packages/apps-engine/tests/test-data/bridges/cloudBridge.ts
new file mode 100644
index 000000000000..6008b4783071
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/cloudBridge.ts
@@ -0,0 +1,15 @@
+import type { IWorkspaceToken } from '../../../src/definition/cloud/IWorkspaceToken';
+import { CloudWorkspaceBridge } from '../../../src/server/bridges/CloudWorkspaceBridge';
+
+export class TestAppCloudWorkspaceBridge extends CloudWorkspaceBridge {
+    constructor() {
+        super();
+    }
+
+    public async getWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken> {
+        return {
+            token: 'mock-workspace-token',
+            expiresAt: new Date(Date.now() + 10000),
+        };
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/commandBridge.ts b/packages/apps-engine/tests/test-data/bridges/commandBridge.ts
new file mode 100644
index 000000000000..a18d0f9af3a1
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/commandBridge.ts
@@ -0,0 +1,38 @@
+import type { IHttp, IModify, IPersistence, IRead } from '../../../src/definition/accessors';
+import type { ISlashCommand, SlashCommandContext } from '../../../src/definition/slashcommands';
+import { CommandBridge } from '../../../src/server/bridges';
+import { TestData } from '../utilities';
+
+export class TestsCommandBridge extends CommandBridge {
+    public commands: Map<string, (context: SlashCommandContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence) => void>;
+
+    constructor() {
+        super();
+        this.commands = new Map<string, (context: SlashCommandContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence) => void>();
+        this.commands.set('it-exists', TestData.getSlashCommand('it-exists').executor);
+    }
+
+    public async doesCommandExist(command: string, appId: string): Promise<boolean> {
+        return this.commands.has(command);
+    }
+
+    public async enableCommand(command: string, appId: string): Promise<void> {}
+
+    public async disableCommand(command: string, appId: string): Promise<void> {}
+
+    public async modifyCommand(command: ISlashCommand, appId: string): Promise<void> {}
+
+    public restoreCommand(comand: string, appId: string): void {}
+
+    public async registerCommand(command: ISlashCommand, appId: string): Promise<void> {
+        if (this.commands.has(command.command)) {
+            throw new Error(`Command "${command.command}" has already been registered.`);
+        }
+
+        this.commands.set(command.command, command.executor);
+    }
+
+    public async unregisterCommand(command: string, appId: string): Promise<void> {
+        this.commands.delete(command);
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/emailBridge.ts b/packages/apps-engine/tests/test-data/bridges/emailBridge.ts
new file mode 100644
index 000000000000..4a86fc3a3c82
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/emailBridge.ts
@@ -0,0 +1,8 @@
+import type { IEmail } from '../../../src/definition/email';
+import { EmailBridge } from '../../../src/server/bridges/EmailBridge';
+
+export class TestsEmailBridge extends EmailBridge {
+    protected sendEmail(email: IEmail, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/environmentalVariableBridge.ts b/packages/apps-engine/tests/test-data/bridges/environmentalVariableBridge.ts
new file mode 100644
index 000000000000..b7fdc44eb2e7
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/environmentalVariableBridge.ts
@@ -0,0 +1,15 @@
+import { EnvironmentalVariableBridge } from '../../../src/server/bridges/EnvironmentalVariableBridge';
+
+export class TestsEnvironmentalVariableBridge extends EnvironmentalVariableBridge {
+    public getValueByName(envVarName: string, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public isReadable(envVarName: string, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented.');
+    }
+
+    public isSet(envVarName: string, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/httpBridge.ts b/packages/apps-engine/tests/test-data/bridges/httpBridge.ts
new file mode 100644
index 000000000000..396658f395c5
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/httpBridge.ts
@@ -0,0 +1,15 @@
+import type { IHttpResponse } from '../../../src/definition/accessors';
+import type { IHttpBridgeRequestInfo } from '../../../src/server/bridges';
+import { HttpBridge } from '../../../src/server/bridges';
+
+export class TestsHttpBridge extends HttpBridge {
+    public call(info: IHttpBridgeRequestInfo): Promise<IHttpResponse> {
+        return Promise.resolve({
+            url: info.url,
+            method: info.method,
+            statusCode: 200,
+            headers: info.request.headers,
+            content: info.request.content,
+        });
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/internalBridge.ts b/packages/apps-engine/tests/test-data/bridges/internalBridge.ts
new file mode 100644
index 000000000000..84e6755aff09
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/internalBridge.ts
@@ -0,0 +1,16 @@
+import type { ISetting } from '../../../src/definition/settings';
+import type { IInternalBridge } from '../../../src/server/bridges';
+
+export class TestsInternalBridge implements IInternalBridge {
+    public doGetUsernamesOfRoomByIdSync(roomId: string): Array<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public doGetUsernamesOfRoomById(roomId: string): Promise<Array<string>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public doGetWorkspacePublicKey(): Promise<ISetting> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/internalFederationBridge.ts b/packages/apps-engine/tests/test-data/bridges/internalFederationBridge.ts
new file mode 100644
index 000000000000..f3e65d8b029f
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/internalFederationBridge.ts
@@ -0,0 +1,11 @@
+import type { IInternalFederationBridge } from '../../../src/server/bridges';
+
+export class TestsInternalFederationBridge implements IInternalFederationBridge {
+    public async getPrivateKey(): Promise<string> {
+        return 'fake_private-key';
+    }
+
+    public async getPublicKey(): Promise<string> {
+        return 'fake_public-key';
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/livechatBridge.ts b/packages/apps-engine/tests/test-data/bridges/livechatBridge.ts
new file mode 100644
index 000000000000..27a884ea5e51
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/livechatBridge.ts
@@ -0,0 +1,96 @@
+import type { IExtraRoomParams } from '../../../src/definition/accessors/ILivechatCreator';
+import type { IDepartment, ILivechatMessage, ILivechatRoom, ILivechatTransferData, IVisitor } from '../../../src/definition/livechat';
+import type { IMessage } from '../../../src/definition/messages';
+import type { IUser } from '../../../src/definition/users';
+import { LivechatBridge } from '../../../src/server/bridges/LivechatBridge';
+
+export class TestLivechatBridge extends LivechatBridge {
+    public findDepartmentsEnabledWithAgents(appId: string): Promise<Array<IDepartment>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public isOnline(departmentId?: string): boolean {
+        throw new Error('Method not implemented');
+    }
+
+    public isOnlineAsync(departmentId?: string): Promise<boolean> {
+        throw new Error('Method not implemented');
+    }
+
+    public createMessage(message: ILivechatMessage, appId: string): Promise<string> {
+        throw new Error('Method not implemented');
+    }
+
+    public getMessageById(messageId: string, appId: string): Promise<ILivechatMessage> {
+        throw new Error('Method not implemented');
+    }
+
+    public updateMessage(message: ILivechatMessage, appId: string): Promise<void> {
+        throw new Error('Method not implemented');
+    }
+
+    public createVisitor(visitor: IVisitor, appId: string): Promise<string> {
+        throw new Error('Method not implemented');
+    }
+
+    public createAndReturnVisitor(visitor: IVisitor, appId: string): Promise<IVisitor | undefined> {
+        throw new Error('Method not implemented');
+    }
+
+    public transferVisitor(visitor: IVisitor, transferData: ILivechatTransferData, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented');
+    }
+
+    public findVisitors(query: object, appId: string): Promise<Array<IVisitor>> {
+        console.warn('The method AppLivechatBridge.findVisitors is deprecated. Please consider using its alternatives');
+        throw new Error('Method not implemented');
+    }
+
+    public findVisitorById(id: string, appId: string): Promise<IVisitor | undefined> {
+        throw new Error('Method not implemented');
+    }
+
+    public findVisitorByEmail(email: string, appId: string): Promise<IVisitor | undefined> {
+        throw new Error('Method not implemented');
+    }
+
+    public findVisitorByToken(token: string, appId: string): Promise<IVisitor | undefined> {
+        throw new Error('Method not implemented');
+    }
+
+    public findVisitorByPhoneNumber(phoneNumber: string, appId: string): Promise<IVisitor | undefined> {
+        throw new Error('Method not implemented');
+    }
+
+    public createRoom(visitor: IVisitor, agent: IUser, appId: string, extraParams?: IExtraRoomParams): Promise<ILivechatRoom> {
+        throw new Error('Method not implemented');
+    }
+
+    public closeRoom(room: ILivechatRoom, comment: string, closer: IUser | undefined, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented');
+    }
+
+    public findRooms(visitor: IVisitor, departmentId: string | null, appId: string): Promise<Array<ILivechatRoom>> {
+        throw new Error('Method not implemented');
+    }
+
+    public findOpenRoomsByAgentId(agentId: string, appId: string): Promise<ILivechatRoom[]> {
+        throw new Error('Method not implemented');
+    }
+
+    public countOpenRoomsByAgentId(agentId: string, appId: string): Promise<number> {
+        throw new Error('Method not implemented');
+    }
+
+    public findDepartmentByIdOrName(value: string, appId: string): Promise<IDepartment | undefined> {
+        throw new Error('Method not implemented');
+    }
+
+    public _fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IMessage>> {
+        throw new Error('Method not implemented');
+    }
+
+    public setCustomFields(data: { token: IVisitor['token']; key: string; value: string; overwrite: boolean }, appId: string): Promise<number> {
+        throw new Error('Method not implemented');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/messageBridge.ts b/packages/apps-engine/tests/test-data/bridges/messageBridge.ts
new file mode 100644
index 000000000000..9f21b37e6855
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/messageBridge.ts
@@ -0,0 +1,43 @@
+import type { IMessage, Reaction } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import type { IUser } from '../../../src/definition/users';
+import { MessageBridge } from '../../../src/server/bridges';
+import type { ITypingDescriptor } from '../../../src/server/bridges/MessageBridge';
+
+export class TestsMessageBridge extends MessageBridge {
+    public create(message: IMessage, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getById(messageId: string, appId: string): Promise<IMessage> {
+        throw new Error('Method not implemented.');
+    }
+
+    public update(message: IMessage, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public notifyUser(user: IUser, message: IMessage, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public notifyRoom(room: IRoom, message: IMessage, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public delete(message: IMessage, user: IUser, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public typing(options: ITypingDescriptor): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public addReaction(_messageId: string, _userId: string, _reaction: Reaction): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public removeReaction(_messageId: string, _userId: string, _reaction: Reaction): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/moderationBridge.ts b/packages/apps-engine/tests/test-data/bridges/moderationBridge.ts
new file mode 100644
index 000000000000..ac03b101aeb1
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/moderationBridge.ts
@@ -0,0 +1,17 @@
+import type { IMessage } from '../../../src/definition/messages';
+import type { IUser } from '../../../src/definition/users';
+import { ModerationBridge } from '../../../src/server/bridges';
+
+export class TestsModerationBridge extends ModerationBridge {
+    public report(messageId: string, description: string, userId: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public dismissReportsByMessageId(messageId: IMessage['id'], reason: string, action: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public dismissReportsByUserId(userId: IUser['id'], reason: string, action: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/persisBridge.ts b/packages/apps-engine/tests/test-data/bridges/persisBridge.ts
new file mode 100644
index 000000000000..6176cbae8f14
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/persisBridge.ts
@@ -0,0 +1,40 @@
+import type { RocketChatAssociationRecord } from '../../../src/definition/metadata';
+import { PersistenceBridge } from '../../../src/server/bridges';
+
+export class TestsPersisBridge extends PersistenceBridge {
+    public purge(appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public create(data: any, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public createWithAssociations(data: object, associations: Array<RocketChatAssociationRecord>, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public readById(id: string, appId: string): Promise<object> {
+        throw new Error('Method not implemented.');
+    }
+
+    public readByAssociations(associations: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public remove(id: string, appId: string): Promise<object> {
+        throw new Error('Method not implemented.');
+    }
+
+    public removeByAssociations(associations: Array<RocketChatAssociationRecord>, appId: string): Promise<Array<object>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public update(id: string, data: object, upsert: boolean, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public updateByAssociations(associations: Array<RocketChatAssociationRecord>, data: object, upsert: boolean, appId: string): Promise<string> {
+        throw new Error('Method not implemented');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/roleBridge.ts b/packages/apps-engine/tests/test-data/bridges/roleBridge.ts
new file mode 100644
index 000000000000..ddeefcfe6f75
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/roleBridge.ts
@@ -0,0 +1,12 @@
+import type { IRole } from '../../../src/definition/roles';
+import { RoleBridge } from '../../../src/server/bridges';
+
+export class TestsRoleBridge extends RoleBridge {
+    public getOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getCustomRoles(appId: string): Promise<Array<IRole>> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/roomBridge.ts b/packages/apps-engine/tests/test-data/bridges/roomBridge.ts
new file mode 100644
index 000000000000..e5e7408b3d9d
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/roomBridge.ts
@@ -0,0 +1,67 @@
+import type { IMessage, IMessageRaw } from '../../../src/definition/messages';
+import type { IRoom } from '../../../src/definition/rooms';
+import type { IUser } from '../../../src/definition/users';
+import { RoomBridge } from '../../../src/server/bridges';
+import type { GetMessagesOptions } from '../../../src/server/bridges/RoomBridge';
+
+export class TestsRoomBridge extends RoomBridge {
+    public create(room: IRoom, members: Array<string>, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getById(roomId: string, appId: string): Promise<IRoom> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getCreatorById(roomId: string, appId: string): Promise<IUser> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getByName(roomName: string, appId: string): Promise<IRoom> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getCreatorByName(roomName: string, appId: string): Promise<IUser> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getDirectByUsernames(username: Array<string>, appId: string): Promise<IRoom> {
+        throw new Error('Method not implemented');
+    }
+
+    public getMembers(roomName: string, appId: string): Promise<Array<IUser>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getMessages(roomId: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]> {
+        throw new Error('Method not implemented.');
+    }
+
+    public update(room: IRoom, members: Array<string>, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public createDiscussion(room: IRoom, parentMessage: IMessage, reply: string, members: Array<string>, appId: string): Promise<string> {
+        throw new Error('Method not implemented.');
+    }
+
+    public delete(roomId: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getLeaders(roomId: string, appId: string): Promise<Array<IUser>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getModerators(roomId: string, appId: string): Promise<Array<IUser>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getOwners(roomId: string, appId: string): Promise<Array<IUser>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public removeUsers(roomId: string, usernames: string[], appId: string): Promise<void> {
+        throw new Error('Method not implemented');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/schedulerBridge.ts b/packages/apps-engine/tests/test-data/bridges/schedulerBridge.ts
new file mode 100644
index 000000000000..c694f9799dcd
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/schedulerBridge.ts
@@ -0,0 +1,24 @@
+import type { IOnetimeSchedule, IProcessor, IRecurringSchedule } from '../../../src/definition/scheduler';
+import { SchedulerBridge } from '../../../src/server/bridges';
+
+export class TestSchedulerBridge extends SchedulerBridge {
+    public async registerProcessors(processors: Array<IProcessor>, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public async scheduleOnce(job: IOnetimeSchedule, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public async scheduleRecurring(job: IRecurringSchedule, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public async cancelJob(jobId: string, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public async cancelAllJobs(appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/serverSettingBridge.ts b/packages/apps-engine/tests/test-data/bridges/serverSettingBridge.ts
new file mode 100644
index 000000000000..74e6e1f71614
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/serverSettingBridge.ts
@@ -0,0 +1,41 @@
+import { SettingType, type ISetting } from '../../../src/definition/settings';
+import { ServerSettingBridge } from '../../../src/server/bridges';
+
+export class TestsServerSettingBridge extends ServerSettingBridge {
+    public getAll(appId: string): Promise<Array<ISetting>> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getOneById(id: string, appId: string): Promise<ISetting> {
+        return Promise.resolve({
+            id,
+            packageValue: 'packageValue',
+            value: 'value',
+            i18nLabel: 'i18nLabel',
+            i18nDescription: 'i18nDescription',
+            required: true,
+            public: true,
+            type: SettingType.STRING,
+        });
+    }
+
+    public hideGroup(name: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public hideSetting(id: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public isReadableById(id: string, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented.');
+    }
+
+    public updateOne(setting: ISetting, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    public incrementValue(id: ISetting['id'], value: number, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/threadBridge.ts b/packages/apps-engine/tests/test-data/bridges/threadBridge.ts
new file mode 100644
index 000000000000..1fc6098c1726
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/threadBridge.ts
@@ -0,0 +1,8 @@
+import type { IMessage } from '../../../src/definition/messages';
+import { ThreadBridge } from '../../../src/server/bridges/ThreadBridge';
+
+export class TestsThreadBridge extends ThreadBridge {
+    public getById(messageId: string, appId: string): Promise<Array<IMessage>> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/uiIntegrationBridge.ts b/packages/apps-engine/tests/test-data/bridges/uiIntegrationBridge.ts
new file mode 100644
index 000000000000..9fda1b553ae5
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/uiIntegrationBridge.ts
@@ -0,0 +1,9 @@
+import type { IUIKitInteractionParam } from '../../../src/definition/accessors/IUIController';
+import type { IUser } from '../../../src/definition/users';
+import { UiInteractionBridge } from '../../../src/server/bridges';
+
+export class TestsUiIntegrationBridge extends UiInteractionBridge {
+    public async notifyUser(user: IUser, interaction: IUIKitInteractionParam, appId: string) {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/uploadBridge.ts b/packages/apps-engine/tests/test-data/bridges/uploadBridge.ts
new file mode 100644
index 000000000000..630c61663b58
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/uploadBridge.ts
@@ -0,0 +1,17 @@
+import type { IUpload } from '../../../src/definition/uploads';
+import type { IUploadDetails } from '../../../src/definition/uploads/IUploadDetails';
+import { UploadBridge } from '../../../src/server/bridges/UploadBridge';
+
+export class TestUploadBridge extends UploadBridge {
+    public getById(id: string, appId: string): Promise<IUpload> {
+        throw new Error('Method not implemented');
+    }
+
+    public getBuffer(upload: IUpload, appId: string): Promise<Buffer> {
+        throw new Error('Method not implemented');
+    }
+
+    public createUpload(details: IUploadDetails, buffer: Buffer, appId: string): Promise<IUpload> {
+        throw new Error('Method not implemented');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/userBridge.ts b/packages/apps-engine/tests/test-data/bridges/userBridge.ts
new file mode 100644
index 000000000000..c9399f5b6c79
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/userBridge.ts
@@ -0,0 +1,44 @@
+import type { IUser, UserType } from '../../../src/definition/users';
+import { UserBridge } from '../../../src/server/bridges';
+
+export class TestsUserBridge extends UserBridge {
+    public getById(id: string, appId: string): Promise<IUser> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getByUsername(username: string, appId: string): Promise<IUser> {
+        throw new Error('Method not implemented.');
+    }
+
+    public create(user: Partial<IUser>): Promise<string> {
+        throw new Error('Method not implemented');
+    }
+
+    public getActiveUserCount(): Promise<number> {
+        throw new Error('Method not implemented.');
+    }
+
+    public remove(user: IUser, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented.');
+    }
+
+    public getAppUser(appId?: string): Promise<IUser> {
+        throw new Error('Method not implemented.');
+    }
+
+    public async update(user: IUser, updates: Partial<IUser>, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented');
+    }
+
+    public async deleteUsersCreatedByApp(appId: string, type: UserType.BOT): Promise<boolean> {
+        throw new Error('Method not implemented');
+    }
+
+    protected getUserUnreadMessageCount(uid: string): Promise<number> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected deactivate(userId: IUser['id'], confirmRelinquish: boolean, appId: string): Promise<boolean> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/bridges/videoConferenceBridge.ts b/packages/apps-engine/tests/test-data/bridges/videoConferenceBridge.ts
new file mode 100644
index 000000000000..b49f3ff87403
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/videoConferenceBridge.ts
@@ -0,0 +1,25 @@
+import type { IVideoConfProvider } from '../../../src/definition/videoConfProviders';
+import type { VideoConference, AppVideoConference } from '../../../src/definition/videoConferences';
+import { VideoConferenceBridge } from '../../../src/server/bridges';
+
+export class TestsVideoConferenceBridge extends VideoConferenceBridge {
+    public getById(callId: string, appId: string): Promise<VideoConference> {
+        throw new Error('Method not implemented.');
+    }
+
+    public create(call: AppVideoConference, appId: string): Promise<string> {
+        throw new Error('Method not implemented');
+    }
+
+    public update(call: VideoConference, appId: string): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected registerProvider(info: IVideoConfProvider, appId: string): Promise<void> {
+        return Promise.resolve();
+    }
+
+    protected unRegisterProvider(info: IVideoConfProvider, appId: string): Promise<void> {
+        return Promise.resolve();
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/misc/fake-library-file.d.ts b/packages/apps-engine/tests/test-data/misc/fake-library-file.d.ts
new file mode 100644
index 000000000000..43e6ba460299
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/misc/fake-library-file.d.ts
@@ -0,0 +1,5 @@
+export declare class FakeLibraryClass {
+    startWork(): boolean;
+
+    stopWorking(): boolean;
+}
diff --git a/packages/apps-engine/tests/test-data/storage/TestSourceStorage.ts b/packages/apps-engine/tests/test-data/storage/TestSourceStorage.ts
new file mode 100644
index 000000000000..fab532a8fdc6
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/storage/TestSourceStorage.ts
@@ -0,0 +1,20 @@
+import type { IAppStorageItem } from '../../../src/server/storage';
+import { AppSourceStorage } from '../../../src/server/storage';
+
+export class TestSourceStorage extends AppSourceStorage {
+    public async store(item: IAppStorageItem, zip: Buffer): Promise<string> {
+        return 'app_package_path';
+    }
+
+    public async fetch(item: IAppStorageItem): Promise<Buffer> {
+        return Buffer.from('buffer');
+    }
+
+    public async update(item: IAppStorageItem, zip: Buffer): Promise<string> {
+        return 'updated_path';
+    }
+
+    public async remove(item: IAppStorageItem): Promise<void> {
+        // yup
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/storage/logStorage.ts b/packages/apps-engine/tests/test-data/storage/logStorage.ts
new file mode 100644
index 000000000000..5ddb90e56753
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/storage/logStorage.ts
@@ -0,0 +1,25 @@
+import type { ILoggerStorageEntry } from '../../../src/server/logging';
+import type { IAppLogStorageFindOptions } from '../../../src/server/storage';
+import { AppLogStorage } from '../../../src/server/storage';
+
+export class TestsAppLogStorage extends AppLogStorage {
+    constructor() {
+        super('nothing');
+    }
+
+    public find(query: { [field: string]: any }, options?: IAppLogStorageFindOptions): Promise<Array<ILoggerStorageEntry>> {
+        return Promise.resolve([]);
+    }
+
+    public storeEntries(logEntry: ILoggerStorageEntry): Promise<ILoggerStorageEntry> {
+        return Promise.resolve({} as ILoggerStorageEntry);
+    }
+
+    public getEntriesFor(appId: string): Promise<Array<ILoggerStorageEntry>> {
+        return Promise.resolve([]);
+    }
+
+    public removeEntriesFor(appId: string): Promise<void> {
+        return Promise.resolve();
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/storage/storage.ts b/packages/apps-engine/tests/test-data/storage/storage.ts
new file mode 100644
index 000000000000..bbb49c590812
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/storage/storage.ts
@@ -0,0 +1,93 @@
+import * as Datastore from 'nedb';
+
+import type { IAppStorageItem } from '../../../src/server/storage';
+import { AppMetadataStorage } from '../../../src/server/storage';
+
+export class TestsAppStorage extends AppMetadataStorage {
+    private db: Datastore;
+
+    constructor() {
+        super('nedb');
+        this.db = new Datastore({ filename: 'tests/test-data/dbs/apps.nedb', autoload: true });
+        this.db.ensureIndex({ fieldName: 'id', unique: true });
+    }
+
+    public create(item: IAppStorageItem): Promise<IAppStorageItem> {
+        return new Promise((resolve, reject) => {
+            item.createdAt = new Date();
+            item.updatedAt = new Date();
+
+            this.db.findOne({ $or: [{ id: item.id }, { 'info.nameSlug': item.info.nameSlug }] }, (err: Error, doc: IAppStorageItem) => {
+                if (err) {
+                    reject(err);
+                } else if (doc) {
+                    reject(new Error('App already exists.'));
+                } else {
+                    this.db.insert(item, (err2: Error, doc2: IAppStorageItem) => {
+                        if (err2) {
+                            reject(err2);
+                        } else {
+                            resolve(doc2);
+                        }
+                    });
+                }
+            });
+        });
+    }
+
+    public retrieveOne(id: string): Promise<IAppStorageItem> {
+        return new Promise((resolve, reject) => {
+            this.db.findOne({ id }, (err: Error, doc: IAppStorageItem) => {
+                if (err) {
+                    reject(err);
+                } else if (doc) {
+                    resolve(doc);
+                } else {
+                    reject(new Error(`No App found by the id: ${id}`));
+                }
+            });
+        });
+    }
+
+    public retrieveAll(): Promise<Map<string, IAppStorageItem>> {
+        return new Promise((resolve, reject) => {
+            this.db.find({}, (err: Error, docs: Array<IAppStorageItem>) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    const items = new Map<string, IAppStorageItem>();
+
+                    docs.forEach((i) => items.set(i.id, i));
+
+                    resolve(items);
+                }
+            });
+        });
+    }
+
+    public update(item: IAppStorageItem): Promise<IAppStorageItem> {
+        return new Promise((resolve, reject) => {
+            this.db.update({ id: item.id }, item, {}, (err: Error, numOfUpdated: number) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    this.retrieveOne(item.id)
+                        .then((updated: IAppStorageItem) => resolve(updated))
+                        .catch((err2: Error) => reject(err2));
+                }
+            });
+        });
+    }
+
+    public remove(id: string): Promise<{ success: boolean }> {
+        return new Promise((resolve, reject) => {
+            this.db.remove({ id }, (err: Error) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve({ success: true });
+                }
+            });
+        });
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/utilities.ts b/packages/apps-engine/tests/test-data/utilities.ts
new file mode 100644
index 000000000000..a565702bebe7
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/utilities.ts
@@ -0,0 +1,492 @@
+import { AppStatus } from '../../src/definition/AppStatus';
+import type { IHttp, IModify, IPersistence, IRead } from '../../src/definition/accessors';
+import { HttpStatusCode } from '../../src/definition/accessors';
+import type { IApi, IApiRequest, IApiResponse } from '../../src/definition/api';
+import { ApiSecurity, ApiVisibility } from '../../src/definition/api';
+import type { IApiEndpointInfo } from '../../src/definition/api/IApiEndpointInfo';
+import type { IMessage, IMessageAttachment, IMessageRaw } from '../../src/definition/messages';
+import type { IRoom } from '../../src/definition/rooms';
+import { RoomType } from '../../src/definition/rooms';
+import type { ISetting } from '../../src/definition/settings';
+import { SettingType } from '../../src/definition/settings';
+import type { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem, SlashCommandContext } from '../../src/definition/slashcommands';
+import type { IUser } from '../../src/definition/users';
+import { UserStatusConnection, UserType } from '../../src/definition/users';
+import type { IVideoConferenceOptions, IVideoConfProvider, VideoConfData, VideoConfDataExtended } from '../../src/definition/videoConfProviders';
+import type { AppVideoConference } from '../../src/definition/videoConferences/AppVideoConference';
+import type { VideoConference } from '../../src/definition/videoConferences/IVideoConference';
+import { VideoConferenceStatus } from '../../src/definition/videoConferences/IVideoConference';
+import type { IVideoConferenceUser } from '../../src/definition/videoConferences/IVideoConferenceUser';
+import type { AppManager } from '../../src/server/AppManager';
+import { ProxiedApp } from '../../src/server/ProxiedApp';
+import type { AppBridges } from '../../src/server/bridges';
+import { AppPackageParser } from '../../src/server/compiler';
+import type {
+    AppExternalComponentManager,
+    AppSchedulerManager,
+    AppSettingsManager,
+    AppSlashCommandManager,
+    AppVideoConfProviderManager,
+} from '../../src/server/managers';
+import type { AppRuntimeManager } from '../../src/server/managers/AppRuntimeManager';
+import type { UIActionButtonManager } from '../../src/server/managers/UIActionButtonManager';
+import type { DenoRuntimeSubprocessController } from '../../src/server/runtime/deno/AppsEngineDenoRuntime';
+import type { AppLogStorage, AppMetadataStorage, AppSourceStorage, IAppStorageItem } from '../../src/server/storage';
+import { TestsAppBridges } from './bridges/appBridges';
+import { TestSourceStorage } from './storage/TestSourceStorage';
+import { TestsAppLogStorage } from './storage/logStorage';
+import { TestsAppStorage } from './storage/storage';
+
+export class TestInfastructureSetup {
+    private appStorage: TestsAppStorage;
+
+    private logStorage: TestsAppLogStorage;
+
+    private bridges: TestsAppBridges;
+
+    private sourceStorage: TestSourceStorage;
+
+    private appManager: AppManager;
+
+    private runtimeManager: AppRuntimeManager;
+
+    constructor() {
+        this.appStorage = new TestsAppStorage();
+        this.logStorage = new TestsAppLogStorage();
+        this.bridges = new TestsAppBridges();
+        this.sourceStorage = new TestSourceStorage();
+        this.runtimeManager = {
+            startRuntimeForApp: async () => {
+                return {} as DenoRuntimeSubprocessController;
+            },
+            runInSandbox: async () => {
+                return {} as unknown as Promise<unknown>;
+            },
+            stopRuntime: () => {},
+        } as unknown as AppRuntimeManager;
+
+        this.appManager = {
+            getParser() {
+                if (!this.parser) {
+                    this.parser = new AppPackageParser();
+                }
+
+                return this.parser;
+            },
+            getBridges: () => {
+                return this.bridges as AppBridges;
+            },
+            getCommandManager() {
+                return {} as AppSlashCommandManager;
+            },
+            getExternalComponentManager() {
+                return {} as AppExternalComponentManager;
+            },
+            getOneById(appId: string): ProxiedApp {
+                return appId === 'failMePlease' ? undefined : TestData.getMockApp(appId, 'testing');
+            },
+            getLogStorage(): AppLogStorage {
+                return new TestsAppLogStorage();
+            },
+            getSchedulerManager() {
+                return {} as AppSchedulerManager;
+            },
+            getUIActionButtonManager() {
+                return {} as UIActionButtonManager;
+            },
+            getVideoConfProviderManager() {
+                return {} as AppVideoConfProviderManager;
+            },
+            getSettingsManager() {
+                return {} as AppSettingsManager;
+            },
+            getRuntime: () => {
+                return this.runtimeManager;
+            },
+        } as unknown as AppManager;
+    }
+
+    public getAppStorage(): AppMetadataStorage {
+        return this.appStorage;
+    }
+
+    public getLogStorage(): AppLogStorage {
+        return this.logStorage;
+    }
+
+    public getAppBridges(): AppBridges {
+        return this.bridges;
+    }
+
+    public getSourceStorage(): AppSourceStorage {
+        return this.sourceStorage;
+    }
+
+    public getMockManager(): AppManager {
+        return this.appManager;
+    }
+}
+
+const date = new Date();
+
+const DEFAULT_ATTACHMENT = {
+    color: '#00b2b2',
+    collapsed: false,
+    text: 'Just an attachment that is used for testing',
+    timestampLink: 'https://google.com/',
+    thumbnailUrl: 'https://avatars0.githubusercontent.com/u/850391?s=88&v=4',
+    author: {
+        name: 'Author Name',
+        link: 'https://github.com/graywolf336',
+        icon: 'https://avatars0.githubusercontent.com/u/850391?s=88&v=4',
+    },
+    title: {
+        value: 'Attachment Title',
+        link: 'https://github.com/RocketChat',
+        displayDownloadLink: false,
+    },
+    imageUrl: 'https://rocket.chat/images/default/logo.svg',
+    audioUrl: 'http://www.w3schools.com/tags/horse.mp3',
+    videoUrl: 'http://www.w3schools.com/tags/movie.mp4',
+    fields: [
+        {
+            short: true,
+            title: 'Test',
+            value: 'Testing out something or other',
+        },
+        {
+            short: true,
+            title: 'Another Test',
+            value: '[Link](https://google.com/) something and this and that.',
+        },
+    ],
+};
+export class TestData {
+    public static getDate(): Date {
+        return date;
+    }
+
+    public static getSetting(id?: string): ISetting {
+        return {
+            id: id || 'testing',
+            type: SettingType.STRING,
+            packageValue: 'The packageValue',
+            required: false,
+            public: false,
+            i18nLabel: 'Testing',
+        };
+    }
+
+    public static getUser(id?: string, username?: string): IUser {
+        return {
+            id: id || 'BBxwgCBzLeMC6esTb',
+            username: username || 'testing-user',
+            name: 'Testing User',
+            emails: [],
+            type: UserType.USER,
+            isEnabled: true,
+            roles: ['admin'],
+            status: 'online',
+            statusConnection: UserStatusConnection.ONLINE,
+            utcOffset: -5,
+            createdAt: date,
+            updatedAt: new Date(),
+            lastLoginAt: new Date(),
+        };
+    }
+
+    public static getRoom(id?: string, slugifiedName?: string): IRoom {
+        return {
+            id: id || 'bTse6CMeLzBCgwxBB',
+            slugifiedName: slugifiedName || 'testing-room',
+            displayName: 'Testing Room',
+            type: RoomType.CHANNEL,
+            creator: TestData.getUser(),
+            usernames: [TestData.getUser().username],
+            isDefault: true,
+            isReadOnly: false,
+            displaySystemMessages: true,
+            messageCount: 145,
+            createdAt: date,
+            updatedAt: new Date(),
+            lastModifiedAt: new Date(),
+        };
+    }
+
+    public static getMessage(id?: string, text?: string): IMessage {
+        return {
+            id: id || '4bShvoOXqB',
+            room: TestData.getRoom(),
+            sender: TestData.getUser(),
+            text: 'This is just a test, do not be alarmed',
+            createdAt: date,
+            updatedAt: new Date(),
+            editor: TestData.getUser(),
+            editedAt: new Date(),
+            emoji: ':see_no_evil:',
+            avatarUrl: 'https://avatars0.githubusercontent.com/u/850391?s=88&v=4',
+            alias: 'Testing Bot',
+            attachments: [this.createAttachment()],
+        };
+    }
+
+    public static getMessageRaw(id?: string, text?: string): IMessageRaw {
+        const editorUser = TestData.getUser();
+        const senderUser = TestData.getUser();
+
+        return {
+            id: id || '4bShvoOXqB',
+            roomId: TestData.getRoom().id,
+            sender: {
+                _id: senderUser.id,
+                username: senderUser.username,
+                name: senderUser?.name,
+            },
+            text: text || 'This is just a test, do not be alarmed',
+            createdAt: date,
+            updatedAt: new Date(),
+            editor: {
+                _id: editorUser.id,
+                username: editorUser.username,
+            },
+            editedAt: new Date(),
+            emoji: ':see_no_evil:',
+            avatarUrl: 'https://avatars0.githubusercontent.com/u/850391?s=88&v=4',
+            alias: 'Testing Bot',
+            attachments: [this.createAttachment()],
+        };
+    }
+
+    private static createAttachment(attachment?: IMessageAttachment): IMessageAttachment {
+        attachment = attachment || DEFAULT_ATTACHMENT;
+        return {
+            timestamp: new Date(),
+            ...attachment,
+        };
+    }
+
+    public static getSlashCommand(command?: string): ISlashCommand {
+        return {
+            command: command || 'testing-cmd',
+            i18nParamsExample: 'justATest',
+            i18nDescription: 'justATest_Description',
+            permission: 'create-c',
+            providesPreview: true,
+            executor: (context: SlashCommandContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<void> => {
+                return Promise.resolve();
+            },
+            previewer: (context: SlashCommandContext, read: IRead, modify: IModify, http: IHttp, persis: IPersistence): Promise<ISlashCommandPreview> => {
+                return Promise.resolve({
+                    i18nTitle: 'my i18nTitle',
+                    items: [],
+                } as ISlashCommandPreview);
+            },
+            executePreviewItem: (
+                item: ISlashCommandPreviewItem,
+                context: SlashCommandContext,
+                read: IRead,
+                modify: IModify,
+                http: IHttp,
+                persis: IPersistence,
+            ): Promise<void> => {
+                return Promise.resolve();
+            },
+        };
+    }
+
+    public static getApi(path = 'testing-path', visibility: ApiVisibility = ApiVisibility.PUBLIC, security: ApiSecurity = ApiSecurity.UNSECURE): IApi {
+        return {
+            visibility,
+            security,
+            endpoints: [
+                {
+                    path,
+                    // The move to the Deno runtime now requires us to manually set what methods are available
+                    _availableMethods: ['get'],
+                    get(
+                        request: IApiRequest,
+                        endpoint: IApiEndpointInfo,
+                        read: IRead,
+                        modify: IModify,
+                        http: IHttp,
+                        persis: IPersistence,
+                    ): Promise<IApiResponse> {
+                        return Promise.resolve({
+                            status: HttpStatusCode.OK,
+                        });
+                    },
+                },
+            ],
+        };
+    }
+
+    public static getVideoConfProvider(name = 'test'): IVideoConfProvider {
+        return {
+            name,
+
+            async generateUrl(call: VideoConfData): Promise<string> {
+                return `${name}/${call._id}`;
+            },
+
+            async customizeUrl(call: VideoConfDataExtended, user: IVideoConferenceUser | undefined, options: IVideoConferenceOptions): Promise<string> {
+                return `${name}/${call._id}#${user ? user.username : ''}`;
+            },
+        };
+    }
+
+    public static getInvalidConfProvider(name = 'invalid'): IVideoConfProvider {
+        return {
+            name,
+
+            async isFullyConfigured(): Promise<boolean> {
+                return false;
+            },
+
+            async generateUrl(call: VideoConfData): Promise<string> {
+                return ``;
+            },
+
+            async customizeUrl(call: VideoConfDataExtended, user: IVideoConferenceUser | undefined, options: IVideoConferenceOptions): Promise<string> {
+                return ``;
+            },
+        };
+    }
+
+    public static getFullVideoConfProvider(name = 'test'): IVideoConfProvider {
+        return {
+            name,
+
+            capabilities: {
+                mic: true,
+                cam: true,
+                title: true,
+            },
+
+            async isFullyConfigured(): Promise<boolean> {
+                return true;
+            },
+
+            async generateUrl(call: VideoConfData): Promise<string> {
+                return `${name}/${call._id}`;
+            },
+
+            async customizeUrl(call: VideoConfDataExtended, user: IVideoConferenceUser | undefined, options: IVideoConferenceOptions): Promise<string> {
+                return `${name}/${call._id}#${user ? user.username : ''}`;
+            },
+        };
+    }
+
+    public static getVideoConferenceUser(): IVideoConferenceUser {
+        return {
+            _id: 'callerId',
+            username: 'caller',
+            name: 'John Caller',
+        };
+    }
+
+    public static getVideoConfData(): VideoConfData {
+        return {
+            _id: 'first-call',
+            type: 'videoconference',
+            rid: 'roomId',
+            createdBy: this.getVideoConferenceUser(),
+            title: 'Test Call',
+        };
+    }
+
+    public static getVideoConfDataExtended(providerName = 'test'): VideoConfDataExtended {
+        return {
+            ...this.getVideoConfData(),
+            url: '${providerName}/first-call',
+        };
+    }
+
+    public static getAppVideoConference(): AppVideoConference {
+        return {
+            rid: 'roomId',
+            createdBy: 'userId',
+            title: 'Video Conference',
+            providerName: 'test',
+        };
+    }
+
+    public static getVideoConference(): VideoConference {
+        return {
+            _id: 'first-call',
+            _updatedAt: new Date(),
+            type: 'videoconference',
+            rid: 'roomId',
+            users: [
+                {
+                    _id: 'johnId',
+                    name: 'John Doe',
+                    username: 'mrdoe',
+                    ts: new Date(),
+                },
+                {
+                    _id: 'janeId',
+                    name: 'Jane Doe',
+                    username: 'msdoe',
+                    ts: new Date(),
+                },
+            ],
+            status: VideoConferenceStatus.STARTED,
+            messages: {
+                started: 'messageId',
+            },
+            url: 'video-conf/first-call',
+            createdBy: {
+                _id: 'johnId',
+                name: 'John Doe',
+                username: 'mrdoe',
+            },
+            createdAt: new Date(),
+            title: 'Video Conference',
+            anonymousUsers: 0,
+            providerName: 'test',
+        };
+    }
+
+    public static getOAuthApp(isToCreate: boolean) {
+        const OAuthApp = {
+            _id: '4526fcab-b068-4dcc-b208-4fff599165b0',
+            name: 'name-test',
+            active: true,
+            clientId: 'clientId-test',
+            clientSecret: 'clientSecret-test',
+            redirectUri: 'redirectUri-test',
+            appId: 'app-123',
+            _createdAt: '2022-07-11T14:30:48.937Z',
+            _createdBy: {
+                _id: 'Em5TQwMD4P7AmTs73',
+                username: 'testa.bot',
+            },
+            _updatedAt: '2022-07-11T14:30:48.937Z',
+        };
+
+        if (isToCreate) {
+            delete OAuthApp._id;
+            delete OAuthApp._createdAt;
+            delete OAuthApp._createdBy;
+            delete OAuthApp._updatedAt;
+            delete OAuthApp.appId;
+        }
+        return OAuthApp;
+    }
+
+    public static getMockApp(id: string, name: string): ProxiedApp {
+        return new ProxiedApp({} as AppManager, { status: AppStatus.UNKNOWN, info: { id, name } } as IAppStorageItem, {} as DenoRuntimeSubprocessController);
+    }
+}
+
+export class SimpleClass {
+    private readonly world: string;
+
+    constructor(world = 'Earith') {
+        this.world = world;
+    }
+
+    public getWorld(): string {
+        return this.world;
+    }
+}
diff --git a/packages/apps-engine/tsconfig-lint.json b/packages/apps-engine/tsconfig-lint.json
new file mode 100644
index 000000000000..c63e4a8bb8cd
--- /dev/null
+++ b/packages/apps-engine/tsconfig-lint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "allowJs": true
+    },
+    "include": ["./scripts/*", "./src/**/*", "./tests/**/*", "./gulpfile.js"]
+}
diff --git a/packages/apps-engine/tsconfig.json b/packages/apps-engine/tsconfig.json
new file mode 100644
index 000000000000..fe9e53b01cb8
--- /dev/null
+++ b/packages/apps-engine/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "sourceMap": true,
+        "target": "es6",
+        "module": "commonjs",
+        "declaration": true,
+        "noImplicitAny": true,
+        "noUnusedLocals": true,
+        "removeComments": false,
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
+        "moduleResolution": "node",
+        "types": ["node"],
+        "lib": ["es2017", "dom"],
+        "rootDir": "./src",
+        "outDir": ".",
+        "skipLibCheck": true
+    },
+    "exclude": ["deno-runtime"],
+    "include": ["./src/**/*"]
+}
diff --git a/packages/apps-engine/turbo.json b/packages/apps-engine/turbo.json
new file mode 100644
index 000000000000..7b22f165150b
--- /dev/null
+++ b/packages/apps-engine/turbo.json
@@ -0,0 +1,9 @@
+{
+    "extends": ["//"],
+    "tasks": {
+        "build": {
+            "dependsOn": ["^build"],
+            "outputs": ["client/**", "definition/**", "deno-runtime/**", "lib/**", "scripts/**", "server/**"]
+        }
+    }
+}
diff --git a/packages/apps-engine/typedoc.json b/packages/apps-engine/typedoc.json
new file mode 100644
index 000000000000..07880a7a8ab1
--- /dev/null
+++ b/packages/apps-engine/typedoc.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "https://typedoc.org/schema.json",
+    "name": "Rocket.Chat Apps TypeScript Definition",
+    "entryPointStrategy": "expand",
+    "entryPoints": ["./src/definition"],
+    "excludePrivate": true,
+    "out": "docs",
+    "gitRevision": "master"
+}
diff --git a/packages/apps/package.json b/packages/apps/package.json
index af88aff27664..331893ac4d72 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -18,7 +18,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^"
 	}
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 2ee07033e732..77277f6a4b87 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -6,6 +6,7 @@
 		"@babel/core": "~7.22.20",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
@@ -32,7 +33,6 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 0db23760066b..f210ec03895a 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -3,6 +3,7 @@
 	"name": "@rocket.chat/core-typings",
 	"version": "6.14.0-develop",
 	"devDependencies": {
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
@@ -22,7 +23,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 975051db933f..320f0ab03dbf 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -63,7 +63,7 @@
     "@babel/preset-env": "~7.22.20",
     "@babel/preset-react": "~7.22.15",
     "@babel/preset-typescript": "~7.22.15",
-    "@rocket.chat/apps-engine": "1.45.0-alpha.868",
+    "@rocket.chat/apps-engine": "workspace:^",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/fuselage": "^0.59.1",
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
index 7235a916385d..a75e72916a5c 100644
--- a/packages/jwt/package.json
+++ b/packages/jwt/package.json
@@ -28,5 +28,8 @@
 	},
 	"volta": {
 		"extends": "../../package.json"
+	},
+	"installConfig": {
+		"hoistingLimits": "workspaces"
 	}
 }
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 30a448980c9b..30753325cdf4 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -2,6 +2,7 @@
 	"name": "@rocket.chat/rest-typings",
 	"version": "6.14.0-develop",
 	"devDependencies": {
+		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
@@ -23,7 +24,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.868",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index f6c5de3e9a44..3ee9382dfd86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -985,6 +985,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
+  dependencies:
+    "@babel/highlight": ^7.24.7
+    picocolors: ^1.0.0
+  checksum: 830e62cd38775fdf84d612544251ce773d544a8e63df667728cc9e0126eeef14c6ebda79be0f0bc307e8318316b7f58c27ce86702e0a1f5c321d842eb38ffda4
+  languageName: node
+  linkType: hard
+
 "@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.21.5, @babel/compat-data@npm:^7.22.20, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9":
   version: 7.23.5
   resolution: "@babel/compat-data@npm:7.23.5"
@@ -1102,6 +1112,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.25.6, @babel/generator@npm:^7.4.0":
+  version: 7.25.6
+  resolution: "@babel/generator@npm:7.25.6"
+  dependencies:
+    "@babel/types": ^7.25.6
+    "@jridgewell/gen-mapping": ^0.3.5
+    "@jridgewell/trace-mapping": ^0.3.25
+    jsesc: ^2.5.1
+  checksum: b55975cd664f5602304d868bb34f4ee3bed6f5c7ce8132cd92ff27a46a53a119def28a182d91992e86f75db904f63094a81247703c4dc96e4db0c03fd04bcd68
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -1356,6 +1378,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-string-parser@npm:7.24.8"
+  checksum: 39b03c5119216883878655b149148dc4d2e284791e969b19467a9411fccaa33f7a713add98f4db5ed519535f70ad273cdadfd2eb54d47ebbdeac5083351328ce
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
@@ -1363,6 +1392,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 6799ab117cefc0ecd35cd0b40ead320c621a298ecac88686a14cffceaac89d80cdb3c178f969861bf5fa5e4f766648f9161ea0752ecfe080d8e89e3147270257
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.16.7, @babel/helper-validator-option@npm:^7.21.0, @babel/helper-validator-option@npm:^7.22.15":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
@@ -1403,6 +1439,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.24.7
+    chalk: ^2.4.2
+    js-tokens: ^4.0.0
+    picocolors: ^1.0.0
+  checksum: 5cd3a89f143671c4ac129960024ba678b669e6fc673ce078030f5175002d1d3d52bc10b22c5b916a6faf644b5028e9a4bd2bb264d053d9b05b6a98690f1d46f1
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/parser@npm:7.23.5"
@@ -1412,6 +1460,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.6, @babel/parser@npm:^7.4.3":
+  version: 7.25.6
+  resolution: "@babel/parser@npm:7.25.6"
+  dependencies:
+    "@babel/types": ^7.25.6
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 85b237ded09ee43cc984493c35f3b1ff8a83e8dbbb8026b8132e692db6567acc5a1659ec928e4baa25499ddd840d7dae9dee3062be7108fe23ec5f94a8066b1e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6, @babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.23.3
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
@@ -2984,6 +3043,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.25.0, @babel/template@npm:^7.4.0":
+  version: 7.25.0
+  resolution: "@babel/template@npm:7.25.0"
+  dependencies:
+    "@babel/code-frame": ^7.24.7
+    "@babel/parser": ^7.25.0
+    "@babel/types": ^7.25.0
+  checksum: 3f2db568718756d0daf2a16927b78f00c425046b654cd30b450006f2e84bdccaf0cbe6dc04994aa1f5f6a4398da2f11f3640a4d3ee31722e43539c4c919c817b
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.22.20, @babel/traverse@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/traverse@npm:7.23.5"
@@ -3002,6 +3072,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.4.3":
+  version: 7.25.6
+  resolution: "@babel/traverse@npm:7.25.6"
+  dependencies:
+    "@babel/code-frame": ^7.24.7
+    "@babel/generator": ^7.25.6
+    "@babel/parser": ^7.25.6
+    "@babel/template": ^7.25.0
+    "@babel/types": ^7.25.6
+    debug: ^4.3.1
+    globals: ^11.1.0
+  checksum: 11ee47269aa4356f2d6633a05b9af73405b5ed72c09378daf644289b686ef852035a6ac9aa410f601991993c6bbf72006795b5478283b78eb1ca77874ada7737
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.5, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.5, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
   version: 7.23.5
   resolution: "@babel/types@npm:7.23.5"
@@ -3013,6 +3098,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.25.0, @babel/types@npm:^7.25.6, @babel/types@npm:^7.4.0":
+  version: 7.25.6
+  resolution: "@babel/types@npm:7.25.6"
+  dependencies:
+    "@babel/helper-string-parser": ^7.24.8
+    "@babel/helper-validator-identifier": ^7.24.7
+    to-fast-properties: ^2.0.0
+  checksum: 9b2f84ff3f874ad05b0b9bf06862c56f478b65781801f82296b4cc01bee39e79c20a7c0a06959fed0ee582c8267e1cb21638318655c5e070b0287242a844d1c9
+  languageName: node
+  linkType: hard
+
 "@base2/pretty-print-object@npm:1.0.1":
   version: 1.0.1
   resolution: "@base2/pretty-print-object@npm:1.0.1"
@@ -4324,6 +4420,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  dependencies:
+    string-width: ^5.1.2
+    string-width-cjs: "npm:string-width@^4.2.0"
+    strip-ansi: ^7.0.1
+    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
+    wrap-ansi: ^8.1.0
+    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
+  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
+  languageName: node
+  linkType: hard
+
 "@istanbuljs/load-nyc-config@npm:^1.0.0":
   version: 1.1.0
   resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
@@ -4643,6 +4753,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+  dependencies:
+    "@jridgewell/set-array": ^1.2.1
+    "@jridgewell/sourcemap-codec": ^1.4.10
+    "@jridgewell/trace-mapping": ^0.3.24
+  checksum: ff7a1764ebd76a5e129c8890aa3e2f46045109dabde62b0b6c6a250152227647178ff2069ea234753a690d8f3c4ac8b5e7b267bbee272bffb7f3b0a370ab6e52
+  languageName: node
+  linkType: hard
+
 "@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
   version: 3.1.2
   resolution: "@jridgewell/resolve-uri@npm:3.1.2"
@@ -4657,6 +4778,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10
+  languageName: node
+  linkType: hard
+
 "@jridgewell/source-map@npm:^0.3.3":
   version: 0.3.3
   resolution: "@jridgewell/source-map@npm:0.3.3"
@@ -4694,6 +4822,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
+  dependencies:
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: 9d3c40d225e139987b50c48988f8717a54a8c994d8a948ee42e1412e08988761d0754d7d10b803061cc3aebf35f92a5dbbab493bd0e1a9ef9e89a2130e83ba34
+  languageName: node
+  linkType: hard
+
 "@juggle/resize-observer@npm:^3.3.1, @juggle/resize-observer@npm:^3.4.0":
   version: 3.4.0
   resolution: "@juggle/resize-observer@npm:3.4.0"
@@ -5551,6 +5689,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
+  languageName: node
+  linkType: hard
+
 "@playwright/test@npm:^1.40.1":
   version: 1.40.1
   resolution: "@playwright/test@npm:1.40.1"
@@ -8513,33 +8658,55 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:1.45.0-alpha.868":
-  version: 1.45.0-alpha.868
-  resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.868"
+"@rocket.chat/apps-engine@workspace:^, @rocket.chat/apps-engine@workspace:packages/apps-engine":
+  version: 0.0.0-use.local
+  resolution: "@rocket.chat/apps-engine@workspace:packages/apps-engine"
   dependencies:
     "@msgpack/msgpack": 3.0.0-beta2
+    "@rocket.chat/eslint-config": "workspace:~"
+    "@rocket.chat/ui-kit": "workspace:~"
+    "@types/adm-zip": ^0.5.0
+    "@types/debug": ^4.1.12
+    "@types/lodash.clonedeep": ^4.5.7
+    "@types/nedb": ^1.8.12
+    "@types/node": ^18.0.0
+    "@types/semver": ^5.5.0
+    "@types/stack-trace": 0.0.29
+    "@types/uuid": ~8.3.4
+    "@typescript-eslint/eslint-plugin": ~5.60.1
+    "@typescript-eslint/parser": ~5.60.1
     adm-zip: ^0.5.9
+    alsatian: ^2.4.0
+    browserify: ^16.5.2
     cryptiles: ^4.1.3
     debug: ^4.3.4
-    deno-bin: 1.37.1
     esbuild: ^0.20.2
+    eslint: ~8.45.0
     jose: ^4.11.1
     jsonrpc-lite: ^2.2.0
     lodash.clonedeep: ^4.5.0
+    nedb: ^1.8.0
+    npm-run-all: ^4.1.5
+    nyc: ^14.1.1
+    rimraf: ^6.0.1
     semver: ^5.7.1
     stack-trace: 0.0.10
+    tap-bark: ^1.0.0
+    ts-node: ^6.2.0
+    typedoc: ~0.24.8
+    typescript: ~5.1.6
+    uglify-es: ^3.3.9
     uuid: ~8.3.2
   peerDependencies:
-    "@rocket.chat/ui-kit": "*"
-  checksum: 3ac41e3de76be67e856e4bca888f113360628e510f9d4c66d70ed71d84f25bda6ca6659ead6c7a87d21c117c47bfa090b4508cce66e8630d2e935d3ed3158835
-  languageName: node
-  linkType: hard
+    "@rocket.chat/ui-kit": "workspace:^"
+  languageName: unknown
+  linkType: soft
 
 "@rocket.chat/apps@workspace:^, @rocket.chat/apps@workspace:packages/apps":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/apps@workspace:packages/apps"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     eslint: ~8.45.0
@@ -8613,7 +8780,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
@@ -8638,7 +8805,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/message-parser": "workspace:^"
@@ -8711,7 +8878,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
@@ -8910,7 +9077,7 @@ __metadata:
     "@babel/preset-env": ~7.22.20
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": ^0.59.1
@@ -9363,7 +9530,7 @@ __metadata:
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
     "@rocket.chat/apps": "workspace:^"
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/base64": "workspace:^"
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
@@ -10010,7 +10177,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -10125,7 +10292,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -12902,7 +13069,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/adm-zip@npm:^0.5.5":
+"@types/adm-zip@npm:^0.5.0, @types/adm-zip@npm:^0.5.5":
   version: 0.5.5
   resolution: "@types/adm-zip@npm:0.5.5"
   dependencies:
@@ -13987,7 +14154,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash.clonedeep@npm:^4.5.9":
+"@types/lodash.clonedeep@npm:^4.5.7, @types/lodash.clonedeep@npm:^4.5.9":
   version: 4.5.9
   resolution: "@types/lodash.clonedeep@npm:4.5.9"
   dependencies:
@@ -14159,6 +14326,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/nedb@npm:^1.8.12":
+  version: 1.8.16
+  resolution: "@types/nedb@npm:1.8.16"
+  dependencies:
+    "@types/node": "*"
+  checksum: 9cfa3b763f7f05da29563971e0dc93c55552ca25b9f475c76f8ebd8b2201ebe62987bf786ba26108fbdcb9561897296c2856faebbcd702733b55dd474caac0b2
+  languageName: node
+  linkType: hard
+
 "@types/node-fetch@npm:^2.5.7":
   version: 2.6.1
   resolution: "@types/node-fetch@npm:2.6.1"
@@ -14194,6 +14370,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:>=0.0.2, @types/node@npm:>=4.0.0":
+  version: 22.5.5
+  resolution: "@types/node@npm:22.5.5"
+  dependencies:
+    undici-types: ~6.19.2
+  checksum: 1f788966ff7df07add0af3481fb68c7fe5091cc72a265c671432abb443788ddacca4ca6378af64fe100c20f857c4d80170d358e66c070171fcea0d4adb1b45b1
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:^12.7.1":
   version: 12.20.55
   resolution: "@types/node@npm:12.20.55"
@@ -14222,6 +14407,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:^18.0.0":
+  version: 18.19.50
+  resolution: "@types/node@npm:18.19.50"
+  dependencies:
+    undici-types: ~5.26.4
+  checksum: 73bdd2b46fb96816a1f7309e1b609f0832a29739c87df7daa729ff497160be143e02cf18486a0112e1981b092358aed3ca0716b532aff93c7e05f7dbb4f7586a
+  languageName: node
+  linkType: hard
+
 "@types/nodemailer@npm:*":
   version: 6.4.13
   resolution: "@types/nodemailer@npm:6.4.13"
@@ -14514,6 +14708,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/semver@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@types/semver@npm:5.5.0"
+  checksum: 88fa46ace5a40457ff22d55affe9ddd63c7a3b2ced6bb177249e3013152a78015c2ea60ca0242a0439215f2d0e5d78509ff2f6734e9b5024a5b70112b78a9067
+  languageName: node
+  linkType: hard
+
 "@types/semver@npm:^7.3.10, @types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
   version: 7.5.4
   resolution: "@types/semver@npm:7.5.4"
@@ -14607,6 +14808,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/stack-trace@npm:0.0.29":
+  version: 0.0.29
+  resolution: "@types/stack-trace@npm:0.0.29"
+  checksum: 2dcfdf8f10e250a76e43efe6d3e05a463b4e22ca290dbb423ec14fa21f57f94ef0cc8ba19ed3394c448218d9ddd9f7cd9adea131fb6572aa2d484b1cf7f043aa
+  languageName: node
+  linkType: hard
+
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.1
   resolution: "@types/stack-utils@npm:2.0.1"
@@ -14760,7 +14968,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^8.3.4":
+"@types/uuid@npm:^8.3.4, @types/uuid@npm:~8.3.4":
   version: 8.3.4
   resolution: "@types/uuid@npm:8.3.4"
   checksum: 6f11f3ff70f30210edaa8071422d405e9c1d4e53abbe50fdce365150d3c698fe7bbff65c1e71ae080cbfb8fded860dbb5e174da96fdbbdfcaa3fb3daa474d20f
@@ -15705,6 +15913,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"JSONStream@npm:^1.0.3":
+  version: 1.3.5
+  resolution: "JSONStream@npm:1.3.5"
+  dependencies:
+    jsonparse: ^1.2.0
+    through: ">=2.2.7 <3"
+  bin:
+    JSONStream: ./bin.js
+  checksum: 2605fa124260c61bad38bb65eba30d2f72216a78e94d0ab19b11b4e0327d572b8d530c0c9cc3b0764f727ad26d39e00bf7ebad57781ca6368394d73169c59e46
+  languageName: node
+  linkType: hard
+
 "abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
@@ -15790,7 +16010,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
+"acorn-node@npm:^1.2.0, acorn-node@npm:^1.3.0, acorn-node@npm:^1.5.2, acorn-node@npm:^1.8.2":
+  version: 1.8.2
+  resolution: "acorn-node@npm:1.8.2"
+  dependencies:
+    acorn: ^7.0.0
+    acorn-walk: ^7.0.0
+    xtend: ^4.0.2
+  checksum: 02e1564a1ccf8bd1fcefcd01235398af4a9effaf032c5397994ddd275590a72894cb3e26e4b82579ccdda1e48ade7486aef61e771ddae3563ca452b927f443d8
+  languageName: node
+  linkType: hard
+
+"acorn-walk@npm:^7.0.0, acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
   checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
@@ -15813,7 +16044,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.1.1, acorn@npm:^7.4.0, acorn@npm:^7.4.1":
+"acorn@npm:^7.0.0, acorn@npm:^7.1.1, acorn@npm:^7.4.0, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
   bin:
@@ -15993,6 +16224,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"alsatian@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "alsatian@npm:2.4.0"
+  dependencies:
+    "@types/node": ">=4.0.0"
+    extendo-error: ^1.0.1
+    glob: ^7.0.3
+    reflect-metadata: ^0.1.3
+    tap-bark: 1.0.0
+    ts-node: ^7.0.0
+  bin:
+    alsatian: ./cli/alsatian-cli.js
+  checksum: 7fb9691d9fe4711bda2acbe660843a410a614c575bb8b7f63b85458636b32ff8ff351c19ee2d5da50053dc96728b3d6b2aa39b4564afbfec7a8f3490e55f75ef
+  languageName: node
+  linkType: hard
+
 "amp-message@npm:~0.1.1":
   version: 0.1.2
   resolution: "amp-message@npm:0.1.2"
@@ -16115,6 +16362,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-regex@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "ansi-regex@npm:6.1.0"
+  checksum: 495834a53b0856c02acd40446f7130cb0f8284f4a39afdab20d5dc42b2e198b1196119fe887beed8f9055c4ff2055e3b2f6d4641d0be018cdfb64fedf6fc1aac
+  languageName: node
+  linkType: hard
+
 "ansi-sequence-parser@npm:^1.1.0":
   version: 1.1.1
   resolution: "ansi-sequence-parser@npm:1.1.1"
@@ -16129,7 +16383,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^3.2.1":
+"ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1":
   version: 3.2.1
   resolution: "ansi-styles@npm:3.2.1"
   dependencies:
@@ -16154,6 +16408,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
+  languageName: node
+  linkType: hard
+
 "ansi-to-html@npm:^0.6.11":
   version: 0.6.15
   resolution: "ansi-to-html@npm:0.6.15"
@@ -16217,6 +16478,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"append-transform@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "append-transform@npm:1.0.0"
+  dependencies:
+    default-require-extensions: ^2.0.0
+  checksum: 65fc4fe074aa1cf291763a5835b1e209b5e407597d6662c30b0921928be8a074f75e69e751ddf388ad16411dd61cb70351a10914090b354a7a447c7bc164b0ac
+  languageName: node
+  linkType: hard
+
 "append-transform@npm:^2.0.0":
   version: 2.0.0
   resolution: "append-transform@npm:2.0.0"
@@ -16588,7 +16858,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arrify@npm:^1.0.1":
+"arrify@npm:^1.0.0, arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
   checksum: 745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7
@@ -16658,6 +16928,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"assert@npm:^1.4.0":
+  version: 1.5.1
+  resolution: "assert@npm:1.5.1"
+  dependencies:
+    object.assign: ^4.1.4
+    util: ^0.10.4
+  checksum: bfc539da97545f9b2989395d6b85be40b70649ce57464f3cc6e61f4975fb097ba0689c386f95bdb4c3ab867931e40a565c9e193ae3c02263a8e92acb17c9dc93
+  languageName: node
+  linkType: hard
+
 "assert@npm:^2.1.0":
   version: 2.1.0
   resolution: "assert@npm:2.1.0"
@@ -17926,6 +18206,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browser-pack@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "browser-pack@npm:6.1.0"
+  dependencies:
+    JSONStream: ^1.0.3
+    combine-source-map: ~0.8.0
+    defined: ^1.0.0
+    safe-buffer: ^5.1.1
+    through2: ^2.0.0
+    umd: ^3.0.0
+  bin:
+    browser-pack: bin/cmd.js
+  checksum: 9e5993d3eefb7c56a68cfc8810e59a2920481f93bdcb0a53e07b322f273f697cfeb3a2302aa7fc0f725d29be0e8cc629561f463f2c8b06e2958497869d42cc53
+  languageName: node
+  linkType: hard
+
 "browser-process-hrtime@npm:^1.0.0":
   version: 1.0.0
   resolution: "browser-process-hrtime@npm:1.0.0"
@@ -17940,6 +18236,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browser-resolve@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "browser-resolve@npm:2.0.0"
+  dependencies:
+    resolve: ^1.17.0
+  checksum: 69225e73b555bd6d2a08fb93c7342cfcf3b5058b975099c52649cd5c3cec84c2066c5385084d190faedfb849684d9dabe10129f0cd401d1883572f2e6650f440
+  languageName: node
+  linkType: hard
+
 "browser-stdout@npm:1.3.1":
   version: 1.3.1
   resolution: "browser-stdout@npm:1.3.1"
@@ -18029,7 +18334,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-zlib@npm:^0.2.0":
+"browserify-zlib@npm:^0.2.0, browserify-zlib@npm:~0.2.0":
   version: 0.2.0
   resolution: "browserify-zlib@npm:0.2.0"
   dependencies:
@@ -18038,6 +18343,64 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserify@npm:^16.5.2":
+  version: 16.5.2
+  resolution: "browserify@npm:16.5.2"
+  dependencies:
+    JSONStream: ^1.0.3
+    assert: ^1.4.0
+    browser-pack: ^6.0.1
+    browser-resolve: ^2.0.0
+    browserify-zlib: ~0.2.0
+    buffer: ~5.2.1
+    cached-path-relative: ^1.0.0
+    concat-stream: ^1.6.0
+    console-browserify: ^1.1.0
+    constants-browserify: ~1.0.0
+    crypto-browserify: ^3.0.0
+    defined: ^1.0.0
+    deps-sort: ^2.0.0
+    domain-browser: ^1.2.0
+    duplexer2: ~0.1.2
+    events: ^2.0.0
+    glob: ^7.1.0
+    has: ^1.0.0
+    htmlescape: ^1.1.0
+    https-browserify: ^1.0.0
+    inherits: ~2.0.1
+    insert-module-globals: ^7.0.0
+    labeled-stream-splicer: ^2.0.0
+    mkdirp-classic: ^0.5.2
+    module-deps: ^6.2.3
+    os-browserify: ~0.3.0
+    parents: ^1.0.1
+    path-browserify: ~0.0.0
+    process: ~0.11.0
+    punycode: ^1.3.2
+    querystring-es3: ~0.2.0
+    read-only-stream: ^2.0.0
+    readable-stream: ^2.0.2
+    resolve: ^1.1.4
+    shasum: ^1.0.0
+    shell-quote: ^1.6.1
+    stream-browserify: ^2.0.0
+    stream-http: ^3.0.0
+    string_decoder: ^1.1.1
+    subarg: ^1.0.0
+    syntax-error: ^1.1.1
+    through2: ^2.0.0
+    timers-browserify: ^1.0.1
+    tty-browserify: 0.0.1
+    url: ~0.11.0
+    util: ~0.10.1
+    vm-browserify: ^1.0.0
+    xtend: ^4.0.0
+  bin:
+    browserify: bin/cmd.js
+  checksum: 75dacf5c82355146b49a2febb3bf9f7898893931973cf901849791827e44782afcb562be7bc3a893d9022ae528fd6fccdf24fc8812cb5aa1b081bb7ce34c46b5
+  languageName: node
+  linkType: hard
+
 "browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1":
   version: 4.22.1
   resolution: "browserslist@npm:4.22.1"
@@ -18126,7 +18489,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-from@npm:^1.0.0":
+"buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
   checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
@@ -18161,6 +18524,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"buffer@npm:~5.2.1":
+  version: 5.2.1
+  resolution: "buffer@npm:5.2.1"
+  dependencies:
+    base64-js: ^1.0.2
+    ieee754: ^1.1.4
+  checksum: aa3f25bb88d313b8317b436677b46e9e32db64ae397dd5a9d1f867da132985b857c71deaa36cc37666fdb955d8d0f66abeae9460aa7d9b2dca36a9da2f50d05e
+  languageName: node
+  linkType: hard
+
 "bufrw@npm:^1.3.0":
   version: 1.3.0
   resolution: "bufrw@npm:1.3.0"
@@ -18362,6 +18735,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cached-path-relative@npm:^1.0.0, cached-path-relative@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "cached-path-relative@npm:1.1.0"
+  checksum: 2f1d63c2301feda575039b945811e54b2dc851b49e94aa366d2916fece745fe4f4490a28a68bd0afe79c2fe336bebf62cbdfa2ad75b178d33b074089114d402d
+  languageName: node
+  linkType: hard
+
+"caching-transform@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "caching-transform@npm:3.0.2"
+  dependencies:
+    hasha: ^3.0.0
+    make-dir: ^2.0.0
+    package-hash: ^3.0.0
+    write-file-atomic: ^2.4.2
+  checksum: e81ff7652fecf23fb0a97d7e019357b91955cb05277e667940b325bd3af89a893312798400ca9735990c17fd60fe495d8da4287dd716371251026e54945f8170
+  languageName: node
+  linkType: hard
+
 "caching-transform@npm:^4.0.0":
   version: 4.0.0
   resolution: "caching-transform@npm:4.0.0"
@@ -18693,7 +19085,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^1.0.0":
+"chalk@npm:^1.0.0, chalk@npm:^1.1.3":
   version: 1.1.3
   resolution: "chalk@npm:1.1.3"
   dependencies:
@@ -19075,6 +19467,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cliui@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cliui@npm:5.0.0"
+  dependencies:
+    string-width: ^3.1.0
+    strip-ansi: ^5.2.0
+    wrap-ansi: ^5.1.0
+  checksum: 0bb8779efe299b8f3002a73619eaa8add4081eb8d1c17bc4fedc6240557fb4eacdc08fe87c39b002eacb6cfc117ce736b362dbfd8bf28d90da800e010ee97df4
+  languageName: node
+  linkType: hard
+
 "cliui@npm:^6.0.0":
   version: 6.0.0
   resolution: "cliui@npm:6.0.0"
@@ -19383,6 +19786,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"combine-source-map@npm:^0.8.0, combine-source-map@npm:~0.8.0":
+  version: 0.8.0
+  resolution: "combine-source-map@npm:0.8.0"
+  dependencies:
+    convert-source-map: ~1.1.0
+    inline-source-map: ~0.6.0
+    lodash.memoize: ~3.0.3
+    source-map: ~0.5.3
+  checksum: 26b3064a4e58400e04089acbf5c8741c47db079706bb2fcd79a7768f99d68de9baf1eb48081cdfbc568e308633105af2aeaf52c73e388619ba1f56463fb73a2e
+  languageName: node
+  linkType: hard
+
 "combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
@@ -19455,6 +19870,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:~2.14.1":
+  version: 2.14.1
+  resolution: "commander@npm:2.14.1"
+  checksum: 26bd49febeac8efabb7488fb5a4a2480b04bc4c4eef3c50da93eead72959f7a5232d003deda5b9761937205721274e80108f6d1d2b45ae7a8387cfb92031084e
+  languageName: node
+  linkType: hard
+
 "comment-json@npm:^4.2.3":
   version: 4.2.3
   resolution: "comment-json@npm:4.2.3"
@@ -19554,7 +19976,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"concat-stream@npm:^1.5.0":
+"concat-stream@npm:^1.5.0, concat-stream@npm:^1.6.0, concat-stream@npm:^1.6.1, concat-stream@npm:~1.6.0":
   version: 1.6.2
   resolution: "concat-stream@npm:1.6.2"
   dependencies:
@@ -19634,7 +20056,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"constants-browserify@npm:^1.0.0":
+"constants-browserify@npm:^1.0.0, constants-browserify@npm:~1.0.0":
   version: 1.0.0
   resolution: "constants-browserify@npm:1.0.0"
   checksum: f7ac8c6d0b6e4e0c77340a1d47a3574e25abd580bfd99ad707b26ff7618596cf1a5e5ce9caf44715e9e01d4a5d12cb3b4edaf1176f34c19adb2874815a56e64f
@@ -19690,6 +20112,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"convert-source-map@npm:~1.1.0":
+  version: 1.1.3
+  resolution: "convert-source-map@npm:1.1.3"
+  checksum: 0ed6bdecd330fd05941b417b63ebc9001b438f6d6681cd9a068617c3d4b649794dc35c95ba239d0a01f0b9499912b9e0d0d1b7c612e3669c57c65ce4bbc8fdd8
+  languageName: node
+  linkType: hard
+
 "cookie-parser@npm:^1.4.6":
   version: 1.4.6
   resolution: "cookie-parser@npm:1.4.6"
@@ -19850,6 +20279,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cp-file@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "cp-file@npm:6.2.0"
+  dependencies:
+    graceful-fs: ^4.1.2
+    make-dir: ^2.0.0
+    nested-error-stacks: ^2.0.0
+    pify: ^4.0.1
+    safe-buffer: ^5.0.1
+  checksum: 7e61b3ca311e74bce4b5f60aad978dc29b957d083fe94a4aba896b927af9ccd51e2e2000ada09542e0f22f0f220b107b0857f6dab21e5cdf189fc14742b94f62
+  languageName: node
+  linkType: hard
+
 "cp-file@npm:^7.0.0":
   version: 7.0.0
   resolution: "cp-file@npm:7.0.0"
@@ -20021,6 +20463,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cross-spawn@npm:^4":
+  version: 4.0.2
+  resolution: "cross-spawn@npm:4.0.2"
+  dependencies:
+    lru-cache: ^4.0.1
+    which: ^1.2.9
+  checksum: 8ce57b3e11c5c798542a21ddfdc1edef33ab6fe001958b31f3340a6ff684e3334a8baad2751efa78b6200aad442cf12b939396d758b0dd5c42c9b782c28fe06e
+  languageName: node
+  linkType: hard
+
 "cross-spawn@npm:^5.0.1, cross-spawn@npm:^5.1.0":
   version: 5.1.0
   resolution: "cross-spawn@npm:5.1.0"
@@ -20072,7 +20524,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-browserify@npm:^3.11.0":
+"crypto-browserify@npm:^3.0.0, crypto-browserify@npm:^3.11.0":
   version: 3.12.0
   resolution: "crypto-browserify@npm:3.12.0"
   dependencies:
@@ -20723,6 +21175,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dash-ast@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "dash-ast@npm:1.0.0"
+  checksum: db59e5e275d8159fb3b84bcd2936470c3fecb626f6486c179a28afad141cd95a578faaa3695ad6106153ca861da99a3d891fda37757b49afab773b3a46c638e6
+  languageName: node
+  linkType: hard
+
 "dashdash@npm:^1.12.0":
   version: 1.14.1
   resolution: "dashdash@npm:1.14.1"
@@ -21137,6 +21596,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"default-require-extensions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "default-require-extensions@npm:2.0.0"
+  dependencies:
+    strip-bom: ^3.0.0
+  checksum: a0b18bdcdee93018ee39161208c193f274d5f6553c32f518ad86eba92edf6485d194012ffb402e8207f9b80f2da2c6de48e0189fd63bd682f0760e4dbd35cb79
+  languageName: node
+  linkType: hard
+
 "default-require-extensions@npm:^3.0.0":
   version: 3.0.0
   resolution: "default-require-extensions@npm:3.0.0"
@@ -21212,6 +21680,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"defined@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "defined@npm:1.0.1"
+  checksum: b1a852300bdb57f297289b55eafdd0c517afaa3ec8190e78fce91b9d8d0c0369d4505ecbdacfd3d98372e664f4a267d9bd793938d4a8c76209c9d9516fbe2101
+  languageName: node
+  linkType: hard
+
 "degenerator@npm:^3.0.1":
   version: 3.0.2
   resolution: "degenerator@npm:3.0.2"
@@ -21245,19 +21720,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deno-bin@npm:1.37.1":
-  version: 1.37.1
-  resolution: "deno-bin@npm:1.37.1"
-  dependencies:
-    adm-zip: ^0.5.4
-    follow-redirects: ^1.10.0
-  bin:
-    deno: bin/deno.js
-    deno-bin: bin/deno.js
-  checksum: 1c985611aa67b4b72f68b5608644af73dbff75619ac4fba67fecf036763acf76c66a9bb537cf09865c855313ceec6af1190474fa0163a616620b8af705c82736
-  languageName: node
-  linkType: hard
-
 "depd@npm:2.0.0, depd@npm:~2.0.0":
   version: 2.0.0
   resolution: "depd@npm:2.0.0"
@@ -21279,6 +21741,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deps-sort@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "deps-sort@npm:2.0.1"
+  dependencies:
+    JSONStream: ^1.0.3
+    shasum-object: ^1.0.0
+    subarg: ^1.0.0
+    through2: ^2.0.0
+  bin:
+    deps-sort: bin/cmd.js
+  checksum: 1cbaad500aa1592d7497321faf39c7bb7b86ed0930b1efd0c54efdf68433fc53d8bc844bb220723c7861b397ba886495ebdab2cb0fbf13262d1342d98a88622b
+  languageName: node
+  linkType: hard
+
 "dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
@@ -21387,6 +21863,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"detective@npm:^5.2.0":
+  version: 5.2.1
+  resolution: "detective@npm:5.2.1"
+  dependencies:
+    acorn-node: ^1.8.2
+    defined: ^1.0.0
+    minimist: ^1.2.6
+  bin:
+    detective: bin/detective.js
+  checksum: dc4601bbc6be850edb3c2dab7a0eaf5a6169a15ad201679c66d40ea1986df816eeaecd590047f15b0780285f3eeea13b82dca0d4c52a47e744a571e326a72dc9
+  languageName: node
+  linkType: hard
+
 "dezalgo@npm:1.0.3":
   version: 1.0.3
   resolution: "dezalgo@npm:1.0.3"
@@ -21418,6 +21907,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff@npm:^3.1.0":
+  version: 3.5.0
+  resolution: "diff@npm:3.5.0"
+  checksum: 00842950a6551e26ce495bdbce11047e31667deea546527902661f25cc2e73358967ebc78cf86b1a9736ec3e14286433225f9970678155753a6291c3bca5227b
+  languageName: node
+  linkType: hard
+
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -21584,7 +22080,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domain-browser@npm:^1.1.1":
+"domain-browser@npm:^1.1.1, domain-browser@npm:^1.2.0":
   version: 1.2.0
   resolution: "domain-browser@npm:1.2.0"
   checksum: 8f1235c7f49326fb762f4675795246a6295e7dd566b4697abec24afdba2460daa7dfbd1a73d31efbf5606b3b7deadb06ce47cf06f0a476e706153d62a4ff2b90
@@ -21805,6 +22301,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"duplexer2@npm:^0.1.2, duplexer2@npm:~0.1.0, duplexer2@npm:~0.1.2":
+  version: 0.1.4
+  resolution: "duplexer2@npm:0.1.4"
+  dependencies:
+    readable-stream: ^2.0.2
+  checksum: 744961f03c7f54313f90555ac20284a3fb7bf22fdff6538f041a86c22499560eb6eac9d30ab5768054137cb40e6b18b40f621094e0261d7d8c35a37b7a5ad241
+  languageName: node
+  linkType: hard
+
 "duplexer2@npm:~0.0.2":
   version: 0.0.2
   resolution: "duplexer2@npm:0.0.2"
@@ -21821,7 +22326,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer@npm:^0.1.2, duplexer@npm:~0.1.1":
+"duplexer@npm:^0.1.1, duplexer@npm:^0.1.2, duplexer@npm:~0.1.1":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
   checksum: 62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0
@@ -21852,6 +22357,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
+  languageName: node
+  linkType: hard
+
 "ecc-jsbn@npm:~0.1.1":
   version: 0.1.2
   resolution: "ecc-jsbn@npm:0.1.2"
@@ -21994,6 +22506,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"emoji-regex@npm:^7.0.1":
+  version: 7.0.3
+  resolution: "emoji-regex@npm:7.0.3"
+  checksum: 9159b2228b1511f2870ac5920f394c7e041715429a68459ebe531601555f11ea782a8e1718f969df2711d38c66268174407cbca57ce36485544f695c2dfdc96e
+  languageName: node
+  linkType: hard
+
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
@@ -23205,6 +23724,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"events-to-array@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "events-to-array@npm:1.1.2"
+  checksum: c4f5f0f6d0c8658b96f940f703ac9c8c99effca1dd7b1f8eb030be7a940725b42a72fa5eb405961c171c2e9e1d5b7efa9a75be5cdaba88f3fc0fcce59d0e6a0f
+  languageName: node
+  linkType: hard
+
 "events@npm:1.1.1":
   version: 1.1.1
   resolution: "events@npm:1.1.1"
@@ -23212,6 +23738,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"events@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "events@npm:2.1.0"
+  checksum: 8756c4f40a57ffdaa60f1e285beb1fcf2873a26ef713879b927ed648b2833cbbbcdbf93460a3af407af55677e89c044ac9c3c5639a7b3ce38f4dfec2fa4d039e
+  languageName: node
+  linkType: hard
+
 "events@npm:^3.0.0, events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
@@ -23514,6 +24047,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"extendo-error@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "extendo-error@npm:1.0.1"
+  checksum: 5965cd2af1127ce321353196095ee07b0d7add134b2837356d676ca8c4a590d6a397ffa50b0ad26a73cba3b2d486806c4653df82cc3f65776dbda79a45c8caa8
+  languageName: node
+  linkType: hard
+
 "external-editor@npm:^3.0.3, external-editor@npm:^3.1.0":
   version: 3.1.0
   resolution: "external-editor@npm:3.1.0"
@@ -24231,7 +24771,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.10.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
   version: 1.15.4
   resolution: "follow-redirects@npm:1.15.4"
   peerDependenciesMeta:
@@ -24284,6 +24824,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"foreground-child@npm:^1.5.6":
+  version: 1.5.6
+  resolution: "foreground-child@npm:1.5.6"
+  dependencies:
+    cross-spawn: ^4
+    signal-exit: ^3.0.0
+  checksum: 991ea607d14001ca98f37f5feadb0dcdc765de9062fa51f071d4fdd4dca1565ac4d21058fa03653d46b4625c933d8b17bec8a2e082081429f9b7c37da6d74372
+  languageName: node
+  linkType: hard
+
 "foreground-child@npm:^2.0.0":
   version: 2.0.0
   resolution: "foreground-child@npm:2.0.0"
@@ -24294,6 +24844,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"foreground-child@npm:^3.1.0":
+  version: 3.3.0
+  resolution: "foreground-child@npm:3.3.0"
+  dependencies:
+    cross-spawn: ^7.0.0
+    signal-exit: ^4.0.1
+  checksum: 1989698488f725b05b26bc9afc8a08f08ec41807cd7b92ad85d96004ddf8243fd3e79486b8348c64a3011ae5cc2c9f0936af989e1f28339805d8bc178a75b451
+  languageName: node
+  linkType: hard
+
 "forever-agent@npm:~0.6.1":
   version: 0.6.1
   resolution: "forever-agent@npm:0.6.1"
@@ -24773,6 +25333,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-assigned-identifiers@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "get-assigned-identifiers@npm:1.2.0"
+  checksum: 5ea831c744a645ebd56fff818c80ffc583995c2ca3958236c7cfaac670242300e4f08498a9bbafd3ecbe30027d58ed50e7fa6268ecfe4b8e5c888ea7275cb56c
+  languageName: node
+  linkType: hard
+
 "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
@@ -25093,6 +25660,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "glob@npm:11.0.0"
+  dependencies:
+    foreground-child: ^3.1.0
+    jackspeak: ^4.0.1
+    minimatch: ^10.0.0
+    minipass: ^7.1.2
+    package-json-from-dist: ^1.0.0
+    path-scurry: ^2.0.0
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 8a2dd914d5776987be5244624d9491bbcaf19f2387e06783737003ff696ebfd2264190c47014f8709c1c02d8bc892f17660cf986c587b107e194c0a3151ab333
+  languageName: node
+  linkType: hard
+
+"glob@npm:^7.1.0":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.1.1
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+  languageName: node
+  linkType: hard
+
 "global-dirs@npm:^0.1.0":
   version: 0.1.1
   resolution: "global-dirs@npm:0.1.1"
@@ -25645,6 +26242,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hasha@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hasha@npm:3.0.0"
+  dependencies:
+    is-stream: ^1.0.1
+  checksum: bcd78059c2925d76af0cde33e0523578feffb52c1d9934e19ea0e8bc16427310be476282e567baf46b7e50a5256b0a527b3cac9e8d88e312f43d4440cd45a151
+  languageName: node
+  linkType: hard
+
 "hasha@npm:^5.0.0":
   version: 5.2.2
   resolution: "hasha@npm:5.2.2"
@@ -26077,6 +26683,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"htmlescape@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "htmlescape@npm:1.1.1"
+  checksum: c59a915ae6ae076b5720243c8c594fd8c76e927d511ed5f205e4d586f47d521478d7148dc7fbe3d4a0cfc30abcc2dd215b30255903c09ed04eb38bca44367c5d
+  languageName: node
+  linkType: hard
+
 "htmlparser2@npm:^4.0.0":
   version: 4.1.0
   resolution: "htmlparser2@npm:4.1.0"
@@ -26789,6 +27402,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"inline-source-map@npm:~0.6.0":
+  version: 0.6.3
+  resolution: "inline-source-map@npm:0.6.3"
+  dependencies:
+    source-map: ~0.5.3
+  checksum: 1eeca6600b4c17012b16a2eadf3fe28feec95f0561b744cf5294325129f6f4738ab93a0e64d5d8e2d83fc1e0bae00d7ab6d0a8f4f9ce3189e5447896a1924f7b
+  languageName: node
+  linkType: hard
+
 "inline-style-parser@npm:0.1.1":
   version: 0.1.1
   resolution: "inline-style-parser@npm:0.1.1"
@@ -26840,6 +27462,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"insert-module-globals@npm:^7.0.0":
+  version: 7.2.1
+  resolution: "insert-module-globals@npm:7.2.1"
+  dependencies:
+    JSONStream: ^1.0.3
+    acorn-node: ^1.5.2
+    combine-source-map: ^0.8.0
+    concat-stream: ^1.6.1
+    is-buffer: ^1.1.0
+    path-is-absolute: ^1.0.1
+    process: ~0.11.0
+    through2: ^2.0.0
+    undeclared-identifiers: ^1.1.2
+    xtend: ^4.0.0
+  bin:
+    insert-module-globals: bin/cmd.js
+  checksum: c44de7e802186e3207e24beadd71a5bb834700456a9e6f5c8fbb415b6f8356aff44df806e32bf9131143c53348d873fb050ea2b8f3c4cac762922e191b6bef15
+  languageName: node
+  linkType: hard
+
 "internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.7":
   version: 1.0.7
   resolution: "internal-slot@npm:1.0.7"
@@ -27103,7 +27745,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-buffer@npm:^1.1.5, is-buffer@npm:~1.1.6":
+"is-buffer@npm:^1.1.0, is-buffer@npm:^1.1.5, is-buffer@npm:~1.1.6":
   version: 1.1.6
   resolution: "is-buffer@npm:1.1.6"
   checksum: 4a186d995d8bbf9153b4bd9ff9fd04ae75068fe695d29025d25e592d9488911eeece84eefbd8fa41b8ddcc0711058a71d4c466dcf6f1f6e1d83830052d8ca707
@@ -27683,7 +28325,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-stream@npm:^1.0.0, is-stream@npm:^1.1.0":
+"is-stream@npm:^1.0.0, is-stream@npm:^1.0.1, is-stream@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-stream@npm:1.1.0"
   checksum: 063c6bec9d5647aa6d42108d4c59723d2bd4ae42135a2d4db6eadbd49b7ea05b750fd69d279e5c7c45cf9da753ad2c00d8978be354d65aa9f6bb434969c6a2ae
@@ -27938,6 +28580,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-coverage@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "istanbul-lib-coverage@npm:2.0.5"
+  checksum: c83bf39dc722d2a3e7c98b16643f2fef719fd59adf23441ad8a1e6422bb1f3367ac7d4c42ac45d0d87413476891947b6ffbdecf2184047436336aa0c28bbfc15
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.0.1, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
@@ -27945,6 +28594,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-hook@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "istanbul-lib-hook@npm:2.0.7"
+  dependencies:
+    append-transform: ^1.0.0
+  checksum: 3c3ec85da459949ce35c4063874666fe96da95a5d63ea69a17688af63b843fc0db301bfa478845cfaa20dea15681f4243e724e51a9e3d6806511b95006d6e04d
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-hook@npm:^3.0.0":
   version: 3.0.0
   resolution: "istanbul-lib-hook@npm:3.0.0"
@@ -27954,6 +28612,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-instrument@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "istanbul-lib-instrument@npm:3.3.0"
+  dependencies:
+    "@babel/generator": ^7.4.0
+    "@babel/parser": ^7.4.3
+    "@babel/template": ^7.4.0
+    "@babel/traverse": ^7.4.3
+    "@babel/types": ^7.4.0
+    istanbul-lib-coverage: ^2.0.5
+    semver: ^6.0.0
+  checksum: 5ff86440c2f4afe83603f899721e43f9bbc0049ebf4e7fd696ea361d0c9ae5c831c656eec07c13f42ba934fc808c78f42a7884f1a08349802bc9bfa5af760571
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-instrument@npm:^4.0.0":
   version: 4.0.3
   resolution: "istanbul-lib-instrument@npm:4.0.3"
@@ -28006,6 +28679,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-report@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "istanbul-lib-report@npm:2.0.8"
+  dependencies:
+    istanbul-lib-coverage: ^2.0.5
+    make-dir: ^2.1.0
+    supports-color: ^6.1.0
+  checksum: eef53d35ea750fd971bc7abf2cf1350615804e4dee5a7ee6e13cff45ff36b518970baaeef4bf019d46149581f9d10c3f3675083cf6625da6cc3d4d4b4c670374
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-report@npm:^3.0.0":
   version: 3.0.0
   resolution: "istanbul-lib-report@npm:3.0.0"
@@ -28017,6 +28701,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-source-maps@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "istanbul-lib-source-maps@npm:3.0.6"
+  dependencies:
+    debug: ^4.1.1
+    istanbul-lib-coverage: ^2.0.5
+    make-dir: ^2.1.0
+    rimraf: ^2.6.3
+    source-map: ^0.6.1
+  checksum: 1c6ebc81331ab4d831910db3e98da1ee4e3e96f64c2fb533e1b73516305f020b44765fa2937f24eee4adb11be22a1fa42c04786e0d697d4893987a1a5180a541
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-source-maps@npm:^4.0.0":
   version: 4.0.1
   resolution: "istanbul-lib-source-maps@npm:4.0.1"
@@ -28028,6 +28725,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-reports@npm:^2.2.4":
+  version: 2.2.7
+  resolution: "istanbul-reports@npm:2.2.7"
+  dependencies:
+    html-escaper: ^2.0.0
+  checksum: 138604c86fe4a386c4ba23c103aa64f3d867548cb1ac9961cafe912004bde601180d7ece918a76e2e0078b94e503b77aa696d6e6f68a0d8698abbf0923d78285
+  languageName: node
+  linkType: hard
+
 "istanbul-reports@npm:^3.0.2, istanbul-reports@npm:^3.1.3":
   version: 3.1.4
   resolution: "istanbul-reports@npm:3.1.4"
@@ -28078,6 +28784,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jackspeak@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "jackspeak@npm:4.0.1"
+  dependencies:
+    "@isaacs/cliui": ^8.0.2
+    "@pkgjs/parseargs": ^0.11.0
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 7989d19eddeff0631ef653df413e26290db77dc3791438bd12b56bed1c0b24d5d535fdfec13cf35775cd5b47f8ee57d36fd0bceaf2df672b1f523533fd4184cc
+  languageName: node
+  linkType: hard
+
 "jaeger-client@npm:^3.19.0":
   version: 3.19.0
   resolution: "jaeger-client@npm:3.19.0"
@@ -28748,7 +29467,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1":
+"js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.2.7, js-yaml@npm:^3.6.1":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
@@ -28945,6 +29664,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-stable-stringify@npm:~0.0.0":
+  version: 0.0.1
+  resolution: "json-stable-stringify@npm:0.0.1"
+  dependencies:
+    jsonify: ~0.0.0
+  checksum: 3a148d4c32bf65c61ceba1a10ffe3e91b8f106135cc203ab464cfe7792e545426294beb60711406a4ef62c001c20c916efc600e44e3ce66d1927bb7f781f8201
+  languageName: node
+  linkType: hard
+
 "json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.1":
   version: 5.0.1
   resolution: "json-stringify-safe@npm:5.0.1"
@@ -29035,6 +29763,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsonify@npm:~0.0.0":
+  version: 0.0.1
+  resolution: "jsonify@npm:0.0.1"
+  checksum: 027287e1c0294fce15f18c0ff990cfc2318e7f01fb76515f784d5cd0784abfec6fc5c2355c3a2f2cb0ad7f4aa2f5b74ebbfe4e80476c35b2d13cabdb572e1134
+  languageName: node
+  linkType: hard
+
+"jsonparse@npm:^1.2.0":
+  version: 1.3.1
+  resolution: "jsonparse@npm:1.3.1"
+  checksum: 6514a7be4674ebf407afca0eda3ba284b69b07f9958a8d3113ef1005f7ec610860c312be067e450c569aab8b89635e332cee3696789c750692bb60daba627f4d
+  languageName: node
+  linkType: hard
+
 "jsonpointer@npm:^4.1.0":
   version: 4.1.0
   resolution: "jsonpointer@npm:4.1.0"
@@ -29309,6 +30051,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"labeled-stream-splicer@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "labeled-stream-splicer@npm:2.0.2"
+  dependencies:
+    inherits: ^2.0.1
+    stream-splicer: ^2.0.0
+  checksum: 4f7097b7666cd6d110f2a700f2905f703aa2a6d21c76fb390fcf441f436b269f5b1ad813178af4406cf6ddf01f3ac24435b3ff8fe2d9678664c147bf92f056b3
+  languageName: node
+  linkType: hard
+
 "lamejs@git+https://github.com/zhuker/lamejs.git":
   version: 1.2.1
   resolution: "lamejs@https://github.com/zhuker/lamejs.git#commit=582bbba6a12f981b984d8fb9e1874499fed85675"
@@ -29797,6 +30549,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.memoize@npm:~3.0.3":
+  version: 3.0.4
+  resolution: "lodash.memoize@npm:3.0.4"
+  checksum: fc52e0916b896fa79d6b85fbeaa0e44a381b70f1fcab7acab10188aaeeb2107e21b9b992bff560f405696e0a6e3bb5c08af18955d628a1e8ab6b11df14ff6172
+  languageName: node
+  linkType: hard
+
 "lodash.merge@npm:4.6.2, lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
@@ -30016,6 +30775,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^11.0.0":
+  version: 11.0.1
+  resolution: "lru-cache@npm:11.0.1"
+  checksum: 6056230a99fb399234e82368b99586bd4740079e80649102f681b19337b7d8c6bc8dd7f8b8c59377c31d26deb89f548b717ae932e139b4b795879d920fccf820
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^4.0.1, lru-cache@npm:^4.1.1":
   version: 4.1.5
   resolution: "lru-cache@npm:4.1.5"
@@ -30607,6 +31373,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"merge-source-map@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "merge-source-map@npm:1.1.0"
+  dependencies:
+    source-map: ^0.6.1
+  checksum: 945a83dcc59eff77dde709be1d3d6cb575c11cd7164a7ccdc1c6f0d463aad7c12750a510bdf84af2c05fac4615c4305d97ac90477975348bb901a905c8e92c4b
+  languageName: node
+  linkType: hard
+
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
@@ -30955,7 +31730,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.2":
+"minimatch@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "minimatch@npm:10.0.1"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: f5b63c2f30606091a057c5f679b067f84a2cd0ffbd2dbc9143bda850afd353c7be81949ff11ae0c86988f07390eeca64efd7143ee05a0dab37f6c6b38a2ebb6c
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
@@ -31079,6 +31863,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "minipass@npm:7.1.2"
+  checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3
+  languageName: node
+  linkType: hard
+
 "minizlib@npm:^1.3.3":
   version: 1.3.3
   resolution: "minizlib@npm:1.3.3"
@@ -31156,7 +31947,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
+"mkdirp@npm:^0.5.0, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
   dependencies:
@@ -31209,6 +32000,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"module-deps@npm:^6.2.3":
+  version: 6.2.3
+  resolution: "module-deps@npm:6.2.3"
+  dependencies:
+    JSONStream: ^1.0.3
+    browser-resolve: ^2.0.0
+    cached-path-relative: ^1.0.2
+    concat-stream: ~1.6.0
+    defined: ^1.0.0
+    detective: ^5.2.0
+    duplexer2: ^0.1.2
+    inherits: ^2.0.1
+    parents: ^1.0.0
+    readable-stream: ^2.0.2
+    resolve: ^1.4.0
+    stream-combiner2: ^1.1.1
+    subarg: ^1.0.0
+    through2: ^2.0.0
+    xtend: ^4.0.0
+  bin:
+    module-deps: bin/cmd.js
+  checksum: cccead8f81b77ec621c29c4407978ce50de6f15c7152b54e81b65ff043d4254fd40071e53a3989a36066ff0d3ce9ae9e65f81aed79b3b5397024dbc8be5d68c7
+  languageName: node
+  linkType: hard
+
 "module-details-from-path@npm:^1.0.3":
   version: 1.0.3
   resolution: "module-details-from-path@npm:1.0.3"
@@ -32379,6 +33195,41 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nyc@npm:^14.1.1":
+  version: 14.1.1
+  resolution: "nyc@npm:14.1.1"
+  dependencies:
+    archy: ^1.0.0
+    caching-transform: ^3.0.2
+    convert-source-map: ^1.6.0
+    cp-file: ^6.2.0
+    find-cache-dir: ^2.1.0
+    find-up: ^3.0.0
+    foreground-child: ^1.5.6
+    glob: ^7.1.3
+    istanbul-lib-coverage: ^2.0.5
+    istanbul-lib-hook: ^2.0.7
+    istanbul-lib-instrument: ^3.3.0
+    istanbul-lib-report: ^2.0.8
+    istanbul-lib-source-maps: ^3.0.6
+    istanbul-reports: ^2.2.4
+    js-yaml: ^3.13.1
+    make-dir: ^2.1.0
+    merge-source-map: ^1.1.0
+    resolve-from: ^4.0.0
+    rimraf: ^2.6.3
+    signal-exit: ^3.0.2
+    spawn-wrap: ^1.4.2
+    test-exclude: ^5.2.3
+    uuid: ^3.3.2
+    yargs: ^13.2.2
+    yargs-parser: ^13.0.0
+  bin:
+    nyc: ./bin/nyc.js
+  checksum: 8d6dae578188cf64e44e28dd53a9b1d366dfc3e30f3877be3dffc30dda815a92f986ac116026b2f23f5b418147884c3cf2f7ac812b2be4051b6392d19ea82376
+  languageName: node
+  linkType: hard
+
 "nyc@npm:^15.1.0":
   version: 15.1.0
   resolution: "nyc@npm:15.1.0"
@@ -32777,7 +33628,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-browserify@npm:^0.3.0":
+"os-browserify@npm:^0.3.0, os-browserify@npm:~0.3.0":
   version: 0.3.0
   resolution: "os-browserify@npm:0.3.0"
   checksum: 16e37ba3c0e6a4c63443c7b55799ce4066d59104143cb637ecb9fce586d5da319cdca786ba1c867abbe3890d2cbf37953f2d51eea85e20dd6c4570d6c54bfebf
@@ -32793,7 +33644,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-homedir@npm:^1.0.0":
+"os-homedir@npm:^1.0.0, os-homedir@npm:^1.0.1":
   version: 1.0.2
   resolution: "os-homedir@npm:1.0.2"
   checksum: af609f5a7ab72de2f6ca9be6d6b91a599777afc122ac5cad47e126c1f67c176fe9b52516b9eeca1ff6ca0ab8587fe66208bc85e40a3940125f03cdb91408e9d2
@@ -33134,6 +33985,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"package-hash@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "package-hash@npm:3.0.0"
+  dependencies:
+    graceful-fs: ^4.1.15
+    hasha: ^3.0.0
+    lodash.flattendeep: ^4.4.0
+    release-zalgo: ^1.0.0
+  checksum: 512dca8cf38689b6681a29d678fc375854cf80eabe037dbe89848ed23bf7be9172d8750b8984f34b06e9da1fe5b278aadc068a7f16fb8157274b1d44d95460ce
+  languageName: node
+  linkType: hard
+
 "package-hash@npm:^4.0.0":
   version: 4.0.0
   resolution: "package-hash@npm:4.0.0"
@@ -33146,6 +34009,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"package-json-from-dist@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "package-json-from-dist@npm:1.0.0"
+  checksum: ac706ec856a5a03f5261e4e48fa974f24feb044d51f84f8332e2af0af04fbdbdd5bbbfb9cbbe354190409bc8307c83a9e38c6672c3c8855f709afb0006a009ea
+  languageName: node
+  linkType: hard
+
 "package-json@npm:^4.0.0":
   version: 4.0.1
   resolution: "package-json@npm:4.0.1"
@@ -33202,6 +34072,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parents@npm:^1.0.0, parents@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "parents@npm:1.0.1"
+  dependencies:
+    path-platform: ~0.11.15
+  checksum: 094fc817d5e8d94e9f9d38c2618a2822f2960b7a268183a36326c5d1cf6ff32f97b1158b0f9b32ab126573996dfe6db104feda6d26e8531d762d178ef4488fc8
+  languageName: node
+  linkType: hard
+
 "parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5":
   version: 5.1.6
   resolution: "parse-asn1@npm:5.1.6"
@@ -33347,7 +34226,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-browserify@npm:0.0.1":
+"path-browserify@npm:0.0.1, path-browserify@npm:~0.0.0":
   version: 0.0.1
   resolution: "path-browserify@npm:0.0.1"
   checksum: ae8dcd45d0d3cfbaf595af4f206bf3ed82d77f72b4877ae7e77328079e1468c84f9386754bb417d994d5a19bf47882fd253565c18441cd5c5c90ae5187599e35
@@ -33408,7 +34287,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-is-absolute@npm:^1.0.0":
+"path-is-absolute@npm:^1.0.0, path-is-absolute@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
   checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
@@ -33443,6 +34322,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-platform@npm:~0.11.15":
+  version: 0.11.15
+  resolution: "path-platform@npm:0.11.15"
+  checksum: 239f2eae720531ff5a48837de68f94ebd7cf6cd2bf295b39beb97c5bafc34a34a683b62f9f5ad5ca5e78d71d7d44c29e7c56373c1c8473ab128a4e648bb898f0
+  languageName: node
+  linkType: hard
+
 "path-posix@npm:^1.0.0":
   version: 1.0.0
   resolution: "path-posix@npm:1.0.0"
@@ -33450,6 +34336,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-scurry@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "path-scurry@npm:2.0.0"
+  dependencies:
+    lru-cache: ^11.0.0
+    minipass: ^7.1.2
+  checksum: 9953ce3857f7e0796b187a7066eede63864b7e1dfc14bf0484249801a5ab9afb90d9a58fc533ebb1b552d23767df8aa6a2c6c62caf3f8a65f6ce336a97bbb484
+  languageName: node
+  linkType: hard
+
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
@@ -34975,7 +35871,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"process@npm:^0.11.1, process@npm:^0.11.10":
+"process@npm:^0.11.1, process@npm:^0.11.10, process@npm:~0.11.0":
   version: 0.11.10
   resolution: "process@npm:0.11.10"
   checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3
@@ -35361,7 +36257,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"querystring-es3@npm:^0.2.0, querystring-es3@npm:^0.2.1":
+"querystring-es3@npm:^0.2.0, querystring-es3@npm:^0.2.1, querystring-es3@npm:~0.2.0":
   version: 0.2.1
   resolution: "querystring-es3@npm:0.2.1"
   checksum: 691e8d6b8b157e7cd49ae8e83fcf86de39ab3ba948c25abaa94fba84c0986c641aa2f597770848c64abce290ed17a39c9df6df737dfa7e87c3b63acc7d225d61
@@ -36216,6 +37112,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-only-stream@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "read-only-stream@npm:2.0.0"
+  dependencies:
+    readable-stream: ^2.0.2
+  checksum: aa48979d1f0e8a83522e60698cf3375dca7b284dd066758ded7c3539613ac08275f94dfe0503d2bdfe964ef3cb65facb87a4b3a8250e5a7e89d07af4451019d8
+  languageName: node
+  linkType: hard
+
 "read-pkg-up@npm:^1.0.1":
   version: 1.0.1
   resolution: "read-pkg-up@npm:1.0.1"
@@ -36226,6 +37131,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-pkg-up@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "read-pkg-up@npm:4.0.0"
+  dependencies:
+    find-up: ^3.0.0
+    read-pkg: ^3.0.0
+  checksum: dd867d9a912707bc11340aebc91780be9f36f34ee1d27a5dafb8520e0cb6344138b80eb8bf8325bebf519d26ecf14cbf6190d9e5f765f0120da5ede4013f4d13
+  languageName: node
+  linkType: hard
+
 "read-pkg-up@npm:^7.0.1":
   version: 7.0.1
   resolution: "read-pkg-up@npm:7.0.1"
@@ -36354,7 +37269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.3.8":
+"readable-stream@npm:^2, readable-stream@npm:^2.3.8":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
   dependencies:
@@ -36532,6 +37447,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect-metadata@npm:^0.1.3":
+  version: 0.1.14
+  resolution: "reflect-metadata@npm:0.1.14"
+  checksum: 155ad339319cec3c2d9d84719f730f8b6a6cd2a074733ec29dbae6c89d48a2914c7d07a2350212594f3aae160fa4da4f903e6512f27ceaf968443a7c692bcad0
+  languageName: node
+  linkType: hard
+
 "reflect.getprototypeof@npm:^1.0.4":
   version: 1.0.6
   resolution: "reflect.getprototypeof@npm:1.0.6"
@@ -37017,7 +37939,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.3.2":
+"resolve@npm:^1.1.4, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.3.2, resolve@npm:^1.4.0":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -37043,7 +37965,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -37180,7 +38102,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^2.2.8, rimraf@npm:^2.5.4, rimraf@npm:^2.6.1, rimraf@npm:^2.6.3":
+"rimraf@npm:^2.2.8, rimraf@npm:^2.5.4, rimraf@npm:^2.6.1, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
   dependencies:
@@ -37202,6 +38124,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rimraf@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "rimraf@npm:6.0.1"
+  dependencies:
+    glob: ^11.0.0
+    package-json-from-dist: ^1.0.0
+  bin:
+    rimraf: dist/esm/bin.mjs
+  checksum: 8ba5b84131c1344e9417cb7e8c05d8368bb73cbe5dd4c1d5eb49fc0b558209781658d18c450460e30607d0b7865bb067482839a2f343b186b07ae87715837e66
+  languageName: node
+  linkType: hard
+
 "ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
   version: 2.0.2
   resolution: "ripemd160@npm:2.0.2"
@@ -37229,7 +38163,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.868
+    "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": ~0.31.25
@@ -37974,7 +38908,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8":
+"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8, sha.js@npm:~2.4.4":
   version: 2.4.11
   resolution: "sha.js@npm:2.4.11"
   dependencies:
@@ -38019,6 +38953,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"shasum-object@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "shasum-object@npm:1.0.0"
+  dependencies:
+    fast-safe-stringify: ^2.0.7
+  checksum: fc3531b7ae6ca1cc76138bec54896ee61ff4e7cc62e37ebd47963c8c92f867c6232332e21437dbca60c9109e077b38ece631b59b045e10e0502949363e337895
+  languageName: node
+  linkType: hard
+
+"shasum@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "shasum@npm:1.0.2"
+  dependencies:
+    json-stable-stringify: ~0.0.0
+    sha.js: ~2.4.4
+  checksum: 61d908825cb4c7a40aa098a5b1a6f8baa782dee38f996fbb0b86358b92a424a6467c5f6e1cadf42567f4283ff640dbf2dbc321e5ab293ca3d4d50657c3908bec
+  languageName: node
+  linkType: hard
+
 "shebang-command@npm:^1.2.0":
   version: 1.2.0
   resolution: "shebang-command@npm:1.2.0"
@@ -38129,6 +39082,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"signal-exit@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549
+  languageName: node
+  linkType: hard
+
 "simple-concat@npm:^1.0.0":
   version: 1.0.1
   resolution: "simple-concat@npm:1.0.1"
@@ -38477,7 +39437,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:^0.5.16, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20":
+"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20":
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
   dependencies:
@@ -38494,7 +39454,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.5.0, source-map@npm:^0.5.6":
+"source-map@npm:^0.5.0, source-map@npm:^0.5.6, source-map@npm:~0.5.3":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
   checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
@@ -38531,6 +39491,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"spawn-wrap@npm:^1.4.2":
+  version: 1.4.3
+  resolution: "spawn-wrap@npm:1.4.3"
+  dependencies:
+    foreground-child: ^1.5.6
+    mkdirp: ^0.5.0
+    os-homedir: ^1.0.1
+    rimraf: ^2.6.2
+    signal-exit: ^3.0.2
+    which: ^1.3.0
+  checksum: 0a6e6bbb7bec2b68ae3c002d53b4fa6dab616948b24d1389abf8451713646694f8e11339b6eb0c671c7bfc4d9eeeb0d7599dc4869a5f983a1647fb80c59ebcf5
+  languageName: node
+  linkType: hard
+
 "spawn-wrap@npm:^2.0.0":
   version: 2.0.0
   resolution: "spawn-wrap@npm:2.0.0"
@@ -38873,7 +39847,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-browserify@npm:^2.0.1":
+"stream-browserify@npm:^2.0.0, stream-browserify@npm:^2.0.1":
   version: 2.0.2
   resolution: "stream-browserify@npm:2.0.2"
   dependencies:
@@ -38900,6 +39874,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stream-combiner2@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "stream-combiner2@npm:1.1.1"
+  dependencies:
+    duplexer2: ~0.1.0
+    readable-stream: ^2.0.2
+  checksum: dd32d179fa8926619c65471a7396fc638ec8866616c0b8747c4e05563ccdb0b694dd4e83cd799f1c52789c965a40a88195942b82b8cea2ee7a5536f1954060f9
+  languageName: node
+  linkType: hard
+
 "stream-combiner@npm:~0.0.4":
   version: 0.0.4
   resolution: "stream-combiner@npm:0.0.4"
@@ -38941,7 +39925,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-http@npm:^3.2.0":
+"stream-http@npm:^3.0.0, stream-http@npm:^3.2.0":
   version: 3.2.0
   resolution: "stream-http@npm:3.2.0"
   dependencies:
@@ -38960,6 +39944,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stream-splicer@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "stream-splicer@npm:2.0.1"
+  dependencies:
+    inherits: ^2.0.1
+    readable-stream: ^2.0.2
+  checksum: 7bb3563961450e69183baa04272e042bdd7df44f6d75bf1cce0d6a628efd2d4b0a0d2a290bed0674ea7719c87e6cf6bf7406ca1d17413abf1484430d36d65580
+  languageName: node
+  linkType: hard
+
 "stream-transform@npm:^2.1.3":
   version: 2.1.3
   resolution: "stream-transform@npm:2.1.3"
@@ -39110,6 +40104,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "string-width@npm:4.2.3"
+  dependencies:
+    emoji-regex: ^8.0.0
+    is-fullwidth-code-point: ^3.0.0
+    strip-ansi: ^6.0.1
+  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
+  languageName: node
+  linkType: hard
+
 "string-width@npm:^1.0.1":
   version: 1.0.2
   resolution: "string-width@npm:1.0.2"
@@ -39121,17 +40126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3":
-  version: 4.2.3
-  resolution: "string-width@npm:4.2.3"
-  dependencies:
-    emoji-regex: ^8.0.0
-    is-fullwidth-code-point: ^3.0.0
-    strip-ansi: ^6.0.1
-  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
-  languageName: node
-  linkType: hard
-
 "string-width@npm:^2.0.0, string-width@npm:^2.1.0, string-width@npm:^2.1.1":
   version: 2.1.1
   resolution: "string-width@npm:2.1.1"
@@ -39142,6 +40136,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-width@npm:^3.0.0, string-width@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "string-width@npm:3.1.0"
+  dependencies:
+    emoji-regex: ^7.0.1
+    is-fullwidth-code-point: ^2.0.0
+    strip-ansi: ^5.1.0
+  checksum: 57f7ca73d201682816d573dc68bd4bb8e1dff8dc9fcf10470fdfc3474135c97175fec12ea6a159e67339b41e86963112355b64529489af6e7e70f94a7caf08b2
+  languageName: node
+  linkType: hard
+
+"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: ^0.2.0
+    emoji-regex: ^9.2.2
+    strip-ansi: ^7.0.1
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+  languageName: node
+  linkType: hard
+
 "string.prototype.matchall@npm:^4.0.0 || ^3.0.1, string.prototype.matchall@npm:^4.0.8":
   version: 4.0.8
   resolution: "string.prototype.matchall@npm:4.0.8"
@@ -39239,6 +40255,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "strip-ansi@npm:6.0.1"
+  dependencies:
+    ansi-regex: ^5.0.1
+  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
+  languageName: node
+  linkType: hard
+
 "strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1":
   version: 3.0.1
   resolution: "strip-ansi@npm:3.0.1"
@@ -39257,7 +40282,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^5.1.0":
+"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0":
   version: 5.2.0
   resolution: "strip-ansi@npm:5.2.0"
   dependencies:
@@ -39266,12 +40291,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "strip-ansi@npm:6.0.1"
+"strip-ansi@npm:^7.0.1":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
   dependencies:
-    ansi-regex: ^5.0.1
-  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
+    ansi-regex: ^6.0.1
+  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
   languageName: node
   linkType: hard
 
@@ -39524,6 +40549,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"subarg@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "subarg@npm:1.0.0"
+  dependencies:
+    minimist: ^1.1.0
+  checksum: 8359df72e9a2d03c35702ba58e49cac04daae8f27dff26837e12687c7d10cb800a036fd33fdc5eb0e8c24fb25d804f657fe8bde18dd3dd6ec7dab8eff7aac27e
+  languageName: node
+  linkType: hard
+
 "superagent@npm:^8.0.0":
   version: 8.0.0
   resolution: "superagent@npm:8.0.0"
@@ -39587,6 +40621,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"supports-color@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "supports-color@npm:6.1.0"
+  dependencies:
+    has-flag: ^3.0.0
+  checksum: 74358f9535c83ee113fbaac354b11e808060f6e7d8722082ee43af3578469134e89d00026dce2a6b93ce4e5b89d0e9a10f638b2b9f64c7838c2fb2883a47b3d5
+  languageName: node
+  linkType: hard
+
 "supports-color@npm:^7.0.0, supports-color@npm:^7.1.0, supports-color@npm:^7.2.0, supports-color@npm:~7.2.0":
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
@@ -39720,6 +40763,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"syntax-error@npm:^1.1.1":
+  version: 1.4.0
+  resolution: "syntax-error@npm:1.4.0"
+  dependencies:
+    acorn-node: ^1.2.0
+  checksum: c1c3f048fed1948865fda5e79e11b02addb32da323c9c9fb214d3a933f9fda668e55c848f7c4082514ea4f1cf3dcfab0c7b9c762bfad1306271753c0fcc4b14f
+  languageName: node
+  linkType: hard
+
 "systeminformation@npm:^5.7":
   version: 5.11.9
   resolution: "systeminformation@npm:5.11.9"
@@ -39742,6 +40794,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tap-bark@npm:1.0.0, tap-bark@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "tap-bark@npm:1.0.0"
+  dependencies:
+    "@types/node": ">=0.0.2"
+    chalk: ^1.1.3
+    duplexer: ^0.1.1
+    tap-parser: ^3.0.3
+    through2: ^2.0.1
+  bin:
+    tap-bark: index.js
+  checksum: cb452b8b3ac8a405f9dc577c405a7fcaa5261d31ab5310cbf98cf3a89b960734470561a04a6ecb41b07f33ee4e9c358bce4949f1a07d4ca8550ba6a489b993e7
+  languageName: node
+  linkType: hard
+
+"tap-parser@npm:^3.0.3":
+  version: 3.0.5
+  resolution: "tap-parser@npm:3.0.5"
+  dependencies:
+    events-to-array: ^1.0.1
+    js-yaml: ^3.2.7
+    readable-stream: ^2
+  dependenciesMeta:
+    readable-stream:
+      optional: true
+  bin:
+    tap-parser: bin/cmd.js
+  checksum: 01504e8c84434c34e0eb8582a771788a657e79ddb20c4625192656b8395dcbee4b56edbd0d1bd98c3c9907e246bd22ae086a23714ef51dc40b655589d79059de
+  languageName: node
+  linkType: hard
+
 "tapable@npm:^1.0.0, tapable@npm:^1.1.3":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"
@@ -40064,6 +41147,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"test-exclude@npm:^5.2.3":
+  version: 5.2.3
+  resolution: "test-exclude@npm:5.2.3"
+  dependencies:
+    glob: ^7.1.3
+    minimatch: ^3.0.4
+    read-pkg-up: ^4.0.0
+    require-main-filename: ^2.0.0
+  checksum: 3a67bee51b0afb0b7a51b649a7dacd920d929de2b3eccb52fa818f0b0bf2ebfced1d1a77a206b74f95c50f6682e313eedb8000cfdd5ac2f9cc6ed8a32fc4ff2e
+  languageName: node
+  linkType: hard
+
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -40134,7 +41229,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through2@npm:^2.0.0, through2@npm:~2.0.3":
+"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:~2.0.3":
   version: 2.0.5
   resolution: "through2@npm:2.0.5"
   dependencies:
@@ -40154,7 +41249,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:2, through@npm:^2.3.6, through@npm:^2.3.8, through@npm:~2.3, through@npm:~2.3.1":
+"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.6, through@npm:^2.3.8, through@npm:~2.3, through@npm:~2.3.1":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
   checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
@@ -40175,6 +41270,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"timers-browserify@npm:^1.0.1":
+  version: 1.4.2
+  resolution: "timers-browserify@npm:1.4.2"
+  dependencies:
+    process: ~0.11.0
+  checksum: b7437e228684d8e6e193580d363ffdcd752396c0d1013503f50e412aa86e920248a8627450ad40557443e07ef6b9b602ffc940b3ba06db23774a7ab507e1911d
+  languageName: node
+  linkType: hard
+
 "timers-browserify@npm:^2.0.12, timers-browserify@npm:^2.0.4":
   version: 2.0.12
   resolution: "timers-browserify@npm:2.0.12"
@@ -40582,6 +41686,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-node@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "ts-node@npm:6.2.0"
+  dependencies:
+    arrify: ^1.0.0
+    buffer-from: ^1.1.0
+    diff: ^3.1.0
+    make-error: ^1.1.1
+    minimist: ^1.2.0
+    mkdirp: ^0.5.1
+    source-map-support: ^0.5.6
+    yn: ^2.0.0
+  bin:
+    ts-node: dist/bin.js
+  checksum: 3d481305250f7026dcfd435bda227324c2e155574cd9a0858eeb5ba40f3f5c411bdb5a4701e74ac9ada31de4bfb75341e7cee7cdbc3cf9e1f89c412b810c60e8
+  languageName: node
+  linkType: hard
+
+"ts-node@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "ts-node@npm:7.0.1"
+  dependencies:
+    arrify: ^1.0.0
+    buffer-from: ^1.1.0
+    diff: ^3.1.0
+    make-error: ^1.1.1
+    minimist: ^1.2.0
+    mkdirp: ^0.5.1
+    source-map-support: ^0.5.6
+    yn: ^2.0.0
+  bin:
+    ts-node: dist/bin.js
+  checksum: 07ed6ea1805361828737a767cfd6c57ea6e267ee8679282afb933610af02405e1a87c1f2aea1d38ed8e66b34fcbf6272b6021ab95d78849105d2e57fc283870b
+  languageName: node
+  linkType: hard
+
 "ts-patch@npm:~3.2.1":
   version: 3.2.1
   resolution: "ts-patch@npm:3.2.1"
@@ -41050,6 +42190,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:~5.1.6":
+  version: 5.1.6
+  resolution: "typescript@npm:5.1.6"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: b2f2c35096035fe1f5facd1e38922ccb8558996331405eb00a5111cc948b2e733163cc22fab5db46992aba7dd520fff637f2c1df4996ff0e134e77d3249a7350
+  languageName: node
+  linkType: hard
+
 "typescript@npm:~5.5.4":
   version: 5.5.4
   resolution: "typescript@npm:5.5.4"
@@ -41060,6 +42210,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@~5.1.6#~builtin<compat/typescript>":
+  version: 5.1.6
+  resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=85af82"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 21e88b0a0c0226f9cb9fd25b9626fb05b4c0f3fddac521844a13e1f30beb8f14e90bd409a9ac43c812c5946d714d6e0dee12d5d02dfc1c562c5aacfa1f49b606
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@~5.5.4#~builtin<compat/typescript>":
   version: 5.5.4
   resolution: "typescript@patch:typescript@npm%3A5.5.4#~builtin<compat/typescript>::version=5.5.4&hash=85af82"
@@ -41118,6 +42278,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uglify-es@npm:^3.3.9":
+  version: 3.3.10
+  resolution: "uglify-es@npm:3.3.10"
+  dependencies:
+    commander: ~2.14.1
+    source-map: ~0.6.1
+  bin:
+    uglifyjs: bin/uglifyjs
+  checksum: 22b028b6454c4d684c76617e9ac5b8da0e56611b32cd5d89e797225d6f1022f697a5642d9084319436df3aed462225749f8287d37bf67dccda1ac9d0365dd950
+  languageName: node
+  linkType: hard
+
 "uglify-js@npm:^3.1.4":
   version: 3.15.3
   resolution: "uglify-js@npm:3.15.3"
@@ -41134,6 +42306,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"umd@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "umd@npm:3.0.3"
+  bin:
+    umd: ./bin/cli.js
+  checksum: 264302acabbc71ef279cfb832d6bb53096a12618e9ef8465b274c5a3fffa5f4da6cf7b8d024fec53a7114742c132bba9f6a6d4d4b5eca2bb55d556d0c57a9f15
+  languageName: node
+  linkType: hard
+
 "unbox-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"
@@ -41156,6 +42337,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undeclared-identifiers@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "undeclared-identifiers@npm:1.1.3"
+  dependencies:
+    acorn-node: ^1.3.0
+    dash-ast: ^1.0.0
+    get-assigned-identifiers: ^1.2.0
+    simple-concat: ^1.0.0
+    xtend: ^4.0.1
+  bin:
+    undeclared-identifiers: bin.js
+  checksum: e1f2a18d7bf735ec2b9ee464a621d8db72768e75e59334d34d1f7085e21558c621cc105dfd4cc7a0a219b91c43b71fbdea0508cdbe3b3396ed96902c6d5d590e
+  languageName: node
+  linkType: hard
+
 "underscore@npm:^1.13.7":
   version: 1.13.7
   resolution: "underscore@npm:1.13.7"
@@ -41177,6 +42373,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~5.26.4":
+  version: 5.26.5
+  resolution: "undici-types@npm:5.26.5"
+  checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487
+  languageName: node
+  linkType: hard
+
+"undici-types@npm:~6.19.2":
+  version: 6.19.8
+  resolution: "undici-types@npm:6.19.8"
+  checksum: de51f1b447d22571cf155dfe14ff6d12c5bdaec237c765085b439c38ca8518fc360e88c70f99469162bf2e14188a7b0bcb06e1ed2dc031042b984b0bb9544017
+  languageName: node
+  linkType: hard
+
 "unfetch@npm:^4.2.0":
   version: 4.2.0
   resolution: "unfetch@npm:4.2.0"
@@ -41664,7 +42874,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url@npm:^0.11.4":
+"url@npm:^0.11.4, url@npm:~0.11.0":
   version: 0.11.4
   resolution: "url@npm:0.11.4"
   dependencies:
@@ -41842,7 +43052,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util@npm:^0.10.3":
+"util@npm:^0.10.3, util@npm:^0.10.4, util@npm:~0.10.1":
   version: 0.10.4
   resolution: "util@npm:0.10.4"
   dependencies:
@@ -42126,7 +43336,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vm-browserify@npm:^1.0.1, vm-browserify@npm:^1.1.2":
+"vm-browserify@npm:^1.0.0, vm-browserify@npm:^1.0.1, vm-browserify@npm:^1.1.2":
   version: 1.1.2
   resolution: "vm-browserify@npm:1.1.2"
   checksum: 10a1c50aab54ff8b4c9042c15fc64aefccce8d2fb90c0640403242db0ee7fb269f9b102bdb69cfb435d7ef3180d61fd4fb004a043a12709abaf9056cfd7e039d
@@ -42945,7 +44155,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:^1.2.0, which@npm:^1.2.9, which@npm:^1.3.1":
+"which@npm:^1.2.0, which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"
   dependencies:
@@ -43079,6 +44289,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "wrap-ansi@npm:7.0.0"
+  dependencies:
+    ansi-styles: ^4.0.0
+    string-width: ^4.1.0
+    strip-ansi: ^6.0.0
+  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "wrap-ansi@npm:5.1.0"
+  dependencies:
+    ansi-styles: ^3.2.0
+    string-width: ^3.0.0
+    strip-ansi: ^5.0.0
+  checksum: 9b48c862220e541eb0daa22661b38b947973fc57054e91be5b0f2dcc77741a6875ccab4ebe970a394b4682c8dfc17e888266a105fb8b0a9b23c19245e781ceae
+  languageName: node
+  linkType: hard
+
 "wrap-ansi@npm:^6.0.1, wrap-ansi@npm:^6.2.0":
   version: 6.2.0
   resolution: "wrap-ansi@npm:6.2.0"
@@ -43090,14 +44322,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "wrap-ansi@npm:7.0.0"
+"wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+    ansi-styles: ^6.1.0
+    string-width: ^5.0.1
+    strip-ansi: ^7.0.1
+  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
   languageName: node
   linkType: hard
 
@@ -43108,7 +44340,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^2.0.0":
+"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.4.2":
   version: 2.4.3
   resolution: "write-file-atomic@npm:2.4.3"
   dependencies:
@@ -43420,6 +44652,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs-parser@npm:^13.0.0, yargs-parser@npm:^13.1.2":
+  version: 13.1.2
+  resolution: "yargs-parser@npm:13.1.2"
+  dependencies:
+    camelcase: ^5.0.0
+    decamelize: ^1.2.0
+  checksum: c8bb6f44d39a4acd94462e96d4e85469df865de6f4326e0ab1ac23ae4a835e5dd2ddfe588317ebf80c3a7e37e741bd5cb0dc8d92bcc5812baefb7df7c885e86b
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^18.1.2, yargs-parser@npm:^18.1.3":
   version: 18.1.3
   resolution: "yargs-parser@npm:18.1.3"
@@ -43471,6 +44713,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs@npm:^13.2.2":
+  version: 13.3.2
+  resolution: "yargs@npm:13.3.2"
+  dependencies:
+    cliui: ^5.0.0
+    find-up: ^3.0.0
+    get-caller-file: ^2.0.1
+    require-directory: ^2.1.1
+    require-main-filename: ^2.0.0
+    set-blocking: ^2.0.0
+    string-width: ^3.0.0
+    which-module: ^2.0.0
+    y18n: ^4.0.0
+    yargs-parser: ^13.1.2
+  checksum: 75c13e837eb2bb25717957ba58d277e864efc0cca7f945c98bdf6477e6ec2f9be6afa9ed8a876b251a21423500c148d7b91e88dee7adea6029bdec97af1ef3e8
+  languageName: node
+  linkType: hard
+
 "yargs@npm:^15.0.2, yargs@npm:^15.1.0, yargs@npm:^15.4.1":
   version: 15.4.1
   resolution: "yargs@npm:15.4.1"
@@ -43531,6 +44791,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yn@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "yn@npm:2.0.0"
+  checksum: 9d49527cb3e9a0948cc057223810bf30607bf04b9ff7666cc1681a6501d660b60d90000c16f9e29311b0f28d8a06222ada565ccdca5f1049cdfefb1908217572
+  languageName: node
+  linkType: hard
+
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"

From 2e3ad27df7d182a2308d44af4877851398038c09 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Sat, 28 Sep 2024 00:09:38 +0000
Subject: [PATCH 131/170] Release 6.13.0-rc.3

[no ci]
---
 .changeset/bump-patch-1727482167703.md        |  5 +++
 .changeset/pre.json                           |  2 ++
 apps/meteor/CHANGELOG.md                      | 34 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 +++++++
 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          | 13 +++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 +++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 +++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 +++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/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/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/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 22 ++++++------
 69 files changed, 429 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/bump-patch-1727482167703.md

diff --git a/.changeset/bump-patch-1727482167703.md b/.changeset/bump-patch-1727482167703.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727482167703.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 467d26f1e0fd..20c16763e622 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -67,8 +67,10 @@
     "brown-singers-appear",
     "bump-patch-1727212585363",
     "bump-patch-1727392133102",
+    "bump-patch-1727482167703",
     "cyan-ladybugs-thank",
     "dirty-stingrays-beg",
+    "dry-taxis-cry",
     "five-coats-rhyme",
     "four-cherries-kneel",
     "great-humans-live",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 891e1aacc10d..6b83bda6054c 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.3
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33381](https://github.com/RocketChat/Rocket.Chat/pull/33381)) Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/license@0.2.8-rc.3
+  - @rocket.chat/omnichannel-services@0.3.5-rc.3
+  - @rocket.chat/pdf-worker@0.2.5-rc.3
+  - @rocket.chat/presence@0.2.8-rc.3
+  - @rocket.chat/api-client@0.2.8-rc.3
+  - @rocket.chat/apps@0.1.8-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/cron@0.1.8-rc.3
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.3
+  - @rocket.chat/gazzodown@11.0.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.3
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  - @rocket.chat/ui-client@11.0.0-rc.3
+  - @rocket.chat/ui-video-conf@11.0.0-rc.3
+  - @rocket.chat/web-ui-registration@11.0.0-rc.3
+  - @rocket.chat/instance-status@0.1.8-rc.3
+  </details>
+
 ## 6.13.0-rc.2
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index cdb965e398f1..2638289a7e61 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.2"
+	"version": "6.13.0-rc.3"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 533aa4bed06a..827c10e1d445 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 1.3.5-rc.2
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 3824180239ba..641da5b884ad 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": "1.3.5-rc.2",
+	"version": "1.3.5-rc.3",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index ad9f35d1e940..0baa3db6a38a 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": "6.13.0-rc.2",
+	"version": "6.13.0-rc.3",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 8355445a504c..306fc9afdf93 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  </details>
+
 ## 0.5.0-rc.2
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 31978e953958..648126b560c4 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.5.0-rc.2",
+  "version": "0.5.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 3f7aacf72531..116a510a4f44 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.4.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 995f14803292..9e603e087a66 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.8-rc.2",
+	"version": "0.4.8-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 596be6356d49..31047524470c 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.4.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 1b824e01726c..a4bc1a9cf0fe 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.8-rc.2",
+	"version": "0.4.8-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 50a3a8329ef0..2e04e1aa0f14 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  - @rocket.chat/instance-status@0.1.8-rc.3
+  </details>
+
 ## 0.3.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 5feec2abc901..93b0372bb7dd 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.8-rc.2",
+	"version": "0.3.8-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 6b87f074638c..d3f4dfa68587 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.5-rc.3
+  - @rocket.chat/pdf-worker@0.2.5-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.4.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 53ba16262a44..371d24504b62 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.8-rc.2",
+	"version": "0.4.8-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 b73a591e04c3..412874a02978 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/presence@0.2.8-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.4.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 88c87a1785ba..ec15e085102b 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.8-rc.2",
+	"version": "0.4.8-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 bd77d36d5fb1..640fba5932c5 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.5-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.4.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index f9522c510479..f663bcd5b297 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.8-rc.2",
+	"version": "0.4.8-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 8d119d985f98..9dab02aed6bb 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.4.8-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 9fb58738737a..0c6fb660e591 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.8-rc.2",
+	"version": "0.4.8-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 5325c6fdab8c..b1482e1a3387 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
 ## 0.2.8-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 976461397924..07444d692732 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.2",
+	"version": "0.2.8-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 04c1ed37d1f7..ec2c98f2c332 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.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/pdf-worker@0.2.5-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.3.5-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 7d784b9ca847..25ce429750c1 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.5-rc.2",
+	"version": "0.3.5-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 666ab0405664..4363690a3238 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.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
 ## 0.2.5-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index ef5fe9e25641..72d5e16eaa7e 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.5-rc.2",
+	"version": "0.2.5-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 8478835b20c8..369cf0716f6b 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.2.8-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index a658148d537f..20804792be28 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.2",
+	"version": "0.2.8-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 6da849fc768d..23b2bcfb07eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.2",
+	"version": "6.13.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 879fad65c766..261a242ddf10 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  </details>
+
 ## 0.2.8-rc.2
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 972e51d4d804..a3ebf1f274bd 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.8-rc.2",
+	"version": "0.2.8-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 78678d25bbfc..deeb3fed3dfa 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  </details>
+
 ## 0.1.8-rc.2
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 4262f5447404..3998174291ec 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.2",
+	"version": "0.1.8-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 853a8fc13260..a5aa06bf749b 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.7.0-rc.2
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index effb18278253..bb682ffc127d 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.0-rc.2",
+	"version": "0.7.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index d8dd0a43ceb0..2c0ee7493b42 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.3
+
 ## 6.13.0-rc.2
 
 ## 6.13.0-rc.1
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 88748914eb47..f597cf5a132a 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.2",
+	"version": "6.13.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index a783830d3db8..43e9077d1ebd 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.1.8-rc.2
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index f23f1f9b04ae..47c1809434e7 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.2",
+	"version": "0.1.8-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 20b386444de1..dfda57db8a84 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/api-client@0.2.8-rc.3
+  </details>
+
 ## 0.3.8-rc.2
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 54b10ecc53c9..6bb6533f325a 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.8-rc.2",
+	"version": "0.3.8-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index c5c801fd123b..8b78d09cdb82 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/gazzodown@11.0.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  - @rocket.chat/ui-video-conf@11.0.0-rc.3
+  </details>
+
 ## 11.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 93e937c566a8..7c3ecba078d8 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.2",
+  "version": "11.0.0-rc.3",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.2",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.2",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.3",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.3",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.2",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.3",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 0b4fb2012547..7d6cc7dde6f1 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-client@11.0.0-rc.3
+  </details>
+
 ## 11.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index a905e90e2a4c..13b13452d76d 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.2",
+	"version": "11.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -74,8 +74,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "11.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
+		"@rocket.chat/ui-client": "11.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 592d2b18879b..a58ce56ef3df 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
 ## 0.1.8-rc.2
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index edcad17e2ff8..57b8e54472c7 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.8-rc.2",
+	"version": "0.1.8-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 4c20e6d34d2f..cb505262626b 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.3
+  </details>
+
 ## 1.20.0-rc.2
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index c3fb62ebc539..6531068a6a31 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.2",
+	"version": "1.20.0-rc.3",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 51f30ad091e7..63ee6102f6e6 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
 ## 0.8.0-rc.2
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index a3344bf44577..67a78bfa4439 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.2",
+	"version": "0.8.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 effdec77a73e..f736fb401d4c 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  </details>
+
 ## 0.3.0-rc.2
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 578e1f52d9b5..46de1a5061bf 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.2",
+	"version": "0.3.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 4fc0ce1a524d..3e71153b8283 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
 ## 6.13.0-rc.2
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index d9259c966591..57f96bb7bab6 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.2",
+	"version": "6.13.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 06d8d346596a..20a2ba3e7dc7 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  </details>
+
 ## 7.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 2504481c999f..562e4ab340b5 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.2",
+	"version": "7.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 77ee80a47966..fe6f08d8d8ed 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  </details>
+
 ## 11.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index dc49888789de..26c5010575ff 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "11.0.0-rc.2",
+	"version": "11.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index d77eb16272a0..27d3df55a0bd 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/ddp-client@0.3.8-rc.3
+  </details>
+
 ## 11.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index eaf609940c86..ea74a40cdfd1 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.2",
+	"version": "11.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 edef43cd60e4..cfa6b630850d 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  </details>
+
 ## 11.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 1ec416147b4f..c26239a5c7d6 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": "11.0.0-rc.2",
+	"version": "11.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 5d342fe4754c..68121f9acbb3 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  </details>
+
 ## 11.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 6cacf9fea0bf..ab576a36bc02 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": "11.0.0-rc.2",
+	"version": "11.0.0-rc.3",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index 2b1e2b970d43..ffd59bc6be3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8959,10 +8959,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.1
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-avatar": 7.0.0-rc.2
+    "@rocket.chat/ui-contexts": 11.0.0-rc.2
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.1
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.2
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9049,8 +9049,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 11.0.0-rc.1
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-client": 11.0.0-rc.2
+    "@rocket.chat/ui-contexts": 11.0.0-rc.2
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10257,7 +10257,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.2
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10308,8 +10308,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.1
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-avatar": 7.0.0-rc.2
+    "@rocket.chat/ui-contexts": 11.0.0-rc.2
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10478,8 +10478,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.1
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-avatar": 7.0.0-rc.2
+    "@rocket.chat/ui-contexts": 11.0.0-rc.2
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10567,7 +10567,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.2
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 637b70465572eda52cff92553ec9dc4d3203caf0 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Mon, 30 Sep 2024 18:22:06 +0530
Subject: [PATCH 132/170] regression: MarkdownText component to parse nested
 emphasis tokens (#33385)

---
 .../client/components/MarkdownText.spec.tsx   | 34 +++++++++++++------
 .../meteor/client/components/MarkdownText.tsx |  8 ++---
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/apps/meteor/client/components/MarkdownText.spec.tsx b/apps/meteor/client/components/MarkdownText.spec.tsx
index 86ebadad8463..69e7a8c25cd2 100644
--- a/apps/meteor/client/components/MarkdownText.spec.tsx
+++ b/apps/meteor/client/components/MarkdownText.spec.tsx
@@ -15,26 +15,30 @@ const markdownText = `
   **Paragraph text**: *Bold with one asterisk* **Bold with two asterisks** Lorem ipsum dolor sit amet, consectetur adipiscing elit.
   ## Heading 2
   _Italic Text_: _Italic with one underscore_ __Italic with two underscores__ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-  ### Heading 3 
+  ### Heading 3
   Lists, Links and elements
-  **Unordered List** 
-  - List Item 1 
-  - List Item 2 
-  - List Item 3 
+  **Unordered List**
+  - List Item 1
+  - List Item 2
+  - List Item 3
   - List Item 4
-  **Ordered List** 
+  **Ordered List**
   1. List Item 1
   2. List Item 2
   3. List Item 3
   4. List Item 4
-  **Links:** 
+  **Links:**
   [Rocket.Chat](rocket.chat)
-  gabriel.engel@rocket.chat 
-  +55991999999 
+  gabriel.engel@rocket.chat
+  +55991999999
   \`Inline code\`
-  \`\`\`typescript 
+  \`\`\`typescript
   const test = 'this is code'
   \`\`\`
+  **Bold text within __Italics__**
+  *Bold text with single asterik and underscore within _Italics_*
+  __Italics within **Bold** text__
+  _Italics within *Bold* text with single underscore and asterik_
 `;
 
 it('should render html elements as expected using default parser', async () => {
@@ -54,13 +58,17 @@ it('should render html elements as expected using default parser', async () => {
 		'<em>Italic Text</em>: <em>Italic with one underscore</em> <em>Italic with two underscores</em> Lorem ipsum dolor sit amet',
 	);
 	expect(normalizedHtml).toContain('<h3>Heading 3</h3>');
-	expect(normalizedHtml).toContain('<ul> <li>List Item 1 </li><li>List Item 2 </li><li>List Item 3 </li><li>List Item 4');
+	expect(normalizedHtml).toContain('<ul> <li>List Item 1</li><li>List Item 2</li><li>List Item 3</li><li>List Item 4');
 	expect(normalizedHtml).toContain('<ol> <li>List Item 1</li><li>List Item 2</li><li>List Item 3</li><li>List Item 4');
 	expect(normalizedHtml).toContain('<a title="" rel="nofollow noopener noreferrer" target="_blank">Rocket.Chat</a>');
 	expect(normalizedHtml).toContain('gabriel.engel@rocket.chat');
 	expect(normalizedHtml).toContain('+55991999999');
 	expect(normalizedHtml).toContain('<code>Inline code</code>');
 	expect(normalizedHtml).toContain('<pre><code class="language-typescript">const test = \'this is code\' </code></pre>');
+	expect(normalizedHtml).toContain('<strong>Bold text within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<strong>Bold text with single asterik and underscore within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text</em>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text with single underscore and asterik</em>');
 });
 
 it('should render html elements as expected using inline parser', async () => {
@@ -89,4 +97,8 @@ it('should render html elements as expected using inline parser', async () => {
 	expect(normalizedHtml).toContain('+55991999999');
 	expect(normalizedHtml).toContain('Inline code');
 	expect(normalizedHtml).toContain(`typescript const test = 'this is code'`);
+	expect(normalizedHtml).toContain('<strong>Bold text within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<strong>Bold text with single asterik and underscore within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text</em>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text with single underscore and asterik</em>');
 });
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index 0b7d2efa780e..a116ad83ddd9 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -23,10 +23,10 @@ const inlineWithoutBreaks = new marked.Renderer();
 const walkTokens = (token: marked.Token) => {
 	const boldPattern = /^\*[^*]+\*$|^\*\*[^*]+\*\*$/;
 	const italicPattern = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;
-	if (boldPattern.test(token.raw)) {
-		token.type = 'strong';
-	} else if (italicPattern.test(token.raw)) {
-		token.type = 'em';
+	if (boldPattern.test(token.raw) && token.type === 'em') {
+		token.type = 'strong' as 'em';
+	} else if (italicPattern.test(token.raw) && token.type === 'strong') {
+		token.type = 'em' as 'strong';
 	}
 };
 

From 662aca32d946ebfc60e2faa3133801f01a56c8ac Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Mon, 30 Sep 2024 10:47:24 -0600
Subject: [PATCH 133/170] fix: Async E2EE key exchange not working on develop
 (#33378)

---
 .changeset/witty-apples-pretend.md                   |  5 +++++
 .../e2e/server/functions/handleSuggestedGroupKey.ts  | 12 +++++++++---
 .../server/methods/setUserPublicAndPrivateKeys.ts    |  4 ++++
 .../meteor/app/lib/server/functions/addUserToRoom.ts |  3 +--
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/witty-apples-pretend.md

diff --git a/.changeset/witty-apples-pretend.md b/.changeset/witty-apples-pretend.md
new file mode 100644
index 000000000000..cb4dd696983d
--- /dev/null
+++ b/.changeset/witty-apples-pretend.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes async E2EE key exchange in development environments where change streams are no longer used
diff --git a/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts b/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts
index 22eccf03f407..e498d282d704 100644
--- a/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts
+++ b/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts
@@ -1,7 +1,7 @@
 import { Rooms, Subscriptions } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { notifyOnSubscriptionChangedById } from '../../../lib/server/lib/notifyListener';
+import { notifyOnSubscriptionChangedById, notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
 
 export async function handleSuggestedGroupKey(
 	handle: 'accept' | 'reject',
@@ -25,11 +25,17 @@ export async function handleSuggestedGroupKey(
 
 	if (handle === 'accept') {
 		await Subscriptions.setGroupE2EKey(sub._id, suggestedKey);
-		await Rooms.removeUsersFromE2EEQueueByRoomId(sub.rid, [userId]);
+		const { modifiedCount } = await Rooms.removeUsersFromE2EEQueueByRoomId(sub.rid, [userId]);
+		if (modifiedCount) {
+			void notifyOnRoomChangedById(sub.rid);
+		}
 	}
 
 	if (handle === 'reject') {
-		await Rooms.addUserIdToE2EEQueueByRoomIds([sub.rid], userId);
+		const { modifiedCount } = await Rooms.addUserIdToE2EEQueueByRoomIds([sub.rid], userId);
+		if (modifiedCount) {
+			void notifyOnRoomChangedById(sub.rid);
+		}
 	}
 
 	const { modifiedCount } = await Subscriptions.unsetGroupE2ESuggestedKey(sub._id);
diff --git a/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts b/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
index 6ef35a063a28..45a00886af1e 100644
--- a/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
+++ b/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
@@ -2,6 +2,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
+
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
@@ -36,5 +38,7 @@ Meteor.methods<ServerMethods>({
 
 		const subscribedRoomIds = await Rooms.getSubscribedRoomIdsWithoutE2EKeys(userId);
 		await Rooms.addUserIdToE2EEQueueByRoomIds(subscribedRoomIds, userId);
+
+		void notifyOnRoomChangedById(subscribedRoomIds);
 	},
 });
diff --git a/apps/meteor/app/lib/server/functions/addUserToRoom.ts b/apps/meteor/app/lib/server/functions/addUserToRoom.ts
index e6ca7b2a8b4d..2e74bf66cf4a 100644
--- a/apps/meteor/app/lib/server/functions/addUserToRoom.ts
+++ b/apps/meteor/app/lib/server/functions/addUserToRoom.ts
@@ -97,8 +97,6 @@ export const addUserToRoom = async function (
 		void notifyOnSubscriptionChangedById(insertedId, 'inserted');
 	}
 
-	void notifyOnRoomChangedById(rid);
-
 	if (!userToBeAdded.username) {
 		throw new Meteor.Error('error-invalid-user', 'Cannot add an user to a room without a username');
 	}
@@ -147,5 +145,6 @@ export const addUserToRoom = async function (
 		await Rooms.addUserIdToE2EEQueueByRoomIds([room._id], userToBeAdded._id);
 	}
 
+	void notifyOnRoomChangedById(rid);
 	return true;
 };

From bcacbb1ceec16f9d6c3ee10cd29d0f9af1156779 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:50:14 -0300
Subject: [PATCH 134/170] feat: Voip for Team Collaboration (#33346)

Co-authored-by: Aleksander Nicacio da Silva <6494543+aleksandernsilva@users.noreply.github.com>
---
 .changeset/gorgeous-houses-sneeze.md          |   14 +
 apps/meteor/app/api/server/lib/users.ts       |   30 +-
 apps/meteor/app/api/server/v1/im.ts           |   19 +-
 .../server/constant/permissions.ts            |    7 +
 .../lib/server/functions/getFullUserData.ts   |    3 +
 apps/meteor/app/models/client/models/Users.ts |    3 +-
 apps/meteor/app/utils/client/lib/SDKClient.ts |    1 +
 apps/meteor/client/NavBarV2/NavBar.tsx        |   14 +
 .../UserMenu/hooks/useUserMenu.tsx            |    5 +
 .../UserMenu/hooks/useVoipItems.tsx           |   67 +
 .../NavBarItemVoipDialer.tsx                  |   48 +
 .../NavBarV2/NavBarVoipToolbar/index.ts       |    1 +
 .../components/UserInfo/UserInfoAction.tsx    |   18 +-
 .../useStartCallRoomAction/index.ts           |    1 +
 .../useStartCallRoomAction.tsx                |   41 +
 .../useVideoConfMenuOptions.tsx}              |   77 +-
 .../useVoipMenuOptions.tsx                    |   69 +
 apps/meteor/client/hooks/useUserInfoQuery.ts  |   15 +-
 .../client/providers/MeteorProvider.tsx       |   11 +-
 .../sidebar/header/hooks/useUserMenu.tsx      |    5 +
 .../sidebar/header/hooks/useVoipItems.tsx     |   67 +
 .../admin/users/AdminUserInfoActions.tsx      |    4 +-
 .../admin/users/AdminUserInfoWithData.tsx     |    4 +-
 .../views/admin/users/AdminUsersPage.tsx      |   10 +-
 ...UserPageHeaderContentWithSeatsCap.spec.tsx |   24 +
 .../UserPageHeaderContentWithSeatsCap.tsx     |   11 +-
 .../users/UsersTable/UsersTable.spec.tsx      |   98 +
 .../admin/users/UsersTable/UsersTable.tsx     |   26 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  |   37 +-
 .../admin/users/hooks/useFilteredUsers.ts     |    8 +-
 .../users/hooks/useVoipExtensionAction.tsx    |   37 +
 .../users/voip/AssignExtensionButton.tsx      |   26 +
 .../users/voip/AssignExtensionModal.spec.tsx  |  129 ++
 .../admin/users/voip/AssignExtensionModal.tsx |  148 ++
 .../users/voip/RemoveExtensionModal.spec.tsx  |   54 +
 .../admin/users/voip/RemoveExtensionModal.tsx |   81 +
 .../views/room/UserCard/UserCardWithData.tsx  |   16 +-
 .../contextualBar/RoomMembers/RoomMembers.tsx |    2 +-
 .../RoomMembers/RoomMembersActions.tsx        |   17 +-
 .../RoomMembers/RoomMembersItem.tsx           |   16 +-
 .../RoomMembers/RoomMembersRow.tsx            |    3 +-
 .../UserInfo/UserInfoActions.tsx              |   19 +-
 .../UserInfo/UserInfoWithData.tsx             |    2 +
 ...eCallAction.tsx => useVideoCallAction.tsx} |   12 +-
 .../actions/useVoipCallAction.tsx             |   43 +
 .../useUserInfoActions/useUserInfoActions.ts  |   57 +-
 .../ee/app/api-enterprise/server/index.ts     |    4 +
 .../api-enterprise/server/voip-freeswitch.ts  |  150 ++
 apps/meteor/ee/server/configuration/index.ts  |    1 +
 apps/meteor/ee/server/configuration/voip.ts   |   10 +
 .../local-services/voip-freeswitch/service.ts |   53 +
 apps/meteor/ee/server/settings/voip.ts        |   49 +
 apps/meteor/ee/server/startup/services.ts     |    3 +
 apps/meteor/jest.config.ts                    |    1 +
 apps/meteor/package.json                      |    3 +
 apps/meteor/server/models/raw/Users.js        |   44 +-
 .../tests/e2e/channel-management.spec.ts      |    3 +-
 .../page-objects/fragments/home-content.ts    |   10 +-
 .../tests/e2e/video-conference-ring.spec.ts   |    9 +-
 .../meteor/tests/e2e/video-conference.spec.ts |   12 +-
 apps/meteor/tests/mocks/client/meteor.ts      |   21 +-
 .../tests/unit/server/lib/freeswitch.tests.ts |   40 +
 packages/core-services/src/index.ts           |    3 +
 .../src/types/IVoipFreeSwitchService.ts       |    8 +
 packages/core-typings/src/IUser.ts            |    1 +
 .../src/voip/FreeSwitchExtension.ts           |   11 +
 packages/core-typings/src/voip/index.ts       |    1 +
 packages/freeswitch/.eslintrc.json            |    4 +
 packages/freeswitch/jest.config.ts            |    6 +
 packages/freeswitch/package.json              |   30 +
 packages/freeswitch/src/FreeSwitchOptions.ts  |    1 +
 packages/freeswitch/src/commands/getDomain.ts |   25 +
 .../src/commands/getExtensionDetails.ts       |   30 +
 .../src/commands/getExtensionList.ts          |   17 +
 .../src/commands/getUserPassword.ts           |   31 +
 packages/freeswitch/src/commands/index.ts     |    4 +
 packages/freeswitch/src/connect.ts            |   82 +
 packages/freeswitch/src/getCommandResponse.ts |   12 +
 packages/freeswitch/src/index.ts              |    1 +
 packages/freeswitch/src/logger.ts             |    3 +
 packages/freeswitch/src/runCommand.ts         |   30 +
 packages/freeswitch/src/utils/mapUserData.ts  |   33 +
 .../freeswitch/src/utils/parseUserList.ts     |   54 +
 .../freeswitch/src/utils/parseUserStatus.ts   |   17 +
 packages/freeswitch/tests/mapUserData.test.ts |   37 +
 .../freeswitch/tests/parseUserList.test.ts    |  214 +++
 .../freeswitch/tests/parseUserStatus.test.ts  |   14 +
 .../tests/utils/makeFreeSwitchResponse.ts     |    5 +
 packages/freeswitch/tsconfig.json             |    9 +
 packages/i18n/src/locales/en.i18n.json        |   52 +
 packages/i18n/src/locales/pt-BR.i18n.json     |   34 +-
 .../src/MockedAppRootBuilder.tsx              |    9 +-
 .../model-typings/src/models/IUsersModel.ts   |    4 +
 packages/rest-typings/src/index.ts            |    3 +
 packages/rest-typings/src/v1/users.ts         |   13 +-
 .../VoipFreeSwitchExtensionAssignProps.ts     |   24 +
 .../VoipFreeSwitchExtensionGetDetailsProps.ts |   27 +
 .../VoipFreeSwitchExtensionGetInfoProps.ts    |   22 +
 .../VoipFreeSwitchExtensionListProps.ts       |   28 +
 .../src/v1/voip-freeswitch/index.ts           |   29 +
 .../components/GenericMenu/GenericMenu.tsx    |   13 +-
 packages/ui-voip/.eslintignore                |    1 +
 packages/ui-voip/.eslintrc.json               |   67 +
 packages/ui-voip/.storybook/main.js           |   12 +
 packages/ui-voip/.storybook/preview.js        |   26 +
 packages/ui-voip/jest.config.ts               |   13 +
 packages/ui-voip/package.json                 |   78 +
 .../VoipActionButton.spec.tsx                 |   19 +
 .../VoipActionButton.stories.tsx              |   22 +
 .../VoipActionButton/VoipActionButton.tsx     |   27 +
 .../VoipActionButton.spec.tsx.snap            |   61 +
 .../src/components/VoipActionButton/index.ts  |    1 +
 .../VoipActions/VoipActions.spec.tsx          |   20 +
 .../VoipActions/VoipActions.stories.tsx       |   24 +
 .../components/VoipActions/VoipActions.tsx    |   85 +
 .../__snapshots__/VoipActions.spec.tsx.snap   |  239 +++
 .../src/components/VoipActions/index.ts       |    1 +
 .../VoipContactId/VoipContactId.spec.tsx      |   65 +
 .../VoipContactId/VoipContactId.stories.tsx   |   36 +
 .../VoipContactId/VoipContactId.tsx           |   74 +
 .../__snapshots__/VoipContactId.spec.tsx.snap |  147 ++
 .../src/components/VoipContactId/index.ts     |    1 +
 .../VoipDialPad/VoipDialPad.spec.tsx          |   75 +
 .../VoipDialPad/VoipDialPad.stories.tsx       |   21 +
 .../components/VoipDialPad/VoipDialPad.tsx    |   68 +
 .../components/VoipDialPadButton.tsx          |   49 +
 .../components/VoipDialPadInput.tsx           |   48 +
 .../src/components/VoipDialPad/index.ts       |    1 +
 .../components/VoipPopup/VoipPopup.spec.tsx   |   80 +
 .../VoipPopup/VoipPopup.stories.tsx           |   91 +
 .../src/components/VoipPopup/VoipPopup.tsx    |   38 +
 .../__snapshots__/VoipPopup.spec.tsx.snap     | 1605 +++++++++++++++++
 .../components/VoipPopupContainer.tsx         |   49 +
 .../VoipPopup/components/VoipPopupContent.tsx |   10 +
 .../VoipPopup/components/VoipPopupFooter.tsx  |   10 +
 .../components/VoipPopupHeader.spec.tsx       |   42 +
 .../VoipPopup/components/VoipPopupHeader.tsx  |   34 +
 .../components/VoipPopup/components/index.ts  |    4 +
 .../ui-voip/src/components/VoipPopup/index.ts |    1 +
 .../VoipPopup/views/VoipDialerView.spec.tsx   |   47 +
 .../VoipPopup/views/VoipDialerView.tsx        |   49 +
 .../VoipPopup/views/VoipErrorView.spec.tsx    |   74 +
 .../VoipPopup/views/VoipErrorView.tsx         |   57 +
 .../VoipPopup/views/VoipIncomingView.spec.tsx |   38 +
 .../VoipPopup/views/VoipIncomingView.tsx      |   36 +
 .../VoipPopup/views/VoipOngoingView.spec.tsx  |   62 +
 .../VoipPopup/views/VoipOngoingView.tsx       |   68 +
 .../VoipPopup/views/VoipOutgoingView.spec.tsx |   35 +
 .../VoipPopup/views/VoipOutgoingView.tsx      |   36 +
 .../src/components/VoipPopup/views/index.ts   |    5 +
 .../VoipPopupPortal/VoipPopupPortal.tsx       |   15 +
 .../src/components/VoipPopupPortal/index.ts   |    1 +
 .../VoipSettingsButton/VoipSettingsButton.tsx |   34 +
 .../hooks/useVoipDeviceSettings.spec.tsx      |   46 +
 .../hooks/useVoipDeviceSettings.tsx           |   75 +
 .../components/VoipSettingsButton/index.ts    |    2 +
 .../components/VoipStatus/VoipStatus.spec.tsx |   32 +
 .../src/components/VoipStatus/VoipStatus.tsx  |   28 +
 .../src/components/VoipStatus/index.ts        |    2 +
 .../components/VoipTimer/VoipTimer.spec.tsx   |   37 +
 .../src/components/VoipTimer/VoipTimer.tsx    |   35 +
 .../ui-voip/src/components/VoipTimer/index.ts |    1 +
 .../VoipTransferModal.spec.tsx                |   94 +
 .../VoipTransferModal/VoipTransferModal.tsx   |   82 +
 .../src/components/VoipTransferModal/index.ts |    1 +
 packages/ui-voip/src/components/index.ts      |    7 +
 packages/ui-voip/src/contexts/VoipContext.tsx |   44 +
 packages/ui-voip/src/definitions/IceServer.ts |    5 +
 .../ui-voip/src/definitions/VoipSession.ts    |   69 +
 packages/ui-voip/src/definitions/index.ts     |    2 +
 packages/ui-voip/src/hooks/index.ts           |    6 +
 packages/ui-voip/src/hooks/useVoip.tsx        |   23 +
 packages/ui-voip/src/hooks/useVoipAPI.tsx     |   52 +
 packages/ui-voip/src/hooks/useVoipClient.tsx  |   89 +
 .../ui-voip/src/hooks/useVoipContactId.tsx    |   25 +
 packages/ui-voip/src/hooks/useVoipDialer.tsx  |   13 +
 packages/ui-voip/src/hooks/useVoipEffect.tsx  |   30 +
 packages/ui-voip/src/hooks/useVoipEvent.tsx   |   28 +
 .../src/hooks/useVoipExtensionDetails.tsx     |   20 +
 packages/ui-voip/src/hooks/useVoipSession.tsx |    6 +
 packages/ui-voip/src/hooks/useVoipSounds.ts   |   26 +
 packages/ui-voip/src/hooks/useVoipState.tsx   |   45 +
 .../src/hooks/useVoipTransferModal.tsx        |   51 +
 .../ui-voip/src/hooks/useWebRtcServers.ts     |   16 +
 packages/ui-voip/src/index.ts                 |    4 +
 packages/ui-voip/src/lib/LocalStream.ts       |  106 ++
 packages/ui-voip/src/lib/RemoteStream.ts      |   75 +
 packages/ui-voip/src/lib/Stream.ts            |   67 +
 packages/ui-voip/src/lib/VoipClient.ts        |  868 +++++++++
 .../ui-voip/src/providers/VoipProvider.tsx    |  177 ++
 packages/ui-voip/src/tests/mocks/index.ts     |   75 +
 .../src/tests/utils/replaceReactAriaIds.ts    |   22 +
 .../utils/parseStringToIceServers/index.ts    |    1 +
 .../parseStringToIceServers.spec.ts           |   50 +
 .../parseStringToIceServers.ts                |   21 +
 .../ui-voip/src/utils/setPreciseInterval.ts   |   25 +
 packages/ui-voip/tsconfig.build.json          |    5 +
 packages/ui-voip/tsconfig.json                |    8 +
 yarn.lock                                     |  107 +-
 199 files changed, 8996 insertions(+), 163 deletions(-)
 create mode 100644 .changeset/gorgeous-houses-sneeze.md
 create mode 100644 apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx
 create mode 100644 apps/meteor/client/NavBarV2/NavBarVoipToolbar/NavBarItemVoipDialer.tsx
 create mode 100644 apps/meteor/client/NavBarV2/NavBarVoipToolbar/index.ts
 create mode 100644 apps/meteor/client/hooks/roomActions/useStartCallRoomAction/index.ts
 create mode 100644 apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
 rename apps/meteor/client/hooks/roomActions/{useStartCallRoomAction.ts => useStartCallRoomAction/useVideoConfMenuOptions.tsx} (53%)
 create mode 100644 apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx
 create mode 100644 apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx
 create mode 100644 apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.spec.tsx
 create mode 100644 apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
 create mode 100644 apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx
 create mode 100644 apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
 create mode 100644 apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
 create mode 100644 apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx
 create mode 100644 apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx
 rename apps/meteor/client/views/room/hooks/useUserInfoActions/actions/{useCallAction.tsx => useVideoCallAction.tsx} (85%)
 create mode 100644 apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx
 create mode 100644 apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts
 create mode 100644 apps/meteor/ee/server/configuration/voip.ts
 create mode 100644 apps/meteor/ee/server/local-services/voip-freeswitch/service.ts
 create mode 100644 apps/meteor/ee/server/settings/voip.ts
 create mode 100644 apps/meteor/tests/unit/server/lib/freeswitch.tests.ts
 create mode 100644 packages/core-services/src/types/IVoipFreeSwitchService.ts
 create mode 100644 packages/core-typings/src/voip/FreeSwitchExtension.ts
 create mode 100644 packages/freeswitch/.eslintrc.json
 create mode 100644 packages/freeswitch/jest.config.ts
 create mode 100644 packages/freeswitch/package.json
 create mode 100644 packages/freeswitch/src/FreeSwitchOptions.ts
 create mode 100644 packages/freeswitch/src/commands/getDomain.ts
 create mode 100644 packages/freeswitch/src/commands/getExtensionDetails.ts
 create mode 100644 packages/freeswitch/src/commands/getExtensionList.ts
 create mode 100644 packages/freeswitch/src/commands/getUserPassword.ts
 create mode 100644 packages/freeswitch/src/commands/index.ts
 create mode 100644 packages/freeswitch/src/connect.ts
 create mode 100644 packages/freeswitch/src/getCommandResponse.ts
 create mode 100644 packages/freeswitch/src/index.ts
 create mode 100644 packages/freeswitch/src/logger.ts
 create mode 100644 packages/freeswitch/src/runCommand.ts
 create mode 100644 packages/freeswitch/src/utils/mapUserData.ts
 create mode 100644 packages/freeswitch/src/utils/parseUserList.ts
 create mode 100644 packages/freeswitch/src/utils/parseUserStatus.ts
 create mode 100644 packages/freeswitch/tests/mapUserData.test.ts
 create mode 100644 packages/freeswitch/tests/parseUserList.test.ts
 create mode 100644 packages/freeswitch/tests/parseUserStatus.test.ts
 create mode 100644 packages/freeswitch/tests/utils/makeFreeSwitchResponse.ts
 create mode 100644 packages/freeswitch/tsconfig.json
 create mode 100644 packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionAssignProps.ts
 create mode 100644 packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetDetailsProps.ts
 create mode 100644 packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetInfoProps.ts
 create mode 100644 packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionListProps.ts
 create mode 100644 packages/rest-typings/src/v1/voip-freeswitch/index.ts
 create mode 100644 packages/ui-voip/.eslintignore
 create mode 100644 packages/ui-voip/.eslintrc.json
 create mode 100644 packages/ui-voip/.storybook/main.js
 create mode 100644 packages/ui-voip/.storybook/preview.js
 create mode 100644 packages/ui-voip/jest.config.ts
 create mode 100644 packages/ui-voip/package.json
 create mode 100644 packages/ui-voip/src/components/VoipActionButton/VoipActionButton.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipActionButton/VoipActionButton.stories.tsx
 create mode 100644 packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
 create mode 100644 packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
 create mode 100644 packages/ui-voip/src/components/VoipActionButton/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipActions/VoipActions.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipActions/VoipActions.stories.tsx
 create mode 100644 packages/ui-voip/src/components/VoipActions/VoipActions.tsx
 create mode 100644 packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
 create mode 100644 packages/ui-voip/src/components/VoipActions/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipContactId/VoipContactId.stories.tsx
 create mode 100644 packages/ui-voip/src/components/VoipContactId/VoipContactId.tsx
 create mode 100644 packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
 create mode 100644 packages/ui-voip/src/components/VoipContactId/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipDialPad/VoipDialPad.stories.tsx
 create mode 100644 packages/ui-voip/src/components/VoipDialPad/VoipDialPad.tsx
 create mode 100644 packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadButton.tsx
 create mode 100644 packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadInput.tsx
 create mode 100644 packages/ui-voip/src/components/VoipDialPad/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/VoipPopup.stories.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/VoipPopup.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/__snapshots__/VoipPopup.spec.tsx.snap
 create mode 100644 packages/ui-voip/src/components/VoipPopup/components/VoipPopupContainer.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/components/VoipPopupContent.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/components/VoipPopupFooter.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/components/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipPopup/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopup/views/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipPopupPortal/VoipPopupPortal.tsx
 create mode 100644 packages/ui-voip/src/components/VoipPopupPortal/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipSettingsButton/VoipSettingsButton.tsx
 create mode 100644 packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.tsx
 create mode 100644 packages/ui-voip/src/components/VoipSettingsButton/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipStatus/VoipStatus.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipStatus/VoipStatus.tsx
 create mode 100644 packages/ui-voip/src/components/VoipStatus/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipTimer/VoipTimer.tsx
 create mode 100644 packages/ui-voip/src/components/VoipTimer/index.ts
 create mode 100644 packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
 create mode 100644 packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.tsx
 create mode 100644 packages/ui-voip/src/components/VoipTransferModal/index.ts
 create mode 100644 packages/ui-voip/src/components/index.ts
 create mode 100644 packages/ui-voip/src/contexts/VoipContext.tsx
 create mode 100644 packages/ui-voip/src/definitions/IceServer.ts
 create mode 100644 packages/ui-voip/src/definitions/VoipSession.ts
 create mode 100644 packages/ui-voip/src/definitions/index.ts
 create mode 100644 packages/ui-voip/src/hooks/index.ts
 create mode 100644 packages/ui-voip/src/hooks/useVoip.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipAPI.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipClient.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipContactId.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipDialer.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipEffect.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipEvent.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipExtensionDetails.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipSession.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipSounds.ts
 create mode 100644 packages/ui-voip/src/hooks/useVoipState.tsx
 create mode 100644 packages/ui-voip/src/hooks/useVoipTransferModal.tsx
 create mode 100644 packages/ui-voip/src/hooks/useWebRtcServers.ts
 create mode 100644 packages/ui-voip/src/index.ts
 create mode 100644 packages/ui-voip/src/lib/LocalStream.ts
 create mode 100644 packages/ui-voip/src/lib/RemoteStream.ts
 create mode 100644 packages/ui-voip/src/lib/Stream.ts
 create mode 100644 packages/ui-voip/src/lib/VoipClient.ts
 create mode 100644 packages/ui-voip/src/providers/VoipProvider.tsx
 create mode 100644 packages/ui-voip/src/tests/mocks/index.ts
 create mode 100644 packages/ui-voip/src/tests/utils/replaceReactAriaIds.ts
 create mode 100644 packages/ui-voip/src/utils/parseStringToIceServers/index.ts
 create mode 100644 packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.spec.ts
 create mode 100644 packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.ts
 create mode 100644 packages/ui-voip/src/utils/setPreciseInterval.ts
 create mode 100644 packages/ui-voip/tsconfig.build.json
 create mode 100644 packages/ui-voip/tsconfig.json

diff --git a/.changeset/gorgeous-houses-sneeze.md b/.changeset/gorgeous-houses-sneeze.md
new file mode 100644
index 000000000000..b2846edb1687
--- /dev/null
+++ b/.changeset/gorgeous-houses-sneeze.md
@@ -0,0 +1,14 @@
+---
+'@rocket.chat/freeswitch': major
+'@rocket.chat/mock-providers': patch
+'@rocket.chat/core-services': patch
+'@rocket.chat/model-typings': patch
+'@rocket.chat/core-typings': patch
+'@rocket.chat/rest-typings': patch
+'@rocket.chat/ui-client': patch
+'@rocket.chat/ui-voip': patch
+'@rocket.chat/i18n': patch
+'@rocket.chat/meteor': patch
+---
+
+Implements integration with FreeSwitch to enable VoIP calls for team collaboration workspaces
diff --git a/apps/meteor/app/api/server/lib/users.ts b/apps/meteor/app/api/server/lib/users.ts
index f8e3d528f163..0289f1fe5ff5 100644
--- a/apps/meteor/app/api/server/lib/users.ts
+++ b/apps/meteor/app/api/server/lib/users.ts
@@ -143,20 +143,6 @@ export async function findPaginatedUsersByStatus({
 	hasLoggedIn,
 	type,
 }: FindPaginatedUsersByStatusProps) {
-	const projection = {
-		name: 1,
-		username: 1,
-		emails: 1,
-		roles: 1,
-		status: 1,
-		active: 1,
-		avatarETag: 1,
-		lastLogin: 1,
-		type: 1,
-		reason: 1,
-		federated: 1,
-	};
-
 	const actualSort: Record<string, 1 | -1> = sort || { username: 1 };
 	if (sort?.status) {
 		actualSort.active = sort.status;
@@ -183,6 +169,22 @@ export async function findPaginatedUsersByStatus({
 	}
 
 	const canSeeAllUserInfo = await hasPermissionAsync(uid, 'view-full-other-user-info');
+	const canSeeExtension = canSeeAllUserInfo || (await hasPermissionAsync(uid, 'view-user-voip-extension'));
+
+	const projection = {
+		name: 1,
+		username: 1,
+		emails: 1,
+		roles: 1,
+		status: 1,
+		active: 1,
+		avatarETag: 1,
+		lastLogin: 1,
+		type: 1,
+		reason: 1,
+		federated: 1,
+		...(canSeeExtension ? { freeSwitchExtension: 1 } : {}),
+	};
 
 	match.$or = [
 		...(canSeeAllUserInfo ? [{ 'emails.address': { $regex: escapeRegExp(searchTerm || ''), $options: 'i' } }] : []),
diff --git a/apps/meteor/app/api/server/v1/im.ts b/apps/meteor/app/api/server/v1/im.ts
index a640318a9cd0..5f12d7d7b751 100644
--- a/apps/meteor/app/api/server/v1/im.ts
+++ b/apps/meteor/app/api/server/v1/im.ts
@@ -17,7 +17,7 @@ import { Meteor } from 'meteor/meteor';
 import { createDirectMessage } from '../../../../server/methods/createDirectMessage';
 import { hideRoomMethod } from '../../../../server/methods/hideRoom';
 import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { hasAtLeastOnePermissionAsync, hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { saveRoomSettings } from '../../../channel-settings/server/methods/saveRoomSettings';
 import { getRoomByNameOrIdWithOptionToJoin } from '../../../lib/server/functions/getRoomByNameOrIdWithOptionToJoin';
 import { settings } from '../../../settings/server';
@@ -327,8 +327,23 @@ API.v1.addRoute(
 				...(status && { status: { $in: status } }),
 			};
 
+			const canSeeExtension = await hasAtLeastOnePermissionAsync(
+				this.userId,
+				['view-full-other-user-info', 'view-user-voip-extension'],
+				room._id,
+			);
+
 			const options = {
-				projection: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1, federated: 1 },
+				projection: {
+					_id: 1,
+					username: 1,
+					name: 1,
+					status: 1,
+					statusText: 1,
+					utcOffset: 1,
+					federated: 1,
+					...(canSeeExtension && { freeSwitchExtension: 1 }),
+				},
 				skip: offset,
 				limit: count,
 				sort: {
diff --git a/apps/meteor/app/authorization/server/constant/permissions.ts b/apps/meteor/app/authorization/server/constant/permissions.ts
index 46d40713bad1..f57943412fb4 100644
--- a/apps/meteor/app/authorization/server/constant/permissions.ts
+++ b/apps/meteor/app/authorization/server/constant/permissions.ts
@@ -208,6 +208,13 @@ export const permissions = [
 	// allows to receive a voip call
 	{ _id: 'inbound-voip-calls', roles: ['livechat-agent'] },
 
+	// Allow managing team collab voip extensions
+	{ _id: 'manage-voip-extensions', roles: ['admin'] },
+	// Allow viewing the extension number of other users
+	{ _id: 'view-user-voip-extension', roles: ['admin', 'user'] },
+	// Allow viewing details of an extension
+	{ _id: 'view-voip-extension-details', roles: ['admin', 'user'] },
+
 	{ _id: 'remove-livechat-department', roles: ['livechat-manager', 'admin'] },
 	{ _id: 'manage-apps', roles: ['admin'] },
 	{ _id: 'post-readonly', roles: ['admin', 'owner', 'moderator'] },
diff --git a/apps/meteor/app/lib/server/functions/getFullUserData.ts b/apps/meteor/app/lib/server/functions/getFullUserData.ts
index 0703b24d9210..f66f8ecb49c6 100644
--- a/apps/meteor/app/lib/server/functions/getFullUserData.ts
+++ b/apps/meteor/app/lib/server/functions/getFullUserData.ts
@@ -35,6 +35,7 @@ const fullFields = {
 	requirePasswordChangeReason: 1,
 	roles: 1,
 	importIds: 1,
+	freeSwitchExtension: 1,
 } as const;
 
 let publicCustomFields: Record<string, 0 | 1> = {};
@@ -85,6 +86,7 @@ export async function getFullUserDataByIdOrUsernameOrImportId(
 		(searchType === 'username' && searchValue === caller.username) ||
 		(searchType === 'importId' && caller.importIds?.includes(searchValue));
 	const canViewAllInfo = !!myself || (await hasPermissionAsync(userId, 'view-full-other-user-info'));
+	const canViewExtension = !!myself || (await hasPermissionAsync(userId, 'view-user-voip-extension'));
 
 	// Only search for importId if the user has permission to view the import id
 	if (searchType === 'importId' && !canViewAllInfo) {
@@ -96,6 +98,7 @@ export async function getFullUserDataByIdOrUsernameOrImportId(
 	const options = {
 		projection: {
 			...fields,
+			...(canViewExtension && { freeSwitchExtension: 1 }),
 			...(myself && { services: 1 }),
 		},
 	};
diff --git a/apps/meteor/app/models/client/models/Users.ts b/apps/meteor/app/models/client/models/Users.ts
index e2d8c7856752..3fd1016e528b 100644
--- a/apps/meteor/app/models/client/models/Users.ts
+++ b/apps/meteor/app/models/client/models/Users.ts
@@ -1,4 +1,5 @@
 import type { IRole, IUser } from '@rocket.chat/core-typings';
+import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 
 class UsersCollection extends Mongo.Collection<IUser> {
@@ -39,4 +40,4 @@ Object.assign(Meteor.users, {
 });
 
 /** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-export const Users = Meteor.users as UsersCollection;
+export const Users = Meteor.users as unknown as UsersCollection;
diff --git a/apps/meteor/app/utils/client/lib/SDKClient.ts b/apps/meteor/app/utils/client/lib/SDKClient.ts
index 3c7e43c85f7c..5ca4e112ad69 100644
--- a/apps/meteor/app/utils/client/lib/SDKClient.ts
+++ b/apps/meteor/app/utils/client/lib/SDKClient.ts
@@ -1,6 +1,7 @@
 import type { RestClientInterface } from '@rocket.chat/api-client';
 import type { SDK, ClientStream, StreamKeys, StreamNames, StreamerCallbackArgs, ServerMethods } from '@rocket.chat/ddp-client';
 import { Emitter } from '@rocket.chat/emitter';
+import { Accounts } from 'meteor/accounts-base';
 import { DDPCommon } from 'meteor/ddp-common';
 import { Meteor } from 'meteor/meteor';
 
diff --git a/apps/meteor/client/NavBarV2/NavBar.tsx b/apps/meteor/client/NavBarV2/NavBar.tsx
index 908e729c956e..7e61d53e5eff 100644
--- a/apps/meteor/client/NavBarV2/NavBar.tsx
+++ b/apps/meteor/client/NavBarV2/NavBar.tsx
@@ -1,6 +1,7 @@
 import { useToolbar } from '@react-aria/toolbar';
 import { NavBar as NavBarComponent, NavBarSection, NavBarGroup, NavBarDivider } from '@rocket.chat/fuselage';
 import { usePermission, useTranslation, useUser } from '@rocket.chat/ui-contexts';
+import { useVoipState } from '@rocket.chat/ui-voip';
 import React, { useRef } from 'react';
 
 import { useIsCallEnabled, useIsCallReady } from '../contexts/CallContext';
@@ -16,6 +17,7 @@ import {
 } from './NavBarOmnichannelToolbar';
 import { NavBarItemMarketPlaceMenu, NavBarItemAuditMenu, NavBarItemDirectoryPage, NavBarItemHomePage } from './NavBarPagesToolbar';
 import { NavBarItemLoginPage, NavBarItemAdministrationMenu, UserMenu } from './NavBarSettingsToolbar';
+import { NavBarItemVoipDialer } from './NavBarVoipToolbar';
 
 const NavBar = () => {
 	const t = useTranslation();
@@ -31,6 +33,7 @@ const NavBar = () => {
 	const showOmnichannelQueueLink = useOmnichannelShowQueueLink();
 	const isCallEnabled = useIsCallEnabled();
 	const isCallReady = useIsCallReady();
+	const { isEnabled: showVoip } = useVoipState();
 
 	const pagesToolbarRef = useRef(null);
 	const { toolbarProps: pagesToolbarProps } = useToolbar({ 'aria-label': t('Pages') }, pagesToolbarRef);
@@ -38,6 +41,9 @@ const NavBar = () => {
 	const omnichannelToolbarRef = useRef(null);
 	const { toolbarProps: omnichannelToolbarProps } = useToolbar({ 'aria-label': t('Omnichannel') }, omnichannelToolbarRef);
 
+	const voipToolbarRef = useRef(null);
+	const { toolbarProps: voipToolbarProps } = useToolbar({ 'aria-label': t('Voice_Call') }, voipToolbarRef);
+
 	return (
 		<NavBarComponent aria-label='header'>
 			<NavBarSection>
@@ -59,6 +65,14 @@ const NavBar = () => {
 						</NavBarGroup>
 					</>
 				)}
+				{showVoip && (
+					<>
+						<NavBarDivider />
+						<NavBarGroup role='toolbar' ref={voipToolbarRef} {...voipToolbarProps}>
+							<NavBarItemVoipDialer primary={isCallEnabled} />
+						</NavBarGroup>
+					</>
+				)}
 			</NavBarSection>
 			<NavBarSection>
 				<NavBarGroup aria-label={t('Workspace_and_user_settings')}>
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index 85a481f3e257..fce9c3d14fd4 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
@@ -7,12 +7,14 @@ import React from 'react';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
+import { useVoipItems } from './useVoipItems';
 
 export const useUserMenu = (user: IUser) => {
 	const t = useTranslation();
 
 	const statusItems = useStatusItems();
 	const accountItems = useAccountItems();
+	const voipItems = useVoipItems();
 
 	const logout = useLogout();
 	const handleLogout = useEffectEvent(() => {
@@ -35,6 +37,9 @@ export const useUserMenu = (user: IUser) => {
 			title: t('Status'),
 			items: statusItems,
 		},
+		{
+			items: voipItems,
+		},
 		{
 			title: t('Account'),
 			items: accountItems,
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx
new file mode 100644
index 000000000000..b3e4cbf22d52
--- /dev/null
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx
@@ -0,0 +1,67 @@
+import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useVoipAPI, useVoipState } from '@rocket.chat/ui-voip';
+import { useMutation } from '@tanstack/react-query';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+export const useVoipItems = (): GenericMenuItemProps[] => {
+	const { t } = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const { clientError, isEnabled, isReady, isRegistered } = useVoipState();
+	const { register, unregister } = useVoipAPI();
+
+	const toggleVoip = useMutation({
+		mutationFn: async () => {
+			if (!isRegistered) {
+				await register();
+				return true;
+			}
+
+			await unregister();
+			return false;
+		},
+		onSuccess: (isEnabled: boolean) => {
+			dispatchToastMessage({
+				type: 'success',
+				message: isEnabled ? t('Voice_calling_enabled') : t('Voice_calling_disabled'),
+			});
+		},
+	});
+
+	const tooltip = useMemo(() => {
+		if (clientError) {
+			return t(clientError.message);
+		}
+
+		if (!isReady || toggleVoip.isLoading) {
+			return t('Loading');
+		}
+
+		return '';
+	}, [clientError, isReady, toggleVoip.isLoading, t]);
+
+	return useMemo(() => {
+		if (!isEnabled) {
+			return [];
+		}
+
+		return [
+			{
+				id: 'toggle-voip',
+				icon: isRegistered ? 'phone-disabled' : 'phone',
+				disabled: !isReady || toggleVoip.isLoading,
+				onClick: () => toggleVoip.mutate(),
+				content: (
+					<Box is='span' title={tooltip}>
+						{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
+					</Box>
+				),
+			},
+		];
+	}, [isEnabled, isRegistered, isReady, tooltip, t, toggleVoip]);
+};
+
+export default useVoipItems;
diff --git a/apps/meteor/client/NavBarV2/NavBarVoipToolbar/NavBarItemVoipDialer.tsx b/apps/meteor/client/NavBarV2/NavBarVoipToolbar/NavBarItemVoipDialer.tsx
new file mode 100644
index 000000000000..bdc62c41b1da
--- /dev/null
+++ b/apps/meteor/client/NavBarV2/NavBarVoipToolbar/NavBarItemVoipDialer.tsx
@@ -0,0 +1,48 @@
+import { NavBarItem } from '@rocket.chat/fuselage';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useLayout } from '@rocket.chat/ui-contexts';
+import { useVoipDialer, useVoipState } from '@rocket.chat/ui-voip';
+import type { HTMLAttributes } from 'react';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+type NavBarItemVoipDialerProps = Omit<HTMLAttributes<HTMLElement>, 'is'> & {
+	primary?: boolean;
+};
+
+const NavBarItemVoipDialer = (props: NavBarItemVoipDialerProps) => {
+	const { t } = useTranslation();
+	const { sidebar } = useLayout();
+	const { clientError, isEnabled, isReady, isRegistered } = useVoipState();
+	const { open: isDialerOpen, openDialer, closeDialer } = useVoipDialer();
+
+	const handleToggleDialer = useEffectEvent(() => {
+		sidebar.toggle();
+		isDialerOpen ? closeDialer() : openDialer();
+	});
+
+	const title = useMemo(() => {
+		if (!isReady && !clientError) {
+			return t('Loading');
+		}
+
+		if (!isRegistered || clientError) {
+			return t('Voice_calling_disabled');
+		}
+
+		return t('New_Call');
+	}, [clientError, isReady, isRegistered, t]);
+
+	return isEnabled ? (
+		<NavBarItem
+			{...props}
+			title={title}
+			icon='phone'
+			onClick={handleToggleDialer}
+			pressed={isDialerOpen}
+			disabled={!isReady || !isRegistered}
+		/>
+	) : null;
+};
+
+export default NavBarItemVoipDialer;
diff --git a/apps/meteor/client/NavBarV2/NavBarVoipToolbar/index.ts b/apps/meteor/client/NavBarV2/NavBarVoipToolbar/index.ts
new file mode 100644
index 000000000000..7f6d317af229
--- /dev/null
+++ b/apps/meteor/client/NavBarV2/NavBarVoipToolbar/index.ts
@@ -0,0 +1 @@
+export { default as NavBarItemVoipDialer } from './NavBarItemVoipDialer';
diff --git a/apps/meteor/client/components/UserInfo/UserInfoAction.tsx b/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
index 97c64ecbede1..f58d0fb07482 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@rocket.chat/fuselage';
+import { Button, IconButton } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { ReactElement, ComponentProps } from 'react';
 import React from 'react';
@@ -7,10 +7,16 @@ type UserInfoActionProps = {
 	icon: IconName;
 } & ComponentProps<typeof Button>;
 
-const UserInfoAction = ({ icon, label, ...props }: UserInfoActionProps): ReactElement => (
-	<Button icon={icon} title={label} {...props} mi={4}>
-		{label}
-	</Button>
-);
+const UserInfoAction = ({ icon, label, title, ...props }: UserInfoActionProps): ReactElement => {
+	if (!label && icon && title) {
+		return <IconButton small secondary icon={icon} title={title} aria-label={title} {...props} mi={4} size={40} />;
+	}
+
+	return (
+		<Button icon={icon} {...props} mi={4}>
+			{label}
+		</Button>
+	);
+};
 
 export default UserInfoAction;
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/index.ts b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/index.ts
new file mode 100644
index 000000000000..d01e5a6a5dff
--- /dev/null
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/index.ts
@@ -0,0 +1 @@
+export * from './useStartCallRoomAction';
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
new file mode 100644
index 000000000000..ee3117d664d1
--- /dev/null
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
@@ -0,0 +1,41 @@
+import { GenericMenu } from '@rocket.chat/ui-client';
+import React, { useMemo } from 'react';
+
+import HeaderToolbarAction from '../../../components/Header/HeaderToolbarAction';
+import type { RoomToolboxActionConfig } from '../../../views/room/contexts/RoomToolboxContext';
+import useVideoConfMenuOptions from './useVideoConfMenuOptions';
+import useVoipMenuOptions from './useVoipMenuOptions';
+
+export const useStartCallRoomAction = () => {
+	const voipCall = useVideoConfMenuOptions();
+	const videoCall = useVoipMenuOptions();
+
+	return useMemo((): RoomToolboxActionConfig | undefined => {
+		if (!videoCall.allowed && !voipCall.allowed) {
+			return undefined;
+		}
+
+		return {
+			id: 'start-call',
+			title: 'Call',
+			icon: 'phone',
+			groups: [...videoCall.groups, ...voipCall.groups],
+			disabled: videoCall.disabled && voipCall.disabled,
+			full: true,
+			order: Math.max(voipCall.order, videoCall.order),
+			featured: true,
+			renderToolboxItem: ({ id, icon, title, disabled, className }) => (
+				<GenericMenu
+					button={<HeaderToolbarAction />}
+					key={id}
+					title={title}
+					disabled={disabled}
+					items={[...voipCall.items, ...videoCall.items]}
+					className={className}
+					placement='bottom-start'
+					icon={icon}
+				/>
+			),
+		};
+	}, [videoCall, voipCall]);
+};
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVideoConfMenuOptions.tsx
similarity index 53%
rename from apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts
rename to apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVideoConfMenuOptions.tsx
index 8d1fa251c051..13b92e7f44a5 100644
--- a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVideoConfMenuOptions.tsx
@@ -1,17 +1,21 @@
-import { isRoomFederated } from '@rocket.chat/core-typings';
-import { useStableArray, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useUser, usePermission } from '@rocket.chat/ui-contexts';
-import { useMemo } from 'react';
+import { isOmnichannelRoom, isRoomFederated } from '@rocket.chat/core-typings';
+import { Box } from '@rocket.chat/fuselage';
+import { useEffectEvent, useStableArray } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { usePermission, useSetting, useUser } from '@rocket.chat/ui-contexts';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useVideoConfDispatchOutgoing, useVideoConfIsCalling, useVideoConfIsRinging } from '../../contexts/VideoConfContext';
-import { VideoConfManager } from '../../lib/VideoConfManager';
-import { useRoom } from '../../views/room/contexts/RoomContext';
-import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
-import { useVideoConfWarning } from '../../views/room/contextualBar/VideoConference/hooks/useVideoConfWarning';
+import { useVideoConfDispatchOutgoing, useVideoConfIsCalling, useVideoConfIsRinging } from '../../../contexts/VideoConfContext';
+import { VideoConfManager } from '../../../lib/VideoConfManager';
+import { useRoom } from '../../../views/room/contexts/RoomContext';
+import type { RoomToolboxActionConfig } from '../../../views/room/contexts/RoomToolboxContext';
+import { useVideoConfWarning } from '../../../views/room/contextualBar/VideoConference/hooks/useVideoConfWarning';
 
-export const useStartCallRoomAction = () => {
+const useVideoConfMenuOptions = () => {
+	const { t } = useTranslation();
 	const room = useRoom();
+	const user = useUser();
 	const federated = isRoomFederated(room);
 
 	const ownUser = room.uids?.length === 1 ?? false;
@@ -24,8 +28,6 @@ export const useStartCallRoomAction = () => {
 	const isCalling = useVideoConfIsCalling();
 	const isRinging = useVideoConfIsRinging();
 
-	const { t } = useTranslation();
-
 	const enabledForDMs = useSetting('VideoConf_Enable_DMs', true);
 	const enabledForChannels = useSetting('VideoConf_Enable_Channels', true);
 	const enabledForTeams = useSetting('VideoConf_Enable_Teams', true);
@@ -43,13 +45,13 @@ export const useStartCallRoomAction = () => {
 		].filter((group): group is RoomToolboxActionConfig['groups'][number] => !!group),
 	);
 
-	const enabled = groups.length > 0;
-
-	const user = useUser();
-
-	const allowed = enabled && permittedToCallManagement && (!user?.username || !room.muted?.includes(user.username)) && !ownUser;
+	const visible = groups.length > 0;
+	const allowed = visible && permittedToCallManagement && (!user?.username || !room.muted?.includes(user.username)) && !ownUser;
+	const disabled = federated || (!!room.ro && !permittedToPostReadonly);
+	const tooltip = disabled ? t('core.Video_Call_unavailable_for_this_type_of_room') : '';
+	const order = isOmnichannelRoom(room) ? -1 : 4;
 
-	const handleOpenVideoConf = useMutableCallback(async () => {
+	const handleOpenVideoConf = useEffectEvent(async () => {
 		if (isCalling || isRinging) {
 			return;
 		}
@@ -62,26 +64,29 @@ export const useStartCallRoomAction = () => {
 		}
 	});
 
-	const disabled = federated || (!!room.ro && !permittedToPostReadonly);
-
-	return useMemo((): RoomToolboxActionConfig | undefined => {
-		if (!allowed) {
-			return undefined;
-		}
+	return useMemo(() => {
+		const items: GenericMenuItemProps[] = [
+			{
+				id: 'start-video-call',
+				icon: 'video',
+				disabled,
+				onClick: handleOpenVideoConf,
+				content: (
+					<Box is='span' title={tooltip}>
+						{t('Video_call')}
+					</Box>
+				),
+			},
+		];
 
 		return {
-			id: 'start-call',
+			items,
+			disabled,
+			allowed,
+			order,
 			groups,
-			title: 'Call',
-			icon: 'phone',
-			action: () => void handleOpenVideoConf(),
-			...(disabled && {
-				tooltip: t('core.Video_Call_unavailable_for_this_type_of_room'),
-				disabled: true,
-			}),
-			full: true,
-			order: 4,
-			featured: true,
 		};
-	}, [allowed, disabled, groups, handleOpenVideoConf, t]);
+	}, [allowed, disabled, groups, handleOpenVideoConf, order, t, tooltip]);
 };
+
+export default useVideoConfMenuOptions;
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx
new file mode 100644
index 000000000000..ca62f372f4ca
--- /dev/null
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx
@@ -0,0 +1,69 @@
+import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { useVoipAPI, useVoipState } from '@rocket.chat/ui-voip';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useMediaPermissions } from '../../../views/room/composer/messageBox/hooks/useMediaPermissions';
+import { useRoom } from '../../../views/room/contexts/RoomContext';
+import { useUserInfoQuery } from '../../useUserInfoQuery';
+
+const useVoipMenuOptions = () => {
+	const { t } = useTranslation();
+	const { uids = [] } = useRoom();
+	const ownUserId = useUserId();
+
+	const [isMicPermissionDenied] = useMediaPermissions('microphone');
+
+	const { isEnabled, isRegistered, isInCall } = useVoipState();
+	const { makeCall } = useVoipAPI();
+
+	const members = useMemo(() => uids.filter((uid) => uid !== ownUserId), [uids, ownUserId]);
+	const remoteUserId = members[0];
+
+	const { data: { user: remoteUser } = {}, isLoading } = useUserInfoQuery({ userId: remoteUserId }, { enabled: Boolean(remoteUserId) });
+
+	const isRemoteRegistered = !!remoteUser?.freeSwitchExtension;
+	const isDM = members.length === 1;
+
+	const disabled = isMicPermissionDenied || !isDM || !isRemoteRegistered || !isRegistered || isInCall || isLoading;
+
+	const title = useMemo(() => {
+		if (isMicPermissionDenied) {
+			return t('Microphone_access_not_allowed');
+		}
+
+		if (isInCall) {
+			return t('Unable_to_make_calls_while_another_is_ongoing');
+		}
+
+		return disabled ? t('Voice_calling_disabled') : '';
+	}, [disabled, isInCall, isMicPermissionDenied, t]);
+
+	return useMemo(() => {
+		const items: GenericMenuItemProps[] = [
+			{
+				id: 'start-voip-call',
+				icon: 'phone',
+				disabled,
+				onClick: () => makeCall(remoteUser?.freeSwitchExtension as string),
+				content: (
+					<Box is='span' title={title}>
+						{t('Voice_call')}
+					</Box>
+				),
+			},
+		];
+
+		return {
+			items: isEnabled ? items : [],
+			groups: ['direct'] as const,
+			disabled,
+			allowed: isEnabled,
+			order: 4,
+		};
+	}, [disabled, title, t, isEnabled, makeCall, remoteUser?.freeSwitchExtension]);
+};
+
+export default useVoipMenuOptions;
diff --git a/apps/meteor/client/hooks/useUserInfoQuery.ts b/apps/meteor/client/hooks/useUserInfoQuery.ts
index 4fac5212b803..fdbe793d60e3 100644
--- a/apps/meteor/client/hooks/useUserInfoQuery.ts
+++ b/apps/meteor/client/hooks/useUserInfoQuery.ts
@@ -1,13 +1,14 @@
 import type { UsersInfoParamsGet } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-// a hook using tanstack useQuery and useEndpoint that fetches user information from the `users.info` endpoint
 
-export const useUserInfoQuery = (params: UsersInfoParamsGet) => {
-	const getUserInfo = useEndpoint('GET', '/v1/users.info');
-	const result = useQuery(['users.info', params], () => getUserInfo({ ...params }), {
-		keepPreviousData: true,
-	});
+type UserInfoQueryOptions = {
+	enabled?: boolean;
+	keepPreviousData?: boolean;
+};
 
-	return result;
+// a hook using tanstack useQuery and useEndpoint that fetches user information from the `users.info` endpoint
+export const useUserInfoQuery = (params: UsersInfoParamsGet, options: UserInfoQueryOptions = { keepPreviousData: true }) => {
+	const getUserInfo = useEndpoint('GET', '/v1/users.info');
+	return useQuery(['users.info', params], () => getUserInfo({ ...params }), options);
 };
diff --git a/apps/meteor/client/providers/MeteorProvider.tsx b/apps/meteor/client/providers/MeteorProvider.tsx
index 4817cee83317..ad5df9503833 100644
--- a/apps/meteor/client/providers/MeteorProvider.tsx
+++ b/apps/meteor/client/providers/MeteorProvider.tsx
@@ -1,3 +1,4 @@
+import { VoipProvider } from '@rocket.chat/ui-voip';
 import type { ReactNode } from 'react';
 import React from 'react';
 
@@ -6,7 +7,7 @@ import ActionManagerProvider from './ActionManagerProvider';
 import AuthenticationProvider from './AuthenticationProvider/AuthenticationProvider';
 import AuthorizationProvider from './AuthorizationProvider';
 import AvatarUrlProvider from './AvatarUrlProvider';
-import { CallProvider } from './CallProvider';
+import { CallProvider as OmnichannelCallProvider } from './CallProvider';
 import ConnectionStatusProvider from './ConnectionStatusProvider';
 import CustomSoundProvider from './CustomSoundProvider';
 import { DeviceProvider } from './DeviceProvider/DeviceProvider';
@@ -51,9 +52,11 @@ const MeteorProvider = ({ children }: MeteorProviderProps) => (
 																			<UserPresenceProvider>
 																				<ActionManagerProvider>
 																					<VideoConfProvider>
-																						<CallProvider>
-																							<OmnichannelProvider>{children}</OmnichannelProvider>
-																						</CallProvider>
+																						<VoipProvider>
+																							<OmnichannelCallProvider>
+																								<OmnichannelProvider>{children}</OmnichannelProvider>
+																							</OmnichannelCallProvider>
+																						</VoipProvider>
 																					</VideoConfProvider>
 																				</ActionManagerProvider>
 																			</UserPresenceProvider>
diff --git a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
index c0c6f94a4ed8..e9ad8cc73836 100644
--- a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
@@ -7,12 +7,14 @@ import React from 'react';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
+import useVoipItems from './useVoipItems';
 
 export const useUserMenu = (user: IUser) => {
 	const t = useTranslation();
 
 	const statusItems = useStatusItems();
 	const accountItems = useAccountItems();
+	const voipItems = useVoipItems();
 
 	const logout = useLogout();
 	const handleLogout = useMutableCallback(() => {
@@ -35,6 +37,9 @@ export const useUserMenu = (user: IUser) => {
 			title: t('Status'),
 			items: statusItems,
 		},
+		{
+			items: voipItems,
+		},
 		{
 			title: t('Account'),
 			items: accountItems,
diff --git a/apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx b/apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx
new file mode 100644
index 000000000000..d7cbf2428c32
--- /dev/null
+++ b/apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx
@@ -0,0 +1,67 @@
+import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useVoipAPI, useVoipState } from '@rocket.chat/ui-voip';
+import { useMutation } from '@tanstack/react-query';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+const useVoipItems = (): GenericMenuItemProps[] => {
+	const { t } = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const { clientError, isEnabled, isReady, isRegistered } = useVoipState();
+	const { register, unregister } = useVoipAPI();
+
+	const toggleVoip = useMutation({
+		mutationFn: async () => {
+			if (!isRegistered) {
+				await register();
+				return true;
+			}
+
+			await unregister();
+			return false;
+		},
+		onSuccess: (isEnabled: boolean) => {
+			dispatchToastMessage({
+				type: 'success',
+				message: isEnabled ? t('Voice_calling_enabled') : t('Voice_calling_disabled'),
+			});
+		},
+	});
+
+	const tooltip = useMemo(() => {
+		if (clientError) {
+			return t(clientError.message);
+		}
+
+		if (!isReady || toggleVoip.isLoading) {
+			return t('Loading');
+		}
+
+		return '';
+	}, [clientError, isReady, toggleVoip.isLoading, t]);
+
+	return useMemo(() => {
+		if (!isEnabled) {
+			return [];
+		}
+
+		return [
+			{
+				id: 'toggle-voip',
+				icon: isRegistered ? 'phone-disabled' : 'phone',
+				disabled: !isReady || toggleVoip.isLoading,
+				onClick: () => toggleVoip.mutate(),
+				content: (
+					<Box is='span' title={tooltip}>
+						{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
+					</Box>
+				),
+			},
+		];
+	}, [isEnabled, isRegistered, isReady, tooltip, t, toggleVoip]);
+};
+
+export default useVoipItems;
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index 800222282054..31ff9a96f842 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -6,7 +6,7 @@ import React, { useCallback, useMemo } from 'react';
 
 import { UserInfoAction } from '../../../components/UserInfo';
 import { useActionSpread } from '../../hooks/useActionSpread';
-import type { AdminUserTab } from './AdminUsersPage';
+import type { AdminUsersTab } from './AdminUsersPage';
 import { useChangeAdminStatusAction } from './hooks/useChangeAdminStatusAction';
 import { useChangeUserStatusAction } from './hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from './hooks/useDeleteUserAction';
@@ -19,7 +19,7 @@ type AdminUserInfoActionsProps = {
 	isFederatedUser: IUser['federated'];
 	isActive: boolean;
 	isAdmin: boolean;
-	tab: AdminUserTab;
+	tab: AdminUsersTab;
 	onChange: () => void;
 	onReload: () => void;
 };
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index 2318e5ae1dc1..59d91ce5ada6 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -14,12 +14,12 @@ import { UserInfo } from '../../../components/UserInfo';
 import { UserStatus } from '../../../components/UserStatus';
 import { getUserEmailVerified } from '../../../lib/utils/getUserEmailVerified';
 import AdminUserInfoActions from './AdminUserInfoActions';
-import type { AdminUserTab } from './AdminUsersPage';
+import type { AdminUsersTab } from './AdminUsersPage';
 
 type AdminUserInfoWithDataProps = {
 	uid: IUser['_id'];
 	onReload: () => void;
-	tab: AdminUserTab;
+	tab: AdminUsersTab;
 };
 
 const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProps): ReactElement => {
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index 56641f8959d0..78950c0fe22a 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -39,9 +39,9 @@ export type UsersFilters = {
 	roles: OptionProp[];
 };
 
-export type AdminUserTab = 'all' | 'active' | 'deactivated' | 'pending';
+export type AdminUsersTab = 'all' | 'active' | 'deactivated' | 'pending';
 
-export type UsersTableSortingOptions = 'name' | 'username' | 'emails.address' | 'status' | 'active';
+export type UsersTableSortingOption = 'name' | 'username' | 'emails.address' | 'status' | 'active' | 'freeSwitchExtension';
 
 const AdminUsersPage = (): ReactElement => {
 	const t = useTranslation();
@@ -65,9 +65,9 @@ const AdminUsersPage = (): ReactElement => {
 	const { data, error } = useQuery(['roles'], async () => getRoles());
 
 	const paginationData = usePagination();
-	const sortData = useSort<UsersTableSortingOptions>('name');
+	const sortData = useSort<UsersTableSortingOption>('name');
 
-	const [tab, setTab] = useState<AdminUserTab>('all');
+	const [tab, setTab] = useState<AdminUsersTab>('all');
 	const [userFilters, setUserFilters] = useState<UsersFilters>({ text: '', roles: [] });
 
 	const searchTerm = useDebouncedValue(userFilters.text, 500);
@@ -89,7 +89,7 @@ const AdminUsersPage = (): ReactElement => {
 		filteredUsersQueryResult?.refetch();
 	};
 
-	const handleTabChange = (tab: AdminUserTab) => {
+	const handleTabChange = (tab: AdminUsersTab) => {
 		setTab(tab);
 
 		paginationData.setCurrent(0);
diff --git a/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.spec.tsx b/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.spec.tsx
new file mode 100644
index 000000000000..b11ca46ce40d
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.spec.tsx
@@ -0,0 +1,24 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import '@testing-library/jest-dom';
+
+import UserPageHeaderContent from './UserPageHeaderContentWithSeatsCap';
+
+it('should render "Associate Extension" button when VoIP_TeamCollab_Enabled setting is enabled', async () => {
+	render(<UserPageHeaderContent activeUsers={1} maxActiveUsers={1} isSeatsCapExceeded={false} />, {
+		legacyRoot: true,
+		wrapper: mockAppRoot().withJohnDoe().withSetting('VoIP_TeamCollab_Enabled', true).build(),
+	});
+
+	expect(screen.getByRole('button', { name: 'Assign_extension' })).toBeEnabled();
+});
+
+it('should not render "Associate Extension" button when VoIP_TeamCollab_Enabled setting is disabled', async () => {
+	render(<UserPageHeaderContent activeUsers={1} maxActiveUsers={1} isSeatsCapExceeded={false} />, {
+		legacyRoot: true,
+		wrapper: mockAppRoot().withJohnDoe().withSetting('VoIP_TeamCollab_Enabled', false).build(),
+	});
+
+	expect(screen.queryByRole('button', { name: 'Assign_extension' })).not.toBeInTheDocument();
+});
diff --git a/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx b/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
index 3000b4f51a5a..a023f5229816 100644
--- a/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
+++ b/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
@@ -1,11 +1,12 @@
 import { Button, ButtonGroup, Margins } from '@rocket.chat/fuselage';
-import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
+import { useSetModal, useTranslation, useRouter, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
 import { useExternalLink } from '../../../hooks/useExternalLink';
 import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
 import SeatsCapUsage from './SeatsCapUsage';
+import AssignExtensionModal from './voip/AssignExtensionModal';
 
 type UserPageHeaderContentWithSeatsCapProps = {
 	activeUsers: number;
@@ -20,6 +21,9 @@ const UserPageHeaderContentWithSeatsCap = ({
 }: UserPageHeaderContentWithSeatsCapProps): ReactElement => {
 	const t = useTranslation();
 	const router = useRouter();
+	const setModal = useSetModal();
+
+	const canRegisterExtension = useSetting('VoIP_TeamCollab_Enabled');
 
 	const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' });
 	const openExternalLink = useExternalLink();
@@ -38,6 +42,11 @@ const UserPageHeaderContentWithSeatsCap = ({
 				<SeatsCapUsage members={activeUsers} limit={maxActiveUsers} />
 			</Margins>
 			<ButtonGroup>
+				{canRegisterExtension && (
+					<Button icon='phone' onClick={(): void => setModal(<AssignExtensionModal onClose={(): void => setModal(null)} />)}>
+						{t('Assign_extension')}
+					</Button>
+				)}
 				<Button icon='mail' onClick={handleInviteButtonClick} disabled={isSeatsCapExceeded}>
 					{t('Invite')}
 				</Button>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
new file mode 100644
index 000000000000..a1a572ad23a6
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
@@ -0,0 +1,98 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { createFakeUser } from '../../../../../tests/mocks/data';
+import UsersTable from './UsersTable';
+
+const createFakeAdminUser = (freeSwitchExtension?: string) =>
+	createFakeUser({
+		active: true,
+		roles: ['admin'],
+		type: 'user',
+		freeSwitchExtension,
+	});
+
+it('should not render "Voice call extension" column when voice call is disabled', async () => {
+	const user = createFakeAdminUser('1000');
+
+	render(
+		<UsersTable
+			filteredUsersQueryResult={{ isSuccess: true, data: { users: [user], count: 1, offset: 1, total: 1 } } as any}
+			setUserFilters={() => undefined}
+			tab='all'
+			onReload={() => undefined}
+			paginationData={{} as any}
+			sortData={{} as any}
+			isSeatsCapExceeded={false}
+			roleData={undefined}
+		/>,
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', false).build(),
+		},
+	);
+
+	expect(screen.queryByText('Voice_call_extension')).not.toBeInTheDocument();
+
+	screen.getByRole('button', { name: 'More_actions' }).click();
+	expect(await screen.findByRole('listbox')).toBeInTheDocument();
+	expect(screen.queryByRole('option', { name: /Assign_extension/ })).not.toBeInTheDocument();
+	expect(screen.queryByRole('option', { name: /Unassign_extension/ })).not.toBeInTheDocument();
+});
+
+it('should render "Unassign_extension" button when user has a associated extension', async () => {
+	const user = createFakeAdminUser('1000');
+
+	render(
+		<UsersTable
+			filteredUsersQueryResult={{ isSuccess: true, data: { users: [user], count: 1, offset: 1, total: 1 } } as any}
+			setUserFilters={() => undefined}
+			tab='all'
+			onReload={() => undefined}
+			paginationData={{} as any}
+			sortData={{} as any}
+			isSeatsCapExceeded={false}
+			roleData={undefined}
+		/>,
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', true).build(),
+		},
+	);
+
+	expect(screen.getByText('Voice_call_extension')).toBeInTheDocument();
+
+	screen.getByRole('button', { name: 'More_actions' }).click();
+	expect(await screen.findByRole('listbox')).toBeInTheDocument();
+	expect(screen.queryByRole('option', { name: /Assign_extension/ })).not.toBeInTheDocument();
+	expect(screen.getByRole('option', { name: /Unassign_extension/ })).toBeInTheDocument();
+});
+
+it('should render "Assign_extension" button when user has no associated extension', async () => {
+	const user = createFakeAdminUser();
+
+	render(
+		<UsersTable
+			filteredUsersQueryResult={{ isSuccess: true, data: { users: [user], count: 1, offset: 1, total: 1 } } as any}
+			setUserFilters={() => undefined}
+			tab='all'
+			onReload={() => undefined}
+			paginationData={{} as any}
+			sortData={{} as any}
+			isSeatsCapExceeded={false}
+			roleData={undefined}
+		/>,
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', true).build(),
+		},
+	);
+
+	expect(screen.getByText('Voice_call_extension')).toBeInTheDocument();
+
+	screen.getByRole('button', { name: 'More_actions' }).click();
+	expect(await screen.findByRole('listbox')).toBeInTheDocument();
+	expect(screen.getByRole('option', { name: /Assign_extension/ })).toBeInTheDocument();
+	expect(screen.queryByRole('option', { name: /Unassign_extension/ })).not.toBeInTheDocument();
+});
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index abdf8cb787c3..531669ca584a 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -3,7 +3,7 @@ import { Pagination } from '@rocket.chat/fuselage';
 import { useEffectEvent, useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedResult, DefaultUserInfo } from '@rocket.chat/rest-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter, useTranslation, useSetting } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { ReactElement, Dispatch, SetStateAction } from 'react';
 import React, { useMemo } from 'react';
@@ -18,18 +18,18 @@ import {
 } from '../../../../components/GenericTable';
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import type { AdminUserTab, UsersFilters, UsersTableSortingOptions } from '../AdminUsersPage';
+import type { AdminUsersTab, UsersFilters, UsersTableSortingOption } from '../AdminUsersPage';
 import UsersTableFilters from './UsersTableFilters';
 import UsersTableRow from './UsersTableRow';
 
 type UsersTableProps = {
-	tab: AdminUserTab;
+	tab: AdminUsersTab;
 	roleData: { roles: IRole[] } | undefined;
 	onReload: () => void;
 	setUserFilters: Dispatch<SetStateAction<UsersFilters>>;
 	filteredUsersQueryResult: UseQueryResult<PaginatedResult<{ users: Serialized<DefaultUserInfo>[] }>>;
 	paginationData: ReturnType<typeof usePagination>;
-	sortData: ReturnType<typeof useSort<UsersTableSortingOptions>>;
+	sortData: ReturnType<typeof useSort<UsersTableSortingOption>>;
 	isSeatsCapExceeded: boolean;
 };
 
@@ -49,6 +49,7 @@ const UsersTable = ({
 
 	const isMobile = !breakpoints.includes('xl');
 	const isLaptop = !breakpoints.includes('xxl');
+	const isVoIPEnabled = useSetting<boolean>('VoIP_TeamCollab_Enabled') || false;
 
 	const { data, isLoading, isError, isSuccess } = filteredUsersQueryResult;
 
@@ -111,9 +112,21 @@ const UsersTable = ({
 					{t('Pending_action')}
 				</GenericTableHeaderCell>
 			),
-			<GenericTableHeaderCell key='actions' w={tab === 'pending' ? 'x204' : ''} />,
+			tab === 'all' && isVoIPEnabled && (
+				<GenericTableHeaderCell
+					w='x180'
+					key='freeSwitchExtension'
+					direction={sortDirection}
+					active={sortBy === 'freeSwitchExtension'}
+					onClick={setSort}
+					sort='freeSwitchExtension'
+				>
+					{t('Voice_call_extension')}
+				</GenericTableHeaderCell>
+			),
+			<GenericTableHeaderCell key='actions' w={tab === 'pending' ? 'x204' : 'x50'} />,
 		],
-		[isLaptop, isMobile, setSort, sortBy, sortDirection, t, tab],
+		[isLaptop, isMobile, setSort, sortBy, sortDirection, t, tab, isVoIPEnabled],
 	);
 
 	return (
@@ -156,6 +169,7 @@ const UsersTable = ({
 									onReload={onReload}
 									tab={tab}
 									isSeatsCapExceeded={isSeatsCapExceeded}
+									showVoipExtension={isVoIPEnabled}
 								/>
 							))}
 						</GenericTableBody>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index c8fa1eae7704..8dc5b4472e1b 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -7,16 +7,17 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Roles } from '../../../../../app/models/client';
+import { Roles } from '../../../../../app/models/client/models/Roles';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { UserStatus } from '../../../../components/UserStatus';
-import type { AdminUserTab } from '../AdminUsersPage';
+import type { AdminUsersTab } from '../AdminUsersPage';
 import { useChangeAdminStatusAction } from '../hooks/useChangeAdminStatusAction';
 import { useChangeUserStatusAction } from '../hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from '../hooks/useDeleteUserAction';
 import { useResetE2EEKeyAction } from '../hooks/useResetE2EEKeyAction';
 import { useResetTOTPAction } from '../hooks/useResetTOTPAction';
 import { useSendWelcomeEmailMutation } from '../hooks/useSendWelcomeEmailMutation';
+import { useVoipExtensionAction } from '../hooks/useVoipExtensionAction';
 
 type UsersTableRowProps = {
 	user: Serialized<DefaultUserInfo>;
@@ -24,14 +25,24 @@ type UsersTableRowProps = {
 	isMobile: boolean;
 	isLaptop: boolean;
 	onReload: () => void;
-	tab: AdminUserTab;
+	tab: AdminUsersTab;
 	isSeatsCapExceeded: boolean;
+	showVoipExtension: boolean;
 };
 
-const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSeatsCapExceeded }: UsersTableRowProps): ReactElement => {
+const UsersTableRow = ({
+	user,
+	onClick,
+	onReload,
+	isMobile,
+	isLaptop,
+	tab,
+	isSeatsCapExceeded,
+	showVoipExtension,
+}: UsersTableRowProps): ReactElement => {
 	const { t } = useTranslation();
 
-	const { _id, emails, username, name, roles, status, active, avatarETag, lastLogin, type } = user;
+	const { _id, emails, username = '', name = '', roles, status, active, avatarETag, lastLogin, type, freeSwitchExtension } = user;
 	const registrationStatusText = useMemo(() => {
 		const usersExcludedFromPending = ['bot', 'app'];
 
@@ -64,10 +75,17 @@ const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSea
 	const resetTOTPAction = useResetTOTPAction(userId);
 	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
 	const resendWelcomeEmail = useSendWelcomeEmailMutation();
+	const voipExtensionAction = useVoipExtensionAction({ extension: freeSwitchExtension, username, name });
 
 	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
 	const menuOptions = useMemo(
 		() => ({
+			...(voipExtensionAction && {
+				voipExtensionAction: {
+					label: { label: voipExtensionAction.label, icon: voipExtensionAction.icon },
+					action: voipExtensionAction.action,
+				},
+			}),
 			...(isNotPendingDeactivatedNorFederated &&
 				changeAdminStatusAction && {
 					makeAdmin: {
@@ -102,6 +120,7 @@ const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSea
 			isNotPendingDeactivatedNorFederated,
 			resetE2EKeyAction,
 			resetTOTPAction,
+			voipExtensionAction,
 		],
 	);
 
@@ -154,6 +173,12 @@ const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSea
 				</GenericTableCell>
 			)}
 
+			{tab === 'all' && showVoipExtension && username && (
+				<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
+					{freeSwitchExtension || t('Not_assigned')}
+				</GenericTableCell>
+			)}
+
 			<GenericTableCell
 				onClick={(e): void => {
 					e.stopPropagation();
@@ -179,6 +204,8 @@ const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSea
 						placement='bottom-start'
 						flexShrink={0}
 						key='menu'
+						aria-label={t('More_actions')}
+						title={t('More_actions')}
 						renderItem={({ label: { label, icon }, ...props }): ReactElement => (
 							<Option label={label} title={label} icon={icon} variant={label === 'Delete' ? 'danger' : ''} {...props} />
 						)}
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
index f6d14a548b46..788690e84022 100644
--- a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -6,14 +6,14 @@ import { useMemo } from 'react';
 
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import type { AdminUserTab, UsersTableSortingOptions } from '../AdminUsersPage';
+import type { AdminUsersTab, UsersTableSortingOption } from '../AdminUsersPage';
 
 type UseFilteredUsersOptions = {
 	searchTerm: string;
 	prevSearchTerm: MutableRefObject<string>;
-	tab: AdminUserTab;
+	tab: AdminUsersTab;
 	paginationData: ReturnType<typeof usePagination>;
-	sortData: ReturnType<typeof useSort<UsersTableSortingOptions>>;
+	sortData: ReturnType<typeof useSort<UsersTableSortingOption>>;
 	selectedRoles: string[];
 };
 
@@ -26,7 +26,7 @@ const useFilteredUsers = ({ searchTerm, prevSearchTerm, sortData, paginationData
 			setCurrent(0);
 		}
 
-		const listUsersPayload: Partial<Record<AdminUserTab, UsersListStatusParamsGET>> = {
+		const listUsersPayload: Partial<Record<AdminUsersTab, UsersListStatusParamsGET>> = {
 			all: {},
 			pending: {
 				hasLoggedIn: false,
diff --git a/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx b/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
new file mode 100644
index 000000000000..23ab468b6c4b
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
@@ -0,0 +1,37 @@
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useSetModal, useSetting } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import type { Action } from '../../../hooks/useActionSpread';
+import AssignExtensionModal from '../voip/AssignExtensionModal';
+import RemoveExtensionModal from '../voip/RemoveExtensionModal';
+
+type VoipExtensionActionParams = {
+	name: string;
+	username: string;
+	extension?: string;
+};
+
+export const useVoipExtensionAction = ({ name, username, extension }: VoipExtensionActionParams): Action | undefined => {
+	const isVoipEnabled = useSetting('VoIP_TeamCollab_Enabled');
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+
+	const handleExtensionAssignment = useEffectEvent(() => {
+		if (extension) {
+			setModal(<RemoveExtensionModal name={name} username={username} extension={extension} onClose={(): void => setModal(null)} />);
+			return;
+		}
+
+		setModal(<AssignExtensionModal defaultUsername={username} onClose={(): void => setModal(null)} />);
+	});
+
+	return isVoipEnabled
+		? {
+				icon: extension ? 'phone-disabled' : 'phone',
+				label: extension ? t('Unassign_extension') : t('Assign_extension'),
+				action: handleExtensionAssignment,
+		  }
+		: undefined;
+};
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx
new file mode 100644
index 000000000000..06b0514d2a01
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx
@@ -0,0 +1,26 @@
+import { IconButton } from '@rocket.chat/fuselage';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { GenericTableCell } from '../../../../components/GenericTable';
+import AssignExtensionModal from './AssignExtensionModal';
+
+const AssignExtensionButton = ({ username }: { username: string }) => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+
+	const handleAssociation = useEffectEvent((e) => {
+		e.stopPropagation();
+		setModal(<AssignExtensionModal defaultUsername={username} onClose={(): void => setModal(null)} />);
+	});
+
+	return (
+		<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
+			<IconButton icon='user-plus' small title={t('Associate_Extension')} onClick={handleAssociation} />
+		</GenericTableCell>
+	);
+};
+
+export default AssignExtensionButton;
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
new file mode 100644
index 000000000000..a1ed4b4d4376
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
@@ -0,0 +1,129 @@
+/* eslint-disable testing-library/no-await-sync-events */
+import { faker } from '@faker-js/faker';
+import { UserStatus } from '@rocket.chat/core-typings';
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import AssignExtensionModal from './AssignExtensionModal';
+
+const appRoot = mockAppRoot()
+	.withJohnDoe()
+	.withEndpoint('POST', '/v1/voip-freeswitch.extension.assign', () => null)
+	.withEndpoint('GET', '/v1/voip-freeswitch.extension.list', () => ({
+		extensions: [
+			{
+				extension: '1000',
+				context: 'default',
+				domain: '172.31.38.45',
+				groups: ['default', 'sales'],
+				status: 'UNREGISTERED' as const,
+				contact: 'error/user_not_registered',
+				callGroup: 'techsupport',
+				callerName: 'Extension 1000',
+				callerNumber: '1000',
+			},
+		],
+		success: true,
+	}))
+	.withEndpoint('GET', '/v1/users.autocomplete', () => ({
+		items: [
+			{
+				_id: faker.database.mongodbObjectId(),
+				name: 'Jane Doe',
+				username: 'jane.doe',
+				nickname: '',
+				status: UserStatus.OFFLINE,
+				avatarETag: '',
+			},
+		],
+		success: true,
+	}));
+
+it.todo('should load with default user');
+
+it.todo('should load with default extension');
+
+it('should only enable "Free Extension Numbers" field if username is informed', async () => {
+	render(<AssignExtensionModal onClose={() => undefined} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	const extensionsSelect = screen.getByRole('button', { name: /Select_an_option/i });
+	expect(extensionsSelect).toHaveClass('disabled');
+	expect(screen.getByLabelText('User')).toBeEnabled();
+
+	screen.getByLabelText('User').focus();
+	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
+	await userEvent.click(userOption);
+
+	await waitFor(() => expect(extensionsSelect).not.toHaveClass('disabled'));
+});
+
+it('should only enable "Associate" button both username and extension is informed', async () => {
+	render(<AssignExtensionModal onClose={() => undefined} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	expect(screen.getByRole('button', { name: /Associate/i, hidden: true })).toBeDisabled();
+
+	screen.getByLabelText('User').focus();
+	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
+	await userEvent.click(userOption);
+
+	const extensionsSelect = screen.getByRole('button', { name: /Select_an_option/i });
+	await waitFor(() => expect(extensionsSelect).not.toHaveClass('disabled'));
+
+	extensionsSelect.click();
+	const extOption = await screen.findByRole('option', { name: '1000' });
+	await userEvent.click(extOption);
+
+	expect(screen.getByRole('button', { name: /Associate/i, hidden: true })).toBeEnabled();
+});
+
+it('should call onClose when extension is associated', async () => {
+	const closeFn = jest.fn();
+	render(<AssignExtensionModal onClose={closeFn} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	screen.getByLabelText('User').focus();
+	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
+	await userEvent.click(userOption);
+
+	const extensionsSelect = screen.getByRole('button', { name: /Select_an_option/i });
+	await waitFor(() => expect(extensionsSelect).not.toHaveClass('disabled'));
+
+	extensionsSelect.click();
+	const extOption = await screen.findByRole('option', { name: '1000' });
+	await userEvent.click(extOption);
+
+	screen.getByRole('button', { name: /Associate/i, hidden: true }).click();
+	await waitFor(() => expect(closeFn).toHaveBeenCalled());
+});
+
+it('should call onClose when cancel button is clicked', () => {
+	const closeFn = jest.fn();
+	render(<AssignExtensionModal onClose={closeFn} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	screen.getByRole('button', { name: /Cancel/i, hidden: true }).click();
+	expect(closeFn).toHaveBeenCalled();
+});
+
+it('should call onClose when cancel button is clicked', () => {
+	const closeFn = jest.fn();
+	render(<AssignExtensionModal onClose={closeFn} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	screen.getByRole('button', { name: /Close/i, hidden: true }).click();
+	expect(closeFn).toHaveBeenCalled();
+});
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
new file mode 100644
index 000000000000..8e13731028d1
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
@@ -0,0 +1,148 @@
+import { Button, Modal, Select, Field, FieldGroup, FieldLabel, FieldRow, Box } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
+import { useToastMessageDispatch, useEndpoint, useUser } from '@rocket.chat/ui-contexts';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import React, { useMemo } from 'react';
+import { Controller, useForm, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+type AssignExtensionModalProps = {
+	onClose: () => void;
+	defaultExtension?: string;
+	defaultUsername?: string;
+};
+
+type FormValue = {
+	username: string;
+	extension: string;
+};
+
+const AssignExtensionModal = ({ defaultExtension, defaultUsername, onClose }: AssignExtensionModalProps) => {
+	const { t } = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+
+	const loggedUser = useUser();
+
+	const assignUser = useEndpoint('POST', '/v1/voip-freeswitch.extension.assign');
+	const getAvailableExtensions = useEndpoint('GET', '/v1/voip-freeswitch.extension.list');
+
+	const modalTitleId = useUniqueId();
+	const usersWithoutExtensionsId = useUniqueId();
+	const freeExtensionNumberId = useUniqueId();
+
+	const {
+		control,
+		handleSubmit,
+		formState: { isSubmitting },
+	} = useForm<FormValue>({
+		defaultValues: {
+			username: defaultUsername,
+			extension: defaultExtension,
+		},
+	});
+
+	const selectedUsername = useWatch({ control, name: 'username' });
+	const selectedExtension = useWatch({ control, name: 'extension' });
+
+	const { data: availableExtensions = [], isLoading } = useQuery(
+		['/v1/voip-freeswitch.extension.list', selectedUsername],
+		() => getAvailableExtensions({ type: 'available' as const, username: selectedUsername }),
+		{
+			select: (data) => data.extensions || [],
+			enabled: !!selectedUsername,
+		},
+	);
+
+	const extensionOptions = useMemo<[string, string][]>(
+		() => availableExtensions.map(({ extension }) => [extension, extension]),
+		[availableExtensions],
+	);
+
+	const handleAssignment = useMutation({
+		mutationFn: async ({ username, extension }: FormValue) => {
+			await assignUser({ username, extension });
+
+			queryClient.invalidateQueries(['users.list']);
+			if (loggedUser?.username === username) {
+				queryClient.invalidateQueries(['voip-client']);
+			}
+
+			onClose();
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+			onClose();
+		},
+	});
+
+	return (
+		<Modal
+			aria-labelledby={modalTitleId}
+			wrapperFunction={(props) => <Box is='form' onSubmit={handleSubmit((data) => handleAssignment.mutateAsync(data))} {...props} />}
+		>
+			<Modal.Header>
+				<Modal.Title id={modalTitleId}>{t('Assign_extension')}</Modal.Title>
+				<Modal.Close aria-label={t('Close')} onClick={onClose} />
+			</Modal.Header>
+			<Modal.Content>
+				<FieldGroup>
+					<Field>
+						<FieldLabel htmlFor={usersWithoutExtensionsId}>{t('User')}</FieldLabel>
+						<FieldRow>
+							<Controller
+								control={control}
+								name='username'
+								render={({ field }) => (
+									<UserAutoComplete
+										id={usersWithoutExtensionsId}
+										value={field.value}
+										onChange={field.onChange}
+										conditions={{
+											$or: [
+												{ freeSwitchExtension: { $exists: true, $eq: selectedExtension } },
+												{ freeSwitchExtension: { $exists: false } },
+												{ username: { $exists: true, $eq: selectedUsername } },
+											],
+										}}
+									/>
+								)}
+							/>
+						</FieldRow>
+					</Field>
+
+					<Field>
+						<FieldLabel htmlFor={freeExtensionNumberId}>{t('Free_Extension_Numbers')}</FieldLabel>
+						<FieldRow>
+							<Controller
+								control={control}
+								name='extension'
+								render={({ field }) => (
+									<Select
+										id={freeExtensionNumberId}
+										disabled={isLoading || !selectedUsername}
+										options={extensionOptions}
+										placeholder={t('Select_an_option')}
+										value={field.value}
+										onChange={field.onChange}
+									/>
+								)}
+							/>
+						</FieldRow>
+					</Field>
+				</FieldGroup>
+			</Modal.Content>
+			<Modal.Footer>
+				<Modal.FooterControllers>
+					<Button onClick={onClose}>{t('Cancel')}</Button>
+					<Button primary disabled={!selectedUsername || !selectedExtension} loading={isSubmitting} type='submit'>
+						{t('Associate')}
+					</Button>
+				</Modal.FooterControllers>
+			</Modal.Footer>
+		</Modal>
+	);
+};
+
+export default AssignExtensionModal;
diff --git a/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx b/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx
new file mode 100644
index 000000000000..73e9abe9693a
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx
@@ -0,0 +1,54 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+
+import '@testing-library/jest-dom';
+import RemoveExtensionModal from './RemoveExtensionModal';
+
+const appRoot = mockAppRoot().withJohnDoe();
+
+it('should have user and extension informed', async () => {
+	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={() => undefined} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	expect(screen.getByLabelText('User')).toHaveValue('John Doe');
+	expect(screen.getByLabelText('Extension')).toHaveValue('1000');
+});
+
+it('should call assign endpoint and onClose when extension is removed', async () => {
+	const closeFn = jest.fn();
+	const assignFn = jest.fn(() => null);
+	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={closeFn} />, {
+		legacyRoot: true,
+		wrapper: appRoot.withEndpoint('POST', '/v1/voip-freeswitch.extension.assign', assignFn).build(),
+	});
+
+	screen.getByRole('button', { name: /Remove/i, hidden: true }).click();
+
+	await waitFor(() => expect(assignFn).toHaveBeenCalled());
+	await waitFor(() => expect(closeFn).toHaveBeenCalled());
+});
+
+it('should call onClose when cancel button is clicked', () => {
+	const closeFn = jest.fn();
+	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={closeFn} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	screen.getByRole('button', { name: /Cancel/i, hidden: true }).click();
+	expect(closeFn).toHaveBeenCalled();
+});
+
+it('should call onClose when cancel button is clicked', () => {
+	const closeFn = jest.fn();
+	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={closeFn} />, {
+		legacyRoot: true,
+		wrapper: appRoot.build(),
+	});
+
+	screen.getByRole('button', { name: /Close/i, hidden: true }).click();
+	expect(closeFn).toHaveBeenCalled();
+});
diff --git a/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx b/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx
new file mode 100644
index 000000000000..bd93ce9ebef1
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx
@@ -0,0 +1,81 @@
+import { Button, Modal, Field, FieldGroup, FieldLabel, FieldRow, TextInput } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useToastMessageDispatch, useEndpoint, useUser } from '@rocket.chat/ui-contexts';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+type RemoveExtensionModalProps = {
+	name: string;
+	extension: string;
+	username: string;
+	onClose: () => void;
+};
+
+const RemoveExtensionModal = ({ name, extension, username, onClose }: RemoveExtensionModalProps) => {
+	const { t } = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+
+	const loggedUser = useUser();
+
+	const removeExtension = useEndpoint('POST', '/v1/voip-freeswitch.extension.assign');
+
+	const modalTitleId = useUniqueId();
+	const userFieldId = useUniqueId();
+	const freeExtensionNumberId = useUniqueId();
+
+	const handleRemoveExtension = useMutation({
+		mutationFn: (username: string) => removeExtension({ username }),
+		onSuccess: () => {
+			dispatchToastMessage({ type: 'success', message: t('Extension_removed') });
+
+			queryClient.invalidateQueries(['users.list']);
+			if (loggedUser?.username === username) {
+				queryClient.invalidateQueries(['voip-client']);
+			}
+
+			onClose();
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+			onClose();
+		},
+	});
+
+	return (
+		<Modal aria-labelledby={modalTitleId}>
+			<Modal.Header>
+				<Modal.Title id={modalTitleId}>{t('Remove_extension')}</Modal.Title>
+				<Modal.Close aria-label={t('Close')} onClick={onClose} />
+			</Modal.Header>
+			<Modal.Content>
+				<FieldGroup>
+					<Field>
+						<FieldLabel htmlFor={userFieldId}>{t('User')}</FieldLabel>
+						<FieldRow>
+							<TextInput disabled id={userFieldId} value={name} />
+						</FieldRow>
+					</Field>
+
+					<Field>
+						<FieldLabel htmlFor={freeExtensionNumberId}>{t('Extension')}</FieldLabel>
+						<FieldRow>
+							<TextInput disabled id={freeExtensionNumberId} value={extension} />
+						</FieldRow>
+					</Field>
+				</FieldGroup>
+			</Modal.Content>
+			<Modal.Footer>
+				<Modal.FooterControllers>
+					<Button onClick={onClose}>{t('Cancel')}</Button>
+					<Button danger onClick={() => handleRemoveExtension.mutate(username)} loading={handleRemoveExtension.isLoading}>
+						{t('Remove')}
+					</Button>
+				</Modal.FooterControllers>
+			</Modal.Footer>
+		</Modal>
+	);
+};
+
+export default RemoveExtensionModal;
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index a26b5f31e77d..feaf12fd6b04 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -48,6 +48,7 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 			utcOffset = defaultValue,
 			nickname,
 			avatarETag,
+			freeSwitchExtension,
 		} = data?.user || {};
 
 		return {
@@ -61,6 +62,7 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 			status: _id && <ReactiveUserStatus uid={_id} />,
 			customStatus: statusText,
 			nickname,
+			freeSwitchExtension,
 		};
 	}, [data, username, showRealNames, isLoading, getRoles]);
 
@@ -69,13 +71,13 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 		onClose();
 	});
 
-	const { actions: actionsDefinition, menuActions: menuOptions } = useUserInfoActions(
-		{ _id: user._id ?? '', username: user.username, name: user.name },
+	const { actions: actionsDefinition, menuActions: menuOptions } = useUserInfoActions({
 		rid,
-		refetch,
-		undefined,
+		user: { _id: user._id ?? '', username: user.username, name: user.name, freeSwitchExtension: user.freeSwitchExtension },
+		size: 3,
 		isMember,
-	);
+		reload: refetch,
+	});
 
 	const menu = useMemo(() => {
 		if (!menuOptions?.length) {
@@ -95,8 +97,8 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 	}, [menuOptions, onClose, t]);
 
 	const actions = useMemo(() => {
-		const mapAction = ([key, { content, icon, onClick }]: any): ReactElement => (
-			<UserCardAction key={key} label={content} aria-label={content} onClick={onClick} icon={icon} />
+		const mapAction = ([key, { content, title, icon, onClick }]: any): ReactElement => (
+			<UserCardAction key={key} label={content || title} aria-label={content || title} onClick={onClick} icon={icon} />
 		);
 
 		return [...actionsDefinition.map(mapAction), menu].filter(Boolean);
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
index 214dff25dfac..d14c5d8a692c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
@@ -21,7 +21,7 @@ import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
 import InfiniteListAnchor from '../../../../components/InfiniteListAnchor';
 import RoomMembersRow from './RoomMembersRow';
 
-type RoomMemberUser = Pick<IUser, 'username' | '_id' | 'name' | 'status'>;
+type RoomMemberUser = Pick<IUser, 'username' | '_id' | 'name' | 'status' | 'freeSwitchExtension'>;
 
 type RoomMembersProps = {
 	rid: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index 453f55fc71a3..a9ba5dd9dc0c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -6,17 +6,22 @@ import { useTranslation } from 'react-i18next';
 
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
-type RoomMembersActionsProps = {
-	username: IUser['username'];
-	name: IUser['name'];
-	_id: IUser['_id'];
+type RoomMembersActionsProps = Pick<IUser, '_id' | 'name' | 'username' | 'freeSwitchExtension'> & {
 	rid: IRoom['_id'];
 	reload: () => void;
 };
 
-const RoomMembersActions = ({ username, _id, name, rid, reload }: RoomMembersActionsProps): ReactElement | null => {
+const RoomMembersActions = ({ username, _id, name, rid, freeSwitchExtension, reload }: RoomMembersActionsProps): ReactElement | null => {
 	const { t } = useTranslation();
-	const { menuActions: menuOptions } = useUserInfoActions({ _id, username, name }, rid, reload, 0, true);
+
+	const { menuActions: menuOptions } = useUserInfoActions({
+		rid,
+		user: { _id, username, name, freeSwitchExtension },
+		reload,
+		size: 0,
+		isMember: true,
+	});
+
 	if (!menuOptions) {
 		return null;
 	}
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
index 8b4d5ad8cb52..562d36536dbe 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
@@ -25,9 +25,19 @@ type RoomMembersItemProps = {
 	rid: IRoom['_id'];
 	reload: () => void;
 	useRealName: boolean;
-} & Pick<IUser, 'federated' | 'username' | 'name' | '_id'>;
+} & Pick<IUser, 'federated' | 'username' | 'name' | '_id' | 'freeSwitchExtension'>;
 
-const RoomMembersItem = ({ _id, name, username, federated, onClickView, rid, reload, useRealName }: RoomMembersItemProps): ReactElement => {
+const RoomMembersItem = ({
+	_id,
+	name,
+	username,
+	federated,
+	freeSwitchExtension,
+	onClickView,
+	rid,
+	reload,
+	useRealName,
+}: RoomMembersItemProps): ReactElement => {
 	const [showButton, setShowButton] = useState();
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -50,7 +60,7 @@ const RoomMembersItem = ({ _id, name, username, federated, onClickView, rid, rel
 			</OptionContent>
 			<OptionMenu onClick={preventPropagation}>
 				{showButton ? (
-					<UserActions username={username} name={name} rid={rid} _id={_id} reload={reload} />
+					<UserActions username={username} name={name} rid={rid} _id={_id} freeSwitchExtension={freeSwitchExtension} reload={reload} />
 				) : (
 					<IconButton tiny icon='kebab' />
 				)}
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx
index 90c827194c24..acac41abf196 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx
@@ -5,7 +5,7 @@ import React, { memo } from 'react';
 import RoomMembersItem from './RoomMembersItem';
 
 type RoomMembersRowProps = {
-	user: Pick<IUser, 'federated' | 'username' | 'name' | '_id'>;
+	user: Pick<IUser, 'federated' | 'username' | 'name' | '_id' | 'freeSwitchExtension'>;
 	data: {
 		onClickView: (e: MouseEvent<HTMLElement>) => void;
 		rid: IRoom['_id'];
@@ -29,6 +29,7 @@ const RoomMembersRow = ({ user, data: { onClickView, rid }, index, reload, useRe
 			rid={rid}
 			name={user.name}
 			federated={user.federated}
+			freeSwitchExtension={user.freeSwitchExtension}
 			onClickView={onClickView}
 			reload={reload}
 		/>
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index b60bcb749f5b..bf600a757f26 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -11,7 +11,7 @@ import { useMemberExists } from '../../../hooks/useMemberExists';
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
 type UserInfoActionsProps = {
-	user: Pick<IUser, '_id' | 'username' | 'name'>;
+	user: Pick<IUser, '_id' | 'username' | 'name' | 'freeSwitchExtension'>;
 	rid: IRoom['_id'];
 	backToList: () => void;
 };
@@ -26,17 +26,18 @@ const UserInfoActions = ({ user, rid, backToList }: UserInfoActionsProps): React
 	} = useMemberExists({ roomId: rid, username: user.username as string });
 
 	const isMember = membershipCheckSuccess && isMemberData?.isMember;
+	const { _id: userId, username, name, freeSwitchExtension } = user;
 
-	const { actions: actionsDefinition, menuActions: menuOptions } = useUserInfoActions(
-		{ _id: user._id, username: user.username, name: user.name },
+	const { actions: actionsDefinition, menuActions: menuOptions } = useUserInfoActions({
 		rid,
-		() => {
+		user: { _id: userId, username, name, freeSwitchExtension },
+		size: 3,
+		isMember,
+		reload: () => {
 			backToList?.();
 			refetch();
 		},
-		undefined,
-		isMember,
-	);
+	});
 
 	const menu = useMemo(() => {
 		if (!menuOptions?.length) {
@@ -59,8 +60,8 @@ const UserInfoActions = ({ user, rid, backToList }: UserInfoActionsProps): React
 
 	// TODO: sanitize Action type to avoid any
 	const actions = useMemo(() => {
-		const mapAction = ([key, { content, icon, onClick }]: any): ReactElement => (
-			<UserInfoAction key={key} title={content} label={content} onClick={onClick} icon={icon} />
+		const mapAction = ([key, { content, title, icon, onClick }]: any): ReactElement => (
+			<UserInfoAction key={key} title={title} label={content} onClick={onClick} icon={icon} />
 		);
 
 		return [...actionsDefinition.map(mapAction), menu].filter(Boolean);
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
index b5049bebdc1f..8f35b56a1c33 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
@@ -61,6 +61,7 @@ const UserInfoWithData = ({ uid, username, rid, onClose, onClickBack }: UserInfo
 			nickname,
 			createdAt,
 			canViewAllInfo,
+			freeSwitchExtension,
 		} = data.user;
 
 		return {
@@ -80,6 +81,7 @@ const UserInfoWithData = ({ uid, username, rid, onClose, onClickBack }: UserInfo
 			status: <ReactiveUserStatus uid={_id} />,
 			statusText,
 			nickname,
+			freeSwitchExtension,
 		};
 	}, [data, getRoles]);
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx
similarity index 85%
rename from apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx
rename to apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx
index 27fd6de58520..8b3f0e5307b5 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx
@@ -7,9 +7,9 @@ import { useVideoConfDispatchOutgoing, useVideoConfIsCalling, useVideoConfIsRing
 import { VideoConfManager } from '../../../../../lib/VideoConfManager';
 import { useUserCard } from '../../../contexts/UserCardContext';
 import { useVideoConfWarning } from '../../../contextualBar/VideoConference/hooks/useVideoConfWarning';
-import type { UserInfoAction, UserInfoActionType } from '../useUserInfoActions';
+import type { UserInfoAction } from '../useUserInfoActions';
 
-export const useCallAction = (user: Pick<IUser, '_id' | 'username'>): UserInfoAction | undefined => {
+export const useVideoCallAction = (user: Pick<IUser, '_id' | 'username'>): UserInfoAction | undefined => {
 	const t = useTranslation();
 	const usernameSubscription = useUserSubscriptionByName(user.username ?? '');
 	const room = useUserRoom(usernameSubscription?.rid || '');
@@ -24,7 +24,7 @@ export const useCallAction = (user: Pick<IUser, '_id' | 'username'>): UserInfoAc
 	const enabledForDMs = useSetting('VideoConf_Enable_DMs');
 	const permittedToCallManagement = usePermission('call-management', room?._id);
 
-	const videoCallOption = useMemo(() => {
+	const videoCallOption = useMemo<UserInfoAction | undefined>(() => {
 		const action = async (): Promise<void> => {
 			if (isCalling || isRinging || !room) {
 				return;
@@ -44,10 +44,10 @@ export const useCallAction = (user: Pick<IUser, '_id' | 'username'>): UserInfoAc
 
 		return shouldShowStartCall
 			? {
-					content: t('Start_call'),
-					icon: 'phone' as const,
+					type: 'communication',
+					title: t('Video_call'),
+					icon: 'video',
 					onClick: action,
-					type: 'communication' as UserInfoActionType,
 			  }
 			: undefined;
 	}, [
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx
new file mode 100644
index 000000000000..da02cf26e560
--- /dev/null
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx
@@ -0,0 +1,43 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { useVoipAPI, useVoipState } from '@rocket.chat/ui-voip';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useMediaPermissions } from '../../../composer/messageBox/hooks/useMediaPermissions';
+import { useUserCard } from '../../../contexts/UserCardContext';
+import type { UserInfoAction } from '../useUserInfoActions';
+
+export const useVoipCallAction = (user: Pick<IUser, '_id' | 'username' | 'freeSwitchExtension'>): UserInfoAction | undefined => {
+	const { t } = useTranslation();
+	const { closeUserCard } = useUserCard();
+	const ownUserId = useUserId();
+
+	const { isEnabled, isRegistered, isInCall } = useVoipState();
+	const { makeCall } = useVoipAPI();
+	const [isMicPermissionDenied] = useMediaPermissions('microphone');
+
+	const isRemoteRegistered = !!user?.freeSwitchExtension;
+	const isSameUser = ownUserId === user._id;
+
+	const disabled = isSameUser || isMicPermissionDenied || !isRemoteRegistered || !isRegistered || isInCall;
+
+	const voipCallOption = useMemo<UserInfoAction | undefined>(() => {
+		const handleClick = () => {
+			makeCall(user?.freeSwitchExtension as string);
+			closeUserCard();
+		};
+
+		return isEnabled && !isSameUser
+			? {
+					type: 'communication',
+					title: t('Voice_call'),
+					icon: 'phone',
+					disabled,
+					onClick: handleClick,
+			  }
+			: undefined;
+	}, [closeUserCard, disabled, isEnabled, isSameUser, makeCall, t, user?.freeSwitchExtension]);
+
+	return voipCallOption;
+};
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
index c04df6b7521a..90dbfbbaba4c 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
@@ -8,7 +8,6 @@ import { useMemo } from 'react';
 import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
 import { useAddUserAction } from './actions/useAddUserAction';
 import { useBlockUserAction } from './actions/useBlockUserAction';
-import { useCallAction } from './actions/useCallAction';
 import { useChangeLeaderAction } from './actions/useChangeLeaderAction';
 import { useChangeModeratorAction } from './actions/useChangeModeratorAction';
 import { useChangeOwnerAction } from './actions/useChangeOwnerAction';
@@ -18,30 +17,52 @@ import { useMuteUserAction } from './actions/useMuteUserAction';
 import { useRedirectModerationConsole } from './actions/useRedirectModerationConsole';
 import { useRemoveUserAction } from './actions/useRemoveUserAction';
 import { useReportUser } from './actions/useReportUser';
+import { useVideoCallAction } from './actions/useVideoCallAction';
+import { useVoipCallAction } from './actions/useVoipCallAction';
 
 export type UserInfoActionType = 'communication' | 'privileges' | 'management' | 'moderation';
 
-export type UserInfoAction = {
-	content: string;
-	icon?: ComponentProps<typeof Icon>['name'];
+type UserInfoActionWithOnlyIcon = {
+	type?: UserInfoActionType;
+	content?: string;
+	icon: ComponentProps<typeof Icon>['name'];
+	title: string;
+	variant?: 'danger';
 	onClick: () => void;
+};
+
+type UserInfoActionWithContent = {
 	type?: UserInfoActionType;
+	content: string;
+	icon?: ComponentProps<typeof Icon>['name'];
+	title?: string;
 	variant?: 'danger';
+	onClick: () => void;
 };
 
+export type UserInfoAction = UserInfoActionWithContent | UserInfoActionWithOnlyIcon;
+
 type UserMenuAction = {
 	id: string;
 	title: string;
 	items: GenericMenuItemProps[];
 }[];
 
-export const useUserInfoActions = (
-	user: Pick<IUser, '_id' | 'username' | 'name'>,
-	rid: IRoom['_id'],
-	reload?: () => void,
+type UserInfoActionsParams = {
+	user: Pick<IUser, '_id' | 'username' | 'name' | 'freeSwitchExtension'>;
+	rid: IRoom['_id'];
+	reload?: () => void;
+	size?: number;
+	isMember?: boolean;
+};
+
+export const useUserInfoActions = ({
+	user,
+	rid,
+	reload,
 	size = 2,
-	isMember?: boolean,
-): { actions: [string, UserInfoAction][]; menuActions: any | undefined } => {
+	isMember,
+}: UserInfoActionsParams): { actions: [string, UserInfoAction][]; menuActions: any | undefined } => {
 	const addUser = useAddUserAction(user, rid, reload);
 	const blockUser = useBlockUserAction(user, rid);
 	const changeLeader = useChangeLeaderAction(user, rid);
@@ -52,7 +73,8 @@ export const useUserInfoActions = (
 	const ignoreUser = useIgnoreUserAction(user, rid);
 	const muteUser = useMuteUserAction(user, rid);
 	const removeUser = useRemoveUserAction(user, rid, reload);
-	const call = useCallAction(user);
+	const videoCall = useVideoCallAction(user);
+	const voipCall = useVoipCallAction(user);
 	const reportUserOption = useReportUser(user);
 	const isLayoutEmbedded = useEmbeddedLayout();
 	const { userToolbox: hiddenActions } = useLayoutHiddenActions();
@@ -60,7 +82,8 @@ export const useUserInfoActions = (
 	const userinfoActions = useMemo(
 		() => ({
 			...(openDirectMessage && !isLayoutEmbedded && { openDirectMessage }),
-			...(call && { call }),
+			...(videoCall && { videoCall }),
+			...(voipCall && { voipCall }),
 			...(!isMember && addUser && { addUser }),
 			...(isMember && changeOwner && { changeOwner }),
 			...(isMember && changeLeader && { changeLeader }),
@@ -75,7 +98,8 @@ export const useUserInfoActions = (
 		[
 			openDirectMessage,
 			isLayoutEmbedded,
-			call,
+			videoCall,
+			voipCall,
 			changeOwner,
 			changeLeader,
 			changeModerator,
@@ -100,7 +124,12 @@ export const useUserInfoActions = (
 			const group = item.type ? item.type : '';
 			const section = acc.find((section: { id: string }) => section.id === group);
 
-			const newItem = { ...item, id: item.content };
+			const newItem = {
+				...item,
+				id: item.content || item.title || '',
+				content: item.content || item.title,
+			};
+
 			if (section) {
 				section.items.push(newItem);
 				return acc;
diff --git a/apps/meteor/ee/app/api-enterprise/server/index.ts b/apps/meteor/ee/app/api-enterprise/server/index.ts
index 7a528a4ec2f4..1c48d592d33e 100644
--- a/apps/meteor/ee/app/api-enterprise/server/index.ts
+++ b/apps/meteor/ee/app/api-enterprise/server/index.ts
@@ -3,3 +3,7 @@ import { License } from '@rocket.chat/license';
 await License.onLicense('canned-responses', async () => {
 	await import('./canned-responses');
 });
+
+await License.onLicense('voip-enterprise', async () => {
+	await import('./voip-freeswitch');
+});
diff --git a/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts b/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts
new file mode 100644
index 000000000000..b4857896e01d
--- /dev/null
+++ b/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts
@@ -0,0 +1,150 @@
+import { VoipFreeSwitch } from '@rocket.chat/core-services';
+import { Users } from '@rocket.chat/models';
+import {
+	isVoipFreeSwitchExtensionAssignProps,
+	isVoipFreeSwitchExtensionGetDetailsProps,
+	isVoipFreeSwitchExtensionGetInfoProps,
+	isVoipFreeSwitchExtensionListProps,
+} from '@rocket.chat/rest-typings';
+import { wrapExceptions } from '@rocket.chat/tools';
+
+import { API } from '../../../../app/api/server';
+import { settings } from '../../../../app/settings/server/cached';
+
+API.v1.addRoute(
+	'voip-freeswitch.extension.list',
+	{ authRequired: true, permissionsRequired: ['manage-voip-extensions'], validateParams: isVoipFreeSwitchExtensionListProps },
+	{
+		async get() {
+			const { username, type = 'all' } = this.queryParams;
+
+			const extensions = await wrapExceptions(() => VoipFreeSwitch.getExtensionList()).catch(() => {
+				throw new Error('Failed to load extension list.');
+			});
+
+			if (type === 'all') {
+				return API.v1.success({ extensions });
+			}
+
+			const assignedExtensions = await Users.findAssignedFreeSwitchExtensions().toArray();
+
+			switch (type) {
+				case 'free':
+					const freeExtensions = extensions.filter(({ extension }) => !assignedExtensions.includes(extension));
+					return API.v1.success({ extensions: freeExtensions });
+				case 'allocated':
+					// Extensions that are already assigned to some user
+					const allocatedExtensions = extensions.filter(({ extension }) => assignedExtensions.includes(extension));
+					return API.v1.success({ extensions: allocatedExtensions });
+				case 'available':
+					// Extensions that are free or assigned to the specified user
+					const user = (username && (await Users.findOneByUsername(username, { projection: { freeSwitchExtension: 1 } }))) || undefined;
+					const currentExtension = user?.freeSwitchExtension;
+
+					const availableExtensions = extensions.filter(
+						({ extension }) => extension === currentExtension || !assignedExtensions.includes(extension),
+					);
+
+					return API.v1.success({ extensions: availableExtensions });
+			}
+
+			return API.v1.success({ extensions });
+		},
+	},
+);
+
+API.v1.addRoute(
+	'voip-freeswitch.extension.assign',
+	{ authRequired: true, permissionsRequired: ['manage-voip-extensions'], validateParams: isVoipFreeSwitchExtensionAssignProps },
+	{
+		async post() {
+			const { extension, username } = this.bodyParams;
+
+			if (!username) {
+				return API.v1.notFound();
+			}
+
+			const user = await Users.findOneByUsername(username, { projection: { freeSwitchExtension: 1 } });
+			if (!user) {
+				return API.v1.notFound();
+			}
+
+			const existingUser = extension && (await Users.findOneByFreeSwitchExtension(extension, { projection: { _id: 1 } }));
+			if (existingUser && existingUser._id !== user._id) {
+				throw new Error('Extension not available.');
+			}
+
+			if (extension && user.freeSwitchExtension === extension) {
+				return API.v1.success();
+			}
+
+			await Users.setFreeSwitchExtension(user._id, extension);
+			return API.v1.success();
+		},
+	},
+);
+
+API.v1.addRoute(
+	'voip-freeswitch.extension.getDetails',
+	{ authRequired: true, permissionsRequired: ['view-voip-extension-details'], validateParams: isVoipFreeSwitchExtensionGetDetailsProps },
+	{
+		async get() {
+			const { extension, group } = this.queryParams;
+
+			if (!extension) {
+				throw new Error('Invalid params');
+			}
+
+			const extensionData = await wrapExceptions(() => VoipFreeSwitch.getExtensionDetails({ extension, group })).suppress(() => undefined);
+			if (!extensionData) {
+				return API.v1.notFound();
+			}
+
+			const existingUser = await Users.findOneByFreeSwitchExtension(extensionData.extension, { projection: { username: 1, name: 1 } });
+
+			return API.v1.success({
+				...extensionData,
+				...(existingUser && { userId: existingUser._id, name: existingUser.name, username: existingUser.username }),
+			});
+		},
+	},
+);
+
+API.v1.addRoute(
+	'voip-freeswitch.extension.getRegistrationInfoByUserId',
+	{ authRequired: true, permissionsRequired: ['view-user-voip-extension'], validateParams: isVoipFreeSwitchExtensionGetInfoProps },
+	{
+		async get() {
+			const { userId } = this.queryParams;
+
+			if (!userId) {
+				throw new Error('Invalid params.');
+			}
+
+			const user = await Users.findOneById(userId, { projection: { freeSwitchExtension: 1 } });
+			if (!user) {
+				throw new Error('User not found.');
+			}
+
+			const { freeSwitchExtension: extension } = user;
+
+			if (!extension) {
+				throw new Error('Extension not assigned.');
+			}
+
+			const extensionData = await wrapExceptions(() => VoipFreeSwitch.getExtensionDetails({ extension })).suppress(() => undefined);
+			if (!extensionData) {
+				return API.v1.notFound();
+			}
+			const password = await wrapExceptions(() => VoipFreeSwitch.getUserPassword(extension)).suppress(() => undefined);
+
+			return API.v1.success({
+				extension: extensionData,
+				credentials: {
+					websocketPath: settings.get<string>('VoIP_TeamCollab_FreeSwitch_WebSocket_Path'),
+					password,
+				},
+			});
+		},
+	},
+);
diff --git a/apps/meteor/ee/server/configuration/index.ts b/apps/meteor/ee/server/configuration/index.ts
index 9a7738b23e4a..09160ef39a26 100644
--- a/apps/meteor/ee/server/configuration/index.ts
+++ b/apps/meteor/ee/server/configuration/index.ts
@@ -3,3 +3,4 @@ import './oauth';
 import './outlookCalendar';
 import './saml';
 import './videoConference';
+import './voip';
diff --git a/apps/meteor/ee/server/configuration/voip.ts b/apps/meteor/ee/server/configuration/voip.ts
new file mode 100644
index 000000000000..b265ca900cdb
--- /dev/null
+++ b/apps/meteor/ee/server/configuration/voip.ts
@@ -0,0 +1,10 @@
+import { License } from '@rocket.chat/license';
+import { Meteor } from 'meteor/meteor';
+
+import { addSettings } from '../settings/voip';
+
+Meteor.startup(async () => {
+	await License.onLicense('voip-enterprise', async () => {
+		await addSettings();
+	});
+});
diff --git a/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts b/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts
new file mode 100644
index 000000000000..8bc0f7c9b4fe
--- /dev/null
+++ b/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts
@@ -0,0 +1,53 @@
+import { type IVoipFreeSwitchService, ServiceClassInternal } from '@rocket.chat/core-services';
+import type { FreeSwitchExtension, ISetting, SettingValue } from '@rocket.chat/core-typings';
+import { getDomain, getUserPassword, getExtensionList, getExtensionDetails } from '@rocket.chat/freeswitch';
+
+export class VoipFreeSwitchService extends ServiceClassInternal implements IVoipFreeSwitchService {
+	protected name = 'voip-freeswitch';
+
+	constructor(private getSetting: <T extends SettingValue = SettingValue>(id: ISetting['_id']) => T) {
+		super();
+	}
+
+	private getConnectionSettings(): { host: string; port: number; password: string; timeout: number } {
+		if (!this.getSetting('VoIP_TeamCollab_Enabled') && !process.env.FREESWITCHIP) {
+			throw new Error('VoIP is disabled.');
+		}
+
+		const host = process.env.FREESWITCHIP || this.getSetting<string>('VoIP_TeamCollab_FreeSwitch_Host');
+		if (!host) {
+			throw new Error('VoIP is not properly configured.');
+		}
+
+		const port = this.getSetting<number>('VoIP_TeamCollab_FreeSwitch_Port') || 8021;
+		const timeout = this.getSetting<number>('VoIP_TeamCollab_FreeSwitch_Timeout') || 3000;
+		const password = this.getSetting<string>('VoIP_TeamCollab_FreeSwitch_Password');
+
+		return {
+			host,
+			port,
+			password,
+			timeout,
+		};
+	}
+
+	async getDomain(): Promise<string> {
+		const options = this.getConnectionSettings();
+		return getDomain(options);
+	}
+
+	async getUserPassword(user: string): Promise<string> {
+		const options = this.getConnectionSettings();
+		return getUserPassword(options, user);
+	}
+
+	async getExtensionList(): Promise<FreeSwitchExtension[]> {
+		const options = this.getConnectionSettings();
+		return getExtensionList(options);
+	}
+
+	async getExtensionDetails(requestParams: { extension: string; group?: string }): Promise<FreeSwitchExtension> {
+		const options = this.getConnectionSettings();
+		return getExtensionDetails(options, requestParams);
+	}
+}
diff --git a/apps/meteor/ee/server/settings/voip.ts b/apps/meteor/ee/server/settings/voip.ts
new file mode 100644
index 000000000000..90d951ead3f4
--- /dev/null
+++ b/apps/meteor/ee/server/settings/voip.ts
@@ -0,0 +1,49 @@
+import { settingsRegistry } from '../../../app/settings/server';
+
+export function addSettings(): Promise<void> {
+	return settingsRegistry.addGroup('VoIP_TeamCollab', async function () {
+		await this.with(
+			{
+				enterprise: true,
+				modules: ['voip-enterprise'],
+			},
+			async function () {
+				await this.add('VoIP_TeamCollab_Enabled', false, {
+					type: 'boolean',
+					public: true,
+					invalidValue: false,
+				});
+
+				await this.add('VoIP_TeamCollab_FreeSwitch_Host', '', {
+					type: 'string',
+					public: true,
+					invalidValue: '',
+				});
+
+				await this.add('VoIP_TeamCollab_FreeSwitch_Port', 8021, {
+					type: 'int',
+					public: true,
+					invalidValue: 8021,
+				});
+
+				await this.add('VoIP_TeamCollab_FreeSwitch_Password', '', {
+					type: 'password',
+					public: true,
+					invalidValue: '',
+				});
+
+				await this.add('VoIP_TeamCollab_FreeSwitch_Timeout', 3000, {
+					type: 'int',
+					public: true,
+					invalidValue: 3000,
+				});
+
+				await this.add('VoIP_TeamCollab_FreeSwitch_WebSocket_Path', '', {
+					type: 'string',
+					public: true,
+					invalidValue: '',
+				});
+			},
+		);
+	});
+}
diff --git a/apps/meteor/ee/server/startup/services.ts b/apps/meteor/ee/server/startup/services.ts
index 2f63ddba42a8..dc072fb1d9b0 100644
--- a/apps/meteor/ee/server/startup/services.ts
+++ b/apps/meteor/ee/server/startup/services.ts
@@ -1,6 +1,7 @@
 import { api } from '@rocket.chat/core-services';
 import { License } from '@rocket.chat/license';
 
+import { settings } from '../../../app/settings/server/cached';
 import { isRunningMs } from '../../../server/lib/isRunningMs';
 import { FederationService } from '../../../server/services/federation/service';
 import { LicenseService } from '../../app/license/server/license.internalService';
@@ -10,6 +11,7 @@ import { FederationServiceEE } from '../local-services/federation/service';
 import { InstanceService } from '../local-services/instance/service';
 import { LDAPEEService } from '../local-services/ldap/service';
 import { MessageReadsService } from '../local-services/message-reads/service';
+import { VoipFreeSwitchService } from '../local-services/voip-freeswitch/service';
 
 // TODO consider registering these services only after a valid license is added
 api.registerService(new EnterpriseSettings());
@@ -17,6 +19,7 @@ api.registerService(new LDAPEEService());
 api.registerService(new LicenseService());
 api.registerService(new MessageReadsService());
 api.registerService(new OmnichannelEE());
+api.registerService(new VoipFreeSwitchService((id) => settings.get(id)));
 
 // when not running micro services we want to start up the instance intercom
 if (!isRunningMs()) {
diff --git a/apps/meteor/jest.config.ts b/apps/meteor/jest.config.ts
index 8dc7fa033e03..b944cd795620 100644
--- a/apps/meteor/jest.config.ts
+++ b/apps/meteor/jest.config.ts
@@ -11,6 +11,7 @@ export default {
 
 			testMatch: [
 				'<rootDir>/client/**/**.spec.[jt]s?(x)',
+				'<rootDir>/ee/client/**/**.spec.[jt]s?(x)',
 				'<rootDir>/tests/unit/client/views/**/*.spec.{ts,tsx}',
 				'<rootDir>/tests/unit/client/providers/**/*.spec.{ts,tsx}',
 			],
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b5c9003b6974..4a86673b1fe5 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -241,6 +241,7 @@
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
+		"@rocket.chat/freeswitch": "workspace:^",
 		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
@@ -284,6 +285,7 @@
 		"@rocket.chat/ui-kit": "workspace:~",
 		"@rocket.chat/ui-theming": "workspace:^",
 		"@rocket.chat/ui-video-conf": "workspace:^",
+		"@rocket.chat/ui-voip": "workspace:^",
 		"@rocket.chat/web-ui-registration": "workspace:^",
 		"@slack/bolt": "^3.14.0",
 		"@slack/rtm-api": "^6.0.0",
@@ -332,6 +334,7 @@
 		"emailreplyparser": "^0.0.5",
 		"emoji-toolkit": "^7.0.1",
 		"emojione": "^4.5.0",
+		"esl": "github:pierre-lehnen-rc/esl",
 		"eventemitter3": "^4.0.7",
 		"exif-be-gone": "^1.3.2",
 		"express": "^4.17.3",
diff --git a/apps/meteor/server/models/raw/Users.js b/apps/meteor/server/models/raw/Users.js
index 0b78f0f9e454..a5bd1d4fc16b 100644
--- a/apps/meteor/server/models/raw/Users.js
+++ b/apps/meteor/server/models/raw/Users.js
@@ -66,6 +66,7 @@ export class UsersRaw extends BaseRaw {
 			{ key: { openBusinessHours: 1 }, sparse: true },
 			{ key: { statusLivechat: 1 }, sparse: true },
 			{ key: { extension: 1 }, sparse: true, unique: true },
+			{ key: { freeSwitchExtension: 1 }, sparse: true, unique: true },
 			{ key: { language: 1 }, sparse: true },
 			{ key: { 'active': 1, 'services.email2fa.enabled': 1 }, sparse: true }, // used by statistics
 			{ key: { 'active': 1, 'services.totp.enabled': 1 }, sparse: true }, // used by statistics
@@ -713,8 +714,10 @@ export class UsersRaw extends BaseRaw {
 						$nin: exceptions,
 					},
 				},
+				{
+					...conditions,
+				},
 			],
-			...conditions,
 		};
 
 		return this.find(query, options);
@@ -2432,6 +2435,34 @@ export class UsersRaw extends BaseRaw {
 		});
 	}
 
+	findOneByFreeSwitchExtension(freeSwitchExtension, options = {}) {
+		return this.findOne(
+			{
+				freeSwitchExtension,
+			},
+			options,
+		);
+	}
+
+	findAssignedFreeSwitchExtensions() {
+		return this.findUsersWithAssignedFreeSwitchExtensions({
+			projection: {
+				freeSwitchExtension: 1,
+			},
+		}).map(({ freeSwitchExtension }) => freeSwitchExtension);
+	}
+
+	findUsersWithAssignedFreeSwitchExtensions(options = {}) {
+		return this.find(
+			{
+				freeSwitchExtension: {
+					$exists: 1,
+				},
+			},
+			options,
+		);
+	}
+
 	// UPDATE
 	addImportIds(_id, importIds) {
 		importIds = [].concat(importIds);
@@ -2905,6 +2936,17 @@ export class UsersRaw extends BaseRaw {
 		);
 	}
 
+	async setFreeSwitchExtension(_id, extension) {
+		return this.updateOne(
+			{
+				_id,
+			},
+			{
+				...(extension ? { $set: { freeSwitchExtension: extension } } : { $unset: { freeSwitchExtension: 1 } }),
+			},
+		);
+	}
+
 	// INSERT
 	create(data) {
 		const user = {
diff --git a/apps/meteor/tests/e2e/channel-management.spec.ts b/apps/meteor/tests/e2e/channel-management.spec.ts
index cd3ab365240f..15a0ef13eff2 100644
--- a/apps/meteor/tests/e2e/channel-management.spec.ts
+++ b/apps/meteor/tests/e2e/channel-management.spec.ts
@@ -51,7 +51,8 @@ test.describe.serial('channel-management', () => {
 
 		await page.keyboard.press('Tab');
 		await page.keyboard.press('Space');
-		await poHomeChannel.content.btnStartCall.waitFor();
+		await page.keyboard.press('Space');
+		await poHomeChannel.content.btnStartVideoCall.waitFor();
 		await page.keyboard.press('Tab');
 
 		await expect(page.getByRole('button', { name: 'Start call' })).toBeFocused();
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 519d9a4102aa..77c378281d94 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -342,15 +342,19 @@ export class HomeContent {
 		return this.page.locator('[data-qa-id="ToolBoxAction-phone"]');
 	}
 
-	get btnStartCall(): Locator {
+	get menuItemVideoCall(): Locator {
+		return this.page.locator('role=menuitem[name="Video call"]');
+	}
+
+	get btnStartVideoCall(): Locator {
 		return this.page.locator('#video-conf-root .rcx-button--primary.rcx-button >> text="Start call"');
 	}
 
-	get btnDeclineCall(): Locator {
+	get btnDeclineVideoCall(): Locator {
 		return this.page.locator('.rcx-button--secondary-danger.rcx-button >> text="Decline"');
 	}
 
-	ringCallText(text: string): Locator {
+	videoConfRingCallText(text: string): Locator {
 		return this.page.locator(`#video-conf-root .rcx-box.rcx-box--full >> text="${text}"`);
 	}
 
diff --git a/apps/meteor/tests/e2e/video-conference-ring.spec.ts b/apps/meteor/tests/e2e/video-conference-ring.spec.ts
index 3c6ba1730e3d..0b26c16cffc6 100644
--- a/apps/meteor/tests/e2e/video-conference-ring.spec.ts
+++ b/apps/meteor/tests/e2e/video-conference-ring.spec.ts
@@ -34,12 +34,13 @@ test.describe('video conference ringing', () => {
 
 		await auxContext.poHomeChannel.sidenav.openChat('user1');
 		await poHomeChannel.content.btnCall.click();
-		await poHomeChannel.content.btnStartCall.click();
+		await poHomeChannel.content.menuItemVideoCall.click();
+		await poHomeChannel.content.btnStartVideoCall.click();
 
-		await expect(poHomeChannel.content.ringCallText('Calling')).toBeVisible();
-		await expect(auxContext.poHomeChannel.content.ringCallText('Incoming call from')).toBeVisible();
+		await expect(poHomeChannel.content.videoConfRingCallText('Calling')).toBeVisible();
+		await expect(auxContext.poHomeChannel.content.videoConfRingCallText('Incoming call from')).toBeVisible();
 
-		await auxContext.poHomeChannel.content.btnDeclineCall.click();
+		await auxContext.poHomeChannel.content.btnDeclineVideoCall.click();
 
 		await auxContext.page.close();
 	});
diff --git a/apps/meteor/tests/e2e/video-conference.spec.ts b/apps/meteor/tests/e2e/video-conference.spec.ts
index f49786f77598..e5ec8a6f8c1d 100644
--- a/apps/meteor/tests/e2e/video-conference.spec.ts
+++ b/apps/meteor/tests/e2e/video-conference.spec.ts
@@ -28,7 +28,8 @@ test.describe('video conference', () => {
 		await poHomeChannel.sidenav.openChat(targetChannel);
 
 		await poHomeChannel.content.btnCall.click();
-		await poHomeChannel.content.btnStartCall.click();
+		await poHomeChannel.content.menuItemVideoCall.click();
+		await poHomeChannel.content.btnStartVideoCall.click();
 		await expect(poHomeChannel.content.videoConfMessageBlock.last()).toBeVisible();
 	});
 
@@ -44,7 +45,8 @@ test.describe('video conference', () => {
 		await poHomeChannel.sidenav.openChat('user2');
 
 		await poHomeChannel.content.btnCall.click();
-		await poHomeChannel.content.btnStartCall.click();
+		await poHomeChannel.content.menuItemVideoCall.click();
+		await poHomeChannel.content.btnStartVideoCall.click();
 		await expect(poHomeChannel.content.videoConfMessageBlock.last()).toBeVisible();
 	});
 
@@ -60,7 +62,8 @@ test.describe('video conference', () => {
 		await poHomeChannel.sidenav.openChat(targetTeam);
 
 		await poHomeChannel.content.btnCall.click();
-		await poHomeChannel.content.btnStartCall.click();
+		await poHomeChannel.content.menuItemVideoCall.click();
+		await poHomeChannel.content.btnStartVideoCall.click();
 		await expect(poHomeChannel.content.videoConfMessageBlock.last()).toBeVisible();
 	});
 
@@ -76,7 +79,8 @@ test.describe('video conference', () => {
 		await poHomeChannel.sidenav.openChat('rocketchat.internal.admin.test, user2');
 
 		await poHomeChannel.content.btnCall.click();
-		await poHomeChannel.content.btnStartCall.click();
+		await poHomeChannel.content.menuItemVideoCall.click();
+		await poHomeChannel.content.btnStartVideoCall.click();
 		await expect(poHomeChannel.content.videoConfMessageBlock.last()).toBeVisible();
 	});
 
diff --git a/apps/meteor/tests/mocks/client/meteor.ts b/apps/meteor/tests/mocks/client/meteor.ts
index d8340ae7b3e7..aa55781bf674 100644
--- a/apps/meteor/tests/mocks/client/meteor.ts
+++ b/apps/meteor/tests/mocks/client/meteor.ts
@@ -2,8 +2,27 @@ import { jest } from '@jest/globals';
 
 export const Meteor = {
 	loginWithSamlToken: jest.fn((_token, callback: () => void) => callback()),
+	connection: {
+		_stream: { on: jest.fn() },
+	},
+	_localStorage: {
+		getItem: jest.fn(),
+		setItem: jest.fn(),
+	},
+	users: {},
 };
 
 export const Mongo = {
-	Collection: class Collection {},
+	Collection: class Collection {
+		findOne = jest.fn();
+	},
 };
+
+export const Accounts = {
+	onLogin: jest.fn(),
+	onLogout: jest.fn(),
+};
+
+export const Tracker = { autorun: jest.fn() };
+
+export const ReactiveVar = class ReactiveVar {};
diff --git a/apps/meteor/tests/unit/server/lib/freeswitch.tests.ts b/apps/meteor/tests/unit/server/lib/freeswitch.tests.ts
new file mode 100644
index 000000000000..bb020995c7f8
--- /dev/null
+++ b/apps/meteor/tests/unit/server/lib/freeswitch.tests.ts
@@ -0,0 +1,40 @@
+import { expect } from 'chai';
+import { describe } from 'mocha';
+
+import { settings } from '../../../../app/settings/server/cached';
+import { VoipFreeSwitchService } from '../../../../ee/server/local-services/voip-freeswitch/service';
+
+const VoipFreeSwitch = new VoipFreeSwitchService((id) => settings.get(id));
+
+// Those tests still need a proper freeswitch environment configured in order to run
+// So for now they are being deliberately skipped on CI
+describe.skip('VoIP', () => {
+	describe('FreeSwitch', () => {
+		it('should get a list of users from FreeSwitch', async () => {
+			const result = await VoipFreeSwitch.getExtensionList();
+
+			expect(result).to.be.an('array');
+			expect(result[0]).to.be.an('object');
+			expect(result[0].extension).to.be.a('string');
+		});
+
+		it('should get a specific user from FreeSwitch', async () => {
+			const result = await VoipFreeSwitch.getExtensionDetails({ extension: '1001' });
+
+			expect(result).to.be.an('object');
+			expect(result.extension).to.be.equal('1001');
+		});
+
+		it('Should load user domain from FreeSwitch', async () => {
+			const result = await VoipFreeSwitch.getDomain();
+
+			expect(result).to.be.a('string').equal('rocket.chat');
+		});
+
+		it('Should load user password from FreeSwitch', async () => {
+			const result = await VoipFreeSwitch.getUserPassword('1000');
+
+			expect(result).to.be.a('string');
+		});
+	});
+});
diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
index 85722c98839f..34694b078e01 100644
--- a/packages/core-services/src/index.ts
+++ b/packages/core-services/src/index.ts
@@ -47,6 +47,7 @@ import type { UiKitCoreAppPayload, IUiKitCoreApp, IUiKitCoreAppService } from '.
 import type { ISendFileLivechatMessageParams, ISendFileMessageParams, IUploadFileParams, IUploadService } from './types/IUploadService';
 import type { IUserService } from './types/IUserService';
 import type { IVideoConfService, VideoConferenceJoinOptions } from './types/IVideoConfService';
+import type { IVoipFreeSwitchService } from './types/IVoipFreeSwitchService';
 import type { IVoipService } from './types/IVoipService';
 
 export { asyncLocalStorage } from './lib/asyncLocalStorage';
@@ -119,6 +120,7 @@ export {
 	IUiKitCoreAppService,
 	IVideoConfService,
 	IVoipService,
+	IVoipFreeSwitchService,
 	NPSCreatePayload,
 	NPSVotePayload,
 	proxifyWithWait,
@@ -166,6 +168,7 @@ export const MessageReads = proxifyWithWait<IMessageReadsService>('message-reads
 export const Room = proxifyWithWait<IRoomService>('room');
 export const Media = proxifyWithWait<IMediaService>('media');
 export const VoipAsterisk = proxifyWithWait<IVoipService>('voip-asterisk');
+export const VoipFreeSwitch = proxifyWithWait<IVoipFreeSwitchService>('voip-freeswitch');
 export const LivechatVoip = proxifyWithWait<IOmnichannelVoipService>('omnichannel-voip');
 export const Analytics = proxifyWithWait<IAnalyticsService>('analytics');
 export const LDAP = proxifyWithWait<ILDAPService>('ldap');
diff --git a/packages/core-services/src/types/IVoipFreeSwitchService.ts b/packages/core-services/src/types/IVoipFreeSwitchService.ts
new file mode 100644
index 000000000000..575cdb157969
--- /dev/null
+++ b/packages/core-services/src/types/IVoipFreeSwitchService.ts
@@ -0,0 +1,8 @@
+import type { FreeSwitchExtension } from '@rocket.chat/core-typings';
+
+export interface IVoipFreeSwitchService {
+	getExtensionList(): Promise<FreeSwitchExtension[]>;
+	getExtensionDetails(requestParams: { extension: string; group?: string }): Promise<FreeSwitchExtension>;
+	getUserPassword(user: string): Promise<string>;
+	getDomain(): Promise<string>;
+}
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index d6854bef7243..76d31704bc6e 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -189,6 +189,7 @@ export interface IUser extends IRocketChatRecord {
 	defaultRoom?: string;
 	ldap?: boolean;
 	extension?: string;
+	freeSwitchExtension?: string;
 	inviteToken?: string;
 	canViewAllInfo?: boolean;
 	phone?: string;
diff --git a/packages/core-typings/src/voip/FreeSwitchExtension.ts b/packages/core-typings/src/voip/FreeSwitchExtension.ts
new file mode 100644
index 000000000000..66e40f57fb66
--- /dev/null
+++ b/packages/core-typings/src/voip/FreeSwitchExtension.ts
@@ -0,0 +1,11 @@
+export type FreeSwitchExtension = {
+	extension: string;
+	context?: string;
+	domain?: string;
+	groups: string[];
+	status: 'UNKNOWN' | 'REGISTERED' | 'UNREGISTERED';
+	contact?: string;
+	callGroup?: string;
+	callerName?: string;
+	callerNumber?: string;
+};
diff --git a/packages/core-typings/src/voip/index.ts b/packages/core-typings/src/voip/index.ts
index 49aa0d367a8e..0a83a01d70bc 100644
--- a/packages/core-typings/src/voip/index.ts
+++ b/packages/core-typings/src/voip/index.ts
@@ -1,5 +1,6 @@
 export * from './CallStates';
 export * from './ConnectionState';
+export * from './FreeSwitchExtension';
 export * from './ICallerInfo';
 export * from './IConnectionDelegate';
 export * from './IEvents';
diff --git a/packages/freeswitch/.eslintrc.json b/packages/freeswitch/.eslintrc.json
new file mode 100644
index 000000000000..a83aeda48e66
--- /dev/null
+++ b/packages/freeswitch/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+	"extends": ["@rocket.chat/eslint-config"],
+	"ignorePatterns": ["**/dist"]
+}
diff --git a/packages/freeswitch/jest.config.ts b/packages/freeswitch/jest.config.ts
new file mode 100644
index 000000000000..c18c8ae02465
--- /dev/null
+++ b/packages/freeswitch/jest.config.ts
@@ -0,0 +1,6 @@
+import server from '@rocket.chat/jest-presets/server';
+import type { Config } from 'jest';
+
+export default {
+	preset: server.preset,
+} satisfies Config;
diff --git a/packages/freeswitch/package.json b/packages/freeswitch/package.json
new file mode 100644
index 000000000000..aed92472c4ba
--- /dev/null
+++ b/packages/freeswitch/package.json
@@ -0,0 +1,30 @@
+{
+	"name": "@rocket.chat/freeswitch",
+	"version": "0.0.1",
+	"private": true,
+	"devDependencies": {
+		"@rocket.chat/jest-presets": "workspace:~",
+		"@types/jest": "~29.5.12",
+		"eslint": "~8.45.0",
+		"jest": "~29.7.0",
+		"typescript": "~5.3.3"
+	},
+	"scripts": {
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"test": "jest",
+		"build": "rm -rf dist && tsc -p tsconfig.json",
+		"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"dependencies": {
+		"@rocket.chat/core-typings": "workspace:^",
+		"@rocket.chat/logger": "workspace:^",
+		"@rocket.chat/tools": "workspace:^",
+		"esl": "github:pierre-lehnen-rc/esl"
+	}
+}
diff --git a/packages/freeswitch/src/FreeSwitchOptions.ts b/packages/freeswitch/src/FreeSwitchOptions.ts
new file mode 100644
index 000000000000..20b68f61f0ed
--- /dev/null
+++ b/packages/freeswitch/src/FreeSwitchOptions.ts
@@ -0,0 +1 @@
+export type FreeSwitchOptions = { host?: string; port?: number; password?: string; timeout?: number };
diff --git a/packages/freeswitch/src/commands/getDomain.ts b/packages/freeswitch/src/commands/getDomain.ts
new file mode 100644
index 000000000000..a1ad0f29f38d
--- /dev/null
+++ b/packages/freeswitch/src/commands/getDomain.ts
@@ -0,0 +1,25 @@
+import type { StringMap } from 'esl';
+
+import type { FreeSwitchOptions } from '../FreeSwitchOptions';
+import { logger } from '../logger';
+import { runCommand } from '../runCommand';
+
+export function getCommandGetDomain(): string {
+	return 'eval ${domain}';
+}
+
+export function parseDomainResponse(response: StringMap): string {
+	const { _body: domain } = response;
+
+	if (typeof domain !== 'string') {
+		logger.error({ msg: 'Failed to load user domain', response });
+		throw new Error('Failed to load user domain from FreeSwitch.');
+	}
+
+	return domain;
+}
+
+export async function getDomain(options: FreeSwitchOptions): Promise<string> {
+	const response = await runCommand(options, getCommandGetDomain());
+	return parseDomainResponse(response);
+}
diff --git a/packages/freeswitch/src/commands/getExtensionDetails.ts b/packages/freeswitch/src/commands/getExtensionDetails.ts
new file mode 100644
index 000000000000..4df2bf64a8ee
--- /dev/null
+++ b/packages/freeswitch/src/commands/getExtensionDetails.ts
@@ -0,0 +1,30 @@
+import type { FreeSwitchExtension } from '@rocket.chat/core-typings';
+
+import type { FreeSwitchOptions } from '../FreeSwitchOptions';
+import { runCommand } from '../runCommand';
+import { mapUserData } from '../utils/mapUserData';
+import { parseUserList } from '../utils/parseUserList';
+
+export function getCommandListFilteredUser(user: string, group = 'default'): string {
+	return `list_users group ${group} user ${user}`;
+}
+
+export async function getExtensionDetails(
+	options: FreeSwitchOptions,
+	requestParams: { extension: string; group?: string },
+): Promise<FreeSwitchExtension> {
+	const { extension, group } = requestParams;
+	const response = await runCommand(options, getCommandListFilteredUser(extension, group));
+
+	const users = parseUserList(response);
+
+	if (!users.length) {
+		throw new Error('Extension not found.');
+	}
+
+	if (users.length >= 2) {
+		throw new Error('Multiple extensions were found.');
+	}
+
+	return mapUserData(users[0]);
+}
diff --git a/packages/freeswitch/src/commands/getExtensionList.ts b/packages/freeswitch/src/commands/getExtensionList.ts
new file mode 100644
index 000000000000..5f5325698fc3
--- /dev/null
+++ b/packages/freeswitch/src/commands/getExtensionList.ts
@@ -0,0 +1,17 @@
+import type { FreeSwitchExtension } from '@rocket.chat/core-typings';
+
+import type { FreeSwitchOptions } from '../FreeSwitchOptions';
+import { runCommand } from '../runCommand';
+import { mapUserData } from '../utils/mapUserData';
+import { parseUserList } from '../utils/parseUserList';
+
+export function getCommandListUsers(): string {
+	return 'list_users';
+}
+
+export async function getExtensionList(options: FreeSwitchOptions): Promise<FreeSwitchExtension[]> {
+	const response = await runCommand(options, getCommandListUsers());
+	const users = parseUserList(response);
+
+	return users.map((item) => mapUserData(item));
+}
diff --git a/packages/freeswitch/src/commands/getUserPassword.ts b/packages/freeswitch/src/commands/getUserPassword.ts
new file mode 100644
index 000000000000..5388dce6e142
--- /dev/null
+++ b/packages/freeswitch/src/commands/getUserPassword.ts
@@ -0,0 +1,31 @@
+import type { StringMap } from 'esl';
+
+import type { FreeSwitchOptions } from '../FreeSwitchOptions';
+import { logger } from '../logger';
+import { runCallback } from '../runCommand';
+import { getCommandGetDomain, parseDomainResponse } from './getDomain';
+
+export function getCommandGetUserPassword(user: string, domain = 'rocket.chat'): string {
+	return `user_data ${user}@${domain} param password`;
+}
+
+export function parsePasswordResponse(response: StringMap): string {
+	const { _body: password } = response;
+
+	if (password === undefined) {
+		logger.error({ msg: 'Failed to load user password', response });
+		throw new Error('Failed to load user password from FreeSwitch.');
+	}
+
+	return password;
+}
+
+export async function getUserPassword(options: FreeSwitchOptions, user: string): Promise<string> {
+	return runCallback(options, async (runCommand) => {
+		const domainResponse = await runCommand(getCommandGetDomain());
+		const domain = parseDomainResponse(domainResponse);
+
+		const response = await runCommand(getCommandGetUserPassword(user, domain));
+		return parsePasswordResponse(response);
+	});
+}
diff --git a/packages/freeswitch/src/commands/index.ts b/packages/freeswitch/src/commands/index.ts
new file mode 100644
index 000000000000..ac33235067db
--- /dev/null
+++ b/packages/freeswitch/src/commands/index.ts
@@ -0,0 +1,4 @@
+export * from './getDomain';
+export * from './getExtensionDetails';
+export * from './getExtensionList';
+export * from './getUserPassword';
diff --git a/packages/freeswitch/src/connect.ts b/packages/freeswitch/src/connect.ts
new file mode 100644
index 000000000000..6ea3741edc42
--- /dev/null
+++ b/packages/freeswitch/src/connect.ts
@@ -0,0 +1,82 @@
+import { Socket, type SocketConnectOpts } from 'node:net';
+
+import { FreeSwitchResponse } from 'esl';
+
+import { logger } from './logger';
+
+const defaultPassword = 'ClueCon';
+
+export async function connect(options?: { host?: string; port?: number; password?: string }): Promise<FreeSwitchResponse> {
+	const host = options?.host ?? '127.0.0.1';
+	const port = options?.port ?? 8021;
+	const password = options?.password ?? defaultPassword;
+
+	return new Promise((resolve, reject) => {
+		logger.debug({ msg: 'FreeSwitchClient::connect', options: { host, port } });
+
+		const socket = new Socket();
+		const currentCall = new FreeSwitchResponse(socket, logger);
+		let connecting = true;
+
+		socket.once('connect', () => {
+			void (async (): Promise<void> => {
+				connecting = false;
+				try {
+					// Normally when the client connects, FreeSwitch will first send us an authentication request. We use it to trigger the remainder of the stack.
+					await currentCall.onceAsync('freeswitch_auth_request', 20_000, 'FreeSwitchClient expected authentication request');
+					await currentCall.auth(password);
+					currentCall.auto_cleanup();
+					await currentCall.event_json('CHANNEL_EXECUTE_COMPLETE', 'BACKGROUND_JOB');
+				} catch (error) {
+					logger.error('FreeSwitchClient: connect error', error);
+					reject(error);
+				}
+
+				if (currentCall) {
+					resolve(currentCall);
+				}
+			})();
+		});
+
+		socket.once('error', (error) => {
+			if (!connecting) {
+				return;
+			}
+
+			logger.error({ msg: 'failed to connect to freeswitch server', error });
+			connecting = false;
+			reject(error);
+		});
+
+		socket.once('end', () => {
+			if (!connecting) {
+				return;
+			}
+
+			logger.debug('FreeSwitchClient::connect: client received `end` event (remote end sent a FIN packet)');
+			connecting = false;
+			reject(new Error('connection-ended'));
+		});
+
+		socket.on('warning', (data) => {
+			if (!connecting) {
+				return;
+			}
+
+			logger.warn({ msg: 'FreeSwitchClient: warning', data });
+		});
+
+		try {
+			logger.debug('FreeSwitchClient::connect: socket.connect', { options: { host, port } });
+			socket.connect({
+				host,
+				port,
+				password,
+			} as unknown as SocketConnectOpts);
+		} catch (error) {
+			logger.error('FreeSwitchClient::connect: socket.connect error', { error });
+			connecting = false;
+			reject(error);
+		}
+	});
+}
diff --git a/packages/freeswitch/src/getCommandResponse.ts b/packages/freeswitch/src/getCommandResponse.ts
new file mode 100644
index 000000000000..b71618b37ec2
--- /dev/null
+++ b/packages/freeswitch/src/getCommandResponse.ts
@@ -0,0 +1,12 @@
+import type { FreeSwitchEventData, StringMap } from 'esl';
+
+import { logger } from './logger';
+
+export async function getCommandResponse(response: FreeSwitchEventData, command?: string): Promise<StringMap> {
+	if (!response?.body) {
+		logger.error('No response from FreeSwitch server', command, response);
+		throw new Error('No response from FreeSwitch server.');
+	}
+
+	return response.body;
+}
diff --git a/packages/freeswitch/src/index.ts b/packages/freeswitch/src/index.ts
new file mode 100644
index 000000000000..30272ff42df9
--- /dev/null
+++ b/packages/freeswitch/src/index.ts
@@ -0,0 +1 @@
+export * from './commands';
diff --git a/packages/freeswitch/src/logger.ts b/packages/freeswitch/src/logger.ts
new file mode 100644
index 000000000000..4c025069d8ad
--- /dev/null
+++ b/packages/freeswitch/src/logger.ts
@@ -0,0 +1,3 @@
+import { Logger } from '@rocket.chat/logger';
+
+export const logger = new Logger('FreeSwitch');
diff --git a/packages/freeswitch/src/runCommand.ts b/packages/freeswitch/src/runCommand.ts
new file mode 100644
index 000000000000..25b87a4d2b80
--- /dev/null
+++ b/packages/freeswitch/src/runCommand.ts
@@ -0,0 +1,30 @@
+import { wrapExceptions } from '@rocket.chat/tools';
+import { FreeSwitchResponse, type StringMap } from 'esl';
+
+import type { FreeSwitchOptions } from './FreeSwitchOptions';
+import { connect } from './connect';
+import { getCommandResponse } from './getCommandResponse';
+
+export async function runCallback<T>(
+	options: FreeSwitchOptions,
+	cb: (runCommand: (command: string) => Promise<StringMap>) => Promise<T>,
+): Promise<T> {
+	const { host, port, password, timeout } = options;
+
+	const call = await connect({ host, port, password });
+	try {
+		// Await result so it runs within the try..finally scope
+		const result = await cb(async (command) => {
+			const response = await call.bgapi(command, timeout ?? FreeSwitchResponse.default_command_timeout);
+			return getCommandResponse(response, command);
+		});
+
+		return result;
+	} finally {
+		await wrapExceptions(async () => call.end()).suppress();
+	}
+}
+
+export async function runCommand(options: FreeSwitchOptions, command: string): Promise<StringMap> {
+	return runCallback(options, async (runCommand) => runCommand(command));
+}
diff --git a/packages/freeswitch/src/utils/mapUserData.ts b/packages/freeswitch/src/utils/mapUserData.ts
new file mode 100644
index 000000000000..265cf1f6946e
--- /dev/null
+++ b/packages/freeswitch/src/utils/mapUserData.ts
@@ -0,0 +1,33 @@
+import type { FreeSwitchExtension } from '@rocket.chat/core-typings';
+import type { StringMap } from 'esl';
+
+import { parseUserStatus } from './parseUserStatus';
+
+export function mapUserData(user: StringMap): FreeSwitchExtension {
+	const {
+		userid: extension,
+		context,
+		domain,
+		groups,
+		contact,
+		callgroup: callGroup,
+		effective_caller_id_name: callerName,
+		effective_caller_id_number: callerNumber,
+	} = user;
+
+	if (!extension) {
+		throw new Error('Invalid user identification.');
+	}
+
+	return {
+		extension,
+		context,
+		domain,
+		groups: groups?.split('|') || [],
+		status: parseUserStatus(contact),
+		contact,
+		callGroup,
+		callerName,
+		callerNumber,
+	};
+}
diff --git a/packages/freeswitch/src/utils/parseUserList.ts b/packages/freeswitch/src/utils/parseUserList.ts
new file mode 100644
index 000000000000..21ed42ef1ac2
--- /dev/null
+++ b/packages/freeswitch/src/utils/parseUserList.ts
@@ -0,0 +1,54 @@
+import type { StringMap } from 'esl';
+
+export function parseUserList(commandResponse: StringMap): Record<string, string>[] {
+	const { _body: text } = commandResponse;
+
+	if (!text || typeof text !== 'string') {
+		throw new Error('Invalid response from FreeSwitch server.');
+	}
+
+	const lines = text.split('\n');
+	const columnsLine = lines.shift();
+	if (!columnsLine) {
+		throw new Error('Invalid response from FreeSwitch server.');
+	}
+
+	const columns = columnsLine.split('|');
+
+	const users = new Map<string, Record<string, string | string[]>>();
+
+	for (const line of lines) {
+		const values = line.split('|');
+		if (!values.length || !values[0]) {
+			continue;
+		}
+		const user = Object.fromEntries(
+			values.map((value, index) => {
+				return [(columns.length > index && columns[index]) || `column${index}`, value];
+			}),
+		);
+
+		if (!user.userid || user.userid === '+OK') {
+			continue;
+		}
+
+		const { group, ...newUserData } = user;
+
+		const existingUser = users.get(user.userid);
+		const groups = (existingUser?.groups || []) as string[];
+
+		if (group && !groups.includes(group)) {
+			groups.push(group);
+		}
+
+		users.set(user.userid, {
+			...(users.get(user.userid) || newUserData),
+			groups,
+		});
+	}
+
+	return [...users.values()].map((user) => ({
+		...user,
+		groups: (user.groups as string[]).join('|'),
+	}));
+}
diff --git a/packages/freeswitch/src/utils/parseUserStatus.ts b/packages/freeswitch/src/utils/parseUserStatus.ts
new file mode 100644
index 000000000000..48cb9b32474a
--- /dev/null
+++ b/packages/freeswitch/src/utils/parseUserStatus.ts
@@ -0,0 +1,17 @@
+import type { FreeSwitchExtension } from '@rocket.chat/core-typings';
+
+export function parseUserStatus(status: string | undefined): FreeSwitchExtension['status'] {
+	if (!status) {
+		return 'UNKNOWN';
+	}
+
+	if (status === 'error/user_not_registered') {
+		return 'UNREGISTERED';
+	}
+
+	if (status.startsWith('sofia/')) {
+		return 'REGISTERED';
+	}
+
+	return 'UNKNOWN';
+}
diff --git a/packages/freeswitch/tests/mapUserData.test.ts b/packages/freeswitch/tests/mapUserData.test.ts
new file mode 100644
index 000000000000..44b55db492c2
--- /dev/null
+++ b/packages/freeswitch/tests/mapUserData.test.ts
@@ -0,0 +1,37 @@
+import { mapUserData } from '../src/utils/mapUserData';
+
+expect(() => mapUserData(undefined as unknown as any)).toThrow();
+expect(() => mapUserData({ extension: '15' })).toThrow('Invalid user identification.');
+
+test.each([
+	[{ userid: '1' }, { extension: '1', groups: [], status: 'UNKNOWN' }],
+	[
+		{ userid: '1', context: 'default' },
+		{ extension: '1', context: 'default', groups: [], status: 'UNKNOWN' },
+	],
+	[
+		{
+			userid: '1',
+			context: 'default',
+			domain: 'domainName',
+			groups: 'default|employee',
+			contact: 'no',
+			callgroup: 'call group',
+			effective_caller_id_name: 'caller_id_name',
+			effective_caller_id_number: 'caller_id_number',
+		},
+		{
+			extension: '1',
+			context: 'default',
+			domain: 'domainName',
+			groups: ['default', 'employee'],
+			contact: 'no',
+			callGroup: 'call group',
+			callerName: 'caller_id_name',
+			callerNumber: 'caller_id_number',
+			status: 'UNKNOWN',
+		},
+	],
+])('parse user status: %p', (input, output) => {
+	expect(mapUserData(input)).toMatchObject(output);
+});
diff --git a/packages/freeswitch/tests/parseUserList.test.ts b/packages/freeswitch/tests/parseUserList.test.ts
new file mode 100644
index 000000000000..e1db317f24fa
--- /dev/null
+++ b/packages/freeswitch/tests/parseUserList.test.ts
@@ -0,0 +1,214 @@
+import { parseUserList } from '../src/utils/parseUserList';
+import { makeFreeSwitchResponse } from './utils/makeFreeSwitchResponse';
+
+test.each(['', undefined, 200 as unknown as any, '\nsomething'])('Invalid FreeSwitch responses', (input) => {
+	expect(() => parseUserList({ _body: input })).toThrow('Invalid response from FreeSwitch server.');
+});
+
+test('Should return an empty list when there is no userid column', () => {
+	expect(
+		parseUserList(
+			makeFreeSwitchResponse([
+				['aaa', 'bbb', 'ccc'],
+				['AData', 'BData', 'CData'],
+				['AData2', 'BData2', 'CData2'],
+				['AData3', 'BData3', 'CData3'],
+			]),
+		),
+	).toMatchObject([]);
+});
+
+test('Should return an empty list when there is no lowercase userid column', () => {
+	expect(
+		parseUserList(
+			makeFreeSwitchResponse([
+				['aaa', 'bbb', 'ccc', 'USERID'],
+				[],
+				['AData', 'BData', 'CData', '15'],
+				['AData2', 'BData2', 'CData2', '20'],
+				['AData3', 'BData3', 'CData3', '30'],
+			]),
+		),
+	).toMatchObject([]);
+});
+
+test(`Should return an empty list when all records' userid is either missing or equal to +OK`, () => {
+	expect(
+		parseUserList(
+			makeFreeSwitchResponse([
+				['aaa', 'bbb', 'ccc', 'userid'],
+				['AData', 'BData', 'CData'],
+				['AData2', 'BData2', 'CData2', ''],
+				['AData3', 'BData3', 'CData3', '+OK'],
+			]),
+		),
+	).toMatchObject([]);
+});
+
+test.each([
+	[
+		[['userid'], ['1']],
+		[
+			{
+				userid: '1',
+			},
+		],
+	],
+	[
+		[['userid'], ['1'], ['2'], ['3']],
+		[
+			{
+				userid: '1',
+			},
+			{
+				userid: '2',
+			},
+			{
+				userid: '3',
+			},
+		],
+	],
+	[
+		[
+			['userid', 'group', 'name'],
+			['1', 'default', 'User 1'],
+			['2', 'default', 'User 2'],
+			['3', 'default', 'User 3'],
+		],
+		[
+			{
+				userid: '1',
+				groups: 'default',
+				name: 'User 1',
+			},
+			{
+				userid: '2',
+				groups: 'default',
+				name: 'User 2',
+			},
+			{
+				userid: '3',
+				groups: 'default',
+				name: 'User 3',
+			},
+		],
+	],
+	[
+		[
+			['userid', 'name'],
+			['1', 'User 1', 'AnotherValue'],
+			['2', 'User 2'],
+			['3', 'User 3'],
+		],
+		[
+			{
+				userid: '1',
+				name: 'User 1',
+				column2: 'AnotherValue',
+			},
+			{
+				userid: '2',
+				name: 'User 2',
+			},
+			{
+				userid: '3',
+				name: 'User 3',
+			},
+		],
+	],
+])('parse valid user list: %p', (input, output) => {
+	expect(parseUserList(makeFreeSwitchResponse(input))).toMatchObject(output);
+});
+
+test.each([
+	[
+		[['userid'], ['1'], ['1']],
+		[
+			{
+				userid: '1',
+			},
+		],
+	],
+	[
+		[['userid'], ['1'], ['2'], ['1'], ['2'], ['3'], ['3']],
+		[
+			{
+				userid: '1',
+			},
+			{
+				userid: '2',
+			},
+			{
+				userid: '3',
+			},
+		],
+	],
+	[
+		[
+			['userid', 'group'],
+			['1', 'default'],
+			['1', 'employee'],
+		],
+		[
+			{
+				userid: '1',
+				groups: 'default|employee',
+			},
+		],
+	],
+	[
+		// When there's multiple records for the same user, join the group names from all of them into the data from the first record
+		[
+			['userid', 'group'],
+			['1', 'default'],
+			['2', 'default'],
+			['1', 'employee'],
+			['2', 'manager'],
+			['3', 'default'],
+			['3', 'owner'],
+		],
+		[
+			{
+				userid: '1',
+				groups: 'default|employee',
+			},
+			{
+				userid: '2',
+				groups: 'default|manager',
+			},
+			{
+				userid: '3',
+				groups: 'default|owner',
+			},
+		],
+	],
+	[
+		// When there's multiple records for the same user without group names, use only the data from the first of them
+		[
+			['userid', 'something_else'],
+			['1', '1.1'],
+			['1', '1.2'],
+			['2', '2.1'],
+			['2', '2.2', 'extra_value'],
+			['3', ''],
+			['3', '3.2'],
+			['3', '3.3'],
+		],
+		[
+			{
+				userid: '1',
+				something_else: '1.1',
+			},
+			{
+				userid: '2',
+				something_else: '2.1',
+			},
+			{
+				userid: '3',
+				something_else: '',
+			},
+		],
+	],
+])('parse user list with duplicate userids: %p', (input, output) => {
+	expect(parseUserList(makeFreeSwitchResponse(input))).toMatchObject(output);
+});
diff --git a/packages/freeswitch/tests/parseUserStatus.test.ts b/packages/freeswitch/tests/parseUserStatus.test.ts
new file mode 100644
index 000000000000..73e2f0599097
--- /dev/null
+++ b/packages/freeswitch/tests/parseUserStatus.test.ts
@@ -0,0 +1,14 @@
+import { parseUserStatus } from '../src/utils/parseUserStatus';
+
+test.each([
+	['', 'UNKNOWN'],
+	[undefined, 'UNKNOWN'],
+	['error/user_not_registered', 'UNREGISTERED'],
+	['ERROR/user_not_registered', 'UNKNOWN'],
+	['sofia/user_data', 'REGISTERED'],
+	['sofia/', 'REGISTERED'],
+	['SOFIA/', 'UNKNOWN'],
+	['luana/', 'UNKNOWN'],
+])('parse user status: %p', (input, output) => {
+	expect(parseUserStatus(input)).toBe(output);
+});
diff --git a/packages/freeswitch/tests/utils/makeFreeSwitchResponse.ts b/packages/freeswitch/tests/utils/makeFreeSwitchResponse.ts
new file mode 100644
index 000000000000..58c2da59a1fe
--- /dev/null
+++ b/packages/freeswitch/tests/utils/makeFreeSwitchResponse.ts
@@ -0,0 +1,5 @@
+import type { StringMap } from 'esl';
+
+export const makeFreeSwitchResponse = (lines: string[][]): StringMap => ({
+	_body: lines.map((columns) => columns.join('|')).join('\n'),
+});
diff --git a/packages/freeswitch/tsconfig.json b/packages/freeswitch/tsconfig.json
new file mode 100644
index 000000000000..d2a7e3ee7c8b
--- /dev/null
+++ b/packages/freeswitch/tsconfig.json
@@ -0,0 +1,9 @@
+{
+	"extends": "../../tsconfig.base.server.json",
+	"compilerOptions": {
+		"declaration": true,
+		"rootDir": "./src",
+		"outDir": "./dist"
+	},
+	"include": ["./src/**/*"],
+}
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 47d2034e002e..ba7ed6ec627a 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -697,6 +697,7 @@
   "Assets_Description": "Modify your workspace's logo, icon, favicon and more.",
   "Asset_preview": "Asset preview",
   "Assign_admin": "Assigning admin",
+  "Assign_extension": "Assign extension",
   "Assign_new_conversations_to_bot_agent": "Assign new conversations to bot agent",
   "Assign_new_conversations_to_bot_agent_description": "The routing system will attempt to find a bot agent before addressing new conversations to a human agent.",
   "assign-admin-role": "Assign Admin Role",
@@ -706,6 +707,8 @@
   "Associate": "Associate",
   "Associate_Agent": "Associate Agent",
   "Associate_Agent_to_Extension": "Associate Agent to Extension",
+  "Associate_Extension": "Associate Extension",
+  "Associate_User_to_Extension": "Associate User to Extension",
   "at": "at",
   "At_least_one_added_token_is_required_by_the_user": "At least one added token is required by the user",
   "AtlassianCrowd": "Atlassian Crowd",
@@ -903,6 +906,8 @@
   "Call_started": "Call started",
   "Call_unavailable_for_federation": "Call is unavailable for Federated rooms",
   "Call_was_not_answered": "Call was not answered",
+  "Call_transfered_to__name__": "Call transfered to {{name}}",
+  "Call_terminated": "Call terminated",
   "Caller": "Caller",
   "Caller_Id": "Caller ID",
   "Camera_access_not_allowed": "Camera access was not allowed, please check your browser settings.",
@@ -1053,6 +1058,7 @@
   "close": "close",
   "Close": "Close",
   "Close_chat": "Close chat",
+  "Close_Dialpad": "Close Dialpad",
   "Close_room_description": "You are about to close this chat. Are you sure you want to continue?",
   "close-livechat-room": "Close Omnichannel Room",
   "close-livechat-room_description": "Permission to close the current Omnichannel room",
@@ -1205,6 +1211,7 @@
   "Copied": "Copied",
   "Copy": "Copy",
   "Copy_text": "Copy text",
+  "Copy_phone_number": "Copy phone number",
   "Copy_to_clipboard": "Copy to clipboard",
   "COPY_TO_CLIPBOARD": "COPY TO CLIPBOARD",
   "could-not-access-webdav": "Could not access WebDAV",
@@ -1672,6 +1679,7 @@
   "Devices": "Devices",
   "Devices_Set": "Devices Set",
   "Device_settings": "Device Settings",
+  "Device_settings_not_supported_by_browser": "Device settings (not supported by the browser)",
   "Dialed_number_doesnt_exist": "Dialed number doesn't exist",
   "Dialed_number_is_incomplete": "Dialed number is not complete",
   "Different_Style_For_User_Mentions": "Different style for user mentions",
@@ -1715,6 +1723,7 @@
   "Disable_two-factor_authentication": "Disable two-factor authentication via TOTP",
   "Disable_two-factor_authentication_email": "Disable two-factor authentication via Email",
   "Disabled": "Disabled",
+  "Disable_voice_calling": "Disable voice calling",
   "Disallow_reacting": "Disallow Reacting",
   "Disallow_reacting_Description": "Disallows reacting",
   "Discard": "Discard",
@@ -1956,6 +1965,7 @@
   "Enable_two-factor_authentication": "Enable two-factor authentication via TOTP",
   "Enable_two-factor_authentication_email": "Enable two-factor authentication via Email",
   "Enable_unlimited_apps": "Enable unlimited apps",
+  "Enable_voice_calling": "Enable voice calling",
   "Enabled": "Enabled",
   "Encrypted": "Encrypted",
   "Encrypted_channel_Description": "Messages are end-to-end encrypted, search will not work and notifications may not show message content",
@@ -2250,6 +2260,8 @@
   "Export_My_Data": "Export My Data (JSON)",
   "expression": "Expression",
   "Extended": "Extended",
+  "Extension": "Extension",
+  "Extension_removed": "Extension removed",
   "Extensions": "Extensions",
   "Extension_Number": "Extension Number",
   "Extension_Status": "Extension Status",
@@ -2276,6 +2288,8 @@
   "Failed_To_Start_Import": "Failed to start import operation",
   "Failed_To_upload_Import_File": "Failed to upload import file",
   "Failed_to_validate_invite_token": "Failed to validate invite token",
+  "Failed_to_copy_phone_number": "Failed to copy phone number",
+  "Failed_to_transfer_call": "Failed to transfer call",
   "Failure": "Failure",
   "False": "False",
   "Fallback_forward_department": "Fallback department for forwarding",
@@ -2578,6 +2592,7 @@
   "Grouping": "Grouping",
   "Guest": "Guest",
   "Hash": "Hash",
+  "Hang_up_and_transfer_call": "Hang up and transfer call",
   "Header": "Header",
   "Header_and_Footer": "Header and Footer",
   "Pharmaceutical": "Pharmaceutical",
@@ -2725,6 +2740,8 @@
   "Include_Offline_Agents": "Include offline agents",
   "Inclusive": "Inclusive",
   "Incoming": "Incoming",
+  "Incoming_call": "Incoming call",
+  "Incoming_call_transfer": "Incoming call transfer",
   "Incoming_call_from": "Incoming call from",
   "Incoming_Livechats": "Queued chats",
   "Incoming_WebHook": "Incoming WebHook",
@@ -3397,6 +3414,7 @@
   "logout-other-user_description": "Permission to logout other users",
   "Logs": "Logs",
   "Logs_Description": "Configure how server logs are received.",
+  "Long_press_to_do_x": "Long press to do {{action}}",
   "Longest_chat_duration": "Longest Chat Duration",
   "Longest_reaction_time": "Longest Reaction Time",
   "Longest_response_time": "Longest Response Time",
@@ -3474,6 +3492,8 @@
   "manage-user-status_description": "Permission to manage the server custom user statuses",
   "manage-voip-call-settings": "Manage Voip Call Settings",
   "manage-voip-call-settings_description": "Permission to manage voip call settings",
+  "manage-voip-extensions": "Manage Voip Extensions",
+  "manage-voip-extensions_description": "Permission to manage voip extensions assigned to users",
   "manage-voip-contact-center-settings": "Manage Voip Contact Center Settings",
   "manage-voip-contact-center-settings_description": "Permission to manage voip contact center settings",
   "Manage_Omnichannel": "Manage Omnichannel",
@@ -4204,6 +4224,7 @@
   "Thank_You_For_Choosing_RocketChat": "Thank you for choosing Rocket.Chat!",
   "Phone_already_exists": "Phone already exists",
   "Phone_number": "Phone number",
+  "Phone_number_copied": "Phone number copied",
   "PID": "PID",
   "Pin": "Pin",
   "Pin_Message": "Pin Message",
@@ -4438,6 +4459,7 @@
   "Registration_status": "Registration status",
   "Registration_Succeeded": "Registration Succeeded",
   "Registration_via_Admin": "Registration via Admin",
+  "Registration_information_not_found": "Registration information not found",
   "Regular_Expressions": "Regular Expressions",
   "Reject_call": "Reject call",
   "Release": "Release",
@@ -4459,6 +4481,8 @@
   "Remove_custom_oauth": "Remove custom OAuth",
   "Remove_from_room": "Remove from room",
   "Remove_from_team": "Remove from team",
+  "Remove_extension": "Remove extension",
+  "Remove_last_character": "Remove last character",
   "Remove_last_admin": "Removing last admin",
   "Remove_someone_from_room": "Remove someone from the room",
   "remove-closed-livechat-room": "Remove Closed Omnichannel Room",
@@ -4845,6 +4869,7 @@
   "Select_user": "Select user",
   "Select_users": "Select users",
   "Select_period": "Select period",
+  "Select_someone_to_transfer_the_call_to": "Select someone to transfer the call to",
   "Selected_agents": "Selected agents",
   "Selected_by_default": "Selected by default",
   "Selected_departments": "Selected Departments",
@@ -5080,6 +5105,7 @@
   "Sound File": "Sound File",
   "Source": "Source",
   "Speakers": "Speakers",
+  "Speaker": "Speaker",
   "spy-voip-calls": "Spy Voip Calls",
   "spy-voip-calls_description": "Permission to spy voip calls",
   "SSL": "SSL",
@@ -5266,6 +5292,7 @@
   "Teams_Select_a_team": "Select a team",
   "Teams_Search_teams": "Search Teams",
   "Teams_New_Read_only_Label": "Read-only",
+  "Temporarily_unavailable": "Temporarily unavailable",
   "Technology_Services": "Technology Services",
   "Upgrade_tab_connection_error_description": "Looks like you have no internet connection. This may be because your workspace is installed on a fully-secured air-gapped server",
   "Terms": "Terms",
@@ -5462,6 +5489,8 @@
   "onboarding.form.registeredServerForm.continueStandalone": "Continue as standalone",
   "transfer-livechat-guest": "Transfer Livechat Guests",
   "transfer-livechat-guest_description": "Permission to transfer livechat guests",
+  "Transfer_to": "Transfer to",
+  "Transfer_call": "Transfer call",
   "Transferred": "Transferred",
   "Translate": "Translate",
   "Translated": "Translated",
@@ -5535,10 +5564,13 @@
   "UI_Use_Real_Name": "Use Real Name",
   "unable-to-get-file": "Unable to get file",
   "Unable_to_load_active_connections": "Unable to load active connections",
+  "Unable_to_complete_call": "Unable to complete call",
+  "Unable_to_make_calls_while_another_is_ongoing": "Unable to make calls while another call is ongoing",
   "Unarchive": "Unarchive",
   "unarchive-room": "Unarchive Room",
   "unarchive-room_description": "Permission to unarchive channels",
   "Unassigned": "Unassigned",
+  "Unassign_extension": "Unassign extension",
   "unauthorized": "Not authorized",
   "Unavailable": "Unavailable",
   "Unavailable_in_encrypted_channels": "Unavailable in encrypted channels",
@@ -5696,6 +5728,7 @@
   "User_uploaded_a_file_to_you": "<strong>{{username}}</strong> sent you a file",
   "User_uploaded_file": "Uploaded a file",
   "User_uploaded_image": "Uploaded an image",
+  "User_extension_not_found": "User extension not found",
   "user-generate-access-token": "User Generate Access Token",
   "user-generate-access-token_description": "Permission for users to generate access tokens",
   "UserData_EnableDownload": "Enable User Data Download",
@@ -5739,6 +5772,7 @@
   "Users_key_has_been_reset": "User's key has been reset",
   "Users_reacted": "Users that Reacted",
   "Users_TOTP_has_been_reset": "User's TOTP has been reset",
+  "User_Without_Extensions": "Users without extensions",
   "Uses": "Uses",
   "Uses_left": "Uses left",
   "UTC_Timezone": "UTC Timezone",
@@ -5772,6 +5806,7 @@
   "Video_Chat_Window": "Video Chat",
   "Video_Conference": "Conference Call",
   "Video_Call_unavailable_for_this_type_of_room": "Video Call is unavailable for this type of room",
+  "Video_call": "Video call",
   "Video_Conferences": "Conference Calls",
   "Video_Conference_Info": "Meeting Information",
   "Video_Conference_Url": "Meeting URL",
@@ -5912,6 +5947,10 @@
   "view-statistics_description": "Permission to view system statistics such as number of users logged in, number of rooms, operating system information",
   "view-user-administration": "View User Administration",
   "view-user-administration_description": "Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",
+  "view-user-voip-extension": "View User VoIP Extension",
+  "view-user-voip-extension_description": "Permission to view user's assigned VoIP Extension",
+  "view-voip-extension-details": "View VoIP Extension Details",
+  "view-voip-extension-details_description": "Permission to view the details associated with VoIP extensions",
   "Viewing_room_administration": "Viewing room administration",
   "Visibility": "Visibility",
   "Visible": "Visible",
@@ -5929,6 +5968,12 @@
   "Visitor_page_URL": "Visitor page URL",
   "Visitor_time_on_site": "Visitor time on site",
   "Voice_Call": "Voice Call",
+  "Voice_call": "Voice call",
+  "Voice_call_extension": "Voice call extension",
+  "Voice_calling_disabled": "Voice calling is disabled",
+  "Voice_calling_enabled": "Voice calling is enabled",
+  "Voice_calling_registration_failed": "Voice calling registration failed",
+  "Voice_Call_Extension": "Voice Call Extension",
   "VoIP_Enable_Keep_Alive_For_Unstable_Networks": "Enable SIP Options Keep Alive",
   "VoIP_Enable_Keep_Alive_For_Unstable_Networks_Description": "Monitor the status of multiple external SIP gateways by sending periodic SIP OPTIONS messages. Used for unstable networks.",
   "VoIP_Enabled": "Enable voice channel",
@@ -5958,6 +6003,13 @@
   "VoIP_JWT_Secret_description": "Set a secret key for sharing extension details from server to client as JWT instead of plain text. Extension registration details will be sent as plain text if a secret key has not been set.",
   "Voip_is_disabled": "VoIP is disabled",
   "Voip_is_disabled_description": "To view the list of extensions it is necessary to activate VoIP, do so in the Settings tab.",
+  "VoIP_TeamCollab": "VoIP for Team Collaboration",
+  "VoIP_TeamCollab_Enabled": "Enabled",
+  "VoIP_TeamCollab_FreeSwitch_Host": "FreeSwitch Host",
+  "VoIP_TeamCollab_FreeSwitch_Port": "FreeSwitch Port",
+  "VoIP_TeamCollab_FreeSwitch_Password": "FreeSwitch Password",
+  "VoIP_TeamCollab_FreeSwitch_Timeout": "FreeSwitch Request Timeout",
+  "VoIP_TeamCollab_FreeSwitch_WebSocket_Path": "WebSocket Path",
   "VoIP_Toggle": "Enable/Disable VoIP",
   "Chat_opened_by_visitor": "Chat opened by the visitor",
   "Wait_activation_warning": "Before you can login, your account must be manually activated by an administrator.",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index b2575a190671..cf06ddc01a89 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -598,6 +598,7 @@
   "Are_you_sure_you_want_to_reset_the_name_of_all_priorities": "Tem certeza que deseja redefinir o nome de todas as prioridades?",
   "Assets": "Recursos",
   "Assign_admin": "Atribuindo administrador",
+  "Assign_extension": "Atribuir extensão",
   "Assign_new_conversations_to_bot_agent": "Atribuir novas conversas para um agente bot",
   "Assign_new_conversations_to_bot_agent_description": "O sistema de roteamento vai procurar um agente bot antes de encaminhar novas conversas para um agente humano.",
   "assign-admin-role": "Atribuir função de administrador",
@@ -760,6 +761,8 @@
   "Call_Information": "Informação da chamada",
   "Call_provider": "Provedor de chamada",
   "Call_Already_Ended": "Chamada já encerrada",
+  "Call_transfered_to__name__": "Chamada transferida para {{name}}",
+  "Call_terminated": "Chamada encerrada",
   "call-management": "Gestão de chamadas",
   "call-management_description": "Permissão para iniciar reunião",
   "Caller": "Autor da chamada",
@@ -888,6 +891,7 @@
   "close": "fechar",
   "Close": "Fechar",
   "Close_chat": "Fechar conversa",
+  "Close_Dialpad": "Fechat Discador",
   "Close_room_description": "Você está prestes a fechar esta conversa. Você tem certeza de que deseja continuar?",
   "close-livechat-room": "Fechar sala omnichannel",
   "close-livechat-room_description": "Permissão para fechar a sala Omnichannel atual",
@@ -1011,6 +1015,7 @@
   "Copied": "Copiado",
   "Copy": "Copiar",
   "Copy_text": "Copiar texto",
+  "Copy_phone_number": "Copiar número de telefone",
   "Copy_to_clipboard": "Copiar para área de transferência",
   "COPY_TO_CLIPBOARD": "COPIAR PARA ÁREA DE TRANSFERÊNCIA",
   "could-not-access-webdav": "Não foi possível acessar o WebDAV",
@@ -1423,6 +1428,8 @@
   "Device_Changes_Not_Available_Insecure_Context": "Mudanças de dispositivo somente estão disponíveis em contextos seguros. (https://)",
   "line": "linha",
   "Device_Management_IP": "IP",
+  "Device_settings": "Configurações de dispositivo",
+  "Device_settings_not_supported_by_browser": "Configurações de dispositivo (não suportado pelo browser)",
   "Different_Style_For_User_Mentions": "Estilo diferente para as menções do usuário",
   "Livechat_Facebook_API_Key": "Chave da API OmniChannel",
   "Livechat_Facebook_API_Secret": "Secret da API OmniChannel",
@@ -1457,6 +1464,7 @@
   "Disable_Notifications": "Desativar as notificações",
   "Disable_two-factor_authentication": "Desativar a autenticação de dois fatores por TOTP",
   "Disable_two-factor_authentication_email": "Desativar a autenticação de dois fatores por e-mail",
+  "Disable_voice_calling": "Desabilitar chamadas de voz",
   "Disabled": "Desabilitado",
   "Disallow_reacting": "Não permitir reagir",
   "Disallow_reacting_Description": "Não permite reagir",
@@ -1641,6 +1649,7 @@
   "Enable_Svg_Favicon": "Ativar favicon SVG",
   "Enable_two-factor_authentication": "Ativar autenticação de dois fatores por TOTP",
   "Enable_two-factor_authentication_email": "Ativar autenticação de dois fatores por e-mail",
+  "Enable_voice_calling": "Habilitar chamadas de voz",
   "Enabled": "Ativado",
   "Encrypted": "Criptografado",
   "Encrypted_channel_Description": "Canal criptografado de ponta a ponta. A pesquisa não funcionará com canais criptografados e as notificações podem não mostrar o conteúdo das mensagens.",
@@ -1869,6 +1878,7 @@
   "Export_My_Data": "Exportar meus dados (JSON)",
   "expression": "Expressão",
   "Extended": "Estendido",
+  "Extension": "Extensão",
   "Extensions": "Extensões",
   "Extension_Number": "Número de extensão",
   "Extension_Status": "Status da extensão",
@@ -1894,6 +1904,8 @@
   "Failed_To_Load_Import_Operation": "Falha ao carregar operação de importação",
   "Failed_To_Start_Import": "Falha ao iniciar operação de importação",
   "Failed_to_validate_invite_token": "Falha na validação do token de convite",
+  "Failed_to_copy_phone_number": "Falha ao copiar número de telefone",
+  "Failed_to_transfer_call": "Failed to transfer call",
   "False": "Falso",
   "Fallback_forward_department": "Departamento alternativo para encaminhamento",
   "Fallback_forward_department_description": "Permite definir um departamento alternativo que vai receber as conversas encaminhadas a este, caso não haja agentes online no momento",
@@ -2051,7 +2063,7 @@
   "Forward_to_user": "Encaminhar ao usuário",
   "Forwarding": "Encaminhando",
   "Free": "Grátis",
-  "Free_Extension_Numbers": "Números gratuitos de extensão",
+  "Free_Extension_Numbers": "Números de extensão livres",
   "Free_Apps": "Aplicativos gratuitos",
   "Frequently_Used": "Usados frequentemente",
   "Friday": "Sexta-feira",
@@ -2106,6 +2118,7 @@
   "Grouping": "Agrupamento",
   "Guest": "Convidado",
   "Hash": "Hash",
+  "Hang_up_and_transfer_call": "Desligar e transferir a chamada",
   "Header": "Cabeçalho",
   "Header_and_Footer": "Cabeçalho e rodapé",
   "Pharmaceutical": "Farmacêutico",
@@ -2782,6 +2795,7 @@
   "Logout": "Sair",
   "Logout_Others": "Sair de outros locais conectados",
   "Logs": "Registros",
+  "Long_press_to_do_x": "Pressione e segure para {{action}}",
   "Longest_chat_duration": "Maior duração da conversa",
   "Longest_reaction_time": "Maior tempo de reação",
   "Longest_response_time": "Maior tempo de resposta",
@@ -3093,6 +3107,7 @@
   "New": "Novo",
   "New_Application": "Novo aplicativo",
   "New_Business_Hour": "Novo horário de expediente",
+  "New_Call": "Nova Chamada",
   "New_chat_in_queue": "Novo chat na fila",
   "New_chat_priority": "Prioridade alterada: {{user}} alterou a prioridade para {{priority}}",
   "New_chat_transfer": "Nova transferência de conversa: {{transfer}}",
@@ -3172,6 +3187,7 @@
   "Not_authorized": "Não autorizado",
   "Normal": "Normal",
   "Not_Available": "Não disponível",
+  "Not_assigned": "Não atribuído",
   "Not_enough_data": "Não há dados suficientes",
   "Not_following": "Não segue",
   "Not_Following": "Não segue",
@@ -3355,6 +3371,7 @@
   "Thank_you_exclamation_mark": "Obrigado!",
   "Phone_already_exists": "Telefone já cadastrado",
   "Phone_number": "Número de telefone",
+  "Phone_number_copied": "Número de telefone copiado",
   "PID": "PID",
   "Pin": "Fixar",
   "Pin_Message": "Fixar mensagem",
@@ -3547,6 +3564,7 @@
   "Registration": "Registro",
   "Registration_Succeeded": "Registrado com sucesso",
   "Registration_via_Admin": "Registro via admin",
+  "Registration_information_not_found": "Informações de registro não encontradas",
   "Regular_Expressions": "Expressões regulares",
   "Reject_call": "Rejeitar chamada",
   "Release": "Versão",
@@ -3565,6 +3583,8 @@
   "Remove_custom_oauth": "Remover oauth customizado",
   "Remove_from_room": "Remover da sala",
   "Remove_from_team": "Remover da equipe",
+  "Remove_extension": "Remover extensão",
+  "Remove_last_character": "Remover último caracter",
   "Remove_last_admin": "Removendo último admin",
   "Remove_someone_from_room": "Remover alguém da sala",
   "remove-closed-livechat-room": "Remover sala de omnichannel fechada",
@@ -3870,6 +3890,7 @@
   "Select_user": "Selecionar usuário",
   "Select_users": "Selecione usuários",
   "Selected_agents": "Agentes selecionados",
+  "Select_someone_to_transfer_the_call_to": "Selecione alguém para transferir a chamada",
   "Selected_departments": "Departamentos selecionados",
   "Selected_monitors": "Monitores selecionados",
   "Selecting_users": "Selecionando usuários",
@@ -4046,6 +4067,7 @@
   "Sound": "Som",
   "Sound_File_mp3": "Arquivo de som (mp3)",
   "Source": "Fonte",
+  "Speaker": "Alto falante",
   "SSL": "SSL",
   "Star": "Favoritar",
   "Star_Message": "Favoritar mensagem",
@@ -4208,6 +4230,7 @@
   "Teams_Select_a_team": "Selecionar uma equipe",
   "Teams_Search_teams": "Pesquisar equipes",
   "Teams_New_Read_only_Label": "Somente leitura",
+  "Temporarily_unavailable": "Temporariamente indisponível",
   "Technology_Services": "Serviços tecnológicos",
   "Upgrade_tab_connection_error_description": "Parece que você não está com conexão com a internet. Isso pode ser porque sua workspace está instalada num servidor totalmente seguro sem acesso à internet",
   "Terms": "Termos",
@@ -4378,6 +4401,8 @@
   "onboarding.form.registeredServerForm.continueStandalone": "Continuar como standalone",
   "transfer-livechat-guest": "Transferir convidados do livechat",
   "transfer-livechat-guest_description": "Permissão para transferir convidados do livechat",
+  "Transfer_to": "Transferir para",
+  "Transfer_call": "Transferir chamada",
   "Transferred": "Transferido",
   "Translate": "Traduzir",
   "Translated": "Traduzido",
@@ -4449,6 +4474,7 @@
   "unarchive-room": "Desarquivar Sala",
   "unarchive-room_description": "Permissão para desarquivar canais",
   "Unassigned": "Não atribuído",
+  "Unassign_extension": "Desatribuir extensão",
   "unauthorized": "Não autorizado",
   "Unavailable": "Indisponível",
   "Unblock_User": "Desbloquear usuário",
@@ -4581,6 +4607,7 @@
   "User_uploaded_a_file_to_you": "<strong>{{username}}</strong> enviou um arquivo para você",
   "User_uploaded_file": "Carregou um arquivo",
   "User_uploaded_image": "Carregou uma imagem",
+  "User_extension_not_found": "Extensão do usuário não encontrada",
   "user-generate-access-token": "Usuário pode gerar token de acesso",
   "user-generate-access-token_description": "Permissão para usuários gerarem tokens de acesso",
   "UserData_EnableDownload": "Ativar o download de dados do usuário",
@@ -4650,6 +4677,7 @@
   "Video_message": "Mensagem de vídeo",
   "Videocall_declined": "Chamada de vídeo negada.",
   "Video_and_Audio_Call": "Chamadas de vídeo e áudio",
+  "Video_call": "Chamada de vídeo",
   "Videos": "Vídeos",
   "View_mode": "Modo de visualização",
   "View_All": "Ver todos os membros",
@@ -4739,6 +4767,10 @@
   "Visitor_page_URL": "URL da página do visitante",
   "Visitor_time_on_site": "Tempo do visitante no site",
   "Voice_Call": "Chamada de voz",
+  "Voice_call": "Chamada de voz",
+  "Voice_calling_disabled": "Chamadas de voz desabilitadas",
+  "Voice_calling_enabled": "Chamadas de voz habilitadas",
+  "Voice_calling_registration_failed": "Falha no registro de chamada de voz",
   "VoIP_Enable_Keep_Alive_For_Unstable_Networks": "SIP Options Keep Alive habilitado",
   "VoIP_Enable_Keep_Alive_For_Unstable_Networks_Description": "Monitore o status de múltiplos gateways SIP externos enviando mensagens SIP OPTIONS periódicas. Usado para redes instáveis.",
   "VoIP_Enabled": "Canal de voz habilitado",
diff --git a/packages/mock-providers/src/MockedAppRootBuilder.tsx b/packages/mock-providers/src/MockedAppRootBuilder.tsx
index 15b1339c560d..646a78a4d815 100644
--- a/packages/mock-providers/src/MockedAppRootBuilder.tsx
+++ b/packages/mock-providers/src/MockedAppRootBuilder.tsx
@@ -1,4 +1,4 @@
-import type { ISetting, Serialized, SettingValue } from '@rocket.chat/core-typings';
+import type { ISetting, IUser, Serialized, SettingValue } from '@rocket.chat/core-typings';
 import type { ServerMethodName, ServerMethodParameters, ServerMethodReturn } from '@rocket.chat/ddp-client';
 import { Emitter } from '@rocket.chat/emitter';
 import languages from '@rocket.chat/i18n/dist/languages';
@@ -257,6 +257,13 @@ export class MockedAppRootBuilder {
 		return this;
 	}
 
+	withUser(user: IUser): this {
+		this.user.userId = user._id;
+		this.user.user = user;
+
+		return this;
+	}
+
 	withRole(role: string): this {
 		if (!this.user.user) {
 			throw new Error('user is not defined');
diff --git a/packages/model-typings/src/models/IUsersModel.ts b/packages/model-typings/src/models/IUsersModel.ts
index bd660c05191d..83c499a1356e 100644
--- a/packages/model-typings/src/models/IUsersModel.ts
+++ b/packages/model-typings/src/models/IUsersModel.ts
@@ -402,4 +402,8 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	findOnlineButNotAvailableAgents(userIds: string[] | null): FindCursor<Pick<ILivechatAgent, '_id' | 'openBusinessHours'>>;
 	findAgentsAvailableWithoutBusinessHours(userIds: string[] | null): FindCursor<Pick<ILivechatAgent, '_id' | 'openBusinessHours'>>;
 	updateLivechatStatusByAgentIds(userIds: string[], status: ILivechatAgentStatus): Promise<UpdateResult>;
+	findOneByFreeSwitchExtension<T = IUser>(extension: string, options?: FindOptions<IUser>): Promise<T | null>;
+	setFreeSwitchExtension(userId: string, extension: string | undefined): Promise<UpdateResult>;
+	findAssignedFreeSwitchExtensions(): FindCursor<string>;
+	findUsersWithAssignedFreeSwitchExtensions<T = IUser>(options?: FindOptions<IUser>): FindCursor<T>;
 }
diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
index 94ee32f2f5be..eda85b03dbc8 100644
--- a/packages/rest-typings/src/index.ts
+++ b/packages/rest-typings/src/index.ts
@@ -47,6 +47,7 @@ import type { TeamsEndpoints } from './v1/teams';
 import type { UsersEndpoints } from './v1/users';
 import type { VideoConferenceEndpoints } from './v1/videoConference';
 import type { VoipEndpoints } from './v1/voip';
+import type { VoipFreeSwitchEndpoints } from './v1/voip-freeswitch';
 import type { WebdavEndpoints } from './v1/webdav';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -99,6 +100,7 @@ export interface Endpoints
 		CalendarEndpoints,
 		AuthEndpoints,
 		ImportEndpoints,
+		VoipFreeSwitchEndpoints,
 		DefaultEndpoints {}
 
 type OperationsByPathPatternAndMethod<
@@ -260,6 +262,7 @@ export * from './v1/e2e/e2eUpdateGroupKeyParamsPOST';
 export * from './v1/e2e';
 export * from './v1/import';
 export * from './v1/voip';
+export * from './v1/voip-freeswitch';
 export * from './v1/email-inbox';
 export * from './v1/calendar';
 export * from './v1/federation';
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 28c7ad52337b..6d4e62331bcf 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -114,7 +114,18 @@ export type UserPersonalTokens = Pick<IPersonalAccessToken, 'name' | 'lastTokenP
 
 export type DefaultUserInfo = Pick<
 	IUser,
-	'_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag' | 'lastLogin' | 'type' | 'federated'
+	| '_id'
+	| 'username'
+	| 'name'
+	| 'status'
+	| 'roles'
+	| 'emails'
+	| 'active'
+	| 'avatarETag'
+	| 'lastLogin'
+	| 'type'
+	| 'federated'
+	| 'freeSwitchExtension'
 >;
 
 export type UsersEndpoints = {
diff --git a/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionAssignProps.ts b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionAssignProps.ts
new file mode 100644
index 000000000000..7fcaf6c6a9a1
--- /dev/null
+++ b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionAssignProps.ts
@@ -0,0 +1,24 @@
+import type { JSONSchemaType } from 'ajv';
+import Ajv from 'ajv';
+
+const ajv = new Ajv();
+
+export type VoipFreeSwitchExtensionAssignProps = { username: string; extension?: string };
+
+const voipFreeSwitchExtensionAssignPropsSchema: JSONSchemaType<VoipFreeSwitchExtensionAssignProps> = {
+	type: 'object',
+	properties: {
+		username: {
+			type: 'string',
+			nullable: false,
+		},
+		extension: {
+			type: 'string',
+			nullable: true,
+		},
+	},
+	required: ['username'],
+	additionalProperties: false,
+};
+
+export const isVoipFreeSwitchExtensionAssignProps = ajv.compile(voipFreeSwitchExtensionAssignPropsSchema);
diff --git a/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetDetailsProps.ts b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetDetailsProps.ts
new file mode 100644
index 000000000000..a41ab7cd562a
--- /dev/null
+++ b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetDetailsProps.ts
@@ -0,0 +1,27 @@
+import type { JSONSchemaType } from 'ajv';
+import Ajv from 'ajv';
+
+const ajv = new Ajv();
+
+export type VoipFreeSwitchExtensionGetDetailsProps = {
+	extension: string;
+	group?: string;
+};
+
+const voipFreeSwitchExtensionGetDetailsPropsSchema: JSONSchemaType<VoipFreeSwitchExtensionGetDetailsProps> = {
+	type: 'object',
+	properties: {
+		extension: {
+			type: 'string',
+			nullable: false,
+		},
+		group: {
+			type: 'string',
+			nullable: true,
+		},
+	},
+	required: ['extension'],
+	additionalProperties: false,
+};
+
+export const isVoipFreeSwitchExtensionGetDetailsProps = ajv.compile(voipFreeSwitchExtensionGetDetailsPropsSchema);
diff --git a/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetInfoProps.ts b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetInfoProps.ts
new file mode 100644
index 000000000000..1ff871296757
--- /dev/null
+++ b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionGetInfoProps.ts
@@ -0,0 +1,22 @@
+import type { JSONSchemaType } from 'ajv';
+import Ajv from 'ajv';
+
+const ajv = new Ajv();
+
+export type VoipFreeSwitchExtensionGetInfoProps = {
+	userId: string;
+};
+
+const voipFreeSwitchExtensionGetInfoPropsSchema: JSONSchemaType<VoipFreeSwitchExtensionGetInfoProps> = {
+	type: 'object',
+	properties: {
+		userId: {
+			type: 'string',
+			nullable: false,
+		},
+	},
+	required: ['userId'],
+	additionalProperties: false,
+};
+
+export const isVoipFreeSwitchExtensionGetInfoProps = ajv.compile(voipFreeSwitchExtensionGetInfoPropsSchema);
diff --git a/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionListProps.ts b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionListProps.ts
new file mode 100644
index 000000000000..e1c010afb326
--- /dev/null
+++ b/packages/rest-typings/src/v1/voip-freeswitch/VoipFreeSwitchExtensionListProps.ts
@@ -0,0 +1,28 @@
+import type { JSONSchemaType } from 'ajv';
+import Ajv from 'ajv';
+
+const ajv = new Ajv();
+
+export type VoipFreeSwitchExtensionListProps = {
+	username?: string;
+	type?: 'available' | 'free' | 'allocated' | 'all';
+};
+
+const voipFreeSwitchExtensionListPropsSchema: JSONSchemaType<VoipFreeSwitchExtensionListProps> = {
+	type: 'object',
+	properties: {
+		username: {
+			type: 'string',
+			nullable: true,
+		},
+		type: {
+			type: 'string',
+			enum: ['available', 'free', 'allocated', 'all'],
+			nullable: true,
+		},
+	},
+	required: [],
+	additionalProperties: false,
+};
+
+export const isVoipFreeSwitchExtensionListProps = ajv.compile(voipFreeSwitchExtensionListPropsSchema);
diff --git a/packages/rest-typings/src/v1/voip-freeswitch/index.ts b/packages/rest-typings/src/v1/voip-freeswitch/index.ts
new file mode 100644
index 000000000000..013e4e0351cb
--- /dev/null
+++ b/packages/rest-typings/src/v1/voip-freeswitch/index.ts
@@ -0,0 +1,29 @@
+import type { FreeSwitchExtension } from '@rocket.chat/core-typings';
+
+import type { VoipFreeSwitchExtensionAssignProps } from './VoipFreeSwitchExtensionAssignProps';
+import type { VoipFreeSwitchExtensionGetDetailsProps } from './VoipFreeSwitchExtensionGetDetailsProps';
+import type { VoipFreeSwitchExtensionGetInfoProps } from './VoipFreeSwitchExtensionGetInfoProps';
+import type { VoipFreeSwitchExtensionListProps } from './VoipFreeSwitchExtensionListProps';
+
+export * from './VoipFreeSwitchExtensionAssignProps';
+export * from './VoipFreeSwitchExtensionGetDetailsProps';
+export * from './VoipFreeSwitchExtensionGetInfoProps';
+export * from './VoipFreeSwitchExtensionListProps';
+
+export type VoipFreeSwitchEndpoints = {
+	'/v1/voip-freeswitch.extension.list': {
+		GET: (params: VoipFreeSwitchExtensionListProps) => { extensions: FreeSwitchExtension[] };
+	};
+	'/v1/voip-freeswitch.extension.getDetails': {
+		GET: (params: VoipFreeSwitchExtensionGetDetailsProps) => FreeSwitchExtension & { userId?: string; username?: string; name?: string };
+	};
+	'/v1/voip-freeswitch.extension.assign': {
+		POST: (params: VoipFreeSwitchExtensionAssignProps) => void;
+	};
+	'/v1/voip-freeswitch.extension.getRegistrationInfoByUserId': {
+		GET: (params: VoipFreeSwitchExtensionGetInfoProps) => {
+			extension: FreeSwitchExtension;
+			credentials: { password: string; websocketPath: string };
+		};
+	};
+};
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index ddd9efe142ce..920c4aa43502 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -1,5 +1,6 @@
 import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
 import type { ComponentProps, ReactNode } from 'react';
+import { cloneElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import type { GenericMenuItemProps } from './GenericMenuItem';
@@ -29,7 +30,7 @@ type GenericMenuConditionalProps =
 
 type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof MenuV2>, 'children'>;
 
-const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, ...props }: GenericMenuProps) => {
+const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, button, className, ...props }: GenericMenuProps) => {
 	const { t, i18n } = useTranslation();
 
 	const sections = 'sections' in props && props.sections;
@@ -47,7 +48,13 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 	const isMenuEmpty = !(sections && sections.length > 0) && !(items && items.length > 0);
 
 	if (isMenuEmpty || disabled) {
-		return <IconButton small icon={icon} disabled />;
+		if (button) {
+			// FIXME: deprecate prop `button` as there's no way to ensure it is actually a button
+			// (e.g cloneElement could be passing props to a fragment)
+			return cloneElement(button, { small: true, icon, disabled, title, className });
+		}
+
+		return <IconButton small icon={icon} className={className} title={title} disabled />;
 	}
 
 	return (
@@ -80,6 +87,8 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 					icon={icon}
 					title={i18n.exists(title) ? t(title) : title}
 					onAction={onAction || handleAction}
+					className={className}
+					button={button}
 					{...(disabledKeys && { disabledKeys })}
 					{...props}
 				>
diff --git a/packages/ui-voip/.eslintignore b/packages/ui-voip/.eslintignore
new file mode 100644
index 000000000000..608841ff3853
--- /dev/null
+++ b/packages/ui-voip/.eslintignore
@@ -0,0 +1 @@
+!.storybook
diff --git a/packages/ui-voip/.eslintrc.json b/packages/ui-voip/.eslintrc.json
new file mode 100644
index 000000000000..465fd738d4e4
--- /dev/null
+++ b/packages/ui-voip/.eslintrc.json
@@ -0,0 +1,67 @@
+{
+	"extends": [
+		"plugin:@typescript-eslint/recommended",
+		"plugin:@typescript-eslint/eslint-recommended",
+		"@rocket.chat/eslint-config/original",
+		"@rocket.chat/eslint-config/react",
+		"prettier",
+		"plugin:anti-trojan-source/recommended",
+		"plugin:react/jsx-runtime",
+		"plugin:storybook/recommended"
+	],
+	"parser": "@typescript-eslint/parser",
+	"plugins": ["@typescript-eslint", "prettier"],
+	"rules": {
+		"func-call-spacing": "off",
+		"import/named": "error",
+		"import/order": [
+			"error",
+			{
+				"newlines-between": "always",
+				"groups": ["builtin", "external", "internal", ["parent", "sibling", "index"]],
+				"alphabetize": {
+					"order": "asc"
+				}
+			}
+		],
+		"indent": "off",
+		"jsx-quotes": ["error", "prefer-single"],
+		"new-cap": ["error"],
+		"no-extra-parens": "off",
+		"no-spaced-func": "off",
+		"no-undef": "off",
+		"no-unused-vars": "off",
+		"no-useless-constructor": "off",
+		"no-use-before-define": "off",
+		"prefer-arrow-callback": ["error", { "allowNamedFunctions": true }],
+		"prettier/prettier": 2
+	},
+	"settings": {
+		"import/resolver": {
+			"node": {
+				"extensions": [".js", ".ts", ".tsx"]
+			}
+		}
+	},
+	"ignorePatterns": ["**/dist"],
+	"overrides": [
+		{
+			"files": ["*.ts", "*.tsx"],
+			"rules": {
+				"arrow-body-style": "off",
+				"@typescript-eslint/ban-ts-ignore": "off",
+				// "@typescript-eslint/explicit-function-return-type": "warn",
+				"@typescript-eslint/indent": "off",
+				"@typescript-eslint/no-extra-parens": "off",
+				"@typescript-eslint/no-explicit-any": "off",
+				"@typescript-eslint/no-unused-vars": [
+					"error",
+					{
+						"argsIgnorePattern": "^_"
+					}
+				],
+				"@typescript-eslint/prefer-optional-chain": "warn"
+			}
+		}
+	]
+}
diff --git a/packages/ui-voip/.storybook/main.js b/packages/ui-voip/.storybook/main.js
new file mode 100644
index 000000000000..dc95f3584a3f
--- /dev/null
+++ b/packages/ui-voip/.storybook/main.js
@@ -0,0 +1,12 @@
+/** @type {import('@storybook/react/types').StorybookConfig} */
+module.exports = {
+	stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],
+	addons: ['@storybook/addon-essentials', '@storybook/addon-a11y'],
+	framework: '@storybook/react',
+	features: {
+		postcss: false,
+	},
+	typescript: {
+		reactDocgen: 'react-docgen-typescript-plugin',
+	},
+};
diff --git a/packages/ui-voip/.storybook/preview.js b/packages/ui-voip/.storybook/preview.js
new file mode 100644
index 000000000000..d1e44f0c2b8c
--- /dev/null
+++ b/packages/ui-voip/.storybook/preview.js
@@ -0,0 +1,26 @@
+import '../../../apps/meteor/app/theme/client/main.css';
+import 'highlight.js/styles/github.css';
+import '@rocket.chat/icons/dist/rocketchat.css';
+
+export const parameters = {
+	actions: { argTypesRegex: '^on[A-Z].*' },
+	controls: {
+		matchers: {
+			color: /(background|color)$/i,
+			date: /Date$/,
+		},
+	},
+};
+
+export const decorators = [
+	(Story) => (
+		<div className='rc-old'>
+			<style>{`
+				body {
+					background-color: white;
+				}
+			`}</style>
+			<Story />
+		</div>
+	),
+];
diff --git a/packages/ui-voip/jest.config.ts b/packages/ui-voip/jest.config.ts
new file mode 100644
index 000000000000..e1525e14dff0
--- /dev/null
+++ b/packages/ui-voip/jest.config.ts
@@ -0,0 +1,13 @@
+import client from '@rocket.chat/jest-presets/client';
+import type { Config } from 'jest';
+
+export default {
+	preset: client.preset,
+	setupFilesAfterEnv: [...client.setupFilesAfterEnv],
+	moduleNameMapper: {
+		'^react($|/.+)': '<rootDir>/../../node_modules/react$1',
+		'^react-dom/client$': '<rootDir>/../../node_modules/react-dom$1',
+		'^react-dom($|/.+)': '<rootDir>/../../node_modules/react-dom$1',
+		'^react-i18next($|/.+)': '<rootDir>/../../node_modules/react-i18next$1',
+	},
+} satisfies Config;
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
new file mode 100644
index 000000000000..d02a8a8e1a66
--- /dev/null
+++ b/packages/ui-voip/package.json
@@ -0,0 +1,78 @@
+{
+	"name": "@rocket.chat/ui-voip",
+	"version": "1.0.0",
+	"private": true,
+	"scripts": {
+		"eslint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"eslint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"test": "jest",
+		"testunit": "jest",
+		"build": "tsc -p tsconfig.build.json",
+		"storybook": "start-storybook -p 6006",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"typecheck": "tsc --noEmit --skipLibCheck -p tsconfig.json"
+	},
+	"dependencies": {
+		"@rocket.chat/emitter": "~0.31.25",
+		"@tanstack/react-query": "^4.16.1",
+		"react-i18next": "~15.0.1",
+		"sip.js": "^0.20.1"
+	},
+	"devDependencies": {
+		"@babel/core": "~7.22.20",
+		"@faker-js/faker": "~8.0.2",
+		"@rocket.chat/css-in-js": "~0.31.25",
+		"@rocket.chat/eslint-config": "workspace:^",
+		"@rocket.chat/fuselage": "^0.59.1",
+		"@rocket.chat/fuselage-hooks": "^0.33.1",
+		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/jest-presets": "workspace:~",
+		"@rocket.chat/mock-providers": "workspace:~",
+		"@rocket.chat/styled": "~0.31.25",
+		"@rocket.chat/ui-avatar": "workspace:^",
+		"@rocket.chat/ui-client": "workspace:^",
+		"@rocket.chat/ui-contexts": "workspace:^",
+		"@storybook/addon-a11y": "^6.5.16",
+		"@storybook/addon-actions": "~6.5.16",
+		"@storybook/addon-docs": "~6.5.16",
+		"@storybook/addon-essentials": "~6.5.16",
+		"@storybook/builder-webpack4": "~6.5.16",
+		"@storybook/manager-webpack4": "~6.5.16",
+		"@storybook/react": "~6.5.16",
+		"@storybook/testing-library": "~0.0.13",
+		"@storybook/testing-react": "~1.3.0",
+		"@testing-library/react": "~16.0.1",
+		"@testing-library/user-event": "~14.5.2",
+		"@types/jest": "~29.5.12",
+		"@types/jest-axe": "~3.5.9",
+		"eslint": "~8.45.0",
+		"eslint-plugin-react": "~7.32.2",
+		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-storybook": "~0.6.15",
+		"jest": "~29.7.0",
+		"jest-axe": "~9.0.0",
+		"react-docgen-typescript-plugin": "~1.0.8",
+		"typescript": "~5.5.4"
+	},
+	"peerDependencies": {
+		"@rocket.chat/css-in-js": "*",
+		"@rocket.chat/fuselage": "*",
+		"@rocket.chat/fuselage-hooks": "*",
+		"@rocket.chat/icons": "*",
+		"@rocket.chat/styled": "*",
+		"@rocket.chat/ui-avatar": "*",
+		"@rocket.chat/ui-client": "*",
+		"@rocket.chat/ui-contexts": "*",
+		"react": "^17.0.2",
+		"react-aria": "~3.23.1",
+		"react-dom": "^17.0.2"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"volta": {
+		"extends": "../../package.json"
+	}
+}
diff --git a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.spec.tsx b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.spec.tsx
new file mode 100644
index 000000000000..73ae2ef31634
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.spec.tsx
@@ -0,0 +1,19 @@
+import { composeStories } from '@storybook/react';
+import { render } from '@testing-library/react';
+import { axe } from 'jest-axe';
+
+import * as stories from './VoipActionButton.stories';
+
+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 />, { legacyRoot: true });
+	expect(tree.baseElement).toMatchSnapshot();
+});
+
+test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
+	const { container } = render(<Story />, { legacyRoot: true });
+
+	const results = await axe(container);
+	expect(results).toHaveNoViolations();
+});
diff --git a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.stories.tsx b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.stories.tsx
new file mode 100644
index 000000000000..a19e55cf3a7c
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.stories.tsx
@@ -0,0 +1,22 @@
+import { ComponentMeta, ComponentStory } from '@storybook/react';
+import { ReactElement } from 'react';
+
+import VoipActionButton from './VoipActionButton';
+
+export default {
+	title: 'Components/VoipActionButton',
+	component: VoipActionButton,
+	decorators: [(Story): ReactElement => <Story />],
+} satisfies ComponentMeta<typeof VoipActionButton>;
+
+export const SuccessButton: ComponentStory<typeof VoipActionButton> = () => {
+	return <VoipActionButton success icon='phone' label='Success Button' />;
+};
+
+export const DangerButton: ComponentStory<typeof VoipActionButton> = () => {
+	return <VoipActionButton danger icon='phone' label='Danger Button' />;
+};
+
+export const NeutralButton: ComponentStory<typeof VoipActionButton> = () => {
+	return <VoipActionButton icon='phone' label='Neutral Button' />;
+};
diff --git a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
new file mode 100644
index 000000000000..17f3e847322c
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
@@ -0,0 +1,27 @@
+import { Icon, IconButton } from '@rocket.chat/fuselage';
+import type { Keys } from '@rocket.chat/icons';
+import type { ComponentProps } from 'react';
+
+type ActionButtonProps = Pick<ComponentProps<typeof IconButton>, 'className' | 'disabled' | 'pressed' | 'danger' | 'success'> & {
+	label: string;
+	icon: Keys;
+	onClick?: () => void;
+};
+
+const VoipActionButton = ({ disabled, label, pressed, icon, danger, success, className, onClick }: ActionButtonProps) => (
+	<IconButton
+		medium
+		danger={danger}
+		success={success}
+		secondary={success || danger}
+		className={className}
+		icon={<Icon name={icon} />}
+		title={label}
+		pressed={pressed}
+		aria-label={label}
+		disabled={disabled}
+		onClick={() => onClick?.()}
+	/>
+);
+
+export default VoipActionButton;
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
new file mode 100644
index 000000000000..2f4b29aa9de8
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
@@ -0,0 +1,61 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders DangerButton without crashing 1`] = `
+<body>
+  <div>
+    <button
+      aria-label="Danger Button"
+      class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-danger rcx-button--square rcx-button--icon rcx-button"
+      title="Danger Button"
+      type="button"
+    >
+      <i
+        aria-hidden="true"
+        class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon"
+      >
+        
+      </i>
+    </button>
+  </div>
+</body>
+`;
+
+exports[`renders NeutralButton without crashing 1`] = `
+<body>
+  <div>
+    <button
+      aria-label="Neutral Button"
+      class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button"
+      title="Neutral Button"
+      type="button"
+    >
+      <i
+        aria-hidden="true"
+        class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon"
+      >
+        
+      </i>
+    </button>
+  </div>
+</body>
+`;
+
+exports[`renders SuccessButton without crashing 1`] = `
+<body>
+  <div>
+    <button
+      aria-label="Success Button"
+      class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-success rcx-button--square rcx-button--icon rcx-button"
+      title="Success Button"
+      type="button"
+    >
+      <i
+        aria-hidden="true"
+        class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon"
+      >
+        
+      </i>
+    </button>
+  </div>
+</body>
+`;
diff --git a/packages/ui-voip/src/components/VoipActionButton/index.ts b/packages/ui-voip/src/components/VoipActionButton/index.ts
new file mode 100644
index 000000000000..3e6352647f2f
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActionButton/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipActionButton';
diff --git a/packages/ui-voip/src/components/VoipActions/VoipActions.spec.tsx b/packages/ui-voip/src/components/VoipActions/VoipActions.spec.tsx
new file mode 100644
index 000000000000..4d7c9adc0160
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActions/VoipActions.spec.tsx
@@ -0,0 +1,20 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { composeStories } from '@storybook/react';
+import { render } from '@testing-library/react';
+import { axe } from 'jest-axe';
+
+import * as stories from './VoipActions.stories';
+
+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: 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 });
+
+	const results = await axe(container);
+	expect(results).toHaveNoViolations();
+});
diff --git a/packages/ui-voip/src/components/VoipActions/VoipActions.stories.tsx b/packages/ui-voip/src/components/VoipActions/VoipActions.stories.tsx
new file mode 100644
index 000000000000..0a1b4a48324e
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActions/VoipActions.stories.tsx
@@ -0,0 +1,24 @@
+import { ComponentMeta, ComponentStory } from '@storybook/react';
+import { ReactElement } from 'react';
+
+import VoipActions from './VoipActions';
+
+const noop = () => undefined;
+
+export default {
+	title: 'Components/VoipActions',
+	component: VoipActions,
+	decorators: [(Story): ReactElement => <Story />],
+} satisfies ComponentMeta<typeof VoipActions>;
+
+export const IncomingActions: ComponentStory<typeof VoipActions> = () => {
+	return <VoipActions onDecline={noop} onAccept={noop} />;
+};
+
+export const OngoingActions: ComponentStory<typeof VoipActions> = () => {
+	return <VoipActions onEndCall={noop} onDTMF={noop} onHold={noop} onMute={noop} onTransfer={noop} />;
+};
+
+export const OutgoingActions: ComponentStory<typeof VoipActions> = () => {
+	return <VoipActions onEndCall={noop} />;
+};
diff --git a/packages/ui-voip/src/components/VoipActions/VoipActions.tsx b/packages/ui-voip/src/components/VoipActions/VoipActions.tsx
new file mode 100644
index 000000000000..0cd3c95a2dc2
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActions/VoipActions.tsx
@@ -0,0 +1,85 @@
+import { ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from 'react-i18next';
+
+import ActionButton from '../VoipActionButton';
+
+type VoipGenericActionsProps = {
+	isDTMFActive?: boolean;
+	isTransferActive?: boolean;
+	isMuted?: boolean;
+	isHeld?: boolean;
+	onDTMF?: () => void;
+	onTransfer?: () => void;
+	onMute?: (muted: boolean) => void;
+	onHold?: (held: boolean) => void;
+};
+
+type VoipIncomingActionsProps = VoipGenericActionsProps & {
+	onEndCall?: never;
+	onDecline: () => void;
+	onAccept: () => void;
+};
+
+type VoipOngoingActionsProps = VoipGenericActionsProps & {
+	onDecline?: never;
+	onAccept?: never;
+	onEndCall: () => void;
+};
+
+type VoipActionsProps = VoipIncomingActionsProps | VoipOngoingActionsProps;
+
+const isIncoming = (props: VoipActionsProps): props is VoipIncomingActionsProps =>
+	'onDecline' in props && 'onAccept' in props && !('onEndCall' in props);
+
+const isOngoing = (props: VoipActionsProps): props is VoipOngoingActionsProps =>
+	'onEndCall' in props && !('onAccept' in props && 'onDecline' in props);
+
+const VoipActions = ({ isMuted, isHeld, isDTMFActive, isTransferActive, ...events }: VoipActionsProps) => {
+	const { t } = useTranslation();
+
+	return (
+		<ButtonGroup large>
+			{isIncoming(events) && <ActionButton danger label={t('Decline')} icon='phone-off' onClick={events.onDecline} />}
+
+			<ActionButton
+				label={isMuted ? t('Turn_on_microphone') : t('Turn_off_microphone')}
+				icon='mic-off'
+				pressed={isMuted}
+				disabled={!events.onMute}
+				onClick={() => events.onMute?.(!isMuted)}
+			/>
+
+			{!isIncoming(events) && (
+				<ActionButton
+					label={isHeld ? t('Resume') : t('Hold')}
+					icon='pause-shape-unfilled'
+					pressed={isHeld}
+					disabled={!events.onHold}
+					onClick={() => events.onHold?.(!isHeld)}
+				/>
+			)}
+
+			<ActionButton
+				label={isDTMFActive ? t('Close_Dialpad') : t('Open_Dialpad')}
+				icon='dialpad'
+				pressed={isDTMFActive}
+				disabled={!events.onDTMF}
+				onClick={events.onDTMF}
+			/>
+
+			<ActionButton
+				label={t('Transfer_call')}
+				icon='arrow-forward'
+				pressed={isTransferActive}
+				disabled={!events.onTransfer}
+				onClick={events.onTransfer}
+			/>
+
+			{isOngoing(events) && <ActionButton danger label={t('End_call')} icon='phone-off' disabled={isHeld} onClick={events.onEndCall} />}
+
+			{isIncoming(events) && <ActionButton success label={t('Accept')} icon='phone' onClick={events.onAccept} />}
+		</ButtonGroup>
+	);
+};
+
+export default VoipActions;
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
new file mode 100644
index 000000000000..093545e64d05
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
@@ -0,0 +1,239 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders IncomingActions without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+      role="group"
+    >
+      <button
+        aria-label="Decline"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-danger rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        title="Decline"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-phone-off rcx-icon"
+        >
+          
+        </i>
+      </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"
+        disabled=""
+        title="Turn_off_microphone"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-mic-off rcx-icon"
+        >
+          
+        </i>
+      </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"
+        disabled=""
+        title="Open_Dialpad"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-dialpad rcx-icon"
+        >
+          
+        </i>
+      </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"
+        disabled=""
+        title="Transfer_call"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-arrow-forward rcx-icon"
+        >
+          
+        </i>
+      </button>
+      <button
+        aria-label="Accept"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-success rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        title="Accept"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon"
+        >
+          
+        </i>
+      </button>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`renders OngoingActions without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+      role="group"
+    >
+      <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"
+        title="Turn_off_microphone"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-mic-off rcx-icon"
+        >
+          
+        </i>
+      </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"
+        title="Hold"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-pause-shape-unfilled rcx-icon"
+        >
+          
+        </i>
+      </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"
+        title="Open_Dialpad"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-dialpad rcx-icon"
+        >
+          
+        </i>
+      </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"
+        title="Transfer_call"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-arrow-forward rcx-icon"
+        >
+          
+        </i>
+      </button>
+      <button
+        aria-label="End_call"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-danger rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        title="End_call"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-phone-off rcx-icon"
+        >
+          
+        </i>
+      </button>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`renders OutgoingActions without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+      role="group"
+    >
+      <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"
+        disabled=""
+        title="Turn_off_microphone"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-mic-off rcx-icon"
+        >
+          
+        </i>
+      </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"
+        disabled=""
+        title="Hold"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-pause-shape-unfilled rcx-icon"
+        >
+          
+        </i>
+      </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"
+        disabled=""
+        title="Open_Dialpad"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-dialpad rcx-icon"
+        >
+          
+        </i>
+      </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"
+        disabled=""
+        title="Transfer_call"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-arrow-forward rcx-icon"
+        >
+          
+        </i>
+      </button>
+      <button
+        aria-label="End_call"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-danger rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        title="End_call"
+        type="button"
+      >
+        <i
+          aria-hidden="true"
+          class="rcx-box rcx-box--full rcx-icon--name-phone-off rcx-icon"
+        >
+          
+        </i>
+      </button>
+    </div>
+  </div>
+</body>
+`;
diff --git a/packages/ui-voip/src/components/VoipActions/index.ts b/packages/ui-voip/src/components/VoipActions/index.ts
new file mode 100644
index 000000000000..fb8ae6407ce3
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipActions/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipActions';
diff --git a/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx b/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
new file mode 100644
index 000000000000..595c6897eeec
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
@@ -0,0 +1,65 @@
+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 { axe } from 'jest-axe';
+
+import VoipContactId from './VoipContactId';
+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(),
+			},
+		});
+	});
+
+	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 });
+
+		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,
+		});
+
+		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,
+		});
+
+		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,
+		});
+
+		const copyButton = screen.getByRole('button', { name: 'Copy_phone_number' });
+		expect(copyButton).toBeInTheDocument();
+
+		copyButton.click();
+		await waitFor(() => expect(navigator.clipboard.writeText).toHaveBeenCalledWith(phone));
+	});
+});
diff --git a/packages/ui-voip/src/components/VoipContactId/VoipContactId.stories.tsx b/packages/ui-voip/src/components/VoipContactId/VoipContactId.stories.tsx
new file mode 100644
index 000000000000..2706a5381bd6
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipContactId/VoipContactId.stories.tsx
@@ -0,0 +1,36 @@
+import { Box } from '@rocket.chat/fuselage';
+import { ComponentMeta, ComponentStory } from '@storybook/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { ReactElement } from 'react';
+
+import VoipContactId from './VoipContactId';
+
+export default {
+	title: 'Components/VoipContactId',
+	component: VoipContactId,
+	decorators: [
+		(Story): ReactElement => (
+			<QueryClientProvider client={new QueryClient()}>
+				<Box maxWidth={200}>
+					<Story />
+				</Box>
+			</QueryClientProvider>
+		),
+	],
+} satisfies ComponentMeta<typeof VoipContactId>;
+
+export const Loading: ComponentStory<typeof VoipContactId> = () => {
+	return <VoipContactId name='1000' isLoading />;
+};
+
+export const WithUsername: ComponentStory<typeof VoipContactId> = () => {
+	return <VoipContactId username='john.doe' name='John Doe' />;
+};
+
+export const WithTransfer: ComponentStory<typeof VoipContactId> = () => {
+	return <VoipContactId username='john.doe' transferedBy='Jane Doe' name='John Doe' />;
+};
+
+export const WithPhoneNumber: ComponentStory<typeof VoipContactId> = () => {
+	return <VoipContactId name='+554788765522' />;
+};
diff --git a/packages/ui-voip/src/components/VoipContactId/VoipContactId.tsx b/packages/ui-voip/src/components/VoipContactId/VoipContactId.tsx
new file mode 100644
index 000000000000..1152309a14da
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipContactId/VoipContactId.tsx
@@ -0,0 +1,74 @@
+import { Box, IconButton, Skeleton } from '@rocket.chat/fuselage';
+import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+const VoipContactId = ({
+	name,
+	username,
+	transferedBy,
+	isLoading = false,
+}: {
+	name?: string;
+	username?: string;
+	transferedBy?: string;
+	isLoading?: boolean;
+}) => {
+	const dispatchToastMessage = useToastMessageDispatch();
+	const { t } = useTranslation();
+
+	const handleCopy = useMutation({
+		mutationFn: (contactName: string) => navigator.clipboard.writeText(contactName),
+		onSuccess: () => dispatchToastMessage({ type: 'success', message: t('Phone_number_copied') }),
+		onError: () => dispatchToastMessage({ type: 'error', message: t('Failed_to_copy_phone_number') }),
+	});
+
+	if (!name) {
+		return null;
+	}
+
+	if (isLoading) {
+		return (
+			<Box display='flex' pi={12} pb={8}>
+				<Skeleton variant='rect' size={20} mie={8} />
+				<Skeleton variant='text' width={100} height={16} />
+			</Box>
+		);
+	}
+
+	return (
+		<Box pi={12} pbs={4} pbe={8}>
+			{transferedBy && (
+				<Box mbe={8} fontScale='p2' color='secondary-info'>
+					{t('From')}: {transferedBy}
+				</Box>
+			)}
+
+			<Box display='flex'>
+				{username && (
+					<Box flexShrink={0} mie={8}>
+						<UserAvatar username={username} size='x24' />
+					</Box>
+				)}
+
+				<Box withTruncatedText is='p' fontScale='p1' mie='auto' color='secondary-info' flexGrow={1} flexShrink={1} title={name}>
+					{name}
+				</Box>
+
+				{!username && (
+					<IconButton
+						mini
+						aria-label={t('Copy_phone_number')}
+						data-tooltip={t('Copy_phone_number')}
+						mis={6}
+						icon='copy'
+						onClick={() => handleCopy.mutate(name)}
+					/>
+				)}
+			</Box>
+		</Box>
+	);
+};
+
+export default VoipContactId;
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
new file mode 100644
index 000000000000..e8d94cbfdde4
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
@@ -0,0 +1,147 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`VoipContactId renders Loading without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-css-1k9c77o"
+    >
+      <div
+        class="rcx-box rcx-box--full rcx-css-1d60bfv"
+      >
+        <span
+          class="rcx-box rcx-box--full rcx-skeleton--rect rcx-skeleton rcx-css-1ad23aw"
+        />
+        <span
+          class="rcx-box rcx-box--full rcx-skeleton--text rcx-skeleton rcx-css-fuw2gp"
+        />
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`VoipContactId renders WithPhoneNumber without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-css-1k9c77o"
+    >
+      <div
+        class="rcx-box rcx-box--full rcx-css-1v88l6i"
+      >
+        <div
+          class="rcx-box rcx-box--full rcx-css-1qvl0ud"
+        >
+          <p
+            class="rcx-box rcx-box--full rcx-css-v42v30"
+            title="+554788765522"
+          >
+            +554788765522
+          </p>
+          <button
+            aria-label="Copy_phone_number"
+            class="rcx-box rcx-box--full rcx-button--mini-square rcx-button--square rcx-button--icon rcx-button rcx-css-1azzyc"
+            data-tooltip="Copy_phone_number"
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              class="rcx-box rcx-box--full rcx-icon--name-copy rcx-icon rcx-css-1tg7yd0"
+            >
+              
+            </i>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`VoipContactId renders WithTransfer without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-css-1k9c77o"
+    >
+      <div
+        class="rcx-box rcx-box--full rcx-css-1v88l6i"
+      >
+        <div
+          class="rcx-box rcx-box--full rcx-css-1w6swlw"
+        >
+          From
+          : 
+          Jane Doe
+        </div>
+        <div
+          class="rcx-box rcx-box--full rcx-css-1qvl0ud"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-1keant8"
+          >
+            <figure
+              class="rcx-box rcx-box--full rcx-avatar rcx-avatar--x24"
+            >
+              <img
+                aria-hidden="true"
+                class="rcx-avatar__element rcx-avatar__element--x24"
+                data-username="john.doe"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQYV2Oora39DwAFaQJ3y3rKeAAAAABJRU5ErkJggg=="
+                title="john.doe"
+              />
+            </figure>
+          </div>
+          <p
+            class="rcx-box rcx-box--full rcx-css-v42v30"
+            title="John Doe"
+          >
+            John Doe
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`VoipContactId renders WithUsername without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-css-1k9c77o"
+    >
+      <div
+        class="rcx-box rcx-box--full rcx-css-1v88l6i"
+      >
+        <div
+          class="rcx-box rcx-box--full rcx-css-1qvl0ud"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-1keant8"
+          >
+            <figure
+              class="rcx-box rcx-box--full rcx-avatar rcx-avatar--x24"
+            >
+              <img
+                aria-hidden="true"
+                class="rcx-avatar__element rcx-avatar__element--x24"
+                data-username="john.doe"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQYV2Oora39DwAFaQJ3y3rKeAAAAABJRU5ErkJggg=="
+                title="john.doe"
+              />
+            </figure>
+          </div>
+          <p
+            class="rcx-box rcx-box--full rcx-css-v42v30"
+            title="John Doe"
+          >
+            John Doe
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
diff --git a/packages/ui-voip/src/components/VoipContactId/index.ts b/packages/ui-voip/src/components/VoipContactId/index.ts
new file mode 100644
index 000000000000..9a50854dfa73
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipContactId/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipContactId';
diff --git a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
new file mode 100644
index 000000000000..602c9813d948
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
@@ -0,0 +1,75 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import DialPad from './VoipDialPad';
+
+describe('VoipDialPad', () => {
+	beforeEach(() => {
+		jest.useFakeTimers();
+	});
+
+	afterEach(() => {
+		jest.clearAllTimers();
+	});
+
+	it('should not be editable by default', () => {
+		render(<DialPad value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+		expect(screen.getByLabelText('Phone_number')).toHaveAttribute('readOnly');
+	});
+
+	it('should enable input when editable', () => {
+		render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+		expect(screen.getByLabelText('Phone_number')).not.toHaveAttribute('readOnly');
+	});
+
+	it('should disable backspace button when input is empty', () => {
+		render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+		expect(screen.getByTestId('dial-paid-input-backspace')).toBeDisabled();
+	});
+
+	it('should enable backspace button when input has value', () => {
+		render(<DialPad editable value='123' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+		expect(screen.getByTestId('dial-paid-input-backspace')).toBeEnabled();
+	});
+
+	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 });
+
+		expect(screen.getByLabelText('Phone_number')).toHaveValue('123');
+
+		screen.getByTestId('dial-paid-input-backspace').click();
+
+		expect(fn).toHaveBeenCalledWith('12');
+	});
+
+	it('should call onChange when number is clicked', () => {
+		const fn = jest.fn();
+		render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+		['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);
+		});
+	});
+
+	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');
+
+		button.click();
+		expect(fn).toHaveBeenCalledWith('1230', '0');
+
+		fireEvent.pointerDown(button);
+		jest.runOnlyPendingTimers();
+		fireEvent.pointerUp(button);
+
+		expect(fn).toHaveBeenCalledWith('123+', '+');
+	});
+});
diff --git a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.stories.tsx b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.stories.tsx
new file mode 100644
index 000000000000..4b2371bb0516
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.stories.tsx
@@ -0,0 +1,21 @@
+import { Box } from '@rocket.chat/fuselage';
+import { ComponentMeta, ComponentStory } from '@storybook/react';
+import { ReactElement } from 'react';
+
+import VoipDialPad from './VoipDialPad';
+
+export default {
+	title: 'Components/VoipDialPad',
+	component: VoipDialPad,
+	decorators: [
+		(Story): ReactElement => (
+			<Box maxWidth={248}>
+				<Story />
+			</Box>
+		),
+	],
+} satisfies ComponentMeta<typeof VoipDialPad>;
+
+export const DialPad: ComponentStory<typeof VoipDialPad> = () => {
+	return <VoipDialPad value='' onChange={() => undefined} />;
+};
diff --git a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.tsx b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.tsx
new file mode 100644
index 000000000000..0dad0fb14d51
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.tsx
@@ -0,0 +1,68 @@
+import { css } from '@rocket.chat/css-in-js';
+import { Box } from '@rocket.chat/fuselage';
+import { FocusScope } from 'react-aria';
+
+import DialPadButton from './components/VoipDialPadButton';
+import DialPadInput from './components/VoipDialPadInput';
+
+type DialPadProps = {
+	value: string;
+	editable?: boolean;
+	longPress?: boolean;
+	onChange(value: string, digit?: string): void;
+};
+
+const DIGITS = [
+	['1', ''],
+	['2', 'ABC'],
+	['3', 'DEF'],
+	['4', 'GHI'],
+	['5', 'JKL'],
+	['6', 'MNO'],
+	['7', 'PQRS'],
+	['8', 'TUV'],
+	['9', 'WXYZ'],
+	['*', ''],
+	['0', '+', '+'],
+	['#', ''],
+];
+
+const dialPadClassName = css`
+	display: flex;
+	justify-content: center;
+	flex-wrap: wrap;
+	padding: 8px 8px 12px;
+
+	> button {
+		margin: 4px;
+	}
+`;
+
+const VoipDialPad = ({ editable = false, value, longPress = true, onChange }: DialPadProps) => (
+	<FocusScope autoFocus>
+		<Box bg='surface-light'>
+			<Box display='flex' pi={12} pbs={4} pbe={8} bg='surface-neutral'>
+				<DialPadInput
+					value={value}
+					readOnly={!editable}
+					onChange={(e) => onChange(e.currentTarget.value)}
+					onBackpaceClick={() => onChange(value.slice(0, -1))}
+				/>
+			</Box>
+
+			<Box className={dialPadClassName} maxWidth={196} mi='auto'>
+				{DIGITS.map(([primaryDigit, subDigit, longPressDigit]) => (
+					<DialPadButton
+						key={primaryDigit}
+						digit={primaryDigit}
+						subDigit={subDigit}
+						longPressDigit={longPress ? longPressDigit : undefined}
+						onClick={(digit: string) => onChange(`${value}${digit}`, digit)}
+					/>
+				))}
+			</Box>
+		</Box>
+	</FocusScope>
+);
+
+export default VoipDialPad;
diff --git a/packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadButton.tsx b/packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadButton.tsx
new file mode 100644
index 000000000000..2ef1bc6e1a4b
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadButton.tsx
@@ -0,0 +1,49 @@
+import { css } from '@rocket.chat/css-in-js';
+import { Box, Button } from '@rocket.chat/fuselage';
+import { mergeProps, useLongPress, usePress } from 'react-aria';
+import { useTranslation } from 'react-i18next';
+
+type DialPadButtonProps = {
+	digit: string;
+	subDigit?: string;
+	longPressDigit?: string;
+	onClick: (digit: string) => void;
+};
+
+const dialPadButtonClass = css`
+	width: 52px;
+	height: 40px;
+	min-width: 52px;
+	padding: 4px;
+
+	> .rcx-button--content {
+		display: flex;
+		flex-direction: column;
+	}
+`;
+
+const VoipDialPadButton = ({ digit, subDigit, longPressDigit, onClick }: DialPadButtonProps) => {
+	const { t } = useTranslation();
+
+	const { longPressProps } = useLongPress({
+		accessibilityDescription: `${t(`Long_press_to_do_x`, { action: longPressDigit })}`,
+		onLongPress: () => longPressDigit && onClick(longPressDigit),
+	});
+
+	const { pressProps } = usePress({
+		onPress: () => onClick(digit),
+	});
+
+	return (
+		<Button className={dialPadButtonClass} {...mergeProps(pressProps, longPressProps)} data-testid={`dial-pad-button-${digit}`}>
+			<Box is='span' fontSize={16} lineHeight={16}>
+				{digit}
+			</Box>
+			<Box is='span' fontSize={12} lineHeight={12} mbs={4} color='hint' aria-hidden>
+				{subDigit}
+			</Box>
+		</Button>
+	);
+};
+
+export default VoipDialPadButton;
diff --git a/packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadInput.tsx b/packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadInput.tsx
new file mode 100644
index 000000000000..9723451f7db7
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipDialPad/components/VoipDialPadInput.tsx
@@ -0,0 +1,48 @@
+import { css } from '@rocket.chat/css-in-js';
+import { IconButton, TextInput } from '@rocket.chat/fuselage';
+import type { FocusEvent, FormEvent } from 'react';
+import { useTranslation } from 'react-i18next';
+
+type DialPadInputProps = {
+	value: string;
+	readOnly?: boolean;
+	onBackpaceClick?: () => void;
+	onChange: (e: FormEvent<HTMLInputElement>) => void;
+	onBlur?: (event: FocusEvent<HTMLElement, Element>) => void;
+};
+
+const className = css`
+	padding-block: 6px;
+	min-height: 28px;
+	height: 28px;
+`;
+
+const VoipDialPadInput = ({ readOnly, value, onChange, onBackpaceClick }: DialPadInputProps) => {
+	const { t } = useTranslation();
+
+	return (
+		<TextInput
+			p={0}
+			readOnly={readOnly}
+			height='100%'
+			minHeight={0}
+			value={value}
+			className={className}
+			aria-label={t('Phone_number')}
+			addon={
+				<IconButton
+					small
+					icon='backspace'
+					aria-label={t('Remove_last_character')}
+					data-testid='dial-paid-input-backspace'
+					size='14px'
+					disabled={!value}
+					onClick={onBackpaceClick}
+				/>
+			}
+			onChange={onChange}
+		/>
+	);
+};
+
+export default VoipDialPadInput;
diff --git a/packages/ui-voip/src/components/VoipDialPad/index.ts b/packages/ui-voip/src/components/VoipDialPad/index.ts
new file mode 100644
index 000000000000..9c97cebe1615
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipDialPad/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipDialPad';
diff --git a/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx b/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
new file mode 100644
index 000000000000..9a442eef572d
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
@@ -0,0 +1,80 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { composeStories } from '@storybook/testing-react';
+import { render, screen } from '@testing-library/react';
+import { axe } from 'jest-axe';
+
+import { useVoipSession } from '../../hooks/useVoipSession';
+import { createMockVoipSession } from '../../tests/mocks';
+import { replaceReactAriaIds } from '../../tests/utils/replaceReactAriaIds';
+import VoipPopup from './VoipPopup';
+import * as stories from './VoipPopup.stories';
+
+jest.mock('../../hooks/useVoipSession', () => ({
+	useVoipSession: jest.fn(),
+}));
+
+jest.mock('../../hooks/useVoipDialer', () => ({
+	useVoipDialer: jest.fn(() => ({ open: true, openDialer: () => undefined, closeDialer: () => undefined })),
+}));
+
+const mockedUseVoipSession = jest.mocked(useVoipSession);
+
+it('should properly render incoming popup', async () => {
+	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'INCOMING' }));
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByTestId('vc-popup-incoming')).toBeInTheDocument();
+});
+
+it('should properly render ongoing popup', async () => {
+	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'ONGOING' }));
+
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByTestId('vc-popup-ongoing')).toBeInTheDocument();
+});
+
+it('should properly render outgoing popup', async () => {
+	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'OUTGOING' }));
+
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByTestId('vc-popup-outgoing')).toBeInTheDocument();
+});
+
+it('should properly render error popup', async () => {
+	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'ERROR' }));
+
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByTestId('vc-popup-error')).toBeInTheDocument();
+});
+
+it('should properly render dialer popup', async () => {
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByTestId('vc-popup-dialer')).toBeInTheDocument();
+});
+
+it('should prioritize session over dialer', async () => {
+	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'INCOMING' }));
+
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.queryByTestId('vc-popup-dialer')).not.toBeInTheDocument();
+	expect(screen.getByTestId('vc-popup-incoming')).toBeInTheDocument();
+});
+
+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: 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: mockAppRoot().build(), legacyRoot: true });
+
+	const results = await axe(container);
+	expect(results).toHaveNoViolations();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/VoipPopup.stories.tsx b/packages/ui-voip/src/components/VoipPopup/VoipPopup.stories.tsx
new file mode 100644
index 000000000000..128a15071eb8
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/VoipPopup.stories.tsx
@@ -0,0 +1,91 @@
+import { Emitter } from '@rocket.chat/emitter';
+import { MockedModalContext } from '@rocket.chat/mock-providers';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { ReactElement } from 'react';
+
+import { VoipContext } from '../../contexts/VoipContext';
+import type { VoipSession } from '../../definitions';
+import type VoipClient from '../../lib/VoipClient';
+import VoipPopup from './VoipPopup';
+
+const MockVoipClient = class extends Emitter {
+	private _sessionType: VoipSession['type'] = 'INCOMING';
+
+	setSessionType(type: VoipSession['type']) {
+		this._sessionType = type;
+	}
+
+	getSession = () =>
+		({
+			type: this._sessionType,
+			contact: { id: '1000', host: '', name: 'John Doe' },
+			transferedBy: null,
+			isMuted: false,
+			isHeld: false,
+			accept: async () => undefined,
+			end: async () => undefined,
+			mute: async (..._: any[]) => undefined,
+			hold: async (..._: any[]) => undefined,
+			dtmf: async () => undefined,
+			error: { status: 488, reason: '' },
+		} as VoipSession);
+};
+
+const client = new MockVoipClient();
+
+const contextValue = {
+	isEnabled: true as const,
+	voipClient: client as unknown as VoipClient,
+	error: null,
+	changeAudioInputDevice: async () => undefined,
+	changeAudioOutputDevice: async () => undefined,
+};
+
+const queryClient = new QueryClient({
+	defaultOptions: {
+		queries: { retry: false },
+		mutations: { retry: false },
+	},
+	logger: {
+		log: console.log,
+		warn: console.warn,
+		error: () => undefined,
+	},
+});
+
+export default {
+	title: 'Components/VoipPopup',
+	component: VoipPopup,
+	decorators: [
+		(Story): ReactElement => (
+			<QueryClientProvider client={queryClient}>
+				<MockedModalContext>
+					<VoipContext.Provider value={contextValue}>
+						<Story />
+					</VoipContext.Provider>
+				</MockedModalContext>
+			</QueryClientProvider>
+		),
+	],
+} satisfies ComponentMeta<typeof VoipPopup>;
+
+export const IncomingCall: ComponentStory<typeof VoipPopup> = () => {
+	client.setSessionType('INCOMING');
+	return <VoipPopup />;
+};
+
+export const OngoingCall: ComponentStory<typeof VoipPopup> = () => {
+	client.setSessionType('ONGOING');
+	return <VoipPopup />;
+};
+
+export const OutgoingCall: ComponentStory<typeof VoipPopup> = () => {
+	client.setSessionType('OUTGOING');
+	return <VoipPopup />;
+};
+
+export const ErrorCall: ComponentStory<typeof VoipPopup> = () => {
+	client.setSessionType('ERROR');
+	return <VoipPopup />;
+};
diff --git a/packages/ui-voip/src/components/VoipPopup/VoipPopup.tsx b/packages/ui-voip/src/components/VoipPopup/VoipPopup.tsx
new file mode 100644
index 000000000000..71c86b2df593
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/VoipPopup.tsx
@@ -0,0 +1,38 @@
+import { isVoipErrorSession, isVoipIncomingSession, isVoipOngoingSession, isVoipOutgoingSession } from '../../definitions';
+import { useVoipDialer } from '../../hooks/useVoipDialer';
+import { useVoipSession } from '../../hooks/useVoipSession';
+import type { PositionOffsets } from './components/VoipPopupContainer';
+import DialerView from './views/VoipDialerView';
+import ErrorView from './views/VoipErrorView';
+import IncomingView from './views/VoipIncomingView';
+import OngoingView from './views/VoipOngoingView';
+import OutgoingView from './views/VoipOutgoingView';
+
+const VoipPopup = ({ position }: { position?: PositionOffsets }) => {
+	const session = useVoipSession();
+	const { open: isDialerOpen } = useVoipDialer();
+
+	if (isVoipIncomingSession(session)) {
+		return <IncomingView session={session} position={position} />;
+	}
+
+	if (isVoipOngoingSession(session)) {
+		return <OngoingView session={session} position={position} />;
+	}
+
+	if (isVoipOutgoingSession(session)) {
+		return <OutgoingView session={session} position={position} />;
+	}
+
+	if (isVoipErrorSession(session)) {
+		return <ErrorView session={session} position={position} />;
+	}
+
+	if (isDialerOpen) {
+		return <DialerView position={position} />;
+	}
+
+	return null;
+};
+
+export default VoipPopup;
diff --git a/packages/ui-voip/src/components/VoipPopup/__snapshots__/VoipPopup.spec.tsx.snap b/packages/ui-voip/src/components/VoipPopup/__snapshots__/VoipPopup.spec.tsx.snap
new file mode 100644
index 000000000000..8c8df4a661ec
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/__snapshots__/VoipPopup.spec.tsx.snap
@@ -0,0 +1,1605 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders ErrorCall without crashing 1`] = `
+<body>
+  <div>
+    <span
+      data-focus-scope-start="true"
+      hidden=""
+    />
+    <article
+      aria-labelledby="voipPopupTitle"
+      class="rcx-css-1u0qz2a"
+      data-testid="vc-popup-dialer"
+    >
+      <header
+        class="rcx-box rcx-box--full rcx-css-1bact0x"
+      >
+        <h3
+          class="rcx-box rcx-box--full rcx-css-6rm93"
+          id="voipPopupTitle"
+        >
+          New_Call
+        </h3>
+        <button
+          aria-label="Close"
+          class="rcx-box rcx-box--full rcx-button--mini-square rcx-button--square rcx-button--icon rcx-button rcx-css-ws1yyr"
+          type="button"
+        >
+          <i
+            aria-hidden="true"
+            class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-1tg7yd0"
+          >
+            
+          </i>
+        </button>
+      </header>
+      <section
+        class="rcx-box rcx-box--full"
+        data-testid="vc-popup-content"
+      >
+        <span
+          data-focus-scope-start="true"
+          hidden=""
+        />
+        <div
+          class="rcx-box rcx-box--full rcx-css-13wyzsd"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-1gr9o58"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label  rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper rcx-css-1nolsce"
+            >
+              <input
+                aria-label="Phone_number"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box rcx-css-1nolsce rcx-css-1uqi900"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <button
+                  aria-label="Remove_last_character"
+                  class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-1yuobxc"
+                  data-testid="dial-paid-input-backspace"
+                  disabled=""
+                  type="button"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-icon--name-backspace rcx-icon rcx-css-4pvxx3"
+                  >
+                    [
+                  </i>
+                </button>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-css-dqa7fo rcx-css-keglju"
+          >
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-1"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  1
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-2"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  2
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  ABC
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-3"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  3
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  DEF
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-4"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  4
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  GHI
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-5"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  5
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  JKL
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-6"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  6
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  MNO
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-7"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  7
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  PQRS
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-8"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  8
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  TUV
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-9"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  9
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  WXYZ
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-*"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  *
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-0"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  0
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  +
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-1"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-#"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  #
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+          </div>
+        </div>
+        <span
+          data-focus-scope-end="true"
+          hidden=""
+        />
+      </section>
+      <footer
+        class="rcx-box rcx-box--full rcx-css-29fkf"
+        data-testid="vc-popup-footer"
+      >
+        <div
+          class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+          role="group"
+        >
+          <button
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
+            disabled=""
+            title="Device_settings_not_supported_by_browser"
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              class="rcx-box rcx-box--full rcx-icon--name-customize rcx-icon rcx-css-4pvxx3"
+            >
+              
+            </i>
+          </button>
+          <button
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button  rcx-button-group__item rcx-css-t3n91h"
+            disabled=""
+            type="button"
+          >
+            <span
+              class="rcx-button--content"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon rcx-css-1hdf9ok"
+              >
+                
+              </i>
+              Call
+            </span>
+          </button>
+        </div>
+      </footer>
+    </article>
+    <span
+      data-focus-scope-end="true"
+      hidden=""
+    />
+  </div>
+  <div
+    id="react-aria-description-1"
+    style="display: none;"
+  >
+    Long_press_to_do_x
+  </div>
+</body>
+`;
+
+exports[`renders IncomingCall without crashing 1`] = `
+<body>
+  <div>
+    <span
+      data-focus-scope-start="true"
+      hidden=""
+    />
+    <article
+      aria-labelledby="voipPopupTitle"
+      class="rcx-css-1u0qz2a"
+      data-testid="vc-popup-dialer"
+    >
+      <header
+        class="rcx-box rcx-box--full rcx-css-1bact0x"
+      >
+        <h3
+          class="rcx-box rcx-box--full rcx-css-6rm93"
+          id="voipPopupTitle"
+        >
+          New_Call
+        </h3>
+        <button
+          aria-label="Close"
+          class="rcx-box rcx-box--full rcx-button--mini-square rcx-button--square rcx-button--icon rcx-button rcx-css-ws1yyr"
+          type="button"
+        >
+          <i
+            aria-hidden="true"
+            class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-1tg7yd0"
+          >
+            
+          </i>
+        </button>
+      </header>
+      <section
+        class="rcx-box rcx-box--full"
+        data-testid="vc-popup-content"
+      >
+        <span
+          data-focus-scope-start="true"
+          hidden=""
+        />
+        <div
+          class="rcx-box rcx-box--full rcx-css-13wyzsd"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-1gr9o58"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label  rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper rcx-css-1nolsce"
+            >
+              <input
+                aria-label="Phone_number"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box rcx-css-1nolsce rcx-css-1uqi900"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <button
+                  aria-label="Remove_last_character"
+                  class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-1yuobxc"
+                  data-testid="dial-paid-input-backspace"
+                  disabled=""
+                  type="button"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-icon--name-backspace rcx-icon rcx-css-4pvxx3"
+                  >
+                    [
+                  </i>
+                </button>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-css-dqa7fo rcx-css-keglju"
+          >
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-1"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  1
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-2"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  2
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  ABC
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-3"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  3
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  DEF
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-4"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  4
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  GHI
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-5"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  5
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  JKL
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-6"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  6
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  MNO
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-7"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  7
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  PQRS
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-8"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  8
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  TUV
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-9"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  9
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  WXYZ
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-*"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  *
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-0"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  0
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  +
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-2"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-#"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  #
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+          </div>
+        </div>
+        <span
+          data-focus-scope-end="true"
+          hidden=""
+        />
+      </section>
+      <footer
+        class="rcx-box rcx-box--full rcx-css-29fkf"
+        data-testid="vc-popup-footer"
+      >
+        <div
+          class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+          role="group"
+        >
+          <button
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
+            disabled=""
+            title="Device_settings_not_supported_by_browser"
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              class="rcx-box rcx-box--full rcx-icon--name-customize rcx-icon rcx-css-4pvxx3"
+            >
+              
+            </i>
+          </button>
+          <button
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button  rcx-button-group__item rcx-css-t3n91h"
+            disabled=""
+            type="button"
+          >
+            <span
+              class="rcx-button--content"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon rcx-css-1hdf9ok"
+              >
+                
+              </i>
+              Call
+            </span>
+          </button>
+        </div>
+      </footer>
+    </article>
+    <span
+      data-focus-scope-end="true"
+      hidden=""
+    />
+  </div>
+  <div
+    id="react-aria-description-2"
+    style="display: none;"
+  >
+    Long_press_to_do_x
+  </div>
+</body>
+`;
+
+exports[`renders OngoingCall without crashing 1`] = `
+<body>
+  <div>
+    <span
+      data-focus-scope-start="true"
+      hidden=""
+    />
+    <article
+      aria-labelledby="voipPopupTitle"
+      class="rcx-css-1u0qz2a"
+      data-testid="vc-popup-dialer"
+    >
+      <header
+        class="rcx-box rcx-box--full rcx-css-1bact0x"
+      >
+        <h3
+          class="rcx-box rcx-box--full rcx-css-6rm93"
+          id="voipPopupTitle"
+        >
+          New_Call
+        </h3>
+        <button
+          aria-label="Close"
+          class="rcx-box rcx-box--full rcx-button--mini-square rcx-button--square rcx-button--icon rcx-button rcx-css-ws1yyr"
+          type="button"
+        >
+          <i
+            aria-hidden="true"
+            class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-1tg7yd0"
+          >
+            
+          </i>
+        </button>
+      </header>
+      <section
+        class="rcx-box rcx-box--full"
+        data-testid="vc-popup-content"
+      >
+        <span
+          data-focus-scope-start="true"
+          hidden=""
+        />
+        <div
+          class="rcx-box rcx-box--full rcx-css-13wyzsd"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-1gr9o58"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label  rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper rcx-css-1nolsce"
+            >
+              <input
+                aria-label="Phone_number"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box rcx-css-1nolsce rcx-css-1uqi900"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <button
+                  aria-label="Remove_last_character"
+                  class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-1yuobxc"
+                  data-testid="dial-paid-input-backspace"
+                  disabled=""
+                  type="button"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-icon--name-backspace rcx-icon rcx-css-4pvxx3"
+                  >
+                    [
+                  </i>
+                </button>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-css-dqa7fo rcx-css-keglju"
+          >
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-1"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  1
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-2"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  2
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  ABC
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-3"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  3
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  DEF
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-4"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  4
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  GHI
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-5"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  5
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  JKL
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-6"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  6
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  MNO
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-7"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  7
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  PQRS
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-8"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  8
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  TUV
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-9"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  9
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  WXYZ
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-*"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  *
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-0"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  0
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  +
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-3"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-#"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  #
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+          </div>
+        </div>
+        <span
+          data-focus-scope-end="true"
+          hidden=""
+        />
+      </section>
+      <footer
+        class="rcx-box rcx-box--full rcx-css-29fkf"
+        data-testid="vc-popup-footer"
+      >
+        <div
+          class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+          role="group"
+        >
+          <button
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
+            disabled=""
+            title="Device_settings_not_supported_by_browser"
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              class="rcx-box rcx-box--full rcx-icon--name-customize rcx-icon rcx-css-4pvxx3"
+            >
+              
+            </i>
+          </button>
+          <button
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button  rcx-button-group__item rcx-css-t3n91h"
+            disabled=""
+            type="button"
+          >
+            <span
+              class="rcx-button--content"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon rcx-css-1hdf9ok"
+              >
+                
+              </i>
+              Call
+            </span>
+          </button>
+        </div>
+      </footer>
+    </article>
+    <span
+      data-focus-scope-end="true"
+      hidden=""
+    />
+  </div>
+  <div
+    id="react-aria-description-3"
+    style="display: none;"
+  >
+    Long_press_to_do_x
+  </div>
+</body>
+`;
+
+exports[`renders OutgoingCall without crashing 1`] = `
+<body>
+  <div>
+    <span
+      data-focus-scope-start="true"
+      hidden=""
+    />
+    <article
+      aria-labelledby="voipPopupTitle"
+      class="rcx-css-1u0qz2a"
+      data-testid="vc-popup-dialer"
+    >
+      <header
+        class="rcx-box rcx-box--full rcx-css-1bact0x"
+      >
+        <h3
+          class="rcx-box rcx-box--full rcx-css-6rm93"
+          id="voipPopupTitle"
+        >
+          New_Call
+        </h3>
+        <button
+          aria-label="Close"
+          class="rcx-box rcx-box--full rcx-button--mini-square rcx-button--square rcx-button--icon rcx-button rcx-css-ws1yyr"
+          type="button"
+        >
+          <i
+            aria-hidden="true"
+            class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-1tg7yd0"
+          >
+            
+          </i>
+        </button>
+      </header>
+      <section
+        class="rcx-box rcx-box--full"
+        data-testid="vc-popup-content"
+      >
+        <span
+          data-focus-scope-start="true"
+          hidden=""
+        />
+        <div
+          class="rcx-box rcx-box--full rcx-css-13wyzsd"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-1gr9o58"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label  rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper rcx-css-1nolsce"
+            >
+              <input
+                aria-label="Phone_number"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box rcx-css-1nolsce rcx-css-1uqi900"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <button
+                  aria-label="Remove_last_character"
+                  class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-1yuobxc"
+                  data-testid="dial-paid-input-backspace"
+                  disabled=""
+                  type="button"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-icon--name-backspace rcx-icon rcx-css-4pvxx3"
+                  >
+                    [
+                  </i>
+                </button>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-css-dqa7fo rcx-css-keglju"
+          >
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-1"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  1
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-2"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  2
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  ABC
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-3"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  3
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  DEF
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-4"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  4
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  GHI
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-5"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  5
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  JKL
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-6"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  6
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  MNO
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-7"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  7
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  PQRS
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-8"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  8
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  TUV
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-9"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  9
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  WXYZ
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-*"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  *
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-0"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  0
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                >
+                  +
+                </span>
+              </span>
+            </button>
+            <button
+              aria-describedby="react-aria-description-4"
+              class="rcx-box rcx-box--full rcx-button rcx-css-w0xx3d"
+              data-testid="dial-pad-button-#"
+              type="button"
+            >
+              <span
+                class="rcx-button--content"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-css-1q15p4p"
+                >
+                  #
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-css-1v117po"
+                />
+              </span>
+            </button>
+          </div>
+        </div>
+        <span
+          data-focus-scope-end="true"
+          hidden=""
+        />
+      </section>
+      <footer
+        class="rcx-box rcx-box--full rcx-css-29fkf"
+        data-testid="vc-popup-footer"
+      >
+        <div
+          class="rcx-button-group rcx-button-group--align-start rcx-button-group--large"
+          role="group"
+        >
+          <button
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
+            disabled=""
+            title="Device_settings_not_supported_by_browser"
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              class="rcx-box rcx-box--full rcx-icon--name-customize rcx-icon rcx-css-4pvxx3"
+            >
+              
+            </i>
+          </button>
+          <button
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button  rcx-button-group__item rcx-css-t3n91h"
+            disabled=""
+            type="button"
+          >
+            <span
+              class="rcx-button--content"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-phone rcx-icon rcx-css-1hdf9ok"
+              >
+                
+              </i>
+              Call
+            </span>
+          </button>
+        </div>
+      </footer>
+    </article>
+    <span
+      data-focus-scope-end="true"
+      hidden=""
+    />
+  </div>
+  <div
+    id="react-aria-description-4"
+    style="display: none;"
+  >
+    Long_press_to_do_x
+  </div>
+</body>
+`;
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupContainer.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupContainer.tsx
new file mode 100644
index 000000000000..048501d94062
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupContainer.tsx
@@ -0,0 +1,49 @@
+import { Palette } from '@rocket.chat/fuselage';
+import styled from '@rocket.chat/styled';
+import type { ReactNode } from 'react';
+import { FocusScope } from 'react-aria';
+
+export type PositionOffsets = Partial<{
+	top: number;
+	right: number;
+	bottom: number;
+	left: number;
+}>;
+
+type ContainerProps = {
+	children: ReactNode;
+	secondary?: boolean;
+	position?: PositionOffsets;
+	['data-testid']: string;
+};
+
+const Container = styled(
+	'article',
+	({ secondary: _secondary, position: _position, ...props }: Pick<ContainerProps, 'secondary' | 'position'>) => props,
+)`
+	position: fixed;
+	top: ${(p) => (p.position?.top !== undefined ? `${p.position.top}px` : 'initial')};
+	right: ${(p) => (p.position?.right !== undefined ? `${p.position.right}px` : 'initial')};
+	bottom: ${(p) => (p.position?.bottom !== undefined ? `${p.position.bottom}px` : 'initial')};
+	left: ${(p) => (p.position?.left !== undefined ? `${p.position.left}px` : 'initial')};
+	display: flex;
+	flex-direction: column;
+	width: 250px;
+	min-height: 128px;
+	border-radius: 4px;
+	border: 1px solid ${Palette.stroke['stroke-dark'].toString()};
+	box-shadow: 0px 0px 1px 0px ${Palette.shadow['shadow-elevation-2x'].toString()},
+		0px 0px 12px 0px ${Palette.shadow['shadow-elevation-2y'].toString()};
+	background-color: ${(p) => (p.secondary ? Palette.surface['surface-neutral'].toString() : Palette.surface['surface-light'].toString())};
+	z-index: 100;
+`;
+
+const VoipPopupContainer = ({ children, secondary = false, position = { top: 0, left: 0 }, ...props }: ContainerProps) => (
+	<FocusScope autoFocus restoreFocus>
+		<Container aria-labelledby='voipPopupTitle' secondary={secondary} position={position} {...props}>
+			{children}
+		</Container>
+	</FocusScope>
+);
+
+export default VoipPopupContainer;
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupContent.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupContent.tsx
new file mode 100644
index 000000000000..aecc43de074c
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupContent.tsx
@@ -0,0 +1,10 @@
+import { Box } from '@rocket.chat/fuselage';
+import type { ReactNode } from 'react';
+
+const VoipPopupContent = ({ children }: { children: ReactNode }) => (
+	<Box is='section' data-testid='vc-popup-content'>
+		{children}
+	</Box>
+);
+
+export default VoipPopupContent;
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupFooter.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupFooter.tsx
new file mode 100644
index 000000000000..bb241136a42a
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupFooter.tsx
@@ -0,0 +1,10 @@
+import { Box } from '@rocket.chat/fuselage';
+import type { ReactNode } from 'react';
+
+const VoipPopupFooter = ({ children }: { children: ReactNode }) => (
+	<Box is='footer' data-testid='vc-popup-footer' p={12} mbs='auto' bg='surface-light' borderRadius='0 0 4px 4px'>
+		{children}
+	</Box>
+);
+
+export default VoipPopupFooter;
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
new file mode 100644
index 000000000000..9c51e5ad3bc8
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
@@ -0,0 +1,42 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+
+import VoipPopupHeader from './VoipPopupHeader';
+
+it('should render title', () => {
+	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: 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: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
+});
+
+it('should call onClose when close button is clicked', () => {
+	const closeFn = jest.fn();
+	render(<VoipPopupHeader onClose={closeFn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	screen.getByRole('button', { name: 'Close' }).click();
+	expect(closeFn).toHaveBeenCalled();
+});
+
+it('should render settings button by default', () => {
+	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: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.queryByRole('button', { name: /Device_settings/ })).not.toBeInTheDocument();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.tsx
new file mode 100644
index 000000000000..51ae01ef490e
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.tsx
@@ -0,0 +1,34 @@
+import { Box, IconButton } from '@rocket.chat/fuselage';
+import type { ReactElement, ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import VoipSettingsButton from '../../VoipSettingsButton';
+
+type VoipPopupHeaderProps = {
+	children?: ReactNode;
+	hideSettings?: boolean;
+	onClose?: () => void;
+};
+
+const VoipPopupHeader = ({ children, hideSettings, onClose }: VoipPopupHeaderProps): ReactElement => {
+	const { t } = useTranslation();
+
+	return (
+		<Box is='header' p={12} pbe={4} display='flex' alignItems='center' justifyContent='space-between'>
+			{children && (
+				<Box is='h3' id='voipPopupTitle' color='titles-labels' fontScale='p2' fontWeight='700'>
+					{children}
+				</Box>
+			)}
+
+			{!hideSettings && (
+				<Box mis={8}>
+					<VoipSettingsButton mini />
+				</Box>
+			)}
+
+			{onClose && <IconButton mini mis={8} aria-label={t('Close')} icon='cross' onClick={onClose} />}
+		</Box>
+	);
+};
+export default VoipPopupHeader;
diff --git a/packages/ui-voip/src/components/VoipPopup/components/index.ts b/packages/ui-voip/src/components/VoipPopup/components/index.ts
new file mode 100644
index 000000000000..1f6bfd56b1d4
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/components/index.ts
@@ -0,0 +1,4 @@
+export { default as VoipPopupContainer } from './VoipPopupContainer';
+export { default as VoipPopupHeader } from './VoipPopupHeader';
+export { default as VoipPopupContent } from './VoipPopupContent';
+export { default as VoipPopupFooter } from './VoipPopupFooter';
diff --git a/packages/ui-voip/src/components/VoipPopup/index.ts b/packages/ui-voip/src/components/VoipPopup/index.ts
new file mode 100644
index 000000000000..753fa81fc627
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipPopup';
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
new file mode 100644
index 000000000000..efe175bffad3
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
@@ -0,0 +1,47 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import VoipDialerView from './VoipDialerView';
+
+const makeCall = jest.fn();
+const closeDialer = jest.fn();
+jest.mock('../../../hooks/useVoipAPI', () => ({
+	useVoipAPI: jest.fn(() => ({ makeCall, closeDialer })),
+}));
+
+it('should look good', async () => {
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByText('New_Call')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: /Call/i })).toBeDisabled();
+});
+
+it('should only enable call button if input has value (keyboard)', async () => {
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByRole('button', { name: /Call/i })).toBeDisabled();
+	await userEvent.type(screen.getByLabelText('Phone_number'), '123');
+	expect(screen.getByRole('button', { name: /Call/i })).toBeEnabled();
+});
+
+it('should only enable call button if input has value (mouse)', async () => {
+	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();
+	expect(screen.getByRole('button', { name: /Call/i })).toBeEnabled();
+});
+
+it('should call methods makeCall and closeDialer when call button is clicked', async () => {
+	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();
+	expect(makeCall).toHaveBeenCalledWith('1231');
+	expect(closeDialer).toHaveBeenCalled();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.tsx
new file mode 100644
index 000000000000..5d525cc63c9a
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.tsx
@@ -0,0 +1,49 @@
+import { Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { VoipDialPad as DialPad, VoipSettingsButton as SettingsButton } from '../..';
+import { useVoipAPI } from '../../../hooks/useVoipAPI';
+import type { PositionOffsets } from '../components/VoipPopupContainer';
+import Container from '../components/VoipPopupContainer';
+import Content from '../components/VoipPopupContent';
+import Footer from '../components/VoipPopupFooter';
+import Header from '../components/VoipPopupHeader';
+
+type VoipDialerViewProps = {
+	position?: PositionOffsets;
+};
+
+const VoipDialerView = ({ position }: VoipDialerViewProps) => {
+	const { t } = useTranslation();
+	const { makeCall, closeDialer } = useVoipAPI();
+	const [number, setNumber] = useState('');
+
+	const handleCall = () => {
+		makeCall(number);
+		closeDialer();
+	};
+
+	return (
+		<Container secondary data-testid='vc-popup-dialer' position={position}>
+			<Header hideSettings onClose={closeDialer}>
+				{t('New_Call')}
+			</Header>
+
+			<Content>
+				<DialPad editable value={number} onChange={(value) => setNumber(value)} />
+			</Content>
+
+			<Footer>
+				<ButtonGroup large>
+					<SettingsButton />
+					<Button medium success icon='phone' disabled={!number} flexGrow={1} onClick={handleCall}>
+						{t('Call')}
+					</Button>
+				</ButtonGroup>
+			</Footer>
+		</Container>
+	);
+};
+
+export default VoipDialerView;
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
new file mode 100644
index 000000000000..2b7823d9141a
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
@@ -0,0 +1,74 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, within } from '@testing-library/react';
+
+import { createMockFreeSwitchExtensionDetails, createMockVoipErrorSession } from '../../../tests/mocks';
+import VoipErrorView from './VoipErrorView';
+
+const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension.getDetails', () => createMockFreeSwitchExtensionDetails());
+
+it('should properly render error view', async () => {
+	const errorSession = createMockVoipErrorSession({ error: { status: -1, reason: '' } });
+	render(<VoipErrorView session={errorSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.queryByLabelText('Device_settings')).not.toBeInTheDocument();
+	expect(await screen.findByText('Administrator')).toBeInTheDocument();
+});
+
+it('should only enable error actions', () => {
+	const errorSession = createMockVoipErrorSession({ error: { status: -1, reason: '' } });
+	render(<VoipErrorView session={errorSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
+	expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Hold' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+});
+
+it('should properly interact with the voice call session', () => {
+	const errorSession = createMockVoipErrorSession({ error: { status: -1, reason: '' } });
+	render(<VoipErrorView session={errorSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(errorSession.end).toHaveBeenCalled();
+});
+
+it('should properly render unknown error calls', async () => {
+	const session = createMockVoipErrorSession({ error: { status: -1, reason: '' } });
+	render(<VoipErrorView session={session} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('Unable_to_complete_call')).toBeInTheDocument();
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(session.end).toHaveBeenCalled();
+});
+
+it('should properly render error for unavailable calls', async () => {
+	const session = createMockVoipErrorSession({ error: { status: 480, reason: '' } });
+	render(<VoipErrorView session={session} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('Temporarily_unavailable')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(session.end).toHaveBeenCalled();
+});
+
+it('should properly render error for busy calls', async () => {
+	const session = createMockVoipErrorSession({ error: { status: 486, reason: '' } });
+	render(<VoipErrorView session={session} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('Caller_is_busy')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(session.end).toHaveBeenCalled();
+});
+
+it('should properly render error for terminated calls', async () => {
+	const session = createMockVoipErrorSession({ error: { status: 487, reason: '' } });
+	render(<VoipErrorView session={session} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('Call_terminated')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(session.end).toHaveBeenCalled();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.tsx
new file mode 100644
index 000000000000..9c6dbd32b346
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.tsx
@@ -0,0 +1,57 @@
+import { Box, Icon } from '@rocket.chat/fuselage';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { VoipActions as Actions, VoipContactId as CallContactId } from '../..';
+import type { VoipErrorSession } from '../../../definitions';
+import { useVoipContactId } from '../../../hooks/useVoipContactId';
+import Container from '../components/VoipPopupContainer';
+import type { PositionOffsets } from '../components/VoipPopupContainer';
+import Content from '../components/VoipPopupContent';
+import Footer from '../components/VoipPopupFooter';
+import Header from '../components/VoipPopupHeader';
+
+type VoipErrorViewProps = {
+	session: VoipErrorSession;
+	position?: PositionOffsets;
+};
+
+const VoipErrorView = ({ session, position }: VoipErrorViewProps) => {
+	const { t } = useTranslation();
+	const contactData = useVoipContactId({ session });
+
+	const { status } = session.error;
+
+	const title = useMemo(() => {
+		switch (status) {
+			case 487:
+				return t('Call_terminated');
+			case 486:
+				return t('Caller_is_busy');
+			case 480:
+				return t('Temporarily_unavailable');
+			default:
+				return t('Unable_to_complete_call');
+		}
+	}, [status, t]);
+
+	return (
+		<Container data-testid='vc-popup-error' position={position}>
+			<Header hideSettings>
+				<Box fontScale='p2' color='danger' fontWeight={700}>
+					<Icon name='warning' size={16} /> {title}
+				</Box>
+			</Header>
+
+			<Content>
+				<CallContactId {...contactData} />
+			</Content>
+
+			<Footer>
+				<Actions onEndCall={session.end} />
+			</Footer>
+		</Container>
+	);
+};
+
+export default VoipErrorView;
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
new file mode 100644
index 000000000000..9b364d51178e
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
@@ -0,0 +1,38 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, within } from '@testing-library/react';
+
+import { createMockFreeSwitchExtensionDetails, createMockVoipIncomingSession } from '../../../tests/mocks';
+import VoipIncomingView from './VoipIncomingView';
+
+const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension.getDetails', () => createMockFreeSwitchExtensionDetails());
+
+const incomingSession = createMockVoipIncomingSession();
+
+it('should properly render incoming view', async () => {
+	render(<VoipIncomingView session={incomingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('Incoming_call...')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
+	expect(await screen.findByText('Administrator')).toBeInTheDocument();
+});
+
+it('should only enable incoming actions', () => {
+	render(<VoipIncomingView session={incomingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
+	expect(screen.getByRole('button', { name: 'Decline' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Accept' })).toBeEnabled();
+});
+
+it('should properly interact with the voice call session', () => {
+	render(<VoipIncomingView session={incomingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	screen.getByRole('button', { name: 'Decline' }).click();
+	screen.getByRole('button', { name: 'Accept' }).click();
+
+	expect(incomingSession.end).toHaveBeenCalled();
+	expect(incomingSession.accept).toHaveBeenCalled();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.tsx
new file mode 100644
index 000000000000..39655bf1ce4c
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.tsx
@@ -0,0 +1,36 @@
+import { useTranslation } from 'react-i18next';
+
+import { VoipActions as Actions, VoipContactId as CallContactId } from '../..';
+import type { VoipIncomingSession } from '../../../definitions';
+import { useVoipContactId } from '../../../hooks/useVoipContactId';
+import Container from '../components/VoipPopupContainer';
+import type { PositionOffsets } from '../components/VoipPopupContainer';
+import Content from '../components/VoipPopupContent';
+import Footer from '../components/VoipPopupFooter';
+import Header from '../components/VoipPopupHeader';
+
+type VoipIncomingViewProps = {
+	session: VoipIncomingSession;
+	position?: PositionOffsets;
+};
+
+const VoipIncomingView = ({ session, position }: VoipIncomingViewProps) => {
+	const { t } = useTranslation();
+	const contactData = useVoipContactId({ session });
+
+	return (
+		<Container data-testid='vc-popup-incoming' position={position}>
+			<Header>{`${session.transferedBy ? t('Incoming_call_transfer') : t('Incoming_call')}...`}</Header>
+
+			<Content>
+				<CallContactId {...contactData} />
+			</Content>
+
+			<Footer>
+				<Actions onAccept={session.accept} onDecline={session.end} />
+			</Footer>
+		</Container>
+	);
+};
+
+export default VoipIncomingView;
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
new file mode 100644
index 000000000000..afe589ff4a51
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
@@ -0,0 +1,62 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, within } from '@testing-library/react';
+
+import { createMockFreeSwitchExtensionDetails, createMockVoipOngoingSession } from '../../../tests/mocks';
+import VoipOngoingView from './VoipOngoingView';
+
+const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension.getDetails', () => createMockFreeSwitchExtensionDetails());
+
+const ongoingSession = createMockVoipOngoingSession();
+
+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();
+});
+
+it('should display on hold and muted', () => {
+	ongoingSession.isMuted = true;
+	ongoingSession.isHeld = true;
+
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('On_Hold')).toBeInTheDocument();
+	expect(screen.getByText('Muted')).toBeInTheDocument();
+
+	ongoingSession.isMuted = false;
+	ongoingSession.isHeld = false;
+});
+
+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();
+});
+
+it('should properly interact with the voice call session', () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	screen.getByRole('button', { name: 'Turn_off_microphone' }).click();
+	expect(ongoingSession.mute).toHaveBeenCalled();
+
+	screen.getByRole('button', { name: 'Hold' }).click();
+	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');
+
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(ongoingSession.end).toHaveBeenCalled();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.tsx
new file mode 100644
index 000000000000..4ab37883d829
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.tsx
@@ -0,0 +1,68 @@
+import { useState } from 'react';
+
+import {
+	VoipActions as Actions,
+	VoipContactId as CallContactId,
+	VoipStatus as Status,
+	VoipDialPad as DialPad,
+	VoipTimer as Timer,
+} from '../..';
+import type { VoipOngoingSession } from '../../../definitions';
+import { useVoipContactId } from '../../../hooks/useVoipContactId';
+import { useVoipTransferModal } from '../../../hooks/useVoipTransferModal';
+import Container from '../components/VoipPopupContainer';
+import type { PositionOffsets } from '../components/VoipPopupContainer';
+import Content from '../components/VoipPopupContent';
+import Footer from '../components/VoipPopupFooter';
+import Header from '../components/VoipPopupHeader';
+
+type VoipOngoingViewProps = {
+	session: VoipOngoingSession;
+	position?: PositionOffsets;
+};
+
+const VoipOngoingView = ({ session, position }: VoipOngoingViewProps) => {
+	const { startTransfer } = useVoipTransferModal({ session });
+	const contactData = useVoipContactId({ session, transferEnabled: false });
+
+	const [isDialPadOpen, setDialerOpen] = useState(false);
+	const [dtmfValue, setDTMF] = useState('');
+
+	const handleDTMF = (value: string, digit: string) => {
+		setDTMF(value);
+		if (digit) {
+			session.dtmf(digit);
+		}
+	};
+
+	return (
+		<Container secondary data-testid='vc-popup-ongoing' position={position}>
+			<Header>
+				<Timer />
+			</Header>
+
+			<Content>
+				<Status isMuted={session.isMuted} isHeld={session.isHeld} />
+
+				<CallContactId {...contactData} />
+
+				{isDialPadOpen && <DialPad value={dtmfValue} longPress={false} onChange={handleDTMF} />}
+			</Content>
+
+			<Footer>
+				<Actions
+					isMuted={session.isMuted}
+					isHeld={session.isHeld}
+					isDTMFActive={isDialPadOpen}
+					onMute={session.mute}
+					onHold={session.hold}
+					onEndCall={session.end}
+					onTransfer={startTransfer}
+					onDTMF={() => setDialerOpen(!isDialPadOpen)}
+				/>
+			</Footer>
+		</Container>
+	);
+};
+
+export default VoipOngoingView;
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
new file mode 100644
index 000000000000..2f5f3b5840f4
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
@@ -0,0 +1,35 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, within } from '@testing-library/react';
+
+import { createMockFreeSwitchExtensionDetails, createMockVoipOutgoingSession } from '../../../tests/mocks';
+import VoipOutgoingView from './VoipOutgoingView';
+
+const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension.getDetails', () => createMockFreeSwitchExtensionDetails());
+
+const outgoingSession = createMockVoipOutgoingSession();
+
+it('should properly render outgoing view', async () => {
+	render(<VoipOutgoingView session={outgoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(screen.getByText('Calling...')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
+	expect(await screen.findByText('Administrator')).toBeInTheDocument();
+});
+
+it('should only enable outgoing actions', () => {
+	render(<VoipOutgoingView session={outgoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
+	expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Hold' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeDisabled();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+});
+
+it('should properly interact with the voice call session', () => {
+	render(<VoipOutgoingView session={outgoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+	screen.getByRole('button', { name: 'End_call' }).click();
+	expect(outgoingSession.end).toHaveBeenCalled();
+});
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.tsx
new file mode 100644
index 000000000000..9fb43e783da7
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.tsx
@@ -0,0 +1,36 @@
+import { useTranslation } from 'react-i18next';
+
+import { VoipActions as Actions, VoipContactId as CallContactId } from '../..';
+import type { VoipOutgoingSession } from '../../../definitions';
+import { useVoipContactId } from '../../../hooks/useVoipContactId';
+import Container from '../components/VoipPopupContainer';
+import type { PositionOffsets } from '../components/VoipPopupContainer';
+import Content from '../components/VoipPopupContent';
+import Footer from '../components/VoipPopupFooter';
+import Header from '../components/VoipPopupHeader';
+
+type VoipOutgoingViewProps = {
+	session: VoipOutgoingSession;
+	position?: PositionOffsets;
+};
+
+const VoipOutgoingView = ({ session, position }: VoipOutgoingViewProps) => {
+	const { t } = useTranslation();
+	const contactData = useVoipContactId({ session });
+
+	return (
+		<Container data-testid='vc-popup-outgoing' position={position}>
+			<Header>{`${t('Calling')}...`}</Header>
+
+			<Content>
+				<CallContactId {...contactData} />
+			</Content>
+
+			<Footer>
+				<Actions onEndCall={session.end} />
+			</Footer>
+		</Container>
+	);
+};
+
+export default VoipOutgoingView;
diff --git a/packages/ui-voip/src/components/VoipPopup/views/index.ts b/packages/ui-voip/src/components/VoipPopup/views/index.ts
new file mode 100644
index 000000000000..4f9f47cfb31d
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopup/views/index.ts
@@ -0,0 +1,5 @@
+export { default as DialerView } from './VoipDialerView';
+export { default as ErrorView } from './VoipErrorView';
+export { default as VoipIncomingView } from './VoipIncomingView';
+export { default as VoipOutgoingView } from './VoipOutgoingView';
+export { default as VoipOngoingView } from './VoipOngoingView';
diff --git a/packages/ui-voip/src/components/VoipPopupPortal/VoipPopupPortal.tsx b/packages/ui-voip/src/components/VoipPopupPortal/VoipPopupPortal.tsx
new file mode 100644
index 000000000000..d0f3c015e51b
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopupPortal/VoipPopupPortal.tsx
@@ -0,0 +1,15 @@
+import { AnchorPortal } from '@rocket.chat/ui-client';
+import type { ReactElement, ReactNode } from 'react';
+import { memo } from 'react';
+
+const voipAnchorId = 'voip-root';
+
+type VoipPopupPortalProps = {
+	children?: ReactNode;
+};
+
+const VoipPopupPortal = ({ children }: VoipPopupPortalProps): ReactElement => {
+	return <AnchorPortal id={voipAnchorId}>{children}</AnchorPortal>;
+};
+
+export default memo(VoipPopupPortal);
diff --git a/packages/ui-voip/src/components/VoipPopupPortal/index.ts b/packages/ui-voip/src/components/VoipPopupPortal/index.ts
new file mode 100644
index 000000000000..47db7440804f
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipPopupPortal/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipPopupPortal';
diff --git a/packages/ui-voip/src/components/VoipSettingsButton/VoipSettingsButton.tsx b/packages/ui-voip/src/components/VoipSettingsButton/VoipSettingsButton.tsx
new file mode 100644
index 000000000000..0c3db9e48433
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipSettingsButton/VoipSettingsButton.tsx
@@ -0,0 +1,34 @@
+/* eslint-disable react/no-multi-comp */
+import { IconButton } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { ComponentProps, Ref } from 'react';
+import { forwardRef } from 'react';
+
+import { useVoipDeviceSettings } from './hooks/useVoipDeviceSettings';
+
+const CustomizeButton = forwardRef(function CustomizeButton(
+	{ mini, ...props }: ComponentProps<typeof IconButton>,
+	ref: Ref<HTMLButtonElement>,
+) {
+	const size = mini ? 24 : 32;
+	return <IconButton {...props} ref={ref} icon='customize' mini width={size} height={size} />;
+});
+
+const VoipSettingsButton = ({ mini = false }: { mini?: boolean }) => {
+	const menu = useVoipDeviceSettings();
+
+	return (
+		<GenericMenu
+			is={CustomizeButton}
+			title={menu.title}
+			disabled={menu.disabled}
+			sections={menu.sections}
+			selectionMode='multiple'
+			placement='top-end'
+			icon='customize'
+			mini={mini}
+		/>
+	);
+};
+
+export default VoipSettingsButton;
diff --git a/packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.spec.tsx b/packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.spec.tsx
new file mode 100644
index 000000000000..17da9f5d8142
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.spec.tsx
@@ -0,0 +1,46 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { DeviceContext, DeviceContextValue } from '@rocket.chat/ui-contexts';
+import { renderHook } from '@testing-library/react';
+
+import { useVoipDeviceSettings } from './useVoipDeviceSettings';
+
+let mockDeviceContextValue = {
+	enabled: true,
+	selectedAudioOutputDevice: undefined,
+	selectedAudioInputDevice: undefined,
+	availableAudioOutputDevices: [],
+	availableAudioInputDevices: [],
+	setAudioOutputDevice: () => undefined,
+	setAudioInputDevice: () => undefined,
+} as unknown as DeviceContextValue;
+
+it('should be disabled when there are no devices', () => {
+	const { result } = renderHook(() => useVoipDeviceSettings(), {
+		wrapper: mockAppRoot()
+			.wrap((children) => <DeviceContext.Provider value={mockDeviceContextValue}>{children}</DeviceContext.Provider>)
+			.build(),
+		legacyRoot: true,
+	});
+
+	expect(result.current.title).toBe('Device_settings_not_supported_by_browser');
+	expect(result.current.disabled).toBeTruthy();
+});
+
+it('should be enabled when there are devices', () => {
+	mockDeviceContextValue = {
+		...mockDeviceContextValue,
+
+		availableAudioOutputDevices: [{ label: '' }],
+		availableAudioInputDevices: [{ label: '' }],
+	} as unknown as DeviceContextValue;
+
+	const { result } = renderHook(() => useVoipDeviceSettings(), {
+		wrapper: mockAppRoot()
+			.wrap((children) => <DeviceContext.Provider value={mockDeviceContextValue}>{children}</DeviceContext.Provider>)
+			.build(),
+		legacyRoot: true,
+	});
+
+	expect(result.current.title).toBe('Device_settings');
+	expect(result.current.disabled).toBeFalsy();
+});
diff --git a/packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.tsx b/packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.tsx
new file mode 100644
index 000000000000..2ac43f66fe88
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.tsx
@@ -0,0 +1,75 @@
+import { Box, RadioButton } from '@rocket.chat/fuselage';
+import { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useAvailableDevices, useSelectedDevices, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useMutation } from '@tanstack/react-query';
+import type { MouseEvent } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useVoipAPI } from '../../../hooks/useVoipAPI';
+
+export const useVoipDeviceSettings = () => {
+	const { t } = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const { changeAudioInputDevice, changeAudioOutputDevice } = useVoipAPI();
+	const availableDevices = useAvailableDevices();
+	const selectedAudioDevices = useSelectedDevices();
+
+	const changeInputDevice = useMutation({
+		mutationFn: changeAudioInputDevice,
+		onSuccess: () => dispatchToastMessage({ type: 'success', message: t('Devices_Set') }),
+		onError: (error) => dispatchToastMessage({ type: 'error', message: error }),
+	});
+
+	const changeOutputDevice = useMutation({
+		mutationFn: changeAudioOutputDevice,
+		onSuccess: () => dispatchToastMessage({ type: 'success', message: t('Devices_Set') }),
+		onError: (error) => dispatchToastMessage({ type: 'error', message: error }),
+	});
+
+	const availableInputDevice =
+		availableDevices?.audioInput?.map<GenericMenuItemProps>((device) => ({
+			id: device.id,
+			content: (
+				<Box is='span' title={device.label} fontSize={14}>
+					{device.label}
+				</Box>
+			),
+			addon: <RadioButton onChange={() => changeInputDevice.mutate(device)} checked={device.id === selectedAudioDevices?.audioInput?.id} />,
+		})) || [];
+
+	const availableOutputDevice =
+		availableDevices?.audioOutput?.map<GenericMenuItemProps>((device) => ({
+			id: device.id,
+			content: (
+				<Box is='span' title={device.label} fontSize={14}>
+					{device.label}
+				</Box>
+			),
+			addon: (
+				<RadioButton onChange={() => changeOutputDevice.mutate(device)} checked={device.id === selectedAudioDevices?.audioOutput?.id} />
+			),
+			onClick(e?: MouseEvent<HTMLElement>) {
+				e?.preventDefault();
+				e?.stopPropagation();
+			},
+		})) || [];
+
+	const micSection = {
+		title: t('Microphone'),
+		items: availableInputDevice,
+	};
+
+	const speakerSection = {
+		title: t('Speaker'),
+		items: availableOutputDevice,
+	};
+
+	const disabled = !micSection.items.length || !speakerSection.items.length;
+
+	return {
+		disabled,
+		title: disabled ? t('Device_settings_not_supported_by_browser') : t('Device_settings'),
+		sections: [micSection, speakerSection],
+	};
+};
diff --git a/packages/ui-voip/src/components/VoipSettingsButton/index.ts b/packages/ui-voip/src/components/VoipSettingsButton/index.ts
new file mode 100644
index 000000000000..f99032fedee5
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipSettingsButton/index.ts
@@ -0,0 +1,2 @@
+export { default } from './VoipSettingsButton';
+export * from './hooks/useVoipDeviceSettings';
diff --git a/packages/ui-voip/src/components/VoipStatus/VoipStatus.spec.tsx b/packages/ui-voip/src/components/VoipStatus/VoipStatus.spec.tsx
new file mode 100644
index 000000000000..f81d35dc8cfc
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipStatus/VoipStatus.spec.tsx
@@ -0,0 +1,32 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+
+import VoipStatus from './VoipStatus';
+
+it('should not render any status', () => {
+	render(<VoipStatus isHeld={false} isMuted={false} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.queryByText('On_Hold')).not.toBeInTheDocument();
+	expect(screen.queryByText('Muted')).not.toBeInTheDocument();
+});
+
+it('should display on hold status', () => {
+	render(<VoipStatus isHeld isMuted={false} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByText('On_Hold')).toBeInTheDocument();
+	expect(screen.queryByText('Muted')).not.toBeInTheDocument();
+});
+
+it('should display muted status', () => {
+	render(<VoipStatus isHeld={false} isMuted />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.queryByText('On_Hold')).not.toBeInTheDocument();
+	expect(screen.getByText('Muted')).toBeInTheDocument();
+});
+
+it('should display all statuses', () => {
+	render(<VoipStatus isHeld isMuted />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByText('On_Hold')).toBeInTheDocument();
+	expect(screen.getByText('Muted')).toBeInTheDocument();
+});
diff --git a/packages/ui-voip/src/components/VoipStatus/VoipStatus.tsx b/packages/ui-voip/src/components/VoipStatus/VoipStatus.tsx
new file mode 100644
index 000000000000..dc466bdf0e6b
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipStatus/VoipStatus.tsx
@@ -0,0 +1,28 @@
+import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from 'react-i18next';
+
+const VoipStatus = ({ isHeld = false, isMuted = false }: { isHeld: boolean; isMuted: boolean }) => {
+	const { t } = useTranslation();
+
+	if (!isHeld && !isMuted) {
+		return null;
+	}
+
+	return (
+		<Box fontScale='p2' display='flex' justifyContent='space-between' paddingInline={12} pb={4}>
+			{isHeld && (
+				<Box is='span' color='default'>
+					{t('On_Hold')}
+				</Box>
+			)}
+
+			{isMuted && (
+				<Box is='span' color='status-font-on-warning'>
+					{t('Muted')}
+				</Box>
+			)}
+		</Box>
+	);
+};
+
+export default VoipStatus;
diff --git a/packages/ui-voip/src/components/VoipStatus/index.ts b/packages/ui-voip/src/components/VoipStatus/index.ts
new file mode 100644
index 000000000000..91d89ce79241
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipStatus/index.ts
@@ -0,0 +1,2 @@
+export { default } from './VoipStatus';
+export * from './VoipStatus';
diff --git a/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx b/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
new file mode 100644
index 000000000000..12a01e9b33bf
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
@@ -0,0 +1,37 @@
+import { act, render, screen } from '@testing-library/react';
+
+import VoipTimer from './VoipTimer';
+
+describe('VoipTimer', () => {
+	beforeEach(() => {
+		jest.useFakeTimers();
+	});
+
+	afterEach(() => {
+		jest.clearAllTimers();
+	});
+
+	it('should display the initial time correctly', () => {
+		render(<VoipTimer />, { legacyRoot: true });
+
+		expect(screen.getByText('00:00')).toBeInTheDocument();
+	});
+
+	it('should update the time after a few seconds', () => {
+		render(<VoipTimer />, { legacyRoot: true });
+
+		act(() => {
+			jest.advanceTimersByTime(5000);
+		});
+
+		expect(screen.getByText('00:05')).toBeInTheDocument();
+	});
+
+	it('should start with a minute on the timer', () => {
+		const startTime = new Date();
+		startTime.setMinutes(startTime.getMinutes() - 1);
+		render(<VoipTimer startAt={startTime} />, { legacyRoot: true });
+
+		expect(screen.getByText('01:00')).toBeInTheDocument();
+	});
+});
diff --git a/packages/ui-voip/src/components/VoipTimer/VoipTimer.tsx b/packages/ui-voip/src/components/VoipTimer/VoipTimer.tsx
new file mode 100644
index 000000000000..e90eeaee510f
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipTimer/VoipTimer.tsx
@@ -0,0 +1,35 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { setPreciseInterval } from '../../utils/setPreciseInterval';
+
+type VoipTimerProps = { startAt?: Date };
+
+const VoipTimer = ({ startAt = new Date() }: VoipTimerProps) => {
+	const [start] = useState(startAt.getTime());
+	const [ellapsedTime, setEllapsedTime] = useState(0);
+
+	useEffect(() => {
+		return setPreciseInterval(() => {
+			setEllapsedTime(Date.now() - start);
+		}, 1000);
+	});
+
+	const [hours, minutes, seconds] = useMemo(() => {
+		const totalSeconds = Math.floor(ellapsedTime / 1000);
+
+		const hours = Math.floor(totalSeconds / 3600);
+		const minutes = Math.floor((totalSeconds % 3600) / 60);
+		const seconds = Math.floor(totalSeconds % 60);
+
+		return [hours.toString().padStart(2, '0'), minutes.toString().padStart(2, '0'), seconds.toString().padStart(2, '0')];
+	}, [ellapsedTime]);
+
+	return (
+		<time aria-hidden>
+			{hours !== '00' ? `${hours}:` : ''}
+			{minutes}:{seconds}
+		</time>
+	);
+};
+
+export default VoipTimer;
diff --git a/packages/ui-voip/src/components/VoipTimer/index.ts b/packages/ui-voip/src/components/VoipTimer/index.ts
new file mode 100644
index 000000000000..9b7e43281970
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipTimer/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipTimer';
diff --git a/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
new file mode 100644
index 000000000000..09c8037cd9f9
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
@@ -0,0 +1,94 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import VoipTransferModal from '.';
+
+it('should be able to select transfer target', async () => {
+	const confirmFn = jest.fn();
+	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={() => undefined} />, {
+		wrapper: mockAppRoot()
+			.withJohnDoe()
+			.withEndpoint('GET', '/v1/users.autocomplete', () => ({
+				items: [
+					{
+						_id: 'janedoe',
+						score: 2,
+						name: 'Jane Doe',
+						username: 'jane.doe',
+						nickname: null,
+						status: 'offline',
+						statusText: '',
+						avatarETag: null,
+					} as any,
+				],
+				success: true,
+			}))
+			.withEndpoint('GET', '/v1/users.info', () => ({
+				user: {
+					_id: 'pC85DQzdv8zmzXNT8',
+					createdAt: '2023-04-12T18:02:08.145Z',
+					username: 'jane.doe',
+					emails: [
+						{
+							address: 'jane.doe@email.com',
+							verified: true,
+						},
+					],
+					type: 'user',
+					active: true,
+					roles: ['user', 'livechat-agent', 'livechat-monitor'],
+					name: 'Jane Doe',
+					requirePasswordChange: false,
+					statusText: '',
+					lastLogin: '2024-08-19T18:21:58.442Z',
+					statusConnection: 'offline',
+					utcOffset: -3,
+					freeSwitchExtension: '1011',
+					canViewAllInfo: true,
+					_updatedAt: '',
+				},
+				success: true,
+			}))
+			.build(),
+		legacyRoot: true,
+	});
+	const hangUpAnTransferButton = screen.getByRole('button', { name: 'Hang_up_and_transfer_call' });
+
+	expect(hangUpAnTransferButton).toBeDisabled();
+
+	screen.getByLabelText('Transfer_to').focus();
+	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
+	await userEvent.click(userOption);
+
+	expect(hangUpAnTransferButton).toBeEnabled();
+	hangUpAnTransferButton.click();
+
+	expect(confirmFn).toHaveBeenCalledWith({ extension: '1011', name: 'Jane Doe' });
+});
+
+it('should call onCancel when Cancel is clicked', () => {
+	const confirmFn = jest.fn();
+	const cancelFn = jest.fn();
+	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={cancelFn} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	screen.getByText('Cancel').click();
+
+	expect(cancelFn).toHaveBeenCalled();
+});
+
+it('should call onCancel when X is clicked', () => {
+	const confirmFn = jest.fn();
+	const cancelFn = jest.fn();
+	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={cancelFn} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	screen.getByLabelText('Close').click();
+
+	expect(cancelFn).toHaveBeenCalled();
+});
diff --git a/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.tsx b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.tsx
new file mode 100644
index 000000000000..f1de589c82b4
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.tsx
@@ -0,0 +1,82 @@
+import { Button, Field, FieldHint, FieldLabel, FieldRow, Modal } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
+import { useEndpoint, useUser } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+type VoipTransferModalProps = {
+	extension: string;
+	isLoading?: boolean;
+	onCancel(): void;
+	onConfirm(params: { extension: string; name: string | undefined }): void;
+};
+
+const VoipTransferModal = ({ extension, isLoading = false, onCancel, onConfirm }: VoipTransferModalProps) => {
+	const { t } = useTranslation();
+	const [username, setTransferTo] = useState('');
+	const user = useUser();
+	const transferToId = useUniqueId();
+	const modalId = useUniqueId();
+
+	const getUserInfo = useEndpoint('GET', '/v1/users.info');
+	const { data: targetUser, isInitialLoading: isTargetInfoLoading } = useQuery(
+		['/v1/users.info', username],
+		() => getUserInfo({ username }),
+		{
+			enabled: Boolean(username),
+			select: (data) => data?.user || {},
+		},
+	);
+
+	const handleConfirm = () => {
+		if (!targetUser?.freeSwitchExtension) {
+			return;
+		}
+
+		onConfirm({ extension: targetUser.freeSwitchExtension, name: targetUser.name });
+	};
+
+	return (
+		<Modal open aria-labelledby={modalId}>
+			<Modal.Header>
+				<Modal.Icon color='danger' name='modal-warning' />
+				<Modal.Title id={modalId}>{t('Transfer_call')}</Modal.Title>
+				<Modal.Close aria-label={t('Close')} onClick={onCancel} />
+			</Modal.Header>
+			<Modal.Content>
+				<Field>
+					<FieldLabel htmlFor={transferToId}>{t('Transfer_to')}</FieldLabel>
+					<FieldRow>
+						<UserAutoComplete
+							id={transferToId}
+							value={username}
+							aria-describedby={`${transferToId}-hint`}
+							data-testid='vc-input-transfer-to'
+							onChange={(target) => setTransferTo(target as string)}
+							multiple={false}
+							conditions={{
+								freeSwitchExtension: { $exists: true, $ne: extension },
+								username: { $ne: user?.username },
+							}}
+						/>
+					</FieldRow>
+					<FieldHint id={`${transferToId}-hint`}>{t('Select_someone_to_transfer_the_call_to')}</FieldHint>
+				</Field>
+			</Modal.Content>
+			<Modal.Footer>
+				<Modal.FooterControllers>
+					<Button data-testid='vc-button-cancel' secondary onClick={onCancel}>
+						{t('Cancel')}
+					</Button>
+					<Button danger onClick={handleConfirm} disabled={!targetUser?.freeSwitchExtension} loading={isLoading || isTargetInfoLoading}>
+						{t('Hang_up_and_transfer_call')}
+					</Button>
+				</Modal.FooterControllers>
+			</Modal.Footer>
+		</Modal>
+	);
+};
+
+export default VoipTransferModal;
diff --git a/packages/ui-voip/src/components/VoipTransferModal/index.ts b/packages/ui-voip/src/components/VoipTransferModal/index.ts
new file mode 100644
index 000000000000..a38c21026718
--- /dev/null
+++ b/packages/ui-voip/src/components/VoipTransferModal/index.ts
@@ -0,0 +1 @@
+export { default } from './VoipTransferModal';
diff --git a/packages/ui-voip/src/components/index.ts b/packages/ui-voip/src/components/index.ts
new file mode 100644
index 000000000000..1593c0b9aa5b
--- /dev/null
+++ b/packages/ui-voip/src/components/index.ts
@@ -0,0 +1,7 @@
+export { default as VoipDialPad } from './VoipDialPad';
+export { default as VoipTimer } from './VoipTimer';
+export { default as VoipStatus } from './VoipStatus';
+export { default as VoipContactId } from './VoipContactId';
+export { default as VoipActionButton } from './VoipActionButton';
+export { default as VoipActions } from './VoipActions';
+export { default as VoipSettingsButton } from './VoipSettingsButton';
diff --git a/packages/ui-voip/src/contexts/VoipContext.tsx b/packages/ui-voip/src/contexts/VoipContext.tsx
new file mode 100644
index 000000000000..fd7700d54da5
--- /dev/null
+++ b/packages/ui-voip/src/contexts/VoipContext.tsx
@@ -0,0 +1,44 @@
+import { type Device } from '@rocket.chat/ui-contexts';
+import { createContext } from 'react';
+
+import type VoIPClient from '../lib/VoipClient';
+
+type VoipContextDisabled = {
+	isEnabled: false;
+	voipClient?: null;
+	error?: null;
+};
+
+export type VoipContextError = {
+	isEnabled: true;
+	error: Error;
+	voipClient: null;
+	changeAudioOutputDevice: (selectedAudioDevices: Device) => Promise<void>;
+	changeAudioInputDevice: (selectedAudioDevices: Device) => Promise<void>;
+};
+
+export type VoipContextEnabled = {
+	isEnabled: true;
+	voipClient: VoIPClient | null;
+	error?: null;
+	changeAudioOutputDevice: (selectedAudioDevices: Device) => Promise<void>;
+	changeAudioInputDevice: (selectedAudioDevices: Device) => Promise<void>;
+};
+
+export type VoipContextReady = {
+	isEnabled: true;
+	voipClient: VoIPClient;
+	error: null;
+	changeAudioOutputDevice: (selectedAudioDevices: Device) => Promise<void>;
+	changeAudioInputDevice: (selectedAudioDevices: Device) => Promise<void>;
+};
+
+export type VoipContextValue = VoipContextDisabled | VoipContextEnabled | VoipContextReady | VoipContextError;
+
+export const isVoipContextReady = (context: VoipContextValue): context is VoipContextReady =>
+	context.isEnabled && context.voipClient !== null;
+
+export const VoipContext = createContext<VoipContextValue>({
+	isEnabled: false,
+	voipClient: null,
+});
diff --git a/packages/ui-voip/src/definitions/IceServer.ts b/packages/ui-voip/src/definitions/IceServer.ts
new file mode 100644
index 000000000000..1f13d16e56fa
--- /dev/null
+++ b/packages/ui-voip/src/definitions/IceServer.ts
@@ -0,0 +1,5 @@
+export type IceServer = {
+	urls: string;
+	username?: string;
+	credential?: string;
+};
diff --git a/packages/ui-voip/src/definitions/VoipSession.ts b/packages/ui-voip/src/definitions/VoipSession.ts
new file mode 100644
index 000000000000..e4bbd5f728ae
--- /dev/null
+++ b/packages/ui-voip/src/definitions/VoipSession.ts
@@ -0,0 +1,69 @@
+export type ContactInfo = {
+	id: string;
+	name?: string;
+	host: string;
+};
+
+export type VoipGenericSession = {
+	type: 'INCOMING' | 'OUTGOING' | 'ONGOING' | 'ERROR';
+	contact: ContactInfo | null;
+	transferedBy?: ContactInfo | null;
+	isMuted?: boolean;
+	isHeld?: boolean;
+	error?: { status?: number; reason: string };
+	accept?(): Promise<void>;
+	end?(): void;
+	mute?(mute?: boolean): void;
+	hold?(held?: boolean): void;
+	dtmf?(digit: string): void;
+};
+
+export type VoipOngoingSession = VoipGenericSession & {
+	type: 'ONGOING';
+	contact: ContactInfo;
+	isMuted: boolean;
+	isHeld: boolean;
+	end(): void;
+	mute(muted?: boolean): void;
+	hold(held?: boolean): void;
+	dtmf(digit: string): void;
+};
+
+export type VoipIncomingSession = VoipGenericSession & {
+	type: 'INCOMING';
+	contact: ContactInfo;
+	transferedBy: ContactInfo | null;
+	end(): void;
+	accept(): Promise<void>;
+};
+
+export type VoipOutgoingSession = VoipGenericSession & {
+	type: 'OUTGOING';
+	contact: ContactInfo;
+	end(): void;
+};
+
+export type VoipErrorSession = VoipGenericSession & {
+	type: 'ERROR';
+	contact: ContactInfo;
+	error: { status?: number; reason: string };
+	end(): void;
+};
+
+export type VoipSession = VoipIncomingSession | VoipOngoingSession | VoipOutgoingSession | VoipErrorSession;
+
+export const isVoipIncomingSession = (session: VoipSession | null | undefined): session is VoipIncomingSession => {
+	return session?.type === 'INCOMING';
+};
+
+export const isVoipOngoingSession = (session: VoipSession | null | undefined): session is VoipOngoingSession => {
+	return session?.type === 'ONGOING';
+};
+
+export const isVoipOutgoingSession = (session: VoipSession | null | undefined): session is VoipOutgoingSession => {
+	return session?.type === 'OUTGOING';
+};
+
+export const isVoipErrorSession = (session: VoipSession | null | undefined): session is VoipErrorSession => {
+	return session?.type === 'ERROR';
+};
diff --git a/packages/ui-voip/src/definitions/index.ts b/packages/ui-voip/src/definitions/index.ts
new file mode 100644
index 000000000000..b1d869534a0e
--- /dev/null
+++ b/packages/ui-voip/src/definitions/index.ts
@@ -0,0 +1,2 @@
+export * from './VoipSession';
+export * from './IceServer';
diff --git a/packages/ui-voip/src/hooks/index.ts b/packages/ui-voip/src/hooks/index.ts
new file mode 100644
index 000000000000..723c5b5fff5d
--- /dev/null
+++ b/packages/ui-voip/src/hooks/index.ts
@@ -0,0 +1,6 @@
+export * from './useVoip';
+export * from './useVoipAPI';
+export * from './useVoipClient';
+export * from './useVoipDialer';
+export * from './useVoipSession';
+export * from './useVoipState';
diff --git a/packages/ui-voip/src/hooks/useVoip.tsx b/packages/ui-voip/src/hooks/useVoip.tsx
new file mode 100644
index 000000000000..1d54d4446117
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoip.tsx
@@ -0,0 +1,23 @@
+import { useContext, useMemo } from 'react';
+
+import { VoipContext } from '../contexts/VoipContext';
+import { useVoipAPI } from './useVoipAPI';
+import { useVoipSession } from './useVoipSession';
+import { useVoipState } from './useVoipState';
+
+export const useVoip = () => {
+	const { error } = useContext(VoipContext);
+	const state = useVoipState();
+	const session = useVoipSession();
+	const api = useVoipAPI();
+
+	return useMemo(
+		() => ({
+			...state,
+			...api,
+			session,
+			error,
+		}),
+		[state, api, session, error],
+	);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipAPI.tsx b/packages/ui-voip/src/hooks/useVoipAPI.tsx
new file mode 100644
index 000000000000..ca645f3d08fe
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipAPI.tsx
@@ -0,0 +1,52 @@
+import { useContext, useMemo } from 'react';
+
+import type { VoipContextReady } from '../contexts/VoipContext';
+import { VoipContext, isVoipContextReady } from '../contexts/VoipContext';
+
+type VoipAPI = {
+	makeCall(calleeURI: string): void;
+	endCall(): void;
+	register(): Promise<void>;
+	unregister(): Promise<void>;
+	openDialer(): void;
+	closeDialer(): void;
+	transferCall(calleeURL: string): Promise<void>;
+	changeAudioOutputDevice: VoipContextReady['changeAudioOutputDevice'];
+	changeAudioInputDevice: VoipContextReady['changeAudioInputDevice'];
+};
+
+const NOOP = (..._args: any[]): any => undefined;
+
+export const useVoipAPI = (): VoipAPI => {
+	const context = useContext(VoipContext);
+
+	return useMemo(() => {
+		if (!isVoipContextReady(context)) {
+			return {
+				makeCall: NOOP,
+				endCall: NOOP,
+				register: NOOP,
+				unregister: NOOP,
+				openDialer: NOOP,
+				closeDialer: NOOP,
+				transferCall: NOOP,
+				changeAudioInputDevice: NOOP,
+				changeAudioOutputDevice: NOOP,
+			} as VoipAPI;
+		}
+
+		const { voipClient, changeAudioInputDevice, changeAudioOutputDevice } = context;
+
+		return {
+			makeCall: voipClient.call,
+			endCall: voipClient.endCall,
+			register: voipClient.register,
+			unregister: voipClient.unregister,
+			transferCall: voipClient.transfer,
+			openDialer: () => voipClient.notifyDialer({ open: true }),
+			closeDialer: () => voipClient.notifyDialer({ open: false }),
+			changeAudioInputDevice,
+			changeAudioOutputDevice,
+		};
+	}, [context]);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipClient.tsx b/packages/ui-voip/src/hooks/useVoipClient.tsx
new file mode 100644
index 000000000000..14ff278ca022
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipClient.tsx
@@ -0,0 +1,89 @@
+import { useUser, useSetting, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import { useEffect, useRef } from 'react';
+
+import VoipClient from '../lib/VoipClient';
+import { useWebRtcServers } from './useWebRtcServers';
+
+type VoipClientParams = {
+	autoRegister?: boolean;
+};
+
+type VoipClientResult = {
+	voipClient: VoipClient | null;
+	error: Error | null;
+};
+
+export const useVoipClient = ({ autoRegister = true }: VoipClientParams): VoipClientResult => {
+	const { _id: userId } = useUser() || {};
+	const isVoipEnabled = useSetting<boolean>('VoIP_TeamCollab_Enabled');
+	const voipClientRef = useRef<VoipClient | null>(null);
+
+	const getRegistrationInfo = useEndpoint('GET', '/v1/voip-freeswitch.extension.getRegistrationInfoByUserId');
+
+	const iceServers = useWebRtcServers();
+
+	const { data: voipClient, error } = useQuery<VoipClient | null, Error>(
+		['voip-client', isVoipEnabled, userId, iceServers],
+		async () => {
+			if (voipClientRef.current) {
+				voipClientRef.current.clear();
+			}
+
+			if (!userId) {
+				throw Error('User_not_found');
+			}
+
+			const registrationInfo = await getRegistrationInfo({ userId })
+				.then((registration) => {
+					if (!registration) {
+						throw Error();
+					}
+
+					return registration;
+				})
+				.catch(() => {
+					throw Error('Registration_information_not_found');
+				});
+
+			const {
+				extension: { extension },
+				credentials: { websocketPath, password },
+			} = registrationInfo;
+
+			if (!extension) {
+				throw Error('User_extension_not_found');
+			}
+
+			const config = {
+				iceServers,
+				authUserName: extension,
+				authPassword: password,
+				sipRegistrarHostnameOrIP: new URL(websocketPath).host,
+				webSocketURI: websocketPath,
+				connectionRetryCount: Number(10), // TODO: get from settings
+				enableKeepAliveUsingOptionsForUnstableNetworks: true, // TODO: get from settings
+			};
+
+			const voipClient = await VoipClient.create(config);
+
+			if (autoRegister) {
+				voipClient.register();
+			}
+
+			return voipClient;
+		},
+		{
+			initialData: null,
+			enabled: !!userId,
+		},
+	);
+
+	useEffect(() => {
+		voipClientRef.current = voipClient;
+
+		return () => voipClientRef.current?.clear();
+	}, [voipClient]);
+
+	return { voipClient, error };
+};
diff --git a/packages/ui-voip/src/hooks/useVoipContactId.tsx b/packages/ui-voip/src/hooks/useVoipContactId.tsx
new file mode 100644
index 000000000000..4ef799ec505e
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipContactId.tsx
@@ -0,0 +1,25 @@
+import type { VoipSession } from '../definitions';
+import { useVoipExtensionDetails } from './useVoipExtensionDetails';
+
+export const useVoipContactId = ({ session, transferEnabled = true }: { session: VoipSession; transferEnabled?: boolean }) => {
+	const { data: contact, isInitialLoading: isLoading } = useVoipExtensionDetails({ extension: session.contact.id });
+	const { data: transferedByContact } = useVoipExtensionDetails({
+		extension: session.transferedBy?.id,
+		enabled: transferEnabled,
+	});
+
+	const getContactName = (data: ReturnType<typeof useVoipExtensionDetails>['data'], defaultValue?: string) => {
+		const { name, username = '', callerName, callerNumber, extension } = data || {};
+		return name || callerName || username || callerNumber || extension || defaultValue || '';
+	};
+
+	const name = getContactName(contact, session.contact.name || session.contact.id);
+	const transferedBy = getContactName(transferedByContact, transferEnabled ? session.transferedBy?.id : '');
+
+	return {
+		name,
+		username: contact?.username,
+		transferedBy,
+		isLoading,
+	};
+};
diff --git a/packages/ui-voip/src/hooks/useVoipDialer.tsx b/packages/ui-voip/src/hooks/useVoipDialer.tsx
new file mode 100644
index 000000000000..0714badacb55
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipDialer.tsx
@@ -0,0 +1,13 @@
+import { useVoipAPI } from './useVoipAPI';
+import { useVoipEvent } from './useVoipEvent';
+
+export const useVoipDialer = () => {
+	const { openDialer, closeDialer } = useVoipAPI();
+	const { open } = useVoipEvent('dialer', { open: false });
+
+	return {
+		open,
+		openDialer: openDialer || (() => undefined),
+		closeDialer: closeDialer || (() => undefined),
+	};
+};
diff --git a/packages/ui-voip/src/hooks/useVoipEffect.tsx b/packages/ui-voip/src/hooks/useVoipEffect.tsx
new file mode 100644
index 000000000000..e412959ff923
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipEffect.tsx
@@ -0,0 +1,30 @@
+import { useContext, useMemo, useRef } from 'react';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
+
+import { VoipContext } from '../contexts/VoipContext';
+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 transformFn = useRef(transform);
+
+	const [subscribe, getSnapshot] = useMemo(() => {
+		let state: T = initValue.current;
+
+		const getSnapshot = (): T => state;
+		const subscribe = (cb: () => void) => {
+			if (!voipClient) return () => undefined;
+
+			state = transformFn.current(voipClient);
+			return voipClient.on('stateChanged', (): void => {
+				state = transformFn.current(voipClient);
+				cb();
+			});
+		};
+
+		return [subscribe, getSnapshot];
+	}, [voipClient]);
+
+	return useSyncExternalStore(subscribe, getSnapshot);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipEvent.tsx b/packages/ui-voip/src/hooks/useVoipEvent.tsx
new file mode 100644
index 000000000000..d78726de1c1d
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipEvent.tsx
@@ -0,0 +1,28 @@
+import { useContext, useMemo, useRef } from 'react';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
+
+import { VoipContext } from '../contexts/VoipContext';
+import type { VoipEvents } from '../lib/VoipClient';
+
+export const useVoipEvent = <E extends keyof VoipEvents>(eventName: E, initialValue: VoipEvents[E]) => {
+	const { voipClient } = useContext(VoipContext);
+	const initValue = useRef(initialValue);
+
+	const [subscribe, getSnapshot] = useMemo(() => {
+		let state: VoipEvents[E] = initValue.current;
+
+		const getSnapshot = (): VoipEvents[E] => state;
+		const callback = (cb: () => void) => {
+			if (!voipClient) return () => undefined;
+
+			return voipClient.on(eventName, (event?: VoipEvents[E]): void => {
+				state = event as VoipEvents[E];
+				cb();
+			});
+		};
+
+		return [callback, getSnapshot];
+	}, [eventName, voipClient]);
+
+	return useSyncExternalStore(subscribe, getSnapshot);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipExtensionDetails.tsx b/packages/ui-voip/src/hooks/useVoipExtensionDetails.tsx
new file mode 100644
index 000000000000..d106ae2842aa
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipExtensionDetails.tsx
@@ -0,0 +1,20 @@
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+
+export const useVoipExtensionDetails = ({ extension, enabled = true }: { extension: string | undefined; enabled?: boolean }) => {
+	const isEnabled = !!extension && enabled;
+	const getContactDetails = useEndpoint('GET', '/v1/voip-freeswitch.extension.getDetails');
+	const { data, ...result } = useQuery(
+		['voip', 'voip-extension-details', extension, getContactDetails],
+		() => getContactDetails({ extension: extension as string }),
+		{
+			enabled: isEnabled,
+			onError: () => undefined,
+		},
+	);
+
+	return {
+		data: isEnabled ? data : undefined,
+		...result,
+	};
+};
diff --git a/packages/ui-voip/src/hooks/useVoipSession.tsx b/packages/ui-voip/src/hooks/useVoipSession.tsx
new file mode 100644
index 000000000000..9ba0874f6d10
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipSession.tsx
@@ -0,0 +1,6 @@
+import type { VoipSession } from '../definitions';
+import { useVoipEffect } from './useVoipEffect';
+
+export const useVoipSession = (): VoipSession | null => {
+	return useVoipEffect((client) => client.getSession(), null);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipSounds.ts b/packages/ui-voip/src/hooks/useVoipSounds.ts
new file mode 100644
index 000000000000..5ba847cae8d2
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipSounds.ts
@@ -0,0 +1,26 @@
+import { useCustomSound, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+type VoipSound = 'telephone' | 'outbound-call-ringing' | 'call-ended';
+
+export const useVoipSounds = () => {
+	const { play, pause } = useCustomSound();
+	const audioVolume = useUserPreference<number>('notificationsSoundVolume', 100) || 100;
+
+	return useMemo(
+		() => ({
+			play: (soundId: VoipSound, loop = true) => {
+				play(soundId, {
+					volume: Number((audioVolume / 100).toPrecision(2)),
+					loop,
+				});
+			},
+			stop: (soundId: VoipSound) => pause(soundId),
+			stopAll: () => {
+				pause('telephone');
+				pause('outbound-call-ringing');
+			},
+		}),
+		[play, pause, audioVolume],
+	);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipState.tsx b/packages/ui-voip/src/hooks/useVoipState.tsx
new file mode 100644
index 000000000000..66e1ea7538a0
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipState.tsx
@@ -0,0 +1,45 @@
+import { useContext, useMemo } from 'react';
+
+import { VoipContext } from '../contexts/VoipContext';
+import { useVoipEffect } from './useVoipEffect';
+
+export type VoipState = {
+	isEnabled: boolean;
+	isRegistered: boolean;
+	isReady: boolean;
+	isOnline: boolean;
+	isIncoming: boolean;
+	isOngoing: boolean;
+	isOutgoing: boolean;
+	isInCall: boolean;
+	isError: boolean;
+	error?: Error | null;
+	clientError?: Error | null;
+};
+
+const DEFAULT_STATE = {
+	isRegistered: false,
+	isReady: false,
+	isInCall: false,
+	isOnline: false,
+	isIncoming: false,
+	isOngoing: false,
+	isOutgoing: false,
+	isError: false,
+};
+
+export const useVoipState = (): VoipState => {
+	const { isEnabled, error: clientError } = useContext(VoipContext);
+
+	const callState = useVoipEffect((client) => client.getState(), DEFAULT_STATE);
+
+	return useMemo(
+		() => ({
+			...callState,
+			clientError,
+			isEnabled,
+			isError: !!clientError || callState.isError,
+		}),
+		[clientError, isEnabled, callState],
+	);
+};
diff --git a/packages/ui-voip/src/hooks/useVoipTransferModal.tsx b/packages/ui-voip/src/hooks/useVoipTransferModal.tsx
new file mode 100644
index 000000000000..df15e400ca27
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useVoipTransferModal.tsx
@@ -0,0 +1,51 @@
+import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useMutation } from '@tanstack/react-query';
+import { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import VoipTransferModal from '../components/VoipTransferModal';
+import type { VoipOngoingSession } from '../definitions';
+import { useVoipAPI } from './useVoipAPI';
+
+type UseVoipTransferParams = {
+	session: VoipOngoingSession;
+};
+
+export const useVoipTransferModal = ({ session }: UseVoipTransferParams) => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const { transferCall } = useVoipAPI();
+
+	const close = useCallback(() => setModal(null), [setModal]);
+
+	useEffect(() => () => close(), [close]);
+
+	const handleTransfer = useMutation({
+		mutationFn: async ({ extension, name }: { extension: string; name: string | undefined }) => {
+			await transferCall(extension);
+			return name || extension;
+		},
+		onSuccess: (name: string) => {
+			dispatchToastMessage({ type: 'success', message: t('Call_transfered_to__name__', { name }) });
+			close();
+		},
+		onError: () => {
+			dispatchToastMessage({ type: 'error', message: t('Failed_to_transfer_call') });
+			close();
+		},
+	});
+
+	const startTransfer = useCallback(() => {
+		setModal(
+			<VoipTransferModal
+				extension={session.contact.id}
+				isLoading={handleTransfer.isLoading}
+				onCancel={() => setModal(null)}
+				onConfirm={handleTransfer.mutate}
+			/>,
+		);
+	}, [handleTransfer.isLoading, handleTransfer.mutate, session, setModal]);
+
+	return { startTransfer, cancelTransfer: close };
+};
diff --git a/packages/ui-voip/src/hooks/useWebRtcServers.ts b/packages/ui-voip/src/hooks/useWebRtcServers.ts
new file mode 100644
index 000000000000..9753098c0a65
--- /dev/null
+++ b/packages/ui-voip/src/hooks/useWebRtcServers.ts
@@ -0,0 +1,16 @@
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import type { IceServer } from '../definitions';
+import { parseStringToIceServers } from '../utils/parseStringToIceServers';
+
+export const useWebRtcServers = (): IceServer[] => {
+	const servers = useSetting('WebRTC_Servers');
+
+	return useMemo(() => {
+		if (typeof servers !== 'string' || !servers.trim()) {
+			return [];
+		}
+		return parseStringToIceServers(servers);
+	}, [servers]);
+};
diff --git a/packages/ui-voip/src/index.ts b/packages/ui-voip/src/index.ts
new file mode 100644
index 000000000000..ebf30176a725
--- /dev/null
+++ b/packages/ui-voip/src/index.ts
@@ -0,0 +1,4 @@
+export { default as VoipProvider } from './providers/VoipProvider';
+export * from './definitions/VoipSession';
+export * from './hooks';
+export * from './components';
diff --git a/packages/ui-voip/src/lib/LocalStream.ts b/packages/ui-voip/src/lib/LocalStream.ts
new file mode 100644
index 000000000000..15acf7a531e2
--- /dev/null
+++ b/packages/ui-voip/src/lib/LocalStream.ts
@@ -0,0 +1,106 @@
+/**
+ * This class is used for local stream manipulation.
+ * @remarks
+ * This class does not really store any local stream for the reason
+ * that the local stream tracks are stored in the peer connection.
+ *
+ * This simply provides necessary methods for stream manipulation.
+ *
+ * Currently it does not use any of its base functionality. Nevertheless
+ * there might be a need that we may want to do some stream operations
+ * such as closing of tracks, in future. For that purpose, it is written
+ * this way.
+ *
+ */
+
+import type { Session } from 'sip.js';
+import type { MediaStreamFactory, SessionDescriptionHandler } from 'sip.js/lib/platform/web';
+import { defaultMediaStreamFactory } from 'sip.js/lib/platform/web';
+
+import Stream from './Stream';
+
+export default class LocalStream extends Stream {
+	static async requestNewStream(constraints: MediaStreamConstraints, session: Session): Promise<MediaStream | undefined> {
+		const factory: MediaStreamFactory = defaultMediaStreamFactory();
+		if (session?.sessionDescriptionHandler) {
+			return factory(constraints, session.sessionDescriptionHandler as SessionDescriptionHandler);
+		}
+	}
+
+	static async replaceTrack(peerConnection: RTCPeerConnection, newStream: MediaStream, mediaType?: 'audio' | 'video'): Promise<boolean> {
+		const senders = peerConnection.getSenders();
+		if (!senders) {
+			return false;
+		}
+		/**
+		 * This will be called when media device change happens.
+		 * This needs to be called externally when the device change occurs.
+		 * This function first acquires the new stream based on device selection
+		 * and then replaces the track in the sender of existing stream by track acquired
+		 * by caputuring new stream.
+		 *
+		 * Notes:
+		 * Each sender represents a track in the RTCPeerConnection.
+		 * Peer connection will contain single track for
+		 * each, audio, video and data.
+		 * Furthermore, We are assuming that
+		 * newly captured stream will have a single track for each media type. i.e
+		 * audio video and data. But this assumption may not be true atleast in theory. One may see multiple
+		 * audio track in the captured stream or multiple senders for same kind in the peer connection
+		 * If/When such situation arrives in future, we may need to revisit the track replacement logic.
+		 * */
+
+		switch (mediaType) {
+			case 'audio': {
+				let replaced = false;
+				const newTracks = newStream.getAudioTracks();
+				if (!newTracks) {
+					console.warn('replaceTrack() : No audio tracks in the stream. Returning');
+					return false;
+				}
+				for (let i = 0; i < senders?.length; i++) {
+					if (senders[i].track?.kind === 'audio') {
+						senders[i].replaceTrack(newTracks[0]);
+						replaced = true;
+						break;
+					}
+				}
+				return replaced;
+			}
+			case 'video': {
+				let replaced = false;
+				const newTracks = newStream.getVideoTracks();
+				if (!newTracks) {
+					console.warn('replaceTrack() : No video tracks in the stream. Returning');
+					return false;
+				}
+				for (let i = 0; i < senders?.length; i++) {
+					if (senders[i].track?.kind === 'video') {
+						senders[i].replaceTrack(newTracks[0]);
+						replaced = true;
+						break;
+					}
+				}
+				return replaced;
+			}
+			default: {
+				let replaced = false;
+				const newTracks = newStream.getVideoTracks();
+				if (!newTracks) {
+					console.warn('replaceTrack() : No tracks in the stream. Returning');
+					return false;
+				}
+				for (let i = 0; i < senders?.length; i++) {
+					for (let j = 0; j < newTracks.length; j++) {
+						if (senders[i].track?.kind === newTracks[j].kind) {
+							senders[i].replaceTrack(newTracks[j]);
+							replaced = true;
+							break;
+						}
+					}
+				}
+				return replaced;
+			}
+		}
+	}
+}
diff --git a/packages/ui-voip/src/lib/RemoteStream.ts b/packages/ui-voip/src/lib/RemoteStream.ts
new file mode 100644
index 000000000000..b870cb2bae4f
--- /dev/null
+++ b/packages/ui-voip/src/lib/RemoteStream.ts
@@ -0,0 +1,75 @@
+/**
+ * This class is used for local stream manipulation.
+ * @remarks
+ * This class wraps up browser media stream and HTMLMedia element
+ * and takes care of rendering the media on a given element.
+ * This provides enough abstraction so that the higher level
+ * classes do not need to know about the browser specificities for
+ * media.
+ * This will also provide stream related functionalities such as
+ * mixing of 2 streams in to 2, adding/removing tracks, getting a track information
+ * detecting voice energy etc. Which will be implemented as when needed
+ */
+
+import Stream from './Stream';
+
+export default class RemoteStream extends Stream {
+	private renderingMediaElement: HTMLMediaElement | undefined;
+
+	constructor(mediaStream: MediaStream) {
+		super(mediaStream);
+	}
+
+	/**
+	 * Called for initializing the class
+	 * @remarks
+	 */
+
+	init(rmElement: HTMLMediaElement): void {
+		if (this.renderingMediaElement) {
+			// Someone already has setup the stream and initializing it once again
+			// Clear the existing stream object
+			this.renderingMediaElement.pause();
+			this.renderingMediaElement.srcObject = null;
+		}
+		this.renderingMediaElement = rmElement;
+	}
+
+	/**
+	 * Called for playing the stream
+	 * @remarks
+	 * Plays the stream on media element. Stream will be autoplayed and muted based on the settings.
+	 * throws and error if the play fails.
+	 */
+
+	play(autoPlay = true, muteAudio = false): void {
+		if (this.renderingMediaElement && this.mediaStream) {
+			this.renderingMediaElement.autoplay = autoPlay;
+			this.renderingMediaElement.srcObject = this.mediaStream;
+			if (autoPlay) {
+				this.renderingMediaElement.play().catch((error: Error) => {
+					throw error;
+				});
+			}
+			if (muteAudio) {
+				this.renderingMediaElement.volume = 0;
+			}
+		}
+	}
+
+	/**
+	 * Called for pausing the stream
+	 * @remarks
+	 */
+	pause(): void {
+		this.renderingMediaElement?.pause();
+	}
+
+	clear(): void {
+		super.clear();
+		if (this.renderingMediaElement) {
+			this.renderingMediaElement.pause();
+			this.renderingMediaElement.srcObject = null;
+		}
+	}
+}
diff --git a/packages/ui-voip/src/lib/Stream.ts b/packages/ui-voip/src/lib/Stream.ts
new file mode 100644
index 000000000000..8473b8558db2
--- /dev/null
+++ b/packages/ui-voip/src/lib/Stream.ts
@@ -0,0 +1,67 @@
+/**
+ * This class is used for stream manipulation.
+ * @remarks
+ * This class wraps up browser media stream and HTMLMedia element
+ * and takes care of rendering the media on a given element.
+ * This provides enough abstraction so that the higher level
+ * classes do not need to know about the browser specificities for
+ * media.
+ * This will also provide stream related functionalities such as
+ * mixing of 2 streams in to 2, adding/removing tracks, getting a track information
+ * detecting voice energy etc. Which will be implemented as when needed
+ */
+export default class Stream {
+	protected mediaStream: MediaStream | undefined;
+
+	constructor(mediaStream: MediaStream) {
+		this.mediaStream = mediaStream;
+	}
+	/**
+	 * Called for stopping the tracks in a given stream.
+	 * @remarks
+	 * All the tracks from a given stream will be stopped.
+	 */
+
+	private stopTracks(): void {
+		const tracks = this.mediaStream?.getTracks();
+		if (tracks) {
+			for (let i = 0; i < tracks?.length; i++) {
+				tracks[i].stop();
+			}
+		}
+	}
+
+	/**
+	 * Called for setting the callback when the track gets added
+	 * @remarks
+	 */
+
+	onTrackAdded(callBack: any): void {
+		this.mediaStream?.onaddtrack?.(callBack);
+	}
+
+	/**
+	 * Called for setting the callback when the track gets removed
+	 * @remarks
+	 */
+
+	onTrackRemoved(callBack: any): void {
+		this.mediaStream?.onremovetrack?.(callBack);
+	}
+
+	/**
+	 * Called for clearing the streams and media element.
+	 * @remarks
+	 * This function stops the media element play, clears the srcObject
+	 * stops all the tracks in the stream and sets media stream to undefined.
+	 * This function ususally gets called when call ends or to clear the previous stream
+	 * when the stream is switched to another stream.
+	 */
+
+	clear(): void {
+		if (this.mediaStream) {
+			this.stopTracks();
+			this.mediaStream = undefined;
+		}
+	}
+}
diff --git a/packages/ui-voip/src/lib/VoipClient.ts b/packages/ui-voip/src/lib/VoipClient.ts
new file mode 100644
index 000000000000..b96adaece968
--- /dev/null
+++ b/packages/ui-voip/src/lib/VoipClient.ts
@@ -0,0 +1,868 @@
+import type { IMediaStreamRenderer, SignalingSocketEvents, VoipEvents as CoreVoipEvents } from '@rocket.chat/core-typings';
+import { type VoIPUserConfiguration } from '@rocket.chat/core-typings';
+import { Emitter } from '@rocket.chat/emitter';
+import type { InvitationAcceptOptions, Message, Referral, Session, SessionInviteOptions } from 'sip.js';
+import { Registerer, RequestPendingError, SessionState, UserAgent, Invitation, Inviter, RegistererState, UserAgentState } from 'sip.js';
+import type { IncomingResponse, OutgoingByeRequest, URI } from 'sip.js/lib/core';
+import type { SessionDescriptionHandlerOptions } from 'sip.js/lib/platform/web';
+import { SessionDescriptionHandler } from 'sip.js/lib/platform/web';
+
+import type { ContactInfo, VoipSession } from '../definitions';
+import LocalStream from './LocalStream';
+import RemoteStream from './RemoteStream';
+
+export type VoipEvents = Omit<CoreVoipEvents, 'ringing' | 'callestablished' | 'incomingcall'> & {
+	callestablished: ContactInfo;
+	incomingcall: ContactInfo;
+	outgoingcall: ContactInfo;
+	dialer: { open: boolean };
+};
+
+type SessionError = {
+	status: number | undefined;
+	reason: string;
+	contact: ContactInfo;
+};
+
+class VoipClient extends Emitter<VoipEvents> {
+	protected registerer: Registerer | undefined;
+
+	protected session: Session | undefined;
+
+	public userAgent: UserAgent | undefined;
+
+	public networkEmitter: Emitter<SignalingSocketEvents>;
+
+	private mediaStreamRendered: IMediaStreamRenderer | undefined;
+
+	private remoteStream: RemoteStream | undefined;
+
+	private held = false;
+
+	private muted = false;
+
+	private online = true;
+
+	private error: SessionError | null = null;
+
+	private contactInfo: ContactInfo | null = null;
+
+	constructor(private readonly config: VoIPUserConfiguration, mediaRenderer?: IMediaStreamRenderer) {
+		super();
+
+		this.mediaStreamRendered = mediaRenderer;
+
+		this.networkEmitter = new Emitter<SignalingSocketEvents>();
+	}
+
+	public async init() {
+		const { authPassword, authUserName, sipRegistrarHostnameOrIP, iceServers, webSocketURI } = this.config;
+
+		const transportOptions = {
+			server: webSocketURI,
+			connectionTimeout: 100,
+			keepAliveInterval: 20,
+		};
+
+		const sdpFactoryOptions = {
+			iceGatheringTimeout: 10,
+			peerConnectionConfiguration: { iceServers },
+		};
+
+		this.userAgent = new UserAgent({
+			authorizationPassword: authPassword,
+			authorizationUsername: authUserName,
+			uri: UserAgent.makeURI(`sip:${authUserName}@${sipRegistrarHostnameOrIP}`),
+			transportOptions,
+			sessionDescriptionHandlerFactoryOptions: sdpFactoryOptions,
+			logConfiguration: false,
+			logLevel: 'error',
+			delegate: {
+				onInvite: this.onIncomingCall,
+				onRefer: this.onTransferedCall,
+				onMessage: this.onMessageReceived,
+			},
+		});
+
+		this.userAgent.transport.isConnected();
+
+		try {
+			this.registerer = new Registerer(this.userAgent);
+
+			this.userAgent.transport.onConnect = this.onUserAgentConnected;
+			this.userAgent.transport.onDisconnect = this.onUserAgentDisconnected;
+
+			await this.userAgent.start();
+
+			window.addEventListener('online', this.onNetworkRestored);
+			window.addEventListener('offline', this.onNetworkLost);
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	static async create(config: VoIPUserConfiguration, mediaRenderer?: IMediaStreamRenderer): Promise<VoipClient> {
+		const voip = new VoipClient(config, mediaRenderer);
+		await voip.init();
+		return voip;
+	}
+
+	protected initSession(session: Session): void {
+		this.session = session;
+
+		this.updateContactInfoFromSession(session);
+
+		this.session?.stateChange.addListener((state: SessionState) => {
+			if (this.session !== session) {
+				return; // if our session has changed, just return
+			}
+
+			const sessionEvents: Record<SessionState, () => void> = {
+				[SessionState.Initial]: () => undefined, // noop
+				[SessionState.Establishing]: this.onSessionStablishing,
+				[SessionState.Established]: this.onSessionStablished,
+				[SessionState.Terminating]: this.onSessionTerminated,
+				[SessionState.Terminated]: this.onSessionTerminated,
+			} as const;
+
+			const event = sessionEvents[state];
+
+			if (!event) {
+				throw new Error('Unknown session state.');
+			}
+
+			event();
+		});
+	}
+
+	public register = async (): Promise<void> => {
+		await this.registerer?.register({
+			requestDelegate: {
+				onAccept: this.onRegistrationAccepted,
+				onReject: this.onRegistrationRejected,
+			},
+		});
+	};
+
+	public unregister = async (): Promise<void> => {
+		await this.registerer?.unregister({
+			all: true,
+			requestDelegate: {
+				onAccept: this.onUnregistrationAccepted,
+				onReject: this.onUnregistrationRejected,
+			},
+		});
+	};
+
+	public call = async (calleeURI: string, mediaRenderer?: IMediaStreamRenderer): Promise<void> => {
+		if (!calleeURI) {
+			throw new Error('Invalid URI');
+		}
+
+		if (this.session) {
+			throw new Error('Session already exists');
+		}
+
+		if (!this.userAgent) {
+			throw new Error('No User Agent.');
+		}
+
+		if (mediaRenderer) {
+			this.switchMediaRenderer(mediaRenderer);
+		}
+
+		const target = this.makeURI(calleeURI);
+
+		if (!target) {
+			throw new Error(`Failed to create valid URI ${calleeURI}`);
+		}
+
+		const inviter = new Inviter(this.userAgent, target, {
+			sessionDescriptionHandlerOptions: {
+				constraints: {
+					audio: true,
+					video: false,
+				},
+			},
+		});
+
+		await this.sendInvite(inviter);
+	};
+
+	public transfer = async (calleeURI: string): Promise<void> => {
+		if (!calleeURI) {
+			throw new Error('Invalid URI');
+		}
+
+		if (!this.session) {
+			throw new Error('No active call');
+		}
+
+		if (!this.userAgent) {
+			throw new Error('No User Agent.');
+		}
+
+		const target = this.makeURI(calleeURI);
+
+		if (!target) {
+			throw new Error(`Failed to create valid URI ${calleeURI}`);
+		}
+
+		await this.session.refer(target, {
+			requestDelegate: {
+				onAccept: () => this.sendContactUpdateMessage(target),
+			},
+		});
+	};
+
+	public answer = (): Promise<void> => {
+		if (!(this.session instanceof Invitation)) {
+			throw new Error('Session not instance of Invitation.');
+		}
+
+		const invitationAcceptOptions: InvitationAcceptOptions = {
+			sessionDescriptionHandlerOptions: {
+				constraints: {
+					audio: true,
+					video: false,
+				},
+			},
+		};
+
+		return this.session.accept(invitationAcceptOptions);
+	};
+
+	public reject = (): Promise<void> => {
+		if (!this.session) {
+			return Promise.reject(new Error('No active call.'));
+		}
+
+		if (!(this.session instanceof Invitation)) {
+			return Promise.reject(new Error('Session not instance of Invitation.'));
+		}
+
+		return this.session.reject();
+	};
+
+	public endCall = async (): Promise<OutgoingByeRequest | void> => {
+		if (!this.session) {
+			return Promise.reject(new Error('No active call.'));
+		}
+
+		switch (this.session.state) {
+			case SessionState.Initial:
+			case SessionState.Establishing:
+				if (this.session instanceof Inviter) {
+					return this.session.cancel();
+				}
+
+				if (this.session instanceof Invitation) {
+					return this.session.reject();
+				}
+
+				throw new Error('Unknown session type.');
+			case SessionState.Established:
+				return this.session.bye();
+			case SessionState.Terminating:
+			case SessionState.Terminated:
+				break;
+			default:
+				throw new Error('Unknown state');
+		}
+
+		return Promise.resolve();
+	};
+
+	public setMute = async (mute: boolean): Promise<void> => {
+		if (this.muted === mute) {
+			return Promise.resolve();
+		}
+
+		if (!this.session) {
+			throw new Error('No active call.');
+		}
+
+		const { peerConnection } = this.sessionDescriptionHandler;
+
+		if (!peerConnection) {
+			throw new Error('Peer connection closed.');
+		}
+
+		try {
+			const options: SessionInviteOptions = {
+				requestDelegate: {
+					onAccept: (): void => {
+						this.muted = mute;
+						this.toggleMediaStreamTracks('sender', !this.muted);
+						this.toggleMediaStreamTracks('receiver', !this.muted);
+						this.emit('stateChanged');
+					},
+					onReject: (): void => {
+						this.toggleMediaStreamTracks('sender', !this.muted);
+						this.toggleMediaStreamTracks('receiver', !this.muted);
+						this.emit('muteerror');
+					},
+				},
+			};
+
+			await this.session.invite(options);
+
+			this.toggleMediaStreamTracks('sender', !this.muted);
+			this.toggleMediaStreamTracks('receiver', !this.muted);
+		} catch (error) {
+			if (error instanceof RequestPendingError) {
+				console.error(`[${this.session?.id}] A mute request is already in progress.`);
+			}
+
+			this.emit('muteerror');
+			throw error;
+		}
+	};
+
+	public setHold = async (hold: boolean): Promise<void> => {
+		if (this.held === hold) {
+			return Promise.resolve();
+		}
+
+		if (!this.session) {
+			throw new Error('Session not found');
+		}
+
+		const { sessionDescriptionHandler } = this;
+
+		const sessionDescriptionHandlerOptions = this.session.sessionDescriptionHandlerOptionsReInvite as SessionDescriptionHandlerOptions;
+		sessionDescriptionHandlerOptions.hold = hold;
+		this.session.sessionDescriptionHandlerOptionsReInvite = sessionDescriptionHandlerOptions;
+
+		const { peerConnection } = sessionDescriptionHandler;
+
+		if (!peerConnection) {
+			throw new Error('Peer connection closed.');
+		}
+
+		try {
+			const options: SessionInviteOptions = {
+				requestDelegate: {
+					onAccept: (): void => {
+						this.held = hold;
+
+						this.toggleMediaStreamTracks('receiver', !this.held);
+						this.toggleMediaStreamTracks('sender', !this.held);
+
+						this.held ? this.emit('hold') : this.emit('unhold');
+						this.emit('stateChanged');
+					},
+					onReject: (): void => {
+						this.toggleMediaStreamTracks('receiver', !this.held);
+						this.toggleMediaStreamTracks('sender', !this.held);
+						this.emit('holderror');
+					},
+				},
+			};
+
+			await this.session.invite(options);
+
+			this.toggleMediaStreamTracks('receiver', !hold);
+			this.toggleMediaStreamTracks('sender', !hold);
+		} catch (error: unknown) {
+			if (error instanceof RequestPendingError) {
+				console.error(`[${this.session?.id}] A hold request is already in progress.`);
+			}
+
+			this.emit('holderror');
+			throw error;
+		}
+	};
+
+	public sendDTMF = (tone: string): Promise<void> => {
+		// Validate tone
+		if (!tone || !/^[0-9A-D#*,]$/.exec(tone)) {
+			return Promise.reject(new Error('Invalid DTMF tone.'));
+		}
+
+		if (!this.session) {
+			return Promise.reject(new Error('Session does not exist.'));
+		}
+
+		const dtmf = tone;
+		const duration = 2000;
+		const body = {
+			contentDisposition: 'render',
+			contentType: 'application/dtmf-relay',
+			content: `Signal=${dtmf}\r\nDuration=${duration}`,
+		};
+		const requestOptions = { body };
+
+		return this.session.info({ requestOptions }).then(() => undefined);
+	};
+
+	private async attemptReconnection(reconnectionAttempt = 0, checkRegistration = false): Promise<void> {
+		const { connectionRetryCount } = this.config;
+
+		if (!this.userAgent) {
+			return;
+		}
+
+		if (connectionRetryCount !== -1 && reconnectionAttempt > connectionRetryCount) {
+			return;
+		}
+
+		const reconnectionDelay = Math.pow(2, reconnectionAttempt % 4);
+
+		console.error(`Attempting to reconnect with backoff due to network loss. Backoff time [${reconnectionDelay}]`);
+		setTimeout(() => {
+			this.userAgent?.reconnect().catch(() => {
+				this.attemptReconnection(++reconnectionAttempt, checkRegistration);
+			});
+		}, reconnectionDelay * 1000);
+	}
+
+	public async changeAudioInputDevice(constraints: MediaStreamConstraints): Promise<boolean> {
+		if (!this.session) {
+			console.warn('changeAudioInputDevice() : No session.');
+			return false;
+		}
+
+		const newStream = await LocalStream.requestNewStream(constraints, this.session);
+
+		if (!newStream) {
+			console.warn('changeAudioInputDevice() : Unable to get local stream.');
+			return false;
+		}
+
+		const { peerConnection } = this.sessionDescriptionHandler;
+
+		if (!peerConnection) {
+			console.warn('changeAudioInputDevice() : No peer connection.');
+			return false;
+		}
+
+		LocalStream.replaceTrack(peerConnection, newStream, 'audio');
+		return true;
+	}
+
+	public switchMediaRenderer(mediaRenderer: IMediaStreamRenderer): void {
+		if (!this.remoteStream) {
+			return;
+		}
+
+		this.mediaStreamRendered = mediaRenderer;
+		this.remoteStream.init(mediaRenderer.remoteMediaElement);
+		this.remoteStream.play();
+	}
+
+	private setContactInfo(contact: ContactInfo) {
+		this.contactInfo = contact;
+		this.emit('stateChanged');
+	}
+
+	public getContactInfo() {
+		if (this.error) {
+			return this.error.contact;
+		}
+
+		if (!(this.session instanceof Invitation) && !(this.session instanceof Inviter)) {
+			return null;
+		}
+
+		return this.contactInfo;
+	}
+
+	public getReferredBy() {
+		if (!(this.session instanceof Invitation)) {
+			return null;
+		}
+
+		const referredBy = this.session.request.getHeader('Referred-By');
+
+		if (!referredBy) {
+			return null;
+		}
+
+		const uri = UserAgent.makeURI(referredBy.slice(1, -1));
+
+		if (!uri) {
+			return null;
+		}
+
+		return {
+			id: uri.user ?? '',
+			host: uri.host,
+		};
+	}
+
+	public isRegistered(): boolean {
+		return this.registerer?.state === RegistererState.Registered;
+	}
+
+	public isReady(): boolean {
+		return this.userAgent?.state === UserAgentState.Started;
+	}
+
+	public isCaller(): boolean {
+		return this.session instanceof Inviter;
+	}
+
+	public isCallee(): boolean {
+		return this.session instanceof Invitation;
+	}
+
+	public isIncoming(): boolean {
+		return this.getSessionType() === 'INCOMING';
+	}
+
+	public isOngoing(): boolean {
+		return this.getSessionType() === 'ONGOING';
+	}
+
+	public isOutgoing(): boolean {
+		return this.getSessionType() === 'OUTGOING';
+	}
+
+	public isInCall(): boolean {
+		return this.getSessionType() !== null;
+	}
+
+	public isError(): boolean {
+		return !!this.error;
+	}
+
+	public isOnline(): boolean {
+		return this.online;
+	}
+
+	public isMuted(): boolean {
+		return this.muted;
+	}
+
+	public isHeld(): boolean {
+		return this.held;
+	}
+
+	public getError() {
+		return this.error ?? null;
+	}
+
+	public clearErrors = (): void => {
+		this.setError(null);
+	};
+
+	public getSessionType(): VoipSession['type'] | null {
+		if (this.error) {
+			return 'ERROR';
+		}
+
+		if (this.session?.state === SessionState.Established) {
+			return 'ONGOING';
+		}
+
+		if (this.session instanceof Invitation) {
+			return 'INCOMING';
+		}
+
+		if (this.session instanceof Inviter) {
+			return 'OUTGOING';
+		}
+
+		return null;
+	}
+
+	public getSession(): VoipSession | null {
+		const type = this.getSessionType();
+
+		switch (type) {
+			case 'ERROR': {
+				const { contact, ...error } = this.getError() as SessionError;
+				return {
+					type: 'ERROR',
+					error,
+					contact,
+					end: this.clearErrors,
+				};
+			}
+			case 'INCOMING':
+			case 'ONGOING':
+			case 'OUTGOING':
+				return {
+					type,
+					contact: this.getContactInfo() as ContactInfo,
+					transferedBy: this.getReferredBy(),
+					isMuted: this.isMuted(),
+					isHeld: this.isHeld(),
+					mute: this.setMute,
+					hold: this.setHold,
+					accept: this.answer,
+					end: this.endCall,
+					dtmf: this.sendDTMF,
+				};
+			default:
+				return null;
+		}
+	}
+
+	public getState() {
+		return {
+			isRegistered: this.isRegistered(),
+			isReady: this.isReady(),
+			isOnline: this.isOnline(),
+			isIncoming: this.isIncoming(),
+			isOngoing: this.isOngoing(),
+			isOutgoing: this.isOutgoing(),
+			isInCall: this.isInCall(),
+			isError: this.isError(),
+		};
+	}
+
+	public notifyDialer(value: { open: boolean }) {
+		this.emit('dialer', value);
+	}
+
+	public clear(): void {
+		this.userAgent?.stop();
+		this.registerer?.dispose();
+
+		if (this.userAgent) {
+			this.userAgent.transport.onConnect = undefined;
+			this.userAgent.transport.onDisconnect = undefined;
+			window.removeEventListener('online', this.onNetworkRestored);
+			window.removeEventListener('offline', this.onNetworkLost);
+		}
+	}
+
+	private setupRemoteMedia() {
+		const { remoteMediaStream } = this.sessionDescriptionHandler;
+
+		this.remoteStream = new RemoteStream(remoteMediaStream);
+		const mediaElement = this.mediaStreamRendered?.remoteMediaElement;
+
+		if (mediaElement) {
+			this.remoteStream.init(mediaElement);
+			this.remoteStream.play();
+		}
+	}
+
+	private makeURI(calleeURI: string): URI | undefined {
+		const hasPlusChar = calleeURI.includes('+');
+		return UserAgent.makeURI(`sip:${hasPlusChar ? '*' : ''}${calleeURI}@${this.config.sipRegistrarHostnameOrIP}`);
+	}
+
+	private toggleMediaStreamTracks(type: 'sender' | 'receiver', enable: boolean): void {
+		const { peerConnection } = this.sessionDescriptionHandler;
+
+		if (!peerConnection) {
+			throw new Error('Peer connection closed.');
+		}
+
+		const tracks = type === 'sender' ? peerConnection.getSenders() : peerConnection.getReceivers();
+
+		tracks?.forEach((sender) => {
+			if (sender.track) {
+				sender.track.enabled = enable;
+			}
+		});
+	}
+
+	private async sendInvite(inviter: Inviter): Promise<void> {
+		this.initSession(inviter);
+
+		await inviter.invite({
+			requestDelegate: {
+				onReject: this.onInviteRejected,
+			},
+		});
+
+		this.emit('stateChanged');
+	}
+
+	private updateContactInfoFromMessage(message: Message): void {
+		const contentType = message.request.getHeader('Content-Type');
+		const messageType = message.request.getHeader('X-Message-Type');
+
+		try {
+			if (messageType !== 'contactUpdate' || contentType !== 'application/json') {
+				throw new Error('Failed to parse contact update message');
+			}
+
+			const data = JSON.parse(message.request.body);
+			const uri = UserAgent.makeURI(data.uri);
+
+			if (!uri) {
+				throw new Error('Failed to parse contact update message');
+			}
+
+			this.setContactInfo({
+				id: uri.user ?? '',
+				host: uri.host,
+				name: uri.user,
+			});
+		} catch (e) {
+			const error = e as Error;
+			console.warn(error.message);
+		}
+	}
+
+	private updateContactInfoFromSession(session: Session) {
+		if (!session) {
+			return;
+		}
+
+		const { remoteIdentity } = session;
+
+		this.setContactInfo({
+			id: remoteIdentity.uri.user ?? '',
+			name: remoteIdentity.displayName,
+			host: remoteIdentity.uri.host,
+		});
+	}
+
+	private sendContactUpdateMessage(contactURI: URI) {
+		if (!this.session) {
+			return;
+		}
+
+		this.session.message({
+			requestOptions: {
+				extraHeaders: ['X-Message-Type: contactUpdate'],
+				body: {
+					contentDisposition: 'render',
+					contentType: 'application/json',
+					content: JSON.stringify({ uri: contactURI.toString() }),
+				},
+			},
+		});
+	}
+
+	private get sessionDescriptionHandler(): SessionDescriptionHandler {
+		if (!this.session) {
+			throw new Error('No active call.');
+		}
+
+		const { sessionDescriptionHandler } = this.session;
+
+		if (!(sessionDescriptionHandler instanceof SessionDescriptionHandler)) {
+			throw new Error("Session's session description handler not instance of SessionDescriptionHandler.");
+		}
+
+		return sessionDescriptionHandler;
+	}
+
+	private setError(error: SessionError | null) {
+		this.error = error;
+		this.emit('stateChanged');
+	}
+
+	private onUserAgentConnected = (): void => {
+		this.networkEmitter.emit('connected');
+		this.emit('stateChanged');
+	};
+
+	private onUserAgentDisconnected = (error: any): void => {
+		this.networkEmitter.emit('disconnected');
+		this.emit('stateChanged');
+
+		if (error) {
+			this.networkEmitter.emit('connectionerror', error);
+			this.attemptReconnection();
+		}
+	};
+
+	private onRegistrationAccepted = (): void => {
+		this.emit('registered');
+		this.emit('stateChanged');
+	};
+
+	private onRegistrationRejected = (error: any): void => {
+		this.emit('registrationerror', error);
+	};
+
+	private onUnregistrationAccepted = (): void => {
+		this.emit('unregistered');
+		this.emit('stateChanged');
+	};
+
+	private onUnregistrationRejected = (error: any): void => {
+		this.emit('unregistrationerror', error);
+	};
+
+	private onIncomingCall = async (invitation: Invitation): Promise<void> => {
+		if (!this.isRegistered() || this.session) {
+			await invitation.reject();
+			return;
+		}
+
+		this.initSession(invitation);
+
+		this.emit('incomingcall', this.getContactInfo() as ContactInfo);
+		this.emit('stateChanged');
+	};
+
+	private onTransferedCall = async (referral: Referral) => {
+		await referral.accept();
+		this.sendInvite(referral.makeInviter());
+	};
+
+	private onMessageReceived = async (message: Message): Promise<void> => {
+		if (!message.request.hasHeader('X-Message-Type')) {
+			message.reject();
+			return;
+		}
+
+		const messageType = message.request.getHeader('X-Message-Type');
+
+		switch (messageType) {
+			case 'contactUpdate':
+				return this.updateContactInfoFromMessage(message);
+		}
+	};
+
+	private onSessionStablishing = (): void => {
+		this.emit('outgoingcall', this.getContactInfo() as ContactInfo);
+	};
+
+	private onSessionStablished = (): void => {
+		this.setupRemoteMedia();
+		this.emit('callestablished', this.getContactInfo() as ContactInfo);
+		this.emit('stateChanged');
+	};
+
+	private onInviteRejected = (response: IncomingResponse): void => {
+		const { statusCode, reasonPhrase, to } = response.message;
+
+		if (!reasonPhrase || statusCode === 487) {
+			return;
+		}
+
+		this.setError({
+			status: statusCode,
+			reason: reasonPhrase,
+			contact: { id: to.uri.user ?? '', host: to.uri.host },
+		});
+
+		this.emit('callfailed', response.message.reasonPhrase || 'unknown');
+	};
+
+	private onSessionTerminated = (): void => {
+		this.session = undefined;
+		this.muted = false;
+		this.held = false;
+		this.remoteStream?.clear();
+		this.emit('callterminated');
+		this.emit('stateChanged');
+	};
+
+	private onNetworkRestored = (): void => {
+		this.online = true;
+		this.networkEmitter.emit('localnetworkonline');
+		this.emit('stateChanged');
+
+		this.attemptReconnection();
+	};
+
+	private onNetworkLost = (): void => {
+		this.online = false;
+		this.networkEmitter.emit('localnetworkoffline');
+		this.emit('stateChanged');
+	};
+}
+
+export default VoipClient;
diff --git a/packages/ui-voip/src/providers/VoipProvider.tsx b/packages/ui-voip/src/providers/VoipProvider.tsx
new file mode 100644
index 000000000000..18903c769ea3
--- /dev/null
+++ b/packages/ui-voip/src/providers/VoipProvider.tsx
@@ -0,0 +1,177 @@
+import { useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import type { Device } from '@rocket.chat/ui-contexts';
+import { useSetInputMediaDevice, useSetOutputMediaDevice, useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import type { ReactNode } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
+import { createPortal } from 'react-dom';
+import { useTranslation } from 'react-i18next';
+
+import VoipPopup from '../components/VoipPopup';
+import VoipPopupPortal from '../components/VoipPopupPortal';
+import type { VoipContextValue } from '../contexts/VoipContext';
+import { VoipContext } from '../contexts/VoipContext';
+import { useVoipClient } from '../hooks/useVoipClient';
+import { useVoipSounds } from '../hooks/useVoipSounds';
+
+const VoipProvider = ({ children }: { children: ReactNode }) => {
+	// Settings
+	const isVoipEnabled = useSetting<boolean>('VoIP_TeamCollab_Enabled') || false;
+	const [isLocalRegistered, setStorageRegistered] = useLocalStorage('voip-registered', true);
+
+	// Hooks
+	const voipSounds = useVoipSounds();
+	const { voipClient, error } = useVoipClient({ autoRegister: isLocalRegistered });
+	const setOutputMediaDevice = useSetOutputMediaDevice();
+	const setInputMediaDevice = useSetInputMediaDevice();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const { t } = useTranslation();
+
+	// Refs
+	const remoteAudioMediaRef = useRef<HTMLAudioElement>(null);
+
+	useEffect(() => {
+		if (!voipClient) {
+			return;
+		}
+
+		const onCallEstablished = async (): Promise<void> => {
+			voipSounds.stopAll();
+
+			if (!voipClient) {
+				return;
+			}
+
+			if (voipClient.isCallee()) {
+				return;
+			}
+
+			if (!remoteAudioMediaRef.current) {
+				return;
+			}
+
+			voipClient.switchMediaRenderer({ remoteMediaElement: remoteAudioMediaRef.current });
+		};
+
+		const onNetworkDisconnected = (): void => {
+			if (voipClient.isOngoing()) {
+				voipClient.endCall();
+			}
+		};
+
+		const onOutgoingCallRinging = (): void => {
+			voipSounds.play('outbound-call-ringing');
+		};
+
+		const onIncomingCallRinging = (): void => {
+			voipSounds.play('telephone');
+		};
+
+		const onCallTerminated = (): void => {
+			voipSounds.play('call-ended', false);
+			voipSounds.stopAll();
+		};
+
+		const onRegistrationError = () => {
+			setStorageRegistered(false);
+			dispatchToastMessage({ type: 'error', message: t('Voice_calling_registration_failed') });
+		};
+
+		const onRegistered = () => {
+			setStorageRegistered(true);
+		};
+
+		const onUnregister = () => {
+			setStorageRegistered(false);
+		};
+
+		voipClient.on('incomingcall', onIncomingCallRinging);
+		voipClient.on('outgoingcall', onOutgoingCallRinging);
+		voipClient.on('callestablished', onCallEstablished);
+		voipClient.on('callterminated', onCallTerminated);
+		voipClient.on('registrationerror', onRegistrationError);
+		voipClient.on('registered', onRegistered);
+		voipClient.on('unregistered', onUnregister);
+		voipClient.networkEmitter.on('disconnected', onNetworkDisconnected);
+		voipClient.networkEmitter.on('connectionerror', onNetworkDisconnected);
+		voipClient.networkEmitter.on('localnetworkoffline', onNetworkDisconnected);
+
+		return (): void => {
+			voipClient.off('incomingcall', onIncomingCallRinging);
+			voipClient.off('outgoingcall', onOutgoingCallRinging);
+			voipClient.off('callestablished', onCallEstablished);
+			voipClient.off('callterminated', onCallTerminated);
+			voipClient.off('registrationerror', onRegistrationError);
+			voipClient.off('registered', onRegistered);
+			voipClient.off('unregistered', onUnregister);
+			voipClient.networkEmitter.off('disconnected', onNetworkDisconnected);
+			voipClient.networkEmitter.off('connectionerror', onNetworkDisconnected);
+			voipClient.networkEmitter.off('localnetworkoffline', onNetworkDisconnected);
+		};
+	}, [dispatchToastMessage, setStorageRegistered, t, voipClient, voipSounds]);
+
+	const changeAudioOutputDevice = useEffectEvent(async (selectedAudioDevice: Device): Promise<void> => {
+		if (!remoteAudioMediaRef.current) {
+			return;
+		}
+
+		setOutputMediaDevice({ outputDevice: selectedAudioDevice, HTMLAudioElement: remoteAudioMediaRef.current });
+	});
+
+	const changeAudioInputDevice = useEffectEvent(async (selectedAudioDevice: Device): Promise<void> => {
+		if (!voipClient) {
+			return;
+		}
+
+		await voipClient.changeAudioInputDevice({ audio: { deviceId: { exact: selectedAudioDevice.id } } });
+		setInputMediaDevice(selectedAudioDevice);
+	});
+
+	const contextValue = useMemo<VoipContextValue>(() => {
+		if (!isVoipEnabled) {
+			return {
+				isEnabled: false,
+				voipClient: null,
+				error: null,
+				changeAudioInputDevice,
+				changeAudioOutputDevice,
+			};
+		}
+
+		if (!voipClient || error) {
+			return {
+				isEnabled: true,
+				voipClient: null,
+				error,
+				changeAudioInputDevice,
+				changeAudioOutputDevice,
+			};
+		}
+
+		return {
+			isEnabled: true,
+			voipClient,
+
+			changeAudioInputDevice,
+			changeAudioOutputDevice,
+		};
+	}, [voipClient, isVoipEnabled, error, changeAudioInputDevice, changeAudioOutputDevice]);
+
+	return (
+		<VoipContext.Provider value={contextValue}>
+			{children}
+			{contextValue.isEnabled &&
+				createPortal(
+					<audio ref={remoteAudioMediaRef}>
+						<track kind='captions' />
+					</audio>,
+					document.body,
+				)}
+
+			<VoipPopupPortal>
+				<VoipPopup position={{ bottom: 132, right: 24 }} />
+			</VoipPopupPortal>
+		</VoipContext.Provider>
+	);
+};
+
+export default VoipProvider;
diff --git a/packages/ui-voip/src/tests/mocks/index.ts b/packages/ui-voip/src/tests/mocks/index.ts
new file mode 100644
index 000000000000..926b5408174e
--- /dev/null
+++ b/packages/ui-voip/src/tests/mocks/index.ts
@@ -0,0 +1,75 @@
+import { OperationParams } from '@rocket.chat/rest-typings';
+
+import { VoipErrorSession, VoipIncomingSession, VoipOngoingSession, VoipOutgoingSession, VoipSession } from '../../definitions';
+
+export const createMockFreeSwitchExtensionDetails = (
+	overwrite?: Partial<OperationParams<'GET', '/v1/voip-freeswitch.extension.getDetails'>>,
+) => ({
+	extension: '1000',
+	context: 'default',
+	domain: '',
+	groups: ['default'],
+	status: 'REGISTERED' as const,
+	contact: '',
+	callGroup: 'techsupport',
+	callerName: 'Extension 1000',
+	callerNumber: '1000',
+	userId: '',
+	name: 'Administrator',
+	username: 'administrator',
+	success: true,
+	...overwrite,
+});
+
+export const createMockVoipSession = (partial?: Partial<VoipSession>): VoipSession => ({
+	type: 'INCOMING',
+	contact: { name: 'test', id: '1000', host: '' },
+	transferedBy: null,
+	isMuted: false,
+	isHeld: false,
+	error: { status: -1, reason: '' },
+	accept: jest.fn(),
+	end: jest.fn(),
+	mute: jest.fn(),
+	hold: jest.fn(),
+	dtmf: jest.fn(),
+	...partial,
+});
+
+export const createMockVoipOngoingSession = (partial?: Partial<VoipOngoingSession>): VoipOngoingSession => ({
+	type: 'ONGOING',
+	contact: { name: 'test', id: '1000', host: '' },
+	transferedBy: null,
+	isMuted: false,
+	isHeld: false,
+	accept: jest.fn(),
+	end: jest.fn(),
+	mute: jest.fn(),
+	hold: jest.fn(),
+	dtmf: jest.fn(),
+	...partial,
+});
+
+export const createMockVoipErrorSession = (partial?: Partial<VoipErrorSession>): VoipErrorSession => ({
+	type: 'ERROR',
+	contact: { name: 'test', id: '1000', host: '' },
+	error: { status: -1, reason: '' },
+	end: jest.fn(),
+	...partial,
+});
+
+export const createMockVoipOutgoingSession = (partial?: Partial<VoipOutgoingSession>): VoipOutgoingSession => ({
+	type: 'OUTGOING',
+	contact: { name: 'test', id: '1000', host: '' },
+	end: jest.fn(),
+	...partial,
+});
+
+export const createMockVoipIncomingSession = (partial?: Partial<VoipIncomingSession>): VoipIncomingSession => ({
+	type: 'INCOMING',
+	contact: { name: 'test', id: '1000', host: '' },
+	transferedBy: null,
+	end: jest.fn(),
+	accept: jest.fn(),
+	...partial,
+});
diff --git a/packages/ui-voip/src/tests/utils/replaceReactAriaIds.ts b/packages/ui-voip/src/tests/utils/replaceReactAriaIds.ts
new file mode 100644
index 000000000000..3963f26e049a
--- /dev/null
+++ b/packages/ui-voip/src/tests/utils/replaceReactAriaIds.ts
@@ -0,0 +1,22 @@
+export const replaceReactAriaIds = (container: HTMLElement): HTMLElement => {
+	const selectors = ['id', 'for', 'aria-labelledby'];
+	const ariaSelector = (el: string) => `[${el}^="react-aria"]`;
+	const regexp = /react-aria\d+-\d+/g;
+	const staticId = 'static-id';
+
+	const attributesMap: Record<string, string> = {};
+
+	container.querySelectorAll(selectors.map(ariaSelector).join(', ')).forEach((el, index) => {
+		selectors.forEach((selector) => {
+			const attr = el.getAttribute(selector);
+
+			if (attr?.match(regexp)) {
+				const newAttr = attributesMap[attr] || `${staticId}-${index}`;
+				el.setAttribute(selector, newAttr);
+				attributesMap[attr] = newAttr;
+			}
+		});
+	});
+
+	return container;
+};
diff --git a/packages/ui-voip/src/utils/parseStringToIceServers/index.ts b/packages/ui-voip/src/utils/parseStringToIceServers/index.ts
new file mode 100644
index 000000000000..290b8eb5f148
--- /dev/null
+++ b/packages/ui-voip/src/utils/parseStringToIceServers/index.ts
@@ -0,0 +1 @@
+export * from './parseStringToIceServers';
diff --git a/packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.spec.ts b/packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.spec.ts
new file mode 100644
index 000000000000..b24564bfb165
--- /dev/null
+++ b/packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.spec.ts
@@ -0,0 +1,50 @@
+import { parseStringToIceServers, parseStringToIceServer } from './parseStringToIceServers';
+
+describe('parseStringToIceServers', () => {
+	describe('parseStringToIceServers', () => {
+		it('should parse return an empty array if string is empty', () => {
+			const result = parseStringToIceServers('');
+			expect(result).toEqual([]);
+		});
+		it('should parse string to servers', () => {
+			const servers = parseStringToIceServers('stun:stun.l.google.com:19302');
+			expect(servers.length).toEqual(1);
+			expect(servers[0].urls).toEqual('stun:stun.l.google.com:19302');
+			expect(servers[0].username).toEqual(undefined);
+			expect(servers[0].credential).toEqual(undefined);
+		});
+
+		it('should parse string to servers with multiple urls', () => {
+			const servers = parseStringToIceServers('stun:stun.l.google.com:19302,stun:stun1.l.google.com:19302');
+			expect(servers.length).toEqual(2);
+			expect(servers[0].urls).toEqual('stun:stun.l.google.com:19302');
+			expect(servers[1].urls).toEqual('stun:stun1.l.google.com:19302');
+		});
+
+		it('should parse string to servers with multiple urls, with password and username', () => {
+			const servers = parseStringToIceServers(
+				'stun:stun.l.google.com:19302,stun:stun1.l.google.com:19302,team%40rocket.chat:demo@turn:numb.viagenie.ca:3478',
+			);
+			expect(servers.length).toEqual(3);
+			expect(servers[0].urls).toEqual('stun:stun.l.google.com:19302');
+			expect(servers[1].urls).toEqual('stun:stun1.l.google.com:19302');
+			expect(servers[2].urls).toEqual('turn:numb.viagenie.ca:3478');
+			expect(servers[2].username).toEqual('team@rocket.chat');
+			expect(servers[2].credential).toEqual('demo');
+		});
+	});
+
+	describe('parseStringToIceServer', () => {
+		it('should parse string to server', () => {
+			const server = parseStringToIceServer('stun:stun.l.google.com:19302');
+			expect(server.urls).toEqual('stun:stun.l.google.com:19302');
+		});
+
+		it('should parse string to server with username and password', () => {
+			const server = parseStringToIceServer('team%40rocket.chat:demo@turn:numb.viagenie.ca:3478');
+			expect(server.urls).toEqual('turn:numb.viagenie.ca:3478');
+			expect(server.username).toEqual('team@rocket.chat');
+			expect(server.credential).toEqual('demo');
+		});
+	});
+});
diff --git a/packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.ts b/packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.ts
new file mode 100644
index 000000000000..ffef45a6401c
--- /dev/null
+++ b/packages/ui-voip/src/utils/parseStringToIceServers/parseStringToIceServers.ts
@@ -0,0 +1,21 @@
+import type { IceServer } from '../../definitions/IceServer';
+
+export const parseStringToIceServer = (server: string): IceServer => {
+	const credentials = server.trim().split('@');
+	const urls = credentials.pop() as string;
+	const [username, credential] = credentials.length === 1 ? credentials[0].split(':') : [];
+
+	return {
+		urls,
+		...(username &&
+			credential && {
+				username: decodeURIComponent(username),
+				credential: decodeURIComponent(credential),
+			}),
+	};
+};
+
+export const parseStringToIceServers = (string: string): IceServer[] => {
+	const lines = string.trim() ? string.split(',') : [];
+	return lines.map((line) => parseStringToIceServer(line));
+};
diff --git a/packages/ui-voip/src/utils/setPreciseInterval.ts b/packages/ui-voip/src/utils/setPreciseInterval.ts
new file mode 100644
index 000000000000..0f3fb12e3004
--- /dev/null
+++ b/packages/ui-voip/src/utils/setPreciseInterval.ts
@@ -0,0 +1,25 @@
+export const setPreciseInterval = (fn: () => void, duration: number) => {
+	let timeoutId: Parameters<typeof clearTimeout>[0] = undefined;
+	const startTime = new Date().getTime();
+
+	const run = () => {
+		fn();
+		const currentTime = new Date().getTime();
+
+		let nextTick = duration - (currentTime - startTime);
+
+		if (nextTick < 0) {
+			nextTick = 0;
+		}
+
+		timeoutId = setTimeout(() => {
+			run();
+		}, nextTick);
+	};
+
+	run();
+
+	return () => {
+		timeoutId && clearTimeout(timeoutId);
+	};
+};
diff --git a/packages/ui-voip/tsconfig.build.json b/packages/ui-voip/tsconfig.build.json
new file mode 100644
index 000000000000..36dbe9c166ff
--- /dev/null
+++ b/packages/ui-voip/tsconfig.build.json
@@ -0,0 +1,5 @@
+{
+	"extends": "./tsconfig.json",
+	"include": ["./src/**/*"],
+	"exclude": ["./src/**/*.stories.tsx", "./src/**/*.spec.ts", "./src/**/*.spec.tsx"]
+}
diff --git a/packages/ui-voip/tsconfig.json b/packages/ui-voip/tsconfig.json
new file mode 100644
index 000000000000..aa282e17ea6c
--- /dev/null
+++ b/packages/ui-voip/tsconfig.json
@@ -0,0 +1,8 @@
+{
+	"extends": "../../tsconfig.base.client.json",
+	"compilerOptions": {
+		"rootDirs": ["./src", "./"],
+		"outDir": "./dist"
+	},
+	"include": ["./src/**/*", "./jest.config.ts"],
+}
diff --git a/yarn.lock b/yarn.lock
index 3ee9382dfd86..c0ff720594cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9020,6 +9020,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rocket.chat/freeswitch@workspace:^, @rocket.chat/freeswitch@workspace:packages/freeswitch":
+  version: 0.0.0-use.local
+  resolution: "@rocket.chat/freeswitch@workspace:packages/freeswitch"
+  dependencies:
+    "@rocket.chat/core-typings": "workspace:^"
+    "@rocket.chat/jest-presets": "workspace:~"
+    "@rocket.chat/logger": "workspace:^"
+    "@rocket.chat/tools": "workspace:^"
+    "@types/jest": ~29.5.12
+    esl: "github:pierre-lehnen-rc/esl"
+    eslint: ~8.45.0
+    jest: ~29.7.0
+    typescript: ~5.3.3
+  languageName: unknown
+  linkType: soft
+
 "@rocket.chat/fuselage-hooks@npm:^0.33.1":
   version: 0.33.1
   resolution: "@rocket.chat/fuselage-hooks@npm:0.33.1"
@@ -9542,6 +9558,7 @@ __metadata:
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
+    "@rocket.chat/freeswitch": "workspace:^"
     "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
@@ -9588,6 +9605,7 @@ __metadata:
     "@rocket.chat/ui-kit": "workspace:~"
     "@rocket.chat/ui-theming": "workspace:^"
     "@rocket.chat/ui-video-conf": "workspace:^"
+    "@rocket.chat/ui-voip": "workspace:^"
     "@rocket.chat/web-ui-registration": "workspace:^"
     "@settlin/spacebars-loader": ^1.0.9
     "@slack/bolt": ^3.14.0
@@ -9729,6 +9747,7 @@ __metadata:
     emoji-toolkit: ^7.0.1
     emojione: ^4.5.0
     emojione-assets: ^4.5.0
+    esl: "github:pierre-lehnen-rc/esl"
     eslint: ~8.45.0
     eslint-config-prettier: ~8.8.0
     eslint-plugin-anti-trojan-source: ~1.1.1
@@ -10681,6 +10700,63 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@rocket.chat/ui-voip@workspace:^, @rocket.chat/ui-voip@workspace:packages/ui-voip":
+  version: 0.0.0-use.local
+  resolution: "@rocket.chat/ui-voip@workspace:packages/ui-voip"
+  dependencies:
+    "@babel/core": ~7.22.20
+    "@faker-js/faker": ~8.0.2
+    "@rocket.chat/css-in-js": ~0.31.25
+    "@rocket.chat/emitter": ~0.31.25
+    "@rocket.chat/eslint-config": "workspace:^"
+    "@rocket.chat/fuselage": ^0.59.1
+    "@rocket.chat/fuselage-hooks": ^0.33.1
+    "@rocket.chat/icons": ~0.38.0
+    "@rocket.chat/jest-presets": "workspace:~"
+    "@rocket.chat/mock-providers": "workspace:~"
+    "@rocket.chat/styled": ~0.31.25
+    "@rocket.chat/ui-avatar": "workspace:^"
+    "@rocket.chat/ui-client": "workspace:^"
+    "@rocket.chat/ui-contexts": "workspace:^"
+    "@storybook/addon-a11y": ^6.5.16
+    "@storybook/addon-actions": ~6.5.16
+    "@storybook/addon-docs": ~6.5.16
+    "@storybook/addon-essentials": ~6.5.16
+    "@storybook/builder-webpack4": ~6.5.16
+    "@storybook/manager-webpack4": ~6.5.16
+    "@storybook/react": ~6.5.16
+    "@storybook/testing-library": ~0.0.13
+    "@storybook/testing-react": ~1.3.0
+    "@tanstack/react-query": ^4.16.1
+    "@testing-library/react": ~16.0.1
+    "@testing-library/user-event": ~14.5.2
+    "@types/jest": ~29.5.12
+    "@types/jest-axe": ~3.5.9
+    eslint: ~8.45.0
+    eslint-plugin-react: ~7.32.2
+    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-storybook: ~0.6.15
+    jest: ~29.7.0
+    jest-axe: ~9.0.0
+    react-docgen-typescript-plugin: ~1.0.8
+    react-i18next: ~15.0.1
+    sip.js: ^0.20.1
+    typescript: ~5.5.4
+  peerDependencies:
+    "@rocket.chat/css-in-js": "*"
+    "@rocket.chat/fuselage": "*"
+    "@rocket.chat/fuselage-hooks": "*"
+    "@rocket.chat/icons": "*"
+    "@rocket.chat/styled": "*"
+    "@rocket.chat/ui-avatar": "*"
+    "@rocket.chat/ui-client": "*"
+    "@rocket.chat/ui-contexts": "*"
+    react: ^17.0.2
+    react-aria: ~3.23.1
+    react-dom: ^17.0.2
+  languageName: unknown
+  linkType: soft
+
 "@rocket.chat/uikit-playground@workspace:apps/uikit-playground":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/uikit-playground@workspace:apps/uikit-playground"
@@ -14014,7 +14090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:~29.5.13":
+"@types/jest@npm:~29.5.12, @types/jest@npm:~29.5.13":
   version: 29.5.13
   resolution: "@types/jest@npm:29.5.13"
   dependencies:
@@ -23169,6 +23245,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esl@github:pierre-lehnen-rc/esl":
+  version: 11.1.1
+  resolution: "esl@https://github.com/pierre-lehnen-rc/esl.git#commit=22f2167a4acaa129d214592cfb0d46a419d08663"
+  checksum: 1e24a130650d916980ba3d332bc3fbac90a78ec9b13db7f7300318de3094e178d5c851c4b1c36d99c8a8ea800279ca07137d6a0c6335168cec01870cf61d820c
+  languageName: node
+  linkType: hard
+
 "eslint-config-prettier@npm:~8.8.0":
   version: 8.8.0
   resolution: "eslint-config-prettier@npm:8.8.0"
@@ -23316,7 +23399,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.2":
+"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.0, eslint-plugin-react-hooks@npm:~4.6.2":
   version: 4.6.2
   resolution: "eslint-plugin-react-hooks@npm:4.6.2"
   peerDependencies:
@@ -42200,6 +42283,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:~5.3.3":
+  version: 5.3.3
+  resolution: "typescript@npm:5.3.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
+  languageName: node
+  linkType: hard
+
 "typescript@npm:~5.5.4":
   version: 5.5.4
   resolution: "typescript@npm:5.5.4"
@@ -42220,6 +42313,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@~5.3.3#~builtin<compat/typescript>":
+  version: 5.3.3
+  resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=85af82"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@~5.5.4#~builtin<compat/typescript>":
   version: 5.5.4
   resolution: "typescript@patch:typescript@npm%3A5.5.4#~builtin<compat/typescript>::version=5.5.4&hash=85af82"

From e0c23cbafabab528d51cc2268b097bb94ded5015 Mon Sep 17 00:00:00 2001
From: Jean Brito <jeanfbrito@gmail.com>
Date: Tue, 1 Oct 2024 15:32:29 -0300
Subject: [PATCH 135/170] regression: Second sidebar processing loop (#33411)

---
 .../views/room/Sidepanel/hooks/useTeamslistChildren.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
index de7645ae2a30..1722a42c7a4d 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -44,17 +44,19 @@ export const useTeamsListChildrenUpdate = (
 		keepPreviousData: true,
 	});
 
+	const { refetch } = result;
+
 	useEffect(() => {
 		const liveQueryHandle = ChatRoom.find(query).observe({
-			added: () => queueMicrotask(() => result.refetch({ exact: false })),
-			changed: () => queueMicrotask(() => result.refetch({ exact: false })),
-			removed: () => queueMicrotask(() => result.refetch({ exact: false })),
+			added: () => queueMicrotask(() => refetch({ exact: false })),
+			changed: () => queueMicrotask(() => refetch({ exact: false })),
+			removed: () => queueMicrotask(() => refetch({ exact: false })),
 		});
 
 		return () => {
 			liveQueryHandle.stop();
 		};
-	}, [query, result]);
+	}, [query, refetch]);
 
 	return result;
 };

From 7cddedea750fcd6bee2b72ce0c91ac02f3af1fa2 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 1 Oct 2024 21:18:10 +0000
Subject: [PATCH 136/170] Release 6.13.0-rc.4

[no ci]
---
 .changeset/bump-patch-1727817480079.md        |  5 +++
 .changeset/pre.json                           |  1 +
 apps/meteor/CHANGELOG.md                      | 32 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 ++++++++
 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          | 13 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++++
 ee/packages/license/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/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/web-ui-registration/CHANGELOG.md     |  9 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 22 ++++++-------
 69 files changed, 426 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/bump-patch-1727817480079.md

diff --git a/.changeset/bump-patch-1727817480079.md b/.changeset/bump-patch-1727817480079.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727817480079.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 20c16763e622..9443e3133ba3 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -68,6 +68,7 @@
     "bump-patch-1727212585363",
     "bump-patch-1727392133102",
     "bump-patch-1727482167703",
+    "bump-patch-1727817480079",
     "cyan-ladybugs-thank",
     "dirty-stingrays-beg",
     "dry-taxis-cry",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 6b83bda6054c..cf76490b54bf 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.4
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/license@0.2.8-rc.4
+  - @rocket.chat/omnichannel-services@0.3.5-rc.4
+  - @rocket.chat/pdf-worker@0.2.5-rc.4
+  - @rocket.chat/presence@0.2.8-rc.4
+  - @rocket.chat/api-client@0.2.8-rc.4
+  - @rocket.chat/apps@0.1.8-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/cron@0.1.8-rc.4
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.4
+  - @rocket.chat/gazzodown@11.0.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.4
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  - @rocket.chat/ui-client@11.0.0-rc.4
+  - @rocket.chat/ui-video-conf@11.0.0-rc.4
+  - @rocket.chat/web-ui-registration@11.0.0-rc.4
+  - @rocket.chat/instance-status@0.1.8-rc.4
+  </details>
+
 ## 6.13.0-rc.3
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 2638289a7e61..2683a6c6f4f7 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.3"
+	"version": "6.13.0-rc.4"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 827c10e1d445..e4658dc6378e 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.5-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 1.3.5-rc.3
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 641da5b884ad..0102e0c28a32 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": "1.3.5-rc.3",
+	"version": "1.3.5-rc.4",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 0baa3db6a38a..2f2f2cd98f55 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": "6.13.0-rc.3",
+	"version": "6.13.0-rc.4",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 306fc9afdf93..49e28d7bc936 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  </details>
+
 ## 0.5.0-rc.3
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 648126b560c4..ddde811ffb8a 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.5.0-rc.3",
+  "version": "0.5.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 116a510a4f44..580ea8aab022 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.4.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 9e603e087a66..2b09adc4c4ec 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.8-rc.3",
+	"version": "0.4.8-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 31047524470c..375969b2a993 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.4.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index a4bc1a9cf0fe..0f94ef6a07ef 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.8-rc.3",
+	"version": "0.4.8-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 2e04e1aa0f14..a7e332575820 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  - @rocket.chat/instance-status@0.1.8-rc.4
+  </details>
+
 ## 0.3.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 93b0372bb7dd..43c5cab7f7c0 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.8-rc.3",
+	"version": "0.3.8-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 d3f4dfa68587..b297fd10c55e 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.5-rc.4
+  - @rocket.chat/pdf-worker@0.2.5-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.4.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 371d24504b62..903333eb777e 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.8-rc.3",
+	"version": "0.4.8-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 412874a02978..9cbf34aea377 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/presence@0.2.8-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.4.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index ec15e085102b..cd2365e56584 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.8-rc.3",
+	"version": "0.4.8-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 640fba5932c5..cd41255a830d 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.5-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.4.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index f663bcd5b297..38b6e613caee 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.8-rc.3",
+	"version": "0.4.8-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 9dab02aed6bb..9110b52ade7f 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.4.8-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 0c6fb660e591..519b35593d7d 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.8-rc.3",
+	"version": "0.4.8-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 b1482e1a3387..2a69abea7135 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
 ## 0.2.8-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 07444d692732..8fe80088bd0a 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.3",
+	"version": "0.2.8-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index ec2c98f2c332..31bf4346a6a7 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.5-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/pdf-worker@0.2.5-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.3.5-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 25ce429750c1..58d4dd86fddb 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.5-rc.3",
+	"version": "0.3.5-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 4363690a3238..b0ba2668531b 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.5-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
 ## 0.2.5-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 72d5e16eaa7e..1cd4de12e37c 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.5-rc.3",
+	"version": "0.2.5-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 369cf0716f6b..180415865b58 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.2.8-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 20804792be28..f8f50f919452 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.3",
+	"version": "0.2.8-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 23b2bcfb07eb..929f06f9bdfb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.3",
+	"version": "6.13.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 261a242ddf10..51b4f6667704 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  </details>
+
 ## 0.2.8-rc.3
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index a3ebf1f274bd..c51e3e95e4c2 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.8-rc.3",
+	"version": "0.2.8-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 deeb3fed3dfa..bafa26eb519b 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  </details>
+
 ## 0.1.8-rc.3
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 3998174291ec..75c68d524814 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.3",
+	"version": "0.1.8-rc.4",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index a5aa06bf749b..bf9d2ed3244a 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.7.0-rc.3
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index bb682ffc127d..27ff5be048bc 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.0-rc.3",
+	"version": "0.7.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 2c0ee7493b42..7843d9163048 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.4
+
 ## 6.13.0-rc.3
 
 ## 6.13.0-rc.2
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index f597cf5a132a..573ae5c76e45 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.3",
+	"version": "6.13.0-rc.4",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 43e9077d1ebd..4ba3e3b461ad 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.1.8-rc.3
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 47c1809434e7..6b59feb623ca 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.3",
+	"version": "0.1.8-rc.4",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index dfda57db8a84..1a38b232c16f 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/api-client@0.2.8-rc.4
+  </details>
+
 ## 0.3.8-rc.3
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 6bb6533f325a..7265a9e89fb1 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.8-rc.3",
+	"version": "0.3.8-rc.4",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 8b78d09cdb82..9ecf45c03de5 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/gazzodown@11.0.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  - @rocket.chat/ui-video-conf@11.0.0-rc.4
+  </details>
+
 ## 11.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 7c3ecba078d8..105de73a1405 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.3",
+  "version": "11.0.0-rc.4",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.3",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.3",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.4",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.4",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.3",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.4",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 7d6cc7dde6f1..2a644d7495b1 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-client@11.0.0-rc.4
+  </details>
+
 ## 11.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 13b13452d76d..02d6b7a60ed0 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.3",
+	"version": "11.0.0-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -74,8 +74,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "11.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
+		"@rocket.chat/ui-client": "11.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index a58ce56ef3df..06b6bf354c0d 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
 ## 0.1.8-rc.3
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 57b8e54472c7..9939cd163a00 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.8-rc.3",
+	"version": "0.1.8-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index cb505262626b..4d462e49b336 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.4
+  </details>
+
 ## 1.20.0-rc.3
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 6531068a6a31..0afdfd4148a2 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.3",
+	"version": "1.20.0-rc.4",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 63ee6102f6e6..10b4d506916c 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
 ## 0.8.0-rc.3
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 67a78bfa4439..ee578e70b3b8 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.3",
+	"version": "0.8.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 f736fb401d4c..74015492c3ff 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  </details>
+
 ## 0.3.0-rc.3
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 46de1a5061bf..89abcb278754 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.3",
+	"version": "0.3.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 3e71153b8283..76d87c09d59d 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
 ## 6.13.0-rc.3
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 57f96bb7bab6..03dbdf5b7495 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.3",
+	"version": "6.13.0-rc.4",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 20a2ba3e7dc7..b58faf335afa 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  </details>
+
 ## 7.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 562e4ab340b5..e6f72ab504f1 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.3",
+	"version": "7.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index fe6f08d8d8ed..695a1b648601 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  </details>
+
 ## 11.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 26c5010575ff..ab9558c76dd5 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "11.0.0-rc.3",
+	"version": "11.0.0-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 27d3df55a0bd..4370d589ad1a 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/ddp-client@0.3.8-rc.4
+  </details>
+
 ## 11.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index ea74a40cdfd1..ac81462795e1 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.3",
+	"version": "11.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 cfa6b630850d..5b91cc0be1bc 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  </details>
+
 ## 11.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index c26239a5c7d6..16fffecad438 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": "11.0.0-rc.3",
+	"version": "11.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 68121f9acbb3..a038ef75b340 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  </details>
+
 ## 11.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ab576a36bc02..3d12a4ee5b30 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": "11.0.0-rc.3",
+	"version": "11.0.0-rc.4",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index ffd59bc6be3a..d0aa7cb4fdee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8959,10 +8959,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.2
+    "@rocket.chat/ui-avatar": 7.0.0-rc.3
+    "@rocket.chat/ui-contexts": 11.0.0-rc.3
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.2
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.3
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9049,8 +9049,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 11.0.0-rc.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.2
+    "@rocket.chat/ui-client": 11.0.0-rc.3
+    "@rocket.chat/ui-contexts": 11.0.0-rc.3
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10257,7 +10257,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.2
+    "@rocket.chat/ui-contexts": 11.0.0-rc.3
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10308,8 +10308,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.2
+    "@rocket.chat/ui-avatar": 7.0.0-rc.3
+    "@rocket.chat/ui-contexts": 11.0.0-rc.3
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10478,8 +10478,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.2
+    "@rocket.chat/ui-avatar": 7.0.0-rc.3
+    "@rocket.chat/ui-contexts": 11.0.0-rc.3
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10567,7 +10567,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.2
+    "@rocket.chat/ui-contexts": 11.0.0-rc.3
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 6208dff4f96090ef1fd8d82ecdcfef7589330f9b Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 1 Oct 2024 21:45:36 -0300
Subject: [PATCH 137/170] feat: search contacts endpoint (#33043)

---
 .../app/livechat/server/api/v1/contact.ts     | 29 +++++-
 .../app/livechat/server/lib/Contacts.ts       | 29 +++++-
 .../server/models/raw/LivechatContacts.ts     | 47 +++++++++-
 .../tests/end-to-end/api/livechat/contacts.ts | 94 +++++++++++++++++++
 .../src/models/ILivechatContactsModel.ts      |  4 +-
 packages/rest-typings/src/v1/omnichannel.ts   | 29 ++++++
 6 files changed, 226 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index ec0559d5f191..0de3181708fb 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -3,13 +3,15 @@ import {
 	isPOSTOmnichannelContactsProps,
 	isPOSTUpdateOmnichannelContactsProps,
 	isGETOmnichannelContactsProps,
+	isGETOmnichannelContactsSearchProps,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { API } from '../../../../api/server';
-import { Contacts, createContact, updateContact, isSingleContactEnabled } from '../../lib/Contacts';
+import { getPaginationItems } from '../../../../api/server/helpers/getPaginationItems';
+import { Contacts, createContact, updateContact, getContacts, isSingleContactEnabled } from '../../lib/Contacts';
 
 API.v1.addRoute(
 	'omnichannel/contact',
@@ -50,7 +52,10 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'omnichannel/contact.search',
-	{ authRequired: true, permissionsRequired: ['view-l-room'] },
+	{
+		authRequired: true,
+		permissionsRequired: ['view-l-room'],
+	},
 	{
 		async get() {
 			check(this.queryParams, {
@@ -136,3 +141,23 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'omnichannel/contacts.search',
+	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsSearchProps },
+	{
+		async get() {
+			if (!isSingleContactEnabled()) {
+				return API.v1.unauthorized();
+			}
+
+			const { searchText } = this.queryParams;
+			const { offset, count } = await getPaginationItems(this.queryParams);
+			const { sort } = await this.parseJsonQuery();
+
+			const result = await getContacts({ searchText, offset, count, sort });
+
+			return API.v1.success(result);
+		},
+	},
+);
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index e9be40aa942b..8d440e297249 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -17,9 +17,10 @@ import {
 	Subscriptions,
 	LivechatContacts,
 } from '@rocket.chat/models';
+import type { PaginatedResult } from '@rocket.chat/rest-typings';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
-import type { MatchKeysAndValues, OnlyFieldsOfType } from 'mongodb';
+import type { MatchKeysAndValues, OnlyFieldsOfType, Sort } from 'mongodb';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { trim } from '../../../../lib/utils/stringUtils';
@@ -63,6 +64,13 @@ type UpdateContactParams = {
 	channels?: ILivechatContactChannel[];
 };
 
+type GetContactsParams = {
+	searchText?: string;
+	count: number;
+	offset: number;
+	sort: Sort;
+};
+
 export const Contacts = {
 	async registerContact({
 		token,
@@ -225,6 +233,25 @@ export async function updateContact(params: UpdateContactParams): Promise<ILivec
 	return updatedContact;
 }
 
+export async function getContacts(params: GetContactsParams): Promise<PaginatedResult<{ contacts: ILivechatContact[] }>> {
+	const { searchText, count, offset, sort } = params;
+
+	const { cursor, totalCount } = LivechatContacts.findPaginatedContacts(searchText, {
+		limit: count,
+		skip: offset,
+		sort: sort ?? { name: 1 },
+	});
+
+	const [contacts, total] = await Promise.all([cursor.toArray(), totalCount]);
+
+	return {
+		contacts,
+		count,
+		offset,
+		total,
+	};
+}
+
 async function getAllowedCustomFields(): Promise<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[]> {
 	return LivechatCustomField.findByScope(
 		'visitor',
diff --git a/apps/meteor/server/models/raw/LivechatContacts.ts b/apps/meteor/server/models/raw/LivechatContacts.ts
index 88dac1b9f5c1..1036205d1539 100644
--- a/apps/meteor/server/models/raw/LivechatContacts.ts
+++ b/apps/meteor/server/models/raw/LivechatContacts.ts
@@ -1,6 +1,7 @@
 import type { ILivechatContact, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
-import type { ILivechatContactsModel } from '@rocket.chat/model-typings';
-import type { Collection, Db } from 'mongodb';
+import type { FindPaginated, ILivechatContactsModel } from '@rocket.chat/model-typings';
+import { escapeRegExp } from '@rocket.chat/string-helpers';
+import type { Collection, Db, RootFilterOperators, Filter, FindOptions, FindCursor, IndexDescription } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -9,6 +10,29 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 		super(db, 'livechat_contact', trash);
 	}
 
+	protected modelIndexes(): IndexDescription[] {
+		return [
+			{
+				key: { name: 1 },
+				unique: false,
+				name: 'name_insensitive',
+				collation: { locale: 'en', strength: 2, caseLevel: false },
+			},
+			{
+				key: { emails: 1 },
+				unique: false,
+				name: 'emails_insensitive',
+				partialFilterExpression: { emails: { $exists: true } },
+				collation: { locale: 'en', strength: 2, caseLevel: false },
+			},
+			{
+				key: { phones: 1 },
+				partialFilterExpression: { phones: { $exists: true } },
+				unique: false,
+			},
+		];
+	}
+
 	async updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact> {
 		const updatedValue = await this.findOneAndUpdate(
 			{ _id: contactId },
@@ -17,4 +41,23 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 		);
 		return updatedValue.value as ILivechatContact;
 	}
+
+	findPaginatedContacts(searchText?: string, options?: FindOptions): FindPaginated<FindCursor<ILivechatContact>> {
+		const searchRegex = escapeRegExp(searchText || '');
+		const match: Filter<ILivechatContact & RootFilterOperators<ILivechatContact>> = {
+			$or: [
+				{ name: { $regex: searchRegex, $options: 'i' } },
+				{ emails: { $regex: searchRegex, $options: 'i' } },
+				{ phones: { $regex: searchRegex, $options: 'i' } },
+			],
+		};
+
+		return this.findPaginated(
+			{ ...match },
+			{
+				allowDiskUse: true,
+				...options,
+			},
+		);
+	}
 }
diff --git a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
index c33ef255c25c..cfbae3db4872 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -632,4 +632,98 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body.errorType).to.be.equal('invalid-params');
 		});
 	});
+
+	describe('[GET] omnichannel/contacts.search', () => {
+		let contactId: string;
+		const contact = {
+			name: faker.person.fullName(),
+			emails: [faker.internet.email().toLowerCase()],
+			phones: [faker.phone.number()],
+			contactManager: agentUser?._id,
+		};
+
+		before(async () => {
+			await updatePermission('view-livechat-contact', ['admin']);
+			const { body } = await request.post(api('omnichannel/contacts')).set(credentials).send(contact);
+			contactId = body.contactId;
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should be able to list all contacts', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials);
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts.length).to.be.greaterThan(0);
+			expect(res.body.count).to.be.an('number');
+			expect(res.body.total).to.be.an('number');
+			expect(res.body.offset).to.be.an('number');
+		});
+
+		it('should return only contacts that match the searchText using email', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials).query({ searchText: contact.emails[0] });
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts.length).to.be.equal(1);
+			expect(res.body.total).to.be.equal(1);
+			expect(res.body.contacts[0]._id).to.be.equal(contactId);
+			expect(res.body.contacts[0].name).to.be.equal(contact.name);
+			expect(res.body.contacts[0].emails[0]).to.be.equal(contact.emails[0]);
+		});
+
+		it('should return only contacts that match the searchText using phone number', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials).query({ searchText: contact.phones[0] });
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts.length).to.be.equal(1);
+			expect(res.body.total).to.be.equal(1);
+			expect(res.body.contacts[0]._id).to.be.equal(contactId);
+			expect(res.body.contacts[0].name).to.be.equal(contact.name);
+			expect(res.body.contacts[0].emails[0]).to.be.equal(contact.emails[0]);
+		});
+
+		it('should return only contacts that match the searchText using name', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials).query({ searchText: contact.name });
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts.length).to.be.equal(1);
+			expect(res.body.total).to.be.equal(1);
+			expect(res.body.contacts[0]._id).to.be.equal(contactId);
+			expect(res.body.contacts[0].name).to.be.equal(contact.name);
+			expect(res.body.contacts[0].emails[0]).to.be.equal(contact.emails[0]);
+		});
+
+		it('should return an empty list if no contacts exist', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials).query({ searchText: 'invalid' });
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts.length).to.be.equal(0);
+			expect(res.body.total).to.be.equal(0);
+		});
+
+		describe('Permissions', () => {
+			before(async () => {
+				await removePermissionFromAllRoles('view-livechat-contact');
+			});
+
+			after(async () => {
+				await restorePermissionToRoles('view-livechat-contact');
+			});
+
+			it("should return an error if user doesn't have 'view-livechat-contact' permission", async () => {
+				const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials);
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+			});
+		});
+	});
 });
diff --git a/packages/model-typings/src/models/ILivechatContactsModel.ts b/packages/model-typings/src/models/ILivechatContactsModel.ts
index f94216830884..9f7bc23e7c2c 100644
--- a/packages/model-typings/src/models/ILivechatContactsModel.ts
+++ b/packages/model-typings/src/models/ILivechatContactsModel.ts
@@ -1,7 +1,9 @@
 import type { ILivechatContact } from '@rocket.chat/core-typings';
+import type { FindCursor, FindOptions } from 'mongodb';
 
-import type { IBaseModel } from './IBaseModel';
+import type { FindPaginated, IBaseModel } from './IBaseModel';
 
 export interface ILivechatContactsModel extends IBaseModel<ILivechatContact> {
 	updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact>;
+	findPaginatedContacts(searchText?: string, options?: FindOptions): FindPaginated<FindCursor<ILivechatContact>>;
 }
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index b494e5d0e5a9..09c021a4e7d9 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -1329,6 +1329,32 @@ const GETOmnichannelContactsSchema = {
 
 export const isGETOmnichannelContactsProps = ajv.compile<GETOmnichannelContactsProps>(GETOmnichannelContactsSchema);
 
+type GETOmnichannelContactsSearchProps = PaginatedRequest<{
+	searchText: string;
+}>;
+
+const GETOmnichannelContactsSearchSchema = {
+	type: 'object',
+	properties: {
+		count: {
+			type: 'number',
+		},
+		offset: {
+			type: 'number',
+		},
+		sort: {
+			type: 'string',
+		},
+		searchText: {
+			type: 'string',
+		},
+	},
+	required: [],
+	additionalProperties: false,
+};
+
+export const isGETOmnichannelContactsSearchProps = ajv.compile<GETOmnichannelContactsSearchProps>(GETOmnichannelContactsSearchSchema);
+
 type GETOmnichannelContactProps = { contactId: string };
 
 const GETOmnichannelContactSchema = {
@@ -3776,6 +3802,9 @@ export type OmnichannelEndpoints = {
 	'/v1/omnichannel/contacts.get': {
 		GET: (params: GETOmnichannelContactsProps) => { contact: ILivechatContact | null };
 	};
+	'/v1/omnichannel/contacts.search': {
+		GET: (params: GETOmnichannelContactsSearchProps) => PaginatedResult<{ contacts: ILivechatContact[] }>;
+	};
 
 	'/v1/omnichannel/contact.search': {
 		GET: (params: GETOmnichannelContactSearchProps) => { contact: ILivechatVisitor | null };

From e63cf28fe03e00054e936886508791e038b8cdbb Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 2 Oct 2024 10:10:15 -0300
Subject: [PATCH 138/170] regression: Broken translation in `UrlChangeModal` at
 setup wizard (#33415)

---
 apps/meteor/client/components/UrlChangeModal.tsx     | 12 ++++++++++--
 .../client/views/setupWizard/SetupWizardRoute.tsx    |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index dbc152c7fbff..617bff939fbe 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -13,7 +13,8 @@ type UrlChangeModalProps = {
 };
 
 const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const { t } = useTranslation('core');
+
 	return (
 		<GenericModal variant='warning' title={t('Warning')} onConfirm={onConfirm} onClose={onClose} onCancel={onClose} confirmText={t('Yes')}>
 			<Box
@@ -26,7 +27,14 @@ const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeMo
 					}),
 				}}
 			/>
-			<p dangerouslySetInnerHTML={{ __html: t('Do_you_want_to_change_to_s_question', currentUrl) }} />
+			<p
+				dangerouslySetInnerHTML={{
+					__html: t('Do_you_want_to_change_to_s_question', {
+						postProcess: 'sprintf',
+						sprintf: [currentUrl],
+					}),
+				}}
+			/>
 		</GenericModal>
 	);
 };
diff --git a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
index 2bc6c4f8a820..91e47b4a590f 100644
--- a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+++ b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
@@ -23,6 +23,7 @@ export const SetupWizardRoute = (): ReactElement | 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>

From cfb6912ec30db6b815f3ca4b2c091f18789adac9 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 2 Oct 2024 12:10:33 -0300
Subject: [PATCH 139/170] chore: removed symbolic link to apps engine (#33406)

---
 apps/meteor/imports/client/@rocket.chat/apps-engine | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 apps/meteor/imports/client/@rocket.chat/apps-engine

diff --git a/apps/meteor/imports/client/@rocket.chat/apps-engine b/apps/meteor/imports/client/@rocket.chat/apps-engine
deleted file mode 120000
index 9a368c3d1407..000000000000
--- a/apps/meteor/imports/client/@rocket.chat/apps-engine
+++ /dev/null
@@ -1 +0,0 @@
-../../../node_modules/@rocket.chat/apps-engine
\ No newline at end of file

From f2844aa27b2b0061d6ae7b0ba5f9a0ef8a27031e Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Wed, 2 Oct 2024 13:16:01 -0300
Subject: [PATCH 140/170] test: fake timers to prevent voip unit tests failing
 sporadically (#33414)

---
 .../VoipPopup/views/VoipOngoingView.spec.tsx  | 112 ++++++++++--------
 1 file changed, 61 insertions(+), 51 deletions(-)

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 afe589ff4a51..397e369d6bbb 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
@@ -8,55 +8,65 @@ const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension
 
 const ongoingSession = createMockVoipOngoingSession();
 
-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();
-});
-
-it('should display on hold and muted', () => {
-	ongoingSession.isMuted = true;
-	ongoingSession.isHeld = true;
-
-	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
-
-	expect(screen.getByText('On_Hold')).toBeInTheDocument();
-	expect(screen.getByText('Muted')).toBeInTheDocument();
-
-	ongoingSession.isMuted = false;
-	ongoingSession.isHeld = false;
-});
-
-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();
-});
-
-it('should properly interact with the voice call session', () => {
-	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
-
-	screen.getByRole('button', { name: 'Turn_off_microphone' }).click();
-	expect(ongoingSession.mute).toHaveBeenCalled();
-
-	screen.getByRole('button', { name: 'Hold' }).click();
-	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');
-
-	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
-	expect(ongoingSession.end).toHaveBeenCalled();
+describe('VoipOngoingView', () => {
+	beforeEach(() => {
+		jest.useFakeTimers();
+	});
+
+	afterEach(() => {
+		jest.clearAllTimers();
+	});
+
+	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();
+	});
+
+	it('should display on hold and muted', () => {
+		ongoingSession.isMuted = true;
+		ongoingSession.isHeld = true;
+
+		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+		expect(screen.getByText('On_Hold')).toBeInTheDocument();
+		expect(screen.getByText('Muted')).toBeInTheDocument();
+
+		ongoingSession.isMuted = false;
+		ongoingSession.isHeld = false;
+	});
+
+	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();
+	});
+
+	it('should properly interact with the voice call session', () => {
+		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+
+		screen.getByRole('button', { name: 'Turn_off_microphone' }).click();
+		expect(ongoingSession.mute).toHaveBeenCalled();
+
+		screen.getByRole('button', { name: 'Hold' }).click();
+		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');
+
+		expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+		screen.getByRole('button', { name: 'End_call' }).click();
+		expect(ongoingSession.end).toHaveBeenCalled();
+	});
 });

From d6617823c0eb533ec6bd1854e35640d4cdc0be85 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 3 Oct 2024 11:18:01 -0300
Subject: [PATCH 141/170] fix: Title missing in thread list for threads
 starting with attachment in E2EE rooms (#33375)

---
 .changeset/moody-phones-admire.md             |  5 ++
 .../client/hooks/useDecryptedMessage.spec.ts  | 86 +++++++++++++++++++
 .../client/hooks/useDecryptedMessage.ts       |  8 ++
 3 files changed, 99 insertions(+)
 create mode 100644 .changeset/moody-phones-admire.md
 create mode 100644 apps/meteor/client/hooks/useDecryptedMessage.spec.ts

diff --git a/.changeset/moody-phones-admire.md b/.changeset/moody-phones-admire.md
new file mode 100644
index 000000000000..bd5e2daa1514
--- /dev/null
+++ b/.changeset/moody-phones-admire.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes title missing in thread list for threads starting with attachment in E2EE rooms
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.spec.ts b/apps/meteor/client/hooks/useDecryptedMessage.spec.ts
new file mode 100644
index 000000000000..62e77a77b096
--- /dev/null
+++ b/apps/meteor/client/hooks/useDecryptedMessage.spec.ts
@@ -0,0 +1,86 @@
+import { isE2EEMessage } from '@rocket.chat/core-typings';
+import { renderHook, waitFor } from '@testing-library/react';
+
+import { e2e } from '../../app/e2e/client/rocketchat.e2e';
+import { useDecryptedMessage } from './useDecryptedMessage';
+
+// Mock the dependencies
+jest.mock('@rocket.chat/core-typings', () => ({
+	isE2EEMessage: jest.fn(),
+}));
+
+jest.mock('../../app/e2e/client/rocketchat.e2e', () => ({
+	e2e: {
+		decryptMessage: jest.fn(),
+	},
+}));
+
+jest.mock('react-i18next', () => ({
+	useTranslation: () => ({
+		t: (key: string) => key,
+	}),
+}));
+
+describe('useDecryptedMessage', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return the original message for non-E2EE messages', () => {
+		(isE2EEMessage as jest.MockedFunction<typeof isE2EEMessage>).mockReturnValue(false);
+		const message = { msg: 'Hello, world!' };
+
+		const { result } = renderHook(() => useDecryptedMessage(message as any), { legacyRoot: true });
+
+		expect(result.current).toBe('Hello, world!');
+		expect(e2e.decryptMessage).not.toHaveBeenCalled();
+	});
+
+	it('should return decrypted message for E2EE messages', async () => {
+		(isE2EEMessage as jest.MockedFunction<typeof isE2EEMessage>).mockReturnValue(true);
+		(e2e.decryptMessage as jest.Mock).mockResolvedValue({ msg: 'Decrypted message' });
+		const message = { msg: 'Encrypted message' };
+		const { result } = renderHook(() => useDecryptedMessage(message as any), { legacyRoot: true });
+
+		await waitFor(() => {
+			expect(result.current).not.toBe('E2E_message_encrypted_placeholder');
+		});
+
+		expect(result.current).toBe('Decrypted message');
+		expect(e2e.decryptMessage).toHaveBeenCalledWith(message);
+	});
+
+	it('should handle E2EE messages with attachments', async () => {
+		(isE2EEMessage as jest.MockedFunction<typeof isE2EEMessage>).mockReturnValue(true);
+		(e2e.decryptMessage as jest.Mock).mockResolvedValue({
+			attachments: [{ description: 'Attachment description' }],
+		});
+		const message = { msg: 'Encrypted message with attachment' };
+
+		const { result } = renderHook(() => useDecryptedMessage(message as any), { legacyRoot: true });
+
+		await waitFor(() => {
+			expect(result.current).toBe('E2E_message_encrypted_placeholder');
+		});
+
+		expect(result.current).toBe('Attachment description');
+		expect(e2e.decryptMessage).toHaveBeenCalledWith(message);
+	});
+
+	it('should handle E2EE messages with attachments but no description', async () => {
+		(isE2EEMessage as jest.MockedFunction<typeof isE2EEMessage>).mockReturnValue(true);
+		(e2e.decryptMessage as jest.Mock).mockResolvedValue({
+			attachments: [{}],
+		});
+		const message = { msg: 'Encrypted message with attachment' };
+
+		const { result } = renderHook(() => useDecryptedMessage(message as any), { legacyRoot: true });
+
+		await waitFor(() => {
+			expect(result.current).toBe('E2E_message_encrypted_placeholder');
+		});
+
+		expect(result.current).toBe('Message_with_attachment');
+		expect(e2e.decryptMessage).toHaveBeenCalledWith(message);
+	});
+});
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.ts b/apps/meteor/client/hooks/useDecryptedMessage.ts
index aa36ba1d34fd..f98012b11f2b 100644
--- a/apps/meteor/client/hooks/useDecryptedMessage.ts
+++ b/apps/meteor/client/hooks/useDecryptedMessage.ts
@@ -19,6 +19,14 @@ export const useDecryptedMessage = (message: IMessage): string => {
 			if (decryptedMsg.msg) {
 				setDecryptedMessage(decryptedMsg.msg);
 			}
+
+			if (decryptedMsg.attachments && decryptedMsg.attachments?.length > 0) {
+				if (decryptedMsg.attachments[0].description) {
+					setDecryptedMessage(decryptedMsg.attachments[0].description);
+				} else {
+					setDecryptedMessage(t('Message_with_attachment'));
+				}
+			}
 		});
 	}, [message, t, setDecryptedMessage]);
 

From 74942f35f5bd6b7ce6b55681c2576304633f4b85 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 3 Oct 2024 17:15:22 -0300
Subject: [PATCH 142/170] regression: email subject variable interpolation
 (#33431)

---
 .../room/contextualBar/ExportMessages/ExportMessages.tsx   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index 4fbd060bef67..ae5a0ada9b52 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -24,6 +24,7 @@ export type MailExportFormValues = {
 
 const ExportMessages = () => {
 	const { t } = useTranslation();
+
 	const room = useRoom();
 
 	const { closeTab } = useRoomToolbox();
@@ -39,11 +40,13 @@ const ExportMessages = () => {
 			toUsers: [],
 			additionalEmails: '',
 			messagesCount: 0,
-			subject: t('Mail_Messages_Subject', roomName),
+			subject: t('Mail_Messages_Subject', {
+				postProcess: 'sprintf',
+				sprintf: [roomName],
+			}),
 			format: 'html',
 		},
 	});
-
 	const exportOptions = useMemo<SelectOption[]>(
 		() => [
 			['email', t('Send_via_email')],

From eca2906fb7c6b848c16cdbd53c2e5958d5d3a39d Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Fri, 4 Oct 2024 01:42:33 -0300
Subject: [PATCH 143/170] regression: i18n missing fallback language (#33440)

---
 apps/meteor/server/lib/i18n.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/meteor/server/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts
index 28ba6cec6dad..0eb7dd6a5387 100644
--- a/apps/meteor/server/lib/i18n.ts
+++ b/apps/meteor/server/lib/i18n.ts
@@ -4,6 +4,7 @@ import { availableTranslationNamespaces, defaultTranslationNamespace, extractTra
 
 void i18n.init({
 	lng: 'en',
+	fallbackLng: 'en',
 	defaultNS: defaultTranslationNamespace,
 	ns: availableTranslationNamespaces,
 	nsSeparator: '.',

From 3ed122d3aa7a8eab2fba133ecc8e28c171faa17f Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 4 Oct 2024 07:13:53 +0000
Subject: [PATCH 144/170] Release 6.13.0-rc.5

[no ci]
---
 .changeset/bump-patch-1728026023781.md        |  5 +++
 .changeset/pre.json                           |  1 +
 apps/meteor/CHANGELOG.md                      | 32 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 ++++++++
 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          | 13 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++++
 ee/packages/license/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/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/web-ui-registration/CHANGELOG.md     |  9 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 22 ++++++-------
 69 files changed, 426 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/bump-patch-1728026023781.md

diff --git a/.changeset/bump-patch-1728026023781.md b/.changeset/bump-patch-1728026023781.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1728026023781.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 9443e3133ba3..b0813cf26004 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -69,6 +69,7 @@
     "bump-patch-1727392133102",
     "bump-patch-1727482167703",
     "bump-patch-1727817480079",
+    "bump-patch-1728026023781",
     "cyan-ladybugs-thank",
     "dirty-stingrays-beg",
     "dry-taxis-cry",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index cf76490b54bf..e4084ca3bf3b 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.5
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/license@0.2.8-rc.5
+  - @rocket.chat/omnichannel-services@0.3.5-rc.5
+  - @rocket.chat/pdf-worker@0.2.5-rc.5
+  - @rocket.chat/presence@0.2.8-rc.5
+  - @rocket.chat/api-client@0.2.8-rc.5
+  - @rocket.chat/apps@0.1.8-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/cron@0.1.8-rc.5
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.5
+  - @rocket.chat/gazzodown@11.0.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.5
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  - @rocket.chat/ui-client@11.0.0-rc.5
+  - @rocket.chat/ui-video-conf@11.0.0-rc.5
+  - @rocket.chat/web-ui-registration@11.0.0-rc.5
+  - @rocket.chat/instance-status@0.1.8-rc.5
+  </details>
+
 ## 6.13.0-rc.4
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 2683a6c6f4f7..80eefdf542ce 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.4"
+	"version": "6.13.0-rc.5"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index e4658dc6378e..5d63d1a22f21 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.5-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 1.3.5-rc.4
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 0102e0c28a32..aafe169e405e 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": "1.3.5-rc.4",
+	"version": "1.3.5-rc.5",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 2f2f2cd98f55..bfc9b67048d2 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": "6.13.0-rc.4",
+	"version": "6.13.0-rc.5",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 49e28d7bc936..7436be0fdf42 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  </details>
+
 ## 0.5.0-rc.4
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index ddde811ffb8a..c5267ece7e39 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.5.0-rc.4",
+  "version": "0.5.0-rc.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 580ea8aab022..28a03675cdaa 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.4.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 2b09adc4c4ec..b53ddb25759c 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.8-rc.4",
+	"version": "0.4.8-rc.5",
 	"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 375969b2a993..45b4946dd3b5 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.4.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 0f94ef6a07ef..7e34f665264f 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.8-rc.4",
+	"version": "0.4.8-rc.5",
 	"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 a7e332575820..bedd82f46c3f 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  - @rocket.chat/instance-status@0.1.8-rc.5
+  </details>
+
 ## 0.3.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 43c5cab7f7c0..8258a9b9b0ab 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.8-rc.4",
+	"version": "0.3.8-rc.5",
 	"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 b297fd10c55e..ecd320289bfd 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/omnichannel-services@0.3.5-rc.5
+  - @rocket.chat/pdf-worker@0.2.5-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.4.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 903333eb777e..a7690bda908c 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.8-rc.4",
+	"version": "0.4.8-rc.5",
 	"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 9cbf34aea377..9f760be14d91 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/presence@0.2.8-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.4.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index cd2365e56584..87a598183010 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.8-rc.4",
+	"version": "0.4.8-rc.5",
 	"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 cd41255a830d..f958a1f773a0 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/omnichannel-services@0.3.5-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.4.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 38b6e613caee..5d42b0890a76 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.8-rc.4",
+	"version": "0.4.8-rc.5",
 	"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 9110b52ade7f..202d1fef99f0 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.4.8-rc.4
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 519b35593d7d..11caa15ab3c5 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.8-rc.4",
+	"version": "0.4.8-rc.5",
 	"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 2a69abea7135..f89de2990622 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
 ## 0.2.8-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 8fe80088bd0a..2c8cd80fa6b0 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.4",
+	"version": "0.2.8-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 31bf4346a6a7..dccb65ac41de 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.5-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/pdf-worker@0.2.5-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.3.5-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 58d4dd86fddb..233c0afa6d0f 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.5-rc.4",
+	"version": "0.3.5-rc.5",
 	"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 b0ba2668531b..fdde971406a8 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.5-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
 ## 0.2.5-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 1cd4de12e37c..a0be3ab2e15c 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.5-rc.4",
+	"version": "0.2.5-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 180415865b58..f8e0e7e610ed 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.2.8-rc.4
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index f8f50f919452..177e02511437 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.4",
+	"version": "0.2.8-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 929f06f9bdfb..2a8ae8bf94c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.4",
+	"version": "6.13.0-rc.5",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 51b4f6667704..2a5e321cfb9f 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  </details>
+
 ## 0.2.8-rc.4
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index c51e3e95e4c2..26f8ac1412b9 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.8-rc.4",
+	"version": "0.2.8-rc.5",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index bafa26eb519b..1df6df8d899b 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  </details>
+
 ## 0.1.8-rc.4
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 75c68d524814..e328339a7657 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.4",
+	"version": "0.1.8-rc.5",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index bf9d2ed3244a..eeb4d4f9e619 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.7.0-rc.4
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 27ff5be048bc..95865c54221d 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.0-rc.4",
+	"version": "0.7.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 7843d9163048..10573eaa8a13 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.5
+
 ## 6.13.0-rc.4
 
 ## 6.13.0-rc.3
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 573ae5c76e45..0316f96ca015 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.4",
+	"version": "6.13.0-rc.5",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 4ba3e3b461ad..e61fea6a020a 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.1.8-rc.4
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 6b59feb623ca..e0fe0d3eab72 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.4",
+	"version": "0.1.8-rc.5",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 1a38b232c16f..d1b078fdb34e 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/api-client@0.2.8-rc.5
+  </details>
+
 ## 0.3.8-rc.4
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 7265a9e89fb1..54e06de0adfd 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.8-rc.4",
+	"version": "0.3.8-rc.5",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 9ecf45c03de5..914c4b30265a 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/gazzodown@11.0.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  - @rocket.chat/ui-video-conf@11.0.0-rc.5
+  </details>
+
 ## 11.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 105de73a1405..f8af78aa67cd 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.4",
+  "version": "11.0.0-rc.5",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.4",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.4",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.5",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.5",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.4",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.5",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 2a644d7495b1..b263252b0dd1 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-client@11.0.0-rc.5
+  </details>
+
 ## 11.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 02d6b7a60ed0..b42dcbf4490b 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.4",
+	"version": "11.0.0-rc.5",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -74,8 +74,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "11.0.0-rc.4",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
+		"@rocket.chat/ui-client": "11.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 06b6bf354c0d..ba9170344cfb 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
 ## 0.1.8-rc.4
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 9939cd163a00..3d346424e7e5 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.8-rc.4",
+	"version": "0.1.8-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 4d462e49b336..b2130010cade 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.5
+  </details>
+
 ## 1.20.0-rc.4
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 0afdfd4148a2..fbeebab85ef6 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.4",
+	"version": "1.20.0-rc.5",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 10b4d506916c..547832a15011 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
 ## 0.8.0-rc.4
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index ee578e70b3b8..77e4cf9df99d 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.4",
+	"version": "0.8.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 74015492c3ff..4f350d794f26 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  </details>
+
 ## 0.3.0-rc.4
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 89abcb278754..58fe25511bc3 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.4",
+	"version": "0.3.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 76d87c09d59d..8e6d5052d369 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
 ## 6.13.0-rc.4
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 03dbdf5b7495..de880dcd0666 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.4",
+	"version": "6.13.0-rc.5",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index b58faf335afa..28a432e0dfcf 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  </details>
+
 ## 7.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index e6f72ab504f1..9d1bf3e5ae76 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.4",
+	"version": "7.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 695a1b648601..f855fe63a07b 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  </details>
+
 ## 11.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index ab9558c76dd5..32998ff327b8 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "11.0.0-rc.4",
+	"version": "11.0.0-rc.5",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.4",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 4370d589ad1a..a4931587e914 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/ddp-client@0.3.8-rc.5
+  </details>
+
 ## 11.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index ac81462795e1..3ac4edf6354f 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.4",
+	"version": "11.0.0-rc.5",
 	"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 5b91cc0be1bc..7e4ba938550e 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  </details>
+
 ## 11.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 16fffecad438..921500c38c15 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": "11.0.0-rc.4",
+	"version": "11.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.4",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index a038ef75b340..4898ac9a8c20 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  </details>
+
 ## 11.0.0-rc.4
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 3d12a4ee5b30..46fc94aa8da9 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": "11.0.0-rc.4",
+	"version": "11.0.0-rc.5",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index d0aa7cb4fdee..ec6141a47d2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8959,10 +8959,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.3
-    "@rocket.chat/ui-contexts": 11.0.0-rc.3
+    "@rocket.chat/ui-avatar": 7.0.0-rc.4
+    "@rocket.chat/ui-contexts": 11.0.0-rc.4
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.3
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.4
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9049,8 +9049,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 11.0.0-rc.3
-    "@rocket.chat/ui-contexts": 11.0.0-rc.3
+    "@rocket.chat/ui-client": 11.0.0-rc.4
+    "@rocket.chat/ui-contexts": 11.0.0-rc.4
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10257,7 +10257,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.3
+    "@rocket.chat/ui-contexts": 11.0.0-rc.4
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10308,8 +10308,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.3
-    "@rocket.chat/ui-contexts": 11.0.0-rc.3
+    "@rocket.chat/ui-avatar": 7.0.0-rc.4
+    "@rocket.chat/ui-contexts": 11.0.0-rc.4
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10478,8 +10478,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.3
-    "@rocket.chat/ui-contexts": 11.0.0-rc.3
+    "@rocket.chat/ui-avatar": 7.0.0-rc.4
+    "@rocket.chat/ui-contexts": 11.0.0-rc.4
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10567,7 +10567,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.3
+    "@rocket.chat/ui-contexts": 11.0.0-rc.4
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 34879cc23de3dc91c79223a418f2b69b3025f00e Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Mon, 7 Oct 2024 15:30:10 -0300
Subject: [PATCH 145/170] feat: page warning before leave/reload while a call
 is ongoing (#33404)

---
 .../ui-voip/src/providers/VoipProvider.tsx    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/ui-voip/src/providers/VoipProvider.tsx b/packages/ui-voip/src/providers/VoipProvider.tsx
index 18903c769ea3..a4f25bc700a1 100644
--- a/packages/ui-voip/src/providers/VoipProvider.tsx
+++ b/packages/ui-voip/src/providers/VoipProvider.tsx
@@ -34,22 +34,18 @@ const VoipProvider = ({ children }: { children: ReactNode }) => {
 			return;
 		}
 
+		const onBeforeUnload = (event: BeforeUnloadEvent) => {
+			event.preventDefault();
+			event.returnValue = true;
+		};
+
 		const onCallEstablished = async (): Promise<void> => {
 			voipSounds.stopAll();
+			window.addEventListener('beforeunload', onBeforeUnload);
 
-			if (!voipClient) {
-				return;
-			}
-
-			if (voipClient.isCallee()) {
-				return;
+			if (voipClient.isCallee() && remoteAudioMediaRef.current) {
+				voipClient.switchMediaRenderer({ remoteMediaElement: remoteAudioMediaRef.current });
 			}
-
-			if (!remoteAudioMediaRef.current) {
-				return;
-			}
-
-			voipClient.switchMediaRenderer({ remoteMediaElement: remoteAudioMediaRef.current });
 		};
 
 		const onNetworkDisconnected = (): void => {
@@ -69,6 +65,7 @@ const VoipProvider = ({ children }: { children: ReactNode }) => {
 		const onCallTerminated = (): void => {
 			voipSounds.play('call-ended', false);
 			voipSounds.stopAll();
+			window.removeEventListener('beforeunload', onBeforeUnload);
 		};
 
 		const onRegistrationError = () => {
@@ -106,6 +103,7 @@ const VoipProvider = ({ children }: { children: ReactNode }) => {
 			voipClient.networkEmitter.off('disconnected', onNetworkDisconnected);
 			voipClient.networkEmitter.off('connectionerror', onNetworkDisconnected);
 			voipClient.networkEmitter.off('localnetworkoffline', onNetworkDisconnected);
+			window.addEventListener('beforeunload', onBeforeUnload);
 		};
 	}, [dispatchToastMessage, setStorageRegistered, t, voipClient, voipSounds]);
 

From 2aa3fa2597f70fdbf3b91aa2031bccb70b844f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:54:01 -0300
Subject: [PATCH 146/170] regression: add `GenericMenu` missing props (#33492)

---
 packages/ui-client/src/components/GenericMenu/GenericMenu.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index 920c4aa43502..cc5434aec1e6 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -64,6 +64,8 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 					icon={icon}
 					title={i18n.exists(title) ? t(title) : title}
 					onAction={onAction || handleAction}
+					className={className}
+					button={button}
 					{...(disabledKeys && { disabledKeys })}
 					{...props}
 				>

From b5ca81c536b5dc50e37d12370d33f0cbc30b9c83 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Tue, 8 Oct 2024 13:59:19 -0300
Subject: [PATCH 147/170] feat: added beta disclaimer to voip settings (#33463)

---
 apps/meteor/ee/server/settings/voip.ts    | 1 +
 packages/i18n/src/locales/en.i18n.json    | 1 +
 packages/i18n/src/locales/pt-BR.i18n.json | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/meteor/ee/server/settings/voip.ts b/apps/meteor/ee/server/settings/voip.ts
index 90d951ead3f4..e3fbb90003c6 100644
--- a/apps/meteor/ee/server/settings/voip.ts
+++ b/apps/meteor/ee/server/settings/voip.ts
@@ -12,6 +12,7 @@ export function addSettings(): Promise<void> {
 					type: 'boolean',
 					public: true,
 					invalidValue: false,
+					alert: 'VoIP_TeamCollab_Beta_Alert',
 				});
 
 				await this.add('VoIP_TeamCollab_FreeSwitch_Host', '', {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index ba7ed6ec627a..d77854e2e146 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -6010,6 +6010,7 @@
   "VoIP_TeamCollab_FreeSwitch_Password": "FreeSwitch Password",
   "VoIP_TeamCollab_FreeSwitch_Timeout": "FreeSwitch Request Timeout",
   "VoIP_TeamCollab_FreeSwitch_WebSocket_Path": "WebSocket Path",
+  "VoIP_TeamCollab_Beta_Alert": "This feature is currently in Beta, please report any issues to Rocket.Chat support",
   "VoIP_Toggle": "Enable/Disable VoIP",
   "Chat_opened_by_visitor": "Chat opened by the visitor",
   "Wait_activation_warning": "Before you can login, your account must be manually activated by an administrator.",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index cf06ddc01a89..a68473eadb93 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -4800,6 +4800,7 @@
   "VoIP_JWT_Secret_description": "Isso permite que você defina uma chave secreta para compartilhar detalhes da extensão do servidor para o cliente como JWT, em vez de texto simples. Se você não configurar isso, os detalhes do registro da extensão serão enviados como texto simples.",
   "Voip_is_disabled": "VoIP está desabilitado",
   "Voip_is_disabled_description": "Para ver a lista de extensões é necessário ativar o VoIP, faça isso na aba Configurações.",
+  "VoIP_TeamCollab_Beta_Alert": "Este recurso está atualmente em Beta, por favor, reporte quaisquer problemas ao suporte da Rocket.Chat.",
   "VoIP_Toggle": "Habilitar/Desabilitar VoIP",
   "Chat_opened_by_visitor": "Conversa aberta pelo visitante",
   "Wait_activation_warning": "Antes que você possa fazer o login, sua conta deve ser manualmente ativada por um administrador.",

From af202c7a629ddd85c19b330f429f8d1dbdb71a93 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 8 Oct 2024 15:26:21 -0300
Subject: [PATCH 148/170] Revert "refactor(i18n): Increase the adoption of
 `react-i18next` - Phase 1" (#33485)

---
 .../react-i18next-npm-15.0.1-0812bb73aa.patch |  99 ------
 apps/meteor/app/2fa/server/code/EmailCheck.ts |   2 +-
 .../app/2fa/server/functions/resetTOTP.ts     |   2 +-
 .../app/lib/server/methods/addUsersToRoom.ts  |  13 +-
 .../app/lib/server/methods/sendMessage.ts     |   5 +-
 .../server/startup/mentionUserNotInChannel.ts |   8 +-
 .../modals/PlaceChatOnHoldModal.tsx           |   4 +-
 .../meteor/app/livechat/server/api/v1/room.ts |   2 +-
 apps/meteor/app/livechat/server/lib/Helper.ts |   4 +-
 .../app/livechat/server/lib/QueueManager.ts   |   4 +-
 .../messageBox/AddLinkComposerActionModal.tsx |   4 +-
 apps/meteor/app/utils/lib/i18n.ts             |   3 +-
 .../NavBarItemOmniChannelCallDialPad.tsx      |   4 +-
 .../NavBarItemOmnichannelCallToggleError.tsx  |   4 +-
 ...NavBarItemOmnichannelCallToggleLoading.tsx |   4 +-
 .../NavBarItemOmnichannelCallToggleReady.tsx  |   4 +-
 .../UserMenu/UserMenu.tsx                     |   4 +-
 .../apps/gameCenter/GameCenterContainer.tsx   |   4 +-
 .../GameCenterInvitePlayersModal.tsx          |   4 +-
 .../components/ActionManagerBusyState.tsx     |   4 +-
 .../components/AutoCompleteDepartment.tsx     |   4 +-
 .../AutoCompleteDepartmentMultiple.tsx        |   4 +-
 .../components/ConfirmOwnerChangeModal.tsx    |   4 +-
 .../Contextualbar/ContextualbarBack.tsx       |   4 +-
 .../Contextualbar/ContextualbarClose.tsx      |   4 +-
 .../meteor/client/components/FilterByText.tsx |   4 +-
 .../components/FingerprintChangeModal.tsx     |   4 +-
 .../FingerprintChangeModalConfirmation.tsx    |   4 +-
 .../components/GenericError/GenericError.tsx  |   4 +-
 .../components/GenericModal/GenericModal.tsx  |   4 +-
 .../GenericNoResults/GenericNoResults.tsx     |   4 +-
 .../hooks/useItemsPerPageLabel.ts             |   4 +-
 .../hooks/useShowingResultsLabel.ts           |  10 +-
 .../GenericUpsellModal/GenericUpsellModal.tsx |   4 +-
 .../components/ImageGallery/ImageGallery.tsx  |   4 +-
 .../ImageGallery/ImageGalleryError.tsx        |   4 +-
 .../ImageGallery/ImageGalleryLoading.tsx      |   4 +-
 .../InfoPanel/RetentionPolicyCallout.tsx      |   4 +-
 apps/meteor/client/components/LocalTime.tsx   |   4 +-
 .../meteor/client/components/MarkdownText.tsx |   4 +-
 .../modals/ReturnChatQueueModal.tsx           |   4 +-
 .../Omnichannel/modals/TranscriptModal.tsx    |   4 +-
 .../client/components/Sidebar/Header.tsx      |   4 +-
 .../Sidebar/SidebarItemsAssembler.tsx         |   6 +-
 .../SidebarToggler/SidebarTogglerButton.tsx   |   4 +-
 apps/meteor/client/components/TextCopy.tsx    |   4 +-
 .../TwoFactorModal/TwoFactorPasswordModal.tsx |   4 +-
 .../TwoFactorModal/TwoFactorTotpModal.tsx     |   4 +-
 .../client/components/UrlChangeModal.tsx      |   9 +-
 .../client/components/UserCard/UserCard.tsx   |   4 +-
 .../client/components/UserInfo/UserInfo.tsx   |   4 +-
 .../meteor/client/components/WarningModal.tsx |   4 +-
 .../components/dashboards/PeriodSelector.tsx  |   6 +-
 .../client/components/dashboards/periods.ts   |  23 +-
 .../components/dashboards/usePeriodLabel.ts   |   6 +-
 .../DeviceManagementTable.tsx                 |   4 +-
 .../deviceManagement/LoggedOutBanner.tsx      |   4 +-
 .../components/message/IgnoredContent.tsx     |   4 +-
 .../components/message/MessageHeader.tsx      |   4 +-
 .../message/ReadReceiptIndicator.tsx          |   4 +-
 .../message/content/BroadcastMetrics.tsx      |   4 +-
 .../message/content/DiscussionMetrics.tsx     |   4 +-
 .../components/message/content/Reactions.tsx  |   4 +-
 .../message/content/actions/MessageAction.tsx |   4 +-
 .../structure/AttachmentDownloadBase.tsx      |   4 +-
 .../attachments/structure/image/Load.tsx      |   4 +-
 .../attachments/structure/image/Retry.tsx     |   4 +-
 .../collapsible/CollapsibleContent.tsx        |   4 +-
 .../content/location/MapViewFallback.tsx      |   4 +-
 .../message/content/location/MapViewImage.tsx |   4 +-
 .../content/reactions/ReactionTooltip.tsx     |   4 +-
 .../content/urlPreviews/OEmbedCollapsible.tsx |   4 +-
 .../message/header/MessageRoles.tsx           |   4 +-
 .../notification/MessageNotification.tsx      |   4 +-
 .../message/toolbar/MessageActionMenu.tsx     |   4 +-
 .../message/variants/SystemMessage.tsx        |   4 +-
 .../message/variants/ThreadMessagePreview.tsx |   4 +-
 .../ThreadMessagePreviewBody.tsx              |   4 +-
 .../components/voip/room/VoipRoomForeword.tsx |   4 +-
 .../client/hooks/useDecryptedMessage.ts       |   4 +-
 .../hooks/useDownloadFromServiceWorker.ts     |   3 +-
 apps/meteor/client/hooks/useFormatDuration.ts |   4 +-
 .../meteor/client/hooks/useHighlightedCode.ts |   4 +-
 .../additionalForms/BusinessHoursMultiple.tsx |   4 +-
 .../additionalForms/ContactManager.js         |   4 +-
 .../CustomFieldsAdditionalForm.tsx            |   4 +-
 .../additionalForms/DepartmentForwarding.tsx  |   4 +-
 .../additionalForms/MaxChatsPerAgent.tsx      |   4 +-
 .../MaxChatsPerAgentDisplay.tsx               |   4 +-
 .../additionalForms/PrioritiesSelect.tsx      |   4 +-
 .../CannedResponseEditWithDepartmentData.tsx  |   4 +-
 .../cannedResponses/CannedResponseFilter.tsx  |   4 +-
 .../InsertPlaceholderDropdown.tsx             |   4 +-
 .../CannedResponse/CannedResponse.tsx         |   4 +-
 .../CannedResponse/CannedResponseList.tsx     |   4 +-
 .../contextualBar/CannedResponse/Item.tsx     |   4 +-
 .../components/RoomActivityIcon/index.tsx     |   4 +-
 .../client/omnichannel/hooks/useScopeDict.ts  |   4 +-
 .../omnichannel/monitors/MonitorsPage.tsx     |   4 +-
 .../priorities/PrioritiesResetModal.tsx       |   4 +-
 .../priorities/PrioritiesTable.tsx            |   4 +-
 .../priorities/PriorityEditFormWithData.tsx   |   4 +-
 .../omnichannel/priorities/PriorityIcon.tsx   |   4 +-
 .../omnichannel/priorities/PriorityList.tsx   |   4 +-
 .../reports/components/AgentsTable.tsx        |   4 +-
 .../components/ReportCardEmptyState.tsx       |   4 +-
 .../components/ReportCardErrorState.tsx       |   4 +-
 .../reports/hooks/useAgentsSection.tsx        |   5 +-
 .../reports/hooks/useChannelsSection.tsx      |  12 +-
 .../reports/hooks/useDefaultDownload.tsx      |   4 +-
 .../reports/hooks/useDepartmentsSection.tsx   |   5 +-
 .../reports/hooks/useStatusSection.tsx        |  10 +-
 .../reports/hooks/useTagsSection.tsx          |   5 +-
 .../reports/sections/AgentsSection.tsx        |   4 +-
 .../reports/utils/formatPeriodDescription.tsx |   6 +-
 .../tags/AutoCompleteTagsMultiple.tsx         |   4 +-
 .../sidebar/RoomList/RoomListWrapper.tsx      |   4 +-
 .../sidebar/footer/SidebarFooterWatermark.tsx |   4 +-
 .../client/sidebar/footer/voip/VoipFooter.tsx |   4 +-
 .../FederatedRoomListEmptyPlaceholder.tsx     |   4 +-
 .../FederatedRoomListErrorBoundary.tsx        |   4 +-
 .../FederatedRoomListItem.tsx                 |   4 +-
 .../MatrixFederationSearch.tsx                |   4 +-
 .../meteor/client/sidebar/header/UserMenu.tsx |   4 +-
 .../sidebar/header/actions/Administration.tsx |   4 +-
 .../sidebar/header/actions/CreateRoom.tsx     |   4 +-
 .../client/sidebar/header/actions/Sort.tsx    |   4 +-
 .../actions/hooks/useAdministrationMenu.tsx   |   4 +-
 .../hooks/useMatrixFederationItems.tsx.tsx    |   4 +-
 .../header/actions/hooks/useSortMenu.tsx      |   4 +-
 .../sidebar/sections/OverMacLimitSection.tsx  |   4 +-
 .../sections/StatusDisabledSection.tsx        |   4 +-
 .../actions/OmnichannelCallDialPad.tsx        |   4 +-
 .../actions/OmnichannelCallToggleError.tsx    |   4 +-
 .../actions/OmnichannelCallToggleLoading.tsx  |   4 +-
 .../actions/OmnichannelCallToggleReady.tsx    |   4 +-
 .../sidebarv2/RoomList/RoomListWrapper.tsx    |   4 +-
 .../footer/SidebarFooterWatermark.tsx         |   4 +-
 .../sidebarv2/footer/voip/VoipFooter.tsx      |   4 +-
 .../FederatedRoomListEmptyPlaceholder.tsx     |   4 +-
 .../FederatedRoomListErrorBoundary.tsx        |   4 +-
 .../FederatedRoomListItem.tsx                 |   4 +-
 .../MatrixFederationSearch.tsx                |   4 +-
 .../sidebarv2/header/actions/CreateRoom.tsx   |   4 +-
 .../client/sidebarv2/header/actions/Sort.tsx  |   4 +-
 .../actions/hooks/useMatrixFederationItems.ts |   4 +-
 .../header/actions/hooks/useSortMenu.tsx      |   4 +-
 .../sections/StatusDisabledSection.tsx        |   4 +-
 .../contexts/TranslationContextMock.tsx       |   3 +-
 .../DeviceManagementAccountPage.tsx           |   4 +-
 .../DeviceManagementAccountRow.tsx            |   4 +-
 .../DeviceManagementAccountTable.tsx          |   4 +-
 .../omnichannel/PreferencesGeneral.tsx        |   4 +-
 .../views/account/preferences/MyDataModal.tsx |   4 +-
 .../PreferencesHighlightsSection.tsx          |   4 +-
 .../PreferencesMessagesSection.tsx            |   4 +-
 .../PreferencesUserPresenceSection.tsx        |   4 +-
 .../account/profile/ActionConfirmModal.tsx    |   4 +-
 .../account/security/BackupCodesModal.tsx     |   4 +-
 .../account/tokens/AccountTokensPage.tsx      |   4 +-
 .../AccountTokensTable/AccountTokensRow.tsx   |   4 +-
 .../admin/customEmoji/AddCustomEmoji.tsx      |   4 +-
 .../CustomUserActiveConnections.tsx           |   4 +-
 .../CustomUserStatusDisabledModal.tsx         |   4 +-
 .../DeviceManagementAdminTable.tsx            |   4 +-
 .../DeviceManagementInfoWithData.tsx          |   4 +-
 .../EngagementDashboardCardErrorBoundary.tsx  |   4 +-
 .../EngagementDashboardPage.tsx               |   4 +-
 .../channels/ChannelsOverview.tsx             |   9 +-
 .../messages/MessagesPerChannelSection.tsx    |   4 +-
 .../messages/MessagesSentSection.tsx          |   4 +-
 .../messages/MessagesTab.tsx                  |   4 +-
 .../users/ActiveUsersSection.tsx              |   4 +-
 .../users/BusiestChatTimesSection.tsx         |   4 +-
 .../users/ContentForHours.tsx                 |   4 +-
 .../users/NewUsersSection.tsx                 |   4 +-
 .../users/UsersByTimeOfTheDaySection.tsx      |   4 +-
 .../engagementDashboard/users/UsersTab.tsx    |   4 +-
 .../FederationDashboardPage.tsx               |   4 +-
 .../views/admin/import/PrepareChannels.tsx    |  10 +-
 .../views/admin/import/PrepareUsers.tsx       |  10 +-
 .../views/admin/integrations/NewBot.tsx       |   4 +-
 .../views/admin/integrations/NewZapier.tsx    |   4 +-
 .../outgoing/OutgoingWebhookForm.tsx          |  14 +-
 .../outgoing/history/HistoryContent.tsx       |   4 +-
 .../admin/moderation/MessageContextFooter.tsx |   4 +-
 .../moderation/ModerationConsoleActions.tsx   |   5 +-
 .../UserReports/ModConsoleUserActions.tsx     |   4 +-
 .../UserReports/UserContextFooter.tsx         |   4 +-
 .../moderation/helpers/DateRangePicker.tsx    |   4 +-
 .../moderation/helpers/ModerationFilter.tsx   |   4 +-
 .../helpers/ReportReasonCollapsible.tsx       |   4 +-
 .../permissions/CustomRoleUpsellModal.tsx     |   4 +-
 .../PermissionsTable/PermissionRow.tsx        |   7 +-
 .../PermissionsTableFilter.tsx                |   4 +-
 .../views/admin/permissions/RoleForm.tsx      |   4 +-
 .../UsersInRoleTable/UsersInRoleTableRow.tsx  |   4 +-
 .../views/admin/rooms/RoomsTableFilters.tsx   |   4 +-
 .../ResetSettingButton/ResetSettingButton.tsx |   4 +-
 .../inputs/CodeMirror/CodeMirrorBox.tsx       |   4 +-
 .../Setting/inputs/ColorSettingInput.tsx      |   4 +-
 .../inputs/MultiSelectSettingInput.tsx        |   4 +-
 .../Setting/inputs/SelectSettingInput.tsx     |   4 +-
 .../inputs/TimespanSettingInput.spec.tsx      |  11 +-
 .../Setting/inputs/TimespanSettingInput.tsx   |   8 +-
 .../SettingsSection/SettingsSection.tsx       |   4 +-
 .../OAuthGroupPage/CreateOAuthModal.tsx       |   4 +-
 .../admin/settings/groups/TabbedGroupPage.tsx |   4 +-
 .../admin/subscription/SubscriptionPage.tsx   |   2 +-
 .../admin/users/AdminUserFormWithData.tsx     |   4 +-
 .../AdminUserSetRandomPasswordRadios.tsx      |   4 +-
 .../users/SeatsCapUsage/SeatsCapUsage.tsx     |   4 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  |   4 +-
 .../views/admin/viewLogs/AnalyticsReports.tsx |   4 +-
 .../views/admin/viewLogs/ViewLogsPage.tsx     |   4 +-
 .../InstancesModal/InstancesModal.tsx         |   4 +-
 .../MessagesRoomsCard/MessagesRoomsCard.tsx   |   4 +-
 .../views/admin/workspace/WorkspacePage.tsx   |   4 +-
 .../client/views/audit/AuditLogPage.tsx       |   4 +-
 apps/meteor/client/views/audit/AuditPage.tsx  |   4 +-
 .../audit/components/AuditFiltersDisplay.tsx  |   4 +-
 .../views/audit/components/AuditForm.tsx      |   4 +-
 .../views/audit/components/AuditLogEntry.tsx  |   4 +-
 .../components/forms/DateRangePicker.tsx      |   4 +-
 .../views/audit/components/tabs/DirectTab.tsx |   4 +-
 .../audit/components/tabs/OmnichannelTab.tsx  |   4 +-
 .../views/audit/components/tabs/RoomsTab.tsx  |   4 +-
 .../views/audit/components/tabs/UsersTab.tsx  |   4 +-
 .../AudioMessageRecorder.tsx                  |   4 +-
 .../composer/EmojiPicker/EmojiCategoryRow.tsx |   4 +-
 .../EmojiPicker/EmojiPickerCategoryItem.tsx   |   4 +-
 .../composer/EmojiPicker/SearchingResult.tsx  |   4 +-
 .../client/views/directory/RoomTags.tsx       |   4 +-
 .../views/e2e/EnterE2EPasswordModal.tsx       |   4 +-
 .../client/views/e2e/SaveE2EPasswordModal.tsx |   4 +-
 .../views/home/cards/DesktopAppsCard.tsx      |   4 +-
 .../views/home/cards/DocumentationCard.tsx    |   4 +-
 .../views/home/cards/MobileAppsCard.tsx       |   4 +-
 .../AppDetailsPage/AppDetailsPageHeader.tsx   |   4 +-
 .../tabs/AppDetails/AppDetails.tsx            |   4 +-
 .../AppDetailsPage/tabs/AppLogs/AppLogs.tsx   |   4 +-
 .../tabs/AppLogs/AppLogsItem.tsx              |   4 +-
 .../tabs/AppLogs/AppLogsItemEntry.tsx         |   4 +-
 .../tabs/AppReleases/AppReleasesItem.tsx      |   4 +-
 .../tabs/AppSecurity/AppSecurity.tsx          |   4 +-
 .../tabs/AppSettings/AppSettings.tsx          |   4 +-
 .../tabs/AppStatus/AppStatusPriceDisplay.tsx  |   6 +-
 .../client/views/marketplace/AppMenu.tsx      |   4 +-
 .../marketplace/AppPermissionsReviewModal.tsx |   4 +-
 .../views/marketplace/AppUpdateModal.tsx      |   4 +-
 .../marketplace/AppsPage/AppsFilters.tsx      |   4 +-
 .../AppsPage/AppsPageConnectionError.tsx      |   4 +-
 .../AppsPage/AppsPageContentBody.tsx          |   4 +-
 .../AppsPage/FeaturedAppsSections.tsx         |   6 +-
 .../AppsPage/NoAppRequestsEmptyState.tsx      |   4 +-
 .../NoInstalledAppMatchesEmptyState.tsx       |   4 +-
 .../AppsPage/NoInstalledAppsEmptyState.tsx    |   4 +-
 ...etplaceOrInstalledAppMatchesEmptyState.tsx |   4 +-
 .../AppsPage/PrivateEmptyState.tsx            |   4 +-
 .../client/views/marketplace/BundleChips.tsx  |   4 +-
 .../client/views/marketplace/IframeModal.tsx  |   4 +-
 .../marketplace/UnlimitedAppsUpsellModal.tsx  |   4 +-
 .../AppInstallModal/AppInstallModal.tsx       |   4 +-
 .../components/AppPermissionsList.tsx         |   4 +-
 .../CategoryFilter/CategoryDropDownAnchor.tsx |   4 +-
 .../components/EnabledAppsCount.tsx           |   4 +-
 .../UninstallGrandfatheredAppModal.tsx        |   4 +-
 .../views/marketplace/hooks/useCategories.ts  |   4 +-
 .../views/notAuthorized/NotAuthorizedPage.tsx |   4 +-
 .../client/views/notFound/NotFoundPage.tsx    |   4 +-
 .../agents/AgentsTable/AgentsTable.tsx        |   4 +-
 .../omnichannel/analytics/AnalyticsPage.tsx   |   6 +-
 .../omnichannel/analytics/DateRangePicker.tsx |   4 +-
 .../appearance/AppearanceFieldLabel.tsx       |   4 +-
 .../omnichannel/appearance/AppearanceForm.tsx |   4 +-
 .../businessHours/BusinessHoursForm.tsx       |   4 +-
 .../contactHistory/ContactHistoryItem.tsx     |   4 +-
 .../contactHistory/ContactHistoryList.tsx     |   4 +-
 .../MessageList/ContactHistoryMessage.tsx     |   4 +-
 .../DepartmentAgentsTable/AgentRow.tsx        |   4 +-
 .../DepartmentAgentsTable.tsx                 |   4 +-
 .../departments/DepartmentTags.tsx            |   4 +-
 .../directory/calls/CallTableRow.tsx          |   4 +-
 .../calls/contextualBar/VoipInfo.tsx          |   4 +-
 .../contextualBar/VoipInfoCallButton.tsx      |   4 +-
 .../chats/contextualBar/DepartmentField.tsx   |   4 +-
 .../RoomEdit/RoomEditWithData.tsx             |   4 +-
 .../chats/contextualBar/VisitorClientInfo.js  |   4 +-
 .../components/CallDialpadButton.tsx          |   4 +-
 .../directory/components/PriorityField.tsx    |   4 +-
 .../directory/components/SlaField.tsx         |   4 +-
 .../directory/components/SourceField.tsx      |   4 +-
 .../contextualBar/ContactEditWithData.js      |   4 +-
 .../omnichannel/queueList/QueueListFilter.tsx |   4 +-
 .../omnichannel/queueList/QueueListPage.tsx   |   4 +-
 .../RealTimeMonitoringPage.js                 |   4 +-
 .../charts/AgentStatusChart.tsx               |   9 +-
 .../charts/ChatDurationChart.js               |   4 +-
 .../realTimeMonitoring/charts/ChatsChart.tsx  |   9 +-
 .../charts/ChatsPerAgentChart.js              |   4 +-
 .../charts/ChatsPerDepartmentChart.js         |   4 +-
 .../charts/ResponseTimesChart.js              |   4 +-
 .../charts/useUpdateChartData.ts              |   6 +-
 .../counter/CounterContainer.tsx              |   4 +-
 .../omnichannel/triggers/ConditionForm.tsx    |   4 +-
 .../triggers/actions/ActionForm.tsx           |   4 +-
 .../triggers/actions/ActionSender.tsx         |   4 +-
 .../actions/ExternalServiceActionForm.tsx     |   4 +-
 .../actions/SendMessageActionForm.tsx         |   4 +-
 .../OutlookSettingItem.tsx                    |   4 +-
 .../views/room/E2EESetup/RoomE2EESetup.tsx    |   4 +-
 .../QuickActions/QuickActionOptions.tsx       |   4 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   4 +-
 .../client/views/room/Header/RoomHeader.tsx   |   4 +-
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      |   4 +-
 .../QuickActions/QuickActionOptions.tsx       |   4 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   4 +-
 .../client/views/room/HeaderV2/RoomHeader.tsx |   4 +-
 .../client/views/room/HeaderV2/RoomLeader.tsx |   4 +-
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      |   4 +-
 .../MessageList/MessageListErrorBoundary.tsx  |   4 +-
 .../room/MessageList/MessageListItem.tsx      |   4 +-
 .../views/room/body/DropTargetOverlay.tsx     |   4 +-
 .../body/ErroredUploadProgressIndicator.tsx   |   4 +-
 .../client/views/room/body/LeaderBar.tsx      |   4 +-
 .../room/body/RetentionPolicyWarning.tsx      |   4 +-
 .../room/body/RoomForeword/RoomForeword.tsx   |   4 +-
 .../room/body/UnreadMessagesIndicator.tsx     |   4 +-
 .../room/body/UploadProgressIndicator.tsx     |   4 +-
 .../views/room/composer/ComposerArchived.tsx  |   4 +-
 .../views/room/composer/ComposerBlocked.tsx   |   4 +-
 .../views/room/composer/ComposerBoxPopup.tsx  |   4 +-
 .../composer/ComposerBoxPopupSlashCommand.tsx |   4 +-
 .../room/composer/ComposerBoxPopupUser.tsx    |   4 +-
 .../ComposerFederationDisabled.tsx            |   4 +-
 .../ComposerFederationJoinRoomDisabled.tsx    |   4 +-
 .../ComposerOmnichannelOnHold.tsx             |   4 +-
 .../ComposerUserActionIndicator.tsx           |   4 +-
 .../views/room/composer/ComposerVoIP.tsx      |   4 +-
 .../FormattingToolbarDropdown.tsx             |   4 +-
 .../MessageBoxFormattingToolbar.tsx           |   4 +-
 .../messageBox/hooks/useMediaActionTitle.ts   |   4 +-
 .../AutoTranslate/AutoTranslate.tsx           |   4 +-
 .../Discussions/DiscussionsListRow.tsx        |   4 +-
 .../components/DiscussionsListItem.tsx        |   4 +-
 .../ExportMessages/ExportMessages.tsx         |   4 +-
 .../ExportMessages/FileExport.tsx             |   4 +-
 .../ExportMessages/MailExportForm.tsx         |   4 +-
 .../ChannelToTeamConfirmation.tsx             |   4 +-
 .../ChannelToTeamSelection.tsx                |   4 +-
 .../contextualBar/Info/RoomInfo/RoomInfo.tsx  |   4 +-
 .../Info/hooks/useRoomActions.ts              |   4 +-
 .../KeyboardShortcuts/KeyboardShortcuts.tsx   |   4 +-
 .../MessageSearchTab/MessageSearchTab.tsx     |   4 +-
 .../components/MessageSearchForm.tsx          |   4 +-
 .../NotificationPreferences.tsx               |   4 +-
 .../NotificationPreferencesForm.tsx           |   4 +-
 .../views/room/contextualBar/OTR/OTR.tsx      |   4 +-
 .../OTR/components/OTREstablished.tsx         |   4 +-
 .../OTR/components/OTRStates.tsx              |   4 +-
 .../PruneMessages/PruneMessages.tsx           |   4 +-
 .../contextualBar/RoomFiles/RoomFiles.tsx     |   4 +-
 .../InviteUsers/EditInviteLink.tsx            |   4 +-
 .../RoomMembers/InviteUsers/InviteLink.tsx    |   4 +-
 .../RoomMembers/InviteUsers/InviteUsers.tsx   |   4 +-
 .../RoomMembers/RoomMembersActions.tsx        |   4 +-
 .../Threads/components/ThreadListMessage.tsx  |   4 +-
 .../Threads/components/ThreadMessageItem.tsx  |   4 +-
 .../UserInfo/UserInfoActions.tsx              |   4 +-
 .../VideoConference/VideoConfConfigModal.tsx  |   4 +-
 .../VideoConfList/VideoConfList.tsx           |   4 +-
 .../VideoConfPopup/IncomingPopup.tsx          |   4 +-
 .../VideoConfPopup/OutgoingPopup.tsx          |   4 +-
 .../VideoConfPopup/StartCallPopup.tsx         |   4 +-
 .../modals/FileUploadModal/MediaPreview.tsx   |   4 +-
 .../ReactionListModal/ReactionListModal.tsx   |   4 +-
 .../FilePickerBreadcrumbs.tsx                 |   4 +-
 .../WebdavFilePickerTable.tsx                 |   4 +-
 .../ChannelDesertionTable.tsx                 |   4 +-
 .../ModalSteps/FirstStep.tsx                  |   4 +-
 .../ModalSteps/SecondStep.tsx                 |   4 +-
 .../channels/TeamsChannelItemMenu.tsx         |   4 +-
 .../contextualBar/channels/TeamsChannels.tsx  |   4 +-
 .../ChannelDeletionTable.tsx                  |   4 +-
 .../info/DeleteTeam/DeleteTeamChannels.tsx    |   4 +-
 .../DeleteTeam/DeleteTeamConfirmation.tsx     |   4 +-
 .../LeaveTeamModal/LeaveTeamModalChannels.tsx |   4 +-
 .../LeaveTeamModalConfirmation.tsx            |   4 +-
 .../teams/contextualBar/info/TeamsInfo.tsx    |   4 +-
 .../RemoveUsersModal/RemoveUsersFirstStep.js  |   4 +-
 .../RemoveUsersModal/RemoveUsersSecondStep.js |   4 +-
 .../client/voip/modal/DialPad/DialInput.tsx   |   4 +-
 .../voip/modal/DialPad/hooks/useDialPad.tsx   |   4 +-
 apps/meteor/package.json                      |   4 +-
 .../EmailInbox/EmailInbox_Incoming.ts         |   2 +-
 .../EmailInbox/EmailInbox_Outgoing.ts         |   2 +-
 apps/meteor/server/lib/i18n.ts                |  11 +
 apps/meteor/server/lib/resetUserE2EKey.ts     |   2 +-
 .../modules/core-apps/mention.module.ts       |  44 ++-
 .../services/omnichannel-analytics/service.ts |   2 +-
 package.json                                  |   1 -
 packages/fuselage-ui-kit/package.json         |   4 +-
 packages/gazzodown/package.json               |   1 -
 packages/gazzodown/src/elements/LinkSpan.tsx  |   4 +-
 packages/gazzodown/src/elements/PlainSpan.tsx |   4 +-
 .../src/mentions/ChannelMentionElement.tsx    |   4 +-
 .../src/mentions/UserMentionElement.tsx       |   4 +-
 packages/i18n/jest.config.ts                  |   2 +-
 packages/i18n/package.json                    |  31 +-
 packages/i18n/src/index.mjs                   |  14 +-
 packages/livechat/package.json                |   4 +-
 packages/mock-providers/package.json          |   4 +-
 packages/ui-client/package.json               |  35 ++-
 .../src/components/CustomFieldsForm.tsx       |   4 +-
 .../GenericMenu/GenericMenu.spec.tsx          |   7 +-
 .../components/GenericMenu/GenericMenu.tsx    |  13 +-
 .../MultiSelectCustomAnchor.tsx               |   4 +-
 .../MultiSelectCustomList.tsx                 |   4 +-
 .../MultiSelectCustom/useFilteredOptions.tsx  |   4 +-
 .../src/components/UserStatus/UserStatus.tsx  |   4 +-
 packages/ui-voip/package.json                 |   2 +-
 packages/web-ui-registration/package.json     |   8 +-
 .../src/SecretRegisterInvalidForm.tsx         |   4 +-
 yarn.lock                                     | 287 ++++++++++++++----
 424 files changed, 1168 insertions(+), 1137 deletions(-)
 delete mode 100644 .yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch

diff --git a/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch b/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch
deleted file mode 100644
index cf5a292c0253..000000000000
--- a/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/dist/amd/react-i18next.js b/dist/amd/react-i18next.js
-index 115ef3cc362e5ce38e875f9b35dfd1fe687cfd6c..2ba1b4d54295eeff49c8c650f214d7875d9219a5 100644
---- a/dist/amd/react-i18next.js
-+++ b/dist/amd/react-i18next.js
-@@ -495,7 +495,7 @@ define(['exports', 'react'], (function (exports, react) { 'use strict';
- 	  }
- 	  addUsedNamespaces(namespaces) {
- 	    namespaces.forEach(ns => {
--	      this.usedNamespaces[ns] ??= true;
-+	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
- 	    });
- 	  }
- 	  getUsedNamespaces() {
-diff --git a/dist/amd/react-i18next.min.js b/dist/amd/react-i18next.min.js
-index c54c9114869feb14df7855be24237f85d64fe7e4..0cc2b09d6db9bfc6f94dffff4b9e0f3fd9108510 100644
---- a/dist/amd/react-i18next.min.js
-+++ b/dist/amd/react-i18next.min.js
-@@ -1 +1 @@
--define(["exports","react"],(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),a=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function i(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var i=e.indexOf("--\x3e");return{type:"comment",comment:-1!==i?e.slice(4,i):""}}for(var r=new RegExp(a),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],a=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=i(r);return c<0?(s.push(g),s):((p=a[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=i(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=a[c-1])&&p.children.push(t),a[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:a[c]),!u&&"<"!==m&&m)){p=-1===c?s:a[c].children;var y=e.indexOf("<",h),v=e.slice(h,-1===y?void 0:y);o.test(v)&&(v=" "),(y>-1&&c+p.length>=0||" "!==v)&&p.push({type:"text",content:v})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,v=e=>"object"==typeof e&&null!==e,x=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,b={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>b[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(x,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],C=(e,t)=>{if(!e)return"";let s="";const a=R(e),i=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return a.forEach(((e,a)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=i.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${a}></${a}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=C(c,t);s+=`<${a}>${e}</${a}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(v(e)){const{format:n,...t}=e,a=Object.keys(t);if(1===a.length){const e=n?`${a[0]}, ${n}`:a[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},T=(e,t,s,a,i,r)=>{if(""===t)return[];const o=a.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):v(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...i},h=(e,t,s)=>{const a=j(e),i=g(a,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(a)&&0===i.length||e.props?.i18nIsDynamicList?a:i},m=(e,t,s,a,i)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:a},i?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:a,ref:e.ref},i?null:t)})))},g=(t,i,c)=>{const u=R(t);return R(i).reduce(((t,i,p)=>{const d=i.children?.[0]?.content&&s.services.interpolator.interpolate(i.children[0].content,f,s.language);if("tag"===i.type){let r=u[parseInt(i.name,10)];1!==c.length||r||(r=c[0][i.name]),r||(r={});const x=0!==Object.keys(i.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:i.attrs},r):r,b=n.isValidElement(x),E=b&&S(i,!0)&&!i.voidElement,O=l&&v(x)&&x.dummy&&!b,N=v(e)&&Object.hasOwnProperty.call(e,i.name);if(y(x)){const e=s.services.interpolator.interpolate(x,f,s.language);t.push(e)}else if(S(x)||E){const e=h(x,i,c);m(x,e,t,p)}else if(O){const e=g(u,i.children,c);m(x,e,t,p)}else if(Number.isNaN(parseFloat(i.name)))if(N){const e=h(x,i,c);m(x,e,t,p,i.voidElement)}else if(a.transSupportBasicHtmlNodes&&o.indexOf(i.name)>-1)if(i.voidElement)t.push(n.createElement(i.name,{key:`${i.name}-${p}`}));else{const e=g(u,i.children,c);t.push(n.createElement(i.name,{key:`${i.name}-${p}`},e))}else if(i.voidElement)t.push(`<${i.name} />`);else{const e=g(u,i.children,c);t.push(`<${i.name}>${e}</${i.name}>`)}else if(v(x)&&!b){const e=i.children[0]?d:null;e&&t.push(e)}else m(x,d,t,p,1!==i.children.length||!d)}else if("text"===i.type){const e=a.transWrapTextNodes,o=r?a.unescape(s.services.interpolator.interpolate(i.content,f,s.language)):s.services.interpolator.interpolate(i.content,f,s.language);e?t.push(n.createElement(e,{key:`${i.name}-${p}`},o)):t.push(o)}return t}),[])},x=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(x[0])};function P(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const v=f||k();if(!v)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const x=h||v.t.bind(v)||(e=>e),b={...$(),...v.options?.react};let E=p||x.ns||v.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=C(t,b),N=c||O||b.transEmptyNodeValue||i,{hashTransKey:w}=b,I=i||(w?w(O||N):O||N);v.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...v.options.interpolation.defaultVariables}:{...v.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?x(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=T(u||t,R,v,b,j,m),L=a??b.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:a,defaultNS:i}=n.useContext(A)||{},r=s||a||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:v(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||i||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,a)=>n.useCallback(U(e,t,s,a),[e,t,s,a]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,x=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[b,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(x)})):h(r,u,(()=>{w.current&&E(x)}))),p&&N&&N!==O&&w.current&&E(x);const s=()=>{w.current&&E(x)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[b,r,p];if(I.t=b,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:a}=s,{i18n:i}=n.useContext(A)||{},r=a||i||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:a}=e;const i=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:i},a)},e.Trans=function(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},v=d||g||k(),x=f||v?.t.bind(v);return P({children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||x?.ns||y||v?.options?.defaultNS,i18n:v,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[a,i,r]=B(n,s);return t(a,{i18n:i,lng:i.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:a,...i}=t;return D(s,a),n.createElement(e,{...i})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function a(a){let{forwardedRef:i,...r}=a;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&i?u.ref=i:!t.withRef&&i&&(u.forwardedRef=i),n.createElement(s,u)}a.displayName=`withI18nextTranslation(${g(s)})`,a.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(a,Object.assign({},e,{forwardedRef:t})))):a}}}));
-+define(["exports","react"],(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),a=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function i(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var i=e.indexOf("--\x3e");return{type:"comment",comment:-1!==i?e.slice(4,i):""}}for(var r=new RegExp(a),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],a=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=i(r);return c<0?(s.push(g),s):((p=a[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=i(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=a[c-1])&&p.children.push(t),a[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:a[c]),!u&&"<"!==m&&m)){p=-1===c?s:a[c].children;var y=e.indexOf("<",h),v=e.slice(h,-1===y?void 0:y);o.test(v)&&(v=" "),(y>-1&&c+p.length>=0||" "!==v)&&p.push({type:"text",content:v})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,v=e=>"object"==typeof e&&null!==e,x=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,b={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>b[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(x,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],C=(e,t)=>{if(!e)return"";let s="";const a=R(e),i=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return a.forEach(((e,a)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=i.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${a}></${a}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=C(c,t);s+=`<${a}>${e}</${a}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(v(e)){const{format:n,...t}=e,a=Object.keys(t);if(1===a.length){const e=n?`${a[0]}, ${n}`:a[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},T=(e,t,s,a,i,r)=>{if(""===t)return[];const o=a.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):v(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...i},h=(e,t,s)=>{const a=j(e),i=g(a,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(a)&&0===i.length||e.props?.i18nIsDynamicList?a:i},m=(e,t,s,a,i)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:a},i?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:a,ref:e.ref},i?null:t)})))},g=(t,i,c)=>{const u=R(t);return R(i).reduce(((t,i,p)=>{const d=i.children?.[0]?.content&&s.services.interpolator.interpolate(i.children[0].content,f,s.language);if("tag"===i.type){let r=u[parseInt(i.name,10)];1!==c.length||r||(r=c[0][i.name]),r||(r={});const x=0!==Object.keys(i.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:i.attrs},r):r,b=n.isValidElement(x),E=b&&S(i,!0)&&!i.voidElement,O=l&&v(x)&&x.dummy&&!b,N=v(e)&&Object.hasOwnProperty.call(e,i.name);if(y(x)){const e=s.services.interpolator.interpolate(x,f,s.language);t.push(e)}else if(S(x)||E){const e=h(x,i,c);m(x,e,t,p)}else if(O){const e=g(u,i.children,c);m(x,e,t,p)}else if(Number.isNaN(parseFloat(i.name)))if(N){const e=h(x,i,c);m(x,e,t,p,i.voidElement)}else if(a.transSupportBasicHtmlNodes&&o.indexOf(i.name)>-1)if(i.voidElement)t.push(n.createElement(i.name,{key:`${i.name}-${p}`}));else{const e=g(u,i.children,c);t.push(n.createElement(i.name,{key:`${i.name}-${p}`},e))}else if(i.voidElement)t.push(`<${i.name} />`);else{const e=g(u,i.children,c);t.push(`<${i.name}>${e}</${i.name}>`)}else if(v(x)&&!b){const e=i.children[0]?d:null;e&&t.push(e)}else m(x,d,t,p,1!==i.children.length||!d)}else if("text"===i.type){const e=a.transWrapTextNodes,o=r?a.unescape(s.services.interpolator.interpolate(i.content,f,s.language)):s.services.interpolator.interpolate(i.content,f,s.language);e?t.push(n.createElement(e,{key:`${i.name}-${p}`},o)):t.push(o)}return t}),[])},x=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(x[0])};function P(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const v=f||k();if(!v)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const x=h||v.t.bind(v)||(e=>e),b={...$(),...v.options?.react};let E=p||x.ns||v.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=C(t,b),N=c||O||b.transEmptyNodeValue||i,{hashTransKey:w}=b,I=i||(w?w(O||N):O||N);v.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...v.options.interpolation.defaultVariables}:{...v.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?x(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=T(u||t,R,v,b,j,m),L=a??b.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:a,defaultNS:i}=n.useContext(A)||{},r=s||a||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:v(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||i||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,a)=>n.useCallback(U(e,t,s,a),[e,t,s,a]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,x=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[b,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(x)})):h(r,u,(()=>{w.current&&E(x)}))),p&&N&&N!==O&&w.current&&E(x);const s=()=>{w.current&&E(x)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[b,r,p];if(I.t=b,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:a}=s,{i18n:i}=n.useContext(A)||{},r=a||i||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:a}=e;const i=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:i},a)},e.Trans=function(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},v=d||g||k(),x=f||v?.t.bind(v);return P({children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||x?.ns||y||v?.options?.defaultNS,i18n:v,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[a,i,r]=B(n,s);return t(a,{i18n:i,lng:i.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:a,...i}=t;return D(s,a),n.createElement(e,{...i})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function a(a){let{forwardedRef:i,...r}=a;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&i?u.ref=i:!t.withRef&&i&&(u.forwardedRef=i),n.createElement(s,u)}a.displayName=`withI18nextTranslation(${g(s)})`,a.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(a,Object.assign({},e,{forwardedRef:t})))):a}}}));
-diff --git a/dist/commonjs/context.js b/dist/commonjs/context.js
-index 5c4506e4d3424e4ffd167fd5bb696dabd67b662b..dcc11b798da72771953acce3c1368f006c3c1478 100644
---- a/dist/commonjs/context.js
-+++ b/dist/commonjs/context.js
-@@ -46,7 +46,7 @@ class ReportNamespaces {
-   }
-   addUsedNamespaces(namespaces) {
-     namespaces.forEach(ns => {
--      this.usedNamespaces[ns] ??= true;
-+      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
-     });
-   }
-   getUsedNamespaces() {
-diff --git a/dist/es/context.js b/dist/es/context.js
-index 89afe45d6cf480079598dd183521b32f28f77f06..a953078f44008ee751f51257536a31ceba2fd672 100644
---- a/dist/es/context.js
-+++ b/dist/es/context.js
-@@ -10,7 +10,7 @@ export class ReportNamespaces {
-   }
-   addUsedNamespaces(namespaces) {
-     namespaces.forEach(ns => {
--      this.usedNamespaces[ns] ??= true;
-+      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
-     });
-   }
-   getUsedNamespaces() {
-diff --git a/dist/umd/react-i18next.js b/dist/umd/react-i18next.js
-index 3723bd7c0f5762bdb09e3226ac86ff255cbf9859..9178ae9f7cdb776f51a64ff6c79eed1d18fbd836 100644
---- a/dist/umd/react-i18next.js
-+++ b/dist/umd/react-i18next.js
-@@ -499,7 +499,7 @@
- 	  }
- 	  addUsedNamespaces(namespaces) {
- 	    namespaces.forEach(ns => {
--	      this.usedNamespaces[ns] ??= true;
-+	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
- 	    });
- 	  }
- 	  getUsedNamespaces() {
-diff --git a/dist/umd/react-i18next.min.js b/dist/umd/react-i18next.min.js
-index 2eef624040aab6b4b9ba4699bf7e4777842bf0a2..69e17753d545df9dc26aa3411b477a4dff5e8361 100644
---- a/dist/umd/react-i18next.min.js
-+++ b/dist/umd/react-i18next.min.js
-@@ -1 +1 @@
--!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-diff --git a/react-i18next.js b/react-i18next.js
-index 3723bd7c0f5762bdb09e3226ac86ff255cbf9859..9178ae9f7cdb776f51a64ff6c79eed1d18fbd836 100644
---- a/react-i18next.js
-+++ b/react-i18next.js
-@@ -499,7 +499,7 @@
- 	  }
- 	  addUsedNamespaces(namespaces) {
- 	    namespaces.forEach(ns => {
--	      this.usedNamespaces[ns] ??= true;
-+	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
- 	    });
- 	  }
- 	  getUsedNamespaces() {
-diff --git a/react-i18next.min.js b/react-i18next.min.js
-index 2eef624040aab6b4b9ba4699bf7e4777842bf0a2..69e17753d545df9dc26aa3411b477a4dff5e8361 100644
---- a/react-i18next.min.js
-+++ b/react-i18next.min.js
-@@ -1 +1 @@
--!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-diff --git a/src/context.js b/src/context.js
-index 167af9c50f47e34f7473df03bb2bb1e369725934..9b9a5570b0b765c9d7809f912dba2db759ebb68d 100644
---- a/src/context.js
-+++ b/src/context.js
-@@ -14,7 +14,7 @@ export class ReportNamespaces {
- 
-   addUsedNamespaces(namespaces) {
-     namespaces.forEach((ns) => {
--      this.usedNamespaces[ns] ??= true;
-+      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
-     });
-   }
- 
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts
index 5baf218a62bb..d947c1b30c2e 100644
--- a/apps/meteor/app/2fa/server/code/EmailCheck.ts
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts
@@ -38,7 +38,7 @@ export class EmailCheck implements ICodeCheck {
 	private async send2FAEmail(address: string, random: string, user: IUser): Promise<void> {
 		const language = user.language || settings.get('Language') || 'en';
 
-		const t = i18n.getFixedT(language);
+		const t = (s: string): string => i18n.t(s, { lng: language });
 
 		await Mailer.send({
 			to: address,
diff --git a/apps/meteor/app/2fa/server/functions/resetTOTP.ts b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
index 84426cd4f88d..3be8ec7c8060 100644
--- a/apps/meteor/app/2fa/server/functions/resetTOTP.ts
+++ b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
@@ -22,7 +22,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
 		return;
 	}
 
-	const t = i18n.getFixedT(language);
+	const t = (s: string): string => i18n.t(s, { lng: language });
 	const text = `
 	${t('Your_TOTP_has_been_reset')}
 
diff --git a/apps/meteor/app/lib/server/methods/addUsersToRoom.ts b/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
index 119071e8ece0..73fbf6e51a04 100644
--- a/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
+++ b/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
@@ -98,11 +98,14 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 					return;
 				}
 				void api.broadcast('notify.ephemeralMessage', userId, data.rid, {
-					msg: i18n.t('Username_is_already_in_here', {
-						postProcess: 'sprintf',
-						sprintf: [newUser.username],
-						lng: user?.language,
-					}),
+					msg: i18n.t(
+						'Username_is_already_in_here',
+						{
+							postProcess: 'sprintf',
+							sprintf: [newUser.username],
+						},
+						user?.language,
+					),
 				});
 			}
 		}),
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
index e004f2199fa0..56009f15fede 100644
--- a/apps/meteor/app/lib/server/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -2,7 +2,6 @@ import { api } from '@rocket.chat/core-services';
 import type { AtLeast, IMessage, IUser } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Users } from '@rocket.chat/models';
-import type { TOptions } from 'i18next';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
@@ -99,9 +98,9 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 		SystemLogger.error({ msg: 'Error sending message:', err });
 
 		const errorMessage = typeof err === 'string' ? err : err.error || err.message;
-		const errorContext: TOptions = err.details ?? {};
+		const errorContext = err.details ?? {};
 		void api.broadcast('notify.ephemeralMessage', uid, message.rid, {
-			msg: i18n.t(errorMessage, { ...errorContext, lng: user.language }),
+			msg: i18n.t(errorMessage, errorContext, user.language),
 		});
 
 		if (typeof err === 'string') {
diff --git a/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts b/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
index 68d18cbfeacf..8a17686ba158 100644
--- a/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
+++ b/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
@@ -24,7 +24,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'add-users',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Add_them', { lng }),
+				text: i18n.t('Add_them', undefined, lng),
 			},
 		},
 		dismissBlock: {
@@ -35,7 +35,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'dismiss',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Do_nothing', { lng }),
+				text: i18n.t('Do_nothing', undefined, lng),
 			},
 		},
 		dmBlock: {
@@ -46,7 +46,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'share-message',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Let_them_know', { lng }),
+				text: i18n.t('Let_them_know', undefined, lng),
 			},
 		},
 	} as const;
@@ -121,7 +121,7 @@ callbacks.add(
 					type: 'section',
 					text: {
 						type: 'mrkdwn',
-						text: i18n.t(messageLabel, { mentions: mentionsText, lng: language }),
+						text: i18n.t(messageLabel, { mentions: mentionsText }, language),
 					},
 				} as const,
 				Boolean(elements.length) &&
diff --git a/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx b/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
index 58ede259fb45..41af8a22b6bb 100644
--- a/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
+++ b/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type PlaceChatOnHoldModalProps = {
 	onOnHoldChat: () => void;
@@ -9,7 +9,7 @@ type PlaceChatOnHoldModalProps = {
 };
 
 const PlaceChatOnHoldModal = ({ onCancel, onOnHoldChat, confirm = onOnHoldChat, ...props }: PlaceChatOnHoldModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props} data-qa-id='on-hold-modal'>
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index 404f576ea513..7aacfacb4476 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -159,7 +159,7 @@ API.v1.addRoute(
 					const visitorEmail = visitor.visitorEmails?.[0]?.address;
 
 					const language = servingAgent.language || rcSettings.get<string>('Language') || 'en';
-					const t = i18n.getFixedT(language);
+					const t = (s: string): string => i18n.t(s, { lng: language });
 					const subject = t('Transcript_of_your_livechat_conversation');
 
 					options.emailTranscript = {
diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
index 017eb516a487..17f21d8d7b04 100644
--- a/apps/meteor/app/livechat/server/lib/Helper.ts
+++ b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -439,8 +439,8 @@ export const dispatchInquiryQueued = async (inquiry: ILivechatInquiryRecord, age
 			hasMentionToHere: false,
 			message: { _id: '', u: v, msg: '' },
 			// we should use server's language for this type of messages instead of user's
-			notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName, lng: language }),
-			room: Object.assign(room, { name: i18n.t('New_chat_in_queue', { lng: language }) }),
+			notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName }, language),
+			room: Object.assign(room, { name: i18n.t('New_chat_in_queue', {}, language) }),
 			mentionIds: [],
 		});
 	}
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index c6728d470870..e1ea79d84163 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -371,8 +371,8 @@ export class QueueManager {
 				hasMentionToHere: false,
 				message: { _id: '', u: v, msg: '' },
 				// we should use server's language for this type of messages instead of user's
-				notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName, lng: language }),
-				room: { ...room, name: i18n.t('New_chat_in_queue', { lng: language }) },
+				notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName }, language),
+				room: { ...room, name: i18n.t('New_chat_in_queue', {}, language) },
 				mentionIds: [],
 			});
 		}
diff --git a/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx b/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
index 21e502c90001..420bf93df66d 100644
--- a/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
+++ b/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
@@ -1,8 +1,8 @@
 import { Field, FieldGroup, TextInput, FieldLabel, FieldRow, Box } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 import { useForm, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../client/components/GenericModal';
 
@@ -13,7 +13,7 @@ type AddLinkComposerActionModalProps = {
 };
 
 const AddLinkComposerActionModal = ({ selectedText, onClose, onConfirm }: AddLinkComposerActionModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const textField = useUniqueId();
 	const urlField = useUniqueId();
 
diff --git a/apps/meteor/app/utils/lib/i18n.ts b/apps/meteor/app/utils/lib/i18n.ts
index 737b98666d0a..b69fe6b30513 100644
--- a/apps/meteor/app/utils/lib/i18n.ts
+++ b/apps/meteor/app/utils/lib/i18n.ts
@@ -1,5 +1,4 @@
 import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
-import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import sprintf from 'i18next-sprintf-postprocessor';
 
@@ -14,7 +13,7 @@ export const addSprinfToI18n = function (t: (typeof i18n)['t']) {
 		}
 
 		if (isObject(replaces[0]) && !Array.isArray(replaces[0])) {
-			return t(key, replaces[0] as TOptions);
+			return t(key, replaces[0]);
 		}
 
 		return t(key, {
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
index 2693060578ed..af9b907df12e 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
@@ -1,7 +1,7 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../contexts/CallContext';
 import { useDialModal } from '../../hooks/useDialModal';
@@ -9,7 +9,7 @@ import { useDialModal } from '../../hooks/useDialModal';
 type NavBarItemOmniChannelCallDialPadProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmniChannelCallDialPad = (props: NavBarItemOmniChannelCallDialPadProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
index 7f2b6adc8691..cf4e7ec240b4 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
@@ -1,12 +1,12 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NavBarItemOmnichannelCallToggleErrorProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleError = (props: NavBarItemOmnichannelCallToggleErrorProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <NavBarItem icon='phone' danger data-tooltip={t('Error')} disabled {...props} />;
 };
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
index 149500050402..c4b53acefabb 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
@@ -1,12 +1,12 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NavBarItemOmnichannelCallToggleLoadingProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleLoading = (props: NavBarItemOmnichannelCallToggleLoadingProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <NavBarItem icon='phone' data-tooltip={t('Loading')} aria-label={t('VoIP_Toggle')} disabled {...props} />;
 };
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
index 82f1c28350cd..8b51fc6c5b57 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
@@ -1,14 +1,14 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../contexts/CallContext';
 
 type NavBarItemOmnichannelCallToggleReadyProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleReady = (props: NavBarItemOmnichannelCallToggleReadyProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const caller = useCallerInfo();
 	const unregister = useCallUnregisterClient();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
index 149ad0ea585e..22895d55388f 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import UserMenuButton from './UserMenuButton';
 import { useUserMenu } from './hooks/useUserMenu';
@@ -11,7 +11,7 @@ import { useUserMenu } from './hooks/useUserMenu';
 type UserMenuProps = { user: IUser } & Omit<ComponentProps<typeof GenericMenu>, 'sections' | 'items' | 'title'>;
 
 const UserMenu = function UserMenu({ user, ...props }: UserMenuProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [isOpen, setIsOpen] = useState(false);
 
 	const sections = useUserMenu(user);
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
index dbaea02ace4a..f589dd21ed50 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
@@ -1,7 +1,7 @@
 import { Avatar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarTitle,
@@ -19,7 +19,7 @@ interface IGameCenterContainerProps {
 }
 
 const GameCenterContainer = ({ handleClose, handleBack, game }: IGameCenterContainerProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
index 871e82f3ff56..d0dcc6fad4fe 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
@@ -19,7 +19,7 @@ interface IGameCenterInvitePlayersModalProps {
 }
 
 const GameCenterInvitePlayersModal = ({ game, onClose }: IGameCenterInvitePlayersModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [users, setUsers] = useState<Array<Username>>([]);
 	const { name } = game;
 
diff --git a/apps/meteor/client/components/ActionManagerBusyState.tsx b/apps/meteor/client/components/ActionManagerBusyState.tsx
index 932eb08ea502..1399c045271f 100644
--- a/apps/meteor/client/components/ActionManagerBusyState.tsx
+++ b/apps/meteor/client/components/ActionManagerBusyState.tsx
@@ -1,12 +1,12 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
 
 const ActionManagerBusyState = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const actionManager = useUiKitActionManager();
 	const [busy, setBusy] = useState(false);
 
diff --git a/apps/meteor/client/components/AutoCompleteDepartment.tsx b/apps/meteor/client/components/AutoCompleteDepartment.tsx
index 0c50f2254aac..6217f1d99610 100644
--- a/apps/meteor/client/components/AutoCompleteDepartment.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartment.tsx
@@ -1,8 +1,8 @@
 import { PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
@@ -28,7 +28,7 @@ const AutoCompleteDepartment = ({
 	showArchived = false,
 	...props
 }: AutoCompleteDepartmentProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState<string>('');
 
 	const debouncedDepartmentsFilter = useDebouncedValue(departmentsFilter, 500);
diff --git a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
index c15d480f3900..99af9a1f6a2c 100644
--- a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
@@ -1,9 +1,9 @@
 import { CheckOption, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
@@ -24,7 +24,7 @@ const AutoCompleteDepartmentMultiple = ({
 	enabled = false,
 	onChange = () => undefined,
 }: AutoCompleteDepartmentMultipleProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 
 	const debouncedDepartmentsFilter = useDebouncedValue(departmentsFilter, 500);
diff --git a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
index 77135fad6230..349341baf003 100644
--- a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
+++ b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 import RawText from './RawText';
@@ -20,7 +20,7 @@ const ConfirmOwnerChangeModal = ({
 	onConfirm,
 	onCancel,
 }: ConfirmOwnerChangeModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	let changeOwnerRooms = '';
 	if (shouldChangeOwner.length > 0) {
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
index dcac448b1e92..c8e17ab88d80 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ContextualbarAction from './ContextualbarAction';
 
 type ContextualbarBackProps = Partial<ComponentProps<typeof ContextualbarAction>>;
 
 const ContextualbarBack = (props: ContextualbarBackProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <ContextualbarAction {...props} title={t('Back')} name='arrow-back' />;
 };
 
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
index 38db516476e3..1670c9be5895 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ContextualbarAction from './ContextualbarAction';
 
 type ContextualbarCloseProps = Partial<ComponentProps<typeof ContextualbarAction>>;
 
 const ContextualbarClose = (props: ContextualbarCloseProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <ContextualbarAction data-qa='ContextualbarActionClose' {...props} aria-label={t('Close')} name='cross' />;
 };
 
diff --git a/apps/meteor/client/components/FilterByText.tsx b/apps/meteor/client/components/FilterByText.tsx
index 25d8e225e3d8..5c5a3d599e2f 100644
--- a/apps/meteor/client/components/FilterByText.tsx
+++ b/apps/meteor/client/components/FilterByText.tsx
@@ -1,8 +1,8 @@
 import { Box, Icon, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, FormEvent, HTMLAttributes } from 'react';
 import React, { forwardRef, memo, useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FilterByTextProps = {
 	onChange: (filter: string) => void;
@@ -13,7 +13,7 @@ const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function Fi
 	{ placeholder, onChange: setFilter, shouldAutoFocus = false, children, ...props },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [text, setText] = useState('');
 	const autoFocusRef = useAutoFocus(shouldAutoFocus);
 	const mergedRefs = useMergedRefs(ref, autoFocusRef);
diff --git a/apps/meteor/client/components/FingerprintChangeModal.tsx b/apps/meteor/client/components/FingerprintChangeModal.tsx
index a45a17db8ccc..db4c33654a92 100644
--- a/apps/meteor/client/components/FingerprintChangeModal.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -12,7 +12,7 @@ type FingerprintChangeModalProps = {
 };
 
 const FingerprintChangeModal = ({ onConfirm, onCancel, onClose }: FingerprintChangeModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<GenericModal
 			variant='warning'
diff --git a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
index 6acc413c82be..77718de0f441 100644
--- a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -16,7 +16,7 @@ const FingerprintChangeModalConfirmation = ({
 	onCancel,
 	newWorkspace,
 }: FingerprintChangeModalConfirmationProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<GenericModal
 			variant='warning'
diff --git a/apps/meteor/client/components/GenericError/GenericError.tsx b/apps/meteor/client/components/GenericError/GenericError.tsx
index 15014fa162d7..22f9923dea27 100644
--- a/apps/meteor/client/components/GenericError/GenericError.tsx
+++ b/apps/meteor/client/components/GenericError/GenericError.tsx
@@ -1,7 +1,7 @@
 import { Box, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type GenericErrorProps = {
 	icon?: IconName;
@@ -11,7 +11,7 @@ type GenericErrorProps = {
 };
 
 const GenericError = ({ icon = 'magnifier', title, buttonTitle, buttonAction }: GenericErrorProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.tsx b/apps/meteor/client/components/GenericModal/GenericModal.tsx
index d91e3c066007..5d025e05827d 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.tsx
@@ -1,9 +1,9 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode, ComponentPropsWithoutRef } from 'react';
 import React, { useEffect, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { RequiredModalProps } from './withDoNotAskAgain';
 import { withDoNotAskAgain } from './withDoNotAskAgain';
@@ -75,7 +75,7 @@ const GenericModal = ({
 	annotation,
 	...props
 }: GenericModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const genericModalId = useUniqueId();
 
 	const dismissedRef = useRef(true);
diff --git a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
index d21023024fb3..3fcfe2b0e0ac 100644
--- a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
+++ b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
@@ -1,7 +1,7 @@
 import { Box, States, StatesIcon, StatesLink, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type LinkProps = { linkText: string; linkHref: string } | { linkText?: never; linkHref?: never };
 type ButtonProps = { buttonTitle: string; buttonAction: () => void } | { buttonTitle?: never; buttonAction?: never };
@@ -23,7 +23,7 @@ const GenericNoResults = ({
 	linkHref,
 	linkText,
 }: GenericNoResultsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
diff --git a/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
index 4c390041497e..0a8a8deb8262 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
@@ -1,7 +1,7 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const useItemsPerPageLabel = (): (() => string) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useCallback(() => t('Items_per_page:'), [t]);
 };
diff --git a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
index 8ff7d2ac18cf..c610340f28bd 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
@@ -1,19 +1,15 @@
 import type { Pagination } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type Props<T extends ComponentProps<typeof Pagination>['showingResultsLabel'] = ComponentProps<typeof Pagination>['showingResultsLabel']> =
 	T extends (...args: any[]) => any ? Parameters<T> : never;
 
 export const useShowingResultsLabel = (): ((...params: Props) => string) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useCallback(
-		({ count, current, itemsPerPage }) =>
-			t('Showing_results_of', {
-				postProcess: 'sprintf',
-				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-			}),
+		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
 		[t],
 	);
 };
diff --git a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
index e7ce515ac496..3d68e3f4b6d3 100644
--- a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
+++ b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
@@ -1,8 +1,8 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ReactElement, ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type GenericUpsellModalProps = {
 	children?: ReactNode;
@@ -35,7 +35,7 @@ const GenericUpsellModal = ({
 	annotation,
 	...props
 }: GenericUpsellModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props}>
diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
index 6db61b2ec910..2cabfed460bd 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
@@ -1,10 +1,10 @@
 import type { IUpload } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, ButtonGroup, IconButton, Palette, Throbber } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useState } from 'react';
 import { FocusScope } from 'react-aria';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 import { Keyboard, Navigation, Zoom, A11y } from 'swiper';
 import type { SwiperRef } from 'swiper/react';
 import { type SwiperClass, Swiper, SwiperSlide } from 'swiper/react';
@@ -108,7 +108,7 @@ const swiperStyle = css`
 `;
 
 export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[]; onClose: () => void; loadMore?: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const swiperRef = useRef<SwiperRef>(null);
 	const [, setSwiperInst] = useState<SwiperClass>();
 	const [zoomScale, setZoomScale] = useState(1);
diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
index 8dcc55a93a48..97d91de95f62 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton, ModalBackdrop } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 
 import GenericError from '../GenericError/GenericError';
 
@@ -14,7 +14,7 @@ const closeButtonStyle = css`
 `;
 
 export const ImageGalleryError = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return createPortal(
 		<ModalBackdrop display='flex' justifyContent='center' color='pure-white'>
diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
index 588605786664..1c057584bd1f 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton, ModalBackdrop, Throbber } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 
 const closeButtonStyle = css`
 	position: absolute;
@@ -12,7 +12,7 @@ const closeButtonStyle = css`
 `;
 
 export const ImageGalleryLoading = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return createPortal(
 		<ModalBackdrop display='flex' justifyContent='center' color='pure-white'>
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
index 6f94be4ebc90..cbefeb2c72c1 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
@@ -1,14 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { usePruneWarningMessage } from '../../hooks/usePruneWarningMessage';
 import { withErrorBoundary } from '../withErrorBoundary';
 
 const RetentionPolicyCallout = ({ room }: { room: IRoom }) => {
 	const message = usePruneWarningMessage(room);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Callout arial-label={t('Retention_policy_warning_callout')} role='alert' aria-live='polite' type='warning'>
diff --git a/apps/meteor/client/components/LocalTime.tsx b/apps/meteor/client/components/LocalTime.tsx
index 498b2da9711e..100ba2ec6a62 100644
--- a/apps/meteor/client/components/LocalTime.tsx
+++ b/apps/meteor/client/components/LocalTime.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useUTCClock } from '../hooks/useUTCClock';
 
@@ -10,7 +10,7 @@ type LocalTimeProps = {
 
 const LocalTime = ({ utcOffset }: LocalTimeProps): ReactElement => {
 	const time = useUTCClock(utcOffset);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <>{t('Local_Time_time', { time })}</>;
 };
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index 0b7d2efa780e..69637fbd1260 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -1,10 +1,10 @@
 import { Box } from '@rocket.chat/fuselage';
 import { isExternal, getBaseURI } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import dompurify from 'dompurify';
 import { marked } from 'marked';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { renderMessageEmoji } from '../lib/utils/renderMessageEmoji';
 
@@ -95,7 +95,7 @@ const MarkdownText = ({
 	...props
 }: MarkdownTextProps) => {
 	const sanitizer = dompurify.sanitize;
-	const { t } = useTranslation();
+	const t = useTranslation();
 	let markedOptions: marked.MarkedOptions;
 
 	const schemes = 'http,https,notes,ftp,ftps,tel,mailto,sms,cid';
diff --git a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
index b19ccfee1769..04fcb29eed01 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type ReturnChatQueueModalProps = {
 	onMoveChat: () => void;
@@ -8,7 +8,7 @@ type ReturnChatQueueModalProps = {
 };
 
 const ReturnChatQueueModal = ({ onCancel, onMoveChat, ...props }: ReturnChatQueueModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props} data-qa-id='return-to-queue-modal'>
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index de13ee3aa9a4..67deb558c1ed 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Field, Button, TextInput, Modal, Box, FieldGroup, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type TranscriptModalProps = {
 	email: string;
@@ -14,7 +14,7 @@ type TranscriptModalProps = {
 };
 
 const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, onCancel, onDiscard, ...props }: TranscriptModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const {
 		register,
diff --git a/apps/meteor/client/components/Sidebar/Header.tsx b/apps/meteor/client/components/Sidebar/Header.tsx
index dcbf7f1cb505..e4bf5a5e7041 100644
--- a/apps/meteor/client/components/Sidebar/Header.tsx
+++ b/apps/meteor/client/components/Sidebar/Header.tsx
@@ -1,7 +1,7 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type HeaderProps = {
 	children?: ReactNode;
@@ -10,7 +10,7 @@ type HeaderProps = {
 };
 
 const Header = ({ title, onClose, children, ...props }: HeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' pb={16} {...props}>
diff --git a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
index b588e223d922..45eb6094572a 100644
--- a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
@@ -1,6 +1,6 @@
 import { Divider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Fragment, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { SidebarItem } from '../../lib/createSidebarItems';
 import { isSidebarItem } from '../../lib/createSidebarItems';
@@ -12,7 +12,7 @@ type SidebarItemsAssemblerProps = {
 };
 
 const SidebarItemsAssembler = ({ items, currentPath }: SidebarItemsAssemblerProps) => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
@@ -25,7 +25,7 @@ const SidebarItemsAssembler = ({ items, currentPath }: SidebarItemsAssemblerProp
 							icon={props.icon}
 							label={t((props.i18nLabel || props.name) as Parameters<typeof t>[0])}
 							currentPath={currentPath}
-							tag={props.tag && i18n.exists(props.tag) ? t(props.tag) : props.tag}
+							tag={props.tag && t.has(props.tag) ? t(props.tag) : props.tag}
 							externalUrl={props.externalUrl}
 							badge={props.badge}
 						/>
diff --git a/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx b/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
index 1eefc50baabd..cd0c25f03d86 100644
--- a/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
+++ b/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
@@ -1,6 +1,6 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import SidebarTogglerBadge from './SidebarTogglerBadge';
 
@@ -10,7 +10,7 @@ type SideBarTogglerButtonProps = {
 };
 
 const SideBarTogglerButton = ({ badge, onClick }: SideBarTogglerButtonProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box position='relative'>
diff --git a/apps/meteor/client/components/TextCopy.tsx b/apps/meteor/client/components/TextCopy.tsx
index f9e2ffc62284..467e954ddd65 100644
--- a/apps/meteor/client/components/TextCopy.tsx
+++ b/apps/meteor/client/components/TextCopy.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, Scrollable } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../hooks/useClipboardWithToast';
 
@@ -17,7 +17,7 @@ type TextCopyProps = {
 } & ComponentProps<typeof Box>;
 
 const TextCopy = ({ text, wrapper = defaultWrapperRenderer, ...props }: TextCopyProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { copy } = useClipboardWithToast(text);
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
index 4867d171aee8..4c91e274de68 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
@@ -1,8 +1,8 @@
 import { Box, PasswordInput, FieldGroup, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, Ref, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -15,7 +15,7 @@ type TwoFactorPasswordModalProps = {
 };
 
 const TwoFactorPasswordModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorPasswordModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus();
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index d6f167be8588..6f36c9c8ce26 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -1,8 +1,8 @@
 import { Box, TextInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -15,7 +15,7 @@ type TwoFactorTotpModalProps = {
 };
 
 const TwoFactorTotpModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorTotpModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus<HTMLInputElement>();
 
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index dbc152c7fbff..13d0523c92aa 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -13,17 +13,14 @@ type UrlChangeModalProps = {
 };
 
 const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<GenericModal variant='warning' title={t('Warning')} onConfirm={onConfirm} onClose={onClose} onCancel={onClose} confirmText={t('Yes')}>
 			<Box
 				is='p'
 				mbe={16}
 				dangerouslySetInnerHTML={{
-					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', {
-						postProcess: 'sprintf',
-						sprintf: [t('Site_Url'), siteUrl, currentUrl],
-					}),
+					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Site_Url'), siteUrl, currentUrl),
 				}}
 			/>
 			<p dangerouslySetInnerHTML={{ __html: t('Do_you_want_to_change_to_s_question', currentUrl) }} />
diff --git a/apps/meteor/client/components/UserCard/UserCard.tsx b/apps/meteor/client/components/UserCard/UserCard.tsx
index 98e1cce2ab78..bf143229cf65 100644
--- a/apps/meteor/client/components/UserCard/UserCard.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 import MarkdownText from '../MarkdownText';
@@ -52,7 +52,7 @@ const UserCard = ({
 	nickname,
 	...props
 }: UserCardProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isLayoutEmbedded = useEmbeddedLayout();
 
 	return (
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index ac879d21738b..a7f32f82f454 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -1,9 +1,9 @@
 import type { IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../hooks/useTimeAgo';
 import { useUserCustomFields } from '../../hooks/useUserCustomFields';
@@ -72,7 +72,7 @@ const UserInfo = ({
 	reason,
 	...props
 }: UserInfoProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const timeAgo = useTimeAgo();
 	const userDisplayName = useUserDisplayName({ name, username });
 	const userCustomFields = useUserCustomFields(customFields);
diff --git a/apps/meteor/client/components/WarningModal.tsx b/apps/meteor/client/components/WarningModal.tsx
index db0697f78c0d..00ae92e1d3bd 100644
--- a/apps/meteor/client/components/WarningModal.tsx
+++ b/apps/meteor/client/components/WarningModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type WarningModalProps = {
 	text: ReactNode;
@@ -13,7 +13,7 @@ type WarningModalProps = {
 };
 
 const WarningModal = ({ text, confirmText, close, cancel, cancelText, confirm, ...props }: WarningModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<Modal open {...props}>
 			<Modal.Header>
diff --git a/apps/meteor/client/components/dashboards/PeriodSelector.tsx b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
index d441fbf2f19a..6977e3334f4f 100644
--- a/apps/meteor/client/components/dashboards/PeriodSelector.tsx
+++ b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
@@ -1,7 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Period } from './periods';
 import { getPeriod } from './periods';
@@ -14,9 +14,9 @@ type PeriodSelectorProps<TPeriod extends Period['key']> = {
 };
 
 const PeriodSelector = <TPeriod extends Period['key']>({ periods, value, name, onChange }: PeriodSelectorProps<TPeriod>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
-	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(getPeriod(period).label)]), [periods, t]);
+	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(...getPeriod(period).label)]), [periods, t]);
 
 	return (
 		<Select
diff --git a/apps/meteor/client/components/dashboards/periods.ts b/apps/meteor/client/components/dashboards/periods.ts
index ff361b3136df..784ba9c8f6a6 100644
--- a/apps/meteor/client/components/dashboards/periods.ts
+++ b/apps/meteor/client/components/dashboards/periods.ts
@@ -1,6 +1,11 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 
+const label = (
+	translationKey: TranslationKey,
+	...replacements: unknown[]
+): readonly [translationKey: TranslationKey, ...replacements: unknown[]] => [translationKey, ...replacements];
+
 const lastNDays =
 	(
 		n: number,
@@ -24,47 +29,47 @@ const lastNDays =
 const periods = [
 	{
 		key: 'today',
-		label: 'Today' as TranslationKey,
+		label: label('Today'),
 		range: lastNDays(0),
 	},
 	{
 		key: 'this week',
-		label: 'This_week' as TranslationKey,
+		label: label('This_week'),
 		range: lastNDays(7),
 	},
 	{
 		key: 'last 7 days',
-		label: 'Last_7_days' as TranslationKey,
+		label: label('Last_7_days'),
 		range: lastNDays(7),
 	},
 	{
 		key: 'last 15 days',
-		label: 'Last_15_days' as TranslationKey,
+		label: label('Last_15_days'),
 		range: lastNDays(15),
 	},
 	{
 		key: 'this month',
-		label: 'This_month' as TranslationKey,
+		label: label('This_month'),
 		range: lastNDays(30),
 	},
 	{
 		key: 'last 30 days',
-		label: 'Last_30_days' as TranslationKey,
+		label: label('Last_30_days'),
 		range: lastNDays(30),
 	},
 	{
 		key: 'last 90 days',
-		label: 'Last_90_days' as TranslationKey,
+		label: label('Last_90_days'),
 		range: lastNDays(90),
 	},
 	{
 		key: 'last 6 months',
-		label: 'Last_6_months' as TranslationKey,
+		label: label('Last_6_months'),
 		range: lastNDays(180),
 	},
 	{
 		key: 'last year',
-		label: 'Last_year' as TranslationKey,
+		label: label('Last_year'),
 		range: lastNDays(365),
 	},
 ] as const;
diff --git a/apps/meteor/client/components/dashboards/usePeriodLabel.ts b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
index 4469015def78..8a8845703a49 100644
--- a/apps/meteor/client/components/dashboards/usePeriodLabel.ts
+++ b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Period } from './periods';
 import { getPeriod } from './periods';
 
 export const usePeriodLabel = (period: Period['key']): string => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
-	return useMemo(() => t(getPeriod(period).label), [period, t]);
+	return useMemo(() => t(...getPeriod(period).label), [period, t]);
 };
diff --git a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
index be07673e6aa6..9bc4f11fd3cd 100644
--- a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
+++ b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
@@ -1,9 +1,9 @@
 import type { DeviceManagementSession, DeviceManagementPopulatedSession, Serialized } from '@rocket.chat/core-typings';
 import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../lib/asyncState';
 import GenericNoResults from '../../GenericNoResults/GenericNoResults';
@@ -37,7 +37,7 @@ const DeviceManagementTable = <T extends DeviceManagementSession | DeviceManagem
 	setItemsPerPage,
 	paginationProps,
 }: DeviceManagementTableProps<T>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (!data && phase === AsyncStatePhase.REJECTED) {
 		return (
diff --git a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
index 3dbc25180a07..fc1c8c72f65b 100644
--- a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
+++ b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
@@ -1,10 +1,10 @@
 import { Banner, Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const LoggedOutBanner = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Banner variant='warning' icon={<Icon name='warning' size='x24' />}>
diff --git a/apps/meteor/client/components/message/IgnoredContent.tsx b/apps/meteor/client/components/message/IgnoredContent.tsx
index 93fa4d391fdc..b2dd7e726667 100644
--- a/apps/meteor/client/components/message/IgnoredContent.tsx
+++ b/apps/meteor/client/components/message/IgnoredContent.tsx
@@ -1,14 +1,14 @@
 import { Box, Icon, MessageBody } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type IgnoredContentProps = {
 	onShowMessageIgnored: () => void;
 };
 
 const IgnoredContent = ({ onShowMessageIgnored }: IgnoredContentProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const showMessageIgnored = (event: React.SyntheticEvent): void => {
 		event.stopPropagation();
diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
index 21a4d8484f8f..487c390a973f 100644
--- a/apps/meteor/client/components/message/MessageHeader.tsx
+++ b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -7,9 +7,9 @@ import {
 	MessageStatusPrivateIndicator,
 	MessageNameContainer,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../lib/getUserDisplayName';
 import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
@@ -27,7 +27,7 @@ type MessageHeaderProps = {
 };
 
 const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const formatTime = useFormatTime();
 	const formatDateAndTime = useFormatDateAndTime();
diff --git a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
index 9ed659b2801f..ac8ae925fbe5 100644
--- a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
+++ b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type ReadReceiptIndicatorProps = {
 	mid: IMessage['_id'];
@@ -10,7 +10,7 @@ type ReadReceiptIndicatorProps = {
 };
 
 const ReadReceiptIndicator = ({ mid, unread }: ReadReceiptIndicatorProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box
diff --git a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
index 378b998a2ee3..2868a1794778 100644
--- a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
+++ b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageBlock, MessageMetrics, MessageMetricsReply } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useChat } from '../../../views/room/contexts/ChatContext';
 
@@ -12,7 +12,7 @@ type BroadcastMetricsProps = {
 };
 
 const BroadcastMetrics = ({ username, message }: BroadcastMetricsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const chat = useChat();
 
diff --git a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
index 3d66580c0270..a14c75761de5 100644
--- a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
+++ b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
@@ -6,9 +6,9 @@ import {
 	MessageMetricsItemLabel,
 	MessageMetricsReply,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
 import { useGoToRoom } from '../../../views/room/hooks/useGoToRoom';
@@ -21,7 +21,7 @@ type DiscussionMetricsProps = {
 };
 
 const DiscussionMetrics = ({ lm, count, rid, drid }: DiscussionMetricsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const format = useTimeAgo();
 
 	const goToRoom = useGoToRoom();
diff --git a/apps/meteor/client/components/message/content/Reactions.tsx b/apps/meteor/client/components/message/content/Reactions.tsx
index d16f6aefb22c..c71afcf3feb1 100644
--- a/apps/meteor/client/components/message/content/Reactions.tsx
+++ b/apps/meteor/client/components/message/content/Reactions.tsx
@@ -1,9 +1,9 @@
 import { useToolbar } from '@react-aria/toolbar';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageReactions, MessageReactionAction } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes, KeyboardEvent, ReactElement } from 'react';
 import React, { useContext, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MessageListContext, useOpenEmojiPicker, useUserHasReacted } from '../list/MessageListContext';
 import Reaction from './reactions/Reaction';
@@ -14,7 +14,7 @@ type ReactionsProps = {
 } & HTMLAttributes<HTMLDivElement>;
 
 const Reactions = ({ message, ...props }: ReactionsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const ref = useRef(null);
 	const hasReacted = useUserHasReacted(message);
 	const openEmojiPicker = useOpenEmojiPicker(message);
diff --git a/apps/meteor/client/components/message/content/actions/MessageAction.tsx b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
index c5b4081dfc5e..7a787cdd7508 100644
--- a/apps/meteor/client/components/message/content/actions/MessageAction.tsx
+++ b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
@@ -1,9 +1,9 @@
 import { Button } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const resolveLegacyIcon = (legacyIcon: IconName | `icon-${IconName | 'videocam'}`): IconName => {
 	if (legacyIcon === 'icon-videocam') {
@@ -23,7 +23,7 @@ type MessageActionProps = {
 };
 
 const MessageAction = ({ icon, methodId, i18nLabel, label, runAction, danger }: MessageActionProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const resolvedIcon = resolveLegacyIcon(icon);
 
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
index 175c41b0f76b..284cb0cecbf2 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Action from '../../Action';
 
 type AttachmentDownloadBaseProps = Omit<ComponentProps<typeof Action>, 'icon'> & { title?: string | undefined; href: string };
 
 const AttachmentDownloadBase = ({ title, href, disabled, ...props }: AttachmentDownloadBaseProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Action
diff --git a/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx b/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
index fbd65900413c..cb61a16ced57 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
@@ -1,15 +1,15 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ImageBox from './ImageBox';
 
 type LoadProps = ComponentPropsWithoutRef<typeof Box> & { load: () => void };
 
 const Load = ({ load, ...props }: LoadProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const clickable = css`
 		cursor: pointer;
 		background: ${Palette.surface['surface-tint']};
diff --git a/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx b/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
index fa959a1dd276..6654800f9e13 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
@@ -1,14 +1,14 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ImageBox from './ImageBox';
 
 type RetryProps = { retry: () => void };
 
 const Retry = ({ retry }: RetryProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const clickable = css`
 		cursor: pointer;
 		background: ${Palette.surface['surface-tint']};
diff --git a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
index 14697087294e..af449db9a41c 100644
--- a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
+++ b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Action from '../Action';
 
 type CollapsibleContentProps = Omit<ComponentProps<typeof Action>, 'icon'> & { collapsed?: boolean };
 
 const CollapsibleContent = ({ collapsed = false, ...props }: CollapsibleContentProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Action title={collapsed ? t('Uncollapse') : t('Collapse')} icon={!collapsed ? 'chevron-down' : 'chevron-left'} {...props} />;
 };
 
diff --git a/apps/meteor/client/components/message/content/location/MapViewFallback.tsx b/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
index 23c0e98320ff..3e89cb03cec7 100644
--- a/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
+++ b/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
@@ -1,14 +1,14 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MapViewFallbackProps = {
 	linkUrl: string;
 };
 
 const MapViewFallback = ({ linkUrl }: MapViewFallbackProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box is='span' fontScale='p2' display='inline-flex' alignItems='center' paddingBlock={4}>
diff --git a/apps/meteor/client/components/message/content/location/MapViewImage.tsx b/apps/meteor/client/components/message/content/location/MapViewImage.tsx
index 1f94006bd0db..4cf33040938d 100644
--- a/apps/meteor/client/components/message/content/location/MapViewImage.tsx
+++ b/apps/meteor/client/components/message/content/location/MapViewImage.tsx
@@ -1,6 +1,6 @@
 import { ExternalLink } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MapViewImageProps = {
 	linkUrl: string;
@@ -8,7 +8,7 @@ type MapViewImageProps = {
 };
 
 const MapViewImage = ({ linkUrl, imageUrl }: MapViewImageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<ExternalLink to={linkUrl}>
diff --git a/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx b/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
index 0bc8975c80f8..a71f50a953b6 100644
--- a/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
+++ b/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
@@ -1,8 +1,8 @@
 import { Skeleton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useGetMessageByID } from '../../../../views/room/contextualBar/Threads/hooks/useGetMessageByID';
 import MarkdownText from '../../../MarkdownText';
@@ -37,7 +37,7 @@ const getTranslationKey = (users: string[], mine: boolean): TranslationKey => {
 };
 
 const ReactionTooltip = ({ emojiName, usernames, mine, messageId, showRealName, username }: ReactionTooltipProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const key = getTranslationKey(usernames, mine);
 
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
index 8761b60cc68f..50f978e243b3 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
@@ -1,7 +1,7 @@
 import { MessageGenericPreview } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MessageCollapsible from '../../MessageCollapsible';
 import OEmbedPreviewContent from './OEmbedPreviewContent';
@@ -10,7 +10,7 @@ import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 type OEmbedCollapsibleProps = { children?: ReactNode } & OEmbedPreviewMetadata;
 
 const OEmbedCollapsible = ({ children, ...props }: OEmbedCollapsibleProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<MessageCollapsible title={t('Link_Preview')}>
diff --git a/apps/meteor/client/components/message/header/MessageRoles.tsx b/apps/meteor/client/components/message/header/MessageRoles.tsx
index 26942e5d04f6..83526f349469 100644
--- a/apps/meteor/client/components/message/header/MessageRoles.tsx
+++ b/apps/meteor/client/components/message/header/MessageRoles.tsx
@@ -1,7 +1,7 @@
 import { MessageRole, MessageRoles as FuselageMessageRoles } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MessageRolesProps = {
 	roles: Array<string>;
@@ -9,7 +9,7 @@ type MessageRolesProps = {
 };
 
 const MessageRoles = ({ roles, isBot }: MessageRolesProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<FuselageMessageRoles>
diff --git a/apps/meteor/client/components/message/notification/MessageNotification.tsx b/apps/meteor/client/components/message/notification/MessageNotification.tsx
index 7dd75ca5ed31..b6d8ac007347 100644
--- a/apps/meteor/client/components/message/notification/MessageNotification.tsx
+++ b/apps/meteor/client/components/message/notification/MessageNotification.tsx
@@ -1,9 +1,9 @@
 import type { Palette } from '@rocket.chat/fuselage';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MessageNotificationProps = {
 	label: TranslationKey;
@@ -11,7 +11,7 @@ type MessageNotificationProps = {
 };
 
 const MessageNotification = ({ label, bg }: MessageNotificationProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Box width='x8' aria-label={t(label)} borderRadius='full' height='x8' bg={bg} />;
 };
 
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 5bf1d8846498..155599c5b51d 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,8 +1,8 @@
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
 
@@ -24,7 +24,7 @@ type MessageActionMenuProps = {
 };
 
 const MessageActionMenu = ({ options, onChangeMenuVisibility, context, isMessageEncrypted }: MessageActionMenuProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const id = useUniqueId();
 	const groupOptions = options
 		.map((option) => ({
diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
index df0d62292422..eeba342c3f31 100644
--- a/apps/meteor/client/components/message/variants/SystemMessage.tsx
+++ b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -13,9 +13,9 @@ import {
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, KeyboardEvent } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
@@ -40,7 +40,7 @@ type SystemMessageProps = {
 } & ComponentProps<typeof MessageSystem>;
 
 const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatTime = useFormatTime();
 	const formatDateAndTime = useFormatDateAndTime();
 	const { triggerProps, openUserCard } = useUserCard();
diff --git a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
index f7fa072a7406..c423d09a9527 100644
--- a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
+++ b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
@@ -13,9 +13,9 @@ import {
 	MessageStatusIndicatorItem,
 } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import {
@@ -42,7 +42,7 @@ const ThreadMessagePreview = ({ message, showUserAvatar, sequential, ...props }:
 	const parentMessage = useParentMessage(message.tmid);
 
 	const translated = useShowTranslated(message);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const isSelecting = useIsSelecting();
 	const toggleSelected = useToggleSelect(message._id);
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
index 3d468f57f464..33bce63745e2 100644
--- a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
+++ b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
@@ -2,9 +2,9 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { isQuoteAttachment, isE2EEMessage } from '@rocket.chat/core-typings';
 import { PreviewMarkup } from '@rocket.chat/gazzodown';
 import type { Root } from '@rocket.chat/message-parser';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GazzodownText from '../../../GazzodownText';
 
@@ -13,7 +13,7 @@ type ThreadMessagePreviewBodyProps = {
 };
 
 const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isEncryptedMessage = isE2EEMessage(message);
 
 	const getMessage = () => {
diff --git a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
index 3d6f4be8c0fc..615fee8714aa 100644
--- a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
+++ b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
@@ -1,14 +1,14 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Avatar, Box, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserAvatarURL } from '../../../../app/utils/client';
 import { parseOutboundPhoneNumber } from '../../../lib/voip/parseOutboundPhoneNumber';
 
 export const VoipRoomForeword = ({ room }: { room: IVoipRoom }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const avatarUrl = getUserAvatarURL(room.name) as string;
 
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.ts b/apps/meteor/client/hooks/useDecryptedMessage.ts
index f98012b11f2b..181d97b197c7 100644
--- a/apps/meteor/client/hooks/useDecryptedMessage.ts
+++ b/apps/meteor/client/hooks/useDecryptedMessage.ts
@@ -1,13 +1,13 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 
 export const useDecryptedMessage = (message: IMessage): string => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [decryptedMessage, setDecryptedMessage] = useSafely(useState(t('E2E_message_encrypted_placeholder')));
 
 	useEffect(() => {
diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
index c6a55716df65..199d1507e284 100644
--- a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
+++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
@@ -1,6 +1,5 @@
 import { Emitter } from '@rocket.chat/emitter';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import type { TFunction } from 'i18next';
 import { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -18,7 +17,7 @@ if ('serviceWorker' in navigator) {
 	});
 }
 
-export const registerDownloadForUid = (uid: string, t: TFunction, title?: string) => {
+export const registerDownloadForUid = (uid: string, t: ReturnType<typeof useTranslation>['t'], title?: string) => {
 	ee.once(uid, ({ result }) => {
 		downloadAs({ data: [new Blob([result])] }, title ?? t('Download'));
 	});
diff --git a/apps/meteor/client/hooks/useFormatDuration.ts b/apps/meteor/client/hooks/useFormatDuration.ts
index 807190c63f5e..61215074dfbd 100644
--- a/apps/meteor/client/hooks/useFormatDuration.ts
+++ b/apps/meteor/client/hooks/useFormatDuration.ts
@@ -1,8 +1,8 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const useFormatDuration = (): ((duration: number) => string) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return useCallback(
 		(duration) => {
diff --git a/apps/meteor/client/hooks/useHighlightedCode.ts b/apps/meteor/client/hooks/useHighlightedCode.ts
index e059bf3f1181..4e3405ca3034 100644
--- a/apps/meteor/client/hooks/useHighlightedCode.ts
+++ b/apps/meteor/client/hooks/useHighlightedCode.ts
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import hljs, { register } from '../../app/markdown/lib/hljs';
 
 export function useHighlightedCode(language: string, text: string): string {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { isLoading } = useQuery(['register-highlight-language', language], async () => {
 		try {
 			await register(language);
diff --git a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index 640dbd375288..a158a13f9711 100644
--- a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -1,15 +1,15 @@
 import { Field, FieldLabel, FieldRow, FieldError, TextInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const BusinessHoursMultiple = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		control,
 		formState: { errors },
diff --git a/apps/meteor/client/omnichannel/additionalForms/ContactManager.js b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
index f92c4720a213..52ab527ef841 100644
--- a/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
+++ b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
@@ -1,12 +1,12 @@
 import { Field } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../components/AutoCompleteAgent';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 export const ContactManager = ({ value: userId, handler }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
 	if (!hasLicense) {
diff --git a/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
index 8ee9cf6ddbf9..d6c78c3c043c 100644
--- a/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
@@ -1,10 +1,10 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, FieldHint, ToggleSwitch, TextInput, Select } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
@@ -17,7 +17,7 @@ const checkIsOptionsValid = (value: string) => {
 };
 
 const CustomFieldsAdditionalForm = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		control,
 		watch,
diff --git a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
index e65e4da01b96..47ee87f7ee2a 100644
--- a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
@@ -2,8 +2,8 @@ import { Field, FieldLabel, FieldRow, FieldHint, Box, PaginatedMultiSelectFilter
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useDepartmentsList } from '../../components/Omnichannel/hooks/useDepartmentsList';
 import { useRecordList } from '../../hooks/lists/useRecordList';
@@ -18,7 +18,7 @@ type DepartmentForwardingProps = {
 };
 
 export const DepartmentForwarding = ({ departmentId, value = [], handler, label }: DepartmentForwardingProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
index dda85c9ff08b..75a2656dc4ea 100644
--- a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
@@ -1,14 +1,14 @@
 import { NumberInput, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const MaxChatsPerAgent = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control } = useFormContext();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
index b628d2622649..8d68f0ec29f3 100644
--- a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { InfoPanelLabel, InfoPanelText } from '../../components/InfoPanel';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const MaxChatsPerAgentDisplay = ({ maxNumberSimultaneousChat = 0 }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
 	if (!hasLicense) {
diff --git a/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
index 3ad0b25b10d6..da157e06b3f0 100644
--- a/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
@@ -3,9 +3,9 @@ import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Options, Box, Option, Field, FieldLabel, FieldRow, SelectLegacy } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback, forwardRef, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import { PriorityIcon } from '../priorities/PriorityIcon';
@@ -18,7 +18,7 @@ type PrioritiesSelectProps = {
 };
 
 export const PrioritiesSelect = ({ value = '', label, options, onChange }: PrioritiesSelectProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const [sorting] = useState<Record<string, LivechatPriorityWeight>>({});
 
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
index 6f57a29e116f..90dd6bd4ed32 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelCannedResponse, Serialized } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../components/Skeleton';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
@@ -12,7 +12,7 @@ const CannedResponseEditWithDepartmentData = ({ cannedResponseData }: { cannedRe
 	const departmentId = useMemo(() => cannedResponseData?.departmentId, [cannedResponseData]) as string;
 	const { value: departmentData, phase: state, error } = useEndpointData('/v1/livechat/department/:_id', { keys: { _id: departmentId } });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (state === AsyncStatePhase.LOADING) {
 		return <FormSkeleton />;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
index bb869189e1ba..4746e7df6bea 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../components/AutoCompleteAgent';
 
@@ -18,7 +18,7 @@ type CannedResponsesFilterProps = {
 };
 
 const CannedResponsesFilter = ({ createdBy, setCreatedBy, sharing, setSharing, text, setText }: CannedResponsesFilterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sharingList: SelectOption[] = [
 		['', t('All')],
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
index 7e59aaa7cf8e..54ce88cccb7e 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Divider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, RefObject, SetStateAction } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type InsertPlaceholderDropdownProps = {
 	onChange: any;
@@ -11,7 +11,7 @@ type InsertPlaceholderDropdownProps = {
 };
 
 const InsertPlaceholderDropdown = ({ onChange, textAreaRef, setVisible }: InsertPlaceholderDropdownProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const clickable = css`
 		cursor: pointer;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
index e4ed5f58ef8c..6bef3f10efdc 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
@@ -1,8 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEventHandler } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -37,7 +37,7 @@ const CannedResponse = ({
 	onClickEdit,
 	onClickUse,
 }: CannedResponseProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const scope = useScopeDict(dataScope, departmentName);
 
 	return (
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
index 5734cf2e93bf..cd9907f271a5 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
@@ -1,9 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, ContextualbarEmptyContent, Icon, Margins, Select, TextInput } from '@rocket.chat/fuselage';
 import { useAutoFocus, useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, FormEventHandler, MouseEvent, ReactElement, SetStateAction } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -54,7 +54,7 @@ const CannedResponseList = ({
 	onClickUse,
 	reload,
 }: CannedResponseListProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 
 	const { context: cannedId } = useRoomToolbox();
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
index 29b4e4326dd1..224e0c5dff55 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
@@ -1,9 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { memo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useScopeDict } from '../../../hooks/useScopeDict';
 
@@ -15,7 +15,7 @@ type ItemProps = {
 };
 
 const Item = ({ data, allowUse, onClickItem, onClickUse }: ItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const scope = useScopeDict(data.scope, data.departmentName);
 
diff --git a/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
index df449a21f64e..749f40d28a60 100644
--- a/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
+++ b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useIsRoomOverMacLimit } from '../../../hooks/omnichannel/useIsRoomOverMacLimit';
 
@@ -11,7 +11,7 @@ type RoomActivityIconProps = {
 };
 
 export const RoomActivityIcon = ({ room }: RoomActivityIconProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isRoomOverMacLimit = useIsRoomOverMacLimit(room);
 
 	return isRoomOverMacLimit ? (
diff --git a/apps/meteor/client/omnichannel/hooks/useScopeDict.ts b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
index ffab5d55aaf0..da8fd60b7360 100644
--- a/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
+++ b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
@@ -1,8 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 export const useScopeDict = (scope: IOmnichannelCannedResponse['scope'], departmentName: ILivechatDepartment['name']): string => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const dict: Record<string, string> = {
 		global: t('Public'),
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
index cbf2e6ec88ff..dffbde494e7a 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import MonitorsTable from './MonitorsTable';
 
 const MonitorsPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page flexDirection='row'>
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
index 5d8c55d5330c..a85dd72c868d 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -10,7 +10,7 @@ type PrioritiesResetModalProps = {
 };
 
 export const PrioritiesResetModal = ({ onCancel, onReset }: PrioritiesResetModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
index 008147d49e1b..7e5368d7a0a5 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
@@ -1,7 +1,7 @@
 import type { ILivechatPriority, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../components/GenericNoResults';
 import {
@@ -22,7 +22,7 @@ type PrioritiesTableProps = {
 };
 
 export const PrioritiesTable = ({ priorities, onRowClick, isLoading }: PrioritiesTableProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const headers = (
 		<>
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
index b0232c6076a6..fec79d762bcd 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
@@ -1,7 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../components/Skeleton';
 import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo';
@@ -13,7 +13,7 @@ type PriorityEditFormWithDataProps = Omit<PriorityEditFormProps, 'data'> & {
 };
 
 function PriorityEditFormWithData({ priorityId, ...props }: PriorityEditFormWithDataProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isInitialLoading, isError } = usePriorityInfo(priorityId);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
index 8aac2a73f85c..7f6a486436a3 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
@@ -2,9 +2,9 @@ import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import { Box, Icon, Palette, StatusBullet } from '@rocket.chat/fuselage';
 import type { Keys } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
 
@@ -37,7 +37,7 @@ const PRIORITY_ICONS: Record<number, { iconName: Keys; color: string }> = {
 };
 
 export const PriorityIcon = ({ level, size = 20, showUnprioritized = false, ...props }: PriorityIconProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { iconName, color } = PRIORITY_ICONS[level] || {};
 	const { data: priorities } = useOmnichannelPriorities();
 
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
index 16091476d10c..e31fc3a44a5a 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -21,7 +21,7 @@ type PriorityListProps = {
 };
 
 const PriorityList = ({ priorityId, onClose, onSave }: PriorityListProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<ContextualbarDialog>
diff --git a/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx b/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
index 2feb7ca01439..90b838758234 100644
--- a/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
@@ -1,6 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	GenericTable,
@@ -22,7 +22,7 @@ type AgentsTableProps = {
 };
 
 export const AgentsTable = memo(({ data, sortBy, sortDirection, setSort }: AgentsTableProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const onHeaderClick = useMutableCallback((id) => {
 		setSort(id, sortDirection === 'asc' ? 'desc' : 'asc');
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
index 2df983140748..e0253f11665c 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
@@ -1,7 +1,7 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
 import type { Keys } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type CardEmpryStateProps = {
 	icon?: Keys;
@@ -9,7 +9,7 @@ type CardEmpryStateProps = {
 };
 
 export const ReportCardEmptyState = ({ icon, subtitle }: CardEmpryStateProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<States width='100%' height='100%'>
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
index b8168e366299..023a4b5c918b 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
@@ -1,14 +1,14 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type ReportCardErrorStateProps = {
 	onRetry?: () => void;
 };
 
 export const ReportCardErrorState = ({ onRetry }: ReportCardErrorStateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<States width='100%' height='100%'>
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
index 23a6c21d33d8..4ca7066bbc08 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
@@ -1,7 +1,6 @@
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
 import { getPeriodRange } from '../../../components/dashboards/periods';
@@ -17,7 +16,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useAgentsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-agents-period', PERIOD_OPTIONS);
 	const getConversationsByAgent = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-agent');
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'total'>('total', 'desc');
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
index 864181a6464e..ce13de2f546e 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
@@ -1,10 +1,8 @@
 import { capitalize } from '@rocket.chat/string-helpers';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -23,7 +21,7 @@ const TYPE_LABEL: Record<string, TranslationKey> = {
 	'api': 'Custom_Integration',
 };
 
-const formatItem = (item: { label: string; value: number }, total: number, t: TFunction): DataItem => {
+const formatItem = (item: { label: string; value: number }, total: number, t: TranslationContextValue['translate']): DataItem => {
 	const percentage = total > 0 ? round((item.value / total) * 100) : 0;
 	const label = `${t(TYPE_LABEL[item.label]) || capitalize(item.label)}`;
 	return {
@@ -34,12 +32,12 @@ const formatItem = (item: { label: string; value: number }, total: number, t: TF
 	};
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
 	return data.map((item) => formatItem(item, total, t));
 };
 
 export const useChannelsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-channels-period', PERIOD_OPTIONS);
 	const getConversationsBySource = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-source');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
index f185e347e8d5..d0cf335c09d9 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Period } from '../../../components/dashboards/periods';
 import { formatAttachmentName } from '../utils/formatAttachmentName';
@@ -13,7 +13,7 @@ type DefaultDownloadHookProps = {
 };
 
 export const useDefaultDownload = ({ columnName, title, period, data }: DefaultDownloadHookProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useMemo(() => {
 		const { start, end } = formatPeriodRange(period);
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
index fe4bfaf7d723..0e207c3d113a 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
@@ -1,7 +1,6 @@
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -16,7 +15,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useDepartmentsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-department-period', PERIOD_OPTIONS);
 	const getConversationsByDepartment = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-department');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
index d8f17dd5b79f..3c725f9bc85b 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
@@ -1,9 +1,7 @@
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -19,7 +17,7 @@ const STATUSES: Record<string, { label: TranslationKey; color: string }> = {
 	Closed: { label: 'Omnichannel_Reports_Status_Closed', color: COLORS.danger },
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
 	return data.map((item) => {
 		const status = STATUSES[item.label];
 		const percentage = total > 0 ? round((item.value / total) * 100) : 0;
@@ -35,7 +33,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 };
 
 export const useStatusSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-status-period', PERIOD_OPTIONS);
 	const getConversationsByStatus = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-status');
 	const { start, end } = getPeriodRange(period);
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
index 93fe56b96b8d..5688fc24c6b5 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
@@ -1,8 +1,7 @@
 import { Palette } from '@rocket.chat/fuselage';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -24,7 +23,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useTagsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-tags-period', PERIOD_OPTIONS);
 	const getConversationsByTags = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-tags');
 
diff --git a/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx b/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
index 11dbecccfab7..692bd1c33032 100644
--- a/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AgentsTable, BarChart, ReportCard } from '../components';
 import { useAgentsSection } from '../hooks';
@@ -11,7 +11,7 @@ const BREAKPOINT = 768;
 
 export const AgentsSection = () => {
 	const { data, sortBy, sortDirection, setSort, ...config } = useAgentsSection();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { ref, contentBoxSize: { inlineSize: cardWidth = 200 } = {} } = useResizeObserver<HTMLElement>();
 	const width = cardWidth * 0.9;
diff --git a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
index 6874c551da52..ab12af6af1cf 100644
--- a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
+++ b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
@@ -1,8 +1,8 @@
-import type { TFunction } from 'i18next';
+import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 
 import { getPeriod, type Period } from '../../../components/dashboards/periods';
 
-export const formatPeriodDescription = (periodKey: Period['key'], t: TFunction) => {
+export const formatPeriodDescription = (periodKey: Period['key'], t: TranslationContextValue['translate']) => {
 	const { label } = getPeriod(periodKey);
-	return t(label).toLocaleLowerCase();
+	return t(...label).toLocaleLowerCase();
 };
diff --git a/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
index 4b6d6d395523..9f0a21086868 100644
--- a/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
+++ b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
@@ -1,8 +1,8 @@
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
@@ -23,7 +23,7 @@ const AutoCompleteTagsMultiple = ({
 	department,
 	viewAll = false,
 }: AutoCompleteTagsMultipleProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [tagsFilter, setTagsFilter] = useState('');
 
 	const debouncedTagsFilter = useDebouncedValue(tagsFilter, 500);
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx b/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
index 791c2189ec6b..6779fb8d6c82 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
@@ -1,12 +1,12 @@
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes, Ref } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from './useSidebarListNavigation';
 
 const RoomListWrapper = forwardRef(function RoomListWrapper(props: HTMLAttributes<HTMLDivElement>, ref: Ref<HTMLDivElement>) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
 
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
index 1f66217d76e5..bf7736b5899a 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useLicense, useLicenseName } from '../../hooks/useLicense';
 
 export const SidebarFooterWatermark = (): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const response = useLicense();
 
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
index ba7bbd977e03..119476ecd89a 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -2,9 +2,9 @@ import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-t
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
@@ -50,7 +50,7 @@ export const VoipFooter = ({
 	options,
 }: VoipFooterPropsType): ReactElement => {
 	const contactLabel = useOmnichannelContactLabel(caller);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const cssClickable =
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
index 43e6be7c583d..8f0a26222679 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../components/GenericNoResults';
 
 const FederatedRoomListEmptyPlaceholder = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
index fd37aac816f4..f3307436bc07 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListErrorBoundaryProps = {
 	children?: ReactNode;
@@ -11,7 +11,7 @@ type FederatedRoomListErrorBoundaryProps = {
 };
 
 const FederatedRoomListErrorBoundary = ({ children, resetKeys }: FederatedRoomListErrorBoundaryProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<QueryErrorResetBoundary>
 			{({ reset }): ReactElement => (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
index c096c74c08a4..01cb22c2e1c5 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
@@ -2,8 +2,8 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListItemProps = IFederationPublicRooms & {
 	disabled: boolean;
@@ -23,7 +23,7 @@ const FederatedRoomListItem = ({
 	canJoin,
 	disabled,
 }: FederatedRoomListItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const nameId = useUniqueId();
 
 	return (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
index 0108958e3e64..741eadf7bc7e 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
@@ -1,7 +1,7 @@
 import { Modal, Skeleton } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearchModalContent from './MatrixFederationSearchModalContent';
 import { useMatrixServerList } from './useMatrixServerList';
@@ -12,7 +12,7 @@ type MatrixFederationSearchProps = {
 };
 
 const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading } = useMatrixServerList();
 	const titleId = useUniqueId();
 
diff --git a/apps/meteor/client/sidebar/header/UserMenu.tsx b/apps/meteor/client/sidebar/header/UserMenu.tsx
index 7d964c2122bc..b106caa20b16 100644
--- a/apps/meteor/client/sidebar/header/UserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenu.tsx
@@ -7,15 +7,15 @@ import {
 	useHandleMenuAction,
 	type GenericMenuItemProps,
 } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import UserAvatarWithStatus from './UserAvatarWithStatus';
 import UserAvatarWithStatusUnstable from './UserAvatarWithStatusUnstable';
 import { useUserMenu } from './hooks/useUserMenu';
 
 const UserMenu = ({ user }: { user: IUser }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [isOpen, setIsOpen] = useState(false);
 
 	const sections = useUserMenu(user);
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index 14c9f2cc83c5..a0016db7e75c 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type AdministrationProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Administration = (props: AdministrationProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useAdministrationMenu();
 
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
index 3a59b0adea43..3392db4ed917 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const CreateRoom = (props: CreateRoomProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useCreateRoom();
 
diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx
index e4d1d66cf3af..1fe4b947c661 100644
--- a/apps/meteor/client/sidebar/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Sort = (props: SortProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useSortMenu();
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
index 23f71d67ebc5..cf71cf4223b9 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
@@ -1,12 +1,12 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { useAdministrationItems } from './useAdministrationItems';
 import { useAppsItems } from './useAppsItems';
 import { useAuditItems } from './useAuditItems';
 
 export const useAdministrationMenu = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const administrationItems = useAdministrationItems();
 	const appItems = useAppsItems();
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
index cd0abc9bdfb2..7e628378749d 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
@@ -1,5 +1,5 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
@@ -9,7 +9,7 @@ export const useMatrixFederationItems = ({
 }: {
 	isMatrixEnabled: string | number | boolean | null | undefined;
 }): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const searchFederatedRooms = useCreateRoomModal(MatrixFederationSearch);
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
index af6a73ce6eab..bea1d999997e 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { useGroupingListItems } from './useGroupingListItems';
 import { useSortModeItems } from './useSortModeItems';
 import { useViewModeItems } from './useViewModeItems';
 
 export const useSortMenu = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const viewModeItems = useViewModeItems();
 	const sortModeItems = useSortModeItems();
diff --git a/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx b/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
index c2578d076f1a..53cbd0340339 100644
--- a/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
+++ b/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
@@ -1,10 +1,10 @@
 import { Icon, SidebarBanner } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const OverMacLimitSection = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleClick = () => {
 		window.open('https://rocket.chat/pricing', '_blank');
diff --git a/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
index c8f56ffe5458..fb12c3e6fc3b 100644
--- a/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
@@ -1,11 +1,11 @@
 import { SidebarBanner } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useStatusDisabledModal } from '../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
 const StatusDisabledSection = ({ onDismiss }: { onDismiss: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
index e0fa30ca2345..2cd263630da7 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
@@ -1,13 +1,13 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../contexts/CallContext';
 import { useDialModal } from '../../../hooks/useDialModal';
 
 export const OmniChannelCallDialPad = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
index dd5186aeb479..77efcd5057e1 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const OmnichannelCallToggleError = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Sidebar.TopBar.Action icon='phone' danger data-tooltip={t('Error')} disabled {...props} />;
 };
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
index 8318e9199900..673a3225482c 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const OmnichannelCallToggleLoading = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Sidebar.TopBar.Action icon='phone' data-tooltip={t('Loading')} aria-label={t('VoIP_Toggle')} disabled {...props} />;
 };
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
index 8205d0287768..497e0143bfaa 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
@@ -1,12 +1,12 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../../contexts/CallContext';
 
 export const OmnichannelCallToggleReady = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const caller = useCallerInfo();
 	const unregister = useCallUnregisterClient();
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
index 09e80f12765c..b4d4b4a44c98 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
@@ -1,14 +1,14 @@
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ForwardedRef, HTMLAttributes } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from './useSidebarListNavigation';
 
 type RoomListWrapperProps = HTMLAttributes<HTMLDivElement>;
 
 const RoomListWrapper = forwardRef(function RoomListWrapper(props: RoomListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
 
diff --git a/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
index 1f66217d76e5..bf7736b5899a 100644
--- a/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useLicense, useLicenseName } from '../../hooks/useLicense';
 
 export const SidebarFooterWatermark = (): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const response = useLicense();
 
diff --git a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
index 9344ba33c9ad..6e67baefdec8 100644
--- a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
@@ -2,9 +2,9 @@ import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-t
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
@@ -50,7 +50,7 @@ const VoipFooter = ({
 	options,
 }: VoipFooterProps): ReactElement => {
 	const contactLabel = useOmnichannelContactLabel(caller);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const cssClickable =
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
index 43e6be7c583d..8f0a26222679 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../components/GenericNoResults';
 
 const FederatedRoomListEmptyPlaceholder = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
index 1608058528bc..6931c98f219e 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListErrorBoundaryProps = {
 	children?: ReactNode;
@@ -11,7 +11,7 @@ type FederatedRoomListErrorBoundaryProps = {
 };
 
 const FederatedRoomListErrorBoundary = ({ children, resetKeys }: FederatedRoomListErrorBoundaryProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<QueryErrorResetBoundary>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
index 002c8a5ac9da..dfaa79ed44de 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListItemProps = IFederationPublicRooms & {
 	disabled: boolean;
@@ -22,7 +22,7 @@ const FederatedRoomListItem = ({
 	canJoin,
 	disabled,
 }: FederatedRoomListItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mb={16} pi={24} is='li' display='flex' flexDirection='column' w='full' name={canonicalAlias}>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
index 9ea119aabb18..f3dc779d28c1 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
@@ -1,6 +1,6 @@
 import { Modal, Skeleton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearchModalContent from './MatrixFederationSearchModalContent';
 import { useMatrixServerList } from './useMatrixServerList';
@@ -11,7 +11,7 @@ type MatrixFederationSearchProps = {
 };
 
 const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading } = useMatrixServerList();
 
 	return (
diff --git a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
index 5c56b44554b8..f12de10f19f9 100644
--- a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
@@ -1,15 +1,15 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const CreateRoom = (props: CreateRoomProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useCreateRoom();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
index dcfa84dd71bc..d5394c28c6e6 100644
--- a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
@@ -1,15 +1,15 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Sort = (props: SortProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useSortMenu();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
index cd0abc9bdfb2..7e628378749d 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
@@ -1,5 +1,5 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
@@ -9,7 +9,7 @@ export const useMatrixFederationItems = ({
 }: {
 	isMatrixEnabled: string | number | boolean | null | undefined;
 }): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const searchFederatedRooms = useCreateRoomModal(MatrixFederationSearch);
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
index af6a73ce6eab..bea1d999997e 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { useGroupingListItems } from './useGroupingListItems';
 import { useSortModeItems } from './useSortModeItems';
 import { useViewModeItems } from './useViewModeItems';
 
 export const useSortMenu = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const viewModeItems = useViewModeItems();
 	const sortModeItems = useSortModeItems();
diff --git a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
index 9994a0e66e77..a0f3245e8835 100644
--- a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
@@ -1,13 +1,13 @@
 import { SidebarV2Banner } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useStatusDisabledModal } from '../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
 type StatusDisabledSectionProps = { onDismiss: () => void };
 
 const StatusDisabledSection = ({ onDismiss }: StatusDisabledSectionProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
diff --git a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
index 2ecb46e44ee7..ac98cd15cd89 100644
--- a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
@@ -1,6 +1,5 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { TranslationContext } from '@rocket.chat/ui-contexts';
-import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import type { ContextType, ReactElement, ReactNode } from 'react';
 import React, { useContext, useMemo } from 'react';
@@ -31,7 +30,7 @@ const TranslationContextMock = ({ children }: TranslationContextMockProps): Reac
 		const translate = (key: string, ...replaces: unknown[]): string => {
 			if (typeof replaces[0] === 'object' && replaces[0] !== null) {
 				const [options] = replaces;
-				return i18next.t(key, options as TOptions);
+				return i18next.t(key, options);
 			}
 
 			if (replaces.length === 0) {
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
index d1af15f59711..30979e2a81d8 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import DeviceManagementAccountTable from './DeviceManagementAccountTable';
 
 const DeviceManagementAccountPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
index 76556a238bac..e2532d0c6623 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
@@ -1,8 +1,8 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
 import DeviceIcon from '../../../../components/deviceManagement/DeviceIcon';
@@ -26,7 +26,7 @@ const DeviceManagementAccountRow = ({
 	loginAt,
 	onReload,
 }: DevicesRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index 411f9ad02e6f..5039521fa622 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -1,7 +1,7 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -17,7 +17,7 @@ const sortMapping = {
 };
 
 const DeviceManagementAccountTable = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'client' | 'os' | 'loginAt'>('loginAt');
 
diff --git a/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx b/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
index ca6872b0165a..2f58ed305be4 100644
--- a/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
+++ b/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
@@ -1,12 +1,12 @@
 import { Field, FieldGroup, FieldHint, FieldLabel, FieldRow, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 export const PreferencesGeneral = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { register } = useFormContext();
 	const omnichannelHideAfterClosing = useUniqueId();
 
diff --git a/apps/meteor/client/views/account/preferences/MyDataModal.tsx b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
index 75b1e67b324e..8889a1a44a53 100644
--- a/apps/meteor/client/views/account/preferences/MyDataModal.tsx
+++ b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Box, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MyDataModalProps = {
 	onCancel: () => void;
@@ -10,7 +10,7 @@ type MyDataModalProps = {
 };
 
 const MyDataModal = ({ onCancel, title, text, ...props }: MyDataModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props}>
diff --git a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
index e987f78266b6..85bfc9072b12 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
@@ -1,11 +1,11 @@
 import { Accordion, Field, FieldGroup, FieldLabel, FieldRow, FieldHint, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 const PreferencesHighlightsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { register } = useFormContext();
 
 	const highlightsId = useUniqueId();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
index c7e5bdf5aece..b8b4366cf4ff 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
@@ -1,12 +1,12 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { FieldRow, FieldLink, FieldHint, FieldLabel, Accordion, Field, Select, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 const PreferencesMessagesSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control } = useFormContext();
 
 	const alsoSendThreadMessageToChannelOptions = useMemo(
diff --git a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
index edfece178e52..02a04d0b2c59 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
@@ -1,11 +1,11 @@
 import { Accordion, Field, FieldLabel, FieldRow, NumberInput, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 const PreferencesUserPresenceSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { register, control } = useFormContext();
 
 	const enableAutoAwayId = useUniqueId();
diff --git a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
index d9e25d6d625e..01c9e1b77fb6 100644
--- a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
+++ b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
@@ -1,6 +1,6 @@
 import { Box, PasswordInput, TextInput, FieldGroup, Field, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
@@ -11,7 +11,7 @@ type ActionConfirmModalProps = {
 };
 
 const ActionConfirmModal = ({ isPassword, onConfirm, onCancel }: ActionConfirmModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [inputText, setInputText] = useState('');
 	const [inputError, setInputError] = useState<string | undefined>();
 
diff --git a/apps/meteor/client/views/account/security/BackupCodesModal.tsx b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
index de3457902b7a..eb97fb10cd7f 100644
--- a/apps/meteor/client/views/account/security/BackupCodesModal.tsx
+++ b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
@@ -1,6 +1,6 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import TextCopy from '../../../components/TextCopy';
 
@@ -10,7 +10,7 @@ type BackupCodesModalProps = {
 };
 
 const BackupCodesModal = ({ codes, onClose, ...props }: BackupCodesModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const codesText = useMemo(() => codes.join(' '), [codes]);
 
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
index abf45ebedcb9..9885b0bd3b86 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AccountTokensTable from './AccountTokensTable';
 
 const AccountTokensPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
index e4e9db4a8fad..5158d31d2470 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
@@ -1,7 +1,7 @@
 import type { IPersonalAccessToken, Serialized } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
@@ -13,7 +13,7 @@ type AccountTokensRowProps = {
 } & Serialized<Pick<IPersonalAccessToken, 'name' | 'createdAt' | 'lastTokenPart' | 'bypassTwoFactor'>>;
 
 const AccountTokensRow = ({ bypassTwoFactor, createdAt, isMedium, lastTokenPart, name, onRegenerate, onRemove }: AccountTokensRowProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const handleRegenerate = useCallback(() => onRegenerate(name), [name, onRegenerate]);
 	const handleRemove = useCallback(() => onRemove(name), [name, onRemove]);
diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index f6f52507d33a..1824a9ee6ab4 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import { useEndpointUpload } from '../../../hooks/useEndpointUpload';
@@ -13,7 +13,7 @@ type AddCustomEmojiProps = {
 };
 
 const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [name, setName] = useState('');
 	const [aliases, setAliases] = useState('');
 	const [emojiFile, setEmojiFile] = useState<Blob>();
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
index fa97324a5722..776e04fe1f69 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage, GenericResourceUsageSkeleton } from '../../../components/GenericResourceUsage';
 import { useActiveConnections } from '../../hooks/useActiveConnections';
 
 const CustomUserActiveConnections = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const result = useActiveConnections();
 
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
index b54c2181d76f..510d2d9303f4 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
 type CustomUserStatusDisabledModalProps = { isAdmin: boolean; onConfirm: () => void; onClose: () => void };
 
 const CustomUserStatusDisabledModal = ({ isAdmin, onConfirm, onClose }: CustomUserStatusDisabledModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return isAdmin ? (
 		<GenericModal
 			title={t('User_status_disabled_learn_more')}
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index 84037afdcab8..ebd1e762ff80 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -1,8 +1,8 @@
 import type { DeviceManagementPopulatedSession, DeviceManagementSession, Serialized } from '@rocket.chat/core-typings';
 import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
@@ -24,7 +24,7 @@ const isSessionPopulatedSession = (
 ): session is Serialized<DeviceManagementPopulatedSession> => '_user' in session;
 
 const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject<() => void> }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [text, setText] = useState('');
 	const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'client' | 'os' | 'username' | 'loginAt'>('username');
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
index f884b27e0cb1..5f78269fca57 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
@@ -1,8 +1,8 @@
 import type { Serialized, DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -27,7 +27,7 @@ const convertSessionFromAPI = ({
 });
 
 const DeviceInfoWithData = ({ deviceId, onReload }: { deviceId: string; onReload: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const {
 		value: data,
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
index 0f20e716b3b1..f95e2b009a26 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
@@ -1,16 +1,16 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 type EngagementDashboardCardErrorBoundaryProps = {
 	children?: ReactNode;
 };
 
 const EngagementDashboardCardErrorBoundary = ({ children }: EngagementDashboardCardErrorBoundaryProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [error, setError] = useState<Error>();
 	const isError = (error: unknown): error is Error => error instanceof Error;
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
index 95de437462a5..78f1585f0f4b 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
@@ -1,7 +1,7 @@
 import { Box, Select, Tabs } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
 import ChannelsTab from './channels/ChannelsTab';
@@ -14,7 +14,7 @@ type EngagementDashboardPageProps = {
 };
 
 const EngagementDashboardPage = ({ tab = 'users', onSelectTab }: EngagementDashboardPageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const timezoneOptions = useMemo<[timezone: 'utc' | 'local', label: string][]>(
 		() => [
diff --git a/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
index 6283d5000825..a92b2c6d3295 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
@@ -1,8 +1,8 @@
 import { Icon, Margins, Pagination, Skeleton, Table, TableBody, TableCell, TableHead, TableRow, Tile } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -14,7 +14,7 @@ import { useChannelsList } from './useChannelsList';
 const ChannelsOverview = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
@@ -121,10 +121,7 @@ const ChannelsOverview = (): ReactElement => {
 					itemsPerPage={itemsPerPage}
 					itemsPerPageLabel={(): string => t('Items_per_page:')}
 					showingResultsLabel={({ count, current, itemsPerPage }): string =>
-						t('Showing_results_of', {
-							postProcess: 'sprintf',
-							sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-						})
+						t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count)
 					}
 					count={data?.total || 0}
 					onSetItemsPerPage={setItemsPerPage}
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
index 88fad25990d0..0d9f7c2e77db 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
@@ -14,9 +14,9 @@ import {
 	TableBody,
 	TableCell,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -34,7 +34,7 @@ const colors = {
 const MessagesPerChannelSection = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data: messageOriginsData } = useMessageOrigins({ period });
 	const { data: topFivePopularChannelsData } = useTopFivePopularChannels({ period });
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
index 5eca6c046568..7cf46ebc476a 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, Skeleton, Palette, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -18,7 +18,7 @@ const MessagesSentSection = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 	const periodLabel = usePeriodLabel(period);
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data } = useMessagesSent({ period });
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
index 616e63a04351..1e12d982d8b6 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import MessagesPerChannelSection from './MessagesPerChannelSection';
 import MessagesSentSection from './MessagesSentSection';
 
 const MessagesTab = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
index 7ac1b7c91289..80359837b627 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveLine } from '@nivo/line';
 import { Box, Flex, Skeleton, Tile } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import CounterSet from '../../../../components/dataView/CounterSet';
@@ -101,7 +101,7 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement
 	}, [data, utc]);
 
 	const formatDate = useFormatDate();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
index 4af3d8f9200a..f70acde3a8e4 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
@@ -1,7 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import ContentForDays from './ContentForDays';
@@ -14,7 +14,7 @@ type BusiestChatTimesSectionProps = {
 };
 
 const BusiestChatTimesSection = ({ timezone }: BusiestChatTimesSectionProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [timeUnit, setTimeUnit] = useState<TimeUnit>('hours');
 	const timeUnitOptions = useMemo<[timeUnit: TimeUnit, label: string][]>(
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
index 83753769cc91..2114bd9208d9 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
@@ -2,10 +2,10 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Button, Chevron, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHourlyChatActivity } from './useHourlyChatActivity';
 
@@ -20,7 +20,7 @@ const ContentForHours = ({ displacement, onPreviousDateClick, onNextDateClick, t
 	const utc = timezone === 'utc';
 	const { data } = useHourlyChatActivity({ displacement, utc });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isLgScreen = useBreakpoints().includes('lg');
 
 	const values = useMemo(() => {
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
index 0498d0451ab9..36f9c3de2cc2 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
@@ -2,10 +2,10 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -29,7 +29,7 @@ const NewUsersSection = ({ timezone }: NewUsersSectionProps): ReactElement => {
 	const utc = timezone === 'utc';
 	const { data } = useNewUsers({ period, utc });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const formatDate = useFormatDate();
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
index c5f7d2044129..007e75f95474 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveHeatMapCanvas } from '@nivo/heatmap';
 import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -23,7 +23,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp
 
 	const { data, isLoading } = useUsersByTimeOfTheDay({ period, utc });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [dates, values] = useMemo(() => {
 		if (!data || isLoading) {
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
index 238cc0e40d29..b79d0b9c9a69 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
@@ -1,8 +1,8 @@
 import { Box, Flex } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import ActiveUsersSection from './ActiveUsersSection';
@@ -15,7 +15,7 @@ type UsersTabProps = {
 };
 
 const UsersTab = ({ timezone }: UsersTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const isXxlScreen = useBreakpoints().includes('xxl');
 
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
index 14dc96283f86..126a385e6ceb 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
@@ -1,14 +1,14 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import OverviewSection from './OverviewSection';
 import ServersSection from './ServersSection';
 
 function FederationDashboardPage(): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/admin/import/PrepareChannels.tsx b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
index 9f868d391ede..494f1f2b9b78 100644
--- a/apps/meteor/client/views/admin/import/PrepareChannels.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
@@ -1,7 +1,7 @@
 import { CheckBox, Table, Tag, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { ChannelDescriptor } from './ChannelDescriptor';
 
@@ -13,15 +13,11 @@ type PrepareChannelsProps = {
 
 // TODO: review inner logic
 const PrepareChannels = ({ channels, channelsCount, setChannels }: PrepareChannelsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
 	const showingResultsLabel = useCallback(
-		({ count, current, itemsPerPage }) =>
-			t('Showing_results_of', {
-				postProcess: 'sprintf',
-				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-			}),
+		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
 		[t],
 	);
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), [t]);
diff --git a/apps/meteor/client/views/admin/import/PrepareUsers.tsx b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
index ff6b4752bb2c..72e5d66127cf 100644
--- a/apps/meteor/client/views/admin/import/PrepareUsers.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
@@ -1,7 +1,7 @@
 import { CheckBox, Table, Tag, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { UserDescriptor } from './UserDescriptor';
 
@@ -13,15 +13,11 @@ type PrepareUsersProps = {
 
 // TODO: review inner logic
 const PrepareUsers = ({ usersCount, users, setUsers }: PrepareUsersProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
 	const showingResultsLabel = useCallback(
-		({ count, current, itemsPerPage }) =>
-			t('Showing_results_of', {
-				postProcess: 'sprintf',
-				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-			}),
+		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
 		[t],
 	);
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), [t]);
diff --git a/apps/meteor/client/views/admin/integrations/NewBot.tsx b/apps/meteor/client/views/admin/integrations/NewBot.tsx
index 65c44aca65bc..bd4bdbac1303 100644
--- a/apps/meteor/client/views/admin/integrations/NewBot.tsx
+++ b/apps/meteor/client/views/admin/integrations/NewBot.tsx
@@ -1,9 +1,9 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const NewBot = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <Box pb={20} fontScale='h4' key='bots' dangerouslySetInnerHTML={{ __html: t('additional_integrations_Bots') }} />;
 };
diff --git a/apps/meteor/client/views/admin/integrations/NewZapier.tsx b/apps/meteor/client/views/admin/integrations/NewZapier.tsx
index e2f5c1d597a8..8313ee4a5029 100644
--- a/apps/meteor/client/views/admin/integrations/NewZapier.tsx
+++ b/apps/meteor/client/views/admin/integrations/NewZapier.tsx
@@ -1,6 +1,6 @@
 import { Box, Skeleton, Margins, Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const blogSpotStyleScriptImport = (src: string) =>
 	new Promise((resolve) => {
@@ -16,7 +16,7 @@ const blogSpotStyleScriptImport = (src: string) =>
 	});
 
 const NewZapier = ({ ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [script, setScript] = useState<HTMLScriptElement>();
 
 	useEffect(() => {
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index d6cebbc0c651..00c6f8270bfd 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -18,9 +18,9 @@ import {
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { outgoingEvents } from '../../../../../app/integrations/lib/outgoingEvents';
 import { useHighlightedCode } from '../../../../hooks/useHighlightedCode';
@@ -52,7 +52,7 @@ type EditOutgoingWebhookPayload = Pick<
 >;
 
 const OutgoingWebhookForm = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const {
 		control,
@@ -185,10 +185,7 @@ const OutgoingWebhookForm = () => {
 								<FieldHint
 									id={`${channelField}-hint-2`}
 									dangerouslySetInnerHTML={{
-										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
-											postProcess: 'sprintf',
-											sprintf: ['@', '#', '@john', '#general'],
-										}),
+										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
 									}}
 								/>
 								<FieldHint id={`${channelField}-hint-3`} dangerouslySetInnerHTML={{ __html: t('Integrations_for_all_channels') }} />
@@ -232,10 +229,7 @@ const OutgoingWebhookForm = () => {
 								<FieldHint
 									id={`${targetRoomField}-hint-2`}
 									dangerouslySetInnerHTML={{
-										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
-											postProcess: 'sprintf',
-											sprintf: ['@', '#', '@john', '#general'],
-										}),
+										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
 									}}
 								/>
 							</Field>
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
index a0ad98a8efb9..7d0ce037c700 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
@@ -1,12 +1,12 @@
 import type { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings';
 import { Skeleton, Box, Accordion } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import HistoryItem from './HistoryItem';
 
 const HistoryContent = ({ data, isLoading }: { data: Serialized<IIntegrationHistory>[]; isLoading: boolean }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (isLoading) {
 		return (
diff --git a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
index a78627685cc0..878b4d84f507 100644
--- a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
@@ -11,7 +11,7 @@ import useResetAvatarAction from './hooks/useResetAvatarAction';
 type MessageContextFooterProps = { userId: string; deleted: boolean };
 
 const MessageContextFooter = ({ userId, deleted }: MessageContextFooterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const dismissUserAction = useDismissUserAction(userId);
 	const deleteMessagesAction = useDeleteMessagesAction(userId);
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
index 52e0e8bcbee5..85d081e652da 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
@@ -1,6 +1,7 @@
+// import { Menu, Option } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { ModerationConsoleRowProps } from './ModerationConsoleTableRow';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
@@ -9,7 +10,7 @@ import useDismissUserAction from './hooks/useDismissUserAction';
 import useResetAvatarAction from './hooks/useResetAvatarAction';
 
 const ModerationConsoleActions = ({ report, onClick }: Omit<ModerationConsoleRowProps, 'isDesktopOrLarger'>): JSX.Element => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { userId: uid, isUserDeleted } = report;
 
 	return (
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
index 21128ff72fd3..13da70b48da2 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
@@ -1,6 +1,6 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
@@ -8,7 +8,7 @@ import useResetAvatarAction from '../hooks/useResetAvatarAction';
 import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow';
 
 const ModConsoleUserActions = ({ report, onClick }: Omit<ModConsoleUserRowProps, 'isDesktopOrLarger'>) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		reportedUser: { _id: uid },
 	} = report;
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
index 496ff07e4524..c437746ad8ef 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
@@ -10,7 +10,7 @@ import useResetAvatarAction from '../hooks/useResetAvatarAction';
 type UserContextFooterProps = { userId: string; deleted: boolean };
 
 const UserContextFooter = ({ userId, deleted }: UserContextFooterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const dismissUserAction = useDismissUserAction(userId, true);
 	const deactivateUserAction = useDeactivateUserAction(userId, true);
diff --git a/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx b/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
index 9da6a25ff863..74d3f206c8ca 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
@@ -1,8 +1,8 @@
 import { Select, Box, type SelectOption } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment, { type Moment } from 'moment';
 import React, { useMemo, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type DateRangePickerProps = {
 	onChange(range: { start: string; end: string }): void;
@@ -23,7 +23,7 @@ const getWeekRange = (daysToSubtractFromStart: number, daysToSubtractFromEnd: nu
 });
 
 const DateRangePicker = ({ onChange }: DateRangePickerProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleRange = useMutableCallback((range) => {
 		onChange(range);
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
index aaad5d0c4ebd..5414e3d06aa5 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import DateRangePicker from './DateRangePicker';
@@ -10,7 +10,7 @@ type ModerationFilterProps = {
 };
 
 const ModerationFilter = ({ setText, setDateRange }: ModerationFilterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<FilterByText shouldAutoFocus placeholder={t('Search')} onChange={setText}>
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx b/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
index 13c26dc62223..c22062228839 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
@@ -1,12 +1,12 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { ReactNode } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ReportReasonCollapsible = ({ children }: { children: ReactNode }) => {
 	const [isOpen, setIsOpen] = useToggle(false);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const toggle = () => setIsOpen((prev) => !prev);
 
diff --git a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
index ad782e021720..6d03af10c8b4 100644
--- a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
+++ b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericUpsellModal from '../../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
 
 const CustomRoleUpsellModal = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { handleManageSubscription } = useUpsellActions();
 
 	return (
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
index 7ddd6ca9ab45..300d80f4f51c 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
@@ -1,17 +1,16 @@
 import type { IRole, IPermission } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { TFunction } from 'i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { CONSTANTS } from '../../../../../app/authorization/lib';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useChangeRole } from '../hooks/useChangeRole';
 import RoleCell from './RoleCell';
 
-const getName = (t: TFunction, permission: IPermission): string => {
+const getName = (t: ReturnType<typeof useTranslation>, permission: IPermission): string => {
 	if (permission.level === CONSTANTS.SETTINGS_LEVEL) {
 		let path = '';
 		if (permission.group) {
@@ -34,7 +33,7 @@ type PermissionRowProps = {
 };
 
 const PermissionRow = ({ permission, roleList, onGrant, onRemove }: PermissionRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { _id, roles } = permission;
 	const [hovered, setHovered] = useState(false);
 	const changeRole = useChangeRole({ onGrant, onRemove, permissionId: _id });
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
index 52f3a5370493..2926ef82124e 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
@@ -1,11 +1,11 @@
 import { TextInput } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const PermissionsTableFilter = ({ onChange }: { onChange: (debouncedFilter: string) => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [filter, setFilter] = useState('');
 	const debouncedFilter = useDebouncedValue(filter, 500);
 
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index bba5dfe95e38..17b1381f1af2 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, FieldHint, TextInput, Select, ToggleSwitch } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type RoleFormProps = {
 	className?: string;
@@ -13,7 +13,7 @@ type RoleFormProps = {
 };
 
 const RoleForm = ({ className, editing = false, isProtected = false, isDisabled = false }: RoleFormProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		register,
 		control,
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
index f05c708fd0fb..4e860ca8f759 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
@@ -2,9 +2,9 @@ import type { IUserInRole } from '@rocket.chat/core-typings';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserEmailAddress } from '../../../../../../lib/getUserEmailAddress';
 import { GenericTableRow, GenericTableCell } from '../../../../../components/GenericTable';
@@ -15,7 +15,7 @@ type UsersInRoleTableRowProps = {
 };
 
 const UsersInRoleTableRow = ({ user, onRemove }: UsersInRoleTableRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { _id, name, username, avatarETag } = user;
 	const email = getUserEmailAddress(user);
 
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
index 63192775a59e..2ec5954332f7 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
@@ -1,9 +1,9 @@
 import { Box, Icon, TextInput } from '@rocket.chat/fuselage';
 import type { OptionProp } from '@rocket.chat/ui-client';
 import { MultiSelectCustom } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useMemo, useState } from 'react';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const initialRoomTypeFilterStructure = [
 	{
@@ -43,7 +43,7 @@ const initialRoomTypeFilterStructure = [
 ] as OptionProp[];
 
 const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction<any>> }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [text, setText] = useState('');
 
 	const [roomTypeSelectedOptions, setRoomTypeSelectedOptions] = useState<OptionProp[]>([]);
diff --git a/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx b/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
index a6dff7cc8047..c4cf47c109fc 100644
--- a/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
@@ -1,11 +1,11 @@
 import type { Button } from '@rocket.chat/fuselage';
 import { IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 function ResetSettingButton(props: ComponentProps<typeof Button>): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <IconButton icon='undo' danger small title={t('Reset')} {...props} />;
 }
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
index ad62903b1cc1..fd96d715a837 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
@@ -1,12 +1,12 @@
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 
 const CodeMirrorBox = ({ label, children }: { label: ReactNode; children: ReactElement }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [fullScreen, toggleFullScreen] = useToggle(false);
 
 	if (fullScreen) {
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
index bfb10a54cbf9..dab9e63f7435 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
@@ -1,8 +1,8 @@
 import { FieldLabel, FieldRow, FieldHint, Flex, InputBox, Margins, TextInput, Select, Field } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -29,7 +29,7 @@ function ColorSettingInput({
 	onChangeEditor,
 	onResetButtonClick,
 }: ColorSettingInputProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleChange = useCallback(
 		(event) => {
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index b844f496b5ba..a484dc1133f0 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -1,8 +1,8 @@
 import { FieldLabel, MultiSelectFiltered, MultiSelect, Field, FieldRow } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -26,7 +26,7 @@ function MultiSelectSettingInput({
 	onResetButtonClick,
 	autocomplete,
 }: MultiSelectSettingInputProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleChange = (value: string[]): void => {
 		onChangeValue?.(value);
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
index 0364dcb11a4e..2ace88fda2cb 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
@@ -1,8 +1,8 @@
 import { Field, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -25,7 +25,7 @@ function SelectSettingInput({
 	onChangeValue,
 	onResetButtonClick,
 }: SelectSettingInputProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleChange = (value: string): void => {
 		onChangeValue?.(value);
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
index 7c57e4c49f4e..975a3171cbbf 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
@@ -1,4 +1,3 @@
-import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -53,7 +52,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const numberInput = screen.getByRole('spinbutton');
@@ -75,7 +74,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'hours' });
@@ -100,7 +99,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'days' });
@@ -125,7 +124,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'hours' });
@@ -151,7 +150,7 @@ describe('TimespanSettingInput component', () => {
 				hasResetButton
 				onResetButtonClick={onResetButtonClickMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const resetButton = screen.getByTitle('Reset');
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
index c59041fa3699..b15a353995c9 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
@@ -1,7 +1,7 @@
 import { Field, FieldLabel, FieldRow, InputBox, Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEventHandler, ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { TIMEUNIT, timeUnitToMs, msToTimeUnit } from '../../../../../lib/convertTimeUnit';
 import ResetSettingButton from '../ResetSettingButton';
@@ -49,7 +49,7 @@ function TimespanSettingInput({
 	onResetButtonClick,
 	packageValue,
 }: TimespanSettingInputProps): ReactElement {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	const [timeUnit, setTimeUnit] = useState<TIMEUNIT>(getHighestTimeUnit(Number(value)));
 	const [internalValue, setInternalValue] = useState<number>(msToTimeUnit(timeUnit, Number(value)));
@@ -71,8 +71,8 @@ function TimespanSettingInput({
 	};
 
 	const timeUnitOptions = useMemo(() => {
-		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, i18n.exists(label) ? t(label) : label]); // todo translate
-	}, [i18n, t]);
+		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, t.has(label) ? t(label) : label]); // todo translate
+	}, [t]);
 
 	const handleResetButtonClick = () => {
 		onResetButtonClick?.();
diff --git a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
index de575dbad302..d26d80e88637 100644
--- a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
@@ -2,9 +2,9 @@ import { isSetting, isSettingColor } from '@rocket.chat/core-typings';
 import { Accordion, Box, Button, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useEditableSettings, useEditableSettingsDispatch } from '../../EditableSettingsContext';
 import Setting from '../Setting';
@@ -20,7 +20,7 @@ type SettingsSectionProps = {
 };
 
 function SettingsSection({ groupId, hasReset = true, sectionName, currentTab, solo, help, children }: SettingsSectionProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const editableSettings = useEditableSettings(
 		useMemo(
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 98357b149383..4c7360d8f600 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -1,7 +1,7 @@
 import { TextInput, Field, FieldLabel, FieldRow, FieldError, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
@@ -13,7 +13,7 @@ type CreateOAuthModalProps = {
 const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactElement => {
 	const [text, setText] = useState<string>('');
 	const [error, setError] = useState<string>('');
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleConfirm = (e: SyntheticEvent): void => {
 		e.preventDefault();
diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
index 1a3c122502cf..782bf34122bc 100644
--- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
@@ -1,8 +1,8 @@
 import { Tabs, TabsItem } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useState, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 import GenericGroupPage from './GenericGroupPage';
@@ -16,7 +16,7 @@ type TabbedGroupPageProps = {
 };
 
 function TabbedGroupPage({ _id, tabs, i18nLabel, onClickBack, ...props }: TabbedGroupPageProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [currentTab, setCurrentTab] = useState(tabs[0]);
 	const handleTabClick = useMemo(() => (tab: string) => (): void => setCurrentTab(tab), [setCurrentTab]);
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index 4c034f7c7eb0..93792b517dcf 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -107,7 +107,7 @@ const SubscriptionPage = () => {
 						</Button>
 					)}
 					<UpgradeButton target='subscription_header' action={isEnterprise ? 'manage_subscription' : 'upgrade'} primary>
-						{isEnterprise ? t('Manage_subscription') : t('Upgrade')}
+						{t(isEnterprise ? 'Manage_subscription' : 'Upgrade')}
 					</UpgradeButton>
 				</ButtonGroup>
 			</PageHeader>
diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index 749b75903827..db51f1401f32 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -1,9 +1,9 @@
 import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
@@ -18,7 +18,7 @@ type AdminUserFormWithDataProps = {
 };
 
 const AdminUserFormWithData = ({ uid, onReload, context, roleData, roleError }: AdminUserFormWithDataProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading, isError, refetch } = useUserInfoQuery({ userId: uid });
 
 	const handleReload = useEffectEvent(() => {
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
index 5d9c72f515cb..bc773428608a 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
@@ -1,9 +1,9 @@
 import { Box, FieldHint, FieldLabel, FieldRow, RadioButton } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { Control, UseFormSetValue } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { UserFormProps } from './AdminUserForm';
 
@@ -22,7 +22,7 @@ const AdminUserSetRandomPasswordRadios = ({
 	setRandomPasswordId,
 	setValue,
 }: AdminUserSetRandomPasswordProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const setPasswordManuallyId = useUniqueId();
 
diff --git a/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx b/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
index 11390b6fdd5a..5a3f1bdd299a 100644
--- a/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
+++ b/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage } from '../../../../components/GenericResourceUsage';
 
@@ -10,7 +10,7 @@ type SeatsCapUsageProps = {
 };
 
 const SeatsCapUsage = ({ limit, members }: SeatsCapUsageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const percentage = Math.max(0, Math.min((100 / limit) * members, 100));
 	const seatsLeft = Math.max(0, limit - members);
 
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 8dc5b4472e1b..299e33bd6fa6 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -3,9 +3,9 @@ import type { IRole, IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
 import type { DefaultUserInfo } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Roles } from '../../../../../app/models/client/models/Roles';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
@@ -40,7 +40,7 @@ const UsersTableRow = ({
 	isSeatsCapExceeded,
 	showVoipExtension,
 }: UsersTableRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { _id, emails, username = '', name = '', roles, status, active, avatarETag, lastLogin, type, freeSwitchExtension } = user;
 	const registrationStatusText = useMemo(() => {
diff --git a/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx b/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
index 836f5bbf1d22..efd1846c09d3 100644
--- a/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
@@ -1,11 +1,11 @@
 import { Box, Icon, Skeleton, Scrollable } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useStatistics } from '../../hooks/useStatistics';
 
 const AnalyticsReports = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data, isLoading, isSuccess, isError } = useStatistics();
 
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
index 818713898b20..8d8118679235 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
@@ -1,14 +1,14 @@
 import { Margins, Tabs } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AnalyticsReports from './AnalyticsReports';
 import ServerLogs from './ServerLogs';
 
 const ViewLogsPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [tab, setTab] = useState('Logs');
 
 	return (
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
index 1394d7497ebd..e0b22e35f5f1 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
@@ -1,7 +1,7 @@
 import { Accordion } from '@rocket.chat/fuselage';
 import type { IInstance } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime';
@@ -14,7 +14,7 @@ type InstancesModalProps = {
 };
 
 const InstancesModal = ({ instances = [], onClose }: InstancesModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 
 	return (
diff --git a/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx b/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
index b608df3ed5c5..4b3ffd819f81 100644
--- a/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
@@ -1,8 +1,8 @@
 import type { IStats } from '@rocket.chat/core-typings';
 import { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import WorkspaceCardSection from '../components/WorkspaceCardSection';
 import WorkspaceCardTextSeparator from '../components/WorkspaceCardTextSeparator';
@@ -12,7 +12,7 @@ type MessagesRoomsCardProps = {
 };
 
 const MessagesRoomsCard = ({ statistics }: MessagesRoomsCardProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Card height='full'>
diff --git a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
index b3288c1b99c5..d45c01153318 100644
--- a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
+++ b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
@@ -1,8 +1,8 @@
 import type { IWorkspaceInfo, IStats } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Callout, CardGrid } from '@rocket.chat/fuselage';
 import type { IInstance } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
@@ -30,7 +30,7 @@ const WorkspacePage = ({
 	onClickRefreshButton,
 	onClickDownloadInfo,
 }: WorkspaceStatusPageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data } = useIsEnterprise();
 
diff --git a/apps/meteor/client/views/audit/AuditLogPage.tsx b/apps/meteor/client/views/audit/AuditLogPage.tsx
index 95fbc39abca8..10b9d439ff09 100644
--- a/apps/meteor/client/views/audit/AuditLogPage.tsx
+++ b/apps/meteor/client/views/audit/AuditLogPage.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import AuditLogTable from './components/AuditLogTable';
 
 const AuditLogPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/audit/AuditPage.tsx b/apps/meteor/client/views/audit/AuditPage.tsx
index 3dce9be56a8e..ca379883224e 100644
--- a/apps/meteor/client/views/audit/AuditPage.tsx
+++ b/apps/meteor/client/views/audit/AuditPage.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, Margins, States, StatesIcon, StatesSubtitle, StatesTitle, Tabs } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
 import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
@@ -15,7 +15,7 @@ const AuditPage = () => {
 	const [type, setType] = useAuditTab();
 	const [selectedRoom, setSelectedRoom] = useState<IRoom | undefined>();
 	const auditMutation = useAuditMutation(type);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page background='room'>
diff --git a/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx b/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
index 39d50edea62a..276d8c355c9b 100644
--- a/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
+++ b/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
@@ -1,8 +1,8 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDate } from '../../../hooks/useFormatDate';
 
@@ -16,7 +16,7 @@ type AuditFiltersDisplayProps = {
 
 const AuditFiltersDisplay = ({ users, room, startDate, endDate, filters }: AuditFiltersDisplayProps): ReactElement => {
 	const formatDate = useFormatDate();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' alignItems='stretch' withTruncatedText>
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index dffaf959f3cd..5f45ddc2b5fe 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -1,8 +1,8 @@
 import type { IAuditLog, IRoom } from '@rocket.chat/core-typings';
 import { Box, Field, FieldLabel, FieldRow, FieldError, TextInput, Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { AuditFields } from '../hooks/useAuditForm';
 import { useAuditForm } from '../hooks/useAuditForm';
@@ -20,7 +20,7 @@ type AuditFormProps = {
 };
 
 const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const form = useAuditForm();
 	const { control, handleSubmit, register } = form;
diff --git a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
index c6c4e204a682..8e3f9788880b 100644
--- a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
+++ b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
@@ -2,9 +2,9 @@ import type { IAuditLog } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
@@ -14,7 +14,7 @@ type AuditLogEntryProps = { value: IAuditLog };
 
 const AuditLogEntry = ({ value: { u, results, ts, _id, fields } }: AuditLogEntryProps): ReactElement => {
 	const formatDateAndTime = useFormatDateAndTime();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { username, name, avatarETag } = u;
 
diff --git a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
index 7eecf145865d..c0399d402349 100644
--- a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
+++ b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
@@ -1,9 +1,9 @@
 import { Box, InputBox, Menu, Margins, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement, ComponentProps, SetStateAction } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { DateRange } from '../../utils/dateRange';
 
@@ -138,7 +138,7 @@ const DateRangePicker = ({ value, onChange, ...props }: DateRangePickerProps): R
 	const minEndDate = startDate;
 	const maxEndDate = useMemo(() => formatToDateInput(new Date()), []);
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const presets = useMemo(
 		() =>
diff --git a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
index ce2b7e044d3a..2a79b3b5270f 100644
--- a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -13,7 +13,7 @@ type DirectTabProps = {
 };
 
 const DirectTab = ({ form: { control } }: DirectTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: usersField, fieldState: usersFieldState } = useController({
 		name: 'users',
diff --git a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
index c756b372488c..00d0da8f3e31 100644
--- a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../../components/AutoCompleteAgent';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -14,7 +14,7 @@ type OmnichannelTabProps = {
 };
 
 const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: visitorField, fieldState: visitorFieldState } = useController({
 		name: 'visitor',
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index d58cc3ccb70d..069a907749ac 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import RoomAutoComplete from '../../../../components/RoomAutoComplete';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -14,7 +14,7 @@ type RoomsTabProps = {
 };
 
 const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: ridField, fieldState: ridFieldState } = useController({ name: 'rid', control, rules: { required: true } });
 
diff --git a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
index 652f7a739a66..50b372ad3291 100644
--- a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -13,7 +13,7 @@ type UsersTabProps = {
 };
 
 const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: usersField, fieldState: usersFieldState } = useController({
 		name: 'users',
diff --git a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
index d3b1e7b342cf..a8da354cbbfb 100644
--- a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
+++ b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AudioRecorder } from '../../../../app/ui/client/lib/recorderjs/AudioRecorder';
 import type { ChatAPI } from '../../../lib/chats/ChatAPI';
@@ -19,7 +19,7 @@ type AudioMessageRecorderProps = {
 };
 
 const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMessageRecorderProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [state, setState] = useState<'loading' | 'recording'>('recording');
 	const [time, setTime] = useState('00:00');
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
index 10f0ed565584..2ee6ebb3f2c3 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { EmojiPickerLoadMore, EmojiPickerNotFound, EmojiPickerCategoryWrapper } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, MutableRefObject } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { CUSTOM_CATEGORY } from '../../../../app/emoji/client';
 import type { EmojiByCategory, EmojiCategoryPosition } from '../../../../app/emoji/client';
@@ -26,7 +26,7 @@ const EmojiCategoryRow = ({
 	handleLoadMore,
 	handleSelectEmoji,
 }: EmojiCategoryRowProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const categoryRowStyle = css`
 		button {
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
index 3a8dc80be6de..701a3eb3872e 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
@@ -1,7 +1,7 @@
 import { IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { EmojiCategory } from '../../../../app/emoji/client';
 
@@ -47,7 +47,7 @@ const mapCategoryIcon = (category: string) => {
 };
 
 const EmojiPickerCategoryItem = ({ category, index, active, handleGoToCategory, ...props }: EmojiPickerCategoryItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const icon = mapCategoryIcon(category.key);
 
diff --git a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
index 152d13bae5de..a42e1b0580b3 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
@@ -1,7 +1,7 @@
 import { EmojiPickerNotFound } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 import type { VirtuosoGridHandle } from 'react-virtuoso';
 import { VirtuosoGrid } from 'react-virtuoso';
 
@@ -21,7 +21,7 @@ type SearchingResultProps = {
 };
 
 const SearchingResult = ({ searchResults, handleSelectEmoji }: SearchingResultProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const ref = useRef<VirtuosoGridHandle>(null);
 
 	if (searchResults.length === 0) {
diff --git a/apps/meteor/client/views/directory/RoomTags.tsx b/apps/meteor/client/views/directory/RoomTags.tsx
index d73c12f2cb62..780b554bd8fb 100644
--- a/apps/meteor/client/views/directory/RoomTags.tsx
+++ b/apps/meteor/client/views/directory/RoomTags.tsx
@@ -1,11 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const RoomTags = ({ room }: { room: IRoom }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mi={4} alignItems='center' display='flex' withTruncatedText>
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
index 5b5e42651847..711b5a6d21a1 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
@@ -1,8 +1,8 @@
 import { Box, PasswordInput, Field, FieldGroup, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -15,7 +15,7 @@ const EnterE2EPasswordModal = ({
 	onClose: () => void;
 	onCancel: () => void;
 }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [password, setPassword] = useState('');
 	const [passwordError, setPasswordError] = useState<string | undefined>();
 
diff --git a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
index a777ca5b4d99..b16837bc3d17 100644
--- a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
@@ -1,9 +1,9 @@
 import { Box, CodeSnippet } from '@rocket.chat/fuselage';
 import { useClipboard } from '@rocket.chat/fuselage-hooks';
 import { ExternalLink } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -17,7 +17,7 @@ type SaveE2EPasswordModalProps = {
 const DOCS_URL = 'https://go.rocket.chat/i/e2ee-guide';
 
 const SaveE2EPasswordModal = ({ randomPassword, onClose, onCancel, onConfirm }: SaveE2EPasswordModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { copy, hasCopied } = useClipboard(randomPassword);
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
index 345d8914fd7b..bd3b46c6adbd 100644
--- a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -11,7 +11,7 @@ const LINUX_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-linux';
 const MAC_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-mac';
 
 const DesktopAppsCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/DocumentationCard.tsx b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
index c047006b77fd..fc50e0aefa3e 100644
--- a/apps/meteor/client/views/home/cards/DocumentationCard.tsx
+++ b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -9,7 +9,7 @@ import { useExternalLink } from '../../../hooks/useExternalLink';
 const DOCS_URL = 'https://go.rocket.chat/i/hp-documentation';
 
 const DocumentationCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
index 47117c448a13..fdb3d4044a7d 100644
--- a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -10,7 +10,7 @@ const GOOGLE_PLAY_URL = 'https://go.rocket.chat/i/hp-mobile-app-google';
 const APP_STORE_URL = 'https://go.rocket.chat/i/hp-mobile-app-apple';
 
 const MobileAppsCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
index f1cc36f9dabe..a4a65f061252 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
@@ -1,10 +1,10 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box, Tag } from '@rocket.chat/fuselage';
 import { AppAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppMenu from '../AppMenu';
 import BundleChips from '../BundleChips';
@@ -18,7 +18,7 @@ const versioni18nKey = (app: App): string => {
 };
 
 const AppDetailsPageHeader = ({ app }: { app: App }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		iconFileData,
 		name,
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 5d20900078a4..5f3e427b8391 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -1,9 +1,9 @@
 import { Box, Callout, Chip, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import DOMPurify from 'dompurify';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
 import type { AppInfo } from '../../../definitions/AppInfo';
@@ -19,7 +19,7 @@ type AppDetailsProps = {
 };
 
 const AppDetails = ({ app }: AppDetailsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		author: { homepage, support } = {},
 		detailedDescription,
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
index 278a72345dda..a653a22478a8 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -1,7 +1,7 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import AccordionLoading from '../../../components/AccordionLoading';
@@ -9,7 +9,7 @@ import { useLogs } from '../../../hooks/useLogs';
 import AppLogsItem from './AppLogsItem';
 
 const AppLogs = ({ id }: { id: string }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const { data, isSuccess, isError, isLoading } = useLogs(id);
 
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
index d1d258006a12..dbbf4bf5b67a 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
@@ -1,7 +1,7 @@
 import type { ILogEntry } from '@rocket.chat/core-typings';
 import { Box, Accordion } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppLogsItemEntry from './AppLogsItemEntry';
 
@@ -12,7 +12,7 @@ type AppLogsItemProps = {
 };
 
 const AppLogsItem = ({ entries, instanceId, title, ...props }: AppLogsItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Accordion.Item title={title} {...props}>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
index ee16fe1b5756..986d2eec9686 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHighlightedCode } from '../../../../../hooks/useHighlightedCode';
 
@@ -12,7 +12,7 @@ type AppLogsItemEntryProps = {
 };
 
 const AppLogsItemEntry = ({ severity, timestamp, caller, args }: AppLogsItemEntryProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box color='default'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
index 3269c1113d0d..974b6d148e61 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
@@ -1,8 +1,8 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
 import { purifyOptions } from '../../../lib/purifyOptions';
@@ -21,7 +21,7 @@ type ReleaseItemProps = {
 };
 
 const AppReleasesItem = ({ release, ...props }: ReleaseItemProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const title = (
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
index 5554bde2651c..baaf65356a8e 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
@@ -1,8 +1,8 @@
 import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppPermissionsList from '../../../components/AppPermissionsList';
 import AppSecurityLabel from './AppSecurityLabel';
@@ -15,7 +15,7 @@ type AppSecurityProps = {
 };
 
 const AppSecurity = ({ privacyPolicySummary, appPermissions, tosLink, privacyLink }: AppSecurityProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box maxWidth='x640' w='full' marginInline='auto' color='default'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
index 59080c7f3237..00dc564ed05d 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
@@ -1,12 +1,12 @@
 import { Box, FieldGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { ISettings } from '../../../../../apps/@types/IOrchestrator';
 import AppSetting from './AppSetting';
 
 const AppSettings = ({ settings }: { settings: ISettings }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
index 00621bdbdc90..6981d1b6a810 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
@@ -1,7 +1,7 @@
 import type { AppPricingPlan, PurchaseType } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { formatPriceAndPurchaseType } from '../../../helpers/formatPriceAndPurchaseType';
 
@@ -14,7 +14,7 @@ type AppStatusPriceDisplayProps = {
 };
 
 const AppStatusPriceDisplay = ({ purchaseType, pricingPlans, price, showType = true }: AppStatusPriceDisplayProps) => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	const { type, price: formattedPrice } = useMemo(
 		() => formatPriceAndPurchaseType(purchaseType, pricingPlans, price),
@@ -24,7 +24,7 @@ const AppStatusPriceDisplay = ({ purchaseType, pricingPlans, price, showType = t
 	return (
 		<Margins inline={4}>
 			<Tag>
-				{showType && <Box color='default'>{i18n.exists(type) ? t(type) : type}</Box>}
+				{showType && <Box color='default'>{t.has(type) ? t(type) : type}</Box>}
 				<Box>{!showType && type === 'Free' ? t(type) : formattedPrice}</Box>
 			</Tag>
 		</Margins>
diff --git a/apps/meteor/client/views/marketplace/AppMenu.tsx b/apps/meteor/client/views/marketplace/AppMenu.tsx
index 9f49b7d75a5b..a1d3942ee304 100644
--- a/apps/meteor/client/views/marketplace/AppMenu.tsx
+++ b/apps/meteor/client/views/marketplace/AppMenu.tsx
@@ -1,8 +1,8 @@
 import type { App } from '@rocket.chat/core-typings';
 import { MenuItem, MenuItemContent, MenuSection, MenuV2, Skeleton } from '@rocket.chat/fuselage';
 import { useHandleMenuAction } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { AppMenuOption } from './hooks/useAppMenu';
 import { useAppMenu } from './hooks/useAppMenu';
@@ -13,7 +13,7 @@ type AppMenuProps = {
 };
 
 const AppMenu = ({ app, isAppDetailsPage }: AppMenuProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { isLoading, isAdminUser, sections } = useAppMenu(app, isAppDetailsPage);
 
diff --git a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
index d06c6bc9f2f5..d9090cd7dc7b 100644
--- a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
@@ -1,7 +1,7 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import AppPermissionsList from './components/AppPermissionsList';
@@ -13,7 +13,7 @@ export type AppPermissionsReviewModalProps = {
 };
 
 const AppPermissionsReviewModal = ({ appPermissions, onCancel, onConfirm }: AppPermissionsReviewModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/marketplace/AppUpdateModal.tsx b/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
index 848e789fa83c..4eb2bcf6da2b 100644
--- a/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type AppUpdateModalProps = {
 	confirm: () => void;
@@ -8,7 +8,7 @@ type AppUpdateModalProps = {
 };
 
 const AppUpdateModal = ({ confirm, cancel, ...props }: AppUpdateModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleCloseButtonClick = (): void => {
 		cancel();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
index 098833ea6e2a..a1f486395dbb 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
@@ -1,8 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../components/FilterByText';
 import CategoryDropDown from '../components/CategoryFilter/CategoryDropDown';
@@ -43,7 +43,7 @@ const AppsFilters = ({
 	statusFilterOnSelected,
 	context,
 }: AppsFiltersProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const isPrivateAppsPage = context === 'private';
 	const breakpoints = useBreakpoints();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
index 2729dafafe86..1f3f27c7fedd 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
@@ -1,10 +1,10 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const AppsPageContentError = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
index 5f55d1d1f07e..56c3ca26f9a7 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
@@ -2,8 +2,8 @@ import type { App } from '@rocket.chat/core-typings';
 import { Box, Pagination } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppsList from '../AppsList';
 import FeaturedAppsSections from './FeaturedAppsSections';
@@ -34,7 +34,7 @@ const AppsPageContentBody = ({
 	paginationProps,
 	noErrorsOcurred,
 }: AppsPageContentBodyProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const scrollableRef = useRef<HTMLDivElement>(null);
 	const appsListId = useUniqueId();
 
diff --git a/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx b/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
index fbc3c99ef483..71d9ac62fcc0 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
@@ -1,7 +1,7 @@
 import type { App } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppsList from '../AppsList';
 import normalizeFeaturedApps from '../helpers/normalizeFeaturedApps';
@@ -13,7 +13,7 @@ type FeaturedSectionsProps = {
 };
 
 const FeaturedAppsSections = ({ appsResult, appsListId }: FeaturedSectionsProps): ReactElement | null => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 	const featuredApps = useFeaturedApps();
 
 	if (featuredApps.isSuccess) {
@@ -24,7 +24,7 @@ const FeaturedAppsSections = ({ appsResult, appsListId }: FeaturedSectionsProps)
 						appsListId={`${appsListId + index}`}
 						key={section.slug}
 						apps={normalizeFeaturedApps(section.apps, appsResult)}
-						title={i18n.exists(section.i18nLabel) ? t(section.i18nLabel) : section.i18nLabel}
+						title={t.has(section.i18nLabel) ? t(section.i18nLabel) : section.i18nLabel}
 					/>
 				))}
 			</>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
index 2bdc8608ac14..dc7d77e64a73 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
@@ -1,9 +1,9 @@
 import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const NoAppRequestsEmptyState = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs='24px'>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
index 65d0ae1e68fc..9403a2443733 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
@@ -9,9 +9,9 @@ import {
 	StatesActions,
 	StatesAction,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NoInstalledAppMatchesEmptyStateProps = {
 	shouldShowSearchText: boolean;
@@ -24,7 +24,7 @@ const NoInstalledAppMatchesEmptyState = ({
 	text,
 	onButtonClick,
 }: NoInstalledAppMatchesEmptyStateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
index 375f2156e61d..a1bdeb90edce 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
@@ -1,10 +1,10 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const NoInstalledAppsEmptyState = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
index bbce0eb71bed..0dc7e471aee4 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
@@ -9,9 +9,9 @@ import {
 	StatesSuggestionText,
 	StatesTitle,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NoMarketplaceOrInstalledAppMatchesEmptyStateProps = { shouldShowSearchText: boolean; text: string };
 
@@ -19,7 +19,7 @@ const NoMarketplaceOrInstalledAppMatchesEmptyState = ({
 	shouldShowSearchText,
 	text,
 }: NoMarketplaceOrInstalledAppMatchesEmptyStateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
index daee8c070471..b7fec778401a 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const PrivateEmptyState = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs='24px'>
diff --git a/apps/meteor/client/views/marketplace/BundleChips.tsx b/apps/meteor/client/views/marketplace/BundleChips.tsx
index d20f1eacfa35..b3110832145d 100644
--- a/apps/meteor/client/views/marketplace/BundleChips.tsx
+++ b/apps/meteor/client/views/marketplace/BundleChips.tsx
@@ -1,7 +1,7 @@
 import { Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { App } from './types';
 
@@ -14,7 +14,7 @@ type BundleChipsProps = {
 };
 
 const BundleChips = ({ bundledIn }: BundleChipsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handlePlanName = (label: string): string => {
 		if (label === 'Enterprise') {
diff --git a/apps/meteor/client/views/marketplace/IframeModal.tsx b/apps/meteor/client/views/marketplace/IframeModal.tsx
index fdf407228628..44616c1f6874 100644
--- a/apps/meteor/client/views/marketplace/IframeModal.tsx
+++ b/apps/meteor/client/views/marketplace/IframeModal.tsx
@@ -1,7 +1,7 @@
 import { Box, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const iframeMsgListener = (confirm: (data: any) => void, cancel: () => void) => (e: MessageEvent<any>) => {
 	let data;
@@ -22,7 +22,7 @@ type IframeModalProps = {
 } & ComponentProps<typeof Modal>;
 
 const IframeModal = ({ url, confirm, cancel, wrapperHeight = 'x360', ...props }: IframeModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	useEffect(() => {
 		const listener = iframeMsgListener(confirm, cancel);
diff --git a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
index 2707c05562a9..33eb6a4960c8 100644
--- a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
+++ b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericUpsellModal from '../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../components/GenericUpsellModal/hooks';
 
 const UnlimitedAppsUpsellModal = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { handleManageSubscription, cloudWorkspaceHadTrial } = useUpsellActions();
 
 	return (
diff --git a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
index 2e25a0a9e1e5..bf9533c81074 100644
--- a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
+++ b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery';
@@ -24,7 +24,7 @@ const AppInstallationModal = ({
 	handleConfirm,
 	handleEnableUnlimitedApps,
 }: AppsInstallationModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const getTitle = () => {
 		if (enabled === limit) {
diff --git a/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx b/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
index 4e52d996dff1..0675295a2595 100644
--- a/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
+++ b/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
@@ -1,9 +1,9 @@
 import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { Fragment } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const defaultPermissions = [
 	'user.read',
@@ -36,7 +36,7 @@ const defaultPermissions = [
 ];
 
 const AppPermissionsList = ({ appPermissions }: { appPermissions: AppPermission[] | undefined }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleAppPermissions = (permission: string): string => t(`Apps_Permissions_${permission.replace('.', '_')}` as TranslationKey);
 
 	if (appPermissions?.length) {
diff --git a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
index 7593323c4a91..b3e43fda942f 100644
--- a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
+++ b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
@@ -1,9 +1,9 @@
 import type { Button } from '@rocket.chat/fuselage';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import colorTokens from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEventHandler } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type CategoryDropDownAnchorProps = { selectedCategoriesCount: number; onClick?: MouseEventHandler<HTMLElement> } & ComponentProps<
 	typeof Button
@@ -13,7 +13,7 @@ const CategoryDropDownAnchor = forwardRef<HTMLElement, CategoryDropDownAnchorPro
 	{ onClick, selectedCategoriesCount, ...props },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box
diff --git a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
index 46e8bd64b55c..9578d49961c8 100644
--- a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
+++ b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage } from '../../../components/GenericResourceUsage';
 
@@ -17,7 +17,7 @@ const EnabledAppsCount = ({
 	enabled: number;
 	context: 'private' | 'explore' | 'installed' | 'premium' | 'requested';
 }): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericResourceUsage
diff --git a/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx b/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
index 81a2afd21e1e..ce87f0d4673a 100644
--- a/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
+++ b/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery';
@@ -14,7 +14,7 @@ type UninstallGrandfatheredAppModalProps = {
 };
 
 const UninstallGrandfatheredAppModal = ({ context, limit, appName, handleUninstall, handleClose }: UninstallGrandfatheredAppModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/marketplace/hooks/useCategories.ts b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
index 17a7c878e6e4..2a6b612470b5 100644
--- a/apps/meteor/client/views/marketplace/hooks/useCategories.ts
+++ b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import type {
@@ -14,7 +14,7 @@ import { useCategoryFlatList } from './useCategoryFlatList';
 import { useCategoryToggle } from './useCategoryToggle';
 
 export const useCategories = (): [CategoryDropDownGroups, selectedCategoriesList, selectedCategoriesList, CategoryOnSelected] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [categories, setCategories] = useState<CategoryDropDownListProps['categories']>([]);
 
 	const fetchCategories = useCallback(async (): Promise<void> => {
diff --git a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
index 31697eaf460d..b5a156b56bf4 100644
--- a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
+++ b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageContent } from '../../components/Page';
 
 const NotAuthorizedPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/notFound/NotFoundPage.tsx b/apps/meteor/client/views/notFound/NotFoundPage.tsx
index d9fbbe593de1..b6c01f05be98 100644
--- a/apps/meteor/client/views/notFound/NotFoundPage.tsx
+++ b/apps/meteor/client/views/notFound/NotFoundPage.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import NotFoundState from '../../components/NotFoundState';
 
 const NotFoundPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <NotFoundState title={t('Page_not_found')} subtitle={t('Page_not_exist_or_not_permission')} />;
 };
 
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
index 6c2c8663f0d4..13e1498d7422 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
@@ -1,8 +1,8 @@
 import { Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
@@ -22,7 +22,7 @@ import AgentsTableRow from './AgentsTableRow';
 
 // TODO: missing error state
 const AgentsTable = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [filter, setFilter] = useState('');
 
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'statusLivechat'>('name');
diff --git a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
index 986221840005..61f952e6f3c3 100644
--- a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
@@ -1,7 +1,7 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Select, Margins, Field, FieldLabel, FieldRow, Label, Option } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
@@ -11,7 +11,7 @@ import InterchangeableChart from './InterchangeableChart';
 import Overview from './Overview';
 
 const useOptions = (type: string): SelectOption[] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useMemo(() => {
 		if (type === 'Conversations') {
 			return [
@@ -30,7 +30,7 @@ const useOptions = (type: string): SelectOption[] => {
 };
 
 const AnalyticsPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [type, setType] = useState('Conversations');
 	const [department, setDepartment] = useState<string | null>(null);
 	const [dateRange, setDateRange] = useState({ start: '', end: '' });
diff --git a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
index d3fd6b8d857a..40c32f4d6980 100644
--- a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
@@ -1,10 +1,10 @@
 import { Box, InputBox, Menu, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Moment } from 'moment';
 import moment from 'moment';
 import type { ComponentProps } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 moment.locale('en');
 
@@ -27,7 +27,7 @@ const getWeekRange = (daysToSubtractFromStart: number, daysToSubtractFromEnd: nu
 });
 
 const DateRangePicker = ({ onChange = () => undefined, ...props }: DateRangePickerProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [range, setRange] = useState({ start: '', end: '' });
 
 	const { start, end } = range;
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
index 18cfb2e9ce56..9bca1e6589c4 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
@@ -1,7 +1,7 @@
 import { FieldLabel as BaseFieldLabel, Box, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
@@ -11,7 +11,7 @@ type FieldLabelProps = ComponentProps<typeof BaseFieldLabel> & {
 };
 
 const FieldLabel = ({ children: label, premium = false }: FieldLabelProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const shouldDisableEnterprise = premium && !hasLicense;
 
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index 92bcfc4c5d30..a4435398d9a9 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -13,17 +13,17 @@ import {
 	FieldHint,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import FieldLabel from './AppearanceFieldLabel';
 
 const AppearanceForm = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isEnterprise = useHasLicenseModule('livechat-enterprise');
 
 	const { control, watch } = useFormContext();
diff --git a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
index 4f53823aca3f..2156babf230d 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
@@ -2,9 +2,9 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { InputBox, Field, MultiSelect, FieldGroup, Box, Select, FieldLabel, FieldRow, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller, useFieldArray } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useTimezoneNameList } from '../../../hooks/useTimezoneNameList';
 import { BusinessHoursMultiple } from '../additionalForms';
@@ -38,7 +38,7 @@ export type BusinessHoursFormData = {
 // TODO: add time validation for start and finish not be equal on UI
 // TODO: add time validation for start not be higher than finish on UI
 const BusinessHoursForm = ({ type }: { type?: 'default' | 'custom' }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const timeZones = useTimezoneNameList();
 	const timeZonesOptions: SelectOption[] = useMemo(() => timeZones.map((name) => [name, t(name as TranslationKey)]), [t, timeZones]);
 	const daysOptions: SelectOption[] = useMemo(() => DAYS_OF_WEEK.map((day) => [day, t(day as TranslationKey)]), [t]);
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
index 9296ec2713f7..2bfc10ef0dfe 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
@@ -9,9 +9,9 @@ import {
 } from '@rocket.chat/fuselage';
 import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 import { clickableItem } from '../../../lib/clickableItem';
@@ -22,7 +22,7 @@ type ContactHistoryItemProps = {
 };
 
 function ContactHistoryItem({ history, setChatId, ...props }: ContactHistoryItemProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useFormatDateAndTime();
 	const username = history.servedBy?.username;
 	const hasClosingMessage = !!history.closingMessage?.msg?.trim();
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
index 5a1cd52eab3c..ba25d511e1a8 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
@@ -1,7 +1,7 @@
 import { Box, Margins, TextInput, Icon, Throbber, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -21,7 +21,7 @@ import { useHistoryList } from './useHistoryList';
 
 const ContactHistoryList = ({ setChatId, close }: { setChatId: Dispatch<SetStateAction<string>>; close: () => void }): ReactElement => {
 	const [text, setText] = useState('');
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useOmnichannelRoom();
 	const { itemsList: historyList, loadMoreItems } = useHistoryList(
 		useMemo(() => ({ roomId: room._id, filter: text, visitorId: room.v._id }), [room, text]),
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index 2915e4907c7d..3c6079c08fd6 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -18,8 +18,8 @@ import {
 	MessageSystemTimestamp,
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
 import MessageContentBody from '../../../../components/message/MessageContentBody';
@@ -38,7 +38,7 @@ type ContactHistoryMessageProps = {
 };
 
 const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }: ContactHistoryMessageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { triggerProps, openUserCard } = useUserCard();
 
 	const format = useFormatDate();
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
index eeca3fb4930d..27312b9e9fac 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
@@ -1,7 +1,7 @@
 import { NumberInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 import type { UseFormRegister } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import type { FormValues, IDepartmentAgent } from '../EditDepartment';
@@ -16,7 +16,7 @@ type AgentRowProps = {
 };
 
 const AgentRow = ({ index, agent, register, onRemove }: AgentRowProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericTableRow key={agent.agentId} tabIndex={0} role='link' action qa-user-id={agent.agentId}>
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
index a81e9ffc8584..c4e4c7acb7c6 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
@@ -1,8 +1,8 @@
 import { Pagination } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import type { Control, UseFormRegister } from 'react-hook-form';
 import { useWatch, useFieldArray } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableBody, GenericTableHeader, GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -16,7 +16,7 @@ type DepartmentAgentsTableProps = {
 };
 
 function DepartmentAgentsTable({ control, register }: DepartmentAgentsTableProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { fields, append, remove } = useFieldArray({ control, name: 'agentList' });
 	const agentList = useWatch({ control, name: 'agentList' });
 
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
index c90f3ebe3ee0..53c1afeb4ba7 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
@@ -1,7 +1,7 @@
 import { Button, Chip, FieldRow, TextInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FormEvent } from 'react';
 import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type DepartmentTagsProps = {
 	error: string;
@@ -10,7 +10,7 @@ type DepartmentTagsProps = {
 } & ComponentProps<typeof TextInput>;
 
 const DepartmentTags = ({ error, value: tags, onChange, ...props }: DepartmentTagsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [tagText, setTagText] = useState('');
 
 	const handleAddTag = useCallback(() => {
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
index 3b01379f18b6..616baee2b531 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
@@ -1,8 +1,8 @@
 import type { IVoipRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useIsCallReady } from '../../../../contexts/CallContext';
@@ -15,7 +15,7 @@ type CallTableRowProps = {
 };
 
 export const CallTableRow = ({ room, onRowClick }: CallTableRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isCallReady = useIsCallReady();
 
 	const { _id, fname, callStarted, queue, callDuration = 0, v, direction } = room;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
index 75f6d1d5c3bd..dab51528dc49 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
@@ -1,10 +1,10 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Box, Icon, Chip, ButtonGroup } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarIcon,
@@ -30,7 +30,7 @@ type VoipInfoPropsType = {
 };
 
 export const VoipInfo = ({ room, onClickClose /* , onClickReport  */ }: VoipInfoPropsType): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isCallReady = useIsCallReady();
 
 	const { servedBy, queue, v, fname, name, callDuration, callTotalHoldTime, closedAt, callWaitingTime, tags, lastMessage } = room;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
index 5af57d8e4366..294a508fbc4f 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../../../contexts/CallContext';
 import { useDialModal } from '../../../../../hooks/useDialModal';
@@ -14,7 +14,7 @@ type VoipInfoCallButtonProps = Exclude<
 };
 
 export const VoipInfoCallButton = ({ phoneNumber, ...props }: VoipInfoCallButtonProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
index d04330aa57b3..a12bba236965 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
@@ -1,6 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Field from '../../../components/Field';
 import Info from '../../../components/Info';
@@ -12,7 +12,7 @@ type DepartmentFieldProps = {
 };
 
 const DepartmentField = ({ departmentId }: DepartmentFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading, isError } = useDepartmentInfo(departmentId);
 
 	return (
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
index e2c053fe90ab..aeca1de73202 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../../components';
 import { useOmnichannelRoomInfo } from '../../../hooks/useOmnichannelRoomInfo';
@@ -15,7 +15,7 @@ type RoomEditWithDataProps = {
 };
 
 function RoomEditWithData({ id: roomId, reload, reloadInfo, onClose }: RoomEditWithDataProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data: room, isLoading: isRoomLoading, isError: isRoomError } = useOmnichannelRoomInfo(roomId);
 	const { _id: visitorId } = room?.v ?? {};
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
index e3745e576a72..d2a17d53be7e 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import UAParser from 'ua-parser-js';
 
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
@@ -10,7 +10,7 @@ import Label from '../../../components/Label';
 import { FormSkeleton } from '../../components/FormSkeleton';
 
 const VisitorClientInfo = ({ uid }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		value: userData,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
index 4c68389a9604..a250a005e243 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../../contexts/CallContext';
 import { useDialModal } from '../../../../hooks/useDialModal';
@@ -14,7 +14,7 @@ const rcxCallDialButton = css`
 `;
 
 export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { outBoundCallsAllowed, outBoundCallsEnabledForUser } = useVoipOutboundStates();
 	const { openDialModal } = useDialModal();
diff --git a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
index 86ca44762d44..9aedf67ab3c9 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Field from '../../components/Field';
 import Info from '../../components/Info';
@@ -13,7 +13,7 @@ type PriorityFieldProps = {
 };
 
 const PriorityField = ({ id }: PriorityFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isInitialLoading, isError } = usePriorityInfo(id);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
index 7b029d73403a..9d0a768579af 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Field from '../../components/Field';
 import Info from '../../components/Info';
@@ -13,7 +13,7 @@ type SlaFieldProps = {
 };
 
 const SlaField = ({ id }: SlaFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isInitialLoading, isError } = useSlaInfo(id);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
index ca3f703abd1d..235f4f95d1fa 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { OmnichannelRoomIcon } from '../../../../components/RoomIcon/OmnichannelRoomIcon';
 import Field from '../../components/Field';
@@ -13,7 +13,7 @@ type SourceFieldProps = {
 };
 
 const SourceField = ({ room }: SourceFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const roomSource = room.source.alias || room.source.id || room.source.type;
 
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
index 297ced9eed53..90ba81d5bf80 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
@@ -1,6 +1,6 @@
 import { Box, ContextualbarContent } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
@@ -8,7 +8,7 @@ import { FormSkeleton } from '../../components/FormSkeleton';
 import ContactNewEdit from './ContactNewEdit';
 
 function ContactEditWithData({ id, close }) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		value: data,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
index 597d3d66dbd4..0d6c9fb406ec 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
@@ -1,8 +1,8 @@
 import { Box, Select, Label } from '@rocket.chat/fuselage';
 import { useMutableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction } from 'react';
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../components/AutoCompleteAgent';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
@@ -12,7 +12,7 @@ type QueueListFilterProps = {
 };
 
 export const QueueListFilter = ({ setFilter, ...props }: QueueListFilterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const statusOptions: [string, string][] = [
 		['online', t('Online')],
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
index 63b62b85e642..677b8a201990 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import QueueListTable from './QueueListTable';
 
 const QueueListPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
index 9b506727def3..b6e29530b5e7 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
@@ -1,7 +1,7 @@
 import { Box, Select, Margins, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useState, useMemo, useEffect, Fragment } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
@@ -27,7 +27,7 @@ const randomizeKeys = (keys) => {
 const dateRange = getDateRange();
 
 const RealTimeMonitoringPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const keys = useRef([...Array(10).keys()]);
 
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
index cc5566e04c4b..f1b2d0eed337 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
@@ -1,10 +1,9 @@
 import type { OperationParams } from '@rocket.chat/rest-typings';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Chart as ChartType } from 'chart.js';
-import type { TFunction } from 'i18next';
 import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -21,7 +20,7 @@ const initialData = {
 	offline: 0,
 };
 
-const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TFunction): Promise<ChartType> =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']): Promise<ChartType> =>
 	drawDoughnutChart(
 		canvas,
 		t('Agents'),
@@ -36,7 +35,7 @@ type AgentStatusChartsProps = {
 };
 
 const AgentStatusChart = ({ params, reloadRef, ...props }: AgentStatusChartsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
 	const context: MutableRefObject<ChartType | undefined> = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
index c684f907052d..b4e155394f68 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
@@ -33,7 +33,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatDurationChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
index dc3c495de32f..b84dfe6918a2 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
@@ -1,10 +1,9 @@
 import type { OperationParams } from '@rocket.chat/rest-typings';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Chart as ChartType } from 'chart.js';
-import type { TFunction } from 'i18next';
 import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -21,7 +20,7 @@ const initialData = {
 	closed: 0,
 };
 
-const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TFunction) =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']) =>
 	drawDoughnutChart(
 		canvas,
 		t('Chats'),
@@ -36,7 +35,7 @@ type ChatsChartProps = {
 };
 
 const ChatsChart = ({ params, reloadRef, ...props }: ChatsChartProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
 	const context: MutableRefObject<ChartType | undefined> = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
index 4fd204b0e907..48b0bdbf655e 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -20,7 +20,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatsPerAgentChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
index 57189f447317..fbfe91695626 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -19,7 +19,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatsPerDepartmentChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
index 2fa04de26313..cfc33687c8fc 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
@@ -34,7 +34,7 @@ const init = (canvas, context, t) =>
 	);
 
 const ResponseTimesChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
index c1c632e06c0c..d942b93a4223 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
@@ -1,6 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 import { type Chart } from 'chart.js';
-import type { TFunction } from 'i18next';
 import { type MutableRefObject } from 'react';
 
 import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler';
@@ -8,8 +8,8 @@ import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler
 type UseUpdateChartDataOptions = {
 	context: MutableRefObject<Chart | undefined>;
 	canvas: MutableRefObject<HTMLCanvasElement | null>;
-	init: (canvas: HTMLCanvasElement, context: undefined, t: TFunction) => Promise<Chart>;
-	t: TFunction;
+	init: (canvas: HTMLCanvasElement, context: undefined, t: TranslationContextValue['translate']) => Promise<Chart>;
+	t: TranslationContextValue['translate'];
 };
 
 export const useUpdateChartData = ({ context: contextRef, canvas: canvasRef, init, t }: UseUpdateChartDataOptions) =>
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
index 0c244993dea7..f10909e19f01 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
@@ -1,7 +1,7 @@
 import { Skeleton } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import CounterItem from './CounterItem';
@@ -23,7 +23,7 @@ type CounterContainerProps = {
 };
 
 const CounterContainer = ({ data, state, initialData, ...props }: CounterContainerProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [displayData, setDisplayData] = useState<DataType>(initialData);
 
diff --git a/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
index 0033d345423f..1073c8e702cc 100644
--- a/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
@@ -1,11 +1,11 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldGroup, FieldLabel, FieldRow, NumberInput, Select, TextInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from './EditTrigger';
 
@@ -16,7 +16,7 @@ type ConditionFormType = ComponentProps<typeof Field> & {
 
 export const ConditionForm = ({ control, index, ...props }: ConditionFormType) => {
 	const conditionFieldId = useUniqueId();
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const conditionName = useWatch({ control, name: `conditions.${index}.name` });
 
 	const placeholders: { [conditionName: string]: string } = useMemo(
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
index 5ef1fd876642..b09ea937b1cd 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
@@ -12,11 +12,11 @@ import {
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback, useMemo } from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 import { type TriggersPayload } from '../EditTrigger';
@@ -35,7 +35,7 @@ const ACTION_HINTS: Record<string, TranslationKey> = {
 const PREMIUM_ACTIONS = ['use-external-service'];
 
 export const ActionForm = ({ control, trigger, index, ...props }: SendMessageFormType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const actionFieldId = useUniqueId();
 	const actionFieldName = `actions.${index}.name` as const;
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
index 4dcd071fdd7d..7b6d9b9b4ed5 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
@@ -1,10 +1,10 @@
 import { FieldRow, Select, TextInput, type SelectOption, Field, FieldLabel } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 
@@ -15,7 +15,7 @@ type ActionSenderType = ComponentProps<typeof Field> & {
 };
 
 export const ActionSender = ({ control, index, disabled, ...props }: ActionSenderType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const senderFieldId = useUniqueId();
 	const senderFieldName = `actions.${index}.params.sender` as const;
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
index c53cd1e076ab..0905b8afbc8d 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
@@ -1,10 +1,10 @@
 import { FieldError, Field, FieldHint, FieldLabel, FieldRow, NumberInput, TextAreaInput, FieldGroup } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FocusEvent } from 'react';
 import React from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 import type { TriggersPayload } from '../EditTrigger';
@@ -19,7 +19,7 @@ type SendMessageActionFormType = ComponentProps<typeof Field> & {
 };
 
 export const ExternalServiceActionForm = ({ control, trigger, index, ...props }: SendMessageActionFormType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
index c48083054e40..d34ce4240c73 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
@@ -1,10 +1,10 @@
 import { Field, FieldError, FieldLabel, FieldRow, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 import { useFieldError } from '../hooks';
@@ -16,7 +16,7 @@ type SendMessageActionFormType = ComponentProps<typeof Field> & {
 };
 
 export const SendMessageActionForm = ({ control, index, ...props }: SendMessageActionFormType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const messageFieldId = useUniqueId();
 	const name = `actions.${index}.params.msg` as const;
 	const [messageError] = useFieldError({ control, name });
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
index bd05e95d83fd..791841ed3ab5 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
@@ -1,7 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Palette } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type OutlookSettingItemProps = {
 	id: string;
@@ -12,7 +12,7 @@ type OutlookSettingItemProps = {
 };
 
 const OutlookSettingItem = ({ id, title, subTitle, enabled, handleEnable }: OutlookSettingItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const hovered = css`
 		&:hover,
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
index d89321346256..71604da54b67 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../../../app/e2e/client';
 import { E2EEState } from '../../../../app/e2e/client/E2EEState';
@@ -16,7 +16,7 @@ const RoomE2EESetup = () => {
 	const e2eeState = useE2EEState();
 	const e2eRoomState = useE2EERoomState(room._id);
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const randomPassword = window.localStorage.getItem('e2e.randomPassword');
 
 	const onSavePassword = useCallback(() => {
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
index 36941e2c829e..b1da1323df65 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box, Dropdown, Option } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../../components/Header';
 import { useDropdownVisibility } from '../../../../../sidebar/header/hooks/useDropdownVisibility';
@@ -14,7 +14,7 @@ type QuickActionOptionsProps = {
 };
 
 const QuickActionOptions = ({ options, room, action, ...props }: QuickActionOptionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const reference = useRef(null);
 	const target = useRef(null);
 	const { isVisible, toggle } = useDropdownVisibility({ reference, target });
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
index f3b7ef7562d6..13805850a13d 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
 import { useOmnichannelRoom } from '../../../contexts/RoomContext';
@@ -13,7 +13,7 @@ type QuickActionsProps = {
 };
 
 const QuickActions = ({ className }: QuickActionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useOmnichannelRoom();
 	const { quickActions, actionDefault } = useQuickActions();
 
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 5d98d4a33f8d..2e38e2110bbe 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Suspense } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header';
 import MarkdownText from '../../../components/MarkdownText';
@@ -34,7 +34,7 @@ export type RoomHeaderProps = {
 };
 
 const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Header>
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
index d8125feff06e..58e1f9f59ef7 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,6 +1,6 @@
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 import { roomActionHooksForE2EESetup } from '../../../../ui';
@@ -10,7 +10,7 @@ import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import { getRoomGroup } from '../../lib/getRoomGroup';
 
 const RoomToolboxE2EESetup = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const toolbox = useRoomToolbox();
 	const room = useRoom();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
index 36941e2c829e..b1da1323df65 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box, Dropdown, Option } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../../components/Header';
 import { useDropdownVisibility } from '../../../../../sidebar/header/hooks/useDropdownVisibility';
@@ -14,7 +14,7 @@ type QuickActionOptionsProps = {
 };
 
 const QuickActionOptions = ({ options, room, action, ...props }: QuickActionOptionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const reference = useRef(null);
 	const target = useRef(null);
 	const { isVisible, toggle } = useDropdownVisibility({ reference, target });
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
index f3b7ef7562d6..13805850a13d 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
 import { useOmnichannelRoom } from '../../../contexts/RoomContext';
@@ -13,7 +13,7 @@ type QuickActionsProps = {
 };
 
 const QuickActions = ({ className }: QuickActionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useOmnichannelRoom();
 	const { quickActions, actionDefault } = useQuickActions();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
index a99265368dee..8ef21aecf0cd 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Suspense } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
@@ -32,7 +32,7 @@ export type RoomHeaderProps = {
 };
 
 const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Header>
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
index 424cfeab7714..cfe1f620afbf 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
@@ -2,9 +2,9 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { UIEvent } from 'react';
 import React, { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderSubtitle } from '../../../components/Header';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
@@ -18,7 +18,7 @@ type RoomLeaderProps = {
 };
 
 const RoomLeader = ({ _id, name, username }: RoomLeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openUserCard, triggerProps } = useUserCard();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
index 12caba1f3801..9c6afa33fc27 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,6 +1,6 @@
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 import { roomActionHooksForE2EESetup } from '../../../../ui';
@@ -8,7 +8,7 @@ import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext'
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
 const RoomToolboxE2EESetup = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const toolbox = useRoomToolbox();
 
 	const { tab } = toolbox;
diff --git a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
index 7865f7dcbe85..dbd1f0fa57c7 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
@@ -1,13 +1,13 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 import { useRoom } from '../contexts/RoomContext';
 
 const MessageListErrorBoundary = ({ children }: { children: ReactNode }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	return (
diff --git a/apps/meteor/client/views/room/MessageList/MessageListItem.tsx b/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
index 0304be656121..ecd0978c9fc0 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
@@ -1,7 +1,7 @@
 import { isThreadMessage, type IMessage, type ISubscription } from '@rocket.chat/core-typings';
 import { Box, Bubble, MessageDivider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import RoomMessage from '../../../components/message/variants/RoomMessage';
 import SystemMessage from '../../../components/message/variants/SystemMessage';
@@ -31,7 +31,7 @@ export const MessageListItem = ({
 	subscription,
 	system,
 }: MessageListItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useFormatDate();
 
 	const ref = useDateRef();
diff --git a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
index 2e9e16ef3201..8a9b1ae77dbd 100644
--- a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
+++ b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { DragEvent, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 
@@ -16,7 +16,7 @@ type DropTargetOverlayProps = {
 };
 
 function DropTargetOverlay({ enabled, reason, onFileDrop, visible = true, onDismiss }: DropTargetOverlayProps): ReactElement | null {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleDragLeave = useMutableCallback((event: DragEvent) => {
 		event.stopPropagation();
diff --git a/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
index 6923528e33b9..cdddc8b482cd 100644
--- a/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Upload } from '../../../lib/chats/Upload';
 
@@ -11,7 +11,7 @@ type ErroredUploadProgressIndicatorProps = {
 };
 
 const ErroredUploadProgressIndicator = ({ id, error, onClose }: ErroredUploadProgressIndicatorProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleCloseClick = useCallback(() => {
 		onClose?.(id);
diff --git a/apps/meteor/client/views/room/body/LeaderBar.tsx b/apps/meteor/client/views/room/body/LeaderBar.tsx
index 6c637eb84d8e..b54d37ed5df9 100644
--- a/apps/meteor/client/views/room/body/LeaderBar.tsx
+++ b/apps/meteor/client/views/room/body/LeaderBar.tsx
@@ -2,10 +2,10 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, UIEvent } from 'react';
 import React, { memo, useCallback, useMemo } from 'react';
 import type { AriaButtonProps } from 'react-aria';
-import { useTranslation } from 'react-i18next';
 
 import { isTruthy } from '../../../../lib/isTruthy';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
@@ -23,7 +23,7 @@ type LeaderBarProps = {
  * @deprecated on newNavigation feature. Remove after full migration.
  */
 const LeaderBar = ({ _id, name, username, visible, onAvatarClick, triggerProps }: LeaderBarProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const chatNowLink = useMemo(() => roomCoordinator.getRouteLink('d', { name: username }) || undefined, [username]);
 
diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
index f9c612ce9a9a..4629b812bbff 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
@@ -1,14 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Bubble } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { withErrorBoundary } from '../../../components/withErrorBoundary';
 import { usePruneWarningMessage } from '../../../hooks/usePruneWarningMessage';
 
 const RetentionPolicyWarning = ({ room }: { room: IRoom }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const message = usePruneWarningMessage(room);
 
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
index 7629fc14c508..a765407ad6d4 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
@@ -2,9 +2,9 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { isVoipRoom, isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { Flex, Box } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword';
 import RoomForewordUsernameList from './RoomForewordUsernameList';
@@ -12,7 +12,7 @@ import RoomForewordUsernameList from './RoomForewordUsernameList';
 type RoomForewordProps = { user: IUser | null; room: IRoom };
 
 const RoomForeword = ({ user, room }: RoomForewordProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (isVoipRoom(room)) {
 		return <VoipRoomForeword room={room} />;
diff --git a/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx b/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
index 842929376cf7..e72a263ae8e6 100644
--- a/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Bubble } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type UnreadMessagesIndicatorProps = {
 	count: number;
@@ -18,7 +18,7 @@ const indicatorStyle = css`
 `;
 
 const UnreadMessagesIndicator = ({ count, onJumpButtonClick, onMarkAsReadButtonClick }: UnreadMessagesIndicatorProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box className={indicatorStyle} mbs={8}>
diff --git a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
index 3c9a9b0a809d..001e84de2401 100644
--- a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Upload } from '../../../lib/chats/Upload';
 import ErroredUploadProgressIndicator from './ErroredUploadProgressIndicator';
@@ -14,7 +14,7 @@ type UploadProgressIndicatorProps = {
 };
 
 const UploadProgressIndicator = ({ id, name, percentage, error, onClose }: UploadProgressIndicatorProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleCloseClick = useCallback(() => {
 		onClose?.(id);
diff --git a/apps/meteor/client/views/room/composer/ComposerArchived.tsx b/apps/meteor/client/views/room/composer/ComposerArchived.tsx
index e32d4310e451..d8e269f9986c 100644
--- a/apps/meteor/client/views/room/composer/ComposerArchived.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerArchived.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerReadOnly = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<MessageFooterCallout>
diff --git a/apps/meteor/client/views/room/composer/ComposerBlocked.tsx b/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
index c1a7aaca35ee..c5edb077c39f 100644
--- a/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerBlocked = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <MessageFooterCallout>{t('room_is_blocked')}</MessageFooterCallout>;
 };
 
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
index cdac8d6d4daf..523c0e44af86 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
@@ -1,9 +1,9 @@
 import { Box, Option, OptionSkeleton, Tile } from '@rocket.chat/fuselage';
 import { useUniqueId, useContentBoxSize } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useEffect, memo, useMemo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export type ComposerBoxPopupProps<
 	T extends {
@@ -32,7 +32,7 @@ function ComposerBoxPopup<
 	select,
 	renderItem = ({ item }: { item: T }) => <>{JSON.stringify(item)}</>,
 }: ComposerBoxPopupProps<T>): ReactElement | null {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const id = useUniqueId();
 	const composerBoxPopupRef = useRef<HTMLElement>(null);
 	const popupSizes = useContentBoxSize(composerBoxPopupRef);
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
index 70c18a9dae57..fe69136c3d26 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
@@ -1,6 +1,6 @@
 import { OptionColumn, OptionContent, OptionDescription, OptionInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export type ComposerBoxPopupSlashCommandProps = {
 	_id: string;
@@ -10,7 +10,7 @@ export type ComposerBoxPopupSlashCommandProps = {
 };
 
 function ComposerBoxPopupSlashCommand({ _id, description, params, disabled }: ComposerBoxPopupSlashCommandProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
index ef38f61cdf6c..a32168799158 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
@@ -1,7 +1,7 @@
 import { OptionAvatar, OptionColumn, OptionContent, OptionInput } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ReactiveUserStatus from '../../../components/UserStatus/ReactiveUserStatus';
 
@@ -19,7 +19,7 @@ export type ComposerBoxPopupUserProps = {
 };
 
 function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, suggestion, variant }: ComposerBoxPopupUserProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
index 0bcfa22790a9..e20c00a0d1eb 100644
--- a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerFederationDisabled = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <MessageFooterCallout>{t('Federation_Matrix_Federated_Description_disabled')}</MessageFooterCallout>;
 };
diff --git a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
index 59337376026f..94d578d6fc2d 100644
--- a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerFederationJoinRoomDisabled = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <MessageFooterCallout>{t('Federation_Matrix_join_public_rooms_is_premium')}</MessageFooterCallout>;
 };
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
index 74ee27dac24f..ecae4417db7b 100644
--- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
@@ -1,7 +1,7 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import { useResumeChatOnHoldMutation } from './hooks/useResumeChatOnHoldMutation';
@@ -11,7 +11,7 @@ export const ComposerOmnichannelOnHold = (): ReactElement => {
 
 	const room = useOmnichannelRoom();
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<MessageFooterCallout>
diff --git a/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx b/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
index f2965f63c26f..e2d5c1f03fe0 100644
--- a/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, Fragment } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { UserAction } from '../../../../../app/ui/client/lib/UserAction';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
@@ -9,7 +9,7 @@ import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 const maxUsernames = 5;
 
 const ComposerUserActionIndicator = ({ rid, tmid }: { rid: string; tmid?: string }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const actions = useReactiveValue(
 		useCallback(() => {
 			const roomAction = UserAction.get(tmid || rid) || {};
diff --git a/apps/meteor/client/views/room/composer/ComposerVoIP.tsx b/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
index 399e0d32baa7..98670bd45a15 100644
--- a/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerVoIP = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <MessageFooterCallout>{t('Composer_not_available_phone_calls')}</MessageFooterCallout>;
 };
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
index 2010a589edc6..d39b74c079a2 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
@@ -1,7 +1,7 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { isPromptButton, type FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI';
@@ -13,7 +13,7 @@ type FormattingToolbarDropdownProps = {
 };
 
 const FormattingToolbarDropdown = ({ composer, items, disabled }: FormattingToolbarDropdownProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const formattingItems: GenericMenuItemProps[] = items.map((formatter) => {
 		const handleFormattingAction = () => {
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
index c5b1f06dd9b8..7a4f7da20825 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
@@ -1,6 +1,6 @@
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import { isPromptButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
@@ -15,7 +15,7 @@ type MessageBoxFormattingToolbarProps = {
 };
 
 const MessageBoxFormattingToolbar = ({ items, variant = 'large', composer, disabled }: MessageBoxFormattingToolbarProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (variant === 'small') {
 		const collapsedItems = [...items];
diff --git a/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts b/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
index e0923c268fe8..e298f86a1e0b 100644
--- a/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const useMediaActionTitle = (
 	media: 'audio' | 'video',
@@ -8,7 +8,7 @@ export const useMediaActionTitle = (
 	isMediaEnabled: boolean,
 	isAllowed: boolean,
 ) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const getMediaActionTitle = useMemo(() => {
 		if (isPermissionDenied) {
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
index e5272e749a17..d6e94f4f45ac 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
@@ -1,8 +1,8 @@
 import { Callout, FieldGroup, Field, FieldLabel, FieldRow, ToggleSwitch, Select } from '@rocket.chat/fuselage';
 import type { SelectOption } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarClose,
@@ -30,7 +30,7 @@ const AutoTranslate = ({
 	handleChangeLanguage,
 	handleClose,
 }: AutoTranslateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	return (
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
index 352f7e46ce6a..5395fb95f467 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
@@ -1,6 +1,6 @@
 import type { IDiscussionMessage, IUser } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 import { normalizeThreadMessage } from '../../../../lib/normalizeThreadMessage';
@@ -14,7 +14,7 @@ type DiscussionListRowProps = {
 };
 
 function DiscussionListRow({ discussion, showRealNames, userId, onClick }: DiscussionListRowProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const msg = normalizeThreadMessage(discussion);
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
index a0c4fa09ffae..6fabbaff4a1a 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
@@ -1,9 +1,9 @@
 import type { IDiscussionMessage } from '@rocket.chat/core-typings';
 import { Box, Message } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Emoji from '../../../../../components/Emoji';
 import { clickableItem } from '../../../../../lib/clickableItem';
@@ -33,7 +33,7 @@ const DiscussionListItem = ({
 	emoji,
 	...props
 }: DiscussionListItemProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<Box is={Message} {...props} className={className} pbs={16} pbe={8}>
 			<Message.LeftContainer>
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index 4fbd060bef67..57aa18c7bb66 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../components/Contextualbar';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
@@ -23,7 +23,7 @@ export type MailExportFormValues = {
 };
 
 const ExportMessages = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	const { closeTab } = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
index 7344926ec646..9f52085e7bd2 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, Select, ButtonGroup, Button, FieldGroup, InputBox } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
 import type { MailExportFormValues } from './ExportMessages';
@@ -18,7 +18,7 @@ type FileExportProps = {
 };
 
 const FileExport = ({ formId, rid, exportOptions, onCancel }: FileExportProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control, handleSubmit } = useFormContext<MailExportFormValues>();
 	const roomExportMutation = useRoomExportMutation();
 	const formFocus = useAutoFocus<HTMLFormElement>();
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
index 41b6c33fec6c..39e043bb9c0b 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -17,9 +17,9 @@ import {
 	Select,
 } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useContext } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { validateEmail } from '../../../../../lib/emailValidator';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
@@ -36,7 +36,7 @@ type MailExportFormProps = {
 };
 
 const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportFormProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formFocus = useAutoFocus<HTMLFormElement>();
 
 	const {
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
index 84c93e307cb1..459557bde32a 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
@@ -10,7 +10,7 @@ type ChannelToTeamConfirmationProps = {
 };
 
 const ChannelToTeamConfirmation = ({ onCancel, onConfirm }: ChannelToTeamConfirmationProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
index ea7335bbbf45..a1e088b158f3 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import TeamAutocomplete from '../../../../teams/contextualBar/TeamAutocomplete';
@@ -14,7 +14,7 @@ type ChannelToTeamSelectionProps = {
 };
 
 const ChannelToTeamSelection = ({ teamId, onCancel, onChange, onConfirm }: ChannelToTeamSelectionProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
index cbbaad6427d1..31f96a344677 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, IconButton } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -41,7 +41,7 @@ type RoomInfoProps = {
 };
 
 const RoomInfo = ({ room, icon, onClickBack, onClickClose, onClickEnterRoom, onClickEdit, resetState }: RoomInfoProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { name, fname, description, topic, archived, broadcast, announcement } = room;
 	const roomTitle = fname || name;
 	const isDiscussion = 'prid' in room;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
index 512fb83fa153..302a2c476e9d 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
@@ -1,6 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom';
 import { useRoomConvertToTeam } from './actions/useRoomConvertToTeam';
@@ -17,7 +17,7 @@ type UseRoomActionsOptions = {
 export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 	const { onClickEnterRoom, onClickEdit, resetState } = options;
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleHide = useRoomHide(room);
 	const handleLeave = useRoomLeave(room);
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload: resetState });
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
index 6dab532b27c6..505a7cbc8590 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -12,7 +12,7 @@ import {
 import KeyboardShortcutSection from './KeyboardShortcutSection';
 
 const KeyboardShortcuts = ({ handleClose }: { handleClose: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
index 6a3c74fd3fa4..e61bd736768b 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
@@ -1,6 +1,6 @@
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarClose,
@@ -22,7 +22,7 @@ const MessageSearchTab = () => {
 
 	const [{ searchText, globalSearch }, handleSearch] = useState({ searchText: '', globalSearch: false });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
index e59ed2cdf780..b9c076e36781 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
@@ -2,9 +2,9 @@ import type { IMessageSearchProvider } from '@rocket.chat/core-typings';
 import { Box, Field, FieldLabel, FieldHint, Icon, TextInput, ToggleSwitch, Callout } from '@rocket.chat/fuselage';
 import { useDebouncedCallback, useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { getRoomTypeTranslation } from '../../../../../lib/getRoomTypeTranslation';
 import { useRoom } from '../../../contexts/RoomContext';
@@ -45,7 +45,7 @@ const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
 	const globalSearchEnabled = provider.settings.GlobalSearchEnabled;
 	const globalSearchToggleId = useUniqueId();
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box is='form' onSubmit={submitHandler} w='full'>
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
index c7ccb8b61232..5066825d8311 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -30,7 +30,7 @@ const NotificationPreferences = ({
 	notificationOptions,
 	handlePlaySound,
 }: NotificationPreferencesProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		formState: { isDirty, isSubmitting },
 	} = useFormContext();
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
index b9b54af27c08..dcf1522197ee 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { FieldGroup, IconButton, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import NotificationByDevice from './components/NotificationByDevice';
 import NotificationPreference from './components/NotificationPreference';
@@ -16,7 +16,7 @@ type NotificationPreferencesFormProps = {
 };
 
 const NotificationPreferencesForm = ({ notificationOptions, handlePlaySound }: NotificationPreferencesFormProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { watch, control } = useFormContext();
 
 	const { showCounter } = watch();
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
index 89c82fd966ec..aaf119e703ff 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Button, Callout, Throbber } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEventHandler, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import {
@@ -27,7 +27,7 @@ type OTRProps = {
 };
 
 const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh, otrState, peerUsername }: OTRProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	const renderOTRState = (): ReactElement => {
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
index 21be67e28011..e74dbb5c54f6 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type OTREstablishedProps = {
 	onClickRefresh: () => void;
@@ -9,7 +9,7 @@ type OTREstablishedProps = {
 };
 
 const OTREstablished = ({ onClickRefresh, onClickEnd }: OTREstablishedProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<ButtonGroup stretch>
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
index 67f3e62d1592..0794c829b58a 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
@@ -1,8 +1,8 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type OTRStatesProps = {
 	title: string;
@@ -12,7 +12,7 @@ type OTRStatesProps = {
 };
 
 const OTRStates = ({ title, description, icon, onClickStart }: OTRStatesProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<States>
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
index 88b979dc8bc3..17242ed06daa 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, ButtonGroup, Button, CheckBox, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -25,7 +25,7 @@ type PruneMessagesProps = {
 };
 
 const PruneMessages = ({ callOutText, validateText, onClickClose, onClickPrune }: PruneMessagesProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control, register } = useFormContext();
 
 	const inclusiveCheckboxId = useUniqueId();
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
index e699ee6f6c77..be479ffe77bd 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
@@ -1,9 +1,9 @@
 import type { IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ContextualbarSection } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -42,7 +42,7 @@ const RoomFiles = ({
 	onClickClose,
 	onClickDelete,
 }: RoomFilesProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const options: SelectOption[] = useMemo(
 		() => [
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
index 1dc2a4c57191..59a06fdb4251 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Field, FieldLabel, FieldRow, Select, Button } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type EditInviteLinkProps = {
 	daysAndMaxUses: { days: string; maxUses: string };
@@ -11,7 +11,7 @@ type EditInviteLinkProps = {
 };
 
 const EditInviteLink = ({ daysAndMaxUses, onClickNewLink }: EditInviteLinkProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		handleSubmit,
 		formState: { isDirty, isSubmitting },
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
index e5aabea4a688..cd2fb2a22a4b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
@@ -1,7 +1,7 @@
 import { Box, Field, FieldLabel, FieldRow, UrlInput, Icon, Button, InputBox } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../../../../../hooks/useClipboardWithToast';
 
@@ -12,7 +12,7 @@ type InviteLinkProps = {
 };
 
 const InviteLink = ({ linkText, captionText, onClickEdit }: InviteLinkProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { copy } = useClipboardWithToast(linkText);
 
 	return (
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
index 1ae82e75681a..fa7a915a7285 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
@@ -1,7 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -38,7 +38,7 @@ const InviteUsers = ({
 	linkText,
 	error,
 }: InviteUsersProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index a9ba5dd9dc0c..130bea5557a0 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -1,8 +1,8 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
@@ -12,7 +12,7 @@ type RoomMembersActionsProps = Pick<IUser, '_id' | 'name' | 'username' | 'freeSw
 };
 
 const RoomMembersActions = ({ username, _id, name, rid, freeSwitchExtension, reload }: RoomMembersActionsProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { menuActions: menuOptions } = useUserInfoActions({
 		rid,
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
index 4a0e71746417..03a80c496028 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
@@ -1,9 +1,9 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Message, Box, IconButton } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Emoji from '../../../../../components/Emoji';
 import { followStyle, anchor } from '../../../../../components/message/helpers/followSyle';
@@ -47,7 +47,7 @@ const ThreadListMessage = ({
 	emoji,
 	...props
 }: ThreadListMessageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const button = !following ? 'bell-off' : 'bell';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
index 3245b1c03010..4e151bab4bec 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
@@ -1,7 +1,7 @@
 import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typings';
 import { Box, Bubble, MessageDivider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import SystemMessage from '../../../../../components/message/variants/SystemMessage';
 import ThreadMessage from '../../../../../components/message/variants/ThreadMessage';
@@ -27,7 +27,7 @@ export const ThreadMessageItem = ({
 	firstUnread,
 	system,
 }: ThreadMessageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useFormatDate();
 	const ref = useDateRef();
 
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index bf600a757f26..ff86c0e6170f 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -2,9 +2,9 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton, Skeleton } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { UserInfoAction } from '../../../../components/UserInfo';
 import { useMemberExists } from '../../../hooks/useMemberExists';
@@ -17,7 +17,7 @@ type UserInfoActionsProps = {
 };
 
 const UserInfoActions = ({ user, rid, backToList }: UserInfoActionsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		data: isMemberData,
 		refetch,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
index 89aecda07fdc..41a980dccf31 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
@@ -1,7 +1,7 @@
 import { Modal, Button, Box, Callout, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type VideoConfConfigModalProps = {
 	onClose: () => void;
@@ -10,7 +10,7 @@ type VideoConfConfigModalProps = {
 };
 
 const VideoConfConfigModal = ({ onClose, onConfirm, isAdmin }: VideoConfConfigModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
index c8c7b6a59e3b..b9da11fcd67d 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
@@ -1,9 +1,9 @@
 import type { VideoConference } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Throbber } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -29,7 +29,7 @@ type VideoConfListProps = {
 };
 
 const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loadMoreItems }: VideoConfListProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { ref, contentBoxSize: { inlineSize = 378, blockSize = 1 } = {} } = useResizeObserver<HTMLElement>({
 		debounceDelay: 200,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
index 09ddfb51b3a2..44727aae98c9 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupContent,
@@ -15,7 +16,6 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVideoConfSetPreferences } from '../../../../../../contexts/VideoConfContext';
 import { AsyncStatePhase } from '../../../../../../hooks/useAsyncState';
@@ -32,7 +32,7 @@ type IncomingPopupProps = {
 };
 
 const IncomingPopup = ({ id, room, position, onClose, onMute, onConfirm }: IncomingPopupProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { controllersConfig, handleToggleMic, handleToggleCam } = useVideoConfControllers();
 	const setPreferences = useVideoConfSetPreferences();
 
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
index eaf82c5a301e..92f30c0c1cea 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
@@ -1,4 +1,5 @@
 import type { IRoom } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupContent,
@@ -13,7 +14,6 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
@@ -25,7 +25,7 @@ type OutgoingPopupProps = {
 };
 
 const OutgoingPopup = ({ room, onClose, id }: OutgoingPopupProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const videoConfPreferences = useVideoConfPreferences();
 	const { controllersConfig } = useVideoConfControllers(videoConfPreferences);
 	const capabilities = useVideoConfCapabilities();
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
index a9fcb8527767..d1bc3a29231b 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
@@ -1,5 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useOutsideClick, useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupHeader,
@@ -14,7 +15,6 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { useCallback, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVideoConfSetPreferences, useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import { useVideoConfRoomName } from '../../hooks/useVideoConfRoomName';
@@ -29,7 +29,7 @@ type StartCallPopupProps = {
 };
 
 const StartCallPopup = ({ id, loading, room, onClose, onConfirm }: StartCallPopupProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const ref = useRef(null);
 	useOutsideClick([ref], !loading ? onClose : () => undefined);
 
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
index ff96e220723a..6b48a47a79ef 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
@@ -1,7 +1,7 @@
 import { AudioPlayer, Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useState, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 import { FilePreviewType } from './FilePreview';
@@ -38,7 +38,7 @@ type MediaPreviewProps = {
 
 const MediaPreview = ({ file, fileType }: MediaPreviewProps): ReactElement => {
 	const [loaded, url] = useFileAsDataURL(file);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (!loaded) {
 		return <PreviewSkeleton />;
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
index cd309923ffd4..70a91df0e555 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import Reactions from './Reactions';
@@ -12,7 +12,7 @@ type ReactionListModalProps = {
 };
 
 const ReactionListModal = ({ reactions, onClose }: ReactionListModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal variant='info' title={t('Users_reacted')} onClose={onClose} onConfirm={onClose} confirmText={t('Close')}>
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
index 3f152db142e9..827e16b1ac60 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
@@ -1,7 +1,7 @@
 import { Box, Icon, IconButton, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FilePickerBreadcrumbsProps = {
 	parentFolders: string[];
@@ -10,7 +10,7 @@ type FilePickerBreadcrumbsProps = {
 };
 
 const FilePickerBreadcrumbs = ({ parentFolders, handleBreadcrumb, handleBack }: FilePickerBreadcrumbsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' alignItems='center' overflowX='auto' mie={8}>
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
index 32b379eca432..e85248fca0e9 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
@@ -1,8 +1,8 @@
 import type { IWebdavNode } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
@@ -36,7 +36,7 @@ const WebdavFilePickerTable = ({
 	onNodeClick,
 	isLoading,
 }: WebdavFilePickerTableProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' overflowY='hidden' height='x256'>
diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
index 2bb54f1fc69c..f7f14bc8199d 100644
--- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
+++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
@@ -1,8 +1,8 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableHeader, GenericTableBody } from '../../../components/GenericTable';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
@@ -29,7 +29,7 @@ const ChannelDesertionTable = ({
 }: ChannelDesertionTableProps) => {
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'ts'>('name');
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const selectedRoomsLength = Object.values(selectedRooms).filter(Boolean).length;
 
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
index a4aba906e7d9..ae5b30609d78 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import ChannelDesertionTable from '../../ChannelDesertionTable';
@@ -28,7 +28,7 @@ const FirstStep = ({
 	eligibleRoomsLength,
 	...props
 }: FirstStepProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
index 27b4a9c7d772..118149591d01 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
@@ -16,7 +16,7 @@ type SecondStepsProps = {
 };
 
 const SecondStep = ({ onClose, onCancel, onConfirm, deletedRooms = {}, rooms = [], ...props }: SecondStepsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index aae1d604dba0..418883869a4a 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -2,15 +2,15 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { CheckBox } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
 
 const TeamsChannelItemMenu = ({ room, mainRoom, reload }: { room: IRoom; mainRoom: IRoom; reload?: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { handleRemoveRoom, canRemoveTeamChannel } = useRemoveRoomFromTeam(room, { reload });
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload });
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
index 288604727ef6..b1847825ffab 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback, useAutoFocus, useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, Dispatch, SetStateAction, SyntheticEvent } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -54,7 +54,7 @@ const TeamsChannels = ({
 	onClickView,
 	reload,
 }: TeamsChannelsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 
 	const options: SelectOption[] = useMemo(
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
index 24555a1fc9e0..4bd85aed663c 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableBody, GenericTableHeader } from '../../../../../../components/GenericTable';
 import { useSort } from '../../../../../../components/GenericTable/hooks/useSort';
@@ -15,7 +15,7 @@ type ChannelDeletionTableProps = {
 };
 
 const ChannelDeletionTable = ({ rooms, onChangeRoomSelection, selectedRooms, onToggleAllRooms }: ChannelDeletionTableProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'usersCount'>('name');
 
 	const selectedRoomsLength = Object.values(selectedRooms).filter(Boolean).length;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
index e87eb5825af6..0a02e1243431 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import ChannelDeletionTable from './ChannelDeletionTable';
@@ -23,7 +23,7 @@ const DeleteTeamChannels = ({
 	onConfirm,
 	onChangeRoomSelection,
 }: DeleteTeamChannelsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
index 4eed097a4a3e..d7c711cf2d42 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
@@ -1,6 +1,6 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import RoomLinkList from './RoomLinkList';
@@ -14,7 +14,7 @@ type DeleteTeamConfirmationProps = {
 };
 
 const DeleteTeamConfirmation = ({ deletedRooms, keptRooms, onConfirm, onReturn, onCancel }: DeleteTeamConfirmationProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const roomIds = Object.values(deletedRooms).map(({ _id }) => _id);
 
 	return (
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
index 230828ef6795..0a4b0fbe6af3 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../../ChannelDesertionTable';
@@ -27,7 +27,7 @@ const LeaveTeamModalChannels = ({
 	eligibleRoomsLength,
 	selectedRooms,
 }: LeaveTeamModalChannelsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
index 0fd32323bfff..36ef2c54f4bc 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 
@@ -15,7 +15,7 @@ type LeaveTeamModalConfirmationProps = {
 };
 
 const LeaveTeamModalConfirmation = ({ selectedRooms, onConfirm, onCancel, onClose }: LeaveTeamModalConfirmationProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index a5e554ca6f05..f28f4c8b5742 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Button, Callout, Option, Menu } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -50,7 +50,7 @@ const TeamsInfo = ({
 	onClickViewChannels,
 	onClickConvertToChannel,
 }: TeamsInfoProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const retentionPolicy = useRetentionPolicy(room);
 
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
index d467b6957e0f..9657ea153a78 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../ChannelDesertionTable';
@@ -21,7 +21,7 @@ const RemoveUsersFirstStep = ({
 	eligibleRoomsLength,
 	...props
 }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
index 8fe67f29fbb2..be5258e0c097 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
@@ -1,11 +1,11 @@
 import { Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
 const RemoveUsersSecondStep = ({ onClose, onCancel, onConfirm, deletedRooms = {}, username, rooms = [], ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/voip/modal/DialPad/DialInput.tsx b/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
index 36a81d47ec8f..cf96f4e26507 100644
--- a/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
+++ b/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
@@ -1,7 +1,7 @@
 import { IconButton, TextInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, FocusEvent } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type DialInputProps = {
 	inputName: string;
@@ -16,7 +16,7 @@ export const DialInput = forwardRef<HTMLInputElement, DialInputProps>(function D
 	{ handleBackspaceClick, handleOnChange, isButtonDisabled, inputError, inputName },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<TextInput
diff --git a/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx b/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
index b3b92609d1a5..8c94ad238ddc 100644
--- a/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
+++ b/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
@@ -1,7 +1,7 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, RefCallback } from 'react';
 import { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useDialModal } from '../../../../hooks/useDialModal';
 import { useOutboundDialer } from '../../../../hooks/useOutboundDialer';
@@ -25,7 +25,7 @@ type DialPadProps = {
 };
 
 export const useDialPad = ({ initialValue, initialErrorMessage }: DialPadProps): DialPadStateHandlers => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const outboundClient = useOutboundDialer();
 	const { closeDialModal } = useDialModal();
 
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 4a86673b1fe5..ef7882341fea 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -183,7 +183,7 @@
 		"eslint-plugin-testing-library": "~6.2.2",
 		"eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0",
 		"fast-glob": "^3.2.12",
-		"i18next": "~23.14.0",
+		"i18next": "~23.4.9",
 		"jest": "~29.7.0",
 		"jsdom-global": "^3.0.2",
 		"mocha": "^9.2.2",
@@ -412,7 +412,7 @@
 		"react-dom": "~17.0.2",
 		"react-error-boundary": "^3.1.4",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"react-keyed-flatten-children": "^1.3.0",
 		"react-virtuoso": "^4.7.1",
 		"redis": "^4.0.6",
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
index 7ecb8f309b29..0797d896f22d 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
@@ -22,7 +22,7 @@ import { logger } from './logger';
 type FileAttachment = VideoAttachmentProps & ImageAttachmentProps & AudioAttachmentProps;
 
 const language = settings.get<string>('Language') || 'en';
-const t = i18n.getFixedT(language);
+const t = (s: string): string => i18n.t(s, { lng: language });
 
 async function getGuestByEmail(email: string, name: string, department = ''): Promise<ILivechatVisitor | null> {
 	const guest = await LivechatVisitors.findOneGuestByEmailAddress(email);
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
index 44a9e2cd6a15..51718e4937d8 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
@@ -20,7 +20,7 @@ const livechatQuoteRegExp = /^\[\s\]\(https?:\/\/.+\/live\/.+\?msg=(?<id>.+?)\)\
 const getRocketCatUser = async (): Promise<IUser | null> => Users.findOneById('rocket.cat');
 
 const language = settings.get<string>('Language') || 'en';
-const t = i18n.getFixedT(language);
+const t = (s: string): string => i18n.t(s, { lng: language });
 
 // TODO: change these messages with room notifications
 const sendErrorReplyMessage = async (error: string, options: any) => {
diff --git a/apps/meteor/server/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts
index 28ba6cec6dad..bc3ed6184937 100644
--- a/apps/meteor/server/lib/i18n.ts
+++ b/apps/meteor/server/lib/i18n.ts
@@ -1,4 +1,6 @@
+import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
 import i18nDict from '@rocket.chat/i18n';
+import type { TOptions } from 'i18next';
 
 import { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces, i18n } from '../../app/utils/lib/i18n';
 
@@ -16,4 +18,13 @@ void i18n.init({
 	initImmediate: false,
 });
 
+declare module 'i18next' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface TFunction {
+		(key: RocketchatI18nKeys, options?: TOptions): string;
+		(key: RocketchatI18nKeys, ...options: unknown[]): string;
+		<T>(key: T extends string ? (T extends RocketchatI18nKeys ? T : never) : never, options?: TOptions): string;
+	}
+}
+
 export { i18n };
diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts
index 26ac78f30ad6..85da6e59cf60 100644
--- a/apps/meteor/server/lib/resetUserE2EKey.ts
+++ b/apps/meteor/server/lib/resetUserE2EKey.ts
@@ -20,7 +20,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
 		return;
 	}
 
-	const t = i18n.getFixedT(language);
+	const t = (s: string): string => i18n.t(s, { lng: language });
 	const text = `
 	${t('Your_e2e_key_has_been_reset')}
 
diff --git a/apps/meteor/server/modules/core-apps/mention.module.ts b/apps/meteor/server/modules/core-apps/mention.module.ts
index 76d3a22ea53b..ac615def8a5a 100644
--- a/apps/meteor/server/modules/core-apps/mention.module.ts
+++ b/apps/meteor/server/modules/core-apps/mention.module.ts
@@ -44,10 +44,13 @@ export class MentionModule implements IUiKitCoreApp {
 
 		if (actionId === 'dismiss') {
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
-					mentions: joinedUsernames,
-					lng: payload.user.language,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room',
+					{
+						mentions: joinedUsernames,
+					},
+					payload.user.language,
+				),
 				_id: payload.message,
 				tmid: message.tmid,
 				mentions,
@@ -58,10 +61,13 @@ export class MentionModule implements IUiKitCoreApp {
 		if (actionId === 'add-users') {
 			void addUsersToRoomMethod(payload.user._id, { rid: payload.room, users: usernames as string[] }, payload.user);
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
-					mentions: joinedUsernames,
-					lng: payload.user.language,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room',
+					{
+						mentions: joinedUsernames,
+					},
+					payload.user.language,
+				),
 				tmid: message.tmid,
 				_id: payload.message,
 				mentions,
@@ -81,10 +87,13 @@ export class MentionModule implements IUiKitCoreApp {
 				throw new Error('Mention bot - Failed to retrieve path to room');
 			}
 
-			const messageText = i18n.t('Youre_not_a_part_of__channel__and_I_mentioned_you_there', {
-				channel: `#${sub.name}`,
-				lng: payload.user.language,
-			});
+			const messageText = i18n.t(
+				'Youre_not_a_part_of__channel__and_I_mentioned_you_there',
+				{
+					channel: `#${sub.name}`,
+				},
+				payload.user.language,
+			);
 
 			const link = new URL(Meteor.absoluteUrl(roomPath));
 			link.searchParams.set('msg', message._id);
@@ -100,10 +109,13 @@ export class MentionModule implements IUiKitCoreApp {
 			);
 
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm', {
-					mentions: joinedUsernames,
-					lng: payload.user.language,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm',
+					{
+						mentions: joinedUsernames,
+					},
+					payload.user.language,
+				),
 				tmid: message.tmid,
 				_id: payload.message,
 				mentions,
diff --git a/apps/meteor/server/services/omnichannel-analytics/service.ts b/apps/meteor/server/services/omnichannel-analytics/service.ts
index 8b27ed4b9f57..4f479d83acdd 100644
--- a/apps/meteor/server/services/omnichannel-analytics/service.ts
+++ b/apps/meteor/server/services/omnichannel-analytics/service.ts
@@ -160,7 +160,7 @@ export class OmnichannelAnalyticsService extends ServiceClassInternal implements
 			return;
 		}
 
-		const t = i18n.getFixedT(language);
+		const t = (s: string) => i18n.t(s, { lng: language });
 
 		const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
 		return this.overview.callAction(name, from, to, departmentId, timezone, t, extraQuery);
diff --git a/package.json b/package.json
index f06deed440ff..54ed0f200304 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
 		"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
 		"@rocket.chat/forked-matrix-sdk-crypto-nodejs": "0.1.0-beta.13",
 		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch",
-		"react-i18next@~15.0.1": "patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch",
 		"moleculer@^0.14.34": "patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch"
 	},
 	"dependencies": {
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 320f0ab03dbf..a0bd73f0d2af 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -93,14 +93,14 @@
     "babel-loader": "~8.2.5",
     "cross-env": "^7.0.3",
     "eslint": "~8.45.0",
-    "i18next": "~23.14.0",
+    "i18next": "^23.10.1",
     "jest": "~29.7.0",
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "~2.8.8",
     "react-docgen-typescript-plugin": "~1.0.8",
     "react-dom": "^17.0.2",
-    "react-i18next": "~15.0.1",
+    "react-i18next": "~13.2.2",
     "rimraf": "^3.0.2",
     "storybook-dark-mode": "~3.0.3",
     "tslib": "^2.5.3",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index ca64df5ec913..98104d7e2faa 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -66,7 +66,6 @@
 		"outdent": "^0.8.0",
 		"react-docgen-typescript-plugin": "~1.0.8",
 		"react-dom": "~17.0.2",
-		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
diff --git a/packages/gazzodown/src/elements/LinkSpan.tsx b/packages/gazzodown/src/elements/LinkSpan.tsx
index 6ac649768db6..5472c12e6d63 100644
--- a/packages/gazzodown/src/elements/LinkSpan.tsx
+++ b/packages/gazzodown/src/elements/LinkSpan.tsx
@@ -1,7 +1,7 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { getBaseURI, isExternal } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { ReactElement, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import BoldSpan from './BoldSpan';
 import ItalicSpan from './ItalicSpan';
@@ -14,7 +14,7 @@ type LinkSpanProps = {
 };
 
 const LinkSpan = ({ href, label }: LinkSpanProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const children = useMemo(() => {
 		const labelArray = Array.isArray(label) ? label : [label];
 
diff --git a/packages/gazzodown/src/elements/PlainSpan.tsx b/packages/gazzodown/src/elements/PlainSpan.tsx
index 06460c348652..582490207717 100644
--- a/packages/gazzodown/src/elements/PlainSpan.tsx
+++ b/packages/gazzodown/src/elements/PlainSpan.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { Fragment, memo, ReactElement, useContext, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -8,7 +8,7 @@ type PlainSpanProps = {
 };
 
 const PlainSpan = ({ text }: PlainSpanProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { highlightRegex, markRegex } = useContext(MarkupInteractionContext);
 
 	const content = useMemo(() => {
diff --git a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
index 54f22ccca7d8..6b8e8518a422 100644
--- a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
+++ b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
@@ -1,6 +1,6 @@
 import { Message } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo, ReactElement, useContext, useMemo, KeyboardEvent } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -11,7 +11,7 @@ type ChannelMentionElementProps = {
 const handleChannelMention = (mention: string, withSymbol: boolean | undefined): string => (withSymbol ? `#${mention}` : mention);
 
 const ChannelMentionElement = ({ mention }: ChannelMentionElementProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { resolveChannelMention, onChannelMentionClick, showMentionSymbol } = useContext(MarkupInteractionContext);
 
 	const resolved = useMemo(() => resolveChannelMention?.(mention), [mention, resolveChannelMention]);
diff --git a/packages/gazzodown/src/mentions/UserMentionElement.tsx b/packages/gazzodown/src/mentions/UserMentionElement.tsx
index 6f52a16a5482..a9ba5567541f 100644
--- a/packages/gazzodown/src/mentions/UserMentionElement.tsx
+++ b/packages/gazzodown/src/mentions/UserMentionElement.tsx
@@ -1,6 +1,6 @@
 import { Message } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo, ReactElement, useContext, useMemo, KeyboardEvent } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -12,7 +12,7 @@ const handleUserMention = (mention: string | undefined, withSymbol: boolean | un
 	withSymbol ? `@${mention}` : mention;
 
 const UserMentionElement = ({ mention }: UserMentionElementProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { resolveUserMention, onUserMentionClick, ownUserId, useRealName, showMentionSymbol, triggerProps } =
 		useContext(MarkupInteractionContext);
 
diff --git a/packages/i18n/jest.config.ts b/packages/i18n/jest.config.ts
index 652cb006f406..eb3d5fd797e5 100644
--- a/packages/i18n/jest.config.ts
+++ b/packages/i18n/jest.config.ts
@@ -4,6 +4,6 @@ import type { Config } from 'jest';
 export default {
 	preset: server.preset,
 	testMatch: ['<rootDir>/src/**/*.spec.(ts|js|mjs)'],
-	transformIgnorePatterns: ['<rootDir>/node_modules/@babel', '<rootDir>/node_modules/@jest', 'signal-exit', 'is-typedarray'],
+	transformIgnorePatterns: ['<rootDir>/node_modules/@babel', '<rootDir>/node_modules/@jest', 'signal-exit'],
 	collectCoverage: false,
 } satisfies Config;
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index b93b9e9926cc..9dd0c4534340 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -2,30 +2,27 @@
 	"name": "@rocket.chat/i18n",
 	"version": "0.8.0-rc.1",
 	"private": true,
-	"type": "module",
-	"main": "./dist/index.js",
-	"module": "./dist/index.mjs",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
-	"scripts": {
-		"build": "node ./src/index.mjs",
-		"lint": "eslint --ext .mjs,.js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .mjs,.js,.jsx,.ts,.tsx . --fix",
-		"test": "jest",
-		"testunit": "jest"
-	},
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"eslint": "~8.45.0",
-		"i18next": "~23.14.0",
 		"jest": "~29.7.0",
+		"tsup": "^6.7.0",
 		"typescript": "~5.5.4"
 	},
-	"peerDependencies": {
-		"i18next": "*"
+	"scripts": {
+		"build": "node ./src/index.mjs",
+		"lint": "eslint --ext .mjs,.js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .mjs,.js,.jsx,.ts,.tsx . --fix",
+		"test": "jest",
+		"testunit": "jest"
 	},
+	"main": "./dist/index.js",
+	"module": "./dist/index.mjs",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"type": "module",
 	"volta": {
 		"extends": "../../package.json"
 	}
diff --git a/packages/i18n/src/index.mjs b/packages/i18n/src/index.mjs
index f39d4df9860d..c952cac7de07 100644
--- a/packages/i18n/src/index.mjs
+++ b/packages/i18n/src/index.mjs
@@ -84,9 +84,7 @@ const cjs = `module.exports = {
 
 const keys = Object.keys(JSON.parse(fs.readFileSync(`./src/locales/en.i18n.json`, 'utf8')));
 
-const tds = `import 'i18next';
-
-export interface RocketchatI18n {
+const tds = `export interface RocketchatI18n {
 	${keys.map((key) => `${JSON.stringify(key)}: string;`).join('\n\t')}
 }
 
@@ -96,16 +94,6 @@ const dict: {
 
 export type RocketchatI18nKeys = keyof RocketchatI18n;
 
-declare module 'i18next' {
-	interface TFunction {
-		<TKey extends keyof RocketchatI18n>(key: TKey, options?: TOptions): string;
-		<TKey extends \`\${string}_\$\{'one' | 'other' | 'zero' | 'few' | 'many' | 'two' | 'three' | 'four'}\`>(
-			key: TKey,
-			options?: TOptions,
-		): string;
-	}
-}
-
 export = dict;
 `;
 
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 5663d8746eea..003f797097d1 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -106,7 +106,7 @@
 		"date-fns": "^2.15.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
-		"i18next": "~23.14.0",
+		"i18next": "~23.4.9",
 		"markdown-it": "^11.0.1",
 		"mem": "^6.1.1",
 		"mitt": "^2.1.0",
@@ -115,7 +115,7 @@
 		"preact-router": "^3.2.1",
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"storybook-dark-mode": "~3.0.3",
 		"whatwg-fetch": "^3.6.20"
 	},
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 3cd4aef7325d..c55acfa8cd32 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -5,8 +5,8 @@
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/i18n": "workspace:~",
-		"i18next": "~23.14.0",
-		"react-i18next": "~15.0.1",
+		"i18next": "~23.4.9",
+		"react-i18next": "~13.2.2",
 		"use-sync-external-store": "~1.2.2"
 	},
 	"devDependencies": {
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 3b551cf83681..7e2c7c26c411 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -2,21 +2,6 @@
 	"name": "@rocket.chat/ui-client",
 	"version": "11.0.0-rc.1",
 	"private": true,
-	"main": "./dist/index.js",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
-	"scripts": {
-		"build": "rm -rf dist && tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"storybook": "start-storybook -p 6006",
-		"test": "jest",
-		"testunit": "jest",
-		"typecheck": "tsc --noEmit"
-	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
@@ -52,17 +37,31 @@
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
 	},
+	"scripts": {
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"typecheck": "tsc --noEmit",
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"test": "jest",
+		"testunit": "jest",
+		"storybook": "start-storybook -p 6006"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
 	"peerDependencies": {
 		"@react-aria/toolbar": "*",
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
+		"@rocket.chat/ui-avatar": "*",
+		"@rocket.chat/ui-contexts": "*",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-client/src/components/CustomFieldsForm.tsx b/packages/ui-client/src/components/CustomFieldsForm.tsx
index 98b9c3fdad79..76cfc44fe010 100644
--- a/packages/ui-client/src/components/CustomFieldsForm.tsx
+++ b/packages/ui-client/src/components/CustomFieldsForm.tsx
@@ -3,10 +3,10 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, Select, TextInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useMemo } from 'react';
 import type { Control, FieldValues, FieldError as RHFFieldError } from 'react-hook-form';
 import { Controller, useFormState, get } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type CustomFieldFormProps<T extends FieldValues> = {
 	metadata: CustomFieldMetadata[];
@@ -34,7 +34,7 @@ const CustomField = <T extends FieldValues>({
 	options = [],
 	...props
 }: CustomFieldProps<T>) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { errors } = useFormState({ control });
 	const fieldId = useUniqueId();
 
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
index a67baa11e700..bdd7f5fbda18 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
@@ -1,4 +1,3 @@
-import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -31,7 +30,7 @@ const sections = [regular, danger];
 
 describe('Room Actions Menu', () => {
 	it('should render kebab menu with the list content', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
 
 		await userEvent.click(screen.getByRole('button'));
 
@@ -40,7 +39,7 @@ describe('Room Actions Menu', () => {
 	});
 
 	it('should have two different sections, regular and danger', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
 
 		await userEvent.click(screen.getByRole('button'));
 
@@ -49,7 +48,7 @@ describe('Room Actions Menu', () => {
 	});
 
 	it('should call the action when item clicked', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
 
 		await userEvent.click(screen.getByRole('button'));
 		await userEvent.click(screen.getAllByRole('menuitem')[0]);
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index cc5434aec1e6..03e003475619 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -1,7 +1,6 @@
 import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactNode } from 'react';
-import { cloneElement } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import { cloneElement, type ComponentProps, type ReactNode } from 'react';
 
 import type { GenericMenuItemProps } from './GenericMenuItem';
 import GenericMenuItem from './GenericMenuItem';
@@ -31,7 +30,7 @@ type GenericMenuConditionalProps =
 type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof MenuV2>, 'children'>;
 
 const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, button, className, ...props }: GenericMenuProps) => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	const sections = 'sections' in props && props.sections;
 	const items = 'items' in props && props.items;
@@ -62,7 +61,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 			{sections && (
 				<MenuV2
 					icon={icon}
-					title={i18n.exists(title) ? t(title) : title}
+					title={t.has(title) ? t(title) : title}
 					onAction={onAction || handleAction}
 					className={className}
 					button={button}
@@ -71,7 +70,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 				>
 					{sections.map(({ title, items }, key) => (
 						<MenuSection
-							title={typeof title === 'string' && i18n.exists(title) ? t(title) : title}
+							title={typeof title === 'string' && t.has(title) ? t(title) : title}
 							items={handleItems(items)}
 							key={`${title}-${key}`}
 						>
@@ -87,7 +86,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 			{items && (
 				<MenuV2
 					icon={icon}
-					title={i18n.exists(title) ? t(title) : title}
+					title={t.has(title) ? t(title) : title}
 					onAction={onAction || handleAction}
 					className={className}
 					button={button}
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
index e28c0a7ad452..acd1e1eb8d6b 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MultiSelectCustomAnchorProps = {
 	collapsed: boolean;
@@ -17,7 +17,7 @@ const MultiSelectCustomAnchor = forwardRef<HTMLElement, MultiSelectCustomAnchorP
 	{ className, collapsed, selectedOptionsCount, selectedOptionsTitle, defaultTitle, maxCount, ...props },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const customStyle = css`
 		&:hover {
 			cursor: pointer;
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index fb8c68d49f46..d73d9ce6b88b 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -1,8 +1,8 @@
 import { Box, CheckBox, Icon, Option, SearchInput, Tile } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import { Fragment, useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { type OptionProp } from './MultiSelectCustom';
 import { useFilteredOptions } from './useFilteredOptions';
@@ -16,7 +16,7 @@ const MultiSelectCustomList = ({
 	onSelected: (item: OptionProp, e?: FormEvent<HTMLElement>) => void;
 	searchBarText?: string;
 }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [text, setText] = useState('');
 
diff --git a/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx b/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
index 9b65b9ad37a6..341c26179198 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
@@ -1,10 +1,10 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import type { OptionProp } from './MultiSelectCustom';
 
 export const useFilteredOptions = (optionSearch: string | undefined, options: OptionProp[]) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (!optionSearch) return options;
 
diff --git a/packages/ui-client/src/components/UserStatus/UserStatus.tsx b/packages/ui-client/src/components/UserStatus/UserStatus.tsx
index 35db49297724..92513498247b 100644
--- a/packages/ui-client/src/components/UserStatus/UserStatus.tsx
+++ b/packages/ui-client/src/components/UserStatus/UserStatus.tsx
@@ -1,14 +1,14 @@
 import { StatusBullet } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export type UserStatusProps = {
 	small?: boolean;
 } & ComponentProps<typeof StatusBullet>;
 
 function UserStatus({ small, status, ...props }: UserStatusProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const size = small ? 'small' : 'large';
 
 	switch (status) {
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index d02a8a8e1a66..bb0975c38598 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -15,7 +15,7 @@
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
 		"@tanstack/react-query": "^4.16.1",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"sip.js": "^0.20.1"
 	},
 	"devDependencies": {
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index c039b3fc6c94..9f84c67d3673 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -9,11 +9,11 @@
 		"/dist"
 	],
 	"scripts": {
-		"build": "tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"storybook": "start-storybook -p 6006 --no-version-updates"
+		"storybook": "start-storybook -p 6006 --no-version-updates",
+		"build": "tsc -p tsconfig.build.json",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput"
 	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,7 +40,7 @@
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"storybook-dark-mode": "~3.0.3",
 		"typescript": "~5.5.4"
 	},
diff --git a/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx b/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
index d1fa2df3d4b3..60cfef030dc3 100644
--- a/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
+++ b/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
@@ -1,10 +1,10 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import VerticalTemplate from './template/VerticalTemplate';
 
 const SecretRegisterInvalidForm = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<VerticalTemplate>
diff --git a/yarn.lock b/yarn.lock
index c0ff720594cc..683dbaec6bae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2996,7 +2996,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.24.4
   resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
@@ -3005,15 +3005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.24.8":
-  version: 7.25.6
-  resolution: "@babel/runtime@npm:7.25.6"
-  dependencies:
-    regenerator-runtime: ^0.14.0
-  checksum: ee1a69d3ac7802803f5ee6a96e652b78b8addc28c6a38c725a4ad7d61a059d9e6cb9f6550ed2f63cce67a1bd82e0b1ef66a1079d895be6bfb536a5cfbd9ccc32
-  languageName: node
-  linkType: hard
-
 "@babel/runtime@npm:~7.22.15":
   version: 7.22.15
   resolution: "@babel/runtime@npm:7.22.15"
@@ -9124,14 +9115,14 @@ __metadata:
     babel-loader: ~8.2.5
     cross-env: ^7.0.3
     eslint: ~8.45.0
-    i18next: ~23.14.0
+    i18next: ^23.10.1
     jest: ~29.7.0
     normalize.css: ^8.0.1
     npm-run-all: ^4.1.5
     prettier: ~2.8.8
     react-docgen-typescript-plugin: ~1.0.8
     react-dom: ^17.0.2
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     rimraf: ^3.0.2
     storybook-dark-mode: ~3.0.3
     tslib: ^2.5.3
@@ -9226,7 +9217,6 @@ __metadata:
     react-docgen-typescript-plugin: ~1.0.8
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
-    react-i18next: ~15.0.1
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -9248,11 +9238,9 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     eslint: ~8.45.0
-    i18next: ~23.14.0
     jest: ~29.7.0
+    tsup: ^6.7.0
     typescript: ~5.5.4
-  peerDependencies:
-    i18next: "*"
   languageName: unknown
   linkType: soft
 
@@ -9393,7 +9381,7 @@ __metadata:
     history: ~5.3.0
     html-webpack-plugin: ^5.5.3
     husky: ^4.3.8
-    i18next: ~23.14.0
+    i18next: ~23.4.9
     if-env: ^1.0.4
     image-webpack-loader: ~8.1.0
     lorem-ipsum: ^2.0.8
@@ -9416,7 +9404,7 @@ __metadata:
     query-string: ^7.1.3
     react-dom: ~17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     rimraf: ^3.0.2
     sass: ~1.62.1
     sass-loader: ~10.4.1
@@ -9778,7 +9766,7 @@ __metadata:
     hljs9: "npm:highlight.js@^9.18.5"
     http-proxy-agent: ^5.0.0
     human-interval: ^2.0.1
-    i18next: ~23.14.0
+    i18next: ~23.4.9
     i18next-http-backend: ^1.4.5
     i18next-sprintf-postprocessor: ^0.2.2
     iconv-lite: ^0.6.3
@@ -9855,7 +9843,7 @@ __metadata:
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     react-keyed-flatten-children: ^1.3.0
     react-virtuoso: ^4.7.1
     redis: ^4.0.6
@@ -9916,9 +9904,9 @@ __metadata:
     "@tanstack/react-query": ^4.16.1
     "@types/use-sync-external-store": ^0.0.6
     eslint: ~8.45.0
-    i18next: ~23.14.0
+    i18next: ~23.4.9
     react: ~17.0.2
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     typescript: ~5.5.4
     use-sync-external-store: ~1.2.2
   peerDependencies:
@@ -10515,7 +10503,6 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
     typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -10523,8 +10510,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.1
-    "@rocket.chat/ui-contexts": 11.0.0-rc.1
+    "@rocket.chat/ui-avatar": "*"
+    "@rocket.chat/ui-contexts": "*"
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10739,7 +10726,7 @@ __metadata:
     jest: ~29.7.0
     jest-axe: ~9.0.0
     react-docgen-typescript-plugin: ~1.0.8
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     sip.js: ^0.20.1
     typescript: ~5.5.4
   peerDependencies:
@@ -10833,7 +10820,7 @@ __metadata:
     eslint: ~8.45.0
     react: ~17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     storybook-dark-mode: ~3.0.3
     typescript: ~5.5.4
   peerDependencies:
@@ -16514,6 +16501,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"any-promise@npm:^1.0.0":
+  version: 1.3.0
+  resolution: "any-promise@npm:1.3.0"
+  checksum: 0ee8a9bdbe882c90464d75d1f55cf027f5458650c4bd1f0467e65aec38ccccda07ca5844969ee77ed46d04e7dded3eaceb027e8d32f385688523fe305fa7e1de
+  languageName: node
+  linkType: hard
+
 "anymatch@npm:^2.0.0":
   version: 2.0.0
   resolution: "anymatch@npm:2.0.0"
@@ -18636,6 +18630,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bundle-require@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "bundle-require@npm:4.0.1"
+  dependencies:
+    load-tsconfig: ^0.2.3
+  peerDependencies:
+    esbuild: ">=0.17"
+  checksum: 737217e37b72d7bee431b5d839b86ba604430f3ec346f073071de2ce65f0915189d4394ddd4685e0366b2930f38c95742b58c7101b8c53d9a8381d453f0b3b8a
+  languageName: node
+  linkType: hard
+
 "busboy@npm:^1.6.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
@@ -18704,6 +18709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cac@npm:^6.7.12":
+  version: 6.7.14
+  resolution: "cac@npm:6.7.14"
+  checksum: 45a2496a9443abbe7f52a49b22fbe51b1905eff46e03fd5e6c98e3f85077be3f8949685a1849b1a9cd2bc3e5567dfebcf64f01ce01847baf918f1b37c839791a
+  languageName: node
+  linkType: hard
+
 "cacache@npm:^12.0.2":
   version: 12.0.4
   resolution: "cacache@npm:12.0.4"
@@ -19911,7 +19923,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^4.1.1":
+"commander@npm:^4.0.0, commander@npm:^4.1.1":
   version: 4.1.1
   resolution: "commander@npm:4.1.1"
   checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977
@@ -22251,9 +22263,9 @@ __metadata:
   linkType: hard
 
 "dompurify@npm:^3.1.6":
-  version: 3.1.6
-  resolution: "dompurify@npm:3.1.6"
-  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
+  version: 3.1.7
+  resolution: "dompurify@npm:3.1.7"
+  checksum: 0a9b811bbc94f3dba60cf6486962362b0f1a5b4ab789f5e1cbd4749b6ba1a1fad190a677a962dc8850ce28764424765fe425e9d6508e4e93ba648ef15d54bc24
   languageName: node
   linkType: hard
 
@@ -23008,7 +23020,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.17.5":
+"esbuild@npm:^0.17.5, esbuild@npm:^0.17.6":
   version: 0.17.19
   resolution: "esbuild@npm:0.17.19"
   dependencies:
@@ -25729,6 +25741,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:7.1.6":
+  version: 7.1.6
+  resolution: "glob@npm:7.1.6"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.0.4
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 351d549dd90553b87c2d3f90ce11aed9e1093c74130440e7ae0592e11bbcd2ce7f0ebb8ba6bfe63aaf9b62166a7f4c80cb84490ae5d78408bb2572bf7d4ee0a6
+  languageName: node
+  linkType: hard
+
 "glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
@@ -25853,7 +25879,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.0, globby@npm:^11.0.2, globby@npm:^11.1.0":
+"globby@npm:^11.0.0, globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
@@ -27041,7 +27067,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:>=17.0.11":
+"i18next@npm:>=17.0.11, i18next@npm:^23.10.1":
   version: 23.10.1
   resolution: "i18next@npm:23.10.1"
   dependencies:
@@ -27059,12 +27085,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:~23.14.0":
-  version: 23.14.0
-  resolution: "i18next@npm:23.14.0"
+"i18next@npm:~23.4.9":
+  version: 23.4.9
+  resolution: "i18next@npm:23.4.9"
   dependencies:
-    "@babel/runtime": ^7.23.2
-  checksum: 4239843691181907d0570eabebf53b81499f54733c87b7554432022b0eeb2ff38df21d03dd907bc3baab8432d746e0fd16949507bbf3c7ccf5b2071e474d5f52
+    "@babel/runtime": ^7.22.5
+  checksum: 46ac2415dc817c0e25e1c5e64332249825cd63b5fb9a5d42e3a2329d4ecd098c0f15a243f56b53e03db02e2e9931ca9bb4447370b2436f9ad6556de40ce981cf
   languageName: node
   linkType: hard
 
@@ -29499,7 +29525,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"joycon@npm:^3.1.1":
+"joycon@npm:^3.0.1, joycon@npm:^3.1.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
   checksum: 8003c9c3fc79c5c7602b1c7e9f7a2df2e9916f046b0dbad862aa589be78c15734d11beb9fe846f5e06138df22cb2ad29961b6a986ba81c4920ce2b15a7f11067
@@ -30407,6 +30433,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"load-tsconfig@npm:^0.2.3":
+  version: 0.2.5
+  resolution: "load-tsconfig@npm:0.2.5"
+  checksum: 631740833c4a7157bb7b6eeae6e1afb6a6fac7416b7ba91bd0944d5c5198270af2d68bf8347af3cc2ba821adc4d83ef98f66278bd263bc284c863a09ec441503
+  languageName: node
+  linkType: hard
+
 "load-yaml-file@npm:^0.2.0":
   version: 0.2.0
   resolution: "load-yaml-file@npm:0.2.0"
@@ -30660,6 +30693,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.sortby@npm:^4.7.0":
+  version: 4.7.0
+  resolution: "lodash.sortby@npm:4.7.0"
+  checksum: db170c9396d29d11fe9a9f25668c4993e0c1331bcb941ddbd48fb76f492e732add7f2a47cfdf8e9d740fa59ac41bbfaf931d268bc72aab3ab49e9f89354d718c
+  languageName: node
+  linkType: hard
+
 "lodash.startcase@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.startcase@npm:4.4.0"
@@ -32478,6 +32518,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mz@npm:^2.7.0":
+  version: 2.7.0
+  resolution: "mz@npm:2.7.0"
+  dependencies:
+    any-promise: ^1.0.0
+    object-assign: ^4.0.1
+    thenify-all: ^1.0.0
+  checksum: 8427de0ece99a07e9faed3c0c6778820d7543e3776f9a84d22cf0ec0a8eb65f6e9aee9c9d353ff9a105ff62d33a9463c6ca638974cc652ee8140cd1e35951c87
+  languageName: node
+  linkType: hard
+
 "nan@npm:^2.12.1, nan@npm:^2.13.2, nan@npm:^2.14.0":
   version: 2.17.0
   resolution: "nan@npm:2.17.0"
@@ -35171,7 +35222,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-load-config@npm:^3.1.4":
+"postcss-load-config@npm:^3.0.1, postcss-load-config@npm:^3.1.4":
   version: 3.1.4
   resolution: "postcss-load-config@npm:3.1.4"
   dependencies:
@@ -36848,29 +36899,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-i18next@npm:15.0.1":
-  version: 15.0.1
-  resolution: "react-i18next@npm:15.0.1"
-  dependencies:
-    "@babel/runtime": ^7.24.8
-    html-parse-stringify: ^3.0.1
-  peerDependencies:
-    i18next: ">= 23.2.3"
-    react: ">= 16.8.0"
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-    react-native:
-      optional: true
-  checksum: fdff560f1a7988677fbccab2934d5d253515f5b07ea33d9a6dff8852be4df5cd72a41235d412be7016cbc96c0a33c8471e5ff7e02ee1e149654918082ea43827
-  languageName: node
-  linkType: hard
-
-"react-i18next@patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch::locator=rocket.chat%40workspace%3A.":
-  version: 15.0.1
-  resolution: "react-i18next@patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch::version=15.0.1&hash=90570d&locator=rocket.chat%40workspace%3A."
+"react-i18next@npm:~13.2.2":
+  version: 13.2.2
+  resolution: "react-i18next@npm:13.2.2"
   dependencies:
-    "@babel/runtime": ^7.24.8
+    "@babel/runtime": ^7.22.5
     html-parse-stringify: ^3.0.1
   peerDependencies:
     i18next: ">= 23.2.3"
@@ -36880,7 +36913,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 76bda74c294a66e3330edd217dcd453b48f3e76fe4a89c411a8c1d31fdff932f7c314a1aa5f83bd948b233ded958a6c66674e12ccb399dc6f7790f2c325742b2
+  checksum: 2b85bfb347af1a00add1c02901025706f7d2037fade4e8aa08159287ddf012e8cf35626eb9f5c578b9d1c24c065c69f2ad4b5a3087fb5cdbea540f8bc18c0f59
   languageName: node
   linkType: hard
 
@@ -38293,7 +38326,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"rollup@npm:^3.21.0":
+"rollup@npm:^3.2.5, rollup@npm:^3.21.0":
   version: 3.28.1
   resolution: "rollup@npm:3.28.1"
   dependencies:
@@ -39537,6 +39570,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map@npm:0.8.0-beta.0":
+  version: 0.8.0-beta.0
+  resolution: "source-map@npm:0.8.0-beta.0"
+  dependencies:
+    whatwg-url: ^7.0.0
+  checksum: e94169be6461ab0ac0913313ad1719a14c60d402bd22b0ad96f4a6cffd79130d91ab5df0a5336a326b04d2df131c1409f563c9dc0d21a6ca6239a44b6c8dbd92
+  languageName: node
+  linkType: hard
+
 "source-map@npm:^0.5.0, source-map@npm:^0.5.6, source-map@npm:~0.5.3":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
@@ -40641,6 +40683,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sucrase@npm:^3.20.3":
+  version: 3.34.0
+  resolution: "sucrase@npm:3.34.0"
+  dependencies:
+    "@jridgewell/gen-mapping": ^0.3.2
+    commander: ^4.0.0
+    glob: 7.1.6
+    lines-and-columns: ^1.1.6
+    mz: ^2.7.0
+    pirates: ^4.0.1
+    ts-interface-checker: ^0.1.9
+  bin:
+    sucrase: bin/sucrase
+    sucrase-node: bin/sucrase-node
+  checksum: 61860063bdf6103413698e13247a3074d25843e91170825a9752e4af7668ffadd331b6e99e92fc32ee5b3c484ee134936f926fa9039d5711fafff29d017a2110
+  languageName: node
+  linkType: hard
+
 "superagent@npm:^8.0.0":
   version: 8.0.0
   resolution: "superagent@npm:8.0.0"
@@ -41283,6 +41343,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"thenify-all@npm:^1.0.0":
+  version: 1.6.0
+  resolution: "thenify-all@npm:1.6.0"
+  dependencies:
+    thenify: ">= 3.1.0 < 4"
+  checksum: dba7cc8a23a154cdcb6acb7f51d61511c37a6b077ec5ab5da6e8b874272015937788402fd271fdfc5f187f8cb0948e38d0a42dcc89d554d731652ab458f5343e
+  languageName: node
+  linkType: hard
+
+"thenify@npm:>= 3.1.0 < 4":
+  version: 3.3.1
+  resolution: "thenify@npm:3.3.1"
+  dependencies:
+    any-promise: ^1.0.0
+  checksum: 84e1b804bfec49f3531215f17b4a6e50fd4397b5f7c1bccc427b9c656e1ecfb13ea79d899930184f78bc2f57285c54d9a50a590c8868f4f0cef5c1d9f898b05e
+  languageName: node
+  linkType: hard
+
 "thread-stream@npm:^2.0.0":
   version: 2.1.0
   resolution: "thread-stream@npm:2.1.0"
@@ -41581,6 +41659,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tr46@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "tr46@npm:1.0.1"
+  dependencies:
+    punycode: ^2.1.0
+  checksum: 96d4ed46bc161db75dbf9247a236ea0bfcaf5758baae6749e92afab0bc5a09cb59af21788ede7e55080f2bf02dce3e4a8f2a484cc45164e29f4b5e68f7cbcc1a
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^2.1.0":
   version: 2.1.0
   resolution: "tr46@npm:2.1.0"
@@ -41606,6 +41693,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tree-kill@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "tree-kill@npm:1.2.2"
+  bin:
+    tree-kill: cli.js
+  checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7
+  languageName: node
+  linkType: hard
+
 "trim-newlines@npm:^1.0.0":
   version: 1.0.0
   resolution: "trim-newlines@npm:1.0.0"
@@ -41680,6 +41776,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-interface-checker@npm:^0.1.9":
+  version: 0.1.13
+  resolution: "ts-interface-checker@npm:0.1.13"
+  checksum: 20c29189c2dd6067a8775e07823ddf8d59a33e2ffc47a1bd59a5cb28bb0121a2969a816d5e77eda2ed85b18171aa5d1c4005a6b88ae8499ec7cc49f78571cb5e
+  languageName: node
+  linkType: hard
+
 "ts-jest@npm:~29.1.5":
   version: 29.1.5
   resolution: "ts-jest@npm:29.1.5"
@@ -41886,6 +41989,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsup@npm:^6.7.0":
+  version: 6.7.0
+  resolution: "tsup@npm:6.7.0"
+  dependencies:
+    bundle-require: ^4.0.0
+    cac: ^6.7.12
+    chokidar: ^3.5.1
+    debug: ^4.3.1
+    esbuild: ^0.17.6
+    execa: ^5.0.0
+    globby: ^11.0.3
+    joycon: ^3.0.1
+    postcss-load-config: ^3.0.1
+    resolve-from: ^5.0.0
+    rollup: ^3.2.5
+    source-map: 0.8.0-beta.0
+    sucrase: ^3.20.3
+    tree-kill: ^1.2.2
+  peerDependencies:
+    "@swc/core": ^1
+    postcss: ^8.4.12
+    typescript: ">=4.1.0"
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    postcss:
+      optional: true
+    typescript:
+      optional: true
+  bin:
+    tsup: dist/cli-default.js
+    tsup-node: dist/cli-node.js
+  checksum: 91ff179f0b9828a6880b6decaa8603fd7af0311f46a38d3a93647a2497298750d676810aeff533a335443a01a7b340dbba7c76523bcd7a87d7b05b7677742901
+  languageName: node
+  linkType: hard
+
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
@@ -43639,6 +43778,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webidl-conversions@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "webidl-conversions@npm:4.0.2"
+  checksum: c93d8dfe908a0140a4ae9c0ebc87a33805b416a33ee638a605b551523eec94a9632165e54632f6d57a39c5f948c4bab10e0e066525e9a4b87a79f0d04fbca374
+  languageName: node
+  linkType: hard
+
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -44154,6 +44300,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "whatwg-url@npm:7.1.0"
+  dependencies:
+    lodash.sortby: ^4.7.0
+    tr46: ^1.0.1
+    webidl-conversions: ^4.0.2
+  checksum: fecb07c87290b47d2ec2fb6d6ca26daad3c9e211e0e531dd7566e7ff95b5b3525a57d4f32640ad4adf057717e0c215731db842ad761e61d947e81010e05cf5fd
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"

From 73808aad3ae29c62cd5787bc5ff0dc213b1801c1 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 8 Oct 2024 15:26:21 -0300
Subject: [PATCH 149/170] Revert "refactor(i18n): Increase the adoption of
 `react-i18next` - Phase 1" (#33485)

---
 .../react-i18next-npm-15.0.1-0812bb73aa.patch |  99 ------
 apps/meteor/app/2fa/server/code/EmailCheck.ts |   2 +-
 .../app/2fa/server/functions/resetTOTP.ts     |   2 +-
 .../app/lib/server/methods/addUsersToRoom.ts  |  13 +-
 .../app/lib/server/methods/sendMessage.ts     |   5 +-
 .../server/startup/mentionUserNotInChannel.ts |   8 +-
 .../modals/PlaceChatOnHoldModal.tsx           |   4 +-
 .../meteor/app/livechat/server/api/v1/room.ts |   2 +-
 apps/meteor/app/livechat/server/lib/Helper.ts |   4 +-
 .../app/livechat/server/lib/QueueManager.ts   |   4 +-
 .../messageBox/AddLinkComposerActionModal.tsx |   4 +-
 apps/meteor/app/utils/lib/i18n.ts             |   3 +-
 .../NavBarItemOmniChannelCallDialPad.tsx      |   4 +-
 .../NavBarItemOmnichannelCallToggleError.tsx  |   4 +-
 ...NavBarItemOmnichannelCallToggleLoading.tsx |   4 +-
 .../NavBarItemOmnichannelCallToggleReady.tsx  |   4 +-
 .../UserMenu/UserMenu.tsx                     |   4 +-
 .../apps/gameCenter/GameCenterContainer.tsx   |   4 +-
 .../GameCenterInvitePlayersModal.tsx          |   4 +-
 .../components/ActionManagerBusyState.tsx     |   4 +-
 .../components/AutoCompleteDepartment.tsx     |   4 +-
 .../AutoCompleteDepartmentMultiple.tsx        |   4 +-
 .../components/ConfirmOwnerChangeModal.tsx    |   4 +-
 .../Contextualbar/ContextualbarBack.tsx       |   4 +-
 .../Contextualbar/ContextualbarClose.tsx      |   4 +-
 .../meteor/client/components/FilterByText.tsx |   4 +-
 .../components/FingerprintChangeModal.tsx     |   4 +-
 .../FingerprintChangeModalConfirmation.tsx    |   4 +-
 .../components/GenericError/GenericError.tsx  |   4 +-
 .../components/GenericModal/GenericModal.tsx  |   4 +-
 .../GenericNoResults/GenericNoResults.tsx     |   4 +-
 .../hooks/useItemsPerPageLabel.ts             |   4 +-
 .../hooks/useShowingResultsLabel.ts           |  10 +-
 .../GenericUpsellModal/GenericUpsellModal.tsx |   4 +-
 .../components/ImageGallery/ImageGallery.tsx  |   4 +-
 .../ImageGallery/ImageGalleryError.tsx        |   4 +-
 .../ImageGallery/ImageGalleryLoading.tsx      |   4 +-
 .../InfoPanel/RetentionPolicyCallout.tsx      |   4 +-
 apps/meteor/client/components/LocalTime.tsx   |   4 +-
 .../meteor/client/components/MarkdownText.tsx |   4 +-
 .../modals/ReturnChatQueueModal.tsx           |   4 +-
 .../Omnichannel/modals/TranscriptModal.tsx    |   4 +-
 .../client/components/Sidebar/Header.tsx      |   4 +-
 .../Sidebar/SidebarItemsAssembler.tsx         |   6 +-
 .../SidebarToggler/SidebarTogglerButton.tsx   |   4 +-
 apps/meteor/client/components/TextCopy.tsx    |   4 +-
 .../TwoFactorModal/TwoFactorPasswordModal.tsx |   4 +-
 .../TwoFactorModal/TwoFactorTotpModal.tsx     |   4 +-
 .../client/components/UrlChangeModal.tsx      |  10 +-
 .../client/components/UserCard/UserCard.tsx   |   4 +-
 .../client/components/UserInfo/UserInfo.tsx   |   4 +-
 .../meteor/client/components/WarningModal.tsx |   4 +-
 .../components/dashboards/PeriodSelector.tsx  |   6 +-
 .../client/components/dashboards/periods.ts   |  23 +-
 .../components/dashboards/usePeriodLabel.ts   |   6 +-
 .../DeviceManagementTable.tsx                 |   4 +-
 .../deviceManagement/LoggedOutBanner.tsx      |   4 +-
 .../components/message/IgnoredContent.tsx     |   4 +-
 .../components/message/MessageHeader.tsx      |   4 +-
 .../message/ReadReceiptIndicator.tsx          |   4 +-
 .../message/content/BroadcastMetrics.tsx      |   4 +-
 .../message/content/DiscussionMetrics.tsx     |   4 +-
 .../components/message/content/Reactions.tsx  |   4 +-
 .../message/content/actions/MessageAction.tsx |   4 +-
 .../structure/AttachmentDownloadBase.tsx      |   4 +-
 .../attachments/structure/image/Load.tsx      |   4 +-
 .../attachments/structure/image/Retry.tsx     |   4 +-
 .../collapsible/CollapsibleContent.tsx        |   4 +-
 .../content/location/MapViewFallback.tsx      |   4 +-
 .../message/content/location/MapViewImage.tsx |   4 +-
 .../content/reactions/ReactionTooltip.tsx     |   4 +-
 .../content/urlPreviews/OEmbedCollapsible.tsx |   4 +-
 .../message/header/MessageRoles.tsx           |   4 +-
 .../notification/MessageNotification.tsx      |   4 +-
 .../message/toolbar/MessageActionMenu.tsx     |   4 +-
 .../message/variants/SystemMessage.tsx        |   4 +-
 .../message/variants/ThreadMessagePreview.tsx |   4 +-
 .../ThreadMessagePreviewBody.tsx              |   4 +-
 .../components/voip/room/VoipRoomForeword.tsx |   4 +-
 .../client/hooks/useDecryptedMessage.ts       |   4 +-
 .../hooks/useDownloadFromServiceWorker.ts     |   3 +-
 apps/meteor/client/hooks/useFormatDuration.ts |   4 +-
 .../meteor/client/hooks/useHighlightedCode.ts |   4 +-
 .../additionalForms/BusinessHoursMultiple.tsx |   4 +-
 .../additionalForms/ContactManager.js         |   4 +-
 .../CustomFieldsAdditionalForm.tsx            |   4 +-
 .../additionalForms/DepartmentForwarding.tsx  |   4 +-
 .../additionalForms/MaxChatsPerAgent.tsx      |   4 +-
 .../MaxChatsPerAgentDisplay.tsx               |   4 +-
 .../additionalForms/PrioritiesSelect.tsx      |   4 +-
 .../CannedResponseEditWithDepartmentData.tsx  |   4 +-
 .../cannedResponses/CannedResponseFilter.tsx  |   4 +-
 .../InsertPlaceholderDropdown.tsx             |   4 +-
 .../CannedResponse/CannedResponse.tsx         |   4 +-
 .../CannedResponse/CannedResponseList.tsx     |   4 +-
 .../contextualBar/CannedResponse/Item.tsx     |   4 +-
 .../components/RoomActivityIcon/index.tsx     |   4 +-
 .../client/omnichannel/hooks/useScopeDict.ts  |   4 +-
 .../omnichannel/monitors/MonitorsPage.tsx     |   4 +-
 .../priorities/PrioritiesResetModal.tsx       |   4 +-
 .../priorities/PrioritiesTable.tsx            |   4 +-
 .../priorities/PriorityEditFormWithData.tsx   |   4 +-
 .../omnichannel/priorities/PriorityIcon.tsx   |   4 +-
 .../omnichannel/priorities/PriorityList.tsx   |   4 +-
 .../reports/components/AgentsTable.tsx        |   4 +-
 .../components/ReportCardEmptyState.tsx       |   4 +-
 .../components/ReportCardErrorState.tsx       |   4 +-
 .../reports/hooks/useAgentsSection.tsx        |   5 +-
 .../reports/hooks/useChannelsSection.tsx      |  12 +-
 .../reports/hooks/useDefaultDownload.tsx      |   4 +-
 .../reports/hooks/useDepartmentsSection.tsx   |   5 +-
 .../reports/hooks/useStatusSection.tsx        |  10 +-
 .../reports/hooks/useTagsSection.tsx          |   5 +-
 .../reports/sections/AgentsSection.tsx        |   4 +-
 .../reports/utils/formatPeriodDescription.tsx |   6 +-
 .../tags/AutoCompleteTagsMultiple.tsx         |   4 +-
 .../sidebar/RoomList/RoomListWrapper.tsx      |   4 +-
 .../sidebar/footer/SidebarFooterWatermark.tsx |   4 +-
 .../client/sidebar/footer/voip/VoipFooter.tsx |   4 +-
 .../FederatedRoomListEmptyPlaceholder.tsx     |   4 +-
 .../FederatedRoomListErrorBoundary.tsx        |   4 +-
 .../FederatedRoomListItem.tsx                 |   4 +-
 .../MatrixFederationSearch.tsx                |   4 +-
 .../meteor/client/sidebar/header/UserMenu.tsx |   4 +-
 .../sidebar/header/actions/Administration.tsx |   4 +-
 .../sidebar/header/actions/CreateRoom.tsx     |   4 +-
 .../client/sidebar/header/actions/Sort.tsx    |   4 +-
 .../actions/hooks/useAdministrationMenu.tsx   |   4 +-
 .../hooks/useMatrixFederationItems.tsx.tsx    |   4 +-
 .../header/actions/hooks/useSortMenu.tsx      |   4 +-
 .../sidebar/sections/OverMacLimitSection.tsx  |   4 +-
 .../sections/StatusDisabledSection.tsx        |   4 +-
 .../actions/OmnichannelCallDialPad.tsx        |   4 +-
 .../actions/OmnichannelCallToggleError.tsx    |   4 +-
 .../actions/OmnichannelCallToggleLoading.tsx  |   4 +-
 .../actions/OmnichannelCallToggleReady.tsx    |   4 +-
 .../sidebarv2/RoomList/RoomListWrapper.tsx    |   4 +-
 .../footer/SidebarFooterWatermark.tsx         |   4 +-
 .../sidebarv2/footer/voip/VoipFooter.tsx      |   4 +-
 .../FederatedRoomListEmptyPlaceholder.tsx     |   4 +-
 .../FederatedRoomListErrorBoundary.tsx        |   4 +-
 .../FederatedRoomListItem.tsx                 |   4 +-
 .../MatrixFederationSearch.tsx                |   4 +-
 .../sidebarv2/header/actions/CreateRoom.tsx   |   4 +-
 .../client/sidebarv2/header/actions/Sort.tsx  |   4 +-
 .../actions/hooks/useMatrixFederationItems.ts |   4 +-
 .../header/actions/hooks/useSortMenu.tsx      |   4 +-
 .../sections/StatusDisabledSection.tsx        |   4 +-
 .../contexts/TranslationContextMock.tsx       |   3 +-
 .../DeviceManagementAccountPage.tsx           |   4 +-
 .../DeviceManagementAccountRow.tsx            |   4 +-
 .../DeviceManagementAccountTable.tsx          |   4 +-
 .../omnichannel/PreferencesGeneral.tsx        |   4 +-
 .../views/account/preferences/MyDataModal.tsx |   4 +-
 .../PreferencesHighlightsSection.tsx          |   4 +-
 .../PreferencesMessagesSection.tsx            |   4 +-
 .../PreferencesUserPresenceSection.tsx        |   4 +-
 .../account/profile/ActionConfirmModal.tsx    |   4 +-
 .../account/security/BackupCodesModal.tsx     |   4 +-
 .../account/tokens/AccountTokensPage.tsx      |   4 +-
 .../AccountTokensTable/AccountTokensRow.tsx   |   4 +-
 .../admin/customEmoji/AddCustomEmoji.tsx      |   4 +-
 .../CustomUserActiveConnections.tsx           |   4 +-
 .../CustomUserStatusDisabledModal.tsx         |   4 +-
 .../DeviceManagementAdminTable.tsx            |   4 +-
 .../DeviceManagementInfoWithData.tsx          |   4 +-
 .../EngagementDashboardCardErrorBoundary.tsx  |   4 +-
 .../EngagementDashboardPage.tsx               |   4 +-
 .../channels/ChannelsOverview.tsx             |   9 +-
 .../messages/MessagesPerChannelSection.tsx    |   4 +-
 .../messages/MessagesSentSection.tsx          |   4 +-
 .../messages/MessagesTab.tsx                  |   4 +-
 .../users/ActiveUsersSection.tsx              |   4 +-
 .../users/BusiestChatTimesSection.tsx         |   4 +-
 .../users/ContentForHours.tsx                 |   4 +-
 .../users/NewUsersSection.tsx                 |   4 +-
 .../users/UsersByTimeOfTheDaySection.tsx      |   4 +-
 .../engagementDashboard/users/UsersTab.tsx    |   4 +-
 .../FederationDashboardPage.tsx               |   4 +-
 .../views/admin/import/PrepareChannels.tsx    |  10 +-
 .../views/admin/import/PrepareUsers.tsx       |  10 +-
 .../views/admin/integrations/NewBot.tsx       |   4 +-
 .../views/admin/integrations/NewZapier.tsx    |   4 +-
 .../outgoing/OutgoingWebhookForm.tsx          |  14 +-
 .../outgoing/history/HistoryContent.tsx       |   4 +-
 .../admin/moderation/MessageContextFooter.tsx |   4 +-
 .../moderation/ModerationConsoleActions.tsx   |   5 +-
 .../UserReports/ModConsoleUserActions.tsx     |   4 +-
 .../UserReports/UserContextFooter.tsx         |   4 +-
 .../moderation/helpers/DateRangePicker.tsx    |   4 +-
 .../moderation/helpers/ModerationFilter.tsx   |   4 +-
 .../helpers/ReportReasonCollapsible.tsx       |   4 +-
 .../permissions/CustomRoleUpsellModal.tsx     |   4 +-
 .../PermissionsTable/PermissionRow.tsx        |   7 +-
 .../PermissionsTableFilter.tsx                |   4 +-
 .../views/admin/permissions/RoleForm.tsx      |   4 +-
 .../UsersInRoleTable/UsersInRoleTableRow.tsx  |   4 +-
 .../views/admin/rooms/RoomsTableFilters.tsx   |   4 +-
 .../ResetSettingButton/ResetSettingButton.tsx |   4 +-
 .../inputs/CodeMirror/CodeMirrorBox.tsx       |   4 +-
 .../Setting/inputs/ColorSettingInput.tsx      |   4 +-
 .../inputs/MultiSelectSettingInput.tsx        |   4 +-
 .../Setting/inputs/SelectSettingInput.tsx     |   4 +-
 .../inputs/TimespanSettingInput.spec.tsx      |  11 +-
 .../Setting/inputs/TimespanSettingInput.tsx   |   8 +-
 .../SettingsSection/SettingsSection.tsx       |   4 +-
 .../OAuthGroupPage/CreateOAuthModal.tsx       |   4 +-
 .../admin/settings/groups/TabbedGroupPage.tsx |   4 +-
 .../admin/subscription/SubscriptionPage.tsx   |   2 +-
 .../admin/users/AdminUserFormWithData.tsx     |   4 +-
 .../AdminUserSetRandomPasswordRadios.tsx      |   4 +-
 .../users/SeatsCapUsage/SeatsCapUsage.tsx     |   4 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  |   4 +-
 .../views/admin/viewLogs/AnalyticsReports.tsx |   4 +-
 .../views/admin/viewLogs/ViewLogsPage.tsx     |   4 +-
 .../InstancesModal/InstancesModal.tsx         |   4 +-
 .../MessagesRoomsCard/MessagesRoomsCard.tsx   |   4 +-
 .../views/admin/workspace/WorkspacePage.tsx   |   4 +-
 .../client/views/audit/AuditLogPage.tsx       |   4 +-
 apps/meteor/client/views/audit/AuditPage.tsx  |   4 +-
 .../audit/components/AuditFiltersDisplay.tsx  |   4 +-
 .../views/audit/components/AuditForm.tsx      |   4 +-
 .../views/audit/components/AuditLogEntry.tsx  |   4 +-
 .../components/forms/DateRangePicker.tsx      |   4 +-
 .../views/audit/components/tabs/DirectTab.tsx |   4 +-
 .../audit/components/tabs/OmnichannelTab.tsx  |   4 +-
 .../views/audit/components/tabs/RoomsTab.tsx  |   4 +-
 .../views/audit/components/tabs/UsersTab.tsx  |   4 +-
 .../AudioMessageRecorder.tsx                  |   4 +-
 .../composer/EmojiPicker/EmojiCategoryRow.tsx |   4 +-
 .../EmojiPicker/EmojiPickerCategoryItem.tsx   |   4 +-
 .../composer/EmojiPicker/SearchingResult.tsx  |   4 +-
 .../client/views/directory/RoomTags.tsx       |   4 +-
 .../views/e2e/EnterE2EPasswordModal.tsx       |   4 +-
 .../client/views/e2e/SaveE2EPasswordModal.tsx |   4 +-
 .../views/home/cards/DesktopAppsCard.tsx      |   4 +-
 .../views/home/cards/DocumentationCard.tsx    |   4 +-
 .../views/home/cards/MobileAppsCard.tsx       |   4 +-
 .../AppDetailsPage/AppDetailsPageHeader.tsx   |   4 +-
 .../tabs/AppDetails/AppDetails.tsx            |   4 +-
 .../AppDetailsPage/tabs/AppLogs/AppLogs.tsx   |   4 +-
 .../tabs/AppLogs/AppLogsItem.tsx              |   4 +-
 .../tabs/AppLogs/AppLogsItemEntry.tsx         |   4 +-
 .../tabs/AppReleases/AppReleasesItem.tsx      |   4 +-
 .../tabs/AppSecurity/AppSecurity.tsx          |   4 +-
 .../tabs/AppSettings/AppSettings.tsx          |   4 +-
 .../tabs/AppStatus/AppStatusPriceDisplay.tsx  |   6 +-
 .../client/views/marketplace/AppMenu.tsx      |   4 +-
 .../marketplace/AppPermissionsReviewModal.tsx |   4 +-
 .../views/marketplace/AppUpdateModal.tsx      |   4 +-
 .../marketplace/AppsPage/AppsFilters.tsx      |   4 +-
 .../AppsPage/AppsPageConnectionError.tsx      |   4 +-
 .../AppsPage/AppsPageContentBody.tsx          |   4 +-
 .../AppsPage/FeaturedAppsSections.tsx         |   6 +-
 .../AppsPage/NoAppRequestsEmptyState.tsx      |   4 +-
 .../NoInstalledAppMatchesEmptyState.tsx       |   4 +-
 .../AppsPage/NoInstalledAppsEmptyState.tsx    |   4 +-
 ...etplaceOrInstalledAppMatchesEmptyState.tsx |   4 +-
 .../AppsPage/PrivateEmptyState.tsx            |   4 +-
 .../client/views/marketplace/BundleChips.tsx  |   4 +-
 .../client/views/marketplace/IframeModal.tsx  |   4 +-
 .../marketplace/UnlimitedAppsUpsellModal.tsx  |   4 +-
 .../AppInstallModal/AppInstallModal.tsx       |   4 +-
 .../components/AppPermissionsList.tsx         |   4 +-
 .../CategoryFilter/CategoryDropDownAnchor.tsx |   4 +-
 .../components/EnabledAppsCount.tsx           |   4 +-
 .../UninstallGrandfatheredAppModal.tsx        |   4 +-
 .../views/marketplace/hooks/useCategories.ts  |   4 +-
 .../views/notAuthorized/NotAuthorizedPage.tsx |   4 +-
 .../client/views/notFound/NotFoundPage.tsx    |   4 +-
 .../agents/AgentsTable/AgentsTable.tsx        |   4 +-
 .../omnichannel/analytics/AnalyticsPage.tsx   |   6 +-
 .../omnichannel/analytics/DateRangePicker.tsx |   4 +-
 .../appearance/AppearanceFieldLabel.tsx       |   4 +-
 .../omnichannel/appearance/AppearanceForm.tsx |   4 +-
 .../businessHours/BusinessHoursForm.tsx       |   4 +-
 .../contactHistory/ContactHistoryItem.tsx     |   4 +-
 .../contactHistory/ContactHistoryList.tsx     |   4 +-
 .../MessageList/ContactHistoryMessage.tsx     |   4 +-
 .../DepartmentAgentsTable/AgentRow.tsx        |   4 +-
 .../DepartmentAgentsTable.tsx                 |   4 +-
 .../departments/DepartmentTags.tsx            |   4 +-
 .../directory/calls/CallTableRow.tsx          |   4 +-
 .../calls/contextualBar/VoipInfo.tsx          |   4 +-
 .../contextualBar/VoipInfoCallButton.tsx      |   4 +-
 .../chats/contextualBar/DepartmentField.tsx   |   4 +-
 .../RoomEdit/RoomEditWithData.tsx             |   4 +-
 .../chats/contextualBar/VisitorClientInfo.js  |   4 +-
 .../components/CallDialpadButton.tsx          |   4 +-
 .../directory/components/PriorityField.tsx    |   4 +-
 .../directory/components/SlaField.tsx         |   4 +-
 .../directory/components/SourceField.tsx      |   4 +-
 .../contextualBar/ContactEditWithData.js      |   4 +-
 .../omnichannel/queueList/QueueListFilter.tsx |   4 +-
 .../omnichannel/queueList/QueueListPage.tsx   |   4 +-
 .../RealTimeMonitoringPage.js                 |   4 +-
 .../charts/AgentStatusChart.tsx               |   9 +-
 .../charts/ChatDurationChart.js               |   4 +-
 .../realTimeMonitoring/charts/ChatsChart.tsx  |   9 +-
 .../charts/ChatsPerAgentChart.js              |   4 +-
 .../charts/ChatsPerDepartmentChart.js         |   4 +-
 .../charts/ResponseTimesChart.js              |   4 +-
 .../charts/useUpdateChartData.ts              |   6 +-
 .../counter/CounterContainer.tsx              |   4 +-
 .../omnichannel/triggers/ConditionForm.tsx    |   4 +-
 .../triggers/actions/ActionForm.tsx           |   4 +-
 .../triggers/actions/ActionSender.tsx         |   4 +-
 .../actions/ExternalServiceActionForm.tsx     |   4 +-
 .../actions/SendMessageActionForm.tsx         |   4 +-
 .../OutlookSettingItem.tsx                    |   4 +-
 .../views/room/E2EESetup/RoomE2EESetup.tsx    |   4 +-
 .../QuickActions/QuickActionOptions.tsx       |   4 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   4 +-
 .../client/views/room/Header/RoomHeader.tsx   |   4 +-
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      |   4 +-
 .../QuickActions/QuickActionOptions.tsx       |   4 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   4 +-
 .../client/views/room/HeaderV2/RoomHeader.tsx |   4 +-
 .../client/views/room/HeaderV2/RoomLeader.tsx |   4 +-
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      |   4 +-
 .../MessageList/MessageListErrorBoundary.tsx  |   4 +-
 .../room/MessageList/MessageListItem.tsx      |   4 +-
 .../views/room/body/DropTargetOverlay.tsx     |   4 +-
 .../body/ErroredUploadProgressIndicator.tsx   |   4 +-
 .../client/views/room/body/LeaderBar.tsx      |   4 +-
 .../room/body/RetentionPolicyWarning.tsx      |   4 +-
 .../room/body/RoomForeword/RoomForeword.tsx   |   4 +-
 .../room/body/UnreadMessagesIndicator.tsx     |   4 +-
 .../room/body/UploadProgressIndicator.tsx     |   4 +-
 .../views/room/composer/ComposerArchived.tsx  |   4 +-
 .../views/room/composer/ComposerBlocked.tsx   |   4 +-
 .../views/room/composer/ComposerBoxPopup.tsx  |   4 +-
 .../composer/ComposerBoxPopupSlashCommand.tsx |   4 +-
 .../room/composer/ComposerBoxPopupUser.tsx    |   4 +-
 .../ComposerFederationDisabled.tsx            |   4 +-
 .../ComposerFederationJoinRoomDisabled.tsx    |   4 +-
 .../ComposerOmnichannelOnHold.tsx             |   4 +-
 .../ComposerUserActionIndicator.tsx           |   4 +-
 .../views/room/composer/ComposerVoIP.tsx      |   4 +-
 .../FormattingToolbarDropdown.tsx             |   4 +-
 .../MessageBoxFormattingToolbar.tsx           |   4 +-
 .../messageBox/hooks/useMediaActionTitle.ts   |   4 +-
 .../AutoTranslate/AutoTranslate.tsx           |   4 +-
 .../Discussions/DiscussionsListRow.tsx        |   4 +-
 .../components/DiscussionsListItem.tsx        |   4 +-
 .../ExportMessages/ExportMessages.tsx         |   5 +-
 .../ExportMessages/FileExport.tsx             |   4 +-
 .../ExportMessages/MailExportForm.tsx         |   4 +-
 .../ChannelToTeamConfirmation.tsx             |   4 +-
 .../ChannelToTeamSelection.tsx                |   4 +-
 .../contextualBar/Info/RoomInfo/RoomInfo.tsx  |   4 +-
 .../Info/hooks/useRoomActions.ts              |   4 +-
 .../KeyboardShortcuts/KeyboardShortcuts.tsx   |   4 +-
 .../MessageSearchTab/MessageSearchTab.tsx     |   4 +-
 .../components/MessageSearchForm.tsx          |   4 +-
 .../NotificationPreferences.tsx               |   4 +-
 .../NotificationPreferencesForm.tsx           |   4 +-
 .../views/room/contextualBar/OTR/OTR.tsx      |   4 +-
 .../OTR/components/OTREstablished.tsx         |   4 +-
 .../OTR/components/OTRStates.tsx              |   4 +-
 .../PruneMessages/PruneMessages.tsx           |   4 +-
 .../contextualBar/RoomFiles/RoomFiles.tsx     |   4 +-
 .../InviteUsers/EditInviteLink.tsx            |   4 +-
 .../RoomMembers/InviteUsers/InviteLink.tsx    |   4 +-
 .../RoomMembers/InviteUsers/InviteUsers.tsx   |   4 +-
 .../RoomMembers/RoomMembersActions.tsx        |   4 +-
 .../Threads/components/ThreadListMessage.tsx  |   4 +-
 .../Threads/components/ThreadMessageItem.tsx  |   4 +-
 .../UserInfo/UserInfoActions.tsx              |   4 +-
 .../VideoConference/VideoConfConfigModal.tsx  |   4 +-
 .../VideoConfList/VideoConfList.tsx           |   4 +-
 .../VideoConfPopup/IncomingPopup.tsx          |   4 +-
 .../VideoConfPopup/OutgoingPopup.tsx          |   4 +-
 .../VideoConfPopup/StartCallPopup.tsx         |   4 +-
 .../modals/FileUploadModal/MediaPreview.tsx   |   4 +-
 .../ReactionListModal/ReactionListModal.tsx   |   4 +-
 .../FilePickerBreadcrumbs.tsx                 |   4 +-
 .../WebdavFilePickerTable.tsx                 |   4 +-
 .../ChannelDesertionTable.tsx                 |   4 +-
 .../ModalSteps/FirstStep.tsx                  |   4 +-
 .../ModalSteps/SecondStep.tsx                 |   4 +-
 .../channels/TeamsChannelItemMenu.tsx         |   4 +-
 .../contextualBar/channels/TeamsChannels.tsx  |   4 +-
 .../ChannelDeletionTable.tsx                  |   4 +-
 .../info/DeleteTeam/DeleteTeamChannels.tsx    |   4 +-
 .../DeleteTeam/DeleteTeamConfirmation.tsx     |   4 +-
 .../LeaveTeamModal/LeaveTeamModalChannels.tsx |   4 +-
 .../LeaveTeamModalConfirmation.tsx            |   4 +-
 .../teams/contextualBar/info/TeamsInfo.tsx    |   4 +-
 .../RemoveUsersModal/RemoveUsersFirstStep.js  |   4 +-
 .../RemoveUsersModal/RemoveUsersSecondStep.js |   4 +-
 .../client/voip/modal/DialPad/DialInput.tsx   |   4 +-
 .../voip/modal/DialPad/hooks/useDialPad.tsx   |   4 +-
 apps/meteor/package.json                      |   4 +-
 .../EmailInbox/EmailInbox_Incoming.ts         |   2 +-
 .../EmailInbox/EmailInbox_Outgoing.ts         |   2 +-
 apps/meteor/server/lib/i18n.ts                |  11 +
 apps/meteor/server/lib/resetUserE2EKey.ts     |   2 +-
 .../modules/core-apps/mention.module.ts       |  44 ++-
 .../services/omnichannel-analytics/service.ts |   2 +-
 package.json                                  |   1 -
 packages/fuselage-ui-kit/package.json         |   4 +-
 packages/gazzodown/package.json               |   1 -
 packages/gazzodown/src/elements/LinkSpan.tsx  |   4 +-
 packages/gazzodown/src/elements/PlainSpan.tsx |   4 +-
 .../src/mentions/ChannelMentionElement.tsx    |   4 +-
 .../src/mentions/UserMentionElement.tsx       |   4 +-
 packages/i18n/jest.config.ts                  |   2 +-
 packages/i18n/package.json                    |  31 +-
 packages/i18n/src/index.mjs                   |  14 +-
 packages/livechat/package.json                |   4 +-
 packages/mock-providers/package.json          |   4 +-
 packages/ui-client/package.json               |  35 +-
 .../src/components/CustomFieldsForm.tsx       |   4 +-
 .../GenericMenu/GenericMenu.spec.tsx          |   7 +-
 .../components/GenericMenu/GenericMenu.tsx    |  12 +-
 .../MultiSelectCustomAnchor.tsx               |   4 +-
 .../MultiSelectCustomList.tsx                 |   4 +-
 .../MultiSelectCustom/useFilteredOptions.tsx  |   4 +-
 .../src/components/UserStatus/UserStatus.tsx  |   4 +-
 packages/web-ui-registration/package.json     |   8 +-
 .../src/SecretRegisterInvalidForm.tsx         |   4 +-
 yarn.lock                                     | 303 +++++++++++++-----
 423 files changed, 1175 insertions(+), 1145 deletions(-)
 delete mode 100644 .yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch

diff --git a/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch b/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch
deleted file mode 100644
index cf5a292c0253..000000000000
--- a/.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/dist/amd/react-i18next.js b/dist/amd/react-i18next.js
-index 115ef3cc362e5ce38e875f9b35dfd1fe687cfd6c..2ba1b4d54295eeff49c8c650f214d7875d9219a5 100644
---- a/dist/amd/react-i18next.js
-+++ b/dist/amd/react-i18next.js
-@@ -495,7 +495,7 @@ define(['exports', 'react'], (function (exports, react) { 'use strict';
- 	  }
- 	  addUsedNamespaces(namespaces) {
- 	    namespaces.forEach(ns => {
--	      this.usedNamespaces[ns] ??= true;
-+	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
- 	    });
- 	  }
- 	  getUsedNamespaces() {
-diff --git a/dist/amd/react-i18next.min.js b/dist/amd/react-i18next.min.js
-index c54c9114869feb14df7855be24237f85d64fe7e4..0cc2b09d6db9bfc6f94dffff4b9e0f3fd9108510 100644
---- a/dist/amd/react-i18next.min.js
-+++ b/dist/amd/react-i18next.min.js
-@@ -1 +1 @@
--define(["exports","react"],(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),a=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function i(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var i=e.indexOf("--\x3e");return{type:"comment",comment:-1!==i?e.slice(4,i):""}}for(var r=new RegExp(a),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],a=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=i(r);return c<0?(s.push(g),s):((p=a[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=i(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=a[c-1])&&p.children.push(t),a[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:a[c]),!u&&"<"!==m&&m)){p=-1===c?s:a[c].children;var y=e.indexOf("<",h),v=e.slice(h,-1===y?void 0:y);o.test(v)&&(v=" "),(y>-1&&c+p.length>=0||" "!==v)&&p.push({type:"text",content:v})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,v=e=>"object"==typeof e&&null!==e,x=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,b={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>b[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(x,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],C=(e,t)=>{if(!e)return"";let s="";const a=R(e),i=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return a.forEach(((e,a)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=i.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${a}></${a}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=C(c,t);s+=`<${a}>${e}</${a}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(v(e)){const{format:n,...t}=e,a=Object.keys(t);if(1===a.length){const e=n?`${a[0]}, ${n}`:a[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},T=(e,t,s,a,i,r)=>{if(""===t)return[];const o=a.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):v(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...i},h=(e,t,s)=>{const a=j(e),i=g(a,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(a)&&0===i.length||e.props?.i18nIsDynamicList?a:i},m=(e,t,s,a,i)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:a},i?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:a,ref:e.ref},i?null:t)})))},g=(t,i,c)=>{const u=R(t);return R(i).reduce(((t,i,p)=>{const d=i.children?.[0]?.content&&s.services.interpolator.interpolate(i.children[0].content,f,s.language);if("tag"===i.type){let r=u[parseInt(i.name,10)];1!==c.length||r||(r=c[0][i.name]),r||(r={});const x=0!==Object.keys(i.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:i.attrs},r):r,b=n.isValidElement(x),E=b&&S(i,!0)&&!i.voidElement,O=l&&v(x)&&x.dummy&&!b,N=v(e)&&Object.hasOwnProperty.call(e,i.name);if(y(x)){const e=s.services.interpolator.interpolate(x,f,s.language);t.push(e)}else if(S(x)||E){const e=h(x,i,c);m(x,e,t,p)}else if(O){const e=g(u,i.children,c);m(x,e,t,p)}else if(Number.isNaN(parseFloat(i.name)))if(N){const e=h(x,i,c);m(x,e,t,p,i.voidElement)}else if(a.transSupportBasicHtmlNodes&&o.indexOf(i.name)>-1)if(i.voidElement)t.push(n.createElement(i.name,{key:`${i.name}-${p}`}));else{const e=g(u,i.children,c);t.push(n.createElement(i.name,{key:`${i.name}-${p}`},e))}else if(i.voidElement)t.push(`<${i.name} />`);else{const e=g(u,i.children,c);t.push(`<${i.name}>${e}</${i.name}>`)}else if(v(x)&&!b){const e=i.children[0]?d:null;e&&t.push(e)}else m(x,d,t,p,1!==i.children.length||!d)}else if("text"===i.type){const e=a.transWrapTextNodes,o=r?a.unescape(s.services.interpolator.interpolate(i.content,f,s.language)):s.services.interpolator.interpolate(i.content,f,s.language);e?t.push(n.createElement(e,{key:`${i.name}-${p}`},o)):t.push(o)}return t}),[])},x=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(x[0])};function P(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const v=f||k();if(!v)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const x=h||v.t.bind(v)||(e=>e),b={...$(),...v.options?.react};let E=p||x.ns||v.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=C(t,b),N=c||O||b.transEmptyNodeValue||i,{hashTransKey:w}=b,I=i||(w?w(O||N):O||N);v.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...v.options.interpolation.defaultVariables}:{...v.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?x(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=T(u||t,R,v,b,j,m),L=a??b.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:a,defaultNS:i}=n.useContext(A)||{},r=s||a||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:v(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||i||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,a)=>n.useCallback(U(e,t,s,a),[e,t,s,a]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,x=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[b,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(x)})):h(r,u,(()=>{w.current&&E(x)}))),p&&N&&N!==O&&w.current&&E(x);const s=()=>{w.current&&E(x)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[b,r,p];if(I.t=b,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:a}=s,{i18n:i}=n.useContext(A)||{},r=a||i||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:a}=e;const i=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:i},a)},e.Trans=function(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},v=d||g||k(),x=f||v?.t.bind(v);return P({children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||x?.ns||y||v?.options?.defaultNS,i18n:v,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[a,i,r]=B(n,s);return t(a,{i18n:i,lng:i.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:a,...i}=t;return D(s,a),n.createElement(e,{...i})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function a(a){let{forwardedRef:i,...r}=a;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&i?u.ref=i:!t.withRef&&i&&(u.forwardedRef=i),n.createElement(s,u)}a.displayName=`withI18nextTranslation(${g(s)})`,a.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(a,Object.assign({},e,{forwardedRef:t})))):a}}}));
-+define(["exports","react"],(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),a=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function i(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var i=e.indexOf("--\x3e");return{type:"comment",comment:-1!==i?e.slice(4,i):""}}for(var r=new RegExp(a),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],a=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=i(r);return c<0?(s.push(g),s):((p=a[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=i(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=a[c-1])&&p.children.push(t),a[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:a[c]),!u&&"<"!==m&&m)){p=-1===c?s:a[c].children;var y=e.indexOf("<",h),v=e.slice(h,-1===y?void 0:y);o.test(v)&&(v=" "),(y>-1&&c+p.length>=0||" "!==v)&&p.push({type:"text",content:v})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,v=e=>"object"==typeof e&&null!==e,x=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,b={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>b[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(x,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],C=(e,t)=>{if(!e)return"";let s="";const a=R(e),i=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return a.forEach(((e,a)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=i.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${a}></${a}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=C(c,t);s+=`<${a}>${e}</${a}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(v(e)){const{format:n,...t}=e,a=Object.keys(t);if(1===a.length){const e=n?`${a[0]}, ${n}`:a[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},T=(e,t,s,a,i,r)=>{if(""===t)return[];const o=a.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):v(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...i},h=(e,t,s)=>{const a=j(e),i=g(a,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(a)&&0===i.length||e.props?.i18nIsDynamicList?a:i},m=(e,t,s,a,i)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:a},i?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:a,ref:e.ref},i?null:t)})))},g=(t,i,c)=>{const u=R(t);return R(i).reduce(((t,i,p)=>{const d=i.children?.[0]?.content&&s.services.interpolator.interpolate(i.children[0].content,f,s.language);if("tag"===i.type){let r=u[parseInt(i.name,10)];1!==c.length||r||(r=c[0][i.name]),r||(r={});const x=0!==Object.keys(i.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:i.attrs},r):r,b=n.isValidElement(x),E=b&&S(i,!0)&&!i.voidElement,O=l&&v(x)&&x.dummy&&!b,N=v(e)&&Object.hasOwnProperty.call(e,i.name);if(y(x)){const e=s.services.interpolator.interpolate(x,f,s.language);t.push(e)}else if(S(x)||E){const e=h(x,i,c);m(x,e,t,p)}else if(O){const e=g(u,i.children,c);m(x,e,t,p)}else if(Number.isNaN(parseFloat(i.name)))if(N){const e=h(x,i,c);m(x,e,t,p,i.voidElement)}else if(a.transSupportBasicHtmlNodes&&o.indexOf(i.name)>-1)if(i.voidElement)t.push(n.createElement(i.name,{key:`${i.name}-${p}`}));else{const e=g(u,i.children,c);t.push(n.createElement(i.name,{key:`${i.name}-${p}`},e))}else if(i.voidElement)t.push(`<${i.name} />`);else{const e=g(u,i.children,c);t.push(`<${i.name}>${e}</${i.name}>`)}else if(v(x)&&!b){const e=i.children[0]?d:null;e&&t.push(e)}else m(x,d,t,p,1!==i.children.length||!d)}else if("text"===i.type){const e=a.transWrapTextNodes,o=r?a.unescape(s.services.interpolator.interpolate(i.content,f,s.language)):s.services.interpolator.interpolate(i.content,f,s.language);e?t.push(n.createElement(e,{key:`${i.name}-${p}`},o)):t.push(o)}return t}),[])},x=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(x[0])};function P(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const v=f||k();if(!v)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const x=h||v.t.bind(v)||(e=>e),b={...$(),...v.options?.react};let E=p||x.ns||v.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=C(t,b),N=c||O||b.transEmptyNodeValue||i,{hashTransKey:w}=b,I=i||(w?w(O||N):O||N);v.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...v.options.interpolation.defaultVariables}:{...v.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?x(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=T(u||t,R,v,b,j,m),L=a??b.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:a,defaultNS:i}=n.useContext(A)||{},r=s||a||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:v(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||i||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,a)=>n.useCallback(U(e,t,s,a),[e,t,s,a]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,x=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[b,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(x)})):h(r,u,(()=>{w.current&&E(x)}))),p&&N&&N!==O&&w.current&&E(x);const s=()=>{w.current&&E(x)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[b,r,p];if(I.t=b,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:a}=s,{i18n:i}=n.useContext(A)||{},r=a||i||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:a}=e;const i=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:i},a)},e.Trans=function(e){let{children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},v=d||g||k(),x=f||v?.t.bind(v);return P({children:t,count:s,parent:a,i18nKey:i,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||x?.ns||y||v?.options?.defaultNS,i18n:v,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[a,i,r]=B(n,s);return t(a,{i18n:i,lng:i.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:a,...i}=t;return D(s,a),n.createElement(e,{...i})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function a(a){let{forwardedRef:i,...r}=a;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&i?u.ref=i:!t.withRef&&i&&(u.forwardedRef=i),n.createElement(s,u)}a.displayName=`withI18nextTranslation(${g(s)})`,a.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(a,Object.assign({},e,{forwardedRef:t})))):a}}}));
-diff --git a/dist/commonjs/context.js b/dist/commonjs/context.js
-index 5c4506e4d3424e4ffd167fd5bb696dabd67b662b..dcc11b798da72771953acce3c1368f006c3c1478 100644
---- a/dist/commonjs/context.js
-+++ b/dist/commonjs/context.js
-@@ -46,7 +46,7 @@ class ReportNamespaces {
-   }
-   addUsedNamespaces(namespaces) {
-     namespaces.forEach(ns => {
--      this.usedNamespaces[ns] ??= true;
-+      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
-     });
-   }
-   getUsedNamespaces() {
-diff --git a/dist/es/context.js b/dist/es/context.js
-index 89afe45d6cf480079598dd183521b32f28f77f06..a953078f44008ee751f51257536a31ceba2fd672 100644
---- a/dist/es/context.js
-+++ b/dist/es/context.js
-@@ -10,7 +10,7 @@ export class ReportNamespaces {
-   }
-   addUsedNamespaces(namespaces) {
-     namespaces.forEach(ns => {
--      this.usedNamespaces[ns] ??= true;
-+      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
-     });
-   }
-   getUsedNamespaces() {
-diff --git a/dist/umd/react-i18next.js b/dist/umd/react-i18next.js
-index 3723bd7c0f5762bdb09e3226ac86ff255cbf9859..9178ae9f7cdb776f51a64ff6c79eed1d18fbd836 100644
---- a/dist/umd/react-i18next.js
-+++ b/dist/umd/react-i18next.js
-@@ -499,7 +499,7 @@
- 	  }
- 	  addUsedNamespaces(namespaces) {
- 	    namespaces.forEach(ns => {
--	      this.usedNamespaces[ns] ??= true;
-+	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
- 	    });
- 	  }
- 	  getUsedNamespaces() {
-diff --git a/dist/umd/react-i18next.min.js b/dist/umd/react-i18next.min.js
-index 2eef624040aab6b4b9ba4699bf7e4777842bf0a2..69e17753d545df9dc26aa3411b477a4dff5e8361 100644
---- a/dist/umd/react-i18next.min.js
-+++ b/dist/umd/react-i18next.min.js
-@@ -1 +1 @@
--!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-diff --git a/react-i18next.js b/react-i18next.js
-index 3723bd7c0f5762bdb09e3226ac86ff255cbf9859..9178ae9f7cdb776f51a64ff6c79eed1d18fbd836 100644
---- a/react-i18next.js
-+++ b/react-i18next.js
-@@ -499,7 +499,7 @@
- 	  }
- 	  addUsedNamespaces(namespaces) {
- 	    namespaces.forEach(ns => {
--	      this.usedNamespaces[ns] ??= true;
-+	      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
- 	    });
- 	  }
- 	  getUsedNamespaces() {
-diff --git a/react-i18next.min.js b/react-i18next.min.js
-index 2eef624040aab6b4b9ba4699bf7e4777842bf0a2..69e17753d545df9dc26aa3411b477a4dff5e8361 100644
---- a/react-i18next.min.js
-+++ b/react-i18next.min.js
-@@ -1 +1 @@
--!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]??=!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("react")):"function"==typeof define&&define.amd?define(["exports","react"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ReactI18next={},e.React)}(this,(function(e,n){"use strict";function t(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var s=t({area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0}),i=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function a(e){var n={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},t=e.match(/<\/?([^\s]+?)[/\s>]/);if(t&&(n.name=t[1],(s[t[1]]||"/"===e.charAt(e.length-2))&&(n.voidElement=!0),n.name.startsWith("!--"))){var a=e.indexOf("--\x3e");return{type:"comment",comment:-1!==a?e.slice(4,a):""}}for(var r=new RegExp(i),o=null;null!==(o=r.exec(e));)if(o[0].trim())if(o[1]){var l=o[1].trim(),c=[l,""];l.indexOf("=")>-1&&(c=l.split("=")),n.attrs[c[0]]=c[1],r.lastIndex--}else o[2]&&(n.attrs[o[2]]=o[3].trim().substring(1,o[3].length-1));return n}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,o=/^\s*$/,l=Object.create(null);var c=function(e,n){n||(n={}),n.components||(n.components=l);var t,s=[],i=[],c=-1,u=!1;if(0!==e.indexOf("<")){var p=e.indexOf("<");s.push({type:"text",content:-1===p?e:e.substring(0,p)})}return e.replace(r,(function(r,l){if(u){if(r!=="</"+t.name+">")return;u=!1}var p,d="/"!==r.charAt(1),f=r.startsWith("\x3c!--"),h=l+r.length,m=e.charAt(h);if(f){var g=a(r);return c<0?(s.push(g),s):((p=i[c]).children.push(g),s)}if(d&&(c++,"tag"===(t=a(r)).type&&n.components[t.name]&&(t.type="component",u=!0),t.voidElement||u||!m||"<"===m||t.children.push({type:"text",content:e.slice(h,e.indexOf("<",h))}),0===c&&s.push(t),(p=i[c-1])&&p.children.push(t),i[c]=t),(!d||t.voidElement)&&(c>-1&&(t.voidElement||t.name===r.slice(2,-1))&&(c--,t=-1===c?s:i[c]),!u&&"<"!==m&&m)){p=-1===c?s:i[c].children;var y=e.indexOf("<",h),x=e.slice(h,-1===y?void 0:y);o.test(x)&&(x=" "),(y>-1&&c+p.length>=0||" "!==x)&&p.push({type:"text",content:x})}})),s};const u=function(){if(console?.warn){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&(n[0]=`react-i18next:: ${n[0]}`),console.warn(...n)}},p={},d=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];y(n[0])&&p[n[0]]||(y(n[0])&&(p[n[0]]=new Date),u(...n))},f=(e,n)=>()=>{if(e.isInitialized)n();else{const t=()=>{setTimeout((()=>{e.off("initialized",t)}),0),n()};e.on("initialized",t)}},h=(e,n,t)=>{e.loadNamespaces(n,f(e,t))},m=(e,n,t,s)=>{y(t)&&(t=[t]),t.forEach((n=>{e.options.ns.indexOf(n)<0&&e.options.ns.push(n)})),e.loadLanguages(n,f(e,s))},g=e=>e.displayName||e.name||(y(e)&&e.length>0?e:"Unknown"),y=e=>"string"==typeof e,x=e=>"object"==typeof e&&null!==e,b=/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g,v={"&amp;":"&","&#38;":"&","&lt;":"<","&#60;":"<","&gt;":">","&#62;":">","&apos;":"'","&#39;":"'","&quot;":'"',"&#34;":'"',"&nbsp;":" ","&#160;":" ","&copy;":"©","&#169;":"©","&reg;":"®","&#174;":"®","&hellip;":"…","&#8230;":"…","&#x2F;":"/","&#47;":"/"},E=e=>v[e];let O={bindI18n:"languageChanged",bindI18nStore:"",transEmptyNodeValue:"",transSupportBasicHtmlNodes:!0,transWrapTextNodes:"",transKeepBasicHtmlNodesFor:["br","strong","i","p"],useSuspense:!0,unescape:e=>e.replace(b,E)};const N=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};O={...O,...e}},$=()=>O;let w;const I=e=>{w=e},k=()=>w,S=(e,n)=>{if(!e)return!1;const t=e.props?.children??e.children;return n?t.length>0:!!t},j=e=>{if(!e)return[];const n=e.props?.children??e.children;return e.props?.i18nIsDynamicList?R(n):n},R=e=>Array.isArray(e)?e:[e],T=(e,t)=>{if(!e)return"";let s="";const i=R(e),a=t?.transSupportBasicHtmlNodes?t.transKeepBasicHtmlNodesFor??[]:[];return i.forEach(((e,i)=>{if(y(e))s+=`${e}`;else if(n.isValidElement(e)){const{props:n,type:r}=e,o=Object.keys(n).length,l=a.indexOf(r)>-1,c=n.children;if(c||!l||o)if(!c&&(!l||o)||n.i18nIsDynamicList)s+=`<${i}></${i}>`;else if(l&&1===o&&y(c))s+=`<${r}>${c}</${r}>`;else{const e=T(c,t);s+=`<${i}>${e}</${i}>`}else s+=`<${r}/>`}else if(null===e)u("Trans: the passed in value is invalid - seems you passed in a null child.");else if(x(e)){const{format:n,...t}=e,i=Object.keys(t);if(1===i.length){const e=n?`${i[0]}, ${n}`:i[0];s+=`{{${e}}}`}else u("react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.",e)}else u("Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.",e)})),s},C=(e,t,s,i,a,r)=>{if(""===t)return[];const o=i.transKeepBasicHtmlNodesFor||[],l=t&&new RegExp(o.map((e=>`<${e}`)).join("|")).test(t);if(!e&&!l&&!r)return[t];const u={},p=e=>{R(e).forEach((e=>{y(e)||(S(e)?p(j(e)):x(e)&&!n.isValidElement(e)&&Object.assign(u,e))}))};p(e);const d=c(`<0>${t}</0>`),f={...u,...a},h=(e,t,s)=>{const i=j(e),a=g(i,t.children,s);return(e=>Array.isArray(e)&&e.every(n.isValidElement))(i)&&0===a.length||e.props?.i18nIsDynamicList?i:a},m=(e,t,s,i,a)=>{e.dummy?(e.children=t,s.push(n.cloneElement(e,{key:i},a?void 0:t))):s.push(...n.Children.map([e],(e=>{const s={...e.props};return delete s.i18nIsDynamicList,n.createElement(e.type,{...s,key:i,ref:e.ref},a?null:t)})))},g=(t,a,c)=>{const u=R(t);return R(a).reduce(((t,a,p)=>{const d=a.children?.[0]?.content&&s.services.interpolator.interpolate(a.children[0].content,f,s.language);if("tag"===a.type){let r=u[parseInt(a.name,10)];1!==c.length||r||(r=c[0][a.name]),r||(r={});const b=0!==Object.keys(a.attrs).length?((e,n)=>{const t={...n};return t.props=Object.assign(e.props,n.props),t})({props:a.attrs},r):r,v=n.isValidElement(b),E=v&&S(a,!0)&&!a.voidElement,O=l&&x(b)&&b.dummy&&!v,N=x(e)&&Object.hasOwnProperty.call(e,a.name);if(y(b)){const e=s.services.interpolator.interpolate(b,f,s.language);t.push(e)}else if(S(b)||E){const e=h(b,a,c);m(b,e,t,p)}else if(O){const e=g(u,a.children,c);m(b,e,t,p)}else if(Number.isNaN(parseFloat(a.name)))if(N){const e=h(b,a,c);m(b,e,t,p,a.voidElement)}else if(i.transSupportBasicHtmlNodes&&o.indexOf(a.name)>-1)if(a.voidElement)t.push(n.createElement(a.name,{key:`${a.name}-${p}`}));else{const e=g(u,a.children,c);t.push(n.createElement(a.name,{key:`${a.name}-${p}`},e))}else if(a.voidElement)t.push(`<${a.name} />`);else{const e=g(u,a.children,c);t.push(`<${a.name}>${e}</${a.name}>`)}else if(x(b)&&!v){const e=a.children[0]?d:null;e&&t.push(e)}else m(b,d,t,p,1!==a.children.length||!d)}else if("text"===a.type){const e=i.transWrapTextNodes,o=r?i.unescape(s.services.interpolator.interpolate(a.content,f,s.language)):s.services.interpolator.interpolate(a.content,f,s.language);e?t.push(n.createElement(e,{key:`${a.name}-${p}`},o)):t.push(o)}return t}),[])},b=g([{dummy:!0,children:e||[]}],d,R(e||[]));return j(b[0])};function P(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:f,t:h,shouldUnescape:m,...g}=e;const x=f||k();if(!x)return d("You will need to pass in an i18next instance by using i18nextReactModule"),t;const b=h||x.t.bind(x)||(e=>e),v={...$(),...x.options?.react};let E=p||b.ns||x.options?.defaultNS;E=y(E)?[E]:E||["translation"];const O=T(t,v),N=c||O||v.transEmptyNodeValue||a,{hashTransKey:w}=v,I=a||(w?w(O||N):O||N);x.options?.interpolation?.defaultVariables&&(l=l&&Object.keys(l).length>0?{...l,...x.options.interpolation.defaultVariables}:{...x.options.interpolation.defaultVariables});const S=l||void 0!==s||!t?o.interpolation:{interpolation:{...o.interpolation,prefix:"#$?",suffix:"?$#"}},j={...o,context:r||o.context,count:s,...l,...S,defaultValue:N,ns:E},R=I?b(I,j):N;u&&Object.keys(u).forEach((e=>{const t=u[e];"function"==typeof t.type||!t.props||!t.props.children||R.indexOf(`${e}/>`)<0&&R.indexOf(`${e} />`)<0||(u[e]=n.createElement((function(){return n.createElement(n.Fragment,null,t)})))}));const P=C(u||t,R,x,v,j,m),L=i??v.defaultTransParent;return L?n.createElement(L,g,P):P}const L={type:"3rdParty",init(e){N(e.options.react),I(e)}},A=n.createContext();class V{constructor(){this.usedNamespaces={}}addUsedNamespaces(e){e.forEach((e=>{this.usedNamespaces[e]=this.usedNamespaces[e]??!0}))}getUsedNamespaces(){return Object.keys(this.usedNamespaces)}}const z=e=>async n=>({...await(e.getInitialProps?.(n))??{},...F()}),F=()=>{const e=k(),n=e.reportNamespaces?.getUsedNamespaces()??[],t={},s={};return e.languages.forEach((t=>{s[t]={},n.forEach((n=>{s[t][n]=e.getResourceBundle(t,n)||{}}))})),t.initialI18nStore=s,t.initialLanguage=e.language,t};const U=(e,n,t,s)=>e.getFixedT(n,t,s),B=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const{i18n:s}=t,{i18n:i,defaultNS:a}=n.useContext(A)||{},r=s||i||k();if(r&&!r.reportNamespaces&&(r.reportNamespaces=new V),!r){d("You will need to pass in an i18next instance by using initReactI18next");const e=(e,n)=>y(n)?n:x(n)&&y(n.defaultValue)?n.defaultValue:Array.isArray(e)?e[e.length-1]:e,n=[e,{},!1];return n.t=e,n.i18n={},n.ready=!1,n}r.options.react?.wait&&d("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");const o={...$(),...r.options.react,...t},{useSuspense:l,keyPrefix:c}=o;let u=e||a||r.options?.defaultNS;u=y(u)?[u]:u||["translation"],r.reportNamespaces.addUsedNamespaces?.(u);const p=(r.isInitialized||r.initializedStoreOnce)&&u.every((e=>function(e,n){let t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return n.languages&&n.languages.length?n.hasLoadedNamespace(e,{lng:t.lng,precheck:(n,s)=>{if(t.bindI18n?.indexOf("languageChanging")>-1&&n.services.backendConnector.backend&&n.isLanguageChangingTo&&!s(n.isLanguageChangingTo,e))return!1}}):(d("i18n.languages were undefined or empty",n.languages),!0)}(e,r,o))),f=((e,t,s,i)=>n.useCallback(U(e,t,s,i),[e,t,s,i]))(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),g=()=>f,b=()=>U(r,t.lng||null,"fallback"===o.nsMode?u:u[0],c),[v,E]=n.useState(g);let O=u.join();t.lng&&(O=`${t.lng}${O}`);const N=((e,t)=>{const s=n.useRef();return n.useEffect((()=>{s.current=e}),[e,t]),s.current})(O),w=n.useRef(!0);n.useEffect((()=>{const{bindI18n:e,bindI18nStore:n}=o;w.current=!0,p||l||(t.lng?m(r,t.lng,u,(()=>{w.current&&E(b)})):h(r,u,(()=>{w.current&&E(b)}))),p&&N&&N!==O&&w.current&&E(b);const s=()=>{w.current&&E(b)};return e&&r?.on(e,s),n&&r?.store.on(n,s),()=>{w.current=!1,r&&e?.split(" ").forEach((e=>r.off(e,s))),n&&r&&n.split(" ").forEach((e=>r.store.off(e,s)))}}),[r,O]),n.useEffect((()=>{w.current&&p&&E(g)}),[r,c,p]);const I=[v,r,p];if(I.t=v,I.i18n=r,I.ready=p,p)return I;if(!p&&!l)return I;throw new Promise((e=>{t.lng?m(r,t.lng,u,(()=>e())):h(r,u,(()=>e()))}))};const D=function(e,t){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};const{i18n:i}=s,{i18n:a}=n.useContext(A)||{},r=i||a||k();r.options?.isClone||(e&&!r.initializedStoreOnce&&(r.services.resourceStore.data=e,r.options.ns=Object.values(e).reduce(((e,n)=>(Object.keys(n).forEach((n=>{e.indexOf(n)<0&&e.push(n)})),e)),r.options.ns),r.initializedStoreOnce=!0,r.isInitialized=!0),t&&!r.initializedLanguageOnce&&(r.changeLanguage(t),r.initializedLanguageOnce=!0))};e.I18nContext=A,e.I18nextProvider=function(e){let{i18n:t,defaultNS:s,children:i}=e;const a=n.useMemo((()=>({i18n:t,defaultNS:s})),[t,s]);return n.createElement(A.Provider,{value:a},i)},e.Trans=function(e){let{children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o={},values:l,defaults:c,components:u,ns:p,i18n:d,t:f,shouldUnescape:h,...m}=e;const{i18n:g,defaultNS:y}=n.useContext(A)||{},x=d||g||k(),b=f||x?.t.bind(x);return P({children:t,count:s,parent:i,i18nKey:a,context:r,tOptions:o,values:l,defaults:c,components:u,ns:p||b?.ns||y||x?.options?.defaultNS,i18n:x,t:f,shouldUnescape:h,...m})},e.TransWithoutContext=P,e.Translation=e=>{let{ns:n,children:t,...s}=e;const[i,a,r]=B(n,s);return t(i,{i18n:a,lng:a.language},r)},e.composeInitialProps=z,e.date=()=>"",e.getDefaults=$,e.getI18n=k,e.getInitialProps=F,e.initReactI18next=L,e.number=()=>"",e.plural=()=>"",e.select=()=>"",e.selectOrdinal=()=>"",e.setDefaults=N,e.setI18n=I,e.time=()=>"",e.useSSR=D,e.useTranslation=B,e.withSSR=()=>function(e){function t(t){let{initialI18nStore:s,initialLanguage:i,...a}=t;return D(s,i),n.createElement(e,{...a})}return t.getInitialProps=z(e),t.displayName=`withI18nextSSR(${g(e)})`,t.WrappedComponent=e,t},e.withTranslation=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return function(s){function i(i){let{forwardedRef:a,...r}=i;const[o,l,c]=B(e,{...r,keyPrefix:t.keyPrefix}),u={...r,t:o,i18n:l,tReady:c};return t.withRef&&a?u.ref=a:!t.withRef&&a&&(u.forwardedRef=a),n.createElement(s,u)}i.displayName=`withI18nextTranslation(${g(s)})`,i.WrappedComponent=s;return t.withRef?n.forwardRef(((e,t)=>n.createElement(i,Object.assign({},e,{forwardedRef:t})))):i}}}));
-diff --git a/src/context.js b/src/context.js
-index 167af9c50f47e34f7473df03bb2bb1e369725934..9b9a5570b0b765c9d7809f912dba2db759ebb68d 100644
---- a/src/context.js
-+++ b/src/context.js
-@@ -14,7 +14,7 @@ export class ReportNamespaces {
- 
-   addUsedNamespaces(namespaces) {
-     namespaces.forEach((ns) => {
--      this.usedNamespaces[ns] ??= true;
-+      this.usedNamespaces[ns] = this.usedNamespaces[ns] ?? true;
-     });
-   }
- 
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts
index 5baf218a62bb..d947c1b30c2e 100644
--- a/apps/meteor/app/2fa/server/code/EmailCheck.ts
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts
@@ -38,7 +38,7 @@ export class EmailCheck implements ICodeCheck {
 	private async send2FAEmail(address: string, random: string, user: IUser): Promise<void> {
 		const language = user.language || settings.get('Language') || 'en';
 
-		const t = i18n.getFixedT(language);
+		const t = (s: string): string => i18n.t(s, { lng: language });
 
 		await Mailer.send({
 			to: address,
diff --git a/apps/meteor/app/2fa/server/functions/resetTOTP.ts b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
index 84426cd4f88d..3be8ec7c8060 100644
--- a/apps/meteor/app/2fa/server/functions/resetTOTP.ts
+++ b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
@@ -22,7 +22,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
 		return;
 	}
 
-	const t = i18n.getFixedT(language);
+	const t = (s: string): string => i18n.t(s, { lng: language });
 	const text = `
 	${t('Your_TOTP_has_been_reset')}
 
diff --git a/apps/meteor/app/lib/server/methods/addUsersToRoom.ts b/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
index 119071e8ece0..73fbf6e51a04 100644
--- a/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
+++ b/apps/meteor/app/lib/server/methods/addUsersToRoom.ts
@@ -98,11 +98,14 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 					return;
 				}
 				void api.broadcast('notify.ephemeralMessage', userId, data.rid, {
-					msg: i18n.t('Username_is_already_in_here', {
-						postProcess: 'sprintf',
-						sprintf: [newUser.username],
-						lng: user?.language,
-					}),
+					msg: i18n.t(
+						'Username_is_already_in_here',
+						{
+							postProcess: 'sprintf',
+							sprintf: [newUser.username],
+						},
+						user?.language,
+					),
 				});
 			}
 		}),
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
index e004f2199fa0..56009f15fede 100644
--- a/apps/meteor/app/lib/server/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -2,7 +2,6 @@ import { api } from '@rocket.chat/core-services';
 import type { AtLeast, IMessage, IUser } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Users } from '@rocket.chat/models';
-import type { TOptions } from 'i18next';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
@@ -99,9 +98,9 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 		SystemLogger.error({ msg: 'Error sending message:', err });
 
 		const errorMessage = typeof err === 'string' ? err : err.error || err.message;
-		const errorContext: TOptions = err.details ?? {};
+		const errorContext = err.details ?? {};
 		void api.broadcast('notify.ephemeralMessage', uid, message.rid, {
-			msg: i18n.t(errorMessage, { ...errorContext, lng: user.language }),
+			msg: i18n.t(errorMessage, errorContext, user.language),
 		});
 
 		if (typeof err === 'string') {
diff --git a/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts b/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
index 68d18cbfeacf..8a17686ba158 100644
--- a/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
+++ b/apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts
@@ -24,7 +24,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'add-users',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Add_them', { lng }),
+				text: i18n.t('Add_them', undefined, lng),
 			},
 		},
 		dismissBlock: {
@@ -35,7 +35,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'dismiss',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Do_nothing', { lng }),
+				text: i18n.t('Do_nothing', undefined, lng),
 			},
 		},
 		dmBlock: {
@@ -46,7 +46,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: strin
 			actionId: 'share-message',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Let_them_know', { lng }),
+				text: i18n.t('Let_them_know', undefined, lng),
 			},
 		},
 	} as const;
@@ -121,7 +121,7 @@ callbacks.add(
 					type: 'section',
 					text: {
 						type: 'mrkdwn',
-						text: i18n.t(messageLabel, { mentions: mentionsText, lng: language }),
+						text: i18n.t(messageLabel, { mentions: mentionsText }, language),
 					},
 				} as const,
 				Boolean(elements.length) &&
diff --git a/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx b/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
index 58ede259fb45..41af8a22b6bb 100644
--- a/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
+++ b/apps/meteor/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type PlaceChatOnHoldModalProps = {
 	onOnHoldChat: () => void;
@@ -9,7 +9,7 @@ type PlaceChatOnHoldModalProps = {
 };
 
 const PlaceChatOnHoldModal = ({ onCancel, onOnHoldChat, confirm = onOnHoldChat, ...props }: PlaceChatOnHoldModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props} data-qa-id='on-hold-modal'>
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index 404f576ea513..7aacfacb4476 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -159,7 +159,7 @@ API.v1.addRoute(
 					const visitorEmail = visitor.visitorEmails?.[0]?.address;
 
 					const language = servingAgent.language || rcSettings.get<string>('Language') || 'en';
-					const t = i18n.getFixedT(language);
+					const t = (s: string): string => i18n.t(s, { lng: language });
 					const subject = t('Transcript_of_your_livechat_conversation');
 
 					options.emailTranscript = {
diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
index 017eb516a487..17f21d8d7b04 100644
--- a/apps/meteor/app/livechat/server/lib/Helper.ts
+++ b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -439,8 +439,8 @@ export const dispatchInquiryQueued = async (inquiry: ILivechatInquiryRecord, age
 			hasMentionToHere: false,
 			message: { _id: '', u: v, msg: '' },
 			// we should use server's language for this type of messages instead of user's
-			notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName, lng: language }),
-			room: Object.assign(room, { name: i18n.t('New_chat_in_queue', { lng: language }) }),
+			notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName }, language),
+			room: Object.assign(room, { name: i18n.t('New_chat_in_queue', {}, language) }),
 			mentionIds: [],
 		});
 	}
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index c6728d470870..e1ea79d84163 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -371,8 +371,8 @@ export class QueueManager {
 				hasMentionToHere: false,
 				message: { _id: '', u: v, msg: '' },
 				// we should use server's language for this type of messages instead of user's
-				notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName, lng: language }),
-				room: { ...room, name: i18n.t('New_chat_in_queue', { lng: language }) },
+				notificationMessage: i18n.t('User_started_a_new_conversation', { username: notificationUserName }, language),
+				room: { ...room, name: i18n.t('New_chat_in_queue', {}, language) },
 				mentionIds: [],
 			});
 		}
diff --git a/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx b/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
index 21e502c90001..420bf93df66d 100644
--- a/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
+++ b/apps/meteor/app/ui-message/client/messageBox/AddLinkComposerActionModal.tsx
@@ -1,8 +1,8 @@
 import { Field, FieldGroup, TextInput, FieldLabel, FieldRow, Box } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 import { useForm, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../client/components/GenericModal';
 
@@ -13,7 +13,7 @@ type AddLinkComposerActionModalProps = {
 };
 
 const AddLinkComposerActionModal = ({ selectedText, onClose, onConfirm }: AddLinkComposerActionModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const textField = useUniqueId();
 	const urlField = useUniqueId();
 
diff --git a/apps/meteor/app/utils/lib/i18n.ts b/apps/meteor/app/utils/lib/i18n.ts
index 737b98666d0a..b69fe6b30513 100644
--- a/apps/meteor/app/utils/lib/i18n.ts
+++ b/apps/meteor/app/utils/lib/i18n.ts
@@ -1,5 +1,4 @@
 import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
-import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import sprintf from 'i18next-sprintf-postprocessor';
 
@@ -14,7 +13,7 @@ export const addSprinfToI18n = function (t: (typeof i18n)['t']) {
 		}
 
 		if (isObject(replaces[0]) && !Array.isArray(replaces[0])) {
-			return t(key, replaces[0] as TOptions);
+			return t(key, replaces[0]);
 		}
 
 		return t(key, {
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
index 2693060578ed..af9b907df12e 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmniChannelCallDialPad.tsx
@@ -1,7 +1,7 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../contexts/CallContext';
 import { useDialModal } from '../../hooks/useDialModal';
@@ -9,7 +9,7 @@ import { useDialModal } from '../../hooks/useDialModal';
 type NavBarItemOmniChannelCallDialPadProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmniChannelCallDialPad = (props: NavBarItemOmniChannelCallDialPadProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
index 7f2b6adc8691..cf4e7ec240b4 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleError.tsx
@@ -1,12 +1,12 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NavBarItemOmnichannelCallToggleErrorProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleError = (props: NavBarItemOmnichannelCallToggleErrorProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <NavBarItem icon='phone' danger data-tooltip={t('Error')} disabled {...props} />;
 };
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
index 149500050402..c4b53acefabb 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleLoading.tsx
@@ -1,12 +1,12 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NavBarItemOmnichannelCallToggleLoadingProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleLoading = (props: NavBarItemOmnichannelCallToggleLoadingProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <NavBarItem icon='phone' data-tooltip={t('Loading')} aria-label={t('VoIP_Toggle')} disabled {...props} />;
 };
 
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
index 82f1c28350cd..8b51fc6c5b57 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggleReady.tsx
@@ -1,14 +1,14 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../contexts/CallContext';
 
 type NavBarItemOmnichannelCallToggleReadyProps = ComponentPropsWithoutRef<typeof NavBarItem>;
 
 const NavBarItemOmnichannelCallToggleReady = (props: NavBarItemOmnichannelCallToggleReadyProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const caller = useCallerInfo();
 	const unregister = useCallUnregisterClient();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
index 149ad0ea585e..22895d55388f 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import UserMenuButton from './UserMenuButton';
 import { useUserMenu } from './hooks/useUserMenu';
@@ -11,7 +11,7 @@ import { useUserMenu } from './hooks/useUserMenu';
 type UserMenuProps = { user: IUser } & Omit<ComponentProps<typeof GenericMenu>, 'sections' | 'items' | 'title'>;
 
 const UserMenu = function UserMenu({ user, ...props }: UserMenuProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [isOpen, setIsOpen] = useState(false);
 
 	const sections = useUserMenu(user);
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
index dbaea02ace4a..f589dd21ed50 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
@@ -1,7 +1,7 @@
 import { Avatar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarTitle,
@@ -19,7 +19,7 @@ interface IGameCenterContainerProps {
 }
 
 const GameCenterContainer = ({ handleClose, handleBack, game }: IGameCenterContainerProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
index 871e82f3ff56..d0dcc6fad4fe 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
@@ -19,7 +19,7 @@ interface IGameCenterInvitePlayersModalProps {
 }
 
 const GameCenterInvitePlayersModal = ({ game, onClose }: IGameCenterInvitePlayersModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [users, setUsers] = useState<Array<Username>>([]);
 	const { name } = game;
 
diff --git a/apps/meteor/client/components/ActionManagerBusyState.tsx b/apps/meteor/client/components/ActionManagerBusyState.tsx
index 932eb08ea502..1399c045271f 100644
--- a/apps/meteor/client/components/ActionManagerBusyState.tsx
+++ b/apps/meteor/client/components/ActionManagerBusyState.tsx
@@ -1,12 +1,12 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
 
 const ActionManagerBusyState = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const actionManager = useUiKitActionManager();
 	const [busy, setBusy] = useState(false);
 
diff --git a/apps/meteor/client/components/AutoCompleteDepartment.tsx b/apps/meteor/client/components/AutoCompleteDepartment.tsx
index 0c50f2254aac..6217f1d99610 100644
--- a/apps/meteor/client/components/AutoCompleteDepartment.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartment.tsx
@@ -1,8 +1,8 @@
 import { PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
@@ -28,7 +28,7 @@ const AutoCompleteDepartment = ({
 	showArchived = false,
 	...props
 }: AutoCompleteDepartmentProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState<string>('');
 
 	const debouncedDepartmentsFilter = useDebouncedValue(departmentsFilter, 500);
diff --git a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
index c15d480f3900..99af9a1f6a2c 100644
--- a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
@@ -1,9 +1,9 @@
 import { CheckOption, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
@@ -24,7 +24,7 @@ const AutoCompleteDepartmentMultiple = ({
 	enabled = false,
 	onChange = () => undefined,
 }: AutoCompleteDepartmentMultipleProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 
 	const debouncedDepartmentsFilter = useDebouncedValue(departmentsFilter, 500);
diff --git a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
index 77135fad6230..349341baf003 100644
--- a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
+++ b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 import RawText from './RawText';
@@ -20,7 +20,7 @@ const ConfirmOwnerChangeModal = ({
 	onConfirm,
 	onCancel,
 }: ConfirmOwnerChangeModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	let changeOwnerRooms = '';
 	if (shouldChangeOwner.length > 0) {
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
index dcac448b1e92..c8e17ab88d80 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ContextualbarAction from './ContextualbarAction';
 
 type ContextualbarBackProps = Partial<ComponentProps<typeof ContextualbarAction>>;
 
 const ContextualbarBack = (props: ContextualbarBackProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <ContextualbarAction {...props} title={t('Back')} name='arrow-back' />;
 };
 
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
index 38db516476e3..1670c9be5895 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ContextualbarAction from './ContextualbarAction';
 
 type ContextualbarCloseProps = Partial<ComponentProps<typeof ContextualbarAction>>;
 
 const ContextualbarClose = (props: ContextualbarCloseProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <ContextualbarAction data-qa='ContextualbarActionClose' {...props} aria-label={t('Close')} name='cross' />;
 };
 
diff --git a/apps/meteor/client/components/FilterByText.tsx b/apps/meteor/client/components/FilterByText.tsx
index 25d8e225e3d8..5c5a3d599e2f 100644
--- a/apps/meteor/client/components/FilterByText.tsx
+++ b/apps/meteor/client/components/FilterByText.tsx
@@ -1,8 +1,8 @@
 import { Box, Icon, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, FormEvent, HTMLAttributes } from 'react';
 import React, { forwardRef, memo, useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FilterByTextProps = {
 	onChange: (filter: string) => void;
@@ -13,7 +13,7 @@ const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function Fi
 	{ placeholder, onChange: setFilter, shouldAutoFocus = false, children, ...props },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [text, setText] = useState('');
 	const autoFocusRef = useAutoFocus(shouldAutoFocus);
 	const mergedRefs = useMergedRefs(ref, autoFocusRef);
diff --git a/apps/meteor/client/components/FingerprintChangeModal.tsx b/apps/meteor/client/components/FingerprintChangeModal.tsx
index a45a17db8ccc..db4c33654a92 100644
--- a/apps/meteor/client/components/FingerprintChangeModal.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -12,7 +12,7 @@ type FingerprintChangeModalProps = {
 };
 
 const FingerprintChangeModal = ({ onConfirm, onCancel, onClose }: FingerprintChangeModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<GenericModal
 			variant='warning'
diff --git a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
index 6acc413c82be..77718de0f441 100644
--- a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -16,7 +16,7 @@ const FingerprintChangeModalConfirmation = ({
 	onCancel,
 	newWorkspace,
 }: FingerprintChangeModalConfirmationProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<GenericModal
 			variant='warning'
diff --git a/apps/meteor/client/components/GenericError/GenericError.tsx b/apps/meteor/client/components/GenericError/GenericError.tsx
index 15014fa162d7..22f9923dea27 100644
--- a/apps/meteor/client/components/GenericError/GenericError.tsx
+++ b/apps/meteor/client/components/GenericError/GenericError.tsx
@@ -1,7 +1,7 @@
 import { Box, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type GenericErrorProps = {
 	icon?: IconName;
@@ -11,7 +11,7 @@ type GenericErrorProps = {
 };
 
 const GenericError = ({ icon = 'magnifier', title, buttonTitle, buttonAction }: GenericErrorProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.tsx b/apps/meteor/client/components/GenericModal/GenericModal.tsx
index d91e3c066007..5d025e05827d 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.tsx
@@ -1,9 +1,9 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode, ComponentPropsWithoutRef } from 'react';
 import React, { useEffect, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { RequiredModalProps } from './withDoNotAskAgain';
 import { withDoNotAskAgain } from './withDoNotAskAgain';
@@ -75,7 +75,7 @@ const GenericModal = ({
 	annotation,
 	...props
 }: GenericModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const genericModalId = useUniqueId();
 
 	const dismissedRef = useRef(true);
diff --git a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
index d21023024fb3..3fcfe2b0e0ac 100644
--- a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
+++ b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
@@ -1,7 +1,7 @@
 import { Box, States, StatesIcon, StatesLink, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type LinkProps = { linkText: string; linkHref: string } | { linkText?: never; linkHref?: never };
 type ButtonProps = { buttonTitle: string; buttonAction: () => void } | { buttonTitle?: never; buttonAction?: never };
@@ -23,7 +23,7 @@ const GenericNoResults = ({
 	linkHref,
 	linkText,
 }: GenericNoResultsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
diff --git a/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
index 4c390041497e..0a8a8deb8262 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useItemsPerPageLabel.ts
@@ -1,7 +1,7 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const useItemsPerPageLabel = (): (() => string) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useCallback(() => t('Items_per_page:'), [t]);
 };
diff --git a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
index 8ff7d2ac18cf..c610340f28bd 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
@@ -1,19 +1,15 @@
 import type { Pagination } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type Props<T extends ComponentProps<typeof Pagination>['showingResultsLabel'] = ComponentProps<typeof Pagination>['showingResultsLabel']> =
 	T extends (...args: any[]) => any ? Parameters<T> : never;
 
 export const useShowingResultsLabel = (): ((...params: Props) => string) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useCallback(
-		({ count, current, itemsPerPage }) =>
-			t('Showing_results_of', {
-				postProcess: 'sprintf',
-				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-			}),
+		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
 		[t],
 	);
 };
diff --git a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
index e7ce515ac496..3d68e3f4b6d3 100644
--- a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
+++ b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
@@ -1,8 +1,8 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ReactElement, ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type GenericUpsellModalProps = {
 	children?: ReactNode;
@@ -35,7 +35,7 @@ const GenericUpsellModal = ({
 	annotation,
 	...props
 }: GenericUpsellModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props}>
diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
index 6db61b2ec910..2cabfed460bd 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
@@ -1,10 +1,10 @@
 import type { IUpload } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, ButtonGroup, IconButton, Palette, Throbber } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useState } from 'react';
 import { FocusScope } from 'react-aria';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 import { Keyboard, Navigation, Zoom, A11y } from 'swiper';
 import type { SwiperRef } from 'swiper/react';
 import { type SwiperClass, Swiper, SwiperSlide } from 'swiper/react';
@@ -108,7 +108,7 @@ const swiperStyle = css`
 `;
 
 export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[]; onClose: () => void; loadMore?: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const swiperRef = useRef<SwiperRef>(null);
 	const [, setSwiperInst] = useState<SwiperClass>();
 	const [zoomScale, setZoomScale] = useState(1);
diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
index 8dcc55a93a48..97d91de95f62 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGalleryError.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton, ModalBackdrop } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 
 import GenericError from '../GenericError/GenericError';
 
@@ -14,7 +14,7 @@ const closeButtonStyle = css`
 `;
 
 export const ImageGalleryError = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return createPortal(
 		<ModalBackdrop display='flex' justifyContent='center' color='pure-white'>
diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
index 588605786664..1c057584bd1f 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGalleryLoading.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton, ModalBackdrop, Throbber } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 
 const closeButtonStyle = css`
 	position: absolute;
@@ -12,7 +12,7 @@ const closeButtonStyle = css`
 `;
 
 export const ImageGalleryLoading = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return createPortal(
 		<ModalBackdrop display='flex' justifyContent='center' color='pure-white'>
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
index 6f94be4ebc90..cbefeb2c72c1 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
@@ -1,14 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { usePruneWarningMessage } from '../../hooks/usePruneWarningMessage';
 import { withErrorBoundary } from '../withErrorBoundary';
 
 const RetentionPolicyCallout = ({ room }: { room: IRoom }) => {
 	const message = usePruneWarningMessage(room);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Callout arial-label={t('Retention_policy_warning_callout')} role='alert' aria-live='polite' type='warning'>
diff --git a/apps/meteor/client/components/LocalTime.tsx b/apps/meteor/client/components/LocalTime.tsx
index 498b2da9711e..100ba2ec6a62 100644
--- a/apps/meteor/client/components/LocalTime.tsx
+++ b/apps/meteor/client/components/LocalTime.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useUTCClock } from '../hooks/useUTCClock';
 
@@ -10,7 +10,7 @@ type LocalTimeProps = {
 
 const LocalTime = ({ utcOffset }: LocalTimeProps): ReactElement => {
 	const time = useUTCClock(utcOffset);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <>{t('Local_Time_time', { time })}</>;
 };
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index a116ad83ddd9..16bd1b71430a 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -1,10 +1,10 @@
 import { Box } from '@rocket.chat/fuselage';
 import { isExternal, getBaseURI } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import dompurify from 'dompurify';
 import { marked } from 'marked';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { renderMessageEmoji } from '../lib/utils/renderMessageEmoji';
 
@@ -95,7 +95,7 @@ const MarkdownText = ({
 	...props
 }: MarkdownTextProps) => {
 	const sanitizer = dompurify.sanitize;
-	const { t } = useTranslation();
+	const t = useTranslation();
 	let markedOptions: marked.MarkedOptions;
 
 	const schemes = 'http,https,notes,ftp,ftps,tel,mailto,sms,cid';
diff --git a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
index b19ccfee1769..04fcb29eed01 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type ReturnChatQueueModalProps = {
 	onMoveChat: () => void;
@@ -8,7 +8,7 @@ type ReturnChatQueueModalProps = {
 };
 
 const ReturnChatQueueModal = ({ onCancel, onMoveChat, ...props }: ReturnChatQueueModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props} data-qa-id='return-to-queue-modal'>
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index de13ee3aa9a4..67deb558c1ed 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Field, Button, TextInput, Modal, Box, FieldGroup, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type TranscriptModalProps = {
 	email: string;
@@ -14,7 +14,7 @@ type TranscriptModalProps = {
 };
 
 const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, onCancel, onDiscard, ...props }: TranscriptModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const {
 		register,
diff --git a/apps/meteor/client/components/Sidebar/Header.tsx b/apps/meteor/client/components/Sidebar/Header.tsx
index dcbf7f1cb505..e4bf5a5e7041 100644
--- a/apps/meteor/client/components/Sidebar/Header.tsx
+++ b/apps/meteor/client/components/Sidebar/Header.tsx
@@ -1,7 +1,7 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type HeaderProps = {
 	children?: ReactNode;
@@ -10,7 +10,7 @@ type HeaderProps = {
 };
 
 const Header = ({ title, onClose, children, ...props }: HeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' pb={16} {...props}>
diff --git a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
index b588e223d922..45eb6094572a 100644
--- a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
@@ -1,6 +1,6 @@
 import { Divider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Fragment, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { SidebarItem } from '../../lib/createSidebarItems';
 import { isSidebarItem } from '../../lib/createSidebarItems';
@@ -12,7 +12,7 @@ type SidebarItemsAssemblerProps = {
 };
 
 const SidebarItemsAssembler = ({ items, currentPath }: SidebarItemsAssemblerProps) => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
@@ -25,7 +25,7 @@ const SidebarItemsAssembler = ({ items, currentPath }: SidebarItemsAssemblerProp
 							icon={props.icon}
 							label={t((props.i18nLabel || props.name) as Parameters<typeof t>[0])}
 							currentPath={currentPath}
-							tag={props.tag && i18n.exists(props.tag) ? t(props.tag) : props.tag}
+							tag={props.tag && t.has(props.tag) ? t(props.tag) : props.tag}
 							externalUrl={props.externalUrl}
 							badge={props.badge}
 						/>
diff --git a/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx b/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
index 1eefc50baabd..cd0c25f03d86 100644
--- a/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
+++ b/apps/meteor/client/components/SidebarToggler/SidebarTogglerButton.tsx
@@ -1,6 +1,6 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import SidebarTogglerBadge from './SidebarTogglerBadge';
 
@@ -10,7 +10,7 @@ type SideBarTogglerButtonProps = {
 };
 
 const SideBarTogglerButton = ({ badge, onClick }: SideBarTogglerButtonProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box position='relative'>
diff --git a/apps/meteor/client/components/TextCopy.tsx b/apps/meteor/client/components/TextCopy.tsx
index f9e2ffc62284..467e954ddd65 100644
--- a/apps/meteor/client/components/TextCopy.tsx
+++ b/apps/meteor/client/components/TextCopy.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, Scrollable } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../hooks/useClipboardWithToast';
 
@@ -17,7 +17,7 @@ type TextCopyProps = {
 } & ComponentProps<typeof Box>;
 
 const TextCopy = ({ text, wrapper = defaultWrapperRenderer, ...props }: TextCopyProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { copy } = useClipboardWithToast(text);
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
index 4867d171aee8..4c91e274de68 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
@@ -1,8 +1,8 @@
 import { Box, PasswordInput, FieldGroup, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, Ref, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -15,7 +15,7 @@ type TwoFactorPasswordModalProps = {
 };
 
 const TwoFactorPasswordModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorPasswordModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus();
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index d6f167be8588..6f36c9c8ce26 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -1,8 +1,8 @@
 import { Box, TextInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -15,7 +15,7 @@ type TwoFactorTotpModalProps = {
 };
 
 const TwoFactorTotpModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorTotpModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus<HTMLInputElement>();
 
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index 617bff939fbe..912a140d60f4 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from './GenericModal';
 
@@ -13,18 +13,14 @@ type UrlChangeModalProps = {
 };
 
 const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeModalProps): ReactElement => {
-	const { t } = useTranslation('core');
-
+	const t = useTranslation();
 	return (
 		<GenericModal variant='warning' title={t('Warning')} onConfirm={onConfirm} onClose={onClose} onCancel={onClose} confirmText={t('Yes')}>
 			<Box
 				is='p'
 				mbe={16}
 				dangerouslySetInnerHTML={{
-					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', {
-						postProcess: 'sprintf',
-						sprintf: [t('Site_Url'), siteUrl, currentUrl],
-					}),
+					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Site_Url'), siteUrl, currentUrl),
 				}}
 			/>
 			<p
diff --git a/apps/meteor/client/components/UserCard/UserCard.tsx b/apps/meteor/client/components/UserCard/UserCard.tsx
index 98e1cce2ab78..bf143229cf65 100644
--- a/apps/meteor/client/components/UserCard/UserCard.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 import MarkdownText from '../MarkdownText';
@@ -52,7 +52,7 @@ const UserCard = ({
 	nickname,
 	...props
 }: UserCardProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isLayoutEmbedded = useEmbeddedLayout();
 
 	return (
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index ac879d21738b..a7f32f82f454 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -1,9 +1,9 @@
 import type { IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../hooks/useTimeAgo';
 import { useUserCustomFields } from '../../hooks/useUserCustomFields';
@@ -72,7 +72,7 @@ const UserInfo = ({
 	reason,
 	...props
 }: UserInfoProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const timeAgo = useTimeAgo();
 	const userDisplayName = useUserDisplayName({ name, username });
 	const userCustomFields = useUserCustomFields(customFields);
diff --git a/apps/meteor/client/components/WarningModal.tsx b/apps/meteor/client/components/WarningModal.tsx
index db0697f78c0d..00ae92e1d3bd 100644
--- a/apps/meteor/client/components/WarningModal.tsx
+++ b/apps/meteor/client/components/WarningModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type WarningModalProps = {
 	text: ReactNode;
@@ -13,7 +13,7 @@ type WarningModalProps = {
 };
 
 const WarningModal = ({ text, confirmText, close, cancel, cancelText, confirm, ...props }: WarningModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<Modal open {...props}>
 			<Modal.Header>
diff --git a/apps/meteor/client/components/dashboards/PeriodSelector.tsx b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
index d441fbf2f19a..6977e3334f4f 100644
--- a/apps/meteor/client/components/dashboards/PeriodSelector.tsx
+++ b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
@@ -1,7 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Period } from './periods';
 import { getPeriod } from './periods';
@@ -14,9 +14,9 @@ type PeriodSelectorProps<TPeriod extends Period['key']> = {
 };
 
 const PeriodSelector = <TPeriod extends Period['key']>({ periods, value, name, onChange }: PeriodSelectorProps<TPeriod>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
-	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(getPeriod(period).label)]), [periods, t]);
+	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(...getPeriod(period).label)]), [periods, t]);
 
 	return (
 		<Select
diff --git a/apps/meteor/client/components/dashboards/periods.ts b/apps/meteor/client/components/dashboards/periods.ts
index ff361b3136df..784ba9c8f6a6 100644
--- a/apps/meteor/client/components/dashboards/periods.ts
+++ b/apps/meteor/client/components/dashboards/periods.ts
@@ -1,6 +1,11 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 
+const label = (
+	translationKey: TranslationKey,
+	...replacements: unknown[]
+): readonly [translationKey: TranslationKey, ...replacements: unknown[]] => [translationKey, ...replacements];
+
 const lastNDays =
 	(
 		n: number,
@@ -24,47 +29,47 @@ const lastNDays =
 const periods = [
 	{
 		key: 'today',
-		label: 'Today' as TranslationKey,
+		label: label('Today'),
 		range: lastNDays(0),
 	},
 	{
 		key: 'this week',
-		label: 'This_week' as TranslationKey,
+		label: label('This_week'),
 		range: lastNDays(7),
 	},
 	{
 		key: 'last 7 days',
-		label: 'Last_7_days' as TranslationKey,
+		label: label('Last_7_days'),
 		range: lastNDays(7),
 	},
 	{
 		key: 'last 15 days',
-		label: 'Last_15_days' as TranslationKey,
+		label: label('Last_15_days'),
 		range: lastNDays(15),
 	},
 	{
 		key: 'this month',
-		label: 'This_month' as TranslationKey,
+		label: label('This_month'),
 		range: lastNDays(30),
 	},
 	{
 		key: 'last 30 days',
-		label: 'Last_30_days' as TranslationKey,
+		label: label('Last_30_days'),
 		range: lastNDays(30),
 	},
 	{
 		key: 'last 90 days',
-		label: 'Last_90_days' as TranslationKey,
+		label: label('Last_90_days'),
 		range: lastNDays(90),
 	},
 	{
 		key: 'last 6 months',
-		label: 'Last_6_months' as TranslationKey,
+		label: label('Last_6_months'),
 		range: lastNDays(180),
 	},
 	{
 		key: 'last year',
-		label: 'Last_year' as TranslationKey,
+		label: label('Last_year'),
 		range: lastNDays(365),
 	},
 ] as const;
diff --git a/apps/meteor/client/components/dashboards/usePeriodLabel.ts b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
index 4469015def78..8a8845703a49 100644
--- a/apps/meteor/client/components/dashboards/usePeriodLabel.ts
+++ b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Period } from './periods';
 import { getPeriod } from './periods';
 
 export const usePeriodLabel = (period: Period['key']): string => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
-	return useMemo(() => t(getPeriod(period).label), [period, t]);
+	return useMemo(() => t(...getPeriod(period).label), [period, t]);
 };
diff --git a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
index be07673e6aa6..9bc4f11fd3cd 100644
--- a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
+++ b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
@@ -1,9 +1,9 @@
 import type { DeviceManagementSession, DeviceManagementPopulatedSession, Serialized } from '@rocket.chat/core-typings';
 import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../lib/asyncState';
 import GenericNoResults from '../../GenericNoResults/GenericNoResults';
@@ -37,7 +37,7 @@ const DeviceManagementTable = <T extends DeviceManagementSession | DeviceManagem
 	setItemsPerPage,
 	paginationProps,
 }: DeviceManagementTableProps<T>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (!data && phase === AsyncStatePhase.REJECTED) {
 		return (
diff --git a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
index 3dbc25180a07..fc1c8c72f65b 100644
--- a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
+++ b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
@@ -1,10 +1,10 @@
 import { Banner, Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const LoggedOutBanner = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Banner variant='warning' icon={<Icon name='warning' size='x24' />}>
diff --git a/apps/meteor/client/components/message/IgnoredContent.tsx b/apps/meteor/client/components/message/IgnoredContent.tsx
index 93fa4d391fdc..b2dd7e726667 100644
--- a/apps/meteor/client/components/message/IgnoredContent.tsx
+++ b/apps/meteor/client/components/message/IgnoredContent.tsx
@@ -1,14 +1,14 @@
 import { Box, Icon, MessageBody } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type IgnoredContentProps = {
 	onShowMessageIgnored: () => void;
 };
 
 const IgnoredContent = ({ onShowMessageIgnored }: IgnoredContentProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const showMessageIgnored = (event: React.SyntheticEvent): void => {
 		event.stopPropagation();
diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
index 21a4d8484f8f..487c390a973f 100644
--- a/apps/meteor/client/components/message/MessageHeader.tsx
+++ b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -7,9 +7,9 @@ import {
 	MessageStatusPrivateIndicator,
 	MessageNameContainer,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../lib/getUserDisplayName';
 import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
@@ -27,7 +27,7 @@ type MessageHeaderProps = {
 };
 
 const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const formatTime = useFormatTime();
 	const formatDateAndTime = useFormatDateAndTime();
diff --git a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
index 9ed659b2801f..ac8ae925fbe5 100644
--- a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
+++ b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type ReadReceiptIndicatorProps = {
 	mid: IMessage['_id'];
@@ -10,7 +10,7 @@ type ReadReceiptIndicatorProps = {
 };
 
 const ReadReceiptIndicator = ({ mid, unread }: ReadReceiptIndicatorProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box
diff --git a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
index 378b998a2ee3..2868a1794778 100644
--- a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
+++ b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageBlock, MessageMetrics, MessageMetricsReply } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useChat } from '../../../views/room/contexts/ChatContext';
 
@@ -12,7 +12,7 @@ type BroadcastMetricsProps = {
 };
 
 const BroadcastMetrics = ({ username, message }: BroadcastMetricsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const chat = useChat();
 
diff --git a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
index 3d66580c0270..a14c75761de5 100644
--- a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
+++ b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
@@ -6,9 +6,9 @@ import {
 	MessageMetricsItemLabel,
 	MessageMetricsReply,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
 import { useGoToRoom } from '../../../views/room/hooks/useGoToRoom';
@@ -21,7 +21,7 @@ type DiscussionMetricsProps = {
 };
 
 const DiscussionMetrics = ({ lm, count, rid, drid }: DiscussionMetricsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const format = useTimeAgo();
 
 	const goToRoom = useGoToRoom();
diff --git a/apps/meteor/client/components/message/content/Reactions.tsx b/apps/meteor/client/components/message/content/Reactions.tsx
index d16f6aefb22c..c71afcf3feb1 100644
--- a/apps/meteor/client/components/message/content/Reactions.tsx
+++ b/apps/meteor/client/components/message/content/Reactions.tsx
@@ -1,9 +1,9 @@
 import { useToolbar } from '@react-aria/toolbar';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageReactions, MessageReactionAction } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes, KeyboardEvent, ReactElement } from 'react';
 import React, { useContext, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MessageListContext, useOpenEmojiPicker, useUserHasReacted } from '../list/MessageListContext';
 import Reaction from './reactions/Reaction';
@@ -14,7 +14,7 @@ type ReactionsProps = {
 } & HTMLAttributes<HTMLDivElement>;
 
 const Reactions = ({ message, ...props }: ReactionsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const ref = useRef(null);
 	const hasReacted = useUserHasReacted(message);
 	const openEmojiPicker = useOpenEmojiPicker(message);
diff --git a/apps/meteor/client/components/message/content/actions/MessageAction.tsx b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
index c5b4081dfc5e..7a787cdd7508 100644
--- a/apps/meteor/client/components/message/content/actions/MessageAction.tsx
+++ b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
@@ -1,9 +1,9 @@
 import { Button } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const resolveLegacyIcon = (legacyIcon: IconName | `icon-${IconName | 'videocam'}`): IconName => {
 	if (legacyIcon === 'icon-videocam') {
@@ -23,7 +23,7 @@ type MessageActionProps = {
 };
 
 const MessageAction = ({ icon, methodId, i18nLabel, label, runAction, danger }: MessageActionProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const resolvedIcon = resolveLegacyIcon(icon);
 
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
index 175c41b0f76b..284cb0cecbf2 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Action from '../../Action';
 
 type AttachmentDownloadBaseProps = Omit<ComponentProps<typeof Action>, 'icon'> & { title?: string | undefined; href: string };
 
 const AttachmentDownloadBase = ({ title, href, disabled, ...props }: AttachmentDownloadBaseProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Action
diff --git a/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx b/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
index fbd65900413c..cb61a16ced57 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/image/Load.tsx
@@ -1,15 +1,15 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ImageBox from './ImageBox';
 
 type LoadProps = ComponentPropsWithoutRef<typeof Box> & { load: () => void };
 
 const Load = ({ load, ...props }: LoadProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const clickable = css`
 		cursor: pointer;
 		background: ${Palette.surface['surface-tint']};
diff --git a/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx b/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
index fa959a1dd276..6654800f9e13 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/image/Retry.tsx
@@ -1,14 +1,14 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ImageBox from './ImageBox';
 
 type RetryProps = { retry: () => void };
 
 const Retry = ({ retry }: RetryProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const clickable = css`
 		cursor: pointer;
 		background: ${Palette.surface['surface-tint']};
diff --git a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
index 14697087294e..af449db9a41c 100644
--- a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
+++ b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Action from '../Action';
 
 type CollapsibleContentProps = Omit<ComponentProps<typeof Action>, 'icon'> & { collapsed?: boolean };
 
 const CollapsibleContent = ({ collapsed = false, ...props }: CollapsibleContentProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Action title={collapsed ? t('Uncollapse') : t('Collapse')} icon={!collapsed ? 'chevron-down' : 'chevron-left'} {...props} />;
 };
 
diff --git a/apps/meteor/client/components/message/content/location/MapViewFallback.tsx b/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
index 23c0e98320ff..3e89cb03cec7 100644
--- a/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
+++ b/apps/meteor/client/components/message/content/location/MapViewFallback.tsx
@@ -1,14 +1,14 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MapViewFallbackProps = {
 	linkUrl: string;
 };
 
 const MapViewFallback = ({ linkUrl }: MapViewFallbackProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box is='span' fontScale='p2' display='inline-flex' alignItems='center' paddingBlock={4}>
diff --git a/apps/meteor/client/components/message/content/location/MapViewImage.tsx b/apps/meteor/client/components/message/content/location/MapViewImage.tsx
index 1f94006bd0db..4cf33040938d 100644
--- a/apps/meteor/client/components/message/content/location/MapViewImage.tsx
+++ b/apps/meteor/client/components/message/content/location/MapViewImage.tsx
@@ -1,6 +1,6 @@
 import { ExternalLink } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MapViewImageProps = {
 	linkUrl: string;
@@ -8,7 +8,7 @@ type MapViewImageProps = {
 };
 
 const MapViewImage = ({ linkUrl, imageUrl }: MapViewImageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<ExternalLink to={linkUrl}>
diff --git a/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx b/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
index 0bc8975c80f8..a71f50a953b6 100644
--- a/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
+++ b/apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx
@@ -1,8 +1,8 @@
 import { Skeleton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useGetMessageByID } from '../../../../views/room/contextualBar/Threads/hooks/useGetMessageByID';
 import MarkdownText from '../../../MarkdownText';
@@ -37,7 +37,7 @@ const getTranslationKey = (users: string[], mine: boolean): TranslationKey => {
 };
 
 const ReactionTooltip = ({ emojiName, usernames, mine, messageId, showRealName, username }: ReactionTooltipProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const key = getTranslationKey(usernames, mine);
 
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
index 8761b60cc68f..50f978e243b3 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
@@ -1,7 +1,7 @@
 import { MessageGenericPreview } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MessageCollapsible from '../../MessageCollapsible';
 import OEmbedPreviewContent from './OEmbedPreviewContent';
@@ -10,7 +10,7 @@ import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 type OEmbedCollapsibleProps = { children?: ReactNode } & OEmbedPreviewMetadata;
 
 const OEmbedCollapsible = ({ children, ...props }: OEmbedCollapsibleProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<MessageCollapsible title={t('Link_Preview')}>
diff --git a/apps/meteor/client/components/message/header/MessageRoles.tsx b/apps/meteor/client/components/message/header/MessageRoles.tsx
index 26942e5d04f6..83526f349469 100644
--- a/apps/meteor/client/components/message/header/MessageRoles.tsx
+++ b/apps/meteor/client/components/message/header/MessageRoles.tsx
@@ -1,7 +1,7 @@
 import { MessageRole, MessageRoles as FuselageMessageRoles } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MessageRolesProps = {
 	roles: Array<string>;
@@ -9,7 +9,7 @@ type MessageRolesProps = {
 };
 
 const MessageRoles = ({ roles, isBot }: MessageRolesProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<FuselageMessageRoles>
diff --git a/apps/meteor/client/components/message/notification/MessageNotification.tsx b/apps/meteor/client/components/message/notification/MessageNotification.tsx
index 7dd75ca5ed31..b6d8ac007347 100644
--- a/apps/meteor/client/components/message/notification/MessageNotification.tsx
+++ b/apps/meteor/client/components/message/notification/MessageNotification.tsx
@@ -1,9 +1,9 @@
 import type { Palette } from '@rocket.chat/fuselage';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MessageNotificationProps = {
 	label: TranslationKey;
@@ -11,7 +11,7 @@ type MessageNotificationProps = {
 };
 
 const MessageNotification = ({ label, bg }: MessageNotificationProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Box width='x8' aria-label={t(label)} borderRadius='full' height='x8' bg={bg} />;
 };
 
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 5bf1d8846498..155599c5b51d 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,8 +1,8 @@
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
 
@@ -24,7 +24,7 @@ type MessageActionMenuProps = {
 };
 
 const MessageActionMenu = ({ options, onChangeMenuVisibility, context, isMessageEncrypted }: MessageActionMenuProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const id = useUniqueId();
 	const groupOptions = options
 		.map((option) => ({
diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
index df0d62292422..eeba342c3f31 100644
--- a/apps/meteor/client/components/message/variants/SystemMessage.tsx
+++ b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -13,9 +13,9 @@ import {
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, KeyboardEvent } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
@@ -40,7 +40,7 @@ type SystemMessageProps = {
 } & ComponentProps<typeof MessageSystem>;
 
 const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatTime = useFormatTime();
 	const formatDateAndTime = useFormatDateAndTime();
 	const { triggerProps, openUserCard } = useUserCard();
diff --git a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
index f7fa072a7406..c423d09a9527 100644
--- a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
+++ b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
@@ -13,9 +13,9 @@ import {
 	MessageStatusIndicatorItem,
 } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import {
@@ -42,7 +42,7 @@ const ThreadMessagePreview = ({ message, showUserAvatar, sequential, ...props }:
 	const parentMessage = useParentMessage(message.tmid);
 
 	const translated = useShowTranslated(message);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const isSelecting = useIsSelecting();
 	const toggleSelected = useToggleSelect(message._id);
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
index 3d468f57f464..33bce63745e2 100644
--- a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
+++ b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
@@ -2,9 +2,9 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { isQuoteAttachment, isE2EEMessage } from '@rocket.chat/core-typings';
 import { PreviewMarkup } from '@rocket.chat/gazzodown';
 import type { Root } from '@rocket.chat/message-parser';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GazzodownText from '../../../GazzodownText';
 
@@ -13,7 +13,7 @@ type ThreadMessagePreviewBodyProps = {
 };
 
 const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isEncryptedMessage = isE2EEMessage(message);
 
 	const getMessage = () => {
diff --git a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
index 3d6f4be8c0fc..615fee8714aa 100644
--- a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
+++ b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
@@ -1,14 +1,14 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Avatar, Box, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserAvatarURL } from '../../../../app/utils/client';
 import { parseOutboundPhoneNumber } from '../../../lib/voip/parseOutboundPhoneNumber';
 
 export const VoipRoomForeword = ({ room }: { room: IVoipRoom }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const avatarUrl = getUserAvatarURL(room.name) as string;
 
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.ts b/apps/meteor/client/hooks/useDecryptedMessage.ts
index aa36ba1d34fd..ea3cf3cc62a9 100644
--- a/apps/meteor/client/hooks/useDecryptedMessage.ts
+++ b/apps/meteor/client/hooks/useDecryptedMessage.ts
@@ -1,13 +1,13 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 
 export const useDecryptedMessage = (message: IMessage): string => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [decryptedMessage, setDecryptedMessage] = useSafely(useState(t('E2E_message_encrypted_placeholder')));
 
 	useEffect(() => {
diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
index c6a55716df65..199d1507e284 100644
--- a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
+++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
@@ -1,6 +1,5 @@
 import { Emitter } from '@rocket.chat/emitter';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import type { TFunction } from 'i18next';
 import { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -18,7 +17,7 @@ if ('serviceWorker' in navigator) {
 	});
 }
 
-export const registerDownloadForUid = (uid: string, t: TFunction, title?: string) => {
+export const registerDownloadForUid = (uid: string, t: ReturnType<typeof useTranslation>['t'], title?: string) => {
 	ee.once(uid, ({ result }) => {
 		downloadAs({ data: [new Blob([result])] }, title ?? t('Download'));
 	});
diff --git a/apps/meteor/client/hooks/useFormatDuration.ts b/apps/meteor/client/hooks/useFormatDuration.ts
index 807190c63f5e..61215074dfbd 100644
--- a/apps/meteor/client/hooks/useFormatDuration.ts
+++ b/apps/meteor/client/hooks/useFormatDuration.ts
@@ -1,8 +1,8 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const useFormatDuration = (): ((duration: number) => string) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return useCallback(
 		(duration) => {
diff --git a/apps/meteor/client/hooks/useHighlightedCode.ts b/apps/meteor/client/hooks/useHighlightedCode.ts
index e059bf3f1181..4e3405ca3034 100644
--- a/apps/meteor/client/hooks/useHighlightedCode.ts
+++ b/apps/meteor/client/hooks/useHighlightedCode.ts
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import hljs, { register } from '../../app/markdown/lib/hljs';
 
 export function useHighlightedCode(language: string, text: string): string {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { isLoading } = useQuery(['register-highlight-language', language], async () => {
 		try {
 			await register(language);
diff --git a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index 640dbd375288..a158a13f9711 100644
--- a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -1,15 +1,15 @@
 import { Field, FieldLabel, FieldRow, FieldError, TextInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const BusinessHoursMultiple = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		control,
 		formState: { errors },
diff --git a/apps/meteor/client/omnichannel/additionalForms/ContactManager.js b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
index f92c4720a213..52ab527ef841 100644
--- a/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
+++ b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
@@ -1,12 +1,12 @@
 import { Field } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../components/AutoCompleteAgent';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 export const ContactManager = ({ value: userId, handler }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
 	if (!hasLicense) {
diff --git a/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
index 8ee9cf6ddbf9..d6c78c3c043c 100644
--- a/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
@@ -1,10 +1,10 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, FieldHint, ToggleSwitch, TextInput, Select } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
@@ -17,7 +17,7 @@ const checkIsOptionsValid = (value: string) => {
 };
 
 const CustomFieldsAdditionalForm = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		control,
 		watch,
diff --git a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
index e65e4da01b96..47ee87f7ee2a 100644
--- a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
@@ -2,8 +2,8 @@ import { Field, FieldLabel, FieldRow, FieldHint, Box, PaginatedMultiSelectFilter
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useDepartmentsList } from '../../components/Omnichannel/hooks/useDepartmentsList';
 import { useRecordList } from '../../hooks/lists/useRecordList';
@@ -18,7 +18,7 @@ type DepartmentForwardingProps = {
 };
 
 export const DepartmentForwarding = ({ departmentId, value = [], handler, label }: DepartmentForwardingProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
index dda85c9ff08b..75a2656dc4ea 100644
--- a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
@@ -1,14 +1,14 @@
 import { NumberInput, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const MaxChatsPerAgent = ({ className }: { className?: ComponentProps<typeof Field>['className'] }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control } = useFormContext();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
index b628d2622649..8d68f0ec29f3 100644
--- a/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { InfoPanelLabel, InfoPanelText } from '../../components/InfoPanel';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 const MaxChatsPerAgentDisplay = ({ maxNumberSimultaneousChat = 0 }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
 	if (!hasLicense) {
diff --git a/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
index 3ad0b25b10d6..da157e06b3f0 100644
--- a/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
@@ -3,9 +3,9 @@ import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Options, Box, Option, Field, FieldLabel, FieldRow, SelectLegacy } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback, forwardRef, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import { PriorityIcon } from '../priorities/PriorityIcon';
@@ -18,7 +18,7 @@ type PrioritiesSelectProps = {
 };
 
 export const PrioritiesSelect = ({ value = '', label, options, onChange }: PrioritiesSelectProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const [sorting] = useState<Record<string, LivechatPriorityWeight>>({});
 
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
index 6f57a29e116f..90dd6bd4ed32 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelCannedResponse, Serialized } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../components/Skeleton';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
@@ -12,7 +12,7 @@ const CannedResponseEditWithDepartmentData = ({ cannedResponseData }: { cannedRe
 	const departmentId = useMemo(() => cannedResponseData?.departmentId, [cannedResponseData]) as string;
 	const { value: departmentData, phase: state, error } = useEndpointData('/v1/livechat/department/:_id', { keys: { _id: departmentId } });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (state === AsyncStatePhase.LOADING) {
 		return <FormSkeleton />;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
index bb869189e1ba..4746e7df6bea 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../components/AutoCompleteAgent';
 
@@ -18,7 +18,7 @@ type CannedResponsesFilterProps = {
 };
 
 const CannedResponsesFilter = ({ createdBy, setCreatedBy, sharing, setSharing, text, setText }: CannedResponsesFilterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sharingList: SelectOption[] = [
 		['', t('All')],
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
index 7e59aaa7cf8e..54ce88cccb7e 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Divider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, RefObject, SetStateAction } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type InsertPlaceholderDropdownProps = {
 	onChange: any;
@@ -11,7 +11,7 @@ type InsertPlaceholderDropdownProps = {
 };
 
 const InsertPlaceholderDropdown = ({ onChange, textAreaRef, setVisible }: InsertPlaceholderDropdownProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const clickable = css`
 		cursor: pointer;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
index e4ed5f58ef8c..6bef3f10efdc 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
@@ -1,8 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEventHandler } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -37,7 +37,7 @@ const CannedResponse = ({
 	onClickEdit,
 	onClickUse,
 }: CannedResponseProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const scope = useScopeDict(dataScope, departmentName);
 
 	return (
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
index 5734cf2e93bf..cd9907f271a5 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
@@ -1,9 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, ContextualbarEmptyContent, Icon, Margins, Select, TextInput } from '@rocket.chat/fuselage';
 import { useAutoFocus, useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, FormEventHandler, MouseEvent, ReactElement, SetStateAction } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -54,7 +54,7 @@ const CannedResponseList = ({
 	onClickUse,
 	reload,
 }: CannedResponseListProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 
 	const { context: cannedId } = useRoomToolbox();
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
index 29b4e4326dd1..224e0c5dff55 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
@@ -1,9 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { memo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useScopeDict } from '../../../hooks/useScopeDict';
 
@@ -15,7 +15,7 @@ type ItemProps = {
 };
 
 const Item = ({ data, allowUse, onClickItem, onClickUse }: ItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const scope = useScopeDict(data.scope, data.departmentName);
 
diff --git a/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
index df449a21f64e..749f40d28a60 100644
--- a/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
+++ b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useIsRoomOverMacLimit } from '../../../hooks/omnichannel/useIsRoomOverMacLimit';
 
@@ -11,7 +11,7 @@ type RoomActivityIconProps = {
 };
 
 export const RoomActivityIcon = ({ room }: RoomActivityIconProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isRoomOverMacLimit = useIsRoomOverMacLimit(room);
 
 	return isRoomOverMacLimit ? (
diff --git a/apps/meteor/client/omnichannel/hooks/useScopeDict.ts b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
index ffab5d55aaf0..da8fd60b7360 100644
--- a/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
+++ b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
@@ -1,8 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 export const useScopeDict = (scope: IOmnichannelCannedResponse['scope'], departmentName: ILivechatDepartment['name']): string => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const dict: Record<string, string> = {
 		global: t('Public'),
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
index cbf2e6ec88ff..dffbde494e7a 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import MonitorsTable from './MonitorsTable';
 
 const MonitorsPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page flexDirection='row'>
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
index 5d8c55d5330c..a85dd72c868d 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -10,7 +10,7 @@ type PrioritiesResetModalProps = {
 };
 
 export const PrioritiesResetModal = ({ onCancel, onReset }: PrioritiesResetModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
index 008147d49e1b..7e5368d7a0a5 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
@@ -1,7 +1,7 @@
 import type { ILivechatPriority, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../components/GenericNoResults';
 import {
@@ -22,7 +22,7 @@ type PrioritiesTableProps = {
 };
 
 export const PrioritiesTable = ({ priorities, onRowClick, isLoading }: PrioritiesTableProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const headers = (
 		<>
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
index b0232c6076a6..fec79d762bcd 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
@@ -1,7 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../components/Skeleton';
 import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo';
@@ -13,7 +13,7 @@ type PriorityEditFormWithDataProps = Omit<PriorityEditFormProps, 'data'> & {
 };
 
 function PriorityEditFormWithData({ priorityId, ...props }: PriorityEditFormWithDataProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isInitialLoading, isError } = usePriorityInfo(priorityId);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
index 8aac2a73f85c..7f6a486436a3 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
@@ -2,9 +2,9 @@ import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import { Box, Icon, Palette, StatusBullet } from '@rocket.chat/fuselage';
 import type { Keys } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
 
@@ -37,7 +37,7 @@ const PRIORITY_ICONS: Record<number, { iconName: Keys; color: string }> = {
 };
 
 export const PriorityIcon = ({ level, size = 20, showUnprioritized = false, ...props }: PriorityIconProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { iconName, color } = PRIORITY_ICONS[level] || {};
 	const { data: priorities } = useOmnichannelPriorities();
 
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
index 16091476d10c..e31fc3a44a5a 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -21,7 +21,7 @@ type PriorityListProps = {
 };
 
 const PriorityList = ({ priorityId, onClose, onSave }: PriorityListProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<ContextualbarDialog>
diff --git a/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx b/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
index 2feb7ca01439..90b838758234 100644
--- a/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/AgentsTable.tsx
@@ -1,6 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	GenericTable,
@@ -22,7 +22,7 @@ type AgentsTableProps = {
 };
 
 export const AgentsTable = memo(({ data, sortBy, sortDirection, setSort }: AgentsTableProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const onHeaderClick = useMutableCallback((id) => {
 		setSort(id, sortDirection === 'asc' ? 'desc' : 'asc');
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
index 2df983140748..e0253f11665c 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCardEmptyState.tsx
@@ -1,7 +1,7 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
 import type { Keys } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type CardEmpryStateProps = {
 	icon?: Keys;
@@ -9,7 +9,7 @@ type CardEmpryStateProps = {
 };
 
 export const ReportCardEmptyState = ({ icon, subtitle }: CardEmpryStateProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<States width='100%' height='100%'>
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
index b8168e366299..023a4b5c918b 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCardErrorState.tsx
@@ -1,14 +1,14 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type ReportCardErrorStateProps = {
 	onRetry?: () => void;
 };
 
 export const ReportCardErrorState = ({ onRetry }: ReportCardErrorStateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<States width='100%' height='100%'>
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
index 23a6c21d33d8..4ca7066bbc08 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
@@ -1,7 +1,6 @@
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
 import { getPeriodRange } from '../../../components/dashboards/periods';
@@ -17,7 +16,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useAgentsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-agents-period', PERIOD_OPTIONS);
 	const getConversationsByAgent = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-agent');
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'total'>('total', 'desc');
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
index 864181a6464e..ce13de2f546e 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
@@ -1,10 +1,8 @@
 import { capitalize } from '@rocket.chat/string-helpers';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -23,7 +21,7 @@ const TYPE_LABEL: Record<string, TranslationKey> = {
 	'api': 'Custom_Integration',
 };
 
-const formatItem = (item: { label: string; value: number }, total: number, t: TFunction): DataItem => {
+const formatItem = (item: { label: string; value: number }, total: number, t: TranslationContextValue['translate']): DataItem => {
 	const percentage = total > 0 ? round((item.value / total) * 100) : 0;
 	const label = `${t(TYPE_LABEL[item.label]) || capitalize(item.label)}`;
 	return {
@@ -34,12 +32,12 @@ const formatItem = (item: { label: string; value: number }, total: number, t: TF
 	};
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
 	return data.map((item) => formatItem(item, total, t));
 };
 
 export const useChannelsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-channels-period', PERIOD_OPTIONS);
 	const getConversationsBySource = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-source');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
index f185e347e8d5..d0cf335c09d9 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDefaultDownload.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Period } from '../../../components/dashboards/periods';
 import { formatAttachmentName } from '../utils/formatAttachmentName';
@@ -13,7 +13,7 @@ type DefaultDownloadHookProps = {
 };
 
 export const useDefaultDownload = ({ columnName, title, period, data }: DefaultDownloadHookProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useMemo(() => {
 		const { start, end } = formatPeriodRange(period);
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
index fe4bfaf7d723..0e207c3d113a 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
@@ -1,7 +1,6 @@
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -16,7 +15,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useDepartmentsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-department-period', PERIOD_OPTIONS);
 	const getConversationsByDepartment = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-department');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
index d8f17dd5b79f..3c725f9bc85b 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
@@ -1,9 +1,7 @@
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -19,7 +17,7 @@ const STATUSES: Record<string, { label: TranslationKey; color: string }> = {
 	Closed: { label: 'Omnichannel_Reports_Status_Closed', color: COLORS.danger },
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
 	return data.map((item) => {
 		const status = STATUSES[item.label];
 		const percentage = total > 0 ? round((item.value / total) * 100) : 0;
@@ -35,7 +33,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 };
 
 export const useStatusSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-status-period', PERIOD_OPTIONS);
 	const getConversationsByStatus = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-status');
 	const { start, end } = getPeriodRange(period);
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
index 93fe56b96b8d..5688fc24c6b5 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
@@ -1,8 +1,7 @@
 import { Palette } from '@rocket.chat/fuselage';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
@@ -24,7 +23,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useTagsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-tags-period', PERIOD_OPTIONS);
 	const getConversationsByTags = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-tags');
 
diff --git a/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx b/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
index 11dbecccfab7..692bd1c33032 100644
--- a/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/sections/AgentsSection.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AgentsTable, BarChart, ReportCard } from '../components';
 import { useAgentsSection } from '../hooks';
@@ -11,7 +11,7 @@ const BREAKPOINT = 768;
 
 export const AgentsSection = () => {
 	const { data, sortBy, sortDirection, setSort, ...config } = useAgentsSection();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { ref, contentBoxSize: { inlineSize: cardWidth = 200 } = {} } = useResizeObserver<HTMLElement>();
 	const width = cardWidth * 0.9;
diff --git a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
index 6874c551da52..ab12af6af1cf 100644
--- a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
+++ b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
@@ -1,8 +1,8 @@
-import type { TFunction } from 'i18next';
+import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 
 import { getPeriod, type Period } from '../../../components/dashboards/periods';
 
-export const formatPeriodDescription = (periodKey: Period['key'], t: TFunction) => {
+export const formatPeriodDescription = (periodKey: Period['key'], t: TranslationContextValue['translate']) => {
 	const { label } = getPeriod(periodKey);
-	return t(label).toLocaleLowerCase();
+	return t(...label).toLocaleLowerCase();
 };
diff --git a/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
index 4b6d6d395523..9f0a21086868 100644
--- a/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
+++ b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
@@ -1,8 +1,8 @@
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
@@ -23,7 +23,7 @@ const AutoCompleteTagsMultiple = ({
 	department,
 	viewAll = false,
 }: AutoCompleteTagsMultipleProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [tagsFilter, setTagsFilter] = useState('');
 
 	const debouncedTagsFilter = useDebouncedValue(tagsFilter, 500);
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx b/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
index 791c2189ec6b..6779fb8d6c82 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListWrapper.tsx
@@ -1,12 +1,12 @@
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes, Ref } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from './useSidebarListNavigation';
 
 const RoomListWrapper = forwardRef(function RoomListWrapper(props: HTMLAttributes<HTMLDivElement>, ref: Ref<HTMLDivElement>) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
 
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
index 1f66217d76e5..bf7736b5899a 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useLicense, useLicenseName } from '../../hooks/useLicense';
 
 export const SidebarFooterWatermark = (): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const response = useLicense();
 
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
index ba7bbd977e03..119476ecd89a 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -2,9 +2,9 @@ import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-t
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
@@ -50,7 +50,7 @@ export const VoipFooter = ({
 	options,
 }: VoipFooterPropsType): ReactElement => {
 	const contactLabel = useOmnichannelContactLabel(caller);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const cssClickable =
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
index 43e6be7c583d..8f0a26222679 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../components/GenericNoResults';
 
 const FederatedRoomListEmptyPlaceholder = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
index fd37aac816f4..f3307436bc07 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListErrorBoundaryProps = {
 	children?: ReactNode;
@@ -11,7 +11,7 @@ type FederatedRoomListErrorBoundaryProps = {
 };
 
 const FederatedRoomListErrorBoundary = ({ children, resetKeys }: FederatedRoomListErrorBoundaryProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<QueryErrorResetBoundary>
 			{({ reset }): ReactElement => (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
index c096c74c08a4..01cb22c2e1c5 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx
@@ -2,8 +2,8 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListItemProps = IFederationPublicRooms & {
 	disabled: boolean;
@@ -23,7 +23,7 @@ const FederatedRoomListItem = ({
 	canJoin,
 	disabled,
 }: FederatedRoomListItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const nameId = useUniqueId();
 
 	return (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
index 0108958e3e64..741eadf7bc7e 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx
@@ -1,7 +1,7 @@
 import { Modal, Skeleton } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearchModalContent from './MatrixFederationSearchModalContent';
 import { useMatrixServerList } from './useMatrixServerList';
@@ -12,7 +12,7 @@ type MatrixFederationSearchProps = {
 };
 
 const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading } = useMatrixServerList();
 	const titleId = useUniqueId();
 
diff --git a/apps/meteor/client/sidebar/header/UserMenu.tsx b/apps/meteor/client/sidebar/header/UserMenu.tsx
index 7d964c2122bc..b106caa20b16 100644
--- a/apps/meteor/client/sidebar/header/UserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenu.tsx
@@ -7,15 +7,15 @@ import {
 	useHandleMenuAction,
 	type GenericMenuItemProps,
 } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import UserAvatarWithStatus from './UserAvatarWithStatus';
 import UserAvatarWithStatusUnstable from './UserAvatarWithStatusUnstable';
 import { useUserMenu } from './hooks/useUserMenu';
 
 const UserMenu = ({ user }: { user: IUser }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [isOpen, setIsOpen] = useState(false);
 
 	const sections = useUserMenu(user);
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index 14c9f2cc83c5..a0016db7e75c 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type AdministrationProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Administration = (props: AdministrationProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useAdministrationMenu();
 
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
index 3a59b0adea43..3392db4ed917 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const CreateRoom = (props: CreateRoomProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useCreateRoom();
 
diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx
index e4d1d66cf3af..1fe4b947c661 100644
--- a/apps/meteor/client/sidebar/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx
@@ -1,15 +1,15 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Sort = (props: SortProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useSortMenu();
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
index 23f71d67ebc5..cf71cf4223b9 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
@@ -1,12 +1,12 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { useAdministrationItems } from './useAdministrationItems';
 import { useAppsItems } from './useAppsItems';
 import { useAuditItems } from './useAuditItems';
 
 export const useAdministrationMenu = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const administrationItems = useAdministrationItems();
 	const appItems = useAppsItems();
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
index cd0abc9bdfb2..7e628378749d 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
@@ -1,5 +1,5 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
@@ -9,7 +9,7 @@ export const useMatrixFederationItems = ({
 }: {
 	isMatrixEnabled: string | number | boolean | null | undefined;
 }): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const searchFederatedRooms = useCreateRoomModal(MatrixFederationSearch);
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
index af6a73ce6eab..bea1d999997e 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { useGroupingListItems } from './useGroupingListItems';
 import { useSortModeItems } from './useSortModeItems';
 import { useViewModeItems } from './useViewModeItems';
 
 export const useSortMenu = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const viewModeItems = useViewModeItems();
 	const sortModeItems = useSortModeItems();
diff --git a/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx b/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
index c2578d076f1a..53cbd0340339 100644
--- a/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
+++ b/apps/meteor/client/sidebar/sections/OverMacLimitSection.tsx
@@ -1,10 +1,10 @@
 import { Icon, SidebarBanner } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const OverMacLimitSection = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleClick = () => {
 		window.open('https://rocket.chat/pricing', '_blank');
diff --git a/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
index c8f56ffe5458..fb12c3e6fc3b 100644
--- a/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebar/sections/StatusDisabledSection.tsx
@@ -1,11 +1,11 @@
 import { SidebarBanner } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useStatusDisabledModal } from '../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
 const StatusDisabledSection = ({ onDismiss }: { onDismiss: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
index e0fa30ca2345..2cd263630da7 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
@@ -1,13 +1,13 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../contexts/CallContext';
 import { useDialModal } from '../../../hooks/useDialModal';
 
 export const OmniChannelCallDialPad = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
index dd5186aeb479..77efcd5057e1 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const OmnichannelCallToggleError = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Sidebar.TopBar.Action icon='phone' danger data-tooltip={t('Error')} disabled {...props} />;
 };
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
index 8318e9199900..673a3225482c 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const OmnichannelCallToggleLoading = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <Sidebar.TopBar.Action icon='phone' data-tooltip={t('Loading')} aria-label={t('VoIP_Toggle')} disabled {...props} />;
 };
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
index 8205d0287768..497e0143bfaa 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
@@ -1,12 +1,12 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../../contexts/CallContext';
 
 export const OmnichannelCallToggleReady = ({ ...props }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const caller = useCallerInfo();
 	const unregister = useCallUnregisterClient();
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
index 09e80f12765c..b4d4b4a44c98 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListWrapper.tsx
@@ -1,14 +1,14 @@
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ForwardedRef, HTMLAttributes } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from './useSidebarListNavigation';
 
 type RoomListWrapperProps = HTMLAttributes<HTMLDivElement>;
 
 const RoomListWrapper = forwardRef(function RoomListWrapper(props: RoomListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
 
diff --git a/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
index 1f66217d76e5..bf7736b5899a 100644
--- a/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebarv2/footer/SidebarFooterWatermark.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useLicense, useLicenseName } from '../../hooks/useLicense';
 
 export const SidebarFooterWatermark = (): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const response = useLicense();
 
diff --git a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
index 9344ba33c9ad..6e67baefdec8 100644
--- a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
@@ -2,9 +2,9 @@ import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-t
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
@@ -50,7 +50,7 @@ const VoipFooter = ({
 	options,
 }: VoipFooterProps): ReactElement => {
 	const contactLabel = useOmnichannelContactLabel(caller);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const cssClickable =
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
index 43e6be7c583d..8f0a26222679 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListEmptyPlaceholder.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../components/GenericNoResults';
 
 const FederatedRoomListEmptyPlaceholder = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
index 1608058528bc..6931c98f219e 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListErrorBoundary.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListErrorBoundaryProps = {
 	children?: ReactNode;
@@ -11,7 +11,7 @@ type FederatedRoomListErrorBoundaryProps = {
 };
 
 const FederatedRoomListErrorBoundary = ({ children, resetKeys }: FederatedRoomListErrorBoundaryProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<QueryErrorResetBoundary>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
index 002c8a5ac9da..dfaa79ed44de 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomListItem.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FederatedRoomListItemProps = IFederationPublicRooms & {
 	disabled: boolean;
@@ -22,7 +22,7 @@ const FederatedRoomListItem = ({
 	canJoin,
 	disabled,
 }: FederatedRoomListItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mb={16} pi={24} is='li' display='flex' flexDirection='column' w='full' name={canonicalAlias}>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
index 9ea119aabb18..f3dc779d28c1 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearch.tsx
@@ -1,6 +1,6 @@
 import { Modal, Skeleton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MatrixFederationSearchModalContent from './MatrixFederationSearchModalContent';
 import { useMatrixServerList } from './useMatrixServerList';
@@ -11,7 +11,7 @@ type MatrixFederationSearchProps = {
 };
 
 const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading } = useMatrixServerList();
 
 	return (
diff --git a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
index 5c56b44554b8..f12de10f19f9 100644
--- a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
@@ -1,15 +1,15 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const CreateRoom = (props: CreateRoomProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useCreateRoom();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
index dcfa84dd71bc..d5394c28c6e6 100644
--- a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
@@ -1,15 +1,15 @@
 import { SidebarV2Action } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Sort = (props: SortProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const sections = useSortMenu();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
index cd0abc9bdfb2..7e628378749d 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
@@ -1,5 +1,5 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
@@ -9,7 +9,7 @@ export const useMatrixFederationItems = ({
 }: {
 	isMatrixEnabled: string | number | boolean | null | undefined;
 }): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const searchFederatedRooms = useCreateRoomModal(MatrixFederationSearch);
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
index af6a73ce6eab..bea1d999997e 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortMenu.tsx
@@ -1,11 +1,11 @@
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { useGroupingListItems } from './useGroupingListItems';
 import { useSortModeItems } from './useSortModeItems';
 import { useViewModeItems } from './useViewModeItems';
 
 export const useSortMenu = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const viewModeItems = useViewModeItems();
 	const sortModeItems = useSortModeItems();
diff --git a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
index 9994a0e66e77..a0f3245e8835 100644
--- a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
@@ -1,13 +1,13 @@
 import { SidebarV2Banner } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useStatusDisabledModal } from '../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
 type StatusDisabledSectionProps = { onDismiss: () => void };
 
 const StatusDisabledSection = ({ onDismiss }: StatusDisabledSectionProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
diff --git a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
index 2ecb46e44ee7..ac98cd15cd89 100644
--- a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
@@ -1,6 +1,5 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { TranslationContext } from '@rocket.chat/ui-contexts';
-import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import type { ContextType, ReactElement, ReactNode } from 'react';
 import React, { useContext, useMemo } from 'react';
@@ -31,7 +30,7 @@ const TranslationContextMock = ({ children }: TranslationContextMockProps): Reac
 		const translate = (key: string, ...replaces: unknown[]): string => {
 			if (typeof replaces[0] === 'object' && replaces[0] !== null) {
 				const [options] = replaces;
-				return i18next.t(key, options as TOptions);
+				return i18next.t(key, options);
 			}
 
 			if (replaces.length === 0) {
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
index d1af15f59711..30979e2a81d8 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import DeviceManagementAccountTable from './DeviceManagementAccountTable';
 
 const DeviceManagementAccountPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
index 76556a238bac..e2532d0c6623 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
@@ -1,8 +1,8 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
 import DeviceIcon from '../../../../components/deviceManagement/DeviceIcon';
@@ -26,7 +26,7 @@ const DeviceManagementAccountRow = ({
 	loginAt,
 	onReload,
 }: DevicesRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index 411f9ad02e6f..5039521fa622 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -1,7 +1,7 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -17,7 +17,7 @@ const sortMapping = {
 };
 
 const DeviceManagementAccountTable = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'client' | 'os' | 'loginAt'>('loginAt');
 
diff --git a/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx b/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
index ca6872b0165a..2f58ed305be4 100644
--- a/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
+++ b/apps/meteor/client/views/account/omnichannel/PreferencesGeneral.tsx
@@ -1,12 +1,12 @@
 import { Field, FieldGroup, FieldHint, FieldLabel, FieldRow, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 export const PreferencesGeneral = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { register } = useFormContext();
 	const omnichannelHideAfterClosing = useUniqueId();
 
diff --git a/apps/meteor/client/views/account/preferences/MyDataModal.tsx b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
index 75b1e67b324e..8889a1a44a53 100644
--- a/apps/meteor/client/views/account/preferences/MyDataModal.tsx
+++ b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Box, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MyDataModalProps = {
 	onCancel: () => void;
@@ -10,7 +10,7 @@ type MyDataModalProps = {
 };
 
 const MyDataModal = ({ onCancel, title, text, ...props }: MyDataModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal {...props}>
diff --git a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
index e987f78266b6..85bfc9072b12 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
@@ -1,11 +1,11 @@
 import { Accordion, Field, FieldGroup, FieldLabel, FieldRow, FieldHint, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 const PreferencesHighlightsSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { register } = useFormContext();
 
 	const highlightsId = useUniqueId();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
index c7e5bdf5aece..b8b4366cf4ff 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
@@ -1,12 +1,12 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { FieldRow, FieldLink, FieldHint, FieldLabel, Accordion, Field, Select, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 const PreferencesMessagesSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control } = useFormContext();
 
 	const alsoSendThreadMessageToChannelOptions = useMemo(
diff --git a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
index edfece178e52..02a04d0b2c59 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
@@ -1,11 +1,11 @@
 import { Accordion, Field, FieldLabel, FieldRow, NumberInput, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 const PreferencesUserPresenceSection = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { register, control } = useFormContext();
 
 	const enableAutoAwayId = useUniqueId();
diff --git a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
index d9e25d6d625e..01c9e1b77fb6 100644
--- a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
+++ b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
@@ -1,6 +1,6 @@
 import { Box, PasswordInput, TextInput, FieldGroup, Field, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
@@ -11,7 +11,7 @@ type ActionConfirmModalProps = {
 };
 
 const ActionConfirmModal = ({ isPassword, onConfirm, onCancel }: ActionConfirmModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [inputText, setInputText] = useState('');
 	const [inputError, setInputError] = useState<string | undefined>();
 
diff --git a/apps/meteor/client/views/account/security/BackupCodesModal.tsx b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
index de3457902b7a..eb97fb10cd7f 100644
--- a/apps/meteor/client/views/account/security/BackupCodesModal.tsx
+++ b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
@@ -1,6 +1,6 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import TextCopy from '../../../components/TextCopy';
 
@@ -10,7 +10,7 @@ type BackupCodesModalProps = {
 };
 
 const BackupCodesModal = ({ codes, onClose, ...props }: BackupCodesModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const codesText = useMemo(() => codes.join(' '), [codes]);
 
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
index abf45ebedcb9..9885b0bd3b86 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AccountTokensTable from './AccountTokensTable';
 
 const AccountTokensPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
index e4e9db4a8fad..5158d31d2470 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
@@ -1,7 +1,7 @@
 import type { IPersonalAccessToken, Serialized } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
@@ -13,7 +13,7 @@ type AccountTokensRowProps = {
 } & Serialized<Pick<IPersonalAccessToken, 'name' | 'createdAt' | 'lastTokenPart' | 'bypassTwoFactor'>>;
 
 const AccountTokensRow = ({ bypassTwoFactor, createdAt, isMedium, lastTokenPart, name, onRegenerate, onRemove }: AccountTokensRowProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const handleRegenerate = useCallback(() => onRegenerate(name), [name, onRegenerate]);
 	const handleRemove = useCallback(() => onRemove(name), [name, onRemove]);
diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index f6f52507d33a..1824a9ee6ab4 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import { useEndpointUpload } from '../../../hooks/useEndpointUpload';
@@ -13,7 +13,7 @@ type AddCustomEmojiProps = {
 };
 
 const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [name, setName] = useState('');
 	const [aliases, setAliases] = useState('');
 	const [emojiFile, setEmojiFile] = useState<Blob>();
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
index fa97324a5722..776e04fe1f69 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserActiveConnections.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage, GenericResourceUsageSkeleton } from '../../../components/GenericResourceUsage';
 import { useActiveConnections } from '../../hooks/useActiveConnections';
 
 const CustomUserActiveConnections = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const result = useActiveConnections();
 
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
index b54c2181d76f..510d2d9303f4 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusDisabledModal.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
 type CustomUserStatusDisabledModalProps = { isAdmin: boolean; onConfirm: () => void; onClose: () => void };
 
 const CustomUserStatusDisabledModal = ({ isAdmin, onConfirm, onClose }: CustomUserStatusDisabledModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return isAdmin ? (
 		<GenericModal
 			title={t('User_status_disabled_learn_more')}
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index 84037afdcab8..ebd1e762ff80 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -1,8 +1,8 @@
 import type { DeviceManagementPopulatedSession, DeviceManagementSession, Serialized } from '@rocket.chat/core-typings';
 import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
@@ -24,7 +24,7 @@ const isSessionPopulatedSession = (
 ): session is Serialized<DeviceManagementPopulatedSession> => '_user' in session;
 
 const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject<() => void> }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [text, setText] = useState('');
 	const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'client' | 'os' | 'username' | 'loginAt'>('username');
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
index f884b27e0cb1..5f78269fca57 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
@@ -1,8 +1,8 @@
 import type { Serialized, DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -27,7 +27,7 @@ const convertSessionFromAPI = ({
 });
 
 const DeviceInfoWithData = ({ deviceId, onReload }: { deviceId: string; onReload: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const {
 		value: data,
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
index 0f20e716b3b1..f95e2b009a26 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
@@ -1,16 +1,16 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 type EngagementDashboardCardErrorBoundaryProps = {
 	children?: ReactNode;
 };
 
 const EngagementDashboardCardErrorBoundary = ({ children }: EngagementDashboardCardErrorBoundaryProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [error, setError] = useState<Error>();
 	const isError = (error: unknown): error is Error => error instanceof Error;
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
index 95de437462a5..78f1585f0f4b 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
@@ -1,7 +1,7 @@
 import { Box, Select, Tabs } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
 import ChannelsTab from './channels/ChannelsTab';
@@ -14,7 +14,7 @@ type EngagementDashboardPageProps = {
 };
 
 const EngagementDashboardPage = ({ tab = 'users', onSelectTab }: EngagementDashboardPageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const timezoneOptions = useMemo<[timezone: 'utc' | 'local', label: string][]>(
 		() => [
diff --git a/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
index 6283d5000825..a92b2c6d3295 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
@@ -1,8 +1,8 @@
 import { Icon, Margins, Pagination, Skeleton, Table, TableBody, TableCell, TableHead, TableRow, Tile } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -14,7 +14,7 @@ import { useChannelsList } from './useChannelsList';
 const ChannelsOverview = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
@@ -121,10 +121,7 @@ const ChannelsOverview = (): ReactElement => {
 					itemsPerPage={itemsPerPage}
 					itemsPerPageLabel={(): string => t('Items_per_page:')}
 					showingResultsLabel={({ count, current, itemsPerPage }): string =>
-						t('Showing_results_of', {
-							postProcess: 'sprintf',
-							sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-						})
+						t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count)
 					}
 					count={data?.total || 0}
 					onSetItemsPerPage={setItemsPerPage}
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
index 88fad25990d0..0d9f7c2e77db 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
@@ -14,9 +14,9 @@ import {
 	TableBody,
 	TableCell,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -34,7 +34,7 @@ const colors = {
 const MessagesPerChannelSection = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data: messageOriginsData } = useMessageOrigins({ period });
 	const { data: topFivePopularChannelsData } = useTopFivePopularChannels({ period });
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
index 5eca6c046568..7cf46ebc476a 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, Skeleton, Palette, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -18,7 +18,7 @@ const MessagesSentSection = (): ReactElement => {
 	const [period, periodSelectorProps] = usePeriodSelectorState('last 7 days', 'last 30 days', 'last 90 days');
 	const periodLabel = usePeriodLabel(period);
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data } = useMessagesSent({ period });
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
index 616e63a04351..1e12d982d8b6 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
@@ -1,13 +1,13 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import MessagesPerChannelSection from './MessagesPerChannelSection';
 import MessagesSentSection from './MessagesSentSection';
 
 const MessagesTab = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
index 7ac1b7c91289..80359837b627 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveLine } from '@nivo/line';
 import { Box, Flex, Skeleton, Tile } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import CounterSet from '../../../../components/dataView/CounterSet';
@@ -101,7 +101,7 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement
 	}, [data, utc]);
 
 	const formatDate = useFormatDate();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
index 4af3d8f9200a..f70acde3a8e4 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
@@ -1,7 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import ContentForDays from './ContentForDays';
@@ -14,7 +14,7 @@ type BusiestChatTimesSectionProps = {
 };
 
 const BusiestChatTimesSection = ({ timezone }: BusiestChatTimesSectionProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [timeUnit, setTimeUnit] = useState<TimeUnit>('hours');
 	const timeUnitOptions = useMemo<[timeUnit: TimeUnit, label: string][]>(
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
index 83753769cc91..2114bd9208d9 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
@@ -2,10 +2,10 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Button, Chevron, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHourlyChatActivity } from './useHourlyChatActivity';
 
@@ -20,7 +20,7 @@ const ContentForHours = ({ displacement, onPreviousDateClick, onNextDateClick, t
 	const utc = timezone === 'utc';
 	const { data } = useHourlyChatActivity({ displacement, utc });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isLgScreen = useBreakpoints().includes('lg');
 
 	const values = useMemo(() => {
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
index 0498d0451ab9..36f9c3de2cc2 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
@@ -2,10 +2,10 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -29,7 +29,7 @@ const NewUsersSection = ({ timezone }: NewUsersSectionProps): ReactElement => {
 	const utc = timezone === 'utc';
 	const { data } = useNewUsers({ period, utc });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const formatDate = useFormatDate();
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
index c5f7d2044129..007e75f95474 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
@@ -1,10 +1,10 @@
 import { ResponsiveHeatMapCanvas } from '@nivo/heatmap';
 import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
@@ -23,7 +23,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp
 
 	const { data, isLoading } = useUsersByTimeOfTheDay({ period, utc });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [dates, values] = useMemo(() => {
 		if (!data || isLoading) {
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
index 238cc0e40d29..b79d0b9c9a69 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
@@ -1,8 +1,8 @@
 import { Box, Flex } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import ActiveUsersSection from './ActiveUsersSection';
@@ -15,7 +15,7 @@ type UsersTabProps = {
 };
 
 const UsersTab = ({ timezone }: UsersTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const isXxlScreen = useBreakpoints().includes('xxl');
 
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
index 14dc96283f86..126a385e6ceb 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
@@ -1,14 +1,14 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import OverviewSection from './OverviewSection';
 import ServersSection from './ServersSection';
 
 function FederationDashboardPage(): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/admin/import/PrepareChannels.tsx b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
index 9f868d391ede..494f1f2b9b78 100644
--- a/apps/meteor/client/views/admin/import/PrepareChannels.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
@@ -1,7 +1,7 @@
 import { CheckBox, Table, Tag, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { ChannelDescriptor } from './ChannelDescriptor';
 
@@ -13,15 +13,11 @@ type PrepareChannelsProps = {
 
 // TODO: review inner logic
 const PrepareChannels = ({ channels, channelsCount, setChannels }: PrepareChannelsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
 	const showingResultsLabel = useCallback(
-		({ count, current, itemsPerPage }) =>
-			t('Showing_results_of', {
-				postProcess: 'sprintf',
-				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-			}),
+		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
 		[t],
 	);
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), [t]);
diff --git a/apps/meteor/client/views/admin/import/PrepareUsers.tsx b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
index ff6b4752bb2c..72e5d66127cf 100644
--- a/apps/meteor/client/views/admin/import/PrepareUsers.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
@@ -1,7 +1,7 @@
 import { CheckBox, Table, Tag, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { UserDescriptor } from './UserDescriptor';
 
@@ -13,15 +13,11 @@ type PrepareUsersProps = {
 
 // TODO: review inner logic
 const PrepareUsers = ({ usersCount, users, setUsers }: PrepareUsersProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [current, setCurrent] = useState(0);
 	const [itemsPerPage, setItemsPerPage] = useState<25 | 50 | 100>(25);
 	const showingResultsLabel = useCallback(
-		({ count, current, itemsPerPage }) =>
-			t('Showing_results_of', {
-				postProcess: 'sprintf',
-				sprintf: [current + 1, Math.min(current + itemsPerPage, count), count],
-			}),
+		({ count, current, itemsPerPage }) => t('Showing_results_of', current + 1, Math.min(current + itemsPerPage, count), count),
 		[t],
 	);
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), [t]);
diff --git a/apps/meteor/client/views/admin/integrations/NewBot.tsx b/apps/meteor/client/views/admin/integrations/NewBot.tsx
index 65c44aca65bc..bd4bdbac1303 100644
--- a/apps/meteor/client/views/admin/integrations/NewBot.tsx
+++ b/apps/meteor/client/views/admin/integrations/NewBot.tsx
@@ -1,9 +1,9 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const NewBot = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <Box pb={20} fontScale='h4' key='bots' dangerouslySetInnerHTML={{ __html: t('additional_integrations_Bots') }} />;
 };
diff --git a/apps/meteor/client/views/admin/integrations/NewZapier.tsx b/apps/meteor/client/views/admin/integrations/NewZapier.tsx
index e2f5c1d597a8..8313ee4a5029 100644
--- a/apps/meteor/client/views/admin/integrations/NewZapier.tsx
+++ b/apps/meteor/client/views/admin/integrations/NewZapier.tsx
@@ -1,6 +1,6 @@
 import { Box, Skeleton, Margins, Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const blogSpotStyleScriptImport = (src: string) =>
 	new Promise((resolve) => {
@@ -16,7 +16,7 @@ const blogSpotStyleScriptImport = (src: string) =>
 	});
 
 const NewZapier = ({ ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [script, setScript] = useState<HTMLScriptElement>();
 
 	useEffect(() => {
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index d6cebbc0c651..00c6f8270bfd 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -18,9 +18,9 @@ import {
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { outgoingEvents } from '../../../../../app/integrations/lib/outgoingEvents';
 import { useHighlightedCode } from '../../../../hooks/useHighlightedCode';
@@ -52,7 +52,7 @@ type EditOutgoingWebhookPayload = Pick<
 >;
 
 const OutgoingWebhookForm = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const {
 		control,
@@ -185,10 +185,7 @@ const OutgoingWebhookForm = () => {
 								<FieldHint
 									id={`${channelField}-hint-2`}
 									dangerouslySetInnerHTML={{
-										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
-											postProcess: 'sprintf',
-											sprintf: ['@', '#', '@john', '#general'],
-										}),
+										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
 									}}
 								/>
 								<FieldHint id={`${channelField}-hint-3`} dangerouslySetInnerHTML={{ __html: t('Integrations_for_all_channels') }} />
@@ -232,10 +229,7 @@ const OutgoingWebhookForm = () => {
 								<FieldHint
 									id={`${targetRoomField}-hint-2`}
 									dangerouslySetInnerHTML={{
-										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
-											postProcess: 'sprintf',
-											sprintf: ['@', '#', '@john', '#general'],
-										}),
+										__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
 									}}
 								/>
 							</Field>
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
index a0ad98a8efb9..7d0ce037c700 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryContent.tsx
@@ -1,12 +1,12 @@
 import type { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings';
 import { Skeleton, Box, Accordion } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import HistoryItem from './HistoryItem';
 
 const HistoryContent = ({ data, isLoading }: { data: Serialized<IIntegrationHistory>[]; isLoading: boolean }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (isLoading) {
 		return (
diff --git a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
index a78627685cc0..878b4d84f507 100644
--- a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
@@ -11,7 +11,7 @@ import useResetAvatarAction from './hooks/useResetAvatarAction';
 type MessageContextFooterProps = { userId: string; deleted: boolean };
 
 const MessageContextFooter = ({ userId, deleted }: MessageContextFooterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const dismissUserAction = useDismissUserAction(userId);
 	const deleteMessagesAction = useDeleteMessagesAction(userId);
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
index 52e0e8bcbee5..85d081e652da 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
@@ -1,6 +1,7 @@
+// import { Menu, Option } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { ModerationConsoleRowProps } from './ModerationConsoleTableRow';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
@@ -9,7 +10,7 @@ import useDismissUserAction from './hooks/useDismissUserAction';
 import useResetAvatarAction from './hooks/useResetAvatarAction';
 
 const ModerationConsoleActions = ({ report, onClick }: Omit<ModerationConsoleRowProps, 'isDesktopOrLarger'>): JSX.Element => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { userId: uid, isUserDeleted } = report;
 
 	return (
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
index 21128ff72fd3..13da70b48da2 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
@@ -1,6 +1,6 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
@@ -8,7 +8,7 @@ import useResetAvatarAction from '../hooks/useResetAvatarAction';
 import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow';
 
 const ModConsoleUserActions = ({ report, onClick }: Omit<ModConsoleUserRowProps, 'isDesktopOrLarger'>) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		reportedUser: { _id: uid },
 	} = report;
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
index 496ff07e4524..c437746ad8ef 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
@@ -10,7 +10,7 @@ import useResetAvatarAction from '../hooks/useResetAvatarAction';
 type UserContextFooterProps = { userId: string; deleted: boolean };
 
 const UserContextFooter = ({ userId, deleted }: UserContextFooterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const dismissUserAction = useDismissUserAction(userId, true);
 	const deactivateUserAction = useDeactivateUserAction(userId, true);
diff --git a/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx b/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
index 9da6a25ff863..74d3f206c8ca 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/DateRangePicker.tsx
@@ -1,8 +1,8 @@
 import { Select, Box, type SelectOption } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment, { type Moment } from 'moment';
 import React, { useMemo, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type DateRangePickerProps = {
 	onChange(range: { start: string; end: string }): void;
@@ -23,7 +23,7 @@ const getWeekRange = (daysToSubtractFromStart: number, daysToSubtractFromEnd: nu
 });
 
 const DateRangePicker = ({ onChange }: DateRangePickerProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleRange = useMutableCallback((range) => {
 		onChange(range);
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
index aaad5d0c4ebd..5414e3d06aa5 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import DateRangePicker from './DateRangePicker';
@@ -10,7 +10,7 @@ type ModerationFilterProps = {
 };
 
 const ModerationFilter = ({ setText, setDateRange }: ModerationFilterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<FilterByText shouldAutoFocus placeholder={t('Search')} onChange={setText}>
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx b/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
index 13c26dc62223..c22062228839 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ReportReasonCollapsible.tsx
@@ -1,12 +1,12 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { ReactNode } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ReportReasonCollapsible = ({ children }: { children: ReactNode }) => {
 	const [isOpen, setIsOpen] = useToggle(false);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const toggle = () => setIsOpen((prev) => !prev);
 
diff --git a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
index ad782e021720..6d03af10c8b4 100644
--- a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
+++ b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericUpsellModal from '../../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
 
 const CustomRoleUpsellModal = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { handleManageSubscription } = useUpsellActions();
 
 	return (
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
index 7ddd6ca9ab45..300d80f4f51c 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
@@ -1,17 +1,16 @@
 import type { IRole, IPermission } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { TFunction } from 'i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { CONSTANTS } from '../../../../../app/authorization/lib';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useChangeRole } from '../hooks/useChangeRole';
 import RoleCell from './RoleCell';
 
-const getName = (t: TFunction, permission: IPermission): string => {
+const getName = (t: ReturnType<typeof useTranslation>, permission: IPermission): string => {
 	if (permission.level === CONSTANTS.SETTINGS_LEVEL) {
 		let path = '';
 		if (permission.group) {
@@ -34,7 +33,7 @@ type PermissionRowProps = {
 };
 
 const PermissionRow = ({ permission, roleList, onGrant, onRemove }: PermissionRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { _id, roles } = permission;
 	const [hovered, setHovered] = useState(false);
 	const changeRole = useChangeRole({ onGrant, onRemove, permissionId: _id });
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
index 52f3a5370493..2926ef82124e 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
@@ -1,11 +1,11 @@
 import { TextInput } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const PermissionsTableFilter = ({ onChange }: { onChange: (debouncedFilter: string) => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [filter, setFilter] = useState('');
 	const debouncedFilter = useDebouncedValue(filter, 500);
 
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index bba5dfe95e38..17b1381f1af2 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, FieldHint, TextInput, Select, ToggleSwitch } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type RoleFormProps = {
 	className?: string;
@@ -13,7 +13,7 @@ type RoleFormProps = {
 };
 
 const RoleForm = ({ className, editing = false, isProtected = false, isDisabled = false }: RoleFormProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		register,
 		control,
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
index f05c708fd0fb..4e860ca8f759 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
@@ -2,9 +2,9 @@ import type { IUserInRole } from '@rocket.chat/core-typings';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserEmailAddress } from '../../../../../../lib/getUserEmailAddress';
 import { GenericTableRow, GenericTableCell } from '../../../../../components/GenericTable';
@@ -15,7 +15,7 @@ type UsersInRoleTableRowProps = {
 };
 
 const UsersInRoleTableRow = ({ user, onRemove }: UsersInRoleTableRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { _id, name, username, avatarETag } = user;
 	const email = getUserEmailAddress(user);
 
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
index 63192775a59e..2ec5954332f7 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
@@ -1,9 +1,9 @@
 import { Box, Icon, TextInput } from '@rocket.chat/fuselage';
 import type { OptionProp } from '@rocket.chat/ui-client';
 import { MultiSelectCustom } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useMemo, useState } from 'react';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const initialRoomTypeFilterStructure = [
 	{
@@ -43,7 +43,7 @@ const initialRoomTypeFilterStructure = [
 ] as OptionProp[];
 
 const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction<any>> }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [text, setText] = useState('');
 
 	const [roomTypeSelectedOptions, setRoomTypeSelectedOptions] = useState<OptionProp[]>([]);
diff --git a/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx b/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
index a6dff7cc8047..c4cf47c109fc 100644
--- a/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/ResetSettingButton/ResetSettingButton.tsx
@@ -1,11 +1,11 @@
 import type { Button } from '@rocket.chat/fuselage';
 import { IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 function ResetSettingButton(props: ComponentProps<typeof Button>): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <IconButton icon='undo' danger small title={t('Reset')} {...props} />;
 }
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
index ad62903b1cc1..fd96d715a837 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirrorBox.tsx
@@ -1,12 +1,12 @@
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { useTranslation } from 'react-i18next';
 
 const CodeMirrorBox = ({ label, children }: { label: ReactNode; children: ReactElement }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [fullScreen, toggleFullScreen] = useToggle(false);
 
 	if (fullScreen) {
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
index bfb10a54cbf9..dab9e63f7435 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
@@ -1,8 +1,8 @@
 import { FieldLabel, FieldRow, FieldHint, Flex, InputBox, Margins, TextInput, Select, Field } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -29,7 +29,7 @@ function ColorSettingInput({
 	onChangeEditor,
 	onResetButtonClick,
 }: ColorSettingInputProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleChange = useCallback(
 		(event) => {
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index b844f496b5ba..a484dc1133f0 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -1,8 +1,8 @@
 import { FieldLabel, MultiSelectFiltered, MultiSelect, Field, FieldRow } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -26,7 +26,7 @@ function MultiSelectSettingInput({
 	onResetButtonClick,
 	autocomplete,
 }: MultiSelectSettingInputProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleChange = (value: string[]): void => {
 		onChangeValue?.(value);
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
index 0364dcb11a4e..2ace88fda2cb 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
@@ -1,8 +1,8 @@
 import { Field, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ResetSettingButton from '../ResetSettingButton';
 import type { SettingInputProps } from './types';
@@ -25,7 +25,7 @@ function SelectSettingInput({
 	onChangeValue,
 	onResetButtonClick,
 }: SelectSettingInputProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleChange = (value: string): void => {
 		onChangeValue?.(value);
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
index 7c57e4c49f4e..975a3171cbbf 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
@@ -1,4 +1,3 @@
-import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -53,7 +52,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const numberInput = screen.getByRole('spinbutton');
@@ -75,7 +74,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'hours' });
@@ -100,7 +99,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'days' });
@@ -125,7 +124,7 @@ describe('TimespanSettingInput component', () => {
 				placeholder='Enter timespan'
 				onChangeValue={onChangeValueMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const selectInput = screen.getByRole('button', { name: 'hours' });
@@ -151,7 +150,7 @@ describe('TimespanSettingInput component', () => {
 				hasResetButton
 				onResetButtonClick={onResetButtonClickMock}
 			/>,
-			{ legacyRoot: true, wrapper: mockAppRoot().build() },
+			{ legacyRoot: true },
 		);
 
 		const resetButton = screen.getByTitle('Reset');
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
index c59041fa3699..b15a353995c9 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
@@ -1,7 +1,7 @@
 import { Field, FieldLabel, FieldRow, InputBox, Select } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEventHandler, ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { TIMEUNIT, timeUnitToMs, msToTimeUnit } from '../../../../../lib/convertTimeUnit';
 import ResetSettingButton from '../ResetSettingButton';
@@ -49,7 +49,7 @@ function TimespanSettingInput({
 	onResetButtonClick,
 	packageValue,
 }: TimespanSettingInputProps): ReactElement {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	const [timeUnit, setTimeUnit] = useState<TIMEUNIT>(getHighestTimeUnit(Number(value)));
 	const [internalValue, setInternalValue] = useState<number>(msToTimeUnit(timeUnit, Number(value)));
@@ -71,8 +71,8 @@ function TimespanSettingInput({
 	};
 
 	const timeUnitOptions = useMemo(() => {
-		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, i18n.exists(label) ? t(label) : label]); // todo translate
-	}, [i18n, t]);
+		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, t.has(label) ? t(label) : label]); // todo translate
+	}, [t]);
 
 	const handleResetButtonClick = () => {
 		onResetButtonClick?.();
diff --git a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
index de575dbad302..d26d80e88637 100644
--- a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx
@@ -2,9 +2,9 @@ import { isSetting, isSettingColor } from '@rocket.chat/core-typings';
 import { Accordion, Box, Button, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useEditableSettings, useEditableSettingsDispatch } from '../../EditableSettingsContext';
 import Setting from '../Setting';
@@ -20,7 +20,7 @@ type SettingsSectionProps = {
 };
 
 function SettingsSection({ groupId, hasReset = true, sectionName, currentTab, solo, help, children }: SettingsSectionProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const editableSettings = useEditableSettings(
 		useMemo(
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 98357b149383..4c7360d8f600 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -1,7 +1,7 @@
 import { TextInput, Field, FieldLabel, FieldRow, FieldError, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
@@ -13,7 +13,7 @@ type CreateOAuthModalProps = {
 const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactElement => {
 	const [text, setText] = useState<string>('');
 	const [error, setError] = useState<string>('');
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleConfirm = (e: SyntheticEvent): void => {
 		e.preventDefault();
diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
index 1a3c122502cf..782bf34122bc 100644
--- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
@@ -1,8 +1,8 @@
 import { Tabs, TabsItem } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useState, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 import GenericGroupPage from './GenericGroupPage';
@@ -16,7 +16,7 @@ type TabbedGroupPageProps = {
 };
 
 function TabbedGroupPage({ _id, tabs, i18nLabel, onClickBack, ...props }: TabbedGroupPageProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [currentTab, setCurrentTab] = useState(tabs[0]);
 	const handleTabClick = useMemo(() => (tab: string) => (): void => setCurrentTab(tab), [setCurrentTab]);
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index 4c034f7c7eb0..93792b517dcf 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -107,7 +107,7 @@ const SubscriptionPage = () => {
 						</Button>
 					)}
 					<UpgradeButton target='subscription_header' action={isEnterprise ? 'manage_subscription' : 'upgrade'} primary>
-						{isEnterprise ? t('Manage_subscription') : t('Upgrade')}
+						{t(isEnterprise ? 'Manage_subscription' : 'Upgrade')}
 					</UpgradeButton>
 				</ButtonGroup>
 			</PageHeader>
diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index 749b75903827..db51f1401f32 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -1,9 +1,9 @@
 import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
@@ -18,7 +18,7 @@ type AdminUserFormWithDataProps = {
 };
 
 const AdminUserFormWithData = ({ uid, onReload, context, roleData, roleError }: AdminUserFormWithDataProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading, isError, refetch } = useUserInfoQuery({ userId: uid });
 
 	const handleReload = useEffectEvent(() => {
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
index 5d9c72f515cb..bc773428608a 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
@@ -1,9 +1,9 @@
 import { Box, FieldHint, FieldLabel, FieldRow, RadioButton } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { Control, UseFormSetValue } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { UserFormProps } from './AdminUserForm';
 
@@ -22,7 +22,7 @@ const AdminUserSetRandomPasswordRadios = ({
 	setRandomPasswordId,
 	setValue,
 }: AdminUserSetRandomPasswordProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const setPasswordManuallyId = useUniqueId();
 
diff --git a/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx b/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
index 11390b6fdd5a..5a3f1bdd299a 100644
--- a/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
+++ b/apps/meteor/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage } from '../../../../components/GenericResourceUsage';
 
@@ -10,7 +10,7 @@ type SeatsCapUsageProps = {
 };
 
 const SeatsCapUsage = ({ limit, members }: SeatsCapUsageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const percentage = Math.max(0, Math.min((100 / limit) * members, 100));
 	const seatsLeft = Math.max(0, limit - members);
 
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index c8fa1eae7704..0d9a030f1447 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -3,9 +3,9 @@ import type { IRole, IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
 import type { DefaultUserInfo } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
@@ -29,7 +29,7 @@ type UsersTableRowProps = {
 };
 
 const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSeatsCapExceeded }: UsersTableRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { _id, emails, username, name, roles, status, active, avatarETag, lastLogin, type } = user;
 	const registrationStatusText = useMemo(() => {
diff --git a/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx b/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
index 836f5bbf1d22..efd1846c09d3 100644
--- a/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
@@ -1,11 +1,11 @@
 import { Box, Icon, Skeleton, Scrollable } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useStatistics } from '../../hooks/useStatistics';
 
 const AnalyticsReports = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data, isLoading, isSuccess, isError } = useStatistics();
 
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
index 818713898b20..8d8118679235 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
@@ -1,14 +1,14 @@
 import { Margins, Tabs } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AnalyticsReports from './AnalyticsReports';
 import ServerLogs from './ServerLogs';
 
 const ViewLogsPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [tab, setTab] = useState('Logs');
 
 	return (
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
index 1394d7497ebd..e0b22e35f5f1 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
@@ -1,7 +1,7 @@
 import { Accordion } from '@rocket.chat/fuselage';
 import type { IInstance } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime';
@@ -14,7 +14,7 @@ type InstancesModalProps = {
 };
 
 const InstancesModal = ({ instances = [], onClose }: InstancesModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 
 	return (
diff --git a/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx b/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
index b608df3ed5c5..4b3ffd819f81 100644
--- a/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/MessagesRoomsCard/MessagesRoomsCard.tsx
@@ -1,8 +1,8 @@
 import type { IStats } from '@rocket.chat/core-typings';
 import { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import WorkspaceCardSection from '../components/WorkspaceCardSection';
 import WorkspaceCardTextSeparator from '../components/WorkspaceCardTextSeparator';
@@ -12,7 +12,7 @@ type MessagesRoomsCardProps = {
 };
 
 const MessagesRoomsCard = ({ statistics }: MessagesRoomsCardProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Card height='full'>
diff --git a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
index b3288c1b99c5..d45c01153318 100644
--- a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
+++ b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
@@ -1,8 +1,8 @@
 import type { IWorkspaceInfo, IStats } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Callout, CardGrid } from '@rocket.chat/fuselage';
 import type { IInstance } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
@@ -30,7 +30,7 @@ const WorkspacePage = ({
 	onClickRefreshButton,
 	onClickDownloadInfo,
 }: WorkspaceStatusPageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data } = useIsEnterprise();
 
diff --git a/apps/meteor/client/views/audit/AuditLogPage.tsx b/apps/meteor/client/views/audit/AuditLogPage.tsx
index 95fbc39abca8..10b9d439ff09 100644
--- a/apps/meteor/client/views/audit/AuditLogPage.tsx
+++ b/apps/meteor/client/views/audit/AuditLogPage.tsx
@@ -1,12 +1,12 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import AuditLogTable from './components/AuditLogTable';
 
 const AuditLogPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/audit/AuditPage.tsx b/apps/meteor/client/views/audit/AuditPage.tsx
index 3dce9be56a8e..ca379883224e 100644
--- a/apps/meteor/client/views/audit/AuditPage.tsx
+++ b/apps/meteor/client/views/audit/AuditPage.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, Margins, States, StatesIcon, StatesSubtitle, StatesTitle, Tabs } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
 import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
@@ -15,7 +15,7 @@ const AuditPage = () => {
 	const [type, setType] = useAuditTab();
 	const [selectedRoom, setSelectedRoom] = useState<IRoom | undefined>();
 	const auditMutation = useAuditMutation(type);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page background='room'>
diff --git a/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx b/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
index 39d50edea62a..276d8c355c9b 100644
--- a/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
+++ b/apps/meteor/client/views/audit/components/AuditFiltersDisplay.tsx
@@ -1,8 +1,8 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDate } from '../../../hooks/useFormatDate';
 
@@ -16,7 +16,7 @@ type AuditFiltersDisplayProps = {
 
 const AuditFiltersDisplay = ({ users, room, startDate, endDate, filters }: AuditFiltersDisplayProps): ReactElement => {
 	const formatDate = useFormatDate();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' alignItems='stretch' withTruncatedText>
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index dffaf959f3cd..5f45ddc2b5fe 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -1,8 +1,8 @@
 import type { IAuditLog, IRoom } from '@rocket.chat/core-typings';
 import { Box, Field, FieldLabel, FieldRow, FieldError, TextInput, Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { AuditFields } from '../hooks/useAuditForm';
 import { useAuditForm } from '../hooks/useAuditForm';
@@ -20,7 +20,7 @@ type AuditFormProps = {
 };
 
 const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const form = useAuditForm();
 	const { control, handleSubmit, register } = form;
diff --git a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
index c6c4e204a682..8e3f9788880b 100644
--- a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
+++ b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
@@ -2,9 +2,9 @@ import type { IAuditLog } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
@@ -14,7 +14,7 @@ type AuditLogEntryProps = { value: IAuditLog };
 
 const AuditLogEntry = ({ value: { u, results, ts, _id, fields } }: AuditLogEntryProps): ReactElement => {
 	const formatDateAndTime = useFormatDateAndTime();
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { username, name, avatarETag } = u;
 
diff --git a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
index 7eecf145865d..c0399d402349 100644
--- a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
+++ b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
@@ -1,9 +1,9 @@
 import { Box, InputBox, Menu, Margins, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement, ComponentProps, SetStateAction } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { DateRange } from '../../utils/dateRange';
 
@@ -138,7 +138,7 @@ const DateRangePicker = ({ value, onChange, ...props }: DateRangePickerProps): R
 	const minEndDate = startDate;
 	const maxEndDate = useMemo(() => formatToDateInput(new Date()), []);
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const presets = useMemo(
 		() =>
diff --git a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
index ce2b7e044d3a..2a79b3b5270f 100644
--- a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -13,7 +13,7 @@ type DirectTabProps = {
 };
 
 const DirectTab = ({ form: { control } }: DirectTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: usersField, fieldState: usersFieldState } = useController({
 		name: 'users',
diff --git a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
index c756b372488c..00d0da8f3e31 100644
--- a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../../components/AutoCompleteAgent';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -14,7 +14,7 @@ type OmnichannelTabProps = {
 };
 
 const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: visitorField, fieldState: visitorFieldState } = useController({
 		name: 'visitor',
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index d58cc3ccb70d..069a907749ac 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import RoomAutoComplete from '../../../../components/RoomAutoComplete';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -14,7 +14,7 @@ type RoomsTabProps = {
 };
 
 const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: ridField, fieldState: ridFieldState } = useController({ name: 'rid', control, rules: { required: true } });
 
diff --git a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
index 652f7a739a66..50b372ad3291 100644
--- a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import type { AuditFields } from '../../hooks/useAuditForm';
@@ -13,7 +13,7 @@ type UsersTabProps = {
 };
 
 const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { field: usersField, fieldState: usersFieldState } = useController({
 		name: 'users',
diff --git a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
index d3b1e7b342cf..a8da354cbbfb 100644
--- a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
+++ b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AudioRecorder } from '../../../../app/ui/client/lib/recorderjs/AudioRecorder';
 import type { ChatAPI } from '../../../lib/chats/ChatAPI';
@@ -19,7 +19,7 @@ type AudioMessageRecorderProps = {
 };
 
 const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMessageRecorderProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [state, setState] = useState<'loading' | 'recording'>('recording');
 	const [time, setTime] = useState('00:00');
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
index 10f0ed565584..2ee6ebb3f2c3 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { EmojiPickerLoadMore, EmojiPickerNotFound, EmojiPickerCategoryWrapper } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, MutableRefObject } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { CUSTOM_CATEGORY } from '../../../../app/emoji/client';
 import type { EmojiByCategory, EmojiCategoryPosition } from '../../../../app/emoji/client';
@@ -26,7 +26,7 @@ const EmojiCategoryRow = ({
 	handleLoadMore,
 	handleSelectEmoji,
 }: EmojiCategoryRowProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const categoryRowStyle = css`
 		button {
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
index 3a8dc80be6de..701a3eb3872e 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
@@ -1,7 +1,7 @@
 import { IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { EmojiCategory } from '../../../../app/emoji/client';
 
@@ -47,7 +47,7 @@ const mapCategoryIcon = (category: string) => {
 };
 
 const EmojiPickerCategoryItem = ({ category, index, active, handleGoToCategory, ...props }: EmojiPickerCategoryItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const icon = mapCategoryIcon(category.key);
 
diff --git a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
index 152d13bae5de..a42e1b0580b3 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
@@ -1,7 +1,7 @@
 import { EmojiPickerNotFound } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 import type { VirtuosoGridHandle } from 'react-virtuoso';
 import { VirtuosoGrid } from 'react-virtuoso';
 
@@ -21,7 +21,7 @@ type SearchingResultProps = {
 };
 
 const SearchingResult = ({ searchResults, handleSelectEmoji }: SearchingResultProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const ref = useRef<VirtuosoGridHandle>(null);
 
 	if (searchResults.length === 0) {
diff --git a/apps/meteor/client/views/directory/RoomTags.tsx b/apps/meteor/client/views/directory/RoomTags.tsx
index d73c12f2cb62..780b554bd8fb 100644
--- a/apps/meteor/client/views/directory/RoomTags.tsx
+++ b/apps/meteor/client/views/directory/RoomTags.tsx
@@ -1,11 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const RoomTags = ({ room }: { room: IRoom }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mi={4} alignItems='center' display='flex' withTruncatedText>
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
index 5b5e42651847..711b5a6d21a1 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
@@ -1,8 +1,8 @@
 import { Box, PasswordInput, Field, FieldGroup, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -15,7 +15,7 @@ const EnterE2EPasswordModal = ({
 	onClose: () => void;
 	onCancel: () => void;
 }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [password, setPassword] = useState('');
 	const [passwordError, setPasswordError] = useState<string | undefined>();
 
diff --git a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
index a777ca5b4d99..b16837bc3d17 100644
--- a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
@@ -1,9 +1,9 @@
 import { Box, CodeSnippet } from '@rocket.chat/fuselage';
 import { useClipboard } from '@rocket.chat/fuselage-hooks';
 import { ExternalLink } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
@@ -17,7 +17,7 @@ type SaveE2EPasswordModalProps = {
 const DOCS_URL = 'https://go.rocket.chat/i/e2ee-guide';
 
 const SaveE2EPasswordModal = ({ randomPassword, onClose, onCancel, onConfirm }: SaveE2EPasswordModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { copy, hasCopied } = useClipboard(randomPassword);
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
index 345d8914fd7b..bd3b46c6adbd 100644
--- a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -11,7 +11,7 @@ const LINUX_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-linux';
 const MAC_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-mac';
 
 const DesktopAppsCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/DocumentationCard.tsx b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
index c047006b77fd..fc50e0aefa3e 100644
--- a/apps/meteor/client/views/home/cards/DocumentationCard.tsx
+++ b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -9,7 +9,7 @@ import { useExternalLink } from '../../../hooks/useExternalLink';
 const DOCS_URL = 'https://go.rocket.chat/i/hp-documentation';
 
 const DocumentationCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
index 47117c448a13..fdb3d4044a7d 100644
--- a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
@@ -1,7 +1,7 @@
 import type { Card } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericCard, GenericCardButton } from '../../../components/GenericCard';
 import { useExternalLink } from '../../../hooks/useExternalLink';
@@ -10,7 +10,7 @@ const GOOGLE_PLAY_URL = 'https://go.rocket.chat/i/hp-mobile-app-google';
 const APP_STORE_URL = 'https://go.rocket.chat/i/hp-mobile-app-apple';
 
 const MobileAppsCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleOpenLink = useExternalLink();
 
 	return (
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
index f1cc36f9dabe..a4a65f061252 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageHeader.tsx
@@ -1,10 +1,10 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box, Tag } from '@rocket.chat/fuselage';
 import { AppAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppMenu from '../AppMenu';
 import BundleChips from '../BundleChips';
@@ -18,7 +18,7 @@ const versioni18nKey = (app: App): string => {
 };
 
 const AppDetailsPageHeader = ({ app }: { app: App }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		iconFileData,
 		name,
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 5d20900078a4..5f3e427b8391 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -1,9 +1,9 @@
 import { Box, Callout, Chip, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import DOMPurify from 'dompurify';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
 import type { AppInfo } from '../../../definitions/AppInfo';
@@ -19,7 +19,7 @@ type AppDetailsProps = {
 };
 
 const AppDetails = ({ app }: AppDetailsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		author: { homepage, support } = {},
 		detailedDescription,
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
index 278a72345dda..a653a22478a8 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -1,7 +1,7 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import AccordionLoading from '../../../components/AccordionLoading';
@@ -9,7 +9,7 @@ import { useLogs } from '../../../hooks/useLogs';
 import AppLogsItem from './AppLogsItem';
 
 const AppLogs = ({ id }: { id: string }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const { data, isSuccess, isError, isLoading } = useLogs(id);
 
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
index d1d258006a12..dbbf4bf5b67a 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
@@ -1,7 +1,7 @@
 import type { ILogEntry } from '@rocket.chat/core-typings';
 import { Box, Accordion } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppLogsItemEntry from './AppLogsItemEntry';
 
@@ -12,7 +12,7 @@ type AppLogsItemProps = {
 };
 
 const AppLogsItem = ({ entries, instanceId, title, ...props }: AppLogsItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Accordion.Item title={title} {...props}>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
index ee16fe1b5756..986d2eec9686 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHighlightedCode } from '../../../../../hooks/useHighlightedCode';
 
@@ -12,7 +12,7 @@ type AppLogsItemEntryProps = {
 };
 
 const AppLogsItemEntry = ({ severity, timestamp, caller, args }: AppLogsItemEntryProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box color='default'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
index 3269c1113d0d..974b6d148e61 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
@@ -1,8 +1,8 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
 import { purifyOptions } from '../../../lib/purifyOptions';
@@ -21,7 +21,7 @@ type ReleaseItemProps = {
 };
 
 const AppReleasesItem = ({ release, ...props }: ReleaseItemProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const title = (
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
index 5554bde2651c..baaf65356a8e 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
@@ -1,8 +1,8 @@
 import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppPermissionsList from '../../../components/AppPermissionsList';
 import AppSecurityLabel from './AppSecurityLabel';
@@ -15,7 +15,7 @@ type AppSecurityProps = {
 };
 
 const AppSecurity = ({ privacyPolicySummary, appPermissions, tosLink, privacyLink }: AppSecurityProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box maxWidth='x640' w='full' marginInline='auto' color='default'>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
index 59080c7f3237..00dc564ed05d 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
@@ -1,12 +1,12 @@
 import { Box, FieldGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { ISettings } from '../../../../../apps/@types/IOrchestrator';
 import AppSetting from './AppSetting';
 
 const AppSettings = ({ settings }: { settings: ISettings }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
index 00621bdbdc90..6981d1b6a810 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
@@ -1,7 +1,7 @@
 import type { AppPricingPlan, PurchaseType } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { formatPriceAndPurchaseType } from '../../../helpers/formatPriceAndPurchaseType';
 
@@ -14,7 +14,7 @@ type AppStatusPriceDisplayProps = {
 };
 
 const AppStatusPriceDisplay = ({ purchaseType, pricingPlans, price, showType = true }: AppStatusPriceDisplayProps) => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	const { type, price: formattedPrice } = useMemo(
 		() => formatPriceAndPurchaseType(purchaseType, pricingPlans, price),
@@ -24,7 +24,7 @@ const AppStatusPriceDisplay = ({ purchaseType, pricingPlans, price, showType = t
 	return (
 		<Margins inline={4}>
 			<Tag>
-				{showType && <Box color='default'>{i18n.exists(type) ? t(type) : type}</Box>}
+				{showType && <Box color='default'>{t.has(type) ? t(type) : type}</Box>}
 				<Box>{!showType && type === 'Free' ? t(type) : formattedPrice}</Box>
 			</Tag>
 		</Margins>
diff --git a/apps/meteor/client/views/marketplace/AppMenu.tsx b/apps/meteor/client/views/marketplace/AppMenu.tsx
index 9f49b7d75a5b..a1d3942ee304 100644
--- a/apps/meteor/client/views/marketplace/AppMenu.tsx
+++ b/apps/meteor/client/views/marketplace/AppMenu.tsx
@@ -1,8 +1,8 @@
 import type { App } from '@rocket.chat/core-typings';
 import { MenuItem, MenuItemContent, MenuSection, MenuV2, Skeleton } from '@rocket.chat/fuselage';
 import { useHandleMenuAction } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { AppMenuOption } from './hooks/useAppMenu';
 import { useAppMenu } from './hooks/useAppMenu';
@@ -13,7 +13,7 @@ type AppMenuProps = {
 };
 
 const AppMenu = ({ app, isAppDetailsPage }: AppMenuProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { isLoading, isAdminUser, sections } = useAppMenu(app, isAppDetailsPage);
 
diff --git a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
index d06c6bc9f2f5..d9090cd7dc7b 100644
--- a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
@@ -1,7 +1,7 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import AppPermissionsList from './components/AppPermissionsList';
@@ -13,7 +13,7 @@ export type AppPermissionsReviewModalProps = {
 };
 
 const AppPermissionsReviewModal = ({ appPermissions, onCancel, onConfirm }: AppPermissionsReviewModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/marketplace/AppUpdateModal.tsx b/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
index 848e789fa83c..4eb2bcf6da2b 100644
--- a/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppUpdateModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type AppUpdateModalProps = {
 	confirm: () => void;
@@ -8,7 +8,7 @@ type AppUpdateModalProps = {
 };
 
 const AppUpdateModal = ({ confirm, cancel, ...props }: AppUpdateModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleCloseButtonClick = (): void => {
 		cancel();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
index 098833ea6e2a..a1f486395dbb 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
@@ -1,8 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../components/FilterByText';
 import CategoryDropDown from '../components/CategoryFilter/CategoryDropDown';
@@ -43,7 +43,7 @@ const AppsFilters = ({
 	statusFilterOnSelected,
 	context,
 }: AppsFiltersProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const isPrivateAppsPage = context === 'private';
 	const breakpoints = useBreakpoints();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
index 2729dafafe86..1f3f27c7fedd 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageConnectionError.tsx
@@ -1,10 +1,10 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const AppsPageContentError = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
index 5f55d1d1f07e..56c3ca26f9a7 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContentBody.tsx
@@ -2,8 +2,8 @@ import type { App } from '@rocket.chat/core-typings';
 import { Box, Pagination } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppsList from '../AppsList';
 import FeaturedAppsSections from './FeaturedAppsSections';
@@ -34,7 +34,7 @@ const AppsPageContentBody = ({
 	paginationProps,
 	noErrorsOcurred,
 }: AppsPageContentBodyProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const scrollableRef = useRef<HTMLDivElement>(null);
 	const appsListId = useUniqueId();
 
diff --git a/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx b/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
index fbc3c99ef483..71d9ac62fcc0 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/FeaturedAppsSections.tsx
@@ -1,7 +1,7 @@
 import type { App } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AppsList from '../AppsList';
 import normalizeFeaturedApps from '../helpers/normalizeFeaturedApps';
@@ -13,7 +13,7 @@ type FeaturedSectionsProps = {
 };
 
 const FeaturedAppsSections = ({ appsResult, appsListId }: FeaturedSectionsProps): ReactElement | null => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 	const featuredApps = useFeaturedApps();
 
 	if (featuredApps.isSuccess) {
@@ -24,7 +24,7 @@ const FeaturedAppsSections = ({ appsResult, appsListId }: FeaturedSectionsProps)
 						appsListId={`${appsListId + index}`}
 						key={section.slug}
 						apps={normalizeFeaturedApps(section.apps, appsResult)}
-						title={i18n.exists(section.i18nLabel) ? t(section.i18nLabel) : section.i18nLabel}
+						title={t.has(section.i18nLabel) ? t(section.i18nLabel) : section.i18nLabel}
 					/>
 				))}
 			</>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
index 2bdc8608ac14..dc7d77e64a73 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoAppRequestsEmptyState.tsx
@@ -1,9 +1,9 @@
 import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const NoAppRequestsEmptyState = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs='24px'>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
index 65d0ae1e68fc..9403a2443733 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppMatchesEmptyState.tsx
@@ -9,9 +9,9 @@ import {
 	StatesActions,
 	StatesAction,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NoInstalledAppMatchesEmptyStateProps = {
 	shouldShowSearchText: boolean;
@@ -24,7 +24,7 @@ const NoInstalledAppMatchesEmptyState = ({
 	text,
 	onButtonClick,
 }: NoInstalledAppMatchesEmptyStateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
index 375f2156e61d..a1bdeb90edce 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoInstalledAppsEmptyState.tsx
@@ -1,10 +1,10 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const NoInstalledAppsEmptyState = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
index bbce0eb71bed..0dc7e471aee4 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
@@ -9,9 +9,9 @@ import {
 	StatesSuggestionText,
 	StatesTitle,
 } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type NoMarketplaceOrInstalledAppMatchesEmptyStateProps = { shouldShowSearchText: boolean; text: string };
 
@@ -19,7 +19,7 @@ const NoMarketplaceOrInstalledAppMatchesEmptyState = ({
 	shouldShowSearchText,
 	text,
 }: NoMarketplaceOrInstalledAppMatchesEmptyStateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs={20}>
diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
index daee8c070471..b7fec778401a 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
@@ -1,9 +1,9 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const PrivateEmptyState = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box mbs='24px'>
diff --git a/apps/meteor/client/views/marketplace/BundleChips.tsx b/apps/meteor/client/views/marketplace/BundleChips.tsx
index d20f1eacfa35..b3110832145d 100644
--- a/apps/meteor/client/views/marketplace/BundleChips.tsx
+++ b/apps/meteor/client/views/marketplace/BundleChips.tsx
@@ -1,7 +1,7 @@
 import { Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { App } from './types';
 
@@ -14,7 +14,7 @@ type BundleChipsProps = {
 };
 
 const BundleChips = ({ bundledIn }: BundleChipsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handlePlanName = (label: string): string => {
 		if (label === 'Enterprise') {
diff --git a/apps/meteor/client/views/marketplace/IframeModal.tsx b/apps/meteor/client/views/marketplace/IframeModal.tsx
index fdf407228628..44616c1f6874 100644
--- a/apps/meteor/client/views/marketplace/IframeModal.tsx
+++ b/apps/meteor/client/views/marketplace/IframeModal.tsx
@@ -1,7 +1,7 @@
 import { Box, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const iframeMsgListener = (confirm: (data: any) => void, cancel: () => void) => (e: MessageEvent<any>) => {
 	let data;
@@ -22,7 +22,7 @@ type IframeModalProps = {
 } & ComponentProps<typeof Modal>;
 
 const IframeModal = ({ url, confirm, cancel, wrapperHeight = 'x360', ...props }: IframeModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	useEffect(() => {
 		const listener = iframeMsgListener(confirm, cancel);
diff --git a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
index 2707c05562a9..33eb6a4960c8 100644
--- a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
+++ b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericUpsellModal from '../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../components/GenericUpsellModal/hooks';
 
 const UnlimitedAppsUpsellModal = ({ onClose }: { onClose: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { handleManageSubscription, cloudWorkspaceHadTrial } = useUpsellActions();
 
 	return (
diff --git a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
index 2e25a0a9e1e5..bf9533c81074 100644
--- a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
+++ b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery';
@@ -24,7 +24,7 @@ const AppInstallationModal = ({
 	handleConfirm,
 	handleEnableUnlimitedApps,
 }: AppsInstallationModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const getTitle = () => {
 		if (enabled === limit) {
diff --git a/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx b/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
index 4e52d996dff1..0675295a2595 100644
--- a/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
+++ b/apps/meteor/client/views/marketplace/components/AppPermissionsList.tsx
@@ -1,9 +1,9 @@
 import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { Fragment } from 'react';
-import { useTranslation } from 'react-i18next';
 
 const defaultPermissions = [
 	'user.read',
@@ -36,7 +36,7 @@ const defaultPermissions = [
 ];
 
 const AppPermissionsList = ({ appPermissions }: { appPermissions: AppPermission[] | undefined }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleAppPermissions = (permission: string): string => t(`Apps_Permissions_${permission.replace('.', '_')}` as TranslationKey);
 
 	if (appPermissions?.length) {
diff --git a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
index 7593323c4a91..b3e43fda942f 100644
--- a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
+++ b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx
@@ -1,9 +1,9 @@
 import type { Button } from '@rocket.chat/fuselage';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import colorTokens from '@rocket.chat/fuselage-tokens/colors.json';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEventHandler } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type CategoryDropDownAnchorProps = { selectedCategoriesCount: number; onClick?: MouseEventHandler<HTMLElement> } & ComponentProps<
 	typeof Button
@@ -13,7 +13,7 @@ const CategoryDropDownAnchor = forwardRef<HTMLElement, CategoryDropDownAnchorPro
 	{ onClick, selectedCategoriesCount, ...props },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box
diff --git a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
index 46e8bd64b55c..9578d49961c8 100644
--- a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
+++ b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericResourceUsage } from '../../../components/GenericResourceUsage';
 
@@ -17,7 +17,7 @@ const EnabledAppsCount = ({
 	enabled: number;
 	context: 'private' | 'explore' | 'installed' | 'premium' | 'requested';
 }): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericResourceUsage
diff --git a/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx b/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
index 81a2afd21e1e..ce87f0d4673a 100644
--- a/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
+++ b/apps/meteor/client/views/marketplace/components/UninstallGrandfatheredAppModal/UninstallGrandfatheredAppModal.tsx
@@ -1,6 +1,6 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery';
@@ -14,7 +14,7 @@ type UninstallGrandfatheredAppModalProps = {
 };
 
 const UninstallGrandfatheredAppModal = ({ context, limit, appName, handleUninstall, handleClose }: UninstallGrandfatheredAppModalProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/marketplace/hooks/useCategories.ts b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
index 17a7c878e6e4..2a6b612470b5 100644
--- a/apps/meteor/client/views/marketplace/hooks/useCategories.ts
+++ b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import type {
@@ -14,7 +14,7 @@ import { useCategoryFlatList } from './useCategoryFlatList';
 import { useCategoryToggle } from './useCategoryToggle';
 
 export const useCategories = (): [CategoryDropDownGroups, selectedCategoriesList, selectedCategoriesList, CategoryOnSelected] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [categories, setCategories] = useState<CategoryDropDownListProps['categories']>([]);
 
 	const fetchCategories = useCallback(async (): Promise<void> => {
diff --git a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
index 31697eaf460d..b5a156b56bf4 100644
--- a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
+++ b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
@@ -1,12 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageContent } from '../../components/Page';
 
 const NotAuthorizedPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/notFound/NotFoundPage.tsx b/apps/meteor/client/views/notFound/NotFoundPage.tsx
index d9fbbe593de1..b6c01f05be98 100644
--- a/apps/meteor/client/views/notFound/NotFoundPage.tsx
+++ b/apps/meteor/client/views/notFound/NotFoundPage.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import NotFoundState from '../../components/NotFoundState';
 
 const NotFoundPage = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <NotFoundState title={t('Page_not_found')} subtitle={t('Page_not_exist_or_not_permission')} />;
 };
 
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
index 6c2c8663f0d4..13e1498d7422 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
@@ -1,8 +1,8 @@
 import { Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
@@ -22,7 +22,7 @@ import AgentsTableRow from './AgentsTableRow';
 
 // TODO: missing error state
 const AgentsTable = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [filter, setFilter] = useState('');
 
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'statusLivechat'>('name');
diff --git a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
index 986221840005..61f952e6f3c3 100644
--- a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
@@ -1,7 +1,7 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Select, Margins, Field, FieldLabel, FieldRow, Label, Option } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
@@ -11,7 +11,7 @@ import InterchangeableChart from './InterchangeableChart';
 import Overview from './Overview';
 
 const useOptions = (type: string): SelectOption[] => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return useMemo(() => {
 		if (type === 'Conversations') {
 			return [
@@ -30,7 +30,7 @@ const useOptions = (type: string): SelectOption[] => {
 };
 
 const AnalyticsPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [type, setType] = useState('Conversations');
 	const [department, setDepartment] = useState<string | null>(null);
 	const [dateRange, setDateRange] = useState({ start: '', end: '' });
diff --git a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
index d3fd6b8d857a..40c32f4d6980 100644
--- a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
@@ -1,10 +1,10 @@
 import { Box, InputBox, Menu, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Moment } from 'moment';
 import moment from 'moment';
 import type { ComponentProps } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 moment.locale('en');
 
@@ -27,7 +27,7 @@ const getWeekRange = (daysToSubtractFromStart: number, daysToSubtractFromEnd: nu
 });
 
 const DateRangePicker = ({ onChange = () => undefined, ...props }: DateRangePickerProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [range, setRange] = useState({ start: '', end: '' });
 
 	const { start, end } = range;
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
index 18cfb2e9ce56..9bca1e6589c4 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceFieldLabel.tsx
@@ -1,7 +1,7 @@
 import { FieldLabel as BaseFieldLabel, Box, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
@@ -11,7 +11,7 @@ type FieldLabelProps = ComponentProps<typeof BaseFieldLabel> & {
 };
 
 const FieldLabel = ({ children: label, premium = false }: FieldLabelProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const shouldDisableEnterprise = premium && !hasLicense;
 
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index 92bcfc4c5d30..a4435398d9a9 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -13,17 +13,17 @@ import {
 	FieldHint,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import FieldLabel from './AppearanceFieldLabel';
 
 const AppearanceForm = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isEnterprise = useHasLicenseModule('livechat-enterprise');
 
 	const { control, watch } = useFormContext();
diff --git a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
index 4f53823aca3f..2156babf230d 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.tsx
@@ -2,9 +2,9 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { InputBox, Field, MultiSelect, FieldGroup, Box, Select, FieldLabel, FieldRow, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller, useFieldArray } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useTimezoneNameList } from '../../../hooks/useTimezoneNameList';
 import { BusinessHoursMultiple } from '../additionalForms';
@@ -38,7 +38,7 @@ export type BusinessHoursFormData = {
 // TODO: add time validation for start and finish not be equal on UI
 // TODO: add time validation for start not be higher than finish on UI
 const BusinessHoursForm = ({ type }: { type?: 'default' | 'custom' }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const timeZones = useTimezoneNameList();
 	const timeZonesOptions: SelectOption[] = useMemo(() => timeZones.map((name) => [name, t(name as TranslationKey)]), [t, timeZones]);
 	const daysOptions: SelectOption[] = useMemo(() => DAYS_OF_WEEK.map((day) => [day, t(day as TranslationKey)]), [t]);
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
index 9296ec2713f7..2bfc10ef0dfe 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
@@ -9,9 +9,9 @@ import {
 } from '@rocket.chat/fuselage';
 import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 import { clickableItem } from '../../../lib/clickableItem';
@@ -22,7 +22,7 @@ type ContactHistoryItemProps = {
 };
 
 function ContactHistoryItem({ history, setChatId, ...props }: ContactHistoryItemProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useFormatDateAndTime();
 	const username = history.servedBy?.username;
 	const hasClosingMessage = !!history.closingMessage?.msg?.trim();
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
index 5a1cd52eab3c..ba25d511e1a8 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
@@ -1,7 +1,7 @@
 import { Box, Margins, TextInput, Icon, Throbber, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -21,7 +21,7 @@ import { useHistoryList } from './useHistoryList';
 
 const ContactHistoryList = ({ setChatId, close }: { setChatId: Dispatch<SetStateAction<string>>; close: () => void }): ReactElement => {
 	const [text, setText] = useState('');
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useOmnichannelRoom();
 	const { itemsList: historyList, loadMoreItems } = useHistoryList(
 		useMemo(() => ({ roomId: room._id, filter: text, visitorId: room.v._id }), [room, text]),
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index 2915e4907c7d..3c6079c08fd6 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -18,8 +18,8 @@ import {
 	MessageSystemTimestamp,
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
 import MessageContentBody from '../../../../components/message/MessageContentBody';
@@ -38,7 +38,7 @@ type ContactHistoryMessageProps = {
 };
 
 const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }: ContactHistoryMessageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { triggerProps, openUserCard } = useUserCard();
 
 	const format = useFormatDate();
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
index eeca3fb4930d..27312b9e9fac 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AgentRow.tsx
@@ -1,7 +1,7 @@
 import { NumberInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 import type { UseFormRegister } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import type { FormValues, IDepartmentAgent } from '../EditDepartment';
@@ -16,7 +16,7 @@ type AgentRowProps = {
 };
 
 const AgentRow = ({ index, agent, register, onRemove }: AgentRowProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericTableRow key={agent.agentId} tabIndex={0} role='link' action qa-user-id={agent.agentId}>
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
index a81e9ffc8584..c4e4c7acb7c6 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/DepartmentAgentsTable.tsx
@@ -1,8 +1,8 @@
 import { Pagination } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import type { Control, UseFormRegister } from 'react-hook-form';
 import { useWatch, useFieldArray } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableBody, GenericTableHeader, GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -16,7 +16,7 @@ type DepartmentAgentsTableProps = {
 };
 
 function DepartmentAgentsTable({ control, register }: DepartmentAgentsTableProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { fields, append, remove } = useFieldArray({ control, name: 'agentList' });
 	const agentList = useWatch({ control, name: 'agentList' });
 
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
index c90f3ebe3ee0..53c1afeb4ba7 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
@@ -1,7 +1,7 @@
 import { Button, Chip, FieldRow, TextInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FormEvent } from 'react';
 import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type DepartmentTagsProps = {
 	error: string;
@@ -10,7 +10,7 @@ type DepartmentTagsProps = {
 } & ComponentProps<typeof TextInput>;
 
 const DepartmentTags = ({ error, value: tags, onChange, ...props }: DepartmentTagsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const [tagText, setTagText] = useState('');
 
 	const handleAddTag = useCallback(() => {
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
index 3b01379f18b6..616baee2b531 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
@@ -1,8 +1,8 @@
 import type { IVoipRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useIsCallReady } from '../../../../contexts/CallContext';
@@ -15,7 +15,7 @@ type CallTableRowProps = {
 };
 
 export const CallTableRow = ({ room, onRowClick }: CallTableRowProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isCallReady = useIsCallReady();
 
 	const { _id, fname, callStarted, queue, callDuration = 0, v, direction } = room;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
index 75f6d1d5c3bd..dab51528dc49 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
@@ -1,10 +1,10 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Box, Icon, Chip, ButtonGroup } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarIcon,
@@ -30,7 +30,7 @@ type VoipInfoPropsType = {
 };
 
 export const VoipInfo = ({ room, onClickClose /* , onClickReport  */ }: VoipInfoPropsType): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const isCallReady = useIsCallReady();
 
 	const { servedBy, queue, v, fname, name, callDuration, callTotalHoldTime, closedAt, callWaitingTime, tags, lastMessage } = room;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
index 5af57d8e4366..294a508fbc4f 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../../../contexts/CallContext';
 import { useDialModal } from '../../../../../hooks/useDialModal';
@@ -14,7 +14,7 @@ type VoipInfoCallButtonProps = Exclude<
 };
 
 export const VoipInfoCallButton = ({ phoneNumber, ...props }: VoipInfoCallButtonProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openDialModal } = useDialModal();
 
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
index d04330aa57b3..a12bba236965 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
@@ -1,6 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Field from '../../../components/Field';
 import Info from '../../../components/Info';
@@ -12,7 +12,7 @@ type DepartmentFieldProps = {
 };
 
 const DepartmentField = ({ departmentId }: DepartmentFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isLoading, isError } = useDepartmentInfo(departmentId);
 
 	return (
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
index e2c053fe90ab..aeca1de73202 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { FormSkeleton } from '../../../components';
 import { useOmnichannelRoomInfo } from '../../../hooks/useOmnichannelRoomInfo';
@@ -15,7 +15,7 @@ type RoomEditWithDataProps = {
 };
 
 function RoomEditWithData({ id: roomId, reload, reloadInfo, onClose }: RoomEditWithDataProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { data: room, isLoading: isRoomLoading, isError: isRoomError } = useOmnichannelRoomInfo(roomId);
 	const { _id: visitorId } = room?.v ?? {};
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
index e3745e576a72..d2a17d53be7e 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import UAParser from 'ua-parser-js';
 
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
@@ -10,7 +10,7 @@ import Label from '../../../components/Label';
 import { FormSkeleton } from '../../components/FormSkeleton';
 
 const VisitorClientInfo = ({ uid }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		value: userData,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
index 4c68389a9604..a250a005e243 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVoipOutboundStates } from '../../../../contexts/CallContext';
 import { useDialModal } from '../../../../hooks/useDialModal';
@@ -14,7 +14,7 @@ const rcxCallDialButton = css`
 `;
 
 export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { outBoundCallsAllowed, outBoundCallsEnabledForUser } = useVoipOutboundStates();
 	const { openDialModal } = useDialModal();
diff --git a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
index 86ca44762d44..9aedf67ab3c9 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Field from '../../components/Field';
 import Info from '../../components/Info';
@@ -13,7 +13,7 @@ type PriorityFieldProps = {
 };
 
 const PriorityField = ({ id }: PriorityFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isInitialLoading, isError } = usePriorityInfo(id);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
index 7b029d73403a..9d0a768579af 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Field from '../../components/Field';
 import Info from '../../components/Info';
@@ -13,7 +13,7 @@ type SlaFieldProps = {
 };
 
 const SlaField = ({ id }: SlaFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { data, isInitialLoading, isError } = useSlaInfo(id);
 
 	if (isInitialLoading) {
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
index ca3f703abd1d..235f4f95d1fa 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { OmnichannelRoomIcon } from '../../../../components/RoomIcon/OmnichannelRoomIcon';
 import Field from '../../components/Field';
@@ -13,7 +13,7 @@ type SourceFieldProps = {
 };
 
 const SourceField = ({ room }: SourceFieldProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const roomSource = room.source.alias || room.source.id || room.source.type;
 
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
index 297ced9eed53..90ba81d5bf80 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.js
@@ -1,6 +1,6 @@
 import { Box, ContextualbarContent } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
@@ -8,7 +8,7 @@ import { FormSkeleton } from '../../components/FormSkeleton';
 import ContactNewEdit from './ContactNewEdit';
 
 function ContactEditWithData({ id, close }) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		value: data,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
index 597d3d66dbd4..0d6c9fb406ec 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
@@ -1,8 +1,8 @@
 import { Box, Select, Label } from '@rocket.chat/fuselage';
 import { useMutableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction } from 'react';
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../components/AutoCompleteAgent';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
@@ -12,7 +12,7 @@ type QueueListFilterProps = {
 };
 
 export const QueueListFilter = ({ setFilter, ...props }: QueueListFilterProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const statusOptions: [string, string][] = [
 		['online', t('Online')],
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
index 63b62b85e642..677b8a201990 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
@@ -1,11 +1,11 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import QueueListTable from './QueueListTable';
 
 const QueueListPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
index 9b506727def3..b6e29530b5e7 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/RealTimeMonitoringPage.js
@@ -1,7 +1,7 @@
 import { Box, Select, Margins, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useState, useMemo, useEffect, Fragment } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
@@ -27,7 +27,7 @@ const randomizeKeys = (keys) => {
 const dateRange = getDateRange();
 
 const RealTimeMonitoringPage = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const keys = useRef([...Array(10).keys()]);
 
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
index cc5566e04c4b..f1b2d0eed337 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
@@ -1,10 +1,9 @@
 import type { OperationParams } from '@rocket.chat/rest-typings';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Chart as ChartType } from 'chart.js';
-import type { TFunction } from 'i18next';
 import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -21,7 +20,7 @@ const initialData = {
 	offline: 0,
 };
 
-const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TFunction): Promise<ChartType> =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']): Promise<ChartType> =>
 	drawDoughnutChart(
 		canvas,
 		t('Agents'),
@@ -36,7 +35,7 @@ type AgentStatusChartsProps = {
 };
 
 const AgentStatusChart = ({ params, reloadRef, ...props }: AgentStatusChartsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
 	const context: MutableRefObject<ChartType | undefined> = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
index c684f907052d..b4e155394f68 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
@@ -33,7 +33,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatDurationChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
index dc3c495de32f..b84dfe6918a2 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
@@ -1,10 +1,9 @@
 import type { OperationParams } from '@rocket.chat/rest-typings';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { Chart as ChartType } from 'chart.js';
-import type { TFunction } from 'i18next';
 import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -21,7 +20,7 @@ const initialData = {
 	closed: 0,
 };
 
-const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TFunction) =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']) =>
 	drawDoughnutChart(
 		canvas,
 		t('Chats'),
@@ -36,7 +35,7 @@ type ChatsChartProps = {
 };
 
 const ChatsChart = ({ params, reloadRef, ...props }: ChatsChartProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
 	const context: MutableRefObject<ChartType | undefined> = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
index 4fd204b0e907..48b0bdbf655e 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -20,7 +20,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatsPerAgentChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
index 57189f447317..fbfe91695626 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
@@ -19,7 +19,7 @@ const init = (canvas, context, t) =>
 	});
 
 const ChatsPerDepartmentChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
index 2fa04de26313..cfc33687c8fc 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.js
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useRef, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
@@ -34,7 +34,7 @@ const init = (canvas, context, t) =>
 	);
 
 const ResponseTimesChart = ({ params, reloadRef, ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const canvas = useRef();
 	const context = useRef();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
index c1c632e06c0c..d942b93a4223 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
@@ -1,6 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 import { type Chart } from 'chart.js';
-import type { TFunction } from 'i18next';
 import { type MutableRefObject } from 'react';
 
 import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler';
@@ -8,8 +8,8 @@ import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler
 type UseUpdateChartDataOptions = {
 	context: MutableRefObject<Chart | undefined>;
 	canvas: MutableRefObject<HTMLCanvasElement | null>;
-	init: (canvas: HTMLCanvasElement, context: undefined, t: TFunction) => Promise<Chart>;
-	t: TFunction;
+	init: (canvas: HTMLCanvasElement, context: undefined, t: TranslationContextValue['translate']) => Promise<Chart>;
+	t: TranslationContextValue['translate'];
 };
 
 export const useUpdateChartData = ({ context: contextRef, canvas: canvasRef, init, t }: UseUpdateChartDataOptions) =>
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
index 0c244993dea7..f10909e19f01 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
@@ -1,7 +1,7 @@
 import { Skeleton } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import CounterItem from './CounterItem';
@@ -23,7 +23,7 @@ type CounterContainerProps = {
 };
 
 const CounterContainer = ({ data, state, initialData, ...props }: CounterContainerProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [displayData, setDisplayData] = useState<DataType>(initialData);
 
diff --git a/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
index 0033d345423f..1073c8e702cc 100644
--- a/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/ConditionForm.tsx
@@ -1,11 +1,11 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldGroup, FieldLabel, FieldRow, NumberInput, Select, TextInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from './EditTrigger';
 
@@ -16,7 +16,7 @@ type ConditionFormType = ComponentProps<typeof Field> & {
 
 export const ConditionForm = ({ control, index, ...props }: ConditionFormType) => {
 	const conditionFieldId = useUniqueId();
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const conditionName = useWatch({ control, name: `conditions.${index}.name` });
 
 	const placeholders: { [conditionName: string]: string } = useMemo(
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
index 5ef1fd876642..b09ea937b1cd 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx
@@ -12,11 +12,11 @@ import {
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback, useMemo } from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 import { type TriggersPayload } from '../EditTrigger';
@@ -35,7 +35,7 @@ const ACTION_HINTS: Record<string, TranslationKey> = {
 const PREMIUM_ACTIONS = ['use-external-service'];
 
 export const ActionForm = ({ control, trigger, index, ...props }: SendMessageFormType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const actionFieldId = useUniqueId();
 	const actionFieldName = `actions.${index}.name` as const;
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
index 4dcd071fdd7d..7b6d9b9b4ed5 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionSender.tsx
@@ -1,10 +1,10 @@
 import { FieldRow, Select, TextInput, type SelectOption, Field, FieldLabel } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useMemo } from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 
@@ -15,7 +15,7 @@ type ActionSenderType = ComponentProps<typeof Field> & {
 };
 
 export const ActionSender = ({ control, index, disabled, ...props }: ActionSenderType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const senderFieldId = useUniqueId();
 	const senderFieldName = `actions.${index}.params.sender` as const;
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
index c53cd1e076ab..0905b8afbc8d 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
@@ -1,10 +1,10 @@
 import { FieldError, Field, FieldHint, FieldLabel, FieldRow, NumberInput, TextAreaInput, FieldGroup } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FocusEvent } from 'react';
 import React from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 import type { TriggersPayload } from '../EditTrigger';
@@ -19,7 +19,7 @@ type SendMessageActionFormType = ComponentProps<typeof Field> & {
 };
 
 export const ExternalServiceActionForm = ({ control, trigger, index, ...props }: SendMessageActionFormType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
index c48083054e40..d34ce4240c73 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
@@ -1,10 +1,10 @@
 import { Field, FieldError, FieldLabel, FieldRow, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React from 'react';
 import type { Control } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 import { useFieldError } from '../hooks';
@@ -16,7 +16,7 @@ type SendMessageActionFormType = ComponentProps<typeof Field> & {
 };
 
 export const SendMessageActionForm = ({ control, index, ...props }: SendMessageActionFormType) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const messageFieldId = useUniqueId();
 	const name = `actions.${index}.params.msg` as const;
 	const [messageError] = useFieldError({ control, name });
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
index bd05e95d83fd..791841ed3ab5 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingItem.tsx
@@ -1,7 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Palette } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type OutlookSettingItemProps = {
 	id: string;
@@ -12,7 +12,7 @@ type OutlookSettingItemProps = {
 };
 
 const OutlookSettingItem = ({ id, title, subTitle, enabled, handleEnable }: OutlookSettingItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const hovered = css`
 		&:hover,
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
index d89321346256..71604da54b67 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../../../app/e2e/client';
 import { E2EEState } from '../../../../app/e2e/client/E2EEState';
@@ -16,7 +16,7 @@ const RoomE2EESetup = () => {
 	const e2eeState = useE2EEState();
 	const e2eRoomState = useE2EERoomState(room._id);
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const randomPassword = window.localStorage.getItem('e2e.randomPassword');
 
 	const onSavePassword = useCallback(() => {
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
index 36941e2c829e..b1da1323df65 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActionOptions.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box, Dropdown, Option } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../../components/Header';
 import { useDropdownVisibility } from '../../../../../sidebar/header/hooks/useDropdownVisibility';
@@ -14,7 +14,7 @@ type QuickActionOptionsProps = {
 };
 
 const QuickActionOptions = ({ options, room, action, ...props }: QuickActionOptionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const reference = useRef(null);
 	const target = useRef(null);
 	const { isVisible, toggle } = useDropdownVisibility({ reference, target });
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
index f3b7ef7562d6..13805850a13d 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
 import { useOmnichannelRoom } from '../../../contexts/RoomContext';
@@ -13,7 +13,7 @@ type QuickActionsProps = {
 };
 
 const QuickActions = ({ className }: QuickActionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useOmnichannelRoom();
 	const { quickActions, actionDefault } = useQuickActions();
 
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 5d98d4a33f8d..2e38e2110bbe 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Suspense } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header';
 import MarkdownText from '../../../components/MarkdownText';
@@ -34,7 +34,7 @@ export type RoomHeaderProps = {
 };
 
 const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Header>
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
index d8125feff06e..58e1f9f59ef7 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,6 +1,6 @@
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 import { roomActionHooksForE2EESetup } from '../../../../ui';
@@ -10,7 +10,7 @@ import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import { getRoomGroup } from '../../lib/getRoomGroup';
 
 const RoomToolboxE2EESetup = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const toolbox = useRoomToolbox();
 	const room = useRoom();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
index 36941e2c829e..b1da1323df65 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActionOptions.tsx
@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box, Dropdown, Option } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../../components/Header';
 import { useDropdownVisibility } from '../../../../../sidebar/header/hooks/useDropdownVisibility';
@@ -14,7 +14,7 @@ type QuickActionOptionsProps = {
 };
 
 const QuickActionOptions = ({ options, room, action, ...props }: QuickActionOptionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const reference = useRef(null);
 	const target = useRef(null);
 	const { isVisible, toggle } = useDropdownVisibility({ reference, target });
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
index f3b7ef7562d6..13805850a13d 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
 import { useOmnichannelRoom } from '../../../contexts/RoomContext';
@@ -13,7 +13,7 @@ type QuickActionsProps = {
 };
 
 const QuickActions = ({ className }: QuickActionsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useOmnichannelRoom();
 	const { quickActions, actionDefault } = useQuickActions();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
index a99265368dee..8ef21aecf0cd 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { Suspense } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
@@ -32,7 +32,7 @@ export type RoomHeaderProps = {
 };
 
 const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Header>
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
index 424cfeab7714..cfe1f620afbf 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomLeader.tsx
@@ -2,9 +2,9 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { UIEvent } from 'react';
 import React, { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderSubtitle } from '../../../components/Header';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
@@ -18,7 +18,7 @@ type RoomLeaderProps = {
 };
 
 const RoomLeader = ({ _id, name, username }: RoomLeaderProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { openUserCard, triggerProps } = useUserCard();
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
index 12caba1f3801..9c6afa33fc27 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,6 +1,6 @@
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 import { roomActionHooksForE2EESetup } from '../../../../ui';
@@ -8,7 +8,7 @@ import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext'
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
 const RoomToolboxE2EESetup = () => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const toolbox = useRoomToolbox();
 
 	const { tab } = toolbox;
diff --git a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
index 7865f7dcbe85..dbd1f0fa57c7 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
@@ -1,13 +1,13 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
 
 import { useRoom } from '../contexts/RoomContext';
 
 const MessageListErrorBoundary = ({ children }: { children: ReactNode }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	return (
diff --git a/apps/meteor/client/views/room/MessageList/MessageListItem.tsx b/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
index 0304be656121..ecd0978c9fc0 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListItem.tsx
@@ -1,7 +1,7 @@
 import { isThreadMessage, type IMessage, type ISubscription } from '@rocket.chat/core-typings';
 import { Box, Bubble, MessageDivider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import RoomMessage from '../../../components/message/variants/RoomMessage';
 import SystemMessage from '../../../components/message/variants/SystemMessage';
@@ -31,7 +31,7 @@ export const MessageListItem = ({
 	subscription,
 	system,
 }: MessageListItemProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useFormatDate();
 
 	const ref = useDateRef();
diff --git a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
index 2e9e16ef3201..8a9b1ae77dbd 100644
--- a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
+++ b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { DragEvent, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 
@@ -16,7 +16,7 @@ type DropTargetOverlayProps = {
 };
 
 function DropTargetOverlay({ enabled, reason, onFileDrop, visible = true, onDismiss }: DropTargetOverlayProps): ReactElement | null {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleDragLeave = useMutableCallback((event: DragEvent) => {
 		event.stopPropagation();
diff --git a/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
index 6923528e33b9..cdddc8b482cd 100644
--- a/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/ErroredUploadProgressIndicator.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Upload } from '../../../lib/chats/Upload';
 
@@ -11,7 +11,7 @@ type ErroredUploadProgressIndicatorProps = {
 };
 
 const ErroredUploadProgressIndicator = ({ id, error, onClose }: ErroredUploadProgressIndicatorProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleCloseClick = useCallback(() => {
 		onClose?.(id);
diff --git a/apps/meteor/client/views/room/body/LeaderBar.tsx b/apps/meteor/client/views/room/body/LeaderBar.tsx
index 6c637eb84d8e..b54d37ed5df9 100644
--- a/apps/meteor/client/views/room/body/LeaderBar.tsx
+++ b/apps/meteor/client/views/room/body/LeaderBar.tsx
@@ -2,10 +2,10 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, UIEvent } from 'react';
 import React, { memo, useCallback, useMemo } from 'react';
 import type { AriaButtonProps } from 'react-aria';
-import { useTranslation } from 'react-i18next';
 
 import { isTruthy } from '../../../../lib/isTruthy';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
@@ -23,7 +23,7 @@ type LeaderBarProps = {
  * @deprecated on newNavigation feature. Remove after full migration.
  */
 const LeaderBar = ({ _id, name, username, visible, onAvatarClick, triggerProps }: LeaderBarProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const chatNowLink = useMemo(() => roomCoordinator.getRouteLink('d', { name: username }) || undefined, [username]);
 
diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
index f9c612ce9a9a..4629b812bbff 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
@@ -1,14 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Bubble } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { withErrorBoundary } from '../../../components/withErrorBoundary';
 import { usePruneWarningMessage } from '../../../hooks/usePruneWarningMessage';
 
 const RetentionPolicyWarning = ({ room }: { room: IRoom }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const message = usePruneWarningMessage(room);
 
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
index 7629fc14c508..a765407ad6d4 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
@@ -2,9 +2,9 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { isVoipRoom, isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { Flex, Box } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword';
 import RoomForewordUsernameList from './RoomForewordUsernameList';
@@ -12,7 +12,7 @@ import RoomForewordUsernameList from './RoomForewordUsernameList';
 type RoomForewordProps = { user: IUser | null; room: IRoom };
 
 const RoomForeword = ({ user, room }: RoomForewordProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (isVoipRoom(room)) {
 		return <VoipRoomForeword room={room} />;
diff --git a/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx b/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
index 842929376cf7..e72a263ae8e6 100644
--- a/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UnreadMessagesIndicator.tsx
@@ -1,8 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Bubble } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type UnreadMessagesIndicatorProps = {
 	count: number;
@@ -18,7 +18,7 @@ const indicatorStyle = css`
 `;
 
 const UnreadMessagesIndicator = ({ count, onJumpButtonClick, onMarkAsReadButtonClick }: UnreadMessagesIndicatorProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box className={indicatorStyle} mbs={8}>
diff --git a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
index 3c9a9b0a809d..001e84de2401 100644
--- a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { Upload } from '../../../lib/chats/Upload';
 import ErroredUploadProgressIndicator from './ErroredUploadProgressIndicator';
@@ -14,7 +14,7 @@ type UploadProgressIndicatorProps = {
 };
 
 const UploadProgressIndicator = ({ id, name, percentage, error, onClose }: UploadProgressIndicatorProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const handleCloseClick = useCallback(() => {
 		onClose?.(id);
diff --git a/apps/meteor/client/views/room/composer/ComposerArchived.tsx b/apps/meteor/client/views/room/composer/ComposerArchived.tsx
index e32d4310e451..d8e269f9986c 100644
--- a/apps/meteor/client/views/room/composer/ComposerArchived.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerArchived.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerReadOnly = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<MessageFooterCallout>
diff --git a/apps/meteor/client/views/room/composer/ComposerBlocked.tsx b/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
index c1a7aaca35ee..c5edb077c39f 100644
--- a/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBlocked.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerBlocked = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <MessageFooterCallout>{t('room_is_blocked')}</MessageFooterCallout>;
 };
 
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
index cdac8d6d4daf..523c0e44af86 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
@@ -1,9 +1,9 @@
 import { Box, Option, OptionSkeleton, Tile } from '@rocket.chat/fuselage';
 import { useUniqueId, useContentBoxSize } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useEffect, memo, useMemo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export type ComposerBoxPopupProps<
 	T extends {
@@ -32,7 +32,7 @@ function ComposerBoxPopup<
 	select,
 	renderItem = ({ item }: { item: T }) => <>{JSON.stringify(item)}</>,
 }: ComposerBoxPopupProps<T>): ReactElement | null {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const id = useUniqueId();
 	const composerBoxPopupRef = useRef<HTMLElement>(null);
 	const popupSizes = useContentBoxSize(composerBoxPopupRef);
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
index 70c18a9dae57..fe69136c3d26 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
@@ -1,6 +1,6 @@
 import { OptionColumn, OptionContent, OptionDescription, OptionInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 export type ComposerBoxPopupSlashCommandProps = {
 	_id: string;
@@ -10,7 +10,7 @@ export type ComposerBoxPopupSlashCommandProps = {
 };
 
 function ComposerBoxPopupSlashCommand({ _id, description, params, disabled }: ComposerBoxPopupSlashCommandProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
index ef38f61cdf6c..a32168799158 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
@@ -1,7 +1,7 @@
 import { OptionAvatar, OptionColumn, OptionContent, OptionInput } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import ReactiveUserStatus from '../../../components/UserStatus/ReactiveUserStatus';
 
@@ -19,7 +19,7 @@ export type ComposerBoxPopupUserProps = {
 };
 
 function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, suggestion, variant }: ComposerBoxPopupUserProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
index 0bcfa22790a9..e20c00a0d1eb 100644
--- a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationDisabled.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerFederationDisabled = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <MessageFooterCallout>{t('Federation_Matrix_Federated_Description_disabled')}</MessageFooterCallout>;
 };
diff --git a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
index 59337376026f..94d578d6fc2d 100644
--- a/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerFederationJoinRoomDisabled = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return <MessageFooterCallout>{t('Federation_Matrix_join_public_rooms_is_premium')}</MessageFooterCallout>;
 };
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
index 74ee27dac24f..ecae4417db7b 100644
--- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
@@ -1,7 +1,7 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import { useResumeChatOnHoldMutation } from './hooks/useResumeChatOnHoldMutation';
@@ -11,7 +11,7 @@ export const ComposerOmnichannelOnHold = (): ReactElement => {
 
 	const room = useOmnichannelRoom();
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<MessageFooterCallout>
diff --git a/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx b/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
index f2965f63c26f..e2d5c1f03fe0 100644
--- a/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, Fragment } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { UserAction } from '../../../../../app/ui/client/lib/UserAction';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
@@ -9,7 +9,7 @@ import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 const maxUsernames = 5;
 
 const ComposerUserActionIndicator = ({ rid, tmid }: { rid: string; tmid?: string }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const actions = useReactiveValue(
 		useCallback(() => {
 			const roomAction = UserAction.get(tmid || rid) || {};
diff --git a/apps/meteor/client/views/room/composer/ComposerVoIP.tsx b/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
index 399e0d32baa7..98670bd45a15 100644
--- a/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerVoIP.tsx
@@ -1,10 +1,10 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 const ComposerVoIP = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return <MessageFooterCallout>{t('Composer_not_available_phone_calls')}</MessageFooterCallout>;
 };
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
index 2010a589edc6..d39b74c079a2 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
@@ -1,7 +1,7 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { isPromptButton, type FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI';
@@ -13,7 +13,7 @@ type FormattingToolbarDropdownProps = {
 };
 
 const FormattingToolbarDropdown = ({ composer, items, disabled }: FormattingToolbarDropdownProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const formattingItems: GenericMenuItemProps[] = items.map((formatter) => {
 		const handleFormattingAction = () => {
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
index c5b1f06dd9b8..7a4f7da20825 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
@@ -1,6 +1,6 @@
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import type { FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import { isPromptButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
@@ -15,7 +15,7 @@ type MessageBoxFormattingToolbarProps = {
 };
 
 const MessageBoxFormattingToolbar = ({ items, variant = 'large', composer, disabled }: MessageBoxFormattingToolbarProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (variant === 'small') {
 		const collapsedItems = [...items];
diff --git a/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts b/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
index e0923c268fe8..e298f86a1e0b 100644
--- a/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/hooks/useMediaActionTitle.ts
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export const useMediaActionTitle = (
 	media: 'audio' | 'video',
@@ -8,7 +8,7 @@ export const useMediaActionTitle = (
 	isMediaEnabled: boolean,
 	isAllowed: boolean,
 ) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const getMediaActionTitle = useMemo(() => {
 		if (isPermissionDenied) {
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
index e5272e749a17..d6e94f4f45ac 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
@@ -1,8 +1,8 @@
 import { Callout, FieldGroup, Field, FieldLabel, FieldRow, ToggleSwitch, Select } from '@rocket.chat/fuselage';
 import type { SelectOption } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarClose,
@@ -30,7 +30,7 @@ const AutoTranslate = ({
 	handleChangeLanguage,
 	handleClose,
 }: AutoTranslateProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	return (
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
index 352f7e46ce6a..5395fb95f467 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
@@ -1,6 +1,6 @@
 import type { IDiscussionMessage, IUser } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 import { normalizeThreadMessage } from '../../../../lib/normalizeThreadMessage';
@@ -14,7 +14,7 @@ type DiscussionListRowProps = {
 };
 
 function DiscussionListRow({ discussion, showRealNames, userId, onClick }: DiscussionListRowProps) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const msg = normalizeThreadMessage(discussion);
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
index a0c4fa09ffae..6fabbaff4a1a 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
@@ -1,9 +1,9 @@
 import type { IDiscussionMessage } from '@rocket.chat/core-typings';
 import { Box, Message } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Emoji from '../../../../../components/Emoji';
 import { clickableItem } from '../../../../../lib/clickableItem';
@@ -33,7 +33,7 @@ const DiscussionListItem = ({
 	emoji,
 	...props
 }: DiscussionListItemProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	return (
 		<Box is={Message} {...props} className={className} pbs={16} pbe={8}>
 			<Message.LeftContainer>
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index ae5a0ada9b52..1e4f30bcfed2 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../components/Contextualbar';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
@@ -23,8 +23,7 @@ export type MailExportFormValues = {
 };
 
 const ExportMessages = () => {
-	const { t } = useTranslation();
-
+	const t = useTranslation();
 	const room = useRoom();
 
 	const { closeTab } = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
index 7344926ec646..9f52085e7bd2 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, Select, ButtonGroup, Button, FieldGroup, InputBox } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
 import type { MailExportFormValues } from './ExportMessages';
@@ -18,7 +18,7 @@ type FileExportProps = {
 };
 
 const FileExport = ({ formId, rid, exportOptions, onCancel }: FileExportProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control, handleSubmit } = useFormContext<MailExportFormValues>();
 	const roomExportMutation = useRoomExportMutation();
 	const formFocus = useAutoFocus<HTMLFormElement>();
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
index 41b6c33fec6c..39e043bb9c0b 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -17,9 +17,9 @@ import {
 	Select,
 } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useContext } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { validateEmail } from '../../../../../lib/emailValidator';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
@@ -36,7 +36,7 @@ type MailExportFormProps = {
 };
 
 const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportFormProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formFocus = useAutoFocus<HTMLFormElement>();
 
 	const {
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
index 84c93e307cb1..459557bde32a 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamConfirmation.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
@@ -10,7 +10,7 @@ type ChannelToTeamConfirmationProps = {
 };
 
 const ChannelToTeamConfirmation = ({ onCancel, onConfirm }: ChannelToTeamConfirmationProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
index ea7335bbbf45..a1e088b158f3 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/ChannelToTeamModal/ChannelToTeamSelection.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import TeamAutocomplete from '../../../../teams/contextualBar/TeamAutocomplete';
@@ -14,7 +14,7 @@ type ChannelToTeamSelectionProps = {
 };
 
 const ChannelToTeamSelection = ({ teamId, onCancel, onChange, onConfirm }: ChannelToTeamSelectionProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
index cbbaad6427d1..31f96a344677 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, IconButton } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -41,7 +41,7 @@ type RoomInfoProps = {
 };
 
 const RoomInfo = ({ room, icon, onClickBack, onClickClose, onClickEnterRoom, onClickEdit, resetState }: RoomInfoProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { name, fname, description, topic, archived, broadcast, announcement } = room;
 	const roomTitle = fname || name;
 	const isDiscussion = 'prid' in room;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
index 512fb83fa153..302a2c476e9d 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
@@ -1,6 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom';
 import { useRoomConvertToTeam } from './actions/useRoomConvertToTeam';
@@ -17,7 +17,7 @@ type UseRoomActionsOptions = {
 export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 	const { onClickEnterRoom, onClickEdit, resetState } = options;
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const handleHide = useRoomHide(room);
 	const handleLeave = useRoomLeave(room);
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload: resetState });
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
index 6dab532b27c6..505a7cbc8590 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -12,7 +12,7 @@ import {
 import KeyboardShortcutSection from './KeyboardShortcutSection';
 
 const KeyboardShortcuts = ({ handleClose }: { handleClose: () => void }): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
index 6a3c74fd3fa4..e61bd736768b 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
@@ -1,6 +1,6 @@
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarClose,
@@ -22,7 +22,7 @@ const MessageSearchTab = () => {
 
 	const [{ searchText, globalSearch }, handleSearch] = useState({ searchText: '', globalSearch: false });
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
index e59ed2cdf780..b9c076e36781 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
@@ -2,9 +2,9 @@ import type { IMessageSearchProvider } from '@rocket.chat/core-typings';
 import { Box, Field, FieldLabel, FieldHint, Icon, TextInput, ToggleSwitch, Callout } from '@rocket.chat/fuselage';
 import { useDebouncedCallback, useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { getRoomTypeTranslation } from '../../../../../lib/getRoomTypeTranslation';
 import { useRoom } from '../../../contexts/RoomContext';
@@ -45,7 +45,7 @@ const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
 	const globalSearchEnabled = provider.settings.GlobalSearchEnabled;
 	const globalSearchToggleId = useUniqueId();
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box is='form' onSubmit={submitHandler} w='full'>
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
index c7ccb8b61232..5066825d8311 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -30,7 +30,7 @@ const NotificationPreferences = ({
 	notificationOptions,
 	handlePlaySound,
 }: NotificationPreferencesProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		formState: { isDirty, isSubmitting },
 	} = useFormContext();
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
index b9b54af27c08..dcf1522197ee 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesForm.tsx
@@ -1,8 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { FieldGroup, IconButton, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import NotificationByDevice from './components/NotificationByDevice';
 import NotificationPreference from './components/NotificationPreference';
@@ -16,7 +16,7 @@ type NotificationPreferencesFormProps = {
 };
 
 const NotificationPreferencesForm = ({ notificationOptions, handlePlaySound }: NotificationPreferencesFormProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { watch, control } = useFormContext();
 
 	const { showCounter } = watch();
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
index 89c82fd966ec..aaf119e703ff 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Button, Callout, Throbber } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEventHandler, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import {
@@ -27,7 +27,7 @@ type OTRProps = {
 };
 
 const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh, otrState, peerUsername }: OTRProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const room = useRoom();
 
 	const renderOTRState = (): ReactElement => {
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
index 21be67e28011..e74dbb5c54f6 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type OTREstablishedProps = {
 	onClickRefresh: () => void;
@@ -9,7 +9,7 @@ type OTREstablishedProps = {
 };
 
 const OTREstablished = ({ onClickRefresh, onClickEnd }: OTREstablishedProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<ButtonGroup stretch>
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
index 67f3e62d1592..0794c829b58a 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
@@ -1,8 +1,8 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type OTRStatesProps = {
 	title: string;
@@ -12,7 +12,7 @@ type OTRStatesProps = {
 };
 
 const OTRStates = ({ title, description, icon, onClickStart }: OTRStatesProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<States>
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
index 88b979dc8bc3..17242ed06daa 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
@@ -1,9 +1,9 @@
 import { Field, FieldLabel, FieldRow, ButtonGroup, Button, CheckBox, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -25,7 +25,7 @@ type PruneMessagesProps = {
 };
 
 const PruneMessages = ({ callOutText, validateText, onClickClose, onClickPrune }: PruneMessagesProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { control, register } = useFormContext();
 
 	const inclusiveCheckboxId = useUniqueId();
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
index e699ee6f6c77..be479ffe77bd 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
@@ -1,9 +1,9 @@
 import type { IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ContextualbarSection } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -42,7 +42,7 @@ const RoomFiles = ({
 	onClickClose,
 	onClickDelete,
 }: RoomFilesProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const options: SelectOption[] = useMemo(
 		() => [
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
index 1dc2a4c57191..59a06fdb4251 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
@@ -1,9 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Field, FieldLabel, FieldRow, Select, Button } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type EditInviteLinkProps = {
 	daysAndMaxUses: { days: string; maxUses: string };
@@ -11,7 +11,7 @@ type EditInviteLinkProps = {
 };
 
 const EditInviteLink = ({ daysAndMaxUses, onClickNewLink }: EditInviteLinkProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		handleSubmit,
 		formState: { isDirty, isSubmitting },
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
index e5aabea4a688..cd2fb2a22a4b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
@@ -1,7 +1,7 @@
 import { Box, Field, FieldLabel, FieldRow, UrlInput, Icon, Button, InputBox } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../../../../../hooks/useClipboardWithToast';
 
@@ -12,7 +12,7 @@ type InviteLinkProps = {
 };
 
 const InviteLink = ({ linkText, captionText, onClickEdit }: InviteLinkProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { copy } = useClipboardWithToast(linkText);
 
 	return (
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
index 1ae82e75681a..fa7a915a7285 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
@@ -1,7 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -38,7 +38,7 @@ const InviteUsers = ({
 	linkText,
 	error,
 }: InviteUsersProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index 453f55fc71a3..c265a28cb284 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -1,8 +1,8 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
@@ -15,7 +15,7 @@ type RoomMembersActionsProps = {
 };
 
 const RoomMembersActions = ({ username, _id, name, rid, reload }: RoomMembersActionsProps): ReactElement | null => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { menuActions: menuOptions } = useUserInfoActions({ _id, username, name }, rid, reload, 0, true);
 	if (!menuOptions) {
 		return null;
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
index 4a0e71746417..03a80c496028 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
@@ -1,9 +1,9 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Message, Box, IconButton } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import Emoji from '../../../../../components/Emoji';
 import { followStyle, anchor } from '../../../../../components/message/helpers/followSyle';
@@ -47,7 +47,7 @@ const ThreadListMessage = ({
 	emoji,
 	...props
 }: ThreadListMessageProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useTimeAgo();
 
 	const button = !following ? 'bell-off' : 'bell';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
index 3245b1c03010..4e151bab4bec 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageItem.tsx
@@ -1,7 +1,7 @@
 import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typings';
 import { Box, Bubble, MessageDivider } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import SystemMessage from '../../../../../components/message/variants/SystemMessage';
 import ThreadMessage from '../../../../../components/message/variants/ThreadMessage';
@@ -27,7 +27,7 @@ export const ThreadMessageItem = ({
 	firstUnread,
 	system,
 }: ThreadMessageProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const formatDate = useFormatDate();
 	const ref = useDateRef();
 
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index b60bcb749f5b..17e8bd1470ba 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -2,9 +2,9 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton, Skeleton } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { UserInfoAction } from '../../../../components/UserInfo';
 import { useMemberExists } from '../../../hooks/useMemberExists';
@@ -17,7 +17,7 @@ type UserInfoActionsProps = {
 };
 
 const UserInfoActions = ({ user, rid, backToList }: UserInfoActionsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const {
 		data: isMemberData,
 		refetch,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
index 89aecda07fdc..41a980dccf31 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
@@ -1,7 +1,7 @@
 import { Modal, Button, Box, Callout, Margins } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type VideoConfConfigModalProps = {
 	onClose: () => void;
@@ -10,7 +10,7 @@ type VideoConfConfigModalProps = {
 };
 
 const VideoConfConfigModal = ({ onClose, onConfirm, isAdmin }: VideoConfConfigModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
index c8c7b6a59e3b..b9da11fcd67d 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
@@ -1,9 +1,9 @@
 import type { VideoConference } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Throbber } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -29,7 +29,7 @@ type VideoConfListProps = {
 };
 
 const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loadMoreItems }: VideoConfListProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { ref, contentBoxSize: { inlineSize = 378, blockSize = 1 } = {} } = useResizeObserver<HTMLElement>({
 		debounceDelay: 200,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
index 09ddfb51b3a2..44727aae98c9 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupContent,
@@ -15,7 +16,6 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVideoConfSetPreferences } from '../../../../../../contexts/VideoConfContext';
 import { AsyncStatePhase } from '../../../../../../hooks/useAsyncState';
@@ -32,7 +32,7 @@ type IncomingPopupProps = {
 };
 
 const IncomingPopup = ({ id, room, position, onClose, onMute, onConfirm }: IncomingPopupProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { controllersConfig, handleToggleMic, handleToggleCam } = useVideoConfControllers();
 	const setPreferences = useVideoConfSetPreferences();
 
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
index eaf82c5a301e..92f30c0c1cea 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
@@ -1,4 +1,5 @@
 import type { IRoom } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupContent,
@@ -13,7 +14,6 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
@@ -25,7 +25,7 @@ type OutgoingPopupProps = {
 };
 
 const OutgoingPopup = ({ room, onClose, id }: OutgoingPopupProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const videoConfPreferences = useVideoConfPreferences();
 	const { controllersConfig } = useVideoConfControllers(videoConfPreferences);
 	const capabilities = useVideoConfCapabilities();
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
index a9fcb8527767..d1bc3a29231b 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
@@ -1,5 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useOutsideClick, useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
 	VideoConfPopupHeader,
@@ -14,7 +15,6 @@ import {
 } from '@rocket.chat/ui-video-conf';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { useCallback, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useVideoConfSetPreferences, useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import { useVideoConfRoomName } from '../../hooks/useVideoConfRoomName';
@@ -29,7 +29,7 @@ type StartCallPopupProps = {
 };
 
 const StartCallPopup = ({ id, loading, room, onClose, onConfirm }: StartCallPopupProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const ref = useRef(null);
 	useOutsideClick([ref], !loading ? onClose : () => undefined);
 
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
index ff96e220723a..6b48a47a79ef 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
@@ -1,7 +1,7 @@
 import { AudioPlayer, Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useState, memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 import { FilePreviewType } from './FilePreview';
@@ -38,7 +38,7 @@ type MediaPreviewProps = {
 
 const MediaPreview = ({ file, fileType }: MediaPreviewProps): ReactElement => {
 	const [loaded, url] = useFileAsDataURL(file);
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (!loaded) {
 		return <PreviewSkeleton />;
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
index cd309923ffd4..70a91df0e555 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import Reactions from './Reactions';
@@ -12,7 +12,7 @@ type ReactionListModalProps = {
 };
 
 const ReactionListModal = ({ reactions, onClose }: ReactionListModalProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal variant='info' title={t('Users_reacted')} onClose={onClose} onConfirm={onClose} confirmText={t('Close')}>
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
index 3f152db142e9..827e16b1ac60 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
@@ -1,7 +1,7 @@
 import { Box, Icon, IconButton, Tag } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 type FilePickerBreadcrumbsProps = {
 	parentFolders: string[];
@@ -10,7 +10,7 @@ type FilePickerBreadcrumbsProps = {
 };
 
 const FilePickerBreadcrumbs = ({ parentFolders, handleBreadcrumb, handleBack }: FilePickerBreadcrumbsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' alignItems='center' overflowX='auto' mie={8}>
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
index 32b379eca432..e85248fca0e9 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
@@ -1,8 +1,8 @@
 import type { IWebdavNode } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
@@ -36,7 +36,7 @@ const WebdavFilePickerTable = ({
 	onNodeClick,
 	isLoading,
 }: WebdavFilePickerTableProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<Box display='flex' flexDirection='column' overflowY='hidden' height='x256'>
diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
index 2bb54f1fc69c..f7f14bc8199d 100644
--- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
+++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
@@ -1,8 +1,8 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableHeader, GenericTableBody } from '../../../components/GenericTable';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
@@ -29,7 +29,7 @@ const ChannelDesertionTable = ({
 }: ChannelDesertionTableProps) => {
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'ts'>('name');
 
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const selectedRoomsLength = Object.values(selectedRooms).filter(Boolean).length;
 
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
index a4aba906e7d9..ae5b30609d78 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import ChannelDesertionTable from '../../ChannelDesertionTable';
@@ -28,7 +28,7 @@ const FirstStep = ({
 	eligibleRoomsLength,
 	...props
 }: FirstStepProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
index 27b4a9c7d772..118149591d01 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
@@ -16,7 +16,7 @@ type SecondStepsProps = {
 };
 
 const SecondStep = ({ onClose, onCancel, onConfirm, deletedRooms = {}, rooms = [], ...props }: SecondStepsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index aae1d604dba0..418883869a4a 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -2,15 +2,15 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { CheckBox } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
 
 const TeamsChannelItemMenu = ({ room, mainRoom, reload }: { room: IRoom; mainRoom: IRoom; reload?: () => void }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const { handleRemoveRoom, canRemoveTeamChannel } = useRemoveRoomFromTeam(room, { reload });
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload });
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
index 288604727ef6..b1847825ffab 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback, useAutoFocus, useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, Dispatch, SetStateAction, SyntheticEvent } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import {
@@ -54,7 +54,7 @@ const TeamsChannels = ({
 	onClickView,
 	reload,
 }: TeamsChannelsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 
 	const options: SelectOption[] = useMemo(
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
index 24555a1fc9e0..4bd85aed663c 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableBody, GenericTableHeader } from '../../../../../../components/GenericTable';
 import { useSort } from '../../../../../../components/GenericTable/hooks/useSort';
@@ -15,7 +15,7 @@ type ChannelDeletionTableProps = {
 };
 
 const ChannelDeletionTable = ({ rooms, onChangeRoomSelection, selectedRooms, onToggleAllRooms }: ChannelDeletionTableProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'usersCount'>('name');
 
 	const selectedRoomsLength = Object.values(selectedRooms).filter(Boolean).length;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
index e87eb5825af6..0a02e1243431 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import ChannelDeletionTable from './ChannelDeletionTable';
@@ -23,7 +23,7 @@ const DeleteTeamChannels = ({
 	onConfirm,
 	onChangeRoomSelection,
 }: DeleteTeamChannelsProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
index 4eed097a4a3e..d7c711cf2d42 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
@@ -1,6 +1,6 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import RoomLinkList from './RoomLinkList';
@@ -14,7 +14,7 @@ type DeleteTeamConfirmationProps = {
 };
 
 const DeleteTeamConfirmation = ({ deletedRooms, keptRooms, onConfirm, onReturn, onCancel }: DeleteTeamConfirmationProps) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const roomIds = Object.values(deletedRooms).map(({ _id }) => _id);
 
 	return (
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
index 230828ef6795..0a4b0fbe6af3 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../../ChannelDesertionTable';
@@ -27,7 +27,7 @@ const LeaveTeamModalChannels = ({
 	eligibleRoomsLength,
 	selectedRooms,
 }: LeaveTeamModalChannelsProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
index 0fd32323bfff..36ef2c54f4bc 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
@@ -1,7 +1,7 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../../components/GenericModal';
 
@@ -15,7 +15,7 @@ type LeaveTeamModalConfirmationProps = {
 };
 
 const LeaveTeamModalConfirmation = ({ selectedRooms, onConfirm, onCancel, onClose }: LeaveTeamModalConfirmationProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index a5e554ca6f05..f28f4c8b5742 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Button, Callout, Option, Menu } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import {
 	ContextualbarHeader,
@@ -50,7 +50,7 @@ const TeamsInfo = ({
 	onClickViewChannels,
 	onClickConvertToChannel,
 }: TeamsInfoProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const retentionPolicy = useRetentionPolicy(room);
 
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
index d467b6957e0f..9657ea153a78 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersFirstStep.js
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../ChannelDesertionTable';
@@ -21,7 +21,7 @@ const RemoveUsersFirstStep = ({
 	eligibleRoomsLength,
 	...props
 }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
index 8fe67f29fbb2..be5258e0c097 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersSecondStep.js
@@ -1,11 +1,11 @@
 import { Icon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
 const RemoveUsersSecondStep = ({ onClose, onCancel, onConfirm, deletedRooms = {}, username, rooms = [], ...props }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/voip/modal/DialPad/DialInput.tsx b/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
index 36a81d47ec8f..cf96f4e26507 100644
--- a/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
+++ b/apps/meteor/client/voip/modal/DialPad/DialInput.tsx
@@ -1,7 +1,7 @@
 import { IconButton, TextInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, FocusEvent } from 'react';
 import React, { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type DialInputProps = {
 	inputName: string;
@@ -16,7 +16,7 @@ export const DialInput = forwardRef<HTMLInputElement, DialInputProps>(function D
 	{ handleBackspaceClick, handleOnChange, isButtonDisabled, inputError, inputName },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<TextInput
diff --git a/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx b/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
index b3b92609d1a5..8c94ad238ddc 100644
--- a/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
+++ b/apps/meteor/client/voip/modal/DialPad/hooks/useDialPad.tsx
@@ -1,7 +1,7 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, RefCallback } from 'react';
 import { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 import { useDialModal } from '../../../../hooks/useDialModal';
 import { useOutboundDialer } from '../../../../hooks/useOutboundDialer';
@@ -25,7 +25,7 @@ type DialPadProps = {
 };
 
 export const useDialPad = ({ initialValue, initialErrorMessage }: DialPadProps): DialPadStateHandlers => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const outboundClient = useOutboundDialer();
 	const { closeDialModal } = useDialModal();
 
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index bfc9b67048d2..4d88dead830c 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -183,7 +183,7 @@
 		"eslint-plugin-testing-library": "~6.2.2",
 		"eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0",
 		"fast-glob": "^3.2.12",
-		"i18next": "~23.14.0",
+		"i18next": "~23.4.9",
 		"jest": "~29.7.0",
 		"jsdom-global": "^3.0.2",
 		"mocha": "^9.2.2",
@@ -408,7 +408,7 @@
 		"react-dom": "~17.0.2",
 		"react-error-boundary": "^3.1.4",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"react-keyed-flatten-children": "^1.3.0",
 		"react-virtuoso": "^4.7.1",
 		"redis": "^4.0.6",
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
index 7ecb8f309b29..0797d896f22d 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
@@ -22,7 +22,7 @@ import { logger } from './logger';
 type FileAttachment = VideoAttachmentProps & ImageAttachmentProps & AudioAttachmentProps;
 
 const language = settings.get<string>('Language') || 'en';
-const t = i18n.getFixedT(language);
+const t = (s: string): string => i18n.t(s, { lng: language });
 
 async function getGuestByEmail(email: string, name: string, department = ''): Promise<ILivechatVisitor | null> {
 	const guest = await LivechatVisitors.findOneGuestByEmailAddress(email);
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
index 44a9e2cd6a15..51718e4937d8 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
@@ -20,7 +20,7 @@ const livechatQuoteRegExp = /^\[\s\]\(https?:\/\/.+\/live\/.+\?msg=(?<id>.+?)\)\
 const getRocketCatUser = async (): Promise<IUser | null> => Users.findOneById('rocket.cat');
 
 const language = settings.get<string>('Language') || 'en';
-const t = i18n.getFixedT(language);
+const t = (s: string): string => i18n.t(s, { lng: language });
 
 // TODO: change these messages with room notifications
 const sendErrorReplyMessage = async (error: string, options: any) => {
diff --git a/apps/meteor/server/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts
index 0eb7dd6a5387..da0efeb5c4a4 100644
--- a/apps/meteor/server/lib/i18n.ts
+++ b/apps/meteor/server/lib/i18n.ts
@@ -1,4 +1,6 @@
+import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
 import i18nDict from '@rocket.chat/i18n';
+import type { TOptions } from 'i18next';
 
 import { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces, i18n } from '../../app/utils/lib/i18n';
 
@@ -17,4 +19,13 @@ void i18n.init({
 	initImmediate: false,
 });
 
+declare module 'i18next' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface TFunction {
+		(key: RocketchatI18nKeys, options?: TOptions): string;
+		(key: RocketchatI18nKeys, ...options: unknown[]): string;
+		<T>(key: T extends string ? (T extends RocketchatI18nKeys ? T : never) : never, options?: TOptions): string;
+	}
+}
+
 export { i18n };
diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts
index 26ac78f30ad6..85da6e59cf60 100644
--- a/apps/meteor/server/lib/resetUserE2EKey.ts
+++ b/apps/meteor/server/lib/resetUserE2EKey.ts
@@ -20,7 +20,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
 		return;
 	}
 
-	const t = i18n.getFixedT(language);
+	const t = (s: string): string => i18n.t(s, { lng: language });
 	const text = `
 	${t('Your_e2e_key_has_been_reset')}
 
diff --git a/apps/meteor/server/modules/core-apps/mention.module.ts b/apps/meteor/server/modules/core-apps/mention.module.ts
index 76d3a22ea53b..ac615def8a5a 100644
--- a/apps/meteor/server/modules/core-apps/mention.module.ts
+++ b/apps/meteor/server/modules/core-apps/mention.module.ts
@@ -44,10 +44,13 @@ export class MentionModule implements IUiKitCoreApp {
 
 		if (actionId === 'dismiss') {
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
-					mentions: joinedUsernames,
-					lng: payload.user.language,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room',
+					{
+						mentions: joinedUsernames,
+					},
+					payload.user.language,
+				),
 				_id: payload.message,
 				tmid: message.tmid,
 				mentions,
@@ -58,10 +61,13 @@ export class MentionModule implements IUiKitCoreApp {
 		if (actionId === 'add-users') {
 			void addUsersToRoomMethod(payload.user._id, { rid: payload.room, users: usernames as string[] }, payload.user);
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
-					mentions: joinedUsernames,
-					lng: payload.user.language,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room',
+					{
+						mentions: joinedUsernames,
+					},
+					payload.user.language,
+				),
 				tmid: message.tmid,
 				_id: payload.message,
 				mentions,
@@ -81,10 +87,13 @@ export class MentionModule implements IUiKitCoreApp {
 				throw new Error('Mention bot - Failed to retrieve path to room');
 			}
 
-			const messageText = i18n.t('Youre_not_a_part_of__channel__and_I_mentioned_you_there', {
-				channel: `#${sub.name}`,
-				lng: payload.user.language,
-			});
+			const messageText = i18n.t(
+				'Youre_not_a_part_of__channel__and_I_mentioned_you_there',
+				{
+					channel: `#${sub.name}`,
+				},
+				payload.user.language,
+			);
 
 			const link = new URL(Meteor.absoluteUrl(roomPath));
 			link.searchParams.set('msg', message._id);
@@ -100,10 +109,13 @@ export class MentionModule implements IUiKitCoreApp {
 			);
 
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm', {
-					mentions: joinedUsernames,
-					lng: payload.user.language,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm',
+					{
+						mentions: joinedUsernames,
+					},
+					payload.user.language,
+				),
 				tmid: message.tmid,
 				_id: payload.message,
 				mentions,
diff --git a/apps/meteor/server/services/omnichannel-analytics/service.ts b/apps/meteor/server/services/omnichannel-analytics/service.ts
index 8b27ed4b9f57..4f479d83acdd 100644
--- a/apps/meteor/server/services/omnichannel-analytics/service.ts
+++ b/apps/meteor/server/services/omnichannel-analytics/service.ts
@@ -160,7 +160,7 @@ export class OmnichannelAnalyticsService extends ServiceClassInternal implements
 			return;
 		}
 
-		const t = i18n.getFixedT(language);
+		const t = (s: string) => i18n.t(s, { lng: language });
 
 		const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
 		return this.overview.callAction(name, from, to, departmentId, timezone, t, extraQuery);
diff --git a/package.json b/package.json
index 2a8ae8bf94c4..271b3adfea3d 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
 		"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
 		"@rocket.chat/forked-matrix-sdk-crypto-nodejs": "0.1.0-beta.13",
 		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch",
-		"react-i18next@~15.0.1": "patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch",
 		"moleculer@^0.14.34": "patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch"
 	},
 	"dependencies": {
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index f8af78aa67cd..877062dd83e1 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -93,14 +93,14 @@
     "babel-loader": "~8.2.5",
     "cross-env": "^7.0.3",
     "eslint": "~8.45.0",
-    "i18next": "~23.14.0",
+    "i18next": "^23.10.1",
     "jest": "~29.7.0",
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "~2.8.8",
     "react-docgen-typescript-plugin": "~1.0.8",
     "react-dom": "^17.0.2",
-    "react-i18next": "~15.0.1",
+    "react-i18next": "~13.2.2",
     "rimraf": "^3.0.2",
     "storybook-dark-mode": "~3.0.3",
     "tslib": "^2.5.3",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index b42dcbf4490b..531f3dd2e34b 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -64,7 +64,6 @@
 		"outdent": "^0.8.0",
 		"react-docgen-typescript-plugin": "~1.0.8",
 		"react-dom": "~17.0.2",
-		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
diff --git a/packages/gazzodown/src/elements/LinkSpan.tsx b/packages/gazzodown/src/elements/LinkSpan.tsx
index 6ac649768db6..5472c12e6d63 100644
--- a/packages/gazzodown/src/elements/LinkSpan.tsx
+++ b/packages/gazzodown/src/elements/LinkSpan.tsx
@@ -1,7 +1,7 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { getBaseURI, isExternal } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { ReactElement, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import BoldSpan from './BoldSpan';
 import ItalicSpan from './ItalicSpan';
@@ -14,7 +14,7 @@ type LinkSpanProps = {
 };
 
 const LinkSpan = ({ href, label }: LinkSpanProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const children = useMemo(() => {
 		const labelArray = Array.isArray(label) ? label : [label];
 
diff --git a/packages/gazzodown/src/elements/PlainSpan.tsx b/packages/gazzodown/src/elements/PlainSpan.tsx
index 06460c348652..582490207717 100644
--- a/packages/gazzodown/src/elements/PlainSpan.tsx
+++ b/packages/gazzodown/src/elements/PlainSpan.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { Fragment, memo, ReactElement, useContext, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -8,7 +8,7 @@ type PlainSpanProps = {
 };
 
 const PlainSpan = ({ text }: PlainSpanProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { highlightRegex, markRegex } = useContext(MarkupInteractionContext);
 
 	const content = useMemo(() => {
diff --git a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
index 54f22ccca7d8..6b8e8518a422 100644
--- a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
+++ b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
@@ -1,6 +1,6 @@
 import { Message } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo, ReactElement, useContext, useMemo, KeyboardEvent } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -11,7 +11,7 @@ type ChannelMentionElementProps = {
 const handleChannelMention = (mention: string, withSymbol: boolean | undefined): string => (withSymbol ? `#${mention}` : mention);
 
 const ChannelMentionElement = ({ mention }: ChannelMentionElementProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { resolveChannelMention, onChannelMentionClick, showMentionSymbol } = useContext(MarkupInteractionContext);
 
 	const resolved = useMemo(() => resolveChannelMention?.(mention), [mention, resolveChannelMention]);
diff --git a/packages/gazzodown/src/mentions/UserMentionElement.tsx b/packages/gazzodown/src/mentions/UserMentionElement.tsx
index 6f52a16a5482..a9ba5567541f 100644
--- a/packages/gazzodown/src/mentions/UserMentionElement.tsx
+++ b/packages/gazzodown/src/mentions/UserMentionElement.tsx
@@ -1,6 +1,6 @@
 import { Message } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo, ReactElement, useContext, useMemo, KeyboardEvent } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 
@@ -12,7 +12,7 @@ const handleUserMention = (mention: string | undefined, withSymbol: boolean | un
 	withSymbol ? `@${mention}` : mention;
 
 const UserMentionElement = ({ mention }: UserMentionElementProps): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { resolveUserMention, onUserMentionClick, ownUserId, useRealName, showMentionSymbol, triggerProps } =
 		useContext(MarkupInteractionContext);
 
diff --git a/packages/i18n/jest.config.ts b/packages/i18n/jest.config.ts
index 652cb006f406..eb3d5fd797e5 100644
--- a/packages/i18n/jest.config.ts
+++ b/packages/i18n/jest.config.ts
@@ -4,6 +4,6 @@ import type { Config } from 'jest';
 export default {
 	preset: server.preset,
 	testMatch: ['<rootDir>/src/**/*.spec.(ts|js|mjs)'],
-	transformIgnorePatterns: ['<rootDir>/node_modules/@babel', '<rootDir>/node_modules/@jest', 'signal-exit', 'is-typedarray'],
+	transformIgnorePatterns: ['<rootDir>/node_modules/@babel', '<rootDir>/node_modules/@jest', 'signal-exit'],
 	collectCoverage: false,
 } satisfies Config;
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index b93b9e9926cc..9dd0c4534340 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -2,30 +2,27 @@
 	"name": "@rocket.chat/i18n",
 	"version": "0.8.0-rc.1",
 	"private": true,
-	"type": "module",
-	"main": "./dist/index.js",
-	"module": "./dist/index.mjs",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
-	"scripts": {
-		"build": "node ./src/index.mjs",
-		"lint": "eslint --ext .mjs,.js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .mjs,.js,.jsx,.ts,.tsx . --fix",
-		"test": "jest",
-		"testunit": "jest"
-	},
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"eslint": "~8.45.0",
-		"i18next": "~23.14.0",
 		"jest": "~29.7.0",
+		"tsup": "^6.7.0",
 		"typescript": "~5.5.4"
 	},
-	"peerDependencies": {
-		"i18next": "*"
+	"scripts": {
+		"build": "node ./src/index.mjs",
+		"lint": "eslint --ext .mjs,.js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .mjs,.js,.jsx,.ts,.tsx . --fix",
+		"test": "jest",
+		"testunit": "jest"
 	},
+	"main": "./dist/index.js",
+	"module": "./dist/index.mjs",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"type": "module",
 	"volta": {
 		"extends": "../../package.json"
 	}
diff --git a/packages/i18n/src/index.mjs b/packages/i18n/src/index.mjs
index f39d4df9860d..c952cac7de07 100644
--- a/packages/i18n/src/index.mjs
+++ b/packages/i18n/src/index.mjs
@@ -84,9 +84,7 @@ const cjs = `module.exports = {
 
 const keys = Object.keys(JSON.parse(fs.readFileSync(`./src/locales/en.i18n.json`, 'utf8')));
 
-const tds = `import 'i18next';
-
-export interface RocketchatI18n {
+const tds = `export interface RocketchatI18n {
 	${keys.map((key) => `${JSON.stringify(key)}: string;`).join('\n\t')}
 }
 
@@ -96,16 +94,6 @@ const dict: {
 
 export type RocketchatI18nKeys = keyof RocketchatI18n;
 
-declare module 'i18next' {
-	interface TFunction {
-		<TKey extends keyof RocketchatI18n>(key: TKey, options?: TOptions): string;
-		<TKey extends \`\${string}_\$\{'one' | 'other' | 'zero' | 'few' | 'many' | 'two' | 'three' | 'four'}\`>(
-			key: TKey,
-			options?: TOptions,
-		): string;
-	}
-}
-
 export = dict;
 `;
 
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index fbeebab85ef6..e635891f3da7 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -106,7 +106,7 @@
 		"date-fns": "^2.15.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
-		"i18next": "~23.14.0",
+		"i18next": "~23.4.9",
 		"markdown-it": "^11.0.1",
 		"mem": "^6.1.1",
 		"mitt": "^2.1.0",
@@ -115,7 +115,7 @@
 		"preact-router": "^3.2.1",
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"storybook-dark-mode": "~3.0.3",
 		"whatwg-fetch": "^3.6.20"
 	},
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 3cd4aef7325d..c55acfa8cd32 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -5,8 +5,8 @@
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/i18n": "workspace:~",
-		"i18next": "~23.14.0",
-		"react-i18next": "~15.0.1",
+		"i18next": "~23.4.9",
+		"react-i18next": "~13.2.2",
 		"use-sync-external-store": "~1.2.2"
 	},
 	"devDependencies": {
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 32998ff327b8..8638a3e707b1 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -2,21 +2,6 @@
 	"name": "@rocket.chat/ui-client",
 	"version": "11.0.0-rc.5",
 	"private": true,
-	"main": "./dist/index.js",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
-	"scripts": {
-		"build": "rm -rf dist && tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"storybook": "start-storybook -p 6006",
-		"test": "jest",
-		"testunit": "jest",
-		"typecheck": "tsc --noEmit"
-	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
@@ -52,17 +37,31 @@
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
 		"typescript": "~5.5.4"
 	},
+	"scripts": {
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"typecheck": "tsc --noEmit",
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"test": "jest",
+		"testunit": "jest",
+		"storybook": "start-storybook -p 6006"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
 	"peerDependencies": {
 		"@react-aria/toolbar": "*",
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.5",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
+		"@rocket.chat/ui-avatar": "*",
+		"@rocket.chat/ui-contexts": "*",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-client/src/components/CustomFieldsForm.tsx b/packages/ui-client/src/components/CustomFieldsForm.tsx
index 98b9c3fdad79..76cfc44fe010 100644
--- a/packages/ui-client/src/components/CustomFieldsForm.tsx
+++ b/packages/ui-client/src/components/CustomFieldsForm.tsx
@@ -3,10 +3,10 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { Field, FieldLabel, FieldRow, FieldError, Select, TextInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useMemo } from 'react';
 import type { Control, FieldValues, FieldError as RHFFieldError } from 'react-hook-form';
 import { Controller, useFormState, get } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 
 type CustomFieldFormProps<T extends FieldValues> = {
 	metadata: CustomFieldMetadata[];
@@ -34,7 +34,7 @@ const CustomField = <T extends FieldValues>({
 	options = [],
 	...props
 }: CustomFieldProps<T>) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const { errors } = useFormState({ control });
 	const fieldId = useUniqueId();
 
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
index a67baa11e700..bdd7f5fbda18 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
@@ -1,4 +1,3 @@
-import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -31,7 +30,7 @@ const sections = [regular, danger];
 
 describe('Room Actions Menu', () => {
 	it('should render kebab menu with the list content', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
 
 		await userEvent.click(screen.getByRole('button'));
 
@@ -40,7 +39,7 @@ describe('Room Actions Menu', () => {
 	});
 
 	it('should have two different sections, regular and danger', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
 
 		await userEvent.click(screen.getByRole('button'));
 
@@ -49,7 +48,7 @@ describe('Room Actions Menu', () => {
 	});
 
 	it('should call the action when item clicked', async () => {
-		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true, wrapper: mockAppRoot().build() });
+		render(<GenericMenu title='Kebab' sections={sections} />, { legacyRoot: true });
 
 		await userEvent.click(screen.getByRole('button'));
 		await userEvent.click(screen.getAllByRole('menuitem')[0]);
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index ddd9efe142ce..448aea15db4f 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -1,6 +1,6 @@
 import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactNode } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import { type ComponentProps, type ReactNode } from 'react';
 
 import type { GenericMenuItemProps } from './GenericMenuItem';
 import GenericMenuItem from './GenericMenuItem';
@@ -30,7 +30,7 @@ type GenericMenuConditionalProps =
 type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof MenuV2>, 'children'>;
 
 const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, ...props }: GenericMenuProps) => {
-	const { t, i18n } = useTranslation();
+	const t = useTranslation();
 
 	const sections = 'sections' in props && props.sections;
 	const items = 'items' in props && props.items;
@@ -55,14 +55,14 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 			{sections && (
 				<MenuV2
 					icon={icon}
-					title={i18n.exists(title) ? t(title) : title}
+					title={t.has(title) ? t(title) : title}
 					onAction={onAction || handleAction}
 					{...(disabledKeys && { disabledKeys })}
 					{...props}
 				>
 					{sections.map(({ title, items }, key) => (
 						<MenuSection
-							title={typeof title === 'string' && i18n.exists(title) ? t(title) : title}
+							title={typeof title === 'string' && t.has(title) ? t(title) : title}
 							items={handleItems(items)}
 							key={`${title}-${key}`}
 						>
@@ -78,7 +78,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
 			{items && (
 				<MenuV2
 					icon={icon}
-					title={i18n.exists(title) ? t(title) : title}
+					title={t.has(title) ? t(title) : title}
 					onAction={onAction || handleAction}
 					{...(disabledKeys && { disabledKeys })}
 					{...props}
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
index e28c0a7ad452..acd1e1eb8d6b 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
@@ -1,9 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type MultiSelectCustomAnchorProps = {
 	collapsed: boolean;
@@ -17,7 +17,7 @@ const MultiSelectCustomAnchor = forwardRef<HTMLElement, MultiSelectCustomAnchorP
 	{ className, collapsed, selectedOptionsCount, selectedOptionsTitle, defaultTitle, maxCount, ...props },
 	ref,
 ) {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const customStyle = css`
 		&:hover {
 			cursor: pointer;
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index fb8c68d49f46..d73d9ce6b88b 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -1,8 +1,8 @@
 import { Box, CheckBox, Icon, Option, SearchInput, Tile } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import { Fragment, useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { type OptionProp } from './MultiSelectCustom';
 import { useFilteredOptions } from './useFilteredOptions';
@@ -16,7 +16,7 @@ const MultiSelectCustomList = ({
 	onSelected: (item: OptionProp, e?: FormEvent<HTMLElement>) => void;
 	searchBarText?: string;
 }) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	const [text, setText] = useState('');
 
diff --git a/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx b/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
index 9b65b9ad37a6..341c26179198 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/useFilteredOptions.tsx
@@ -1,10 +1,10 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 
 import type { OptionProp } from './MultiSelectCustom';
 
 export const useFilteredOptions = (optionSearch: string | undefined, options: OptionProp[]) => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	if (!optionSearch) return options;
 
diff --git a/packages/ui-client/src/components/UserStatus/UserStatus.tsx b/packages/ui-client/src/components/UserStatus/UserStatus.tsx
index 35db49297724..92513498247b 100644
--- a/packages/ui-client/src/components/UserStatus/UserStatus.tsx
+++ b/packages/ui-client/src/components/UserStatus/UserStatus.tsx
@@ -1,14 +1,14 @@
 import { StatusBullet } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 export type UserStatusProps = {
 	small?: boolean;
 } & ComponentProps<typeof StatusBullet>;
 
 function UserStatus({ small, status, ...props }: UserStatusProps): ReactElement {
-	const { t } = useTranslation();
+	const t = useTranslation();
 	const size = small ? 'small' : 'large';
 
 	switch (status) {
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 46fc94aa8da9..c8d131c47d66 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -9,11 +9,11 @@
 		"/dist"
 	],
 	"scripts": {
-		"build": "tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"storybook": "start-storybook -p 6006 --no-version-updates"
+		"storybook": "start-storybook -p 6006 --no-version-updates",
+		"build": "tsc -p tsconfig.build.json",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput"
 	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -40,7 +40,7 @@
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
-		"react-i18next": "~15.0.1",
+		"react-i18next": "~13.2.2",
 		"storybook-dark-mode": "~3.0.3",
 		"typescript": "~5.5.4"
 	},
diff --git a/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx b/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
index d1fa2df3d4b3..60cfef030dc3 100644
--- a/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
+++ b/packages/web-ui-registration/src/SecretRegisterInvalidForm.tsx
@@ -1,10 +1,10 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import VerticalTemplate from './template/VerticalTemplate';
 
 const SecretRegisterInvalidForm = (): ReactElement => {
-	const { t } = useTranslation();
+	const t = useTranslation();
 
 	return (
 		<VerticalTemplate>
diff --git a/yarn.lock b/yarn.lock
index ec6141a47d2e..026299547a0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2937,7 +2937,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.24.4
   resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
@@ -2946,15 +2946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.24.8":
-  version: 7.25.6
-  resolution: "@babel/runtime@npm:7.25.6"
-  dependencies:
-    regenerator-runtime: ^0.14.0
-  checksum: ee1a69d3ac7802803f5ee6a96e652b78b8addc28c6a38c725a4ad7d61a059d9e6cb9f6550ed2f63cce67a1bd82e0b1ef66a1079d895be6bfb536a5cfbd9ccc32
-  languageName: node
-  linkType: hard
-
 "@babel/runtime@npm:~7.22.15":
   version: 7.22.15
   resolution: "@babel/runtime@npm:7.22.15"
@@ -8938,14 +8929,14 @@ __metadata:
     babel-loader: ~8.2.5
     cross-env: ^7.0.3
     eslint: ~8.45.0
-    i18next: ~23.14.0
+    i18next: ^23.10.1
     jest: ~29.7.0
     normalize.css: ^8.0.1
     npm-run-all: ^4.1.5
     prettier: ~2.8.8
     react-docgen-typescript-plugin: ~1.0.8
     react-dom: ^17.0.2
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     rimraf: ^3.0.2
     storybook-dark-mode: ~3.0.3
     tslib: ^2.5.3
@@ -8959,10 +8950,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.4
-    "@rocket.chat/ui-contexts": 11.0.0-rc.4
+    "@rocket.chat/ui-avatar": 7.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.4
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.5
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9040,7 +9031,6 @@ __metadata:
     react-docgen-typescript-plugin: ~1.0.8
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
-    react-i18next: ~15.0.1
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -9049,8 +9039,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 11.0.0-rc.4
-    "@rocket.chat/ui-contexts": 11.0.0-rc.4
+    "@rocket.chat/ui-client": 11.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9062,11 +9052,9 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     eslint: ~8.45.0
-    i18next: ~23.14.0
     jest: ~29.7.0
+    tsup: ^6.7.0
     typescript: ~5.5.4
-  peerDependencies:
-    i18next: "*"
   languageName: unknown
   linkType: soft
 
@@ -9207,7 +9195,7 @@ __metadata:
     history: ~5.3.0
     html-webpack-plugin: ^5.5.3
     husky: ^4.3.8
-    i18next: ~23.14.0
+    i18next: ~23.4.9
     if-env: ^1.0.4
     image-webpack-loader: ~8.1.0
     lorem-ipsum: ^2.0.8
@@ -9230,7 +9218,7 @@ __metadata:
     query-string: ^7.1.3
     react-dom: ~17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     rimraf: ^3.0.2
     sass: ~1.62.1
     sass-loader: ~10.4.1
@@ -9588,7 +9576,7 @@ __metadata:
     hljs9: "npm:highlight.js@^9.18.5"
     http-proxy-agent: ^5.0.0
     human-interval: ^2.0.1
-    i18next: ~23.14.0
+    i18next: ~23.4.9
     i18next-http-backend: ^1.4.5
     i18next-sprintf-postprocessor: ^0.2.2
     iconv-lite: ^0.6.3
@@ -9665,7 +9653,7 @@ __metadata:
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     react-keyed-flatten-children: ^1.3.0
     react-virtuoso: ^4.7.1
     redis: ^4.0.6
@@ -9726,9 +9714,9 @@ __metadata:
     "@tanstack/react-query": ^4.16.1
     "@types/use-sync-external-store": ^0.0.6
     eslint: ~8.45.0
-    i18next: ~23.14.0
+    i18next: ~23.4.9
     react: ~17.0.2
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     typescript: ~5.5.4
     use-sync-external-store: ~1.2.2
   peerDependencies:
@@ -10257,7 +10245,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.4
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10300,7 +10288,6 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
     typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -10308,8 +10295,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.4
-    "@rocket.chat/ui-contexts": 11.0.0-rc.4
+    "@rocket.chat/ui-avatar": "*"
+    "@rocket.chat/ui-contexts": "*"
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10478,8 +10465,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.4
-    "@rocket.chat/ui-contexts": 11.0.0-rc.4
+    "@rocket.chat/ui-avatar": 7.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10561,13 +10548,13 @@ __metadata:
     eslint: ~8.45.0
     react: ~17.0.2
     react-hook-form: ~7.45.4
-    react-i18next: ~15.0.1
+    react-i18next: ~13.2.2
     storybook-dark-mode: ~3.0.3
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.4
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"
@@ -16148,6 +16135,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"any-promise@npm:^1.0.0":
+  version: 1.3.0
+  resolution: "any-promise@npm:1.3.0"
+  checksum: 0ee8a9bdbe882c90464d75d1f55cf027f5458650c4bd1f0467e65aec38ccccda07ca5844969ee77ed46d04e7dded3eaceb027e8d32f385688523fe305fa7e1de
+  languageName: node
+  linkType: hard
+
 "anymatch@npm:^2.0.0":
   version: 2.0.0
   resolution: "anymatch@npm:2.0.0"
@@ -18158,6 +18152,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bundle-require@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "bundle-require@npm:4.0.1"
+  dependencies:
+    load-tsconfig: ^0.2.3
+  peerDependencies:
+    esbuild: ">=0.17"
+  checksum: 737217e37b72d7bee431b5d839b86ba604430f3ec346f073071de2ce65f0915189d4394ddd4685e0366b2930f38c95742b58c7101b8c53d9a8381d453f0b3b8a
+  languageName: node
+  linkType: hard
+
 "busboy@npm:^1.6.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
@@ -18226,6 +18231,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cac@npm:^6.7.12":
+  version: 6.7.14
+  resolution: "cac@npm:6.7.14"
+  checksum: 45a2496a9443abbe7f52a49b22fbe51b1905eff46e03fd5e6c98e3f85077be3f8949685a1849b1a9cd2bc3e5567dfebcf64f01ce01847baf918f1b37c839791a
+  languageName: node
+  linkType: hard
+
 "cacache@npm:^12.0.2":
   version: 12.0.4
   resolution: "cacache@npm:12.0.4"
@@ -19391,7 +19403,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^4.1.1":
+"commander@npm:^4.0.0, commander@npm:^4.1.1":
   version: 4.1.1
   resolution: "commander@npm:4.1.1"
   checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977
@@ -21650,9 +21662,9 @@ __metadata:
   linkType: hard
 
 "dompurify@npm:^3.1.6":
-  version: 3.1.6
-  resolution: "dompurify@npm:3.1.6"
-  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
+  version: 3.1.7
+  resolution: "dompurify@npm:3.1.7"
+  checksum: 0a9b811bbc94f3dba60cf6486962362b0f1a5b4ab789f5e1cbd4749b6ba1a1fad190a677a962dc8850ce28764424765fe425e9d6508e4e93ba648ef15d54bc24
   languageName: node
   linkType: hard
 
@@ -22384,7 +22396,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.17.5":
+"esbuild@npm:^0.17.5, esbuild@npm:^0.17.6":
   version: 0.17.19
   resolution: "esbuild@npm:0.17.19"
   dependencies:
@@ -25050,6 +25062,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:7.1.6":
+  version: 7.1.6
+  resolution: "glob@npm:7.1.6"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.0.4
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 351d549dd90553b87c2d3f90ce11aed9e1093c74130440e7ae0592e11bbcd2ce7f0ebb8ba6bfe63aaf9b62166a7f4c80cb84490ae5d78408bb2572bf7d4ee0a6
+  languageName: node
+  linkType: hard
+
 "glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
@@ -25144,7 +25170,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.0, globby@npm:^11.0.2, globby@npm:^11.1.0":
+"globby@npm:^11.0.0, globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
@@ -26316,7 +26342,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:>=17.0.11":
+"i18next@npm:>=17.0.11, i18next@npm:^23.10.1":
   version: 23.10.1
   resolution: "i18next@npm:23.10.1"
   dependencies:
@@ -26334,12 +26360,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:~23.14.0":
-  version: 23.14.0
-  resolution: "i18next@npm:23.14.0"
+"i18next@npm:~23.4.9":
+  version: 23.4.9
+  resolution: "i18next@npm:23.4.9"
   dependencies:
-    "@babel/runtime": ^7.23.2
-  checksum: 4239843691181907d0570eabebf53b81499f54733c87b7554432022b0eeb2ff38df21d03dd907bc3baab8432d746e0fd16949507bbf3c7ccf5b2071e474d5f52
+    "@babel/runtime": ^7.22.5
+  checksum: 46ac2415dc817c0e25e1c5e64332249825cd63b5fb9a5d42e3a2329d4ecd098c0f15a243f56b53e03db02e2e9931ca9bb4447370b2436f9ad6556de40ce981cf
   languageName: node
   linkType: hard
 
@@ -28668,7 +28694,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"joycon@npm:^3.1.1":
+"joycon@npm:^3.0.1, joycon@npm:^3.1.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
   checksum: 8003c9c3fc79c5c7602b1c7e9f7a2df2e9916f046b0dbad862aa589be78c15734d11beb9fe846f5e06138df22cb2ad29961b6a986ba81c4920ce2b15a7f11067
@@ -29543,6 +29569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"load-tsconfig@npm:^0.2.3":
+  version: 0.2.5
+  resolution: "load-tsconfig@npm:0.2.5"
+  checksum: 631740833c4a7157bb7b6eeae6e1afb6a6fac7416b7ba91bd0944d5c5198270af2d68bf8347af3cc2ba821adc4d83ef98f66278bd263bc284c863a09ec441503
+  languageName: node
+  linkType: hard
+
 "load-yaml-file@npm:^0.2.0":
   version: 0.2.0
   resolution: "load-yaml-file@npm:0.2.0"
@@ -29789,6 +29822,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.sortby@npm:^4.7.0":
+  version: 4.7.0
+  resolution: "lodash.sortby@npm:4.7.0"
+  checksum: db170c9396d29d11fe9a9f25668c4993e0c1331bcb941ddbd48fb76f492e732add7f2a47cfdf8e9d740fa59ac41bbfaf931d268bc72aab3ab49e9f89354d718c
+  languageName: node
+  linkType: hard
+
 "lodash.startcase@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.startcase@npm:4.4.0"
@@ -31550,6 +31590,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mz@npm:^2.7.0":
+  version: 2.7.0
+  resolution: "mz@npm:2.7.0"
+  dependencies:
+    any-promise: ^1.0.0
+    object-assign: ^4.0.1
+    thenify-all: ^1.0.0
+  checksum: 8427de0ece99a07e9faed3c0c6778820d7543e3776f9a84d22cf0ec0a8eb65f6e9aee9c9d353ff9a105ff62d33a9463c6ca638974cc652ee8140cd1e35951c87
+  languageName: node
+  linkType: hard
+
 "nan@npm:^2.12.1, nan@npm:^2.13.2, nan@npm:^2.14.0":
   version: 2.17.0
   resolution: "nan@npm:2.17.0"
@@ -34163,7 +34214,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-load-config@npm:^3.1.4":
+"postcss-load-config@npm:^3.0.1, postcss-load-config@npm:^3.1.4":
   version: 3.1.4
   resolution: "postcss-load-config@npm:3.1.4"
   dependencies:
@@ -35840,11 +35891,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-i18next@npm:15.0.1":
-  version: 15.0.1
-  resolution: "react-i18next@npm:15.0.1"
+"react-i18next@npm:~13.2.2":
+  version: 13.2.2
+  resolution: "react-i18next@npm:13.2.2"
   dependencies:
-    "@babel/runtime": ^7.24.8
+    "@babel/runtime": ^7.22.5
     html-parse-stringify: ^3.0.1
   peerDependencies:
     i18next: ">= 23.2.3"
@@ -35854,25 +35905,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: fdff560f1a7988677fbccab2934d5d253515f5b07ea33d9a6dff8852be4df5cd72a41235d412be7016cbc96c0a33c8471e5ff7e02ee1e149654918082ea43827
-  languageName: node
-  linkType: hard
-
-"react-i18next@patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch::locator=rocket.chat%40workspace%3A.":
-  version: 15.0.1
-  resolution: "react-i18next@patch:react-i18next@npm%3A15.0.1#./.yarn/patches/react-i18next-npm-15.0.1-0812bb73aa.patch::version=15.0.1&hash=90570d&locator=rocket.chat%40workspace%3A."
-  dependencies:
-    "@babel/runtime": ^7.24.8
-    html-parse-stringify: ^3.0.1
-  peerDependencies:
-    i18next: ">= 23.2.3"
-    react: ">= 16.8.0"
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-    react-native:
-      optional: true
-  checksum: 76bda74c294a66e3330edd217dcd453b48f3e76fe4a89c411a8c1d31fdff932f7c314a1aa5f83bd948b233ded958a6c66674e12ccb399dc6f7790f2c325742b2
+  checksum: 2b85bfb347af1a00add1c02901025706f7d2037fade4e8aa08159287ddf012e8cf35626eb9f5c578b9d1c24c065c69f2ad4b5a3087fb5cdbea540f8bc18c0f59
   languageName: node
   linkType: hard
 
@@ -37246,7 +37279,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"rollup@npm:^3.21.0":
+"rollup@npm:^3.2.5, rollup@npm:^3.21.0":
   version: 3.28.1
   resolution: "rollup@npm:3.28.1"
   dependencies:
@@ -38464,6 +38497,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map@npm:0.8.0-beta.0":
+  version: 0.8.0-beta.0
+  resolution: "source-map@npm:0.8.0-beta.0"
+  dependencies:
+    whatwg-url: ^7.0.0
+  checksum: e94169be6461ab0ac0913313ad1719a14c60d402bd22b0ad96f4a6cffd79130d91ab5df0a5336a326b04d2df131c1409f563c9dc0d21a6ca6239a44b6c8dbd92
+  languageName: node
+  linkType: hard
+
 "source-map@npm:^0.5.0, source-map@npm:^0.5.6":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
@@ -39494,6 +39536,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sucrase@npm:^3.20.3":
+  version: 3.34.0
+  resolution: "sucrase@npm:3.34.0"
+  dependencies:
+    "@jridgewell/gen-mapping": ^0.3.2
+    commander: ^4.0.0
+    glob: 7.1.6
+    lines-and-columns: ^1.1.6
+    mz: ^2.7.0
+    pirates: ^4.0.1
+    ts-interface-checker: ^0.1.9
+  bin:
+    sucrase: bin/sucrase
+    sucrase-node: bin/sucrase-node
+  checksum: 61860063bdf6103413698e13247a3074d25843e91170825a9752e4af7668ffadd331b6e99e92fc32ee5b3c484ee134936f926fa9039d5711fafff29d017a2110
+  languageName: node
+  linkType: hard
+
 "superagent@npm:^8.0.0":
   version: 8.0.0
   resolution: "superagent@npm:8.0.0"
@@ -40075,6 +40135,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"thenify-all@npm:^1.0.0":
+  version: 1.6.0
+  resolution: "thenify-all@npm:1.6.0"
+  dependencies:
+    thenify: ">= 3.1.0 < 4"
+  checksum: dba7cc8a23a154cdcb6acb7f51d61511c37a6b077ec5ab5da6e8b874272015937788402fd271fdfc5f187f8cb0948e38d0a42dcc89d554d731652ab458f5343e
+  languageName: node
+  linkType: hard
+
+"thenify@npm:>= 3.1.0 < 4":
+  version: 3.3.1
+  resolution: "thenify@npm:3.3.1"
+  dependencies:
+    any-promise: ^1.0.0
+  checksum: 84e1b804bfec49f3531215f17b4a6e50fd4397b5f7c1bccc427b9c656e1ecfb13ea79d899930184f78bc2f57285c54d9a50a590c8868f4f0cef5c1d9f898b05e
+  languageName: node
+  linkType: hard
+
 "thread-stream@npm:^2.0.0":
   version: 2.1.0
   resolution: "thread-stream@npm:2.1.0"
@@ -40364,6 +40442,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tr46@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "tr46@npm:1.0.1"
+  dependencies:
+    punycode: ^2.1.0
+  checksum: 96d4ed46bc161db75dbf9247a236ea0bfcaf5758baae6749e92afab0bc5a09cb59af21788ede7e55080f2bf02dce3e4a8f2a484cc45164e29f4b5e68f7cbcc1a
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^2.1.0":
   version: 2.1.0
   resolution: "tr46@npm:2.1.0"
@@ -40389,6 +40476,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tree-kill@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "tree-kill@npm:1.2.2"
+  bin:
+    tree-kill: cli.js
+  checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7
+  languageName: node
+  linkType: hard
+
 "trim-newlines@npm:^1.0.0":
   version: 1.0.0
   resolution: "trim-newlines@npm:1.0.0"
@@ -40463,6 +40559,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-interface-checker@npm:^0.1.9":
+  version: 0.1.13
+  resolution: "ts-interface-checker@npm:0.1.13"
+  checksum: 20c29189c2dd6067a8775e07823ddf8d59a33e2ffc47a1bd59a5cb28bb0121a2969a816d5e77eda2ed85b18171aa5d1c4005a6b88ae8499ec7cc49f78571cb5e
+  languageName: node
+  linkType: hard
+
 "ts-jest@npm:~29.1.5":
   version: 29.1.5
   resolution: "ts-jest@npm:29.1.5"
@@ -40633,6 +40736,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsup@npm:^6.7.0":
+  version: 6.7.0
+  resolution: "tsup@npm:6.7.0"
+  dependencies:
+    bundle-require: ^4.0.0
+    cac: ^6.7.12
+    chokidar: ^3.5.1
+    debug: ^4.3.1
+    esbuild: ^0.17.6
+    execa: ^5.0.0
+    globby: ^11.0.3
+    joycon: ^3.0.1
+    postcss-load-config: ^3.0.1
+    resolve-from: ^5.0.0
+    rollup: ^3.2.5
+    source-map: 0.8.0-beta.0
+    sucrase: ^3.20.3
+    tree-kill: ^1.2.2
+  peerDependencies:
+    "@swc/core": ^1
+    postcss: ^8.4.12
+    typescript: ">=4.1.0"
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    postcss:
+      optional: true
+    typescript:
+      optional: true
+  bin:
+    tsup: dist/cli-default.js
+    tsup-node: dist/cli-node.js
+  checksum: 91ff179f0b9828a6880b6decaa8603fd7af0311f46a38d3a93647a2497298750d676810aeff533a335443a01a7b340dbba7c76523bcd7a87d7b05b7677742901
+  languageName: node
+  linkType: hard
+
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
@@ -42296,6 +42435,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webidl-conversions@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "webidl-conversions@npm:4.0.2"
+  checksum: c93d8dfe908a0140a4ae9c0ebc87a33805b416a33ee638a605b551523eec94a9632165e54632f6d57a39c5f948c4bab10e0e066525e9a4b87a79f0d04fbca374
+  languageName: node
+  linkType: hard
+
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -42811,6 +42957,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "whatwg-url@npm:7.1.0"
+  dependencies:
+    lodash.sortby: ^4.7.0
+    tr46: ^1.0.1
+    webidl-conversions: ^4.0.2
+  checksum: fecb07c87290b47d2ec2fb6d6ca26daad3c9e211e0e531dd7566e7ff95b5b3525a57d4f32640ad4adf057717e0c215731db842ad761e61d947e81010e05cf5fd
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"

From 8f940bd2addeace1b8282706fda632b31649b135 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 8 Oct 2024 19:38:13 +0000
Subject: [PATCH 150/170] Release 6.13.0-rc.6

[no ci]
---
 .changeset/bump-patch-1728416283220.md        |  5 +++
 .changeset/pre.json                           |  1 +
 apps/meteor/CHANGELOG.md                      | 31 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 13 ++++++++
 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          | 13 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 13 ++++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 14 +++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 14 +++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 13 ++++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 13 ++++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 12 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 ++++++
 ee/packages/license/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/fuselage-ui-kit/CHANGELOG.md         | 13 ++++++++
 packages/fuselage-ui-kit/package.json         |  8 ++---
 packages/gazzodown/CHANGELOG.md               | 10 ++++++
 packages/gazzodown/package.json               |  4 +--
 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-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/web-ui-registration/CHANGELOG.md     |  9 ++++++
 packages/web-ui-registration/package.json     |  4 +--
 66 files changed, 399 insertions(+), 41 deletions(-)
 create mode 100644 .changeset/bump-patch-1728416283220.md

diff --git a/.changeset/bump-patch-1728416283220.md b/.changeset/bump-patch-1728416283220.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1728416283220.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 b0813cf26004..c1eafc495c79 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -70,6 +70,7 @@
     "bump-patch-1727482167703",
     "bump-patch-1727817480079",
     "bump-patch-1728026023781",
+    "bump-patch-1728416283220",
     "cyan-ladybugs-thank",
     "dirty-stingrays-beg",
     "dry-taxis-cry",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index e4084ca3bf3b..340ae30e35a7 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.6
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/license@0.2.8-rc.6
+  - @rocket.chat/omnichannel-services@0.3.5-rc.6
+  - @rocket.chat/pdf-worker@0.2.5-rc.6
+  - @rocket.chat/presence@0.2.8-rc.6
+  - @rocket.chat/api-client@0.2.8-rc.6
+  - @rocket.chat/apps@0.1.8-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/cron@0.1.8-rc.6
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.6
+  - @rocket.chat/gazzodown@11.0.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.6
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  - @rocket.chat/ui-video-conf@11.0.0-rc.6
+  - @rocket.chat/web-ui-registration@11.0.0-rc.6
+  - @rocket.chat/instance-status@0.1.8-rc.6
+  </details>
+
 ## 6.13.0-rc.5
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 80eefdf542ce..19164d07ee1b 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.5"
+	"version": "6.13.0-rc.6"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 5d63d1a22f21..5d8f857ad8ff 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.3.5-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 1.3.5-rc.5
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index aafe169e405e..1e6e859d7639 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": "1.3.5-rc.5",
+	"version": "1.3.5-rc.6",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 4d88dead830c..0e761cad06fd 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": "6.13.0-rc.5",
+	"version": "6.13.0-rc.6",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 7436be0fdf42..8b1c72004a69 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  </details>
+
 ## 0.5.0-rc.5
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index c5267ece7e39..c31fd7e3da47 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.5.0-rc.5",
+  "version": "0.5.0-rc.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 28a03675cdaa..59a4ada810c5 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.4.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index b53ddb25759c..fccc333b2c5b 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.8-rc.5",
+	"version": "0.4.8-rc.6",
 	"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 45b4946dd3b5..3a74e48465cb 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.4.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 7e34f665264f..0a852f1fa9b0 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.8-rc.5",
+	"version": "0.4.8-rc.6",
 	"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 bedd82f46c3f..ec81e858c1fd 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  - @rocket.chat/instance-status@0.1.8-rc.6
+  </details>
+
 ## 0.3.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 8258a9b9b0ab..c31e1cdd02fd 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.8-rc.5",
+	"version": "0.3.8-rc.6",
 	"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 ecd320289bfd..4c26ead7f78d 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/omnichannel-services@0.3.5-rc.6
+  - @rocket.chat/pdf-worker@0.2.5-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.4.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index a7690bda908c..464ba9af2247 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.8-rc.5",
+	"version": "0.4.8-rc.6",
 	"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 9f760be14d91..57e20e88ac11 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/presence@0.2.8-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.4.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 87a598183010..f1335b2ddd20 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.8-rc.5",
+	"version": "0.4.8-rc.6",
 	"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 f958a1f773a0..b8260d3fec4c 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/omnichannel-services@0.3.5-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.4.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 5d42b0890a76..6ae6b4ea8fec 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.8-rc.5",
+	"version": "0.4.8-rc.6",
 	"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 202d1fef99f0..4de6dc748196 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.4.8-rc.5
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 11caa15ab3c5..50dffd921595 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.8-rc.5",
+	"version": "0.4.8-rc.6",
 	"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 f89de2990622..d089e7f736e0 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
 ## 0.2.8-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 2c8cd80fa6b0..4b28df13c112 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.5",
+	"version": "0.2.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index dccb65ac41de..05c28dbfde8d 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.5-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/pdf-worker@0.2.5-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.3.5-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 233c0afa6d0f..eba036bfe5cb 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.5-rc.5",
+	"version": "0.3.5-rc.6",
 	"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 fdde971406a8..a898e5f97c89 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.5-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
 ## 0.2.5-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index a0be3ab2e15c..3ebb27b33920 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.5-rc.5",
+	"version": "0.2.5-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index f8e0e7e610ed..18a1af23c896 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.2.8-rc.5
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 177e02511437..5b26bd898121 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.5",
+	"version": "0.2.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index 271b3adfea3d..ed611ca67fcb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.5",
+	"version": "6.13.0-rc.6",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 2a5e321cfb9f..0fbf1c9420c4 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  </details>
+
 ## 0.2.8-rc.5
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 26f8ac1412b9..5774166e116a 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.8-rc.5",
+	"version": "0.2.8-rc.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 1df6df8d899b..22ce4478cde9 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  </details>
+
 ## 0.1.8-rc.5
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index e328339a7657..04b361b9f48e 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.5",
+	"version": "0.1.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index eeb4d4f9e619..0db80e7f2acb 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.7.0-rc.5
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 95865c54221d..ee2006dc8547 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.0-rc.5",
+	"version": "0.7.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 10573eaa8a13..f915f94e51d0 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.6
+
 ## 6.13.0-rc.5
 
 ## 6.13.0-rc.4
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 0316f96ca015..7e2e7f7be0cd 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.5",
+	"version": "6.13.0-rc.6",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index e61fea6a020a..8b2917bbeb9c 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.1.8-rc.5
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index e0fe0d3eab72..2f0daa8f658e 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.5",
+	"version": "0.1.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index d1b078fdb34e..aa9feebb0c55 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/api-client@0.2.8-rc.6
+  </details>
+
 ## 0.3.8-rc.5
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 54e06de0adfd..765b691537a5 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.8-rc.5",
+	"version": "0.3.8-rc.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 914c4b30265a..65f5201518c4 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/gazzodown@11.0.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  - @rocket.chat/ui-video-conf@11.0.0-rc.6
+  </details>
+
 ## 11.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 877062dd83e1..f051aea22585 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.5",
+  "version": "11.0.0-rc.6",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.5",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.5",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.6",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.6",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.5",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.6",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index b263252b0dd1..1feb3f37e34e 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  </details>
+
 ## 11.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 531f3dd2e34b..38475931ed8e 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.5",
+	"version": "11.0.0-rc.6",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -74,7 +74,7 @@
 		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
 		"@rocket.chat/ui-client": "11.0.0-rc.5",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index ba9170344cfb..309a0b4d575c 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
 ## 0.1.8-rc.5
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 3d346424e7e5..77d762f46c3e 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.8-rc.5",
+	"version": "0.1.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index b2130010cade..5758b87605d7 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.6
+  </details>
+
 ## 1.20.0-rc.5
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index e635891f3da7..14f077bb49b1 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.5",
+	"version": "1.20.0-rc.6",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 547832a15011..8622fef80d33 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
 ## 0.8.0-rc.5
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 77e4cf9df99d..aac550df73f7 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.5",
+	"version": "0.8.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 4f350d794f26..2414fd691ddb 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  </details>
+
 ## 0.3.0-rc.5
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 58fe25511bc3..132d80fea828 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.5",
+	"version": "0.3.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 8e6d5052d369..04cf749f9096 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
 ## 6.13.0-rc.5
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index de880dcd0666..a9bea2c87e43 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.5",
+	"version": "6.13.0-rc.6",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 28a432e0dfcf..2da271f261f1 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  </details>
+
 ## 7.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 9d1bf3e5ae76..2305da31a50a 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.5",
+	"version": "7.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index a4931587e914..c32490e954b2 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/ddp-client@0.3.8-rc.6
+  </details>
+
 ## 11.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 3ac4edf6354f..d047df089b67 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.5",
+	"version": "11.0.0-rc.6",
 	"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 7e4ba938550e..331f679638f3 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  </details>
+
 ## 11.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 921500c38c15..bb0ea409c157 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": "11.0.0-rc.5",
+	"version": "11.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.5",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 4898ac9a8c20..6c32d8f6d5a4 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  </details>
+
 ## 11.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index c8d131c47d66..2b921a18f4b6 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": "11.0.0-rc.5",
+	"version": "11.0.0-rc.6",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From a16b582c94d3b139ca9dac090c94e572a471245e Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 8 Oct 2024 15:53:09 -0600
Subject: [PATCH 151/170] fix: Don't return users with `E2ESuggestedKey` set
 when selecting users to provide E2EKey (#33405)

---
 .changeset/strong-waves-add.md                 | 7 +++++++
 apps/meteor/server/models/raw/Subscriptions.ts | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 .changeset/strong-waves-add.md

diff --git a/.changeset/strong-waves-add.md b/.changeset/strong-waves-add.md
new file mode 100644
index 000000000000..c3b6bcf08cd2
--- /dev/null
+++ b/.changeset/strong-waves-add.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes an issue where a user may receive an indefinite amount of "suggested keys" from all the users on a room even when a user already suggested a key for them, duplicating the work on server.
+
+Now, the endpoint that returns users waiting for keys will return only users that don't have neither `E2EKey` nor `E2ESuggestedKey`.
diff --git a/apps/meteor/server/models/raw/Subscriptions.ts b/apps/meteor/server/models/raw/Subscriptions.ts
index fdefd36bd44b..dd4bb91df325 100644
--- a/apps/meteor/server/models/raw/Subscriptions.ts
+++ b/apps/meteor/server/models/raw/Subscriptions.ts
@@ -750,6 +750,7 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 					'E2EKey': {
 						$exists: false,
 					},
+					'E2ESuggestedKey': { $exists: false },
 					'u._id': {
 						$ne: excludeUserId,
 					},

From d9fe5bbe0b41de4742446d12ae09e748967e3ada Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 8 Oct 2024 17:36:07 -0600
Subject: [PATCH 152/170] fix: Server not notifying users of E2EE key
 suggestions (#33435)

Co-authored-by: Ricardo Garim <9621276+ricardogarim@users.noreply.github.com>
---
 .changeset/pink-wombats-wait.md                           | 6 ++++++
 .../server/functions/provideUsersSuggestedGroupKeys.ts    | 7 +++++--
 apps/meteor/app/e2e/server/methods/updateGroupKey.ts      | 8 ++++----
 apps/meteor/server/models/raw/Subscriptions.ts            | 5 +++--
 packages/model-typings/src/models/ISubscriptionsModel.ts  | 3 ++-
 5 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/pink-wombats-wait.md

diff --git a/.changeset/pink-wombats-wait.md b/.changeset/pink-wombats-wait.md
new file mode 100644
index 000000000000..5c8d4cb6a0b1
--- /dev/null
+++ b/.changeset/pink-wombats-wait.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixes an issue causing server to not notify users via websocket of new E2EE keys suggested by other users to them when running in development environments.
diff --git a/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts b/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts
index 42408f398ecb..9f69f17920d1 100644
--- a/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts
+++ b/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts
@@ -2,6 +2,7 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Rooms, Subscriptions } from '@rocket.chat/models';
 
 import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
+import { notifyOnSubscriptionChanged, notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
 
 export const provideUsersSuggestedGroupKeys = async (
 	userId: IUser['_id'],
@@ -21,13 +22,15 @@ export const provideUsersSuggestedGroupKeys = async (
 
 		const usersWithSuggestedKeys = [];
 		for await (const user of usersSuggestedGroupKeys[roomId]) {
-			const { modifiedCount } = await Subscriptions.setGroupE2ESuggestedKey(user._id, roomId, user.key);
-			if (!modifiedCount) {
+			const { value } = await Subscriptions.setGroupE2ESuggestedKey(user._id, roomId, user.key);
+			if (!value) {
 				continue;
 			}
+			void notifyOnSubscriptionChanged(value);
 			usersWithSuggestedKeys.push(user._id);
 		}
 
 		await Rooms.removeUsersFromE2EEQueueByRoomId(roomId, usersWithSuggestedKeys);
+		void notifyOnRoomChangedById(roomId);
 	}
 };
diff --git a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
index 87182f723e7d..6974ba225d9f 100644
--- a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
+++ b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
@@ -3,7 +3,7 @@ import { Subscriptions } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
-import { notifyOnSubscriptionChangedById, notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../lib/server/lib/notifyListener';
+import { notifyOnSubscriptionChangedById, notifyOnSubscriptionChanged } from '../../../lib/server/lib/notifyListener';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -34,9 +34,9 @@ Meteor.methods<ServerMethods>({
 			}
 
 			// uid also has subscription to this room
-			const { modifiedCount } = await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
-			if (modifiedCount) {
-				void notifyOnSubscriptionChangedByRoomIdAndUserId(rid, uid);
+			const { value } = await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
+			if (value) {
+				void notifyOnSubscriptionChanged(value);
 			}
 		}
 	},
diff --git a/apps/meteor/server/models/raw/Subscriptions.ts b/apps/meteor/server/models/raw/Subscriptions.ts
index dd4bb91df325..02eb7927ed4d 100644
--- a/apps/meteor/server/models/raw/Subscriptions.ts
+++ b/apps/meteor/server/models/raw/Subscriptions.ts
@@ -30,6 +30,7 @@ import type {
 	AggregationCursor,
 	CountDocumentsOptions,
 	DeleteOptions,
+	ModifyResult,
 } from 'mongodb';
 
 import { getDefaultSubscriptionPref } from '../../../app/utils/lib/getDefaultSubscriptionPref';
@@ -585,10 +586,10 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return this.updateOne(query, update);
 	}
 
-	setGroupE2ESuggestedKey(uid: string, rid: string, key: string): Promise<UpdateResult> {
+	setGroupE2ESuggestedKey(uid: string, rid: string, key: string): Promise<ModifyResult<ISubscription>> {
 		const query = { rid, 'u._id': uid };
 		const update = { $set: { E2ESuggestedKey: key } };
-		return this.updateOne(query, update);
+		return this.findOneAndUpdate(query, update, { returnDocument: 'after' });
 	}
 
 	unsetGroupE2ESuggestedKey(_id: string): Promise<UpdateResult | Document> {
diff --git a/packages/model-typings/src/models/ISubscriptionsModel.ts b/packages/model-typings/src/models/ISubscriptionsModel.ts
index 78fb38c8704b..24fd36a073ba 100644
--- a/packages/model-typings/src/models/ISubscriptionsModel.ts
+++ b/packages/model-typings/src/models/ISubscriptionsModel.ts
@@ -12,6 +12,7 @@ import type {
 	AggregationCursor,
 	DeleteOptions,
 	CountDocumentsOptions,
+	ModifyResult,
 } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
@@ -115,7 +116,7 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 
 	setGroupE2EKey(_id: string, key: string): Promise<UpdateResult>;
 
-	setGroupE2ESuggestedKey(uid: string, rid: string, key: string): Promise<UpdateResult>;
+	setGroupE2ESuggestedKey(uid: string, rid: string, key: string): Promise<ModifyResult<ISubscription>>;
 
 	unsetGroupE2ESuggestedKey(_id: string): Promise<UpdateResult | Document>;
 

From 5f9826bed6b25f26c4c0c1feacb551b5ed734481 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Wed, 9 Oct 2024 12:50:25 -0300
Subject: [PATCH 153/170] fix: deno runtime controller not handling undefined
 child process reference correctly (#33494)

---
 .changeset/proud-bugs-cry.md                        |  5 +++++
 .../server/runtime/deno/AppsEngineDenoRuntime.ts    | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/proud-bugs-cry.md

diff --git a/.changeset/proud-bugs-cry.md b/.changeset/proud-bugs-cry.md
new file mode 100644
index 000000000000..854f9c6372fd
--- /dev/null
+++ b/.changeset/proud-bugs-cry.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Fixed a problem in the deno runtime controller where it would not handle undefined child process references correctly
diff --git a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
index 8d589c0d2e9e..5eb3b7cd0918 100644
--- a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
+++ b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
@@ -71,7 +71,7 @@ export type DenoRuntimeOptions = {
 };
 
 export class DenoRuntimeSubprocessController extends EventEmitter {
-    private deno: child_process.ChildProcess;
+    private deno: child_process.ChildProcess | undefined;
 
     private state: 'uninitialized' | 'ready' | 'invalid' | 'restarting' | 'unknown' | 'stopped';
 
@@ -166,6 +166,11 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
     }
 
     public async killProcess(): Promise<void> {
+        if (!this.deno) {
+            this.debug('No child process reference');
+            return;
+        }
+
         // This field is not populated if the process is killed by the OS
         if (this.deno.killed) {
             this.debug('App process was already killed');
@@ -201,7 +206,7 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
 
     public async getStatus(): Promise<AppStatus> {
         // If the process has been terminated, we can't get the status
-        if (this.deno.exitCode !== null) {
+        if (!this.deno || this.deno.exitCode !== null) {
             return AppStatus.UNKNOWN;
         }
 
@@ -311,6 +316,10 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
     }
 
     private setupListeners(): void {
+        if (!this.deno) {
+            return;
+        }
+
         this.deno.stderr.on('data', this.parseError.bind(this));
         this.deno.on('error', (err) => {
             this.state = 'invalid';

From 678faed48b14aebf48a578c402294046e542d51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <43561537+rique223@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:58:34 -0300
Subject: [PATCH 154/170] fix: Blank selected department when selecting out of
 range (#33386)

---
 .changeset/sharp-adults-think.md              |   7 ++
 .../components/AutoCompleteDepartment.tsx     |   3 +-
 .../Definitions/DepartmentsDefinitions.ts     |   5 +
 .../hooks/useDepartmentsList.spec.ts          | 111 ++++++++++++++++++
 .../Omnichannel/hooks/useDepartmentsList.ts   |  28 +++--
 .../Omnichannel/utils/normalizeDepartments.ts |  24 ++++
 .../omnichannel-current-chats.spec.ts         |   8 +-
 .../page-objects/omnichannel-current-chats.ts |   4 +
 8 files changed, 175 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/sharp-adults-think.md
 create mode 100644 apps/meteor/client/components/Omnichannel/Definitions/DepartmentsDefinitions.ts
 create mode 100644 apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.spec.ts
 create mode 100644 apps/meteor/client/components/Omnichannel/utils/normalizeDepartments.ts

diff --git a/.changeset/sharp-adults-think.md b/.changeset/sharp-adults-think.md
new file mode 100644
index 000000000000..399d3bae1ce2
--- /dev/null
+++ b/.changeset/sharp-adults-think.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Fixes the departments filter on the omnichannel current chats page by ensuring that the selected department is fetched and 
+added if it was not part of the initial department list. This prevents the filter from becoming blank and avoids potential 
+UX issues.
diff --git a/apps/meteor/client/components/AutoCompleteDepartment.tsx b/apps/meteor/client/components/AutoCompleteDepartment.tsx
index 6217f1d99610..7ff38c9c3ca4 100644
--- a/apps/meteor/client/components/AutoCompleteDepartment.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartment.tsx
@@ -42,8 +42,9 @@ const AutoCompleteDepartment = ({
 				haveNone,
 				excludeDepartmentId,
 				showArchived,
+				selectedDepartment: value,
 			}),
-			[debouncedDepartmentsFilter, onlyMyDepartments, haveAll, haveNone, excludeDepartmentId, showArchived],
+			[debouncedDepartmentsFilter, onlyMyDepartments, haveAll, haveNone, excludeDepartmentId, showArchived, value],
 		),
 	);
 
diff --git a/apps/meteor/client/components/Omnichannel/Definitions/DepartmentsDefinitions.ts b/apps/meteor/client/components/Omnichannel/Definitions/DepartmentsDefinitions.ts
new file mode 100644
index 000000000000..8c6a2301bd66
--- /dev/null
+++ b/apps/meteor/client/components/Omnichannel/Definitions/DepartmentsDefinitions.ts
@@ -0,0 +1,5 @@
+export type DepartmentListItem = {
+	_id: string;
+	label: string;
+	value: string;
+};
diff --git a/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.spec.ts b/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.spec.ts
new file mode 100644
index 000000000000..173677799b08
--- /dev/null
+++ b/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.spec.ts
@@ -0,0 +1,111 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook, waitFor } from '@testing-library/react';
+
+import { useDepartmentsList } from './useDepartmentsList';
+
+const initialDepartmentsListMock = Array.from(Array(25)).map((_, index) => {
+	return {
+		_id: `${index}`,
+		name: `test_department_${index}`,
+		enabled: true,
+		email: `test${index}@email.com`,
+		showOnRegistration: false,
+		showOnOfflineForm: false,
+		type: 'd',
+		_updatedAt: '2024-09-26T20:05:31.330Z',
+		offlineMessageChannelName: '',
+		numAgents: 0,
+		ancestors: undefined,
+		parentId: undefined,
+	};
+});
+
+it('should not fetch and add selected department if it is already in the departments list on first fetch', async () => {
+	const selectedDepartmentMappedToOption = {
+		_id: '5',
+		label: 'test_department_5',
+		value: '5',
+	};
+
+	const getDepartmentByIdCallback = jest.fn();
+
+	const { result } = renderHook(
+		() =>
+			useDepartmentsList({
+				filter: '',
+				onlyMyDepartments: true,
+				haveAll: true,
+				showArchived: true,
+				selectedDepartment: '5',
+			}),
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot()
+				.withEndpoint('GET', '/v1/livechat/department', () => ({
+					count: 25,
+					offset: 0,
+					total: 25,
+					departments: initialDepartmentsListMock,
+				}))
+				.withEndpoint('GET', `/v1/livechat/department/:_id`, getDepartmentByIdCallback)
+				.build(),
+		},
+	);
+
+	expect(getDepartmentByIdCallback).not.toHaveBeenCalled();
+	await waitFor(() => expect(result.current.itemsList.items).toContainEqual(selectedDepartmentMappedToOption));
+	// The expected length is 26 because the hook will add the 'All' item on run time
+	await waitFor(() => expect(result.current.itemsList.items.length).toBe(26));
+});
+
+it('should fetch and add selected department if it is not part of departments list on first fetch', async () => {
+	const missingDepartmentRawMock = {
+		_id: '56f5be8bcf8cd67f9e9bcfdc',
+		name: 'test_department_25',
+		enabled: true,
+		email: 'test25@email.com',
+		showOnRegistration: false,
+		showOnOfflineForm: false,
+		type: 'd',
+		_updatedAt: '2024-09-26T20:05:31.330Z',
+		offlineMessageChannelName: '',
+		numAgents: 0,
+		ancestors: undefined,
+		parentId: undefined,
+	};
+
+	const missingDepartmentMappedToOption = {
+		_id: '56f5be8bcf8cd67f9e9bcfdc',
+		label: 'test_department_25',
+		value: '56f5be8bcf8cd67f9e9bcfdc',
+	};
+
+	const { result } = renderHook(
+		() =>
+			useDepartmentsList({
+				filter: '',
+				onlyMyDepartments: true,
+				haveAll: true,
+				showArchived: true,
+				selectedDepartment: '56f5be8bcf8cd67f9e9bcfdc',
+			}),
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot()
+				.withEndpoint('GET', '/v1/livechat/department', () => ({
+					count: 25,
+					offset: 0,
+					total: 25,
+					departments: initialDepartmentsListMock,
+				}))
+				.withEndpoint('GET', `/v1/livechat/department/:_id`, () => ({
+					department: missingDepartmentRawMock,
+				}))
+				.build(),
+		},
+	);
+
+	await waitFor(() => expect(result.current.itemsList.items).toContainEqual(missingDepartmentMappedToOption));
+	// The expected length is 27 because the hook will add the 'All' item and the missing department on run time
+	await waitFor(() => expect(result.current.itemsList.items.length).toBe(27));
+});
diff --git a/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts b/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts
index fd3c0a29effe..d8e1071bf509 100644
--- a/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts
+++ b/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts
@@ -4,6 +4,8 @@ import { useCallback, useState } from 'react';
 import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList';
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
 import { RecordList } from '../../../lib/lists/RecordList';
+import type { DepartmentListItem } from '../Definitions/DepartmentsDefinitions';
+import { normalizeDepartments } from '../utils/normalizeDepartments';
 
 type DepartmentsListOptions = {
 	filter: string;
@@ -14,12 +16,7 @@ type DepartmentsListOptions = {
 	excludeDepartmentId?: string;
 	enabled?: boolean;
 	showArchived?: boolean;
-};
-
-type DepartmentListItem = {
-	_id: string;
-	label: string;
-	value: string;
+	selectedDepartment?: string;
 };
 
 export const useDepartmentsList = (
@@ -35,6 +32,7 @@ export const useDepartmentsList = (
 	const reload = useCallback(() => setItemsList(new RecordList<DepartmentListItem>()), []);
 
 	const getDepartments = useEndpoint('GET', '/v1/livechat/department');
+	const getDepartment = useEndpoint('GET', '/v1/livechat/department/:_id', { _id: options.selectedDepartment ?? '' });
 
 	useComponentDidUpdate(() => {
 		options && reload();
@@ -60,30 +58,32 @@ export const useDepartmentsList = (
 					}
 					return true;
 				})
-				.map(({ _id, name, _updatedAt, ...department }): DepartmentListItem => {
-					return {
+				.map(
+					({ _id, name, ...department }): DepartmentListItem => ({
 						_id,
 						label: department.archived ? `${name} [${t('Archived')}]` : name,
 						value: _id,
-					};
-				});
+					}),
+				);
+
+			const normalizedItems = await normalizeDepartments(items, options.selectedDepartment ?? '', getDepartment);
 
 			options.haveAll &&
-				items.unshift({
+				normalizedItems.unshift({
 					_id: '',
 					label: t('All'),
 					value: 'all',
 				});
 
 			options.haveNone &&
-				items.unshift({
+				normalizedItems.unshift({
 					_id: '',
 					label: t('None'),
 					value: '',
 				});
 
 			return {
-				items,
+				items: normalizedItems,
 				itemCount: options.departmentId ? total - 1 : total,
 			};
 		},
@@ -94,9 +94,11 @@ export const useDepartmentsList = (
 			options.excludeDepartmentId,
 			options.enabled,
 			options.showArchived,
+			options.selectedDepartment,
 			options.haveAll,
 			options.haveNone,
 			options.departmentId,
+			getDepartment,
 			t,
 		],
 	);
diff --git a/apps/meteor/client/components/Omnichannel/utils/normalizeDepartments.ts b/apps/meteor/client/components/Omnichannel/utils/normalizeDepartments.ts
new file mode 100644
index 000000000000..6c27db246b1d
--- /dev/null
+++ b/apps/meteor/client/components/Omnichannel/utils/normalizeDepartments.ts
@@ -0,0 +1,24 @@
+import type { EndpointFunction } from '@rocket.chat/ui-contexts';
+
+import type { DepartmentListItem } from '../Definitions/DepartmentsDefinitions';
+
+export const normalizeDepartments = async (
+	departments: DepartmentListItem[],
+	selectedDepartment: string,
+	getDepartment: EndpointFunction<'GET', '/v1/livechat/department/:_id'>,
+): Promise<DepartmentListItem[]> => {
+	const isSelectedDepartmentAlreadyOnList = () => departments.some((department) => department._id === selectedDepartment);
+	if (!selectedDepartment || selectedDepartment === 'all' || isSelectedDepartmentAlreadyOnList()) {
+		return departments;
+	}
+
+	try {
+		const { department: missingDepartment } = await getDepartment({});
+
+		return missingDepartment
+			? [...departments, { _id: missingDepartment._id, label: missingDepartment.name, value: missingDepartment._id }]
+			: departments;
+	} catch {
+		return departments;
+	}
+};
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts
index be8ec38a49aa..8e121b36ddb0 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts
@@ -146,7 +146,7 @@ test.describe('OC - Current Chats [Auto Selection]', async () => {
 		expect(results.violations).toEqual([]);
 	});
 
-	test('OC - Current chats - Filters', async () => {
+	test('OC - Current chats - Filters', async ({ page }) => {
 		const [departmentA, departmentB] = departments.map(({ data }) => data);
 
 		await test.step('expect to filter by guest', async () => {
@@ -236,6 +236,12 @@ test.describe('OC - Current Chats [Auto Selection]', async () => {
 			await expect(poCurrentChats.findRowByName(visitorA)).toBeVisible();
 		});
 
+		await test.step('expect department filter to show selected value after page reload', async () => {
+			await poCurrentChats.selectDepartment(departmentA.name);
+			await page.reload();
+			await expect(poCurrentChats.inputDepartmentValue).toContainText(departmentA.name);
+		});
+
 		// TODO: Unit test await test.step('expect to filter by period', async () => {});
 
 		// TODO: Unit test await test.step('expect to filter by custom fields', async () => {});
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-current-chats.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-current-chats.ts
index 46773e0ca43a..87a21cf34c8f 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-current-chats.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-current-chats.ts
@@ -35,6 +35,10 @@ export class OmnichannelCurrentChats extends OmnichannelAdministration {
 		return this.page.locator('[data-qa="autocomplete-department"] input');
 	}
 
+	get inputDepartmentValue(): Locator {
+		return this.page.locator('[data-qa="autocomplete-department"] span');
+	}
+
 	get inputTags(): Locator {
 		return this.page.locator('[data-qa="current-chats-tags"] [role="listbox"]');
 	}

From 6843990cb5f444461fd575f4dfa2bfaa9287439d Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Wed, 9 Oct 2024 15:40:41 -0300
Subject: [PATCH 155/170] regression: unable to disable voip client query
 (#33510)

---
 packages/ui-voip/src/hooks/useVoipClient.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui-voip/src/hooks/useVoipClient.tsx b/packages/ui-voip/src/hooks/useVoipClient.tsx
index 14ff278ca022..37715ea918dd 100644
--- a/packages/ui-voip/src/hooks/useVoipClient.tsx
+++ b/packages/ui-voip/src/hooks/useVoipClient.tsx
@@ -75,7 +75,7 @@ export const useVoipClient = ({ autoRegister = true }: VoipClientParams): VoipCl
 		},
 		{
 			initialData: null,
-			enabled: !!userId,
+			enabled: isVoipEnabled,
 		},
 	);
 

From c24b0e5ed353be61f3b76134b2fe737ed84cea2b Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Wed, 9 Oct 2024 19:59:25 -0300
Subject: [PATCH 156/170] regression: voip beforeunload listener being added
 instead of removed (#33511)

---
 packages/ui-voip/src/providers/VoipProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui-voip/src/providers/VoipProvider.tsx b/packages/ui-voip/src/providers/VoipProvider.tsx
index a4f25bc700a1..28133abd8698 100644
--- a/packages/ui-voip/src/providers/VoipProvider.tsx
+++ b/packages/ui-voip/src/providers/VoipProvider.tsx
@@ -103,7 +103,7 @@ const VoipProvider = ({ children }: { children: ReactNode }) => {
 			voipClient.networkEmitter.off('disconnected', onNetworkDisconnected);
 			voipClient.networkEmitter.off('connectionerror', onNetworkDisconnected);
 			voipClient.networkEmitter.off('localnetworkoffline', onNetworkDisconnected);
-			window.addEventListener('beforeunload', onBeforeUnload);
+			window.removeEventListener('beforeunload', onBeforeUnload);
 		};
 	}, [dispatchToastMessage, setStorageRegistered, t, voipClient, voipSounds]);
 

From a15b925c3888f01a1031a34570ca80e6d45dd7cc Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Wed, 9 Oct 2024 20:19:08 -0300
Subject: [PATCH 157/170] fix: livechat stuck unread counter on new messages
 (#33229)

---
 .changeset/poor-falcons-doubt.md              |  5 ++
 .../omnichannel/omnichannel-livechat.spec.ts  | 18 +++++-
 packages/livechat/src/lib/main.js             | 55 +++++++++----------
 3 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 .changeset/poor-falcons-doubt.md

diff --git a/.changeset/poor-falcons-doubt.md b/.changeset/poor-falcons-doubt.md
new file mode 100644
index 000000000000..cb297885c5a9
--- /dev/null
+++ b/.changeset/poor-falcons-doubt.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/livechat': patch
+---
+
+Fixes an issue where the unread message counter in the livechat widget does not update when a visitor receives their first response from an agent while the widget is minimized.
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
index 405e7f82e3c4..cf805ca233dd 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
@@ -58,7 +58,7 @@ test.describe.serial('OC - Livechat', () => {
 		});
 	});
 
-	test('OC - Livechat - Send message to livechat costumer', async () => {
+	test('OC - Livechat - Send message to livechat customer', async () => {
 		await poHomeOmnichannel.sidenav.openChat(firstVisitor.name);
 
 		await test.step('expect message to be sent by agent', async () => {
@@ -76,9 +76,23 @@ test.describe.serial('OC - Livechat', () => {
 			await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible();
 		});
 
+		await test.step('expect multiple messages to be received by minimized livechat', async () => {
+			await poHomeOmnichannel.content.sendMessage('this_a_test_message_once_again_from_agent');
+			await expect(poLiveChat.unreadMessagesBadge(2)).toBeVisible();
+		});
+
 		await test.step('expect unread messages to be visible after a reload', async () => {
 			await poLiveChat.page.reload();
-			await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible();
+			await expect(poLiveChat.unreadMessagesBadge(2)).toBeVisible();
+		});
+	});
+
+	test('OC - Livechat - Send message to agent after reload', async () => {
+		await test.step('expect unread counter to be empty after user sends a message', async () => {
+			await poLiveChat.openAnyLiveChat();
+			await poLiveChat.onlineAgentMessage.fill('this_a_test_message_from_user');
+			await poLiveChat.btnSendMessageToOnlineAgent.click();
+			expect(await poLiveChat.unreadMessagesBadge(0).all()).toHaveLength(0);
 		});
 	});
 
diff --git a/packages/livechat/src/lib/main.js b/packages/livechat/src/lib/main.js
index ad93dc184dd9..499cda913b95 100644
--- a/packages/livechat/src/lib/main.js
+++ b/packages/livechat/src/lib/main.js
@@ -90,41 +90,38 @@ export const getUnreadMessages = () => {
 	const { messages, user, lastReadMessageId } = store.state;
 
 	const renderedMessages = messages.filter((message) => canRenderMessage(message));
+
 	const lastReadMessageIndex = lastReadMessageId
 		? renderedMessages.findIndex((item) => item._id === lastReadMessageId)
-		: renderedMessages
-				.slice()
-				.reverse()
-				.findIndex((item) => item.u._id === user?._id);
-
-	if (lastReadMessageIndex !== -1) {
-		const unreadMessages = renderedMessages.slice(lastReadMessageIndex + 1).filter((message) => message.u._id !== user?._id);
-
-		return unreadMessages;
-	}
+		: renderedMessages.findLastIndex((item) => item.u._id === user?._id);
 
-	return [];
+	if (lastReadMessageIndex === -1) return 0;
+	return renderedMessages.slice(lastReadMessageIndex + 1).filter((message) => message.u._id !== user?._id).length;
 };
 
 export const processUnread = async () => {
+	const unreadMessages = getUnreadMessages();
+	if (unreadMessages <= 0) {
+		await store.setState({ unread: 0 });
+		return;
+	}
+
 	const shouldMarkUnread = shouldMarkAsUnread();
-	if (shouldMarkUnread) {
-		const unreadMessages = getUnreadMessages();
-
-		if (unreadMessages.length > 0) {
-			const { alerts } = store.state;
-			const lastReadMessage = getLastReadMessage();
-			const alertMessage = i18next.t('count_new_messages_since_since', {
-				count: unreadMessages.length,
-				val: new Date(lastReadMessage.ts),
-				formatParams: {
-					val: { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' },
-				},
-			});
-
-			const alert = { id: constants.unreadMessagesAlertId, children: alertMessage, success: true, timeout: 0 };
-			const newAlerts = alerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
-			await store.setState({ alerts: (newAlerts.push(alert), newAlerts), unread: unreadMessages.length });
-		}
+	if (!shouldMarkUnread) {
+		return;
 	}
+
+	const { alerts } = store.state;
+	const lastReadMessage = getLastReadMessage();
+	const alertMessage = i18next.t('count_new_messages_since_since', {
+		count: unreadMessages,
+		val: new Date(lastReadMessage.ts),
+		formatParams: {
+			val: { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' },
+		},
+	});
+	const alert = { id: constants.unreadMessagesAlertId, children: alertMessage, success: true, timeout: 0 };
+	const newAlerts = alerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
+
+	await store.setState({ alerts: (newAlerts.push(alert), newAlerts), unread: unreadMessages });
 };

From 4aa1a2344e1dbf8373bb387a4e71356679ef2a35 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Wed, 9 Oct 2024 20:19:08 -0300
Subject: [PATCH 158/170] fix: livechat stuck unread counter on new messages
 (#33229)

---
 .changeset/poor-falcons-doubt.md              |  5 ++
 .../omnichannel/omnichannel-livechat.spec.ts  | 18 +++++-
 packages/livechat/src/lib/main.js             | 55 +++++++++----------
 3 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 .changeset/poor-falcons-doubt.md

diff --git a/.changeset/poor-falcons-doubt.md b/.changeset/poor-falcons-doubt.md
new file mode 100644
index 000000000000..cb297885c5a9
--- /dev/null
+++ b/.changeset/poor-falcons-doubt.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/livechat': patch
+---
+
+Fixes an issue where the unread message counter in the livechat widget does not update when a visitor receives their first response from an agent while the widget is minimized.
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
index 405e7f82e3c4..cf805ca233dd 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
@@ -58,7 +58,7 @@ test.describe.serial('OC - Livechat', () => {
 		});
 	});
 
-	test('OC - Livechat - Send message to livechat costumer', async () => {
+	test('OC - Livechat - Send message to livechat customer', async () => {
 		await poHomeOmnichannel.sidenav.openChat(firstVisitor.name);
 
 		await test.step('expect message to be sent by agent', async () => {
@@ -76,9 +76,23 @@ test.describe.serial('OC - Livechat', () => {
 			await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible();
 		});
 
+		await test.step('expect multiple messages to be received by minimized livechat', async () => {
+			await poHomeOmnichannel.content.sendMessage('this_a_test_message_once_again_from_agent');
+			await expect(poLiveChat.unreadMessagesBadge(2)).toBeVisible();
+		});
+
 		await test.step('expect unread messages to be visible after a reload', async () => {
 			await poLiveChat.page.reload();
-			await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible();
+			await expect(poLiveChat.unreadMessagesBadge(2)).toBeVisible();
+		});
+	});
+
+	test('OC - Livechat - Send message to agent after reload', async () => {
+		await test.step('expect unread counter to be empty after user sends a message', async () => {
+			await poLiveChat.openAnyLiveChat();
+			await poLiveChat.onlineAgentMessage.fill('this_a_test_message_from_user');
+			await poLiveChat.btnSendMessageToOnlineAgent.click();
+			expect(await poLiveChat.unreadMessagesBadge(0).all()).toHaveLength(0);
 		});
 	});
 
diff --git a/packages/livechat/src/lib/main.js b/packages/livechat/src/lib/main.js
index ad93dc184dd9..499cda913b95 100644
--- a/packages/livechat/src/lib/main.js
+++ b/packages/livechat/src/lib/main.js
@@ -90,41 +90,38 @@ export const getUnreadMessages = () => {
 	const { messages, user, lastReadMessageId } = store.state;
 
 	const renderedMessages = messages.filter((message) => canRenderMessage(message));
+
 	const lastReadMessageIndex = lastReadMessageId
 		? renderedMessages.findIndex((item) => item._id === lastReadMessageId)
-		: renderedMessages
-				.slice()
-				.reverse()
-				.findIndex((item) => item.u._id === user?._id);
-
-	if (lastReadMessageIndex !== -1) {
-		const unreadMessages = renderedMessages.slice(lastReadMessageIndex + 1).filter((message) => message.u._id !== user?._id);
-
-		return unreadMessages;
-	}
+		: renderedMessages.findLastIndex((item) => item.u._id === user?._id);
 
-	return [];
+	if (lastReadMessageIndex === -1) return 0;
+	return renderedMessages.slice(lastReadMessageIndex + 1).filter((message) => message.u._id !== user?._id).length;
 };
 
 export const processUnread = async () => {
+	const unreadMessages = getUnreadMessages();
+	if (unreadMessages <= 0) {
+		await store.setState({ unread: 0 });
+		return;
+	}
+
 	const shouldMarkUnread = shouldMarkAsUnread();
-	if (shouldMarkUnread) {
-		const unreadMessages = getUnreadMessages();
-
-		if (unreadMessages.length > 0) {
-			const { alerts } = store.state;
-			const lastReadMessage = getLastReadMessage();
-			const alertMessage = i18next.t('count_new_messages_since_since', {
-				count: unreadMessages.length,
-				val: new Date(lastReadMessage.ts),
-				formatParams: {
-					val: { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' },
-				},
-			});
-
-			const alert = { id: constants.unreadMessagesAlertId, children: alertMessage, success: true, timeout: 0 };
-			const newAlerts = alerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
-			await store.setState({ alerts: (newAlerts.push(alert), newAlerts), unread: unreadMessages.length });
-		}
+	if (!shouldMarkUnread) {
+		return;
 	}
+
+	const { alerts } = store.state;
+	const lastReadMessage = getLastReadMessage();
+	const alertMessage = i18next.t('count_new_messages_since_since', {
+		count: unreadMessages,
+		val: new Date(lastReadMessage.ts),
+		formatParams: {
+			val: { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' },
+		},
+	});
+	const alert = { id: constants.unreadMessagesAlertId, children: alertMessage, success: true, timeout: 0 };
+	const newAlerts = alerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
+
+	await store.setState({ alerts: (newAlerts.push(alert), newAlerts), unread: unreadMessages });
 };

From 760ae5c01a6df34567f287542225fda06fdfe2d9 Mon Sep 17 00:00:00 2001
From: Abhinav Kumar <abhinav@avitechlab.com>
Date: Thu, 10 Oct 2024 07:33:08 +0530
Subject: [PATCH 159/170] fix: "Filter by room type" selectable in Rooms filter
 (#33507)

---
 .changeset/tender-cheetahs-teach.md           |  6 +++
 .../views/admin/rooms/RoomsTableFilters.tsx   |  1 +
 .../MultiSelectCustom/MultiSelectCustom.tsx   |  1 +
 .../MultiSelectCustomList.spec.tsx            | 44 +++++++++++++++++++
 .../MultiSelectCustomList.tsx                 |  4 +-
 5 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/tender-cheetahs-teach.md
 create mode 100644 packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.spec.tsx

diff --git a/.changeset/tender-cheetahs-teach.md b/.changeset/tender-cheetahs-teach.md
new file mode 100644
index 000000000000..bbb956d74715
--- /dev/null
+++ b/.changeset/tender-cheetahs-teach.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/ui-client': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue where "Filter by room type" was selectable in the Rooms filter.
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
index 2ec5954332f7..5d84c451df9a 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
@@ -9,6 +9,7 @@ const initialRoomTypeFilterStructure = [
 	{
 		id: 'filter_by_room',
 		text: 'Filter_by_room',
+		isGroupTitle: true,
 	},
 	{
 		id: 'd',
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
index 0855e5fc68c5..7694dda2944a 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
@@ -24,6 +24,7 @@ export type OptionProp = {
 	id: string;
 	text: string;
 	checked?: boolean;
+	isGroupTitle?: boolean;
 };
 
 /**
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.spec.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.spec.tsx
new file mode 100644
index 000000000000..7d8596d8f0ea
--- /dev/null
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.spec.tsx
@@ -0,0 +1,44 @@
+import { render, screen } from '@testing-library/react';
+
+import MultiSelectCustomList from './MultiSelectCustomList';
+
+it('should render options with correct checked state', () => {
+	render(
+		<MultiSelectCustomList
+			options={[
+				{ id: '1', text: 'Option 1', checked: true },
+				{ id: '2', text: 'Option 2', checked: false },
+			]}
+			onSelected={jest.fn()}
+		/>,
+		{ legacyRoot: true },
+	);
+
+	const option1 = screen.getByLabelText('Option 1');
+	expect(option1).toBeInTheDocument();
+	expect(option1).toBeChecked();
+
+	const option2 = screen.getByLabelText('Option 2');
+	expect(option2).toBeInTheDocument();
+	expect(option2).not.toBeChecked();
+});
+
+it('should not render group title as selectable option', () => {
+	render(
+		<MultiSelectCustomList
+			options={[
+				{ id: '1', text: 'Group title', isGroupTitle: true },
+				{ id: '2', text: 'Option 1', checked: false },
+			]}
+			onSelected={jest.fn()}
+		/>,
+		{ legacyRoot: true },
+	);
+
+	expect(screen.getByText('Group title')).toBeInTheDocument();
+	expect(screen.queryByRole('checkbox', { name: /Group title/i })).not.toBeInTheDocument();
+
+	const option1 = screen.getByLabelText('Option 1');
+	expect(option1).toBeInTheDocument();
+	expect(option1).not.toBeChecked();
+});
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index d73d9ce6b88b..7a2268743fd4 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -40,8 +40,8 @@ const MultiSelectCustomList = ({
 			)}
 			{filteredOptions.map((option) => (
 				<Fragment key={option.id}>
-					{!option.hasOwnProperty('checked') ? (
-						<Box mi={12} mb={4} fontScale='p2b' color='default'>
+					{option.isGroupTitle || !option.hasOwnProperty('checked') ? (
+						<Box mi='x10' mb={4} fontScale='p2b' color='default'>
 							{t(option.text as TranslationKey)}
 						</Box>
 					) : (

From e9700f68b79a4a109a1815d564078e1ef1a0a9dd Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Thu, 10 Oct 2024 03:10:58 +0000
Subject: [PATCH 160/170] Release 6.13.0

[no ci]
---
 .changeset/brave-brooms-invent.md             |   5 -
 .changeset/brown-singers-appear.md            |   7 -
 .changeset/bump-patch-1727212585363.md        |   5 -
 .changeset/bump-patch-1727392133102.md        |   5 -
 .changeset/bump-patch-1727482167703.md        |   5 -
 .changeset/bump-patch-1727817480079.md        |   5 -
 .changeset/bump-patch-1728026023781.md        |   5 -
 .changeset/bump-patch-1728416283220.md        |   5 -
 .changeset/cyan-ladybugs-thank.md             |   5 -
 .changeset/dirty-stingrays-beg.md             |   7 -
 .changeset/dry-taxis-cry.md                   |   5 -
 .changeset/five-coats-rhyme.md                |   5 -
 .changeset/four-cherries-kneel.md             |   5 -
 .changeset/great-humans-live.md               |   5 -
 .changeset/healthy-rivers-nail.md             |   8 --
 .changeset/heavy-snails-help.md               |   6 -
 .changeset/hot-balloons-travel.md             |   5 -
 .changeset/khaki-cameras-glow.md              |   5 -
 .changeset/kind-llamas-grin.md                |   5 -
 .changeset/late-planes-sniff.md               |   7 -
 .changeset/many-balloons-scream.md            |  13 --
 .changeset/many-rules-shout.md                |   5 -
 .changeset/mighty-drinks-hide.md              |   6 -
 .changeset/nasty-tools-enjoy.md               |   5 -
 .changeset/pink-swans-teach.md                |   5 -
 .changeset/poor-falcons-doubt.md              |   5 -
 .changeset/pre.json                           | 109 ----------------
 .changeset/quick-rings-wave.md                |   7 -
 .changeset/quiet-cherries-punch.md            |   7 -
 .changeset/rich-toes-bow.md                   |   5 -
 .changeset/rotten-rabbits-brush.md            |   5 -
 .changeset/short-drinks-itch.md               |   6 -
 .changeset/sixty-spoons-own.md                |   9 --
 .changeset/small-crabs-travel.md              |   5 -
 .changeset/soft-mirrors-remember.md           |   8 --
 .changeset/spicy-rocks-burn.md                |   5 -
 .changeset/strong-grapes-brake.md             |   9 --
 .changeset/stupid-pigs-share.md               |   5 -
 .changeset/sweet-nails-grin.md                |   5 -
 .changeset/tame-mayflies-press.md             |   5 -
 .changeset/tiny-geckos-kiss.md                |   6 -
 .changeset/wet-hats-walk.md                   |   5 -
 .changeset/wise-avocados-taste.md             |   5 -
 .changeset/witty-lemons-type.md               |  10 --
 apps/meteor/CHANGELOG.md                      | 121 ++++++++++++++++++
 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            |  16 +++
 apps/uikit-playground/package.json            |   2 +-
 ee/apps/account-service/CHANGELOG.md          |  13 ++
 ee/apps/account-service/package.json          |   2 +-
 ee/apps/authorization-service/CHANGELOG.md    |  13 ++
 ee/apps/authorization-service/package.json    |   2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             |  14 ++
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   |  14 ++
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/presence-service/CHANGELOG.md         |  13 ++
 ee/apps/presence-service/package.json         |   2 +-
 ee/apps/queue-worker/CHANGELOG.md             |  13 ++
 ee/apps/queue-worker/package.json             |   2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       |  12 ++
 ee/apps/stream-hub-service/package.json       |   2 +-
 ee/packages/license/CHANGELOG.md              |   9 ++
 ee/packages/license/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 +-
 ee/packages/ui-theming/CHANGELOG.md           |   6 +
 ee/packages/ui-theming/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           |  20 +++
 packages/core-services/package.json           |   2 +-
 packages/core-typings/CHANGELOG.md            |  17 +++
 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/fuselage-ui-kit/CHANGELOG.md         |  21 +++
 packages/fuselage-ui-kit/package.json         |   8 +-
 packages/gazzodown/CHANGELOG.md               |  16 +++
 packages/gazzodown/package.json               |   8 +-
 packages/i18n/CHANGELOG.md                    |  16 +++
 packages/i18n/package.json                    |   2 +-
 packages/instance-status/CHANGELOG.md         |   9 ++
 packages/instance-status/package.json         |   2 +-
 packages/livechat/CHANGELOG.md                |  17 +++
 packages/livechat/package.json                |   2 +-
 packages/message-parser/CHANGELOG.md          |   6 +
 packages/message-parser/package.json          |   2 +-
 packages/mock-providers/CHANGELOG.md          |   9 ++
 packages/mock-providers/package.json          |   2 +-
 packages/model-typings/CHANGELOG.md           |  19 +++
 packages/model-typings/package.json           |   2 +-
 packages/models/CHANGELOG.md                  |  13 ++
 packages/models/package.json                  |   2 +-
 packages/peggy-loader/CHANGELOG.md            |   7 +
 packages/peggy-loader/package.json            |   2 +-
 packages/rest-typings/CHANGELOG.md            |  24 ++++
 packages/rest-typings/package.json            |   2 +-
 packages/ui-avatar/CHANGELOG.md               |  13 ++
 packages/ui-avatar/package.json               |   4 +-
 packages/ui-client/CHANGELOG.md               |  20 +++
 packages/ui-client/package.json               |   2 +-
 packages/ui-composer/CHANGELOG.md             |   6 +
 packages/ui-composer/package.json             |   2 +-
 packages/ui-contexts/CHANGELOG.md             |  12 ++
 packages/ui-contexts/package.json             |   2 +-
 packages/ui-video-conf/CHANGELOG.md           |  14 ++
 packages/ui-video-conf/package.json           |   6 +-
 packages/web-ui-registration/CHANGELOG.md     |   9 ++
 packages/web-ui-registration/package.json     |   4 +-
 yarn.lock                                     |  16 +--
 123 files changed, 659 insertions(+), 423 deletions(-)
 delete mode 100644 .changeset/brave-brooms-invent.md
 delete mode 100644 .changeset/brown-singers-appear.md
 delete mode 100644 .changeset/bump-patch-1727212585363.md
 delete mode 100644 .changeset/bump-patch-1727392133102.md
 delete mode 100644 .changeset/bump-patch-1727482167703.md
 delete mode 100644 .changeset/bump-patch-1727817480079.md
 delete mode 100644 .changeset/bump-patch-1728026023781.md
 delete mode 100644 .changeset/bump-patch-1728416283220.md
 delete mode 100644 .changeset/cyan-ladybugs-thank.md
 delete mode 100644 .changeset/dirty-stingrays-beg.md
 delete mode 100644 .changeset/dry-taxis-cry.md
 delete mode 100644 .changeset/five-coats-rhyme.md
 delete mode 100644 .changeset/four-cherries-kneel.md
 delete mode 100644 .changeset/great-humans-live.md
 delete mode 100644 .changeset/healthy-rivers-nail.md
 delete mode 100644 .changeset/heavy-snails-help.md
 delete mode 100644 .changeset/hot-balloons-travel.md
 delete mode 100644 .changeset/khaki-cameras-glow.md
 delete mode 100644 .changeset/kind-llamas-grin.md
 delete mode 100644 .changeset/late-planes-sniff.md
 delete mode 100644 .changeset/many-balloons-scream.md
 delete mode 100644 .changeset/many-rules-shout.md
 delete mode 100644 .changeset/mighty-drinks-hide.md
 delete mode 100644 .changeset/nasty-tools-enjoy.md
 delete mode 100644 .changeset/pink-swans-teach.md
 delete mode 100644 .changeset/poor-falcons-doubt.md
 delete mode 100644 .changeset/pre.json
 delete mode 100644 .changeset/quick-rings-wave.md
 delete mode 100644 .changeset/quiet-cherries-punch.md
 delete mode 100644 .changeset/rich-toes-bow.md
 delete mode 100644 .changeset/rotten-rabbits-brush.md
 delete mode 100644 .changeset/short-drinks-itch.md
 delete mode 100644 .changeset/sixty-spoons-own.md
 delete mode 100644 .changeset/small-crabs-travel.md
 delete mode 100644 .changeset/soft-mirrors-remember.md
 delete mode 100644 .changeset/spicy-rocks-burn.md
 delete mode 100644 .changeset/strong-grapes-brake.md
 delete mode 100644 .changeset/stupid-pigs-share.md
 delete mode 100644 .changeset/sweet-nails-grin.md
 delete mode 100644 .changeset/tame-mayflies-press.md
 delete mode 100644 .changeset/tiny-geckos-kiss.md
 delete mode 100644 .changeset/wet-hats-walk.md
 delete mode 100644 .changeset/wise-avocados-taste.md
 delete mode 100644 .changeset/witty-lemons-type.md

diff --git a/.changeset/brave-brooms-invent.md b/.changeset/brave-brooms-invent.md
deleted file mode 100644
index 35d32b485944..000000000000
--- a/.changeset/brave-brooms-invent.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
diff --git a/.changeset/brown-singers-appear.md b/.changeset/brown-singers-appear.md
deleted file mode 100644
index 8a9a69f225ac..000000000000
--- a/.changeset/brown-singers-appear.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@rocket.chat/ui-client': minor
-'@rocket.chat/i18n': minor
-'@rocket.chat/meteor': minor
----
-
-added `sidepanelNavigation` to feature preview list
diff --git a/.changeset/bump-patch-1727212585363.md b/.changeset/bump-patch-1727212585363.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1727212585363.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1727392133102.md b/.changeset/bump-patch-1727392133102.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1727392133102.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1727482167703.md b/.changeset/bump-patch-1727482167703.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1727482167703.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1727817480079.md b/.changeset/bump-patch-1727817480079.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1727817480079.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1728026023781.md b/.changeset/bump-patch-1728026023781.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1728026023781.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1728416283220.md b/.changeset/bump-patch-1728416283220.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1728416283220.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/cyan-ladybugs-thank.md b/.changeset/cyan-ladybugs-thank.md
deleted file mode 100644
index 377a014fcb72..000000000000
--- a/.changeset/cyan-ladybugs-thank.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed error during sendmessage client stub
diff --git a/.changeset/dirty-stingrays-beg.md b/.changeset/dirty-stingrays-beg.md
deleted file mode 100644
index cf5e3a4ca839..000000000000
--- a/.changeset/dirty-stingrays-beg.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/model-typings": minor
-"@rocket.chat/rest-typings": minor
----
-
-Added support for specifying a unit on departments' creation and update
diff --git a/.changeset/dry-taxis-cry.md b/.changeset/dry-taxis-cry.md
deleted file mode 100644
index ae8244087d9e..000000000000
--- a/.changeset/dry-taxis-cry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
diff --git a/.changeset/five-coats-rhyme.md b/.changeset/five-coats-rhyme.md
deleted file mode 100644
index c5359e3c978a..000000000000
--- a/.changeset/five-coats-rhyme.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/fuselage-ui-kit': patch
----
-
-Fixed an error that incorrectly showed conference calls as not answered after they ended
diff --git a/.changeset/four-cherries-kneel.md b/.changeset/four-cherries-kneel.md
deleted file mode 100644
index 095d5af0aa76..000000000000
--- a/.changeset/four-cherries-kneel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
diff --git a/.changeset/great-humans-live.md b/.changeset/great-humans-live.md
deleted file mode 100644
index 1d97d9da23ae..000000000000
--- a/.changeset/great-humans-live.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed a Federation callback not awaiting db call
diff --git a/.changeset/healthy-rivers-nail.md b/.changeset/healthy-rivers-nail.md
deleted file mode 100644
index a8da9bec846e..000000000000
--- a/.changeset/healthy-rivers-nail.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/i18n": minor
-"@rocket.chat/livechat": minor
----
-
-Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
-However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
diff --git a/.changeset/heavy-snails-help.md b/.changeset/heavy-snails-help.md
deleted file mode 100644
index fb10bac9ea8f..000000000000
--- a/.changeset/heavy-snails-help.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/rest-typings": minor
----
-
-Implemented "omnichannel/contacts.update" endpoint to update contacts
diff --git a/.changeset/hot-balloons-travel.md b/.changeset/hot-balloons-travel.md
deleted file mode 100644
index d6154babc49d..000000000000
--- a/.changeset/hot-balloons-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
diff --git a/.changeset/khaki-cameras-glow.md b/.changeset/khaki-cameras-glow.md
deleted file mode 100644
index 87470d5c497b..000000000000
--- a/.changeset/khaki-cameras-glow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes an issue where the retention policy warning keep displaying even if the retention is disabled inside the room
diff --git a/.changeset/kind-llamas-grin.md b/.changeset/kind-llamas-grin.md
deleted file mode 100644
index fd349e82d7f9..000000000000
--- a/.changeset/kind-llamas-grin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Changed the contextualbar behavior based on chat size instead the viewport
diff --git a/.changeset/late-planes-sniff.md b/.changeset/late-planes-sniff.md
deleted file mode 100644
index d702a938da78..000000000000
--- a/.changeset/late-planes-sniff.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/core-typings": patch
-"@rocket.chat/i18n": patch
----
-
-Added a new setting to enable mentions in end to end encrypted channels
diff --git a/.changeset/many-balloons-scream.md b/.changeset/many-balloons-scream.md
deleted file mode 100644
index f017cdb81137..000000000000
--- a/.changeset/many-balloons-scream.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-'@rocket.chat/uikit-playground': minor
-'@rocket.chat/fuselage-ui-kit': minor
-'@rocket.chat/ui-theming': minor
-'@rocket.chat/ui-video-conf': minor
-'@rocket.chat/ui-composer': minor
-'@rocket.chat/gazzodown': minor
-'@rocket.chat/ui-avatar': minor
-'@rocket.chat/ui-client': minor
-'@rocket.chat/meteor': minor
----
-
-Replaced new `SidebarV2` components under feature preview
diff --git a/.changeset/many-rules-shout.md b/.changeset/many-rules-shout.md
deleted file mode 100644
index eacb88108a0f..000000000000
--- a/.changeset/many-rules-shout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/.changeset/mighty-drinks-hide.md b/.changeset/mighty-drinks-hide.md
deleted file mode 100644
index 955d1ed760cc..000000000000
--- a/.changeset/mighty-drinks-hide.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@rocket.chat/meteor": patch
-"@rocket.chat/fuselage-ui-kit": patch
----
-
-Fixes multiple selection for MultiStaticSelectElement in UiKit
diff --git a/.changeset/nasty-tools-enjoy.md b/.changeset/nasty-tools-enjoy.md
deleted file mode 100644
index b6e8dae3785a..000000000000
--- a/.changeset/nasty-tools-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed a code issue on NPS service. It was passing `startAt` as the expiration date when creating a banner.
diff --git a/.changeset/pink-swans-teach.md b/.changeset/pink-swans-teach.md
deleted file mode 100644
index 7c85572a78d5..000000000000
--- a/.changeset/pink-swans-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-fixed retention policy max age settings not being respected after upgrade
diff --git a/.changeset/poor-falcons-doubt.md b/.changeset/poor-falcons-doubt.md
deleted file mode 100644
index cb297885c5a9..000000000000
--- a/.changeset/poor-falcons-doubt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/livechat': patch
----
-
-Fixes an issue where the unread message counter in the livechat widget does not update when a visitor receives their first response from an agent while the widget is minimized.
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index c1eafc495c79..000000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "rc",
-  "initialVersions": {
-    "@rocket.chat/meteor": "6.13.0-develop",
-    "rocketchat-services": "1.3.3",
-    "@rocket.chat/uikit-playground": "0.4.0",
-    "@rocket.chat/account-service": "0.4.6",
-    "@rocket.chat/authorization-service": "0.4.6",
-    "@rocket.chat/ddp-streamer": "0.3.6",
-    "@rocket.chat/omnichannel-transcript": "0.4.6",
-    "@rocket.chat/presence-service": "0.4.6",
-    "@rocket.chat/queue-worker": "0.4.6",
-    "@rocket.chat/stream-hub-service": "0.4.6",
-    "@rocket.chat/license": "0.2.6",
-    "@rocket.chat/omnichannel-services": "0.3.3",
-    "@rocket.chat/pdf-worker": "0.2.3",
-    "@rocket.chat/presence": "0.2.6",
-    "@rocket.chat/ui-theming": "0.2.1",
-    "@rocket.chat/account-utils": "0.0.2",
-    "@rocket.chat/agenda": "0.1.0",
-    "@rocket.chat/api-client": "0.2.6",
-    "@rocket.chat/apps": "0.1.6",
-    "@rocket.chat/base64": "1.0.13",
-    "@rocket.chat/cas-validate": "0.0.2",
-    "@rocket.chat/core-services": "0.6.0",
-    "@rocket.chat/core-typings": "6.13.0-develop",
-    "@rocket.chat/cron": "0.1.6",
-    "@rocket.chat/ddp-client": "0.3.6",
-    "@rocket.chat/eslint-config": "0.7.0",
-    "@rocket.chat/favicon": "0.0.2",
-    "@rocket.chat/fuselage-ui-kit": "10.0.0",
-    "@rocket.chat/gazzodown": "10.0.0",
-    "@rocket.chat/i18n": "0.7.0",
-    "@rocket.chat/instance-status": "0.1.6",
-    "@rocket.chat/jest-presets": "0.0.1",
-    "@rocket.chat/jwt": "0.1.1",
-    "@rocket.chat/livechat": "1.19.3",
-    "@rocket.chat/log-format": "0.0.2",
-    "@rocket.chat/logger": "0.0.2",
-    "@rocket.chat/message-parser": "0.31.29",
-    "@rocket.chat/mock-providers": "0.1.2",
-    "@rocket.chat/model-typings": "0.7.0",
-    "@rocket.chat/models": "0.2.3",
-    "@rocket.chat/poplib": "0.0.2",
-    "@rocket.chat/password-policies": "0.0.2",
-    "@rocket.chat/patch-injection": "0.0.1",
-    "@rocket.chat/peggy-loader": "0.31.25",
-    "@rocket.chat/random": "1.2.2",
-    "@rocket.chat/release-action": "2.2.3",
-    "@rocket.chat/release-changelog": "0.1.0",
-    "@rocket.chat/rest-typings": "6.13.0-develop",
-    "@rocket.chat/server-cloud-communication": "0.0.2",
-    "@rocket.chat/server-fetch": "0.0.3",
-    "@rocket.chat/sha256": "1.0.10",
-    "@rocket.chat/tools": "0.2.2",
-    "@rocket.chat/ui-avatar": "6.0.0",
-    "@rocket.chat/ui-client": "10.0.0",
-    "@rocket.chat/ui-composer": "0.2.1",
-    "@rocket.chat/ui-contexts": "10.0.0",
-    "@rocket.chat/ui-kit": "0.36.1",
-    "@rocket.chat/ui-video-conf": "10.0.0",
-    "@rocket.chat/web-ui-registration": "10.0.0"
-  },
-  "changesets": [
-    "brave-brooms-invent",
-    "brown-singers-appear",
-    "bump-patch-1727212585363",
-    "bump-patch-1727392133102",
-    "bump-patch-1727482167703",
-    "bump-patch-1727817480079",
-    "bump-patch-1728026023781",
-    "bump-patch-1728416283220",
-    "cyan-ladybugs-thank",
-    "dirty-stingrays-beg",
-    "dry-taxis-cry",
-    "five-coats-rhyme",
-    "four-cherries-kneel",
-    "great-humans-live",
-    "healthy-rivers-nail",
-    "heavy-snails-help",
-    "hot-balloons-travel",
-    "khaki-cameras-glow",
-    "kind-llamas-grin",
-    "late-planes-sniff",
-    "many-balloons-scream",
-    "many-rules-shout",
-    "mighty-drinks-hide",
-    "nasty-tools-enjoy",
-    "pink-swans-teach",
-    "quick-rings-wave",
-    "quiet-cherries-punch",
-    "rich-toes-bow",
-    "rotten-rabbits-brush",
-    "short-drinks-itch",
-    "sixty-spoons-own",
-    "small-crabs-travel",
-    "soft-mirrors-remember",
-    "spicy-rocks-burn",
-    "strong-grapes-brake",
-    "stupid-pigs-share",
-    "sweet-nails-grin",
-    "tame-mayflies-press",
-    "tiny-geckos-kiss",
-    "wet-hats-walk",
-    "wise-avocados-taste",
-    "witty-lemons-type"
-  ]
-}
diff --git a/.changeset/quick-rings-wave.md b/.changeset/quick-rings-wave.md
deleted file mode 100644
index 0ea22897ff45..000000000000
--- a/.changeset/quick-rings-wave.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/i18n": minor
-"@rocket.chat/ui-client": minor
----
-
-Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
diff --git a/.changeset/quiet-cherries-punch.md b/.changeset/quiet-cherries-punch.md
deleted file mode 100644
index 25c08506db41..000000000000
--- a/.changeset/quiet-cherries-punch.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/core-services": minor
-"@rocket.chat/rest-typings": minor
----
-
-Return `parent` and `team` information when calling `rooms.info` endpoint
diff --git a/.changeset/rich-toes-bow.md b/.changeset/rich-toes-bow.md
deleted file mode 100644
index a670f0756f1e..000000000000
--- a/.changeset/rich-toes-bow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Prevented uiInteraction to subscribe multiple times
diff --git a/.changeset/rotten-rabbits-brush.md b/.changeset/rotten-rabbits-brush.md
deleted file mode 100644
index 916f4cc8034a..000000000000
--- a/.changeset/rotten-rabbits-brush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
diff --git a/.changeset/short-drinks-itch.md b/.changeset/short-drinks-itch.md
deleted file mode 100644
index ee57330ffc86..000000000000
--- a/.changeset/short-drinks-itch.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@rocket.chat/message-parser': patch
-'@rocket.chat/peggy-loader': patch
----
-
-Improved the performance of the message parser
diff --git a/.changeset/sixty-spoons-own.md b/.changeset/sixty-spoons-own.md
deleted file mode 100644
index 0b717c3965ef..000000000000
--- a/.changeset/sixty-spoons-own.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/core-typings": minor
-"@rocket.chat/model-typings": minor
-"@rocket.chat/models": minor
-"@rocket.chat/rest-typings": minor
----
-
-Introduced "create contacts" endpoint to omnichannel
diff --git a/.changeset/small-crabs-travel.md b/.changeset/small-crabs-travel.md
deleted file mode 100644
index 201494a5b70f..000000000000
--- a/.changeset/small-crabs-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
diff --git a/.changeset/soft-mirrors-remember.md b/.changeset/soft-mirrors-remember.md
deleted file mode 100644
index 78b005ee6b6e..000000000000
--- a/.changeset/soft-mirrors-remember.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"@rocket.chat/meteor": minor
-"@rocket.chat/core-services": minor
-"@rocket.chat/model-typings": minor
-"@rocket.chat/rest-typings": minor
----
-
-New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
diff --git a/.changeset/spicy-rocks-burn.md b/.changeset/spicy-rocks-burn.md
deleted file mode 100644
index 6468dbbec241..000000000000
--- a/.changeset/spicy-rocks-burn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
diff --git a/.changeset/strong-grapes-brake.md b/.changeset/strong-grapes-brake.md
deleted file mode 100644
index c867600a8cd2..000000000000
--- a/.changeset/strong-grapes-brake.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixed remaining direct references to external user avatar URLs
-
-Fixed local avatars having priority over external provider
-
-It mainly corrects the behavior of E2E encryption messages and desktop notifications.
diff --git a/.changeset/stupid-pigs-share.md b/.changeset/stupid-pigs-share.md
deleted file mode 100644
index 55d68c66d587..000000000000
--- a/.changeset/stupid-pigs-share.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': minor
----
-
-Wraps some room settings in an accordion advanced settings section in room edit contextual bar to improve organization
diff --git a/.changeset/sweet-nails-grin.md b/.changeset/sweet-nails-grin.md
deleted file mode 100644
index de240bfc0e3f..000000000000
--- a/.changeset/sweet-nails-grin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
diff --git a/.changeset/tame-mayflies-press.md b/.changeset/tame-mayflies-press.md
deleted file mode 100644
index e470306cbc25..000000000000
--- a/.changeset/tame-mayflies-press.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": minor
----
-
-Implemented sending email via apps
diff --git a/.changeset/tiny-geckos-kiss.md b/.changeset/tiny-geckos-kiss.md
deleted file mode 100644
index d38150970310..000000000000
--- a/.changeset/tiny-geckos-kiss.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@rocket.chat/i18n': minor
-'@rocket.chat/meteor': minor
----
-
-Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
diff --git a/.changeset/wet-hats-walk.md b/.changeset/wet-hats-walk.md
deleted file mode 100644
index 4c3565e75523..000000000000
--- a/.changeset/wet-hats-walk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
deleted file mode 100644
index c4c9bce010b8..000000000000
--- a/.changeset/wise-avocados-taste.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes an issue where multi-step modals were closing unexpectedly
diff --git a/.changeset/witty-lemons-type.md b/.changeset/witty-lemons-type.md
deleted file mode 100644
index a007cbe6260e..000000000000
--- a/.changeset/witty-lemons-type.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@rocket.chat/core-services': minor
-'@rocket.chat/model-typings': minor
-'@rocket.chat/core-typings': minor
-'@rocket.chat/rest-typings': minor
-'@rocket.chat/ui-client': minor
-'@rocket.chat/meteor': minor
----
-
-Implemented new feature preview for Sidepanel
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 340ae30e35a7..2fd9252f1ba1 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,126 @@
 # @rocket.chat/meteor
 
+## 6.13.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+- ([#32729](https://github.com/RocketChat/Rocket.Chat/pull/32729)) Implemented "omnichannel/contacts.update" endpoint to update contacts
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33114](https://github.com/RocketChat/Rocket.Chat/pull/33114)) Wraps some room settings in an accordion advanced settings section in room edit contextual bar to improve organization
+
+- ([#33160](https://github.com/RocketChat/Rocket.Chat/pull/33160)) Implemented sending email via apps
+
+- ([#32945](https://github.com/RocketChat/Rocket.Chat/pull/32945)) Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- ([#33339](https://github.com/RocketChat/Rocket.Chat/pull/33339)) Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33317](https://github.com/RocketChat/Rocket.Chat/pull/33317)) Fixed error during sendmessage client stub
+
+- ([#33381](https://github.com/RocketChat/Rocket.Chat/pull/33381)) Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
+
+- ([#33211](https://github.com/RocketChat/Rocket.Chat/pull/33211)) Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
+
+- ([#33298](https://github.com/RocketChat/Rocket.Chat/pull/33298)) Fixed a Federation callback not awaiting db call
+
+- ([#32939](https://github.com/RocketChat/Rocket.Chat/pull/32939)) Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
+
+- ([#33197](https://github.com/RocketChat/Rocket.Chat/pull/33197)) Fixes an issue where the retention policy warning keep displaying even if the retention is disabled inside the room
+
+- ([#33321](https://github.com/RocketChat/Rocket.Chat/pull/33321)) Changed the contextualbar behavior based on chat size instead the viewport
+
+- ([#33246](https://github.com/RocketChat/Rocket.Chat/pull/33246)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#32999](https://github.com/RocketChat/Rocket.Chat/pull/32999)) Fixes multiple selection for MultiStaticSelectElement in UiKit
+
+- ([#33155](https://github.com/RocketChat/Rocket.Chat/pull/33155)) Fixed a code issue on NPS service. It was passing `startAt` as the expiration date when creating a banner.
+
+- ([#33237](https://github.com/RocketChat/Rocket.Chat/pull/33237)) fixed retention policy max age settings not being respected after upgrade
+
+- ([#33216](https://github.com/RocketChat/Rocket.Chat/pull/33216)) Prevented uiInteraction to subscribe multiple times
+
+- ([#33295](https://github.com/RocketChat/Rocket.Chat/pull/33295)) Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
+
+- ([#33193](https://github.com/RocketChat/Rocket.Chat/pull/33193)) Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
+
+- ([#33209](https://github.com/RocketChat/Rocket.Chat/pull/33209)) Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
+
+- ([#33296](https://github.com/RocketChat/Rocket.Chat/pull/33296)) Fixed remaining direct references to external user avatar URLs
+
+  Fixed local avatars having priority over external provider
+
+  It mainly corrects the behavior of E2E encryption messages and desktop notifications.
+
+- ([#33157](https://github.com/RocketChat/Rocket.Chat/pull/33157) by [@csuadev](https://github.com/csuadev)) Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
+
+- ([#33181](https://github.com/RocketChat/Rocket.Chat/pull/33181)) Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
+
+- ([#33158](https://github.com/RocketChat/Rocket.Chat/pull/33158)) Fixes an issue where multi-step modals were closing unexpectedly
+
+- <details><summary>Updated dependencies [bb94c9c67a, 9a38c8e13f, 599762739a, 7c14fd1a80, 9eaefdc892, 274f4f5881, cd0d50016e, 78e6ba4820, 2f9eea03d2, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 0f21fa01a3, 12d6307998]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0
+  - @rocket.chat/i18n@0.8.0
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/fuselage-ui-kit@11.0.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/ui-theming@0.3.0
+  - @rocket.chat/ui-video-conf@11.0.0
+  - @rocket.chat/ui-composer@0.3.0
+  - @rocket.chat/gazzodown@11.0.0
+  - @rocket.chat/ui-avatar@7.0.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/message-parser@0.31.31
+  - @rocket.chat/models@0.3.0
+  - @rocket.chat/web-ui-registration@11.0.0
+  - @rocket.chat/ui-contexts@11.0.0
+  - @rocket.chat/omnichannel-services@0.3.5
+  - @rocket.chat/apps@0.1.8
+  - @rocket.chat/presence@0.2.8
+  - @rocket.chat/api-client@0.2.8
+  - @rocket.chat/license@0.2.8
+  - @rocket.chat/pdf-worker@0.2.5
+  - @rocket.chat/cron@0.1.8
+  - @rocket.chat/instance-status@0.1.8
+  - @rocket.chat/server-cloud-communication@0.0.2
+  </details>
+
 ## 6.13.0-rc.6
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 19164d07ee1b..1d2749722818 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-rc.6"
+	"version": "6.13.0"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 5d8f857ad8ff..46637586f11e 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 1.3.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/message-parser@0.31.31
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 1.3.5-rc.6
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 1e6e859d7639..3550f3dd2924 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": "1.3.5-rc.6",
+	"version": "1.3.5",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 0e761cad06fd..c6084f477c19 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": "6.13.0-rc.6",
+	"version": "6.13.0",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 8b1c72004a69..7bb157c65dce 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [599762739a, 274f4f5881, cd0d50016e, 78e6ba4820, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@11.0.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/ui-avatar@7.0.0
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 0.5.0-rc.6
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index c31fd7e3da47..00e52229c2e3 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.5.0-rc.6",
+  "version": "0.5.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 59a4ada810c5..1ca0dced8d7e 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.4.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.4.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index fccc333b2c5b..eaba89d2fc2e 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.8-rc.6",
+	"version": "0.4.8",
 	"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 3a74e48465cb..52a01e0162bd 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.4.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 0a852f1fa9b0..2f44e5cbfb78 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.8-rc.6",
+	"version": "0.4.8",
 	"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 ec81e858c1fd..3a6fdfede7f4 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  - @rocket.chat/instance-status@0.1.8
+  </details>
+
 ## 0.3.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index c31e1cdd02fd..4c162643f2ea 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.8-rc.6",
+	"version": "0.3.8",
 	"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 4c26ead7f78d..29b1d5cc1a25 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  - @rocket.chat/omnichannel-services@0.3.5
+  - @rocket.chat/pdf-worker@0.2.5
+  </details>
+
 ## 0.4.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 464ba9af2247..e9c0ebde63a7 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.8-rc.6",
+	"version": "0.4.8",
 	"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 57e20e88ac11..991e4dc943f1 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.4.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  - @rocket.chat/presence@0.2.8
+  </details>
+
 ## 0.4.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index f1335b2ddd20..554f9e18229e 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.8-rc.6",
+	"version": "0.4.8",
 	"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 b8260d3fec4c..7a4f3f32902c 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  - @rocket.chat/omnichannel-services@0.3.5
+  </details>
+
 ## 0.4.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 6ae6b4ea8fec..93abd202c23e 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.8-rc.6",
+	"version": "0.4.8",
 	"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 4de6dc748196..e030e690b4f7 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.4.8-rc.6
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 50dffd921595..dc64eae38fa0 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.8-rc.6",
+	"version": "0.4.8",
 	"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 d089e7f736e0..68a572cf8fc1 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.2.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  </details>
+
 ## 0.2.8-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 4b28df13c112..f2423e523aa5 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.8-rc.6",
+	"version": "0.2.8",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 05c28dbfde8d..ca409291a716 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.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  - @rocket.chat/pdf-worker@0.2.5
+  </details>
+
 ## 0.3.5-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index eba036bfe5cb..80e2cb56c3f8 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.5-rc.6",
+	"version": "0.3.5",
 	"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 a898e5f97c89..6be98a7e16f3 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.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  </details>
+
 ## 0.2.5-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 3ebb27b33920..b8f1555161f0 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.5-rc.6",
+	"version": "0.2.5",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 18a1af23c896..08f6c58e046a 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/core-services@0.7.0
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.2.8-rc.6
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 5b26bd898121..9fb87f9d862b 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.8-rc.6",
+	"version": "0.2.8",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/ee/packages/ui-theming/CHANGELOG.md b/ee/packages/ui-theming/CHANGELOG.md
index b25ae24af33d..b4b5349ddf05 100644
--- a/ee/packages/ui-theming/CHANGELOG.md
+++ b/ee/packages/ui-theming/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-theming
 
+## 0.3.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
 ## 0.3.0-rc.0
 
 ### Minor Changes
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 29fe229ca532..4cb281f188c9 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-theming",
-	"version": "0.3.0-rc.0",
+	"version": "0.3.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
diff --git a/package.json b/package.json
index ed611ca67fcb..2c4534043c5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-rc.6",
+	"version": "6.13.0",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 0fbf1c9420c4..87c06b4de2ab 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  </details>
+
 ## 0.2.8-rc.6
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 5774166e116a..929a1bb520be 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.8-rc.6",
+	"version": "0.2.8",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 22ce4478cde9..68e573a21f3f 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.1.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  - @rocket.chat/core-typings@6.13.0
+  </details>
+
 ## 0.1.8-rc.6
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 04b361b9f48e..ed7538b303cd 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.8-rc.6",
+	"version": "0.1.8",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 0db80e7f2acb..d96eda04db27 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @rocket.chat/core-services
 
+## 0.7.0
+
+### Minor Changes
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/message-parser@0.31.31
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.7.0-rc.6
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index ee2006dc8547..bc0d5302cb66 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.0-rc.6",
+	"version": "0.7.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index f915f94e51d0..8102a9b1706b 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/core-typings
 
+## 6.13.0
+
+### Minor Changes
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
+- <details><summary>Updated dependencies [79c16d315a]:</summary>
+
+  - @rocket.chat/message-parser@0.31.31
+  </details>
+
 ## 6.13.0-rc.6
 
 ## 6.13.0-rc.5
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 7e2e7f7be0cd..01ffe1e4a268 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-rc.6",
+	"version": "6.13.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 8b2917bbeb9c..0ea3ad31a30b 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.1.8-rc.6
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 2f0daa8f658e..133a0e9c72fc 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.8-rc.6",
+	"version": "0.1.8",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index aa9feebb0c55..4ea7d409e947 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/api-client@0.2.8
+  </details>
+
 ## 0.3.8-rc.6
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 765b691537a5..9adb1186a028 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.8-rc.6",
+	"version": "0.3.8",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 65f5201518c4..e4d3c0d6d4ce 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Change Log
 
+## 11.0.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- ([#33179](https://github.com/RocketChat/Rocket.Chat/pull/33179)) Fixed an error that incorrectly showed conference calls as not answered after they ended
+
+- ([#32999](https://github.com/RocketChat/Rocket.Chat/pull/32999)) Fixes multiple selection for MultiStaticSelectElement in UiKit
+
+- <details><summary>Updated dependencies [274f4f5881, cd0d50016e, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/ui-video-conf@11.0.0
+  - @rocket.chat/gazzodown@11.0.0
+  - @rocket.chat/ui-avatar@7.0.0
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 11.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index f051aea22585..a28262f57114 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "11.0.0-rc.6",
+  "version": "11.0.0",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "7.0.0-rc.6",
-    "@rocket.chat/ui-contexts": "11.0.0-rc.6",
+    "@rocket.chat/ui-avatar": "7.0.0",
+    "@rocket.chat/ui-contexts": "11.0.0",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "11.0.0-rc.6",
+    "@rocket.chat/ui-video-conf": "11.0.0",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 1feb3f37e34e..4b05d52431da 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 274f4f5881, cd0d50016e, 2f9eea03d2, 79c16d315a, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/message-parser@0.31.31
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 11.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 38475931ed8e..d68ea14320d2 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "11.0.0-rc.6",
+	"version": "11.0.0",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -71,10 +71,10 @@
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-tokens": "*",
-		"@rocket.chat/message-parser": "0.31.31-rc.0",
+		"@rocket.chat/message-parser": "0.31.31",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "11.0.0-rc.5",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
+		"@rocket.chat/ui-client": "11.0.0",
+		"@rocket.chat/ui-contexts": "11.0.0",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 3fa9140d4e99..59fa5b3e9e3b 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rocket.chat/i18n
 
+## 0.8.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+- ([#32945](https://github.com/RocketChat/Rocket.Chat/pull/32945)) Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
+
+### Patch Changes
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
 ## 0.8.0-rc.1
 
 ### Minor Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 9dd0c4534340..41df22d139b8 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.8.0-rc.1",
+	"version": "0.8.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 309a0b4d575c..2c77275e8d9b 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [927710d778]:</summary>
+
+  - @rocket.chat/models@0.3.0
+  </details>
+
 ## 0.1.8-rc.6
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 77d762f46c3e..f369ebfa0cfc 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.8-rc.6",
+	"version": "0.1.8",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 5758b87605d7..0f3e6e4fe25f 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0
+
+### Minor Changes
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+
+### Patch Changes
+
+- ([#33229](https://github.com/RocketChat/Rocket.Chat/pull/33229)) Fixes an issue where the unread message counter in the livechat widget does not update when a visitor receives their first response from an agent while the widget is minimized.
+
+- <details><summary>Updated dependencies [cd0d50016e, 79c16d315a]:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0
+  - @rocket.chat/message-parser@0.31.31
+  </details>
+
 ## 1.20.0-rc.6
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 14f077bb49b1..042e27064df5 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.0-rc.6",
+	"version": "1.20.0",
 	"files": [
 		"/build"
 	],
diff --git a/packages/message-parser/CHANGELOG.md b/packages/message-parser/CHANGELOG.md
index 0655d17fe0cb..60e4647c17e3 100644
--- a/packages/message-parser/CHANGELOG.md
+++ b/packages/message-parser/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.31.31
+
+### Patch Changes
+
+- ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+
 ## 0.31.31-rc.0
 
 ### Patch Changes
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index 00eacaea9f19..641505485564 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/message-parser",
   "description": "Rocket.Chat parser for messages",
-  "version": "0.31.31-rc.0",
+  "version": "0.31.31",
   "author": {
     "name": "Rocket.Chat",
     "url": "https://rocket.chat/"
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index a18b8b2e51fc..a71e5e2f4f9a 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/mock-providers
 
+## 0.1.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 7c14fd1a80, 274f4f5881, 2f9eea03d2, 0f21fa01a3]:</summary>
+
+  - @rocket.chat/i18n@0.8.0
+  </details>
+
 ## 0.1.3-rc.1
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index c55acfa8cd32..105b7d498f76 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.3-rc.1",
+	"version": "0.1.3",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 8622fef80d33..64b314864ba1 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @rocket.chat/model-typings
 
+## 0.8.0
+
+### Minor Changes
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  </details>
+
 ## 0.8.0-rc.6
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index aac550df73f7..5864b7363a0d 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.8.0-rc.6",
+	"version": "0.8.0",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 2414fd691ddb..704ec20a22fb 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/models
 
+## 0.3.0
+
+### Minor Changes
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0
+  </details>
+
 ## 0.3.0-rc.6
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 132d80fea828..70f290f5aa1e 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.3.0-rc.6",
+	"version": "0.3.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/peggy-loader/CHANGELOG.md b/packages/peggy-loader/CHANGELOG.md
index 6985a0b2c912..271ddc123197 100644
--- a/packages/peggy-loader/CHANGELOG.md
+++ b/packages/peggy-loader/CHANGELOG.md
@@ -1,10 +1,17 @@
 # Change Log
 
+## 0.31.27
+
+### Patch Changes
+
+- ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+
 ## 0.31.27-rc.0
 
 ### Patch Changes
 
 - ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+
 ## 0.31.26
 
 ### Patch Changes
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index e36ae8d1012b..1092615c1868 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/peggy-loader",
-  "version": "0.31.27-rc.0",
+  "version": "0.31.27",
   "description": "Peggy loader for webpack",
   "keywords": [
     "peggy",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 04cf749f9096..ce65443eaf26 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0
+
+### Minor Changes
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#32729](https://github.com/RocketChat/Rocket.Chat/pull/32729)) Implemented "omnichannel/contacts.update" endpoint to update contacts
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 79c16d315a, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/message-parser@0.31.31
+  </details>
+
 ## 6.13.0-rc.6
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index a9bea2c87e43..72990256f0e4 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-rc.6",
+	"version": "6.13.0",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 2da271f261f1..fdfde7c3b345 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 7.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 2305da31a50a..5a85ece4217b 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "7.0.0-rc.6",
+	"version": "7.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "11.0.0",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index f855fe63a07b..933bf84f7180 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @rocket.chat/ui-client
 
+## 11.0.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e]:</summary>
+
+  - @rocket.chat/ui-avatar@7.0.0
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 11.0.0-rc.5
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 8638a3e707b1..f81fc4ff3572 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "11.0.0-rc.5",
+	"version": "11.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/ui-composer/CHANGELOG.md b/packages/ui-composer/CHANGELOG.md
index 20d5d6ac715d..9d36b75e5ba9 100644
--- a/packages/ui-composer/CHANGELOG.md
+++ b/packages/ui-composer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-composer
 
+## 0.3.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
 ## 0.3.0-rc.0
 
 ### Minor Changes
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index c43f3485880e..131833b0ce69 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/ui-composer",
-  "version": "0.3.0-rc.0",
+  "version": "0.3.0",
   "private": true,
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index c32490e954b2..af979ba3154d 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 9a38c8e13f, 7c14fd1a80, 9eaefdc892, 274f4f5881, 2f9eea03d2, 532f08819e, 927710d778, 3a161c4310, 0f21fa01a3, 12d6307998]:</summary>
+
+  - @rocket.chat/i18n@0.8.0
+  - @rocket.chat/rest-typings@6.13.0
+  - @rocket.chat/core-typings@6.13.0
+  - @rocket.chat/ddp-client@0.3.8
+  </details>
+
 ## 11.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index d047df089b67..6836d4f0f570 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "11.0.0-rc.6",
+	"version": "11.0.0",
 	"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 331f679638f3..dffce9f448c1 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e]:</summary>
+
+  - @rocket.chat/ui-avatar@7.0.0
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 11.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index bb0ea409c157..692d01ec94b6 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": "11.0.0-rc.6",
+	"version": "11.0.0",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "7.0.0-rc.6",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
+		"@rocket.chat/ui-avatar": "7.0.0",
+		"@rocket.chat/ui-contexts": "11.0.0",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 6c32d8f6d5a4..861edc80a5d6 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0
+  </details>
+
 ## 11.0.0-rc.6
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 2b921a18f4b6..5538d63b3406 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": "11.0.0-rc.6",
+	"version": "11.0.0",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "11.0.0",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index 026299547a0e..5ae4d159a810 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8950,10 +8950,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.5
-    "@rocket.chat/ui-contexts": 11.0.0-rc.5
+    "@rocket.chat/ui-avatar": 7.0.0-rc.6
+    "@rocket.chat/ui-contexts": 11.0.0-rc.6
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 11.0.0-rc.5
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.6
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9040,7 +9040,7 @@ __metadata:
     "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
     "@rocket.chat/ui-client": 11.0.0-rc.5
-    "@rocket.chat/ui-contexts": 11.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.6
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10245,7 +10245,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 11.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.6
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10465,8 +10465,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 7.0.0-rc.5
-    "@rocket.chat/ui-contexts": 11.0.0-rc.5
+    "@rocket.chat/ui-avatar": 7.0.0-rc.6
+    "@rocket.chat/ui-contexts": 11.0.0-rc.6
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10554,7 +10554,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 11.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.6
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From debd3ffa2261c71eb49452ca43867d3230ac5ec7 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: Thu, 10 Oct 2024 01:59:57 -0700
Subject: [PATCH 161/170] feat: introduce new categories field for UI Action
 Buttons (#33066)

Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
---
 .changeset/red-crews-behave.md                |  7 ++
 .../message/toolbar/MessageToolbar.tsx        | 16 ++++
 .../toolbar/MessageToolbarStarsActionMenu.tsx | 89 +++++++++++++++++++
 .../client/hooks/useAppActionButtons.ts       | 13 ++-
 apps/meteor/client/hooks/useFilterActions.ts  | 24 +++++
 packages/i18n/src/locales/en.i18n.json        |  1 +
 6 files changed, 143 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/red-crews-behave.md
 create mode 100644 apps/meteor/client/components/message/toolbar/MessageToolbarStarsActionMenu.tsx
 create mode 100644 apps/meteor/client/hooks/useFilterActions.ts

diff --git a/.changeset/red-crews-behave.md b/.changeset/red-crews-behave.md
new file mode 100644
index 000000000000..19608792e73d
--- /dev/null
+++ b/.changeset/red-crews-behave.md
@@ -0,0 +1,7 @@
+---
+'@rocket.chat/ui-kit': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Introduces new property `category` for Rocket.Chat Apps to register UI action buttons. This property is used to group buttons in the UI. 
diff --git a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
index 183aea7190d9..17357be8b6ab 100644
--- a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
@@ -19,6 +19,7 @@ import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoT
 import { useChat } from '../../../views/room/contexts/ChatContext';
 import { useRoomToolbox } from '../../../views/room/contexts/RoomToolboxContext';
 import MessageActionMenu from './MessageActionMenu';
+import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu';
 import { useWebDAVMessageAction } from './useWebDAVMessageAction';
 
 const getMessageContext = (message: IMessage, room: IRoom, context?: MessageActionContext): MessageActionContext => {
@@ -78,6 +79,8 @@ const MessageToolbar = ({
 
 	const actionButtonApps = useMessageActionAppsActionButtons(context);
 
+	const starsAction = useMessageActionAppsActionButtons(context, 'ai');
+
 	const { messageToolbox: hiddenActions } = useLayoutHiddenActions();
 
 	// TODO: move this to another place
@@ -135,6 +138,19 @@ const MessageToolbar = ({
 						disabled={action?.disabled?.({ message, room, user, subscription, settings: mapSettings, chat, context })}
 					/>
 				))}
+			{starsAction.data && starsAction.data.length > 0 && (
+				<MessageToolbarStarsActionMenu
+					options={starsAction.data.map((action) => ({
+						...action,
+						action: (e) => action.action(e, { message, tabbar: toolbox, room, chat, autoTranslateOptions }),
+					}))}
+					onChangeMenuVisibility={onChangeMenuVisibility}
+					data-qa-type='message-action-stars-menu-options'
+					context={{ message, room, user, subscription, settings: mapSettings, chat, context }}
+					isMessageEncrypted={isE2EEMessage(message)}
+				/>
+			)}
+
 			{actionsQueryResult.isSuccess && actionsQueryResult.data.menu.length > 0 && (
 				<MessageActionMenu
 					options={[...actionsQueryResult.data?.menu, ...(actionButtonApps.data ?? [])].filter(Boolean).map((action) => ({
diff --git a/apps/meteor/client/components/message/toolbar/MessageToolbarStarsActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageToolbarStarsActionMenu.tsx
new file mode 100644
index 000000000000..7c88d89ac205
--- /dev/null
+++ b/apps/meteor/client/components/message/toolbar/MessageToolbarStarsActionMenu.tsx
@@ -0,0 +1,89 @@
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { MouseEvent, ReactElement } from 'react';
+import React from 'react';
+
+import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
+
+type MessageActionConfigOption = Omit<MessageActionConfig, 'condition' | 'context' | 'order' | 'action'> & {
+	action: (e?: MouseEvent<HTMLElement>) => void;
+};
+
+type MessageActionSection = {
+	id: string;
+	title: string;
+	items: GenericMenuItemProps[];
+};
+
+type MessageActionMenuProps = {
+	onChangeMenuVisibility: (visible: boolean) => void;
+	options: MessageActionConfigOption[];
+	context: MessageActionConditionProps;
+	isMessageEncrypted: boolean;
+};
+
+const MessageToolbarStarsActionMenu = ({
+	options,
+	onChangeMenuVisibility,
+	context,
+	isMessageEncrypted,
+}: MessageActionMenuProps): ReactElement => {
+	const t = useTranslation();
+	const id = useUniqueId();
+
+	const groupOptions = options.reduce((acc, option) => {
+		const transformedOption = {
+			variant: option.color === 'alert' ? 'danger' : '',
+			id: option.id,
+			icon: option.icon,
+			content: t(option.label),
+			onClick: option.action,
+			type: option.type,
+			...(option.disabled && { disabled: option?.disabled?.(context) }),
+			...(option.disabled &&
+				option?.disabled?.(context) && { tooltip: t('Action_not_available_encrypted_content', { action: t(option.label) }) }),
+		};
+
+		const group = option.type || '';
+		let section = acc.find((section: { id: string }) => section.id === group);
+
+		if (!section) {
+			section = { id: group, title: '', items: [] };
+			acc.push(section);
+		}
+
+		// Add option to the appropriate section
+		section.items.push(transformedOption);
+
+		// Handle the "apps" section if message is encrypted
+		if (group === 'apps' && isMessageEncrypted) {
+			section.items = [
+				{
+					content: t('Unavailable'),
+					id,
+					disabled: true,
+					gap: false,
+					tooltip: t('Action_not_available_encrypted_content', { action: t('Apps') }),
+				},
+			];
+		}
+
+		return acc;
+	}, [] as MessageActionSection[]);
+
+	return (
+		<GenericMenu
+			onOpenChange={onChangeMenuVisibility}
+			detached
+			icon='stars'
+			title={t('AI_Actions')}
+			data-qa-id='menu'
+			data-qa-type='message-action-menu'
+			sections={groupOptions}
+			placement='bottom-end'
+		/>
+	);
+};
+
+export default MessageToolbarStarsActionMenu;
diff --git a/apps/meteor/client/hooks/useAppActionButtons.ts b/apps/meteor/client/hooks/useAppActionButtons.ts
index 64c46f370a1f..3e21ca6a668d 100644
--- a/apps/meteor/client/hooks/useAppActionButtons.ts
+++ b/apps/meteor/client/hooks/useAppActionButtons.ts
@@ -1,4 +1,4 @@
-import type { IUIActionButton, UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui';
+import { type IUIActionButton, type UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useStream, useToastMessageDispatch, useUserId } from '@rocket.chat/ui-contexts';
@@ -13,6 +13,7 @@ import type { MessageBoxAction } from '../../app/ui-utils/client/lib/messageBox'
 import { Utilities } from '../../ee/lib/misc/Utilities';
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
 import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters';
+import { useFilterActionsByContextAndCategory } from './useFilterActions';
 
 const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `${appId}/${actionId}`;
 
@@ -160,20 +161,18 @@ export const useUserDropdownAppsActionButtons = () => {
 	} as UseQueryResult<GenericMenuItemProps[]>;
 };
 
-export const useMessageActionAppsActionButtons = (context?: MessageActionContext) => {
+export const useMessageActionAppsActionButtons = (context?: MessageActionContext, category?: string) => {
 	const result = useAppActionButtons('messageAction');
 	const actionManager = useUiKitActionManager();
 	const applyButtonFilters = useApplyButtonFilters();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const { t } = useTranslation();
+	const filterActionsByContextAndCategory = useFilterActionsByContextAndCategory(context, category);
 	const data = useMemo(
 		() =>
 			result.data
 				?.filter((action) => {
-					if (
-						context &&
-						!(action.when?.messageActionContext || ['message', 'message-mobile', 'threads', 'starred']).includes(context as any)
-					) {
+					if (!filterActionsByContextAndCategory(action)) {
 						return false;
 					}
 					return applyButtonFilters(action);
@@ -212,7 +211,7 @@ export const useMessageActionAppsActionButtons = (context?: MessageActionContext
 
 					return item;
 				}),
-		[actionManager, applyButtonFilters, context, dispatchToastMessage, result.data, t],
+		[actionManager, applyButtonFilters, dispatchToastMessage, filterActionsByContextAndCategory, result.data, t],
 	);
 	return {
 		...result,
diff --git a/apps/meteor/client/hooks/useFilterActions.ts b/apps/meteor/client/hooks/useFilterActions.ts
new file mode 100644
index 000000000000..5eab0b795a59
--- /dev/null
+++ b/apps/meteor/client/hooks/useFilterActions.ts
@@ -0,0 +1,24 @@
+import { MessageActionContext } from '@rocket.chat/apps-engine/definition/ui';
+import type { IUIActionButton } from '@rocket.chat/apps-engine/definition/ui';
+import { useCallback } from 'react';
+
+const DEFAULT_CATEGORY = 'default';
+
+export const useFilterActionsByContextAndCategory = (context: string | undefined, category = 'default') => {
+	return useCallback(
+		(action: IUIActionButton) => {
+			if (!context) {
+				return true;
+			}
+
+			const actionCategory = action?.category ?? DEFAULT_CATEGORY;
+			const messageActionContext = action.when?.messageActionContext || Object.values(MessageActionContext);
+			const isContextMatch = messageActionContext.includes(context as MessageActionContext);
+
+			const isCategoryMatch = category === DEFAULT_CATEGORY ? actionCategory === DEFAULT_CATEGORY : actionCategory === category;
+
+			return isContextMatch && isCategoryMatch;
+		},
+		[context, category],
+	);
+};
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index d77854e2e146..b89b760caadf 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -392,6 +392,7 @@
   "Agent_Without_Extensions": "Agent Without Extensions",
   "Agents": "Agents",
   "Agree": "Agree",
+  "AI_Actions": "AI Actions",
   "Alerts": "Alerts",
   "Alias": "Alias",
   "Alias_Format": "Alias Format",

From 6d1b7f89b91cdbd8f7a95a50bc5ea7a390e4fed6 Mon Sep 17 00:00:00 2001
From: "lingohub[bot]" <69908207+lingohub[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:32:33 +0000
Subject: [PATCH 162/170] =?UTF-8?q?i18n:=20Rocket.Chat=20language=20update?=
 =?UTF-8?q?=20from=20Lingohub=20=F0=9F=A4=96=20on=202024-10-07Z=20(#33479)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 packages/i18n/src/locales/ar.i18n.json    |   22 +-
 packages/i18n/src/locales/az.i18n.json    |    2 +-
 packages/i18n/src/locales/be-BY.i18n.json |    2 +-
 packages/i18n/src/locales/bg.i18n.json    |    2 +-
 packages/i18n/src/locales/bs.i18n.json    |    2 +-
 packages/i18n/src/locales/ca.i18n.json    |    2 +-
 packages/i18n/src/locales/cs.i18n.json    |   10 +-
 packages/i18n/src/locales/cy.i18n.json    |    2 +-
 packages/i18n/src/locales/da.i18n.json    |    2 +-
 packages/i18n/src/locales/de-AT.i18n.json |    2 +-
 packages/i18n/src/locales/de.i18n.json    |    4 +-
 packages/i18n/src/locales/el.i18n.json    |    2 +-
 packages/i18n/src/locales/eo.i18n.json    |    2 +-
 packages/i18n/src/locales/es.i18n.json    |   16 +-
 packages/i18n/src/locales/fi.i18n.json    |    2 +-
 packages/i18n/src/locales/fr.i18n.json    |    8 +-
 packages/i18n/src/locales/he.i18n.json    |    2 +-
 packages/i18n/src/locales/hi-IN.i18n.json |   24 +-
 packages/i18n/src/locales/hu.i18n.json    |    2 +-
 packages/i18n/src/locales/it.i18n.json    |    8 +-
 packages/i18n/src/locales/ja.i18n.json    |    2 +-
 packages/i18n/src/locales/km.i18n.json    |    2 +-
 packages/i18n/src/locales/ko.i18n.json    |    2 +-
 packages/i18n/src/locales/ku.i18n.json    |    2 +-
 packages/i18n/src/locales/lo.i18n.json    |    2 +-
 packages/i18n/src/locales/lt.i18n.json    |    2 +-
 packages/i18n/src/locales/lv.i18n.json    |    2 +-
 packages/i18n/src/locales/mn.i18n.json    |    2 +-
 packages/i18n/src/locales/ms-MY.i18n.json |    2 +-
 packages/i18n/src/locales/nl.i18n.json    |    2 +-
 packages/i18n/src/locales/nn.i18n.json    | 4586 +++++++++++++-
 packages/i18n/src/locales/no.i18n.json    |    9 +-
 packages/i18n/src/locales/pl.i18n.json    |   16 +-
 packages/i18n/src/locales/pt-BR.i18n.json |   20 +-
 packages/i18n/src/locales/pt.i18n.json    |    2 +-
 packages/i18n/src/locales/ro.i18n.json    |    2 +-
 packages/i18n/src/locales/ru.i18n.json    |   22 +-
 packages/i18n/src/locales/se.i18n.json    | 6621 +++++++++++++++++++++
 packages/i18n/src/locales/sk-SK.i18n.json |    2 +-
 packages/i18n/src/locales/sl-SI.i18n.json |    2 +-
 packages/i18n/src/locales/sq.i18n.json    |    2 +-
 packages/i18n/src/locales/sr.i18n.json    |    2 +-
 packages/i18n/src/locales/sv.i18n.json    |    3 +-
 packages/i18n/src/locales/th-TH.i18n.json |    2 +-
 packages/i18n/src/locales/tr.i18n.json    |    2 +-
 packages/i18n/src/locales/ug.i18n.json    |    2 +-
 packages/i18n/src/locales/uk.i18n.json    |    6 +-
 packages/i18n/src/locales/vi-VN.i18n.json |    2 +-
 packages/i18n/src/locales/zh-HK.i18n.json |    2 +-
 packages/i18n/src/locales/zh-TW.i18n.json |    2 +-
 packages/i18n/src/locales/zh.i18n.json    |    2 +-
 51 files changed, 11329 insertions(+), 118 deletions(-)
 create mode 100644 packages/i18n/src/locales/se.i18n.json

diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index 6d3d406e6c81..0b8667bad64a 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -186,6 +186,7 @@
   "Accounts_Password_Policy_AtLeastOneLowercase": "حرف صغير واحد على الأقل",
   "Accounts_Password_Policy_AtLeastOneLowercase_Description": "فرض احتواء كلمة المرور على حرف واحد صغير على الأقل.",
   "Accounts_Password_Policy_AtLeastOneNumber": "رقم واحد على الأقل",
+  "Calls_in_queue_many": "{{count}} من المكالمات الانتظار",
   "Accounts_Password_Policy_AtLeastOneNumber_Description": "فرض احتواء كلمة المرور على رمز رقمي واحد على الأقل.",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "رمز واحد على الأقل",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "فرض احتواء كلمة المرور على رمز خاص واحد على الأقل.",
@@ -205,6 +206,7 @@
   "Accounts_Registration_AuthenticationServices_Default_Roles": "الأدوار الافتراضية لخدمات المصادقة",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "سيتم تعيين الأدوار الافتراضية (مفصولة بفواصل) للمستخدمين عند التسجيل من خلال خدمات المصادقة",
   "Accounts_Registration_AuthenticationServices_Enabled": "التسجيل من خلال خدمات المصادقة",
+  "Calls_in_queue_few": "{{count}} من المكالمات الانتظار",
   "Accounts_Registration_Users_Default_Roles": "الأدوار الافتراضية للمستخدمين",
   "Accounts_Registration_Users_Default_Roles_Description": "سيتم منح المستخدمين الأدوار الافتراضية (مفصولة بفواصل) عند التسجيل من خلال التسجيل اليدوي (بما في ذلك عبر واجهة برمجة التطبيقات)",
   "Accounts_Registration_Users_Default_Roles_Enabled": "تمكين الأدوار الافتراضية للتسجيل اليدوي",
@@ -232,7 +234,6 @@
   "Accounts_ShowFormLogin": "عرض نموذج تسجيل الدخول الافتراضي",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "تمكين المصادقة الثنائية عبر TOTP",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "يمكن للمستخدمين إعداد المصادقة الثنائية باستخدام أي تطبيق TOTP، مثل Google Authenticator أو Authy.",
-  "Calls_in_queue_many": "{{count}} من المكالمات الانتظار",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "الاختيار التلقائي لدى المستخدمين الجدد للمصادقة الثنائية عبر البريد الإلكتروني",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "سيتم تمكين المصادقة الثنائية لدى المستخدمين الجدد عبر البريد الإلكتروني افتراضيًا. وسيتمكنون من تعطيلها في صفحة ملفهم الشخصي.",
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "الوقت المحدد لانتهاء صلاحية الرمز المرسل عبر البريد الإلكتروني بالثواني",
@@ -251,7 +252,6 @@
   "API_EmbedDisabledFor": "تعطيل التضمين للمستخدمين",
   "Accounts_UserAddedEmail_Default": "<h1>مرحبًا بكم في<strong> [Site_Name]</strong></h1> <p> انتقل إلى<a href=\"[Site_URL]\"> [Site_URL] </a>وجرب أفضل حل للدردشة مفتوحة المصدر متاح اليوم!</p> <p> يمكنك تسجيل الدخول باستخدام بريدك الإلكتروني: [email] وكلمة المرور: [password]. قد يُطلب منك تغييرها بعد تسجيل الدخول في المرة الأولى.",
   "Accounts_UserAddedEmail_Description": "يمكنك استخدام العناصر النائبة التالية:  \n -  [name]، [fname]، [lname] لاسم المستخدم الكامل أو الاسم الأول أو اسم العائلة، على التوالي.  \n - `[email]` للبريد الإلكتروني للمستخدم.  \n - `[password]` لكلمة مرور المستخدم.  \n - `[Site_Name]` و[Site_URL] لاسم التطبيق وعنوان URL الخاص به على التوالي. ",
-  "Calls_in_queue_few": "{{count}} من المكالمات الانتظار",
   "API_EmbedDisabledFor_Description": "قائمة أسماء المستخدمين مفصولة بفواصل لتعطيل معاينات الرابط المضمن.",
   "Accounts_UserAddedEmailSubject_Default": "لقد تمت إضافتك إلى [Site_Name]",
   "Action": "الإجراء",
@@ -604,6 +604,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "تمكين الترجمة التلقائية",
   "AutoTranslate_Enabled_Description": "سيسمح تمكين الترجمة التلقائية للأشخاص الذين لديهم إذن `الترجمة التلقائية`  بترجمة جميع الرسائل تلقائيًا إلى لغتهم المحددة. قد يتم تطبيق الرسوم.",
+  "message_counter_many": "{{count}} رسائل",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "مفتاح اشتراك Omp-Apim",
@@ -615,6 +616,7 @@
   "Avatars": "الصورة الرمزية",
   "Avatar_changed_successfully": "تم تغيير الصورة الرمزية بنجاح",
   "Avatar_URL": "عنوان URL للصورة الرمزية",
+  "meteor_status_reconnect_in_many": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "Avatar_format_invalid": "تنسيق غير صالح. يسمح فقط بتنسيق الصور",
   "Avatar_url_invalid_or_error": "عنوان url المقدَّم غير صالح أو لا يمكن الوصول إليه. ترجى المحاولة مرة أخرى، ولكن باستخدام عنوان url مختلف.",
   "Avg_chat_duration": "متوسط مدة الدردشة",
@@ -673,6 +675,7 @@
   "Blockstack_ButtonLabelText": "نص تسمية الزر",
   "Blockstack_Generate_Username": "إنشاء اسم مستخدم",
   "Body": "النص",
+  "message_counter_few": "{{count}} رسائل",
   "bot_request": "طلب الروبوت",
   "BotHelpers_userFields": "حقول المستخدم",
   "BotHelpers_userFields_Description": "ملف CSV لحقول المستخدم التي يمكن الوصول إليها عبر وسائل مساعد الروبوتات.",
@@ -699,6 +702,7 @@
   "Busiest_time": "الوقت الأكثر ازدحامًا",
   "Business_Hour": "ساعة العمل",
   "Business_Hour_Removed": "تمت إزالة ساعة العمل",
+  "meteor_status_reconnect_in_few": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "Business_Hours": "ساعات العمل",
   "Business_hours_enabled": "تم تمكين ساعات العمل",
   "Business_hours_updated": "تم تحديث ساعات العمل",
@@ -748,7 +752,6 @@
   "CAS_enabled": "تم التمكين",
   "CAS_Login_Layout": "تخطيط تسجيل دخول CAS",
   "CAS_login_url": "عنوان URL لتسجيل الدخول إلى SSO",
-  "message_counter_many": "{{count}} رسائل",
   "CAS_login_url_Description": "عنوان URL لتسجيل الدخول الخاص بخدمة SSO الخارجية، مثل: `https://sso.example.undef/sso/login`",
   "CAS_popup_height": "ارتفاع النافذة المنبثقة لتسجيل الدخول",
   "CAS_popup_width": "عرض النافذة المنبثقة لتسجيل الدخول",
@@ -764,7 +767,6 @@
   "Categories*": "الفئات*",
   "CDN_JSCSS_PREFIX": "بادئة CDN لـ JS/CSS",
   "CDN_PREFIX": "بادئة CDN",
-  "meteor_status_reconnect_in_many": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "CDN_PREFIX_ALL": "استخدم بادئة CDN لجميع الأصول",
   "Certificates_and_Keys": "الشهادات والمفاتيح",
   "change-livechat-room-visitor": "تغيير زوار Livechat Room‎",
@@ -833,7 +835,6 @@
   "Click_here": "انقر هنا",
   "Click_here_for_more_details_or_contact_sales_for_a_new_license": "<a target=\"_blank\" href=\"{{url}}\">انقر هنا</a>لمزيد من التفاصيل أو اتصل بـ <strong>{{email}} </strong> للحصول على ترخيص جديد.",
   "Click_here_for_more_info": "انقر هنا للمزيد من المعلومات",
-  "message_counter_few": "{{count}} رسائل",
   "Click_here_to_clear_the_selection": "انقر هنا لمسح التحديد",
   "Click_here_to_enter_your_encryption_password": "انقر هنا لإدخال كلمة مرور التشفير الخاصة بك",
   "Click_here_to_view_and_copy_your_password": "انقر هنا لعرض كلمة المرور ونسخها.",
@@ -865,7 +866,6 @@
   "Cloud_Invalid_license": "ترخيص غير صالح!",
   "Cloud_Apply_license": "تطبيق الترخيص",
   "Cloud_connectivity": "الاتصال السحابي",
-  "meteor_status_reconnect_in_few": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "Cloud_address_to_send_registration_to": "العنوان المقرر إرسال البريد الإلكتروني للتسجيل السحابي الخاص بك إليه.",
   "Cloud_click_here": "بعد نسخ النص، انتقل إلى [وحدة التحكم السحابية (انقر هنا)] ({{cloudConsoleUrl}}).",
   "Cloud_console": "وحدة التحكم السحابية",
@@ -1110,9 +1110,11 @@
   "Country_Marshall_Islands": "جزر مارشال",
   "Country_Martinique": "مارتينيك",
   "Country_Mauritania": "موريتانيا",
+  "message_counter_two": "{{count}} رسائل",
   "Country_Mauritius": "موريشيوس",
   "Country_Mayotte": "مايوت",
   "Country_Mexico": "المكسيك",
+  "message_counter_zero": "{{count}} رسائل",
   "Country_Micronesia_Federated_States_of": "ولايات ميكرونيزيا الموحدة",
   "Country_Moldova_Republic_of": "جمهورية مولدوفا",
   "Country_Monaco": "موناكو",
@@ -1138,7 +1140,9 @@
   "Country_Norway": "النرويج",
   "Country_Oman": "سلطنة عمان",
   "Country_Pakistan": "باكستان",
+  "meteor_status_reconnect_in_two": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "Country_Palau": "بالاو",
+  "meteor_status_reconnect_in_zero": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "Country_Palestinian_Territory_Occupied": "الأراضي الفلسطينية المحتلة",
   "Country_Panama": "بنما",
   "Country_Papua_New_Guinea": "بابوا غينيا الجديدة",
@@ -1353,10 +1357,8 @@
   "delete-message_description": "إذن لحذف رسالة في غرفة",
   "delete-own-message": "حذف رسالة شخصية",
   "delete-own-message_description": "إذن لحذف رسالة شخصية",
-  "message_counter_two": "{{count}} رسائل",
   "delete-p": "حذف Channel الخاصة",
   "delete-p_description": "إذن لحذف القنوات الخاصة",
-  "message_counter_zero": "{{count}} رسائل",
   "delete-user": "حذف مستخدم",
   "delete-user_description": "إذن لحذف المستخدمين",
   "Deleted": "تم الحذف!",
@@ -1381,8 +1383,6 @@
   "Details": "التفاصيل",
   "line": "السطر",
   "Device_Management_IP": " عنوان IP",
-  "meteor_status_reconnect_in_two": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
-  "meteor_status_reconnect_in_zero": "المحاولة مرة أخرى خلال {{count}} من الثواني...",
   "Different_Style_For_User_Mentions": "نمط مختلف لإشارات المستخدم",
   "Livechat_Facebook_API_Key": "مفتاح واجهة برمجة تطبيقات Channel متعددة الاتجاهات",
   "Direct": "مباشر",
@@ -4126,7 +4126,7 @@
   "The_application_name_is_required": "اسم التطبيق مطلوب",
   "The_channel_name_is_required": "اسم القناة مطلوب",
   "The_emails_are_being_sent": "يتم إرسال رسائل البريد الإلكتروني.",
-  "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرفة الفارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرفة الفارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "لن يعمل تغيير حجم الصورة لأننا لا نستطيع اكتشاف تثبيت ImageMagick أو GraphicsMagick على الخادم الخاص بك.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "الرسالة عبارة عن مناقشة أنك لن تتمكن من استعادة الرسائل!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "تم تعطيل إشعارات الهاتف المحمول لجميع المستخدمين، انتقل إلى \"المسؤول > منبثق\" لتمكين البوابة المنبثقة مرة أخرى",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 7b1c3f48fa1c..44e9e412a2df 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -2366,7 +2366,7 @@
   "Thank_you_for_your_feedback": "Əlaqə üçün təşəkkür edirik",
   "The_application_name_is_required": "Ərizə adı tələb olunur",
   "The_channel_name_is_required": "Kanal adı tələb olunur",
-  "The_emails_are_being_sent": "E-poçt göndərilir.",   
+  "The_emails_are_being_sent": "E-poçt göndərilir.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick və ya GraphicsMagick-i serverinizdə yükləməyəcəyimiz üçün şəkil ölçüsünün işləməyəcəyi.",
   "The_redirectUri_is_required": "RedirectUri tələb olunur",
   "The_server_will_restart_in_s_seconds": "Server%s saniyə ərzində yenidən başlayacaq",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index daea286edfed..26d9ea55e1c2 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -2384,7 +2384,7 @@
   "Thank_you_for_your_feedback": "Дзякуй за ваш водгук",
   "The_application_name_is_required": "Імя прыкладання патрабуецца",
   "The_channel_name_is_required": "Назва канала патрабуецца",
-  "The_emails_are_being_sent": "Лісты былі адпраўленыя.",   
+  "The_emails_are_being_sent": "Лісты былі адпраўленыя.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Змяніць памер малюнка не будзе працаваць, таму што мы не можам выявіць ImageMagick або GraphicsMagick усталяваны на вашым серверы.",
   "The_redirectUri_is_required": "RedirectUri патрабуецца",
   "The_server_will_restart_in_s_seconds": "Сервер будзе перазагружаны у %s секунд",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index f7bc5ad2cf8f..c779a93f1efa 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -2363,7 +2363,7 @@
   "Thank_you_for_your_feedback": "Благодарим Ви за обратната връзка",
   "The_application_name_is_required": "Името на приложението е задължително",
   "The_channel_name_is_required": "Името на канала е задължително",
-  "The_emails_are_being_sent": "Изпращат се имейлите.",   
+  "The_emails_are_being_sent": "Изпращат се имейлите.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Размерът на изображението няма да работи, защото не можем да открием ImageMagick или GraphicsMagick, инсталирани на вашия сървър.",
   "The_redirectUri_is_required": "Необходимо е пренасочването",
   "The_server_will_restart_in_s_seconds": "Сървъра ще бъде рестартиран след %s секунди",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index 85e70bbb0abc..8fdafb52ed6e 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -2360,7 +2360,7 @@
   "Thank_you_for_your_feedback": "Hvala vam na povratnim informacijama",
   "The_application_name_is_required": "Naziv aplikacije je potreban",
   "The_channel_name_is_required": "Ime sobe je potrebno",
-  "The_emails_are_being_sent": "E-mailovi su poslani.",   
+  "The_emails_are_being_sent": "E-mailovi su poslani.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veličine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vašem poslužitelju.",
   "The_redirectUri_is_required": "RedirectUri je potrebno",
   "The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index f4d304e08633..c9603ff976e0 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -4044,7 +4044,7 @@
   "The_application_name_is_required": "El nom de laplicació és obligatori.",
   "The_channel_name_is_required": "Es requereix el nom del canal",
   "The_emails_are_being_sent": "Els missatges de correu-e s'estan enviant.",
-  "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automàticament.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automàticament.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "L'ajust de mida de les imatges no funcionarà perquè no podem detectar ni ImageMagick ni GraphicsMagick al servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "El missatge és una discussió, no podrà recuperar els missatges!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notificacions mòbils es deshabilitaron per a tots els usuaris, aneu a \"Admin> Push\" per habilitar Push inici novament",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index a74224912766..0c9fbd9ea3c1 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -505,6 +505,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "Povolit automatický překlad",
   "AutoTranslate_Enabled_Description": "Aktivace automatického překladu umožní lidem, kteří mají `auto-translate `  právo, aby všechny zprávy byly automaticky přeloženy do vybraného jazyka. Mohou být účtovány poplatky.",
+  "message_counter_many": "{{count}} zpráv(y)",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Subscription-Key",
@@ -515,6 +516,7 @@
   "Avatar": "Avatar",
   "Avatar_changed_successfully": "Avatar byl úspěšně změněn",
   "Avatar_URL": "URL avataru",
+  "meteor_status_reconnect_in_many": "zkusím znovu za {{count}} sekund...",
   "Avatar_url_invalid_or_error": "URL neplatná nebo není přístupná. Zkuste to prosím znovu, s jinou URL.",
   "Avg_chat_duration": "Průměrné trvání chatu",
   "Avg_first_response_time": "Průměrná doba první reakce",
@@ -561,6 +563,7 @@
   "Blockstack_ButtonLabelText": "Text popisku tlačítka",
   "Blockstack_Generate_Username": "Generovat uživatelské jméno",
   "Body": "Obsah",
+  "message_counter_few": "{{count}} zpráv(y)",
   "bot_request": "Request bota",
   "BotHelpers_userFields": "Uživatelská pole",
   "BotHelpers_userFields_Description": "CSV uživatelských polí, která budou přístupná botům",
@@ -585,6 +588,7 @@
   "Busiest_time": "Nejrušnější čas",
   "Business_Hour": "Otevírací doba",
   "Business_Hour_Removed": "Otevírací doba odstraněna",
+  "meteor_status_reconnect_in_few": "zkusím znovu za {{count}} sekund...",
   "Business_Hours": "Otevírací doba",
   "Business_hours_enabled": "Otevírací doba povolena",
   "Business_hours_updated": "Otevírací doba upravena",
@@ -613,7 +617,6 @@
   "CAS_enabled": "Povoleno",
   "CAS_Login_Layout": "Rozložení CAS přihlášení",
   "CAS_login_url": "SSO přihlašovací URL",
-  "message_counter_many": "{{count}} zpráv(y)",
   "CAS_login_url_Description": "Adresa přihlášení vaší externí SSO služby např: https://sso.priklad.cz/sso/login",
   "CAS_popup_height": "Výška přihlašovacího popupu",
   "CAS_popup_width": "Šířka přihlašovacího popupu",
@@ -628,7 +631,6 @@
   "Categories": "Kategorie",
   "CDN_JSCSS_PREFIX": "Prefix CDN pro JS/CSS",
   "CDN_PREFIX": "CDN Prefix",
-  "meteor_status_reconnect_in_many": "zkusím znovu za {{count}} sekund...",
   "CDN_PREFIX_ALL": "Použijte prefix CDN pro všechny prvky",
   "Certificates_and_Keys": "Certifikáty a klíče",
   "Change_Room_Type": "Změna typu místnosti",
@@ -679,7 +681,6 @@
   "Click_here": "Klikněte zde",
   "Click_here_for_more_details_or_contact_sales_for_a_new_license": "<a target=\"_blank\" href=\"{{url}}\">Kliknutím sem</a> zobrazíte podrobnosti, případně kontaktujte <strong>{{email}}</strong> pro novou licenci.",
   "Click_here_for_more_info": "Klikněte pro více infomací",
-  "message_counter_few": "{{count}} zpráv(y)",
   "Click_here_to_enter_your_encryption_password": "Klikněte zde pro zadání svého šifrovacího hesla",
   "Click_here_to_view_and_copy_your_password": "Klikněte zde pro zobrazení a zkopírování svého hesla.",
   "Click_the_messages_you_would_like_to_send_by_email": "Kikněte na zprávy, které chcete odeslat e-mailem",
@@ -702,7 +703,6 @@
   "Closing_chat": "Uzavření místnosti",
   "Closing_chat_message": "Zpráva uzavření",
   "Cloud": "Cloud",
-  "meteor_status_reconnect_in_few": "zkusím znovu za {{count}} sekund...",
   "Cloud_address_to_send_registration_to": "Adresa, na kterou chcete poslat svůj registrační e-mail do Cloudu.",
   "Cloud_click_here": "Po zkopírování textu přejděte do cloudové konzole - [Klikněte zde]({{cloudConsoleUrl}})",
   "Cloud_console": "Cloud přehled",
@@ -3413,7 +3413,7 @@
   "The_application_name_is_required": "Název aplikace je vyžadován",
   "The_channel_name_is_required": "Název místnosti je vyžadován",
   "The_emails_are_being_sent": "Tyto e-maily jsou odesílány.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Prázdná místnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstraněna.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Prázdná místnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstraněna.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Nelze změnit velikost obrázku, protože na serveru nebyl nalezen ImageMagick ani GraphicsMagick.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Zpráva je diskuse, ze které nebudete moci obnovit zprávy!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilní oznámení byla deaktivována všem uživatelům, v admin sekci \"Notifikace\" znovu aktivujte Push Gateway",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index 7f63d511201f..0c188e3575dd 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -2361,7 +2361,7 @@
   "Thank_you_for_your_feedback": "Diolch i chi am eich adborth",
   "The_application_name_is_required": "Mae angen enw'r cais",
   "The_channel_name_is_required": "Mae angen enw'r sianel",
-  "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",   
+  "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ni fydd maint y delwedd yn gweithio oherwydd na allwn ganfod ImageMagick neu GraphicsMagick ar eich gweinydd.",
   "The_redirectUri_is_required": "Mae angen y redirectUri",
   "The_server_will_restart_in_s_seconds": "Bydd y gweinydd yn ailgychwyn yn %s eiliad",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index 2aabbfcd8642..dcd6f262bbca 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -3521,7 +3521,7 @@
   "The_application_name_is_required": "Ansøgningsnavnet er påkrævet",
   "The_channel_name_is_required": "Kanalnavnet er påkrævet",
   "The_emails_are_being_sent": "E-mailsne bliver sendt.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Billedforstørrelsen fungerer ikke, fordi vi ikke kan opdage ImageMagick eller GraphicsMagick installeret på din server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelelsen er en diskussion og du vil derfor ikke kunne gendanne meddelelserne!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilmeddelelser blev deaktiveret for alle brugere. Tilgå \"Admin > Push\" for at aktivere Push Gateway igen",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index bbe960596a28..3c9fc7236c14 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -2368,7 +2368,7 @@
   "Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung.",
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden.",
   "The_channel_name_is_required": "Ein Name für den Raum muss angegeben werden.",
-  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",   
+  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_redirectUri_is_required": "Es muss eine Weiterleitung-URL angegeben werden.",
   "The_server_will_restart_in_s_seconds": "Der Server wird in %s Sekunden neu gestartet",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index 59e329014186..87a2cb04196b 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -4635,7 +4635,7 @@
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
   "The_channel_name_is_required": "Ein Name für den Channel muss angegeben werden",
   "The_emails_are_being_sent": "E-Mails werden gesendet",
-  "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Sie diese löschen, werden Sie die Nachrichten der Diskussion nicht mehr auffinden können.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Die mobilen Benachrichtigungen wurden für alle Benutzer deaktiviert, wechseln Sie zu \"Admin > Push\", um das Push-Gateway erneut zu aktivieren",
@@ -5529,4 +5529,4 @@
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Nachrichtenüberprüfung"
-}
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 3e335c6638d3..437657eda502 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -2373,7 +2373,7 @@
   "Thank_you_for_your_feedback": "Ευχαριστούμε για τα σχόλιά σας",
   "The_application_name_is_required": "Το όνομα της εφαρμογής απαιτείται",
   "The_channel_name_is_required": "Το όνομα του καναλιού απαιτείται",
-  "The_emails_are_being_sent": "Τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",   
+  "The_emails_are_being_sent": "Τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Το μέγεθος της εικόνας δεν θα λειτουργήσει, επειδή δεν μπορεί να ανιχνεύσει ImageMagick ή GraphicsMagick εγκατεστημένο στον server σας.",
   "The_redirectUri_is_required": "Η redirectUri απαιτείται",
   "The_server_will_restart_in_s_seconds": "Ο διακομιστής θα κάνει επανεκκίνηση στο %s δευτερόλεπτα",
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index 907767a7f7da..152d40e1466c 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -2366,7 +2366,7 @@
   "Thank_you_for_your_feedback": "Dankon pro viaj sugestoj",
   "The_application_name_is_required": "La aplika nomo estas postulita",
   "The_channel_name_is_required": "La kanala nomo estas postulita",
-  "The_emails_are_being_sent": "La retpoŝtoj estas senditaj.",   
+  "The_emails_are_being_sent": "La retpoŝtoj estas senditaj.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "La regrandigo de bildoj ne funkcios ĉar ni ne povas detekti ImageMagick aŭ GraphicsMagick instalitan sur via servilo.",
   "The_redirectUri_is_required": "La redirectUri estas postulita",
   "The_server_will_restart_in_s_seconds": "La servilo rekomencos en%s sekundoj",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index 4a690dd7a4b2..88d5ea217f50 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -618,6 +618,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "Habilitar traducción automática",
   "AutoTranslate_Enabled_Description": "Habilitar la traducción automática permite a los usuario con licencia de `traducción automática`  que todos los mensajes se traduzcan automáticamente al idioma seleccionado. Se pueden aplicar cargos.",
+  "message_counter_many": "{{count}} mensajes",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Subscription-Key",
@@ -628,6 +629,7 @@
   "Avatar": "Avatar",
   "Avatar_changed_successfully": "Avatar cambiado correctamente",
   "Avatar_URL": "URL del avatar",
+  "meteor_status_reconnect_in_many": "intentando de nuevo dentro de {{count}} segundos...",
   "Avatar_url_invalid_or_error": "La URL proporcionada no es válida o no es accesible. Inténtalo de nuevo con una URL diferente.",
   "Avg_chat_duration": "Promedio de duración del chat",
   "Avg_first_response_time": "Promedio del tiempo de la primera respuesta",
@@ -756,7 +758,6 @@
   "CAS_enabled": "Habilitada",
   "CAS_Login_Layout": "Diseño de inicio de sesión de CAS",
   "CAS_login_url": "URL de inicio de sesión SSO",
-  "message_counter_many": "{{count}} mensajes",
   "CAS_login_url_Description": "URL de inicio de sesión de tu servicio  SSO externo; por ejemplo, `https://sso.example.undef/sso/login`",
   "CAS_popup_height": "Altura de la ventana emergente de inicio de sesión",
   "CAS_popup_width": "Anchura de la ventana emergente de inicio de sesión",
@@ -772,7 +773,6 @@
   "Categories*": "Categorías*",
   "CDN_JSCSS_PREFIX": "Prefijo de CDN para JS/CSS",
   "CDN_PREFIX": "Prefijo de CDN",
-  "meteor_status_reconnect_in_many": "intentando de nuevo dentro de {{count}} segundos...",
   "CDN_PREFIX_ALL": "Usar prefijo de CDN para todos los activos",
   "Certificates_and_Keys": "Certificados y claves",
   "change-livechat-room-visitor": "Cambiar visitantes de Room de Livechat",
@@ -1250,11 +1250,14 @@
   "CROWD_Allow_Custom_Username": "Permitir nombre de usuario personalizado en Rocket.Chat",
   "CROWD_Reject_Unauthorized": "Rechazar no autorizado",
   "Crowd_Remove_Orphaned_Users": "Eliminar usuarios huérfanos",
+  "mentions_counter_many": "{{count}} menciones",
   "Crowd_sync_interval_Description": "Intervalo entre sincronizaciones, como \"cada 24 horas\" o \"el primer día de la semana\"; más ejemplos en [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
   "Current_Chats": "Chats actuales",
   "Current_File": "Archivo actual",
   "Current_Import_Operation": "Operación de importación actual",
   "Current_Status": "Estado actual",
+  "threads_counter_many": "{{count}} mensajes en hilo sin leer",
+  "unread_messages_counter_many": "{{count}} mensajes sin leer",
   "Custom": "Personalizado",
   "Custom CSS": "CSS personalizado",
   "Custom_agent": "Agente personalizado",
@@ -1439,8 +1442,10 @@
   "Discussions": "Discusiones",
   "Display": "Mostrar",
   "Display_avatars": "Mostrar avatares",
+  "subscription.callout.description.limitsExceeded_many": "Su espacio de trabajo ha superado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "Display_Avatars_Sidebar": "Mostrar avatares en la barra lateral",
   "Display_chat_permissions": "Mostrar permisos de chat",
+  "subscription.callout.description.limitsReached_many": "Su espacio de trabajo ha alcanzado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "Display_offline_form": "Mostrar formulario fuera de línea",
   "Display_setting_permissions": "Mostrar permisos para cambiar la configuración",
   "Display_unread_counter": "Mostrar número de mensajes no leídos",
@@ -1495,14 +1500,11 @@
   "E2E_Enabled": "E2E habilitado",
   "E2E_Enabled_Default_DirectRooms": "Habilitar cifrado de Rooms directas por defecto",
   "E2E_Enabled_Default_PrivateRooms": "Habilitar cifrado de Rooms privadas por defecto",
-  "mentions_counter_many": "{{count}} menciones",
   "E2E_Encryption_Password_Change": "Cambiar contraseña de cifrado",
   "E2E_Encryption_Password_Explanation": "Ahora puedes crear grupos privados cifrados y mensajes directos. También puedes cambiar los grupos privados o los mensajes directos existentes para cifrarlos.<br/><br/>Este es un cifrado de extremo a extremo, por lo que la clave para codifica/decodificar tus mensajes no se guardará en el servidor. Por esa razón, debes guardar tu contraseña en un lugar seguro. Se te pedirá que la introduzcas en otros dispositivos en los que quieras usar el cifrado E2E.",
   "E2E_key_reset_email": "Notificación de restablecimiento de clave E2E",
   "E2E_password_request_text": "Para acceder a tus grupos privados y mensajes directos cifrados, introduce tu contraseña de cifrado.<br/>Necesitas introducir esta contraseña para codificar/decodificar tus mensajes en cada cliente que uses, ya que la clave no se almacena en el servidor.",
   "E2E_password_reveal_text": "Ahora puedes crear grupos privados y mensajes directos cifrados. También puedes cambiar los grupos privados o los mensajes directos existentes para cifrarlos.<br/><br/>Este es un cifrado de extremo a extremo, por lo que la clave para codifica/decodificar tus mensajes no se guardará en el servidor. Por esa razón, debes guardar tu contraseña en un lugar seguro. Se te pedirá que la introduzcas en otros dispositivos en los que quieras usar el cifrado E2E.<a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\" target=\"_blank\">Consulta más información aquí.</a><br/><br/>Tu contraseña: <span style=\"font-weight: bold;\">%s</span><br/><br/>Esta es una contraseña generada automáticamente. Puedes configurar una nueva contraseña para tu clave de cifrado en cualquier momento desde cualquier navegador en el que hayas introducido la contraseña existente.<br/>Esta contraseña solo se almacena en este navegador hasta que la guardes y descartes este mensaje.",
-  "threads_counter_many": "{{count}} mensajes en hilo sin leer",
-  "unread_messages_counter_many": "{{count}} mensajes sin leer",
   "E2E_Reset_Email_Content": "Tu sesión se ha cerrado automáticamente. Cuando vuelvas a iniciar sesión, Rocket.Chat generará una nueva clave y restaurará tu acceso a cualquier sala cifrada que tenga uno o más miembros en línea. Debido a la naturaleza del cifrado E2E, Rocket.Chat no podrá restaurar el acceso a ninguna sala cifrada que no tenga miembros en línea.",
   "E2E_Reset_Key_Explanation": "Esta opción eliminará tu clave E2E actual y cerrará tu sesión. <BR/>Cuando vuelvas a iniciar sesión, Rocket.Chat generará una nueva clave y restaurará tu acceso a cualquier sala cifrada que tenga uno o más miembros en línea.<BR/>Debido a la naturaleza del cifrado E2E, Rocket.Chat no podrá restaurar el acceso a ninguna sala cifrada que no tenga miembros en línea.",
   "E2E_Reset_Other_Key_Warning": "Restablecer la clave E2E actual cerrará la sesión del usuario. Cuando vuelva a iniciar sesión, Rocket.Chat generará una nueva clave y restaurará su acceso a cualquier sala cifrada que tenga uno o más miembros en línea. Debido a la naturaleza del cifrado E2E, Rocket.Chat no podrá restaurar el acceso a ninguna sala cifrada que no tenga miembros en línea.",
@@ -1745,10 +1747,8 @@
   "error-no-tokens-for-this-user": "No hay ningún token para este usuario",
   "error-no-agents-online-in-department": "No hay agentes en línea en el departamento",
   "error-no-message-for-unread": "No hay mensajes para marcar como no leídos",
-  "subscription.callout.description.limitsExceeded_many": "Su espacio de trabajo ha superado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "error-not-allowed": "No permitido",
   "error-not-authorized": "No autorizado",
-  "subscription.callout.description.limitsReached_many": "Su espacio de trabajo ha alcanzado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "error-office-hours-are-closed": "El horario de oficina ha finalizado.",
   "Estimated_due_time": "Tiempo estimado de vencimiento",
   "error-password-in-history": "La contraseña introducida se ha usado anteriormente",
@@ -4109,7 +4109,7 @@
   "The_application_name_is_required": "El nombre de la aplicación es obligatorio",
   "The_channel_name_is_required": "El nombre del canal es obligatorio",
   "The_emails_are_being_sent": "Los correos electrónicos se están enviando.",
-  "The_empty_room__roomName__will_be_removed_automatically": "La sala vacía <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "La sala vacía <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "El ajuste de tamaño de las imágenes no funcionará porque no detectamos ImageMagick o GraphicsMagick instalados en tu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "El mensaje es una discusión, así que no podrás recuperar los mensajes",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Las notificaciones móviles se han deshabilitado para todos los usuarios. Ve a \"Administración\" > \"Push\" para habilitar puerta de enlace push nuevamente",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index 26ba8019aeb1..90dd4b4f94bd 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -4727,7 +4727,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> voi:",
   "The_channel_name_is_required": "Kanavan nimi on pakollinen",
   "The_emails_are_being_sent": "Sähköpostiviestejä lähetetään.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Kuvien koon muuttaminen ei toimi, koska ImageMagickia tai GraphicsMagickia ei havaittu asennettuna palvelimessa.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Viesti on keskustelu, et voi palauttaa näitä viestejä!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobiili-ilmoitukset oli poistettu käytöstä kaikilta käyttäjiltä. Ota Push Gateway uudelleen käyttöön kohdassa \"Admin > Push\"",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index 80e4504d2085..378071205b60 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -186,6 +186,7 @@
   "Accounts_Password_Policy_AtLeastOneLowercase": "Au moins une lettre minuscule",
   "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Imposer qu'un mot de passe contienne au moins une lettre minuscule.",
   "Accounts_Password_Policy_AtLeastOneNumber": "Au moins un chiffre",
+  "Calls_in_queue_many": "{{count}} appels en file d'attente",
   "Accounts_Password_Policy_AtLeastOneNumber_Description": "Imposer qu'un mot de passe contienne au moins un caractère numérique.",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "Au moins un symbole",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Imposer qu'un mot de passe contienne au moins un caractère spécial.",
@@ -232,7 +233,6 @@
   "Accounts_ShowFormLogin": "Afficher le formulaire de connexion par défaut",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "Activer l'authentification à deux facteurs via TOTP",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "Les utilisateurs peuvent configurer l'authentification à deux facteurs via n'importe quelle application TOTP, comme Google Authenticateur ou Authy.",
-  "Calls_in_queue_many": "{{count}} appels en file d'attente",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Activer automatiquement l'authentification à deux facteurs par e-mail pour les nouveaux utilisateurs",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "L'authentification à deux facteurs par e-mail sera activée par défaut pour les nouveaux utilisateurs. Ils pourront la désactiver dans leur page de profil.",
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Délai d'expiration du code envoyé par e-mail (en secondes)",
@@ -603,6 +603,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "Activer la traduction automatique",
   "AutoTranslate_Enabled_Description": "Activer la traduction automatique permet aux utilisateurs disposant de l'autorisation `auto-translate`  de voir l'ensemble des messages traduits automatiquement dans leur langue. Des frais peuvent s'appliquer.",
+  "message_counter_many": "{{count}} messages",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "Clé d'abonnement Ocp-Apim",
@@ -613,6 +614,7 @@
   "Avatar": "Avatar",
   "Avatar_changed_successfully": "Avatar modifié avec succès",
   "Avatar_URL": "URL de l'avatar",
+  "meteor_status_reconnect_in_many": "nouvelle tentative dans {{count}} secondes...",
   "Avatar_format_invalid": "Format invalide. Seul le type d'image est autorisé",
   "Avatar_url_invalid_or_error": "L'URL est non valide ou non accessible. Essayez de nouveau, mais avec une URL différente.",
   "Avg_chat_duration": "Durée moyenne du chat",
@@ -751,7 +753,6 @@
   "CAS_enabled": "Activé",
   "CAS_Login_Layout": "Présentation de la connexion CAS",
   "CAS_login_url": "URL de connexion SSO",
-  "message_counter_many": "{{count}} messages",
   "CAS_login_url_Description": "URL de connexion de votre service SSO externe, par exemple : `https://sso.example.undef/sso/login`",
   "CAS_popup_height": "Hauteur de la fenêtre contextuelle de connexion",
   "CAS_popup_width": "Largeur de la fenêtre contextuelle de connexion",
@@ -767,7 +768,6 @@
   "Categories*": "Catégories*",
   "CDN_JSCSS_PREFIX": "Préfixe CDN pour JS/CSS",
   "CDN_PREFIX": "Préfixe CDN",
-  "meteor_status_reconnect_in_many": "nouvelle tentative dans {{count}} secondes...",
   "CDN_PREFIX_ALL": "Utiliser le préfixe CDN pour toutes les ressources",
   "Certificates_and_Keys": "Certificats et clés",
   "change-livechat-room-visitor": "Modifier les visiteurs des salons Livechat",
@@ -4121,7 +4121,7 @@
   "The_application_name_is_required": "Le nom de l'application est requis",
   "The_channel_name_is_required": "Le nom du canal est obligatoire",
   "The_emails_are_being_sent": "Les e-mails sont en cours d'envoi.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Le redimensionnement de l'image ne fonctionnera pas car nous n'avons pas trouvé ImageMagick ou GraphicsMagick installé sur votre serveur.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Le message est une discussion, vous ne pourrez pas récupérer les messages.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notifications mobiles ont été désactivées pour tous les utilisateurs, accédez à \"Admin > Push\" pour réactiver la passerelle Push",
diff --git a/packages/i18n/src/locales/he.i18n.json b/packages/i18n/src/locales/he.i18n.json
index 499e2ca41d2d..5c6c3d1f140b 100644
--- a/packages/i18n/src/locales/he.i18n.json
+++ b/packages/i18n/src/locales/he.i18n.json
@@ -1304,7 +1304,7 @@
   "Thank_you_for_your_feedback": "תודה לך על המשוב",
   "The_application_name_is_required": "שם האפליקציה נדרש",
   "The_channel_name_is_required": "שם הערוץ נדרש",
-  "The_emails_are_being_sent": "האימיילים נשלחים.",   
+  "The_emails_are_being_sent": "האימיילים נשלחים.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "שינוי גודל התמונה לא יעבוד כי אנחנו לא יכולים לזהות ImageMagick או GraphicsMagick מותקן על השרת שלך.",
   "The_redirectUri_is_required": "RedirectUri נדרש",
   "The_server_will_restart_in_s_seconds": "השרת יפעיל את עצמו מחדש בעוד ",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 3110d6e82a67..6f63eeadd9ed 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -6,8 +6,8 @@
   "__count__message_pruned": "{{count}} संदेश काट दिया गया",
   "__count__conversations__period__": "{{count}} बातचीत, {{period}}",
   "__count__tags__and__count__conversations__period__": "{{count}} टैग और {{conversations}} बातचीत, {{period}}",
-  "__departments__departments_and__count__conversations__period__": "{{departments}} विभाग और {{count}} बातचीत, {{period}}",
   "__usersCount__member_joined": "+ {{usersCount}} सदस्य शामिल हुए",
+  "__departments__departments_and__count__conversations__period__": "{{departments}} विभाग और {{count}} बातचीत, {{period}}",
   "__usersCount__people_will_be_invited": "{{usersCount}} लोगों को आमंत्रित किया जाएगा",
   "__username__is_no_longer__role__defined_by__user_by_": "{{username}} is no longer {{role}} by {{user_by}}",
   "__username__was_set__role__by__user_by_": "{{username}} was set {{role}} by {{user_by}}",
@@ -504,6 +504,8 @@
   "App_status_auto_enabled": "सक्रिय",
   "App_status_constructed": "निर्माण",
   "App_status_disabled": "उपयोग करने की अनुमति नहीं है",
+  "Apps_Count_Enabled": "{{count}} ऐप सक्षम",
+  "Private_Apps_Count_Enabled": "{{count}} निजी ऐप सक्षम",
   "App_status_error_disabled": "अक्षम: ध्यान में न आई त्रुटि",
   "App_status_initialized": "प्रारंभ",
   "App_status_invalid_license_disabled": "विकलांग: अमान्य लाइसेंस",
@@ -529,8 +531,6 @@
   "Apps_context_requested": "का अनुरोध किया",
   "Apps_context_private": "निजी ऐप्स",
   "Apps_context_premium": "अधिमूल्य",
-  "Apps_Count_Enabled": "{{count}} ऐप सक्षम",
-  "Private_Apps_Count_Enabled": "{{count}} निजी ऐप सक्षम",
   "Apps_Count_Enabled_tooltip": "सामुदायिक कार्यस्थान अधिकतम {{number}} {{context}} ऐप्स सक्षम कर सकते हैं",
   "Apps_disabled_when_Premium_trial_ended": "प्रीमियम योजना का परीक्षण समाप्त होने पर ऐप्स अक्षम हो गए",
   "Apps_disabled_when_Premium_trial_ended_description": "समुदाय पर कार्यस्थानों में अधिकतम 5 मार्केटप्लेस ऐप्स और 3 निजी ऐप्स सक्षम हो सकते हैं। अपने कार्यक्षेत्र व्यवस्थापक से ऐप्स को पुनः सक्षम करने के लिए कहें।",
@@ -705,6 +705,7 @@
   "Auto_Load_Images": "छवियाँ स्वतः लोड करें",
   "Auto_Selection": "स्वतः चयन",
   "Auto_Translate": "ऑटो का अनुवाद",
+  "Calls_in_queue": "{{calls}} कतार में कॉल करें",
   "auto-translate": "स्वतः अनुवाद",
   "auto-translate_description": "ऑटो ट्रांसलेशन टूल का उपयोग करने की अनुमति",
   "Automatic_Translation": "स्वचालित अनुवाद",
@@ -851,7 +852,6 @@
   "Call_Center_Description": "रॉकेट.चैट के वॉयस चैनल कॉन्फ़िगर करें",
   "Call_ended": "कॉल समाप्त",
   "Calls": "कॉल",
-  "Calls_in_queue": "{{calls}} कतार में कॉल करें",
   "Call_declined": "कॉल अस्वीकृत!",
   "Call_history_provides_a_record_of_when_calls_took_place_and_who_joined": "कॉल इतिहास इस बात का रिकॉर्ड प्रदान करता है कि कॉल कब हुई और कौन शामिल हुआ।",
   "Call_Information": "कॉल सूचना",
@@ -2169,6 +2169,7 @@
   "Favorite_Rooms": "पसंदीदा कमरे सक्षम करें",
   "Favorites": "पसंदीदा",
   "Feature_preview": "फ़ीचर पूर्वावलोकन",
+  "Feature_preview_page_description": "फीचर पूर्वावलोकन पृष्ठ पर आपका स्वागत है! यहां, आप नवीनतम अत्याधुनिक सुविधाओं को सक्षम कर सकते हैं जो वर्तमान में विकास के अधीन हैं और अभी तक आधिकारिक तौर पर जारी नहीं की गई हैं।\n\nकृपया ध्यान दें कि ये कॉन्फ़िगरेशन अभी भी परीक्षण चरण में हैं और स्थिर या पूरी तरह कार्यात्मक नहीं हो सकते हैं।",
   "featured": "प्रदर्शित",
   "Featured": "प्रदर्शित",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "यह सुविधा प्रशासन सेटिंग्स (एडमिन -> वीडियो कॉन्फ्रेंस) से सक्षम होने के लिए उपरोक्त चयनित कॉल प्रदाता पर निर्भर करती है।",
@@ -3167,6 +3168,7 @@
   "Log_Exceptions_to_Channel": "चैनल में अपवाद लॉग करें",
   "Log_Exceptions_to_Channel_Description": "एक चैनल जो सभी कैप्चर किए गए अपवाद प्राप्त करेगा। अपवादों को नज़रअंदाज करने के लिए खाली छोड़ें।",
   "Log_File": "फ़ाइल और लाइन दिखाएँ",
+  "message_counter": "{{counter}} संदेश",
   "Log_Level": "छांटने का स्तर",
   "Log_Package": "पैकेज दिखाएँ",
   "Log_Trace_Methods": "ट्रेस विधि कॉल",
@@ -3272,6 +3274,7 @@
   "manage-selected-settings": "कुछ सेटिंग्स बदलें",
   "manage-selected-settings_description": "सेटिंग्स को बदलने की अनुमति जो स्पष्ट रूप से बदलने के लिए दी गई है",
   "manage-sounds": "ध्वनियाँ प्रबंधित करें",
+  "meteor_status_reconnect_in": "एक सेकंड में पुनः प्रयास कर रहा हूँ...",
   "manage-sounds_description": "सर्वर ध्वनियों को प्रबंधित करने की अनुमति",
   "manage-the-app": "ऐप प्रबंधित करें",
   "manage-user-status": "उपयोगकर्ता स्थिति प्रबंधित करें",
@@ -3380,7 +3383,6 @@
   "Message_Code_highlight_Description": "अल्पविराम से अलग की गई भाषाओं की सूची (सभी समर्थित भाषाएं [highlight.js](https://github.com/highlightjs/highlight.js/tree/11.6.0#supported-भाषाएं) पर) जिनका उपयोग कोड ब्लॉक को हाइलाइट करने के लिए किया जाएगा",
   "Message_CustomDomain_AutoLink": "ऑटो लिंक के लिए कस्टम डोमेन श्वेतसूची",
   "Message_CustomDomain_AutoLink_Description": "यदि आप `https://internaltool.intranet` या `internaltool.intranet` जैसे आंतरिक लिंक को ऑटो लिंक करना चाहते हैं, तो आपको फ़ील्ड में `इंट्रानेट` डोमेन जोड़ना होगा, कई डोमेन को अल्पविराम से अलग करना होगा।",
-  "message_counter": "{{counter}} संदेश",
   "Message_DateFormat": "तारिख का प्रारूप",
   "Message_DateFormat_Description": "यह भी देखें: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
   "Message_deleting_blocked": "यह संदेश अब हटाया नहीं जा सकता",
@@ -3486,7 +3488,6 @@
   "meteor_status_connecting": "कनेक्ट हो रहा है...",
   "meteor_status_failed": "सर्वर कनेक्शन विफल रहा",
   "meteor_status_offline": "ऑफ़लाइन मोड।",
-  "meteor_status_reconnect_in": "एक सेकंड में पुनः प्रयास कर रहा हूँ...",
   "meteor_status_try_now_offline": "पुनः कनेक्ट करें",
   "meteor_status_try_now_waiting": "अब कोशिश करो",
   "meteor_status_waiting": "सर्वर कनेक्शन की प्रतीक्षा में,",
@@ -4127,6 +4128,7 @@
   "Queue_Time": "कतार समय",
   "Queue_management": "कतार प्रबंधन",
   "Quick_reactions": "त्वरित प्रतिक्रियाएँ",
+  "Quick_reactions_description": "जब आपका माउस संदेश पर होता है तो सबसे अधिक उपयोग की जाने वाली तीन प्रतिक्रियाओं तक आसान पहुंच मिलती है",
   "quote": "उद्धरण",
   "Quote": "उद्धरण",
   "Random": "Random",
@@ -5672,9 +5674,13 @@
   "WebRTC_Call": "वेबआरटीसी कॉल",
   "WebRTC_Call_unavailable_for_federation": "फ़ेडरेटेड रूम के लिए WebRTC कॉल उपलब्ध नहीं है",
   "WebRTC_direct_audio_call_from_%s": "%s से सीधा ऑडियो कॉल",
+  "mentions_counter": "{{count}} उल्लेख",
   "WebRTC_direct_video_call_from_%s": "%s से सीधा वीडियो कॉल",
+  "threads_counter": "{{count}} अपठित थ्रेडेड संदेश",
   "WebRTC_Enable_Channel": "सार्वजनिक चैनलों के लिए सक्षम करें",
+  "group_mentions_counter": "{{count}} समूह का उल्लेख",
   "WebRTC_Enable_Direct": "सीधे संदेशों के लिए सक्षम करें",
+  "unread_messages_counter": "अपठित संदेश को {{count}}",
   "WebRTC_Enable_Private": "निजी चैनलों के लिए सक्षम करें",
   "WebRTC_group_audio_call_from_%s": "%s से समूह ऑडियो कॉल",
   "WebRTC_group_video_call_from_%s": "%s से समूह वीडियो कॉल",
@@ -6051,10 +6057,6 @@
   "Filter_by_room": "कमरे के प्रकार के अनुसार फ़िल्टर करें",
   "Filter_by_visibility": "दृश्यता के आधार पर फ़िल्टर करें",
   "Theme_Appearence": "थीम उपस्थिति",
-  "mentions_counter": "{{count}} उल्लेख",
-  "threads_counter": "{{count}} अपठित थ्रेडेड संदेश",
-  "group_mentions_counter": "{{count}} समूह का उल्लेख",
-  "unread_messages_counter": "अपठित संदेश को {{count}}",
   "Premium": "अधिमूल्य",
   "Premium_capability": "प्रीमियम क्षमता",
   "Operating_withing_plan_limits": "योजना सीमा के भीतर संचालन",
@@ -6132,4 +6134,4 @@
   "Unlimited_seats": "असीमित सीटें",
   "Unlimited_MACs": "असीमित एमएसी",
   "Unlimited_seats_MACs": "असीमित सीटें और एमएसी"
-}
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index a281e3b2c64b..78da1d401147 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -4540,7 +4540,7 @@
   "The_application_name_is_required": "Az alkalmazás neve kötelező",
   "The_channel_name_is_required": "A csatorna neve kötelező",
   "The_emails_are_being_sent": "Az e-mailek elküldésre kerültek.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolítva.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolítva.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "A kép átméretezése nem fog működni, mert nem észlelhető a kiszolgálóra telepített ImageMagick vagy GraphicsMagick program.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Az üzenet egy megbeszélés, nem lesz képes helyreállítani az üzeneteket!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "A mobil értesítések le lettek tiltva az összes felhasználó számára. Menjen az „Adminisztráció → Leküldés” menüponthoz a leküldéses átjáró újbóli engedélyezéséhez.",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index f4bbf05e2faf..ec48aa15bb7b 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -178,8 +178,10 @@
   "Accounts_OAuth_Meteor_id": "ID Meteor",
   "Accounts_OAuth_Meteor_secret": "Chiave segreta Meteor",
   "Accounts_OAuth_Nextcloud": "OAuth abilitato",
+  "Apps_Count_Enabled_many": "{{count}} app abilitate",
   "Accounts_OAuth_Nextcloud_secret": "Chiave segreta",
   "Accounts_OAuth_Proxy_host": "Host Proxy",
+  "Private_Apps_Count_Enabled_many": "{{count}} applicazioni private abilitate",
   "Accounts_OAuth_Proxy_services": "Servizi Proxy",
   "Accounts_OAuth_Tokenpass": "Accesso Tokenpass",
   "Accounts_OAuth_Tokenpass_callback_url": "URL di callback di Tokenpass",
@@ -203,11 +205,9 @@
   "Accounts_OAuth_Wordpress_token_path": "Percorso del token",
   "Accounts_Password_Policy_AtLeastOneLowercase": "Almeno una minuscola",
   "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Imponi che una password contenga almeno un carattere minuscolo.",
-  "Apps_Count_Enabled_many": "{{count}} app abilitate",
   "Accounts_Password_Policy_AtLeastOneNumber": "Almeno un numero",
   "Accounts_Password_Policy_AtLeastOneNumber_Description": "Imponi che una password contenga almeno un carattere numerico.",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "Almeno un simbolo",
-  "Private_Apps_Count_Enabled_many": "{{count}} applicazioni private abilitate",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Imponi che una password contenga almeno un carattere speciale.",
   "Accounts_Password_Policy_AtLeastOneUppercase": "Almeno una maiuscola",
   "Accounts_Password_Policy_AtLeastOneUppercase_Description": "Imponi che una password contenga almeno un carattere minuscolo.",
@@ -492,6 +492,7 @@
   "Avatar": "Avatar",
   "Avatar_changed_successfully": "Avatar cambiato con successo",
   "Avatar_URL": "URL avatar",
+  "meteor_status_reconnect_in_many": "riprovo tra {{count}} secondi...",
   "Avatar_url_invalid_or_error": "L'URL fornito non è valido o non è accessibile. Si prega di riprovare, ma con un URL differente.",
   "away": "assente",
   "Away": "Assente",
@@ -593,7 +594,6 @@
   "CAS_version": "Versione CAS",
   "CAS_version_Description": "Utilizza solo la versione CAS supportata dal tuo servizio CAS SSO.",
   "CDN_PREFIX": "Prefisso CDN",
-  "meteor_status_reconnect_in_many": "riprovo tra {{count}} secondi...",
   "Certificates_and_Keys": "Certificati e chiavi",
   "Change_Room_Type": "Cambia la tipologia di stanza",
   "Changing_email": "In fase di cambiamento dell'email",
@@ -2920,7 +2920,7 @@
   "Thank_you_for_your_feedback": "Grazie per il tuo feedback",
   "The_application_name_is_required": "Il nome dell'applicazione è richiesta",
   "The_channel_name_is_required": "Il nome del canale è richiesto",
-  "The_emails_are_being_sent": "Le email verranno inviate.",   
+  "The_emails_are_being_sent": "Le email verranno inviate.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Il ridimensionamento dell'immagine non funzionerà se non rileva ImageMagick or GraphicsMagick installato sul tuo server.",
   "The_redirectUri_is_required": "Il redirectUri é richiesto",
   "The_server_will_restart_in_s_seconds": "Il server si riavvierà in %s secondi",
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index dcdf00bf7ed6..e049ea98c74b 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -4070,7 +4070,7 @@
   "The_application_name_is_required": "アプリケーション名は必須です",
   "The_channel_name_is_required": "チャネル名は必須です",
   "The_emails_are_being_sent": "メールを送信中です。",
-  "The_empty_room__roomName__will_be_removed_automatically": "空のルーム<span style=\"font-weight: bold;\">{{roomName}}</span>は自動的に削除されます。",   
+  "The_empty_room__roomName__will_be_removed_automatically": "空のルーム<span style=\"font-weight: bold;\">{{roomName}}</span>は自動的に削除されます。",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "サーバーにインストールされたImageMagickまたはGraphicsMagickを検出できないため、画像のサイズ変更が機能しません。",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "このメッセージはメッセージを復元できないディスカッションです！",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "すべてのユーザーに対してモバイル通知が無効になりました。［管理］>［プッシュ］に移動して、プッシュゲートウェイを再度有効にしてください",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index 8927c7f3335b..583d34a5d70e 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -2691,7 +2691,7 @@
   "Thank_you_for_your_feedback": "សូមអរគុណសម្រាប់មតិរបស់អ្នក",
   "The_application_name_is_required": "ឈ្មោះកម្មវិធីនេះគឺត្រូវបានទាមទារ",
   "The_channel_name_is_required": "ឈ្មោះឆានែលនេះគឺត្រូវបានទាមទារ",
-  "The_emails_are_being_sent": "នេះ​អ៊ីមែល​ត្រូវ​បាន​បញ្ជូន​។",   
+  "The_emails_are_being_sent": "នេះ​អ៊ីមែល​ត្រូវ​បាន​បញ្ជូន​។",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ប្ដូរទំហំរូបភាពនឹងមិនធ្វើការដោយសារតែយើងមិនអាចរកឃើញ ImageMagick ឬ GraphicsMagick ដែលបានដំឡើងនៅលើម៉ាស៊ីនបម្រើរបស់អ្នក។",
   "The_redirectUri_is_required": "redirectUri នេះគឺត្រូវបានទាមទារ",
   "The_server_will_restart_in_s_seconds": "ម៉ាស៊ីនបម្រើនេះនឹងចាប់ផ្ដើមឡើងវិញនៅក្នុង %s វិនាទី",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index 5df1f0db78ba..e9e498d81491 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -3470,7 +3470,7 @@
   "The_application_name_is_required": "응용프로그램명이 필요합니다.",
   "The_channel_name_is_required": "채널명이 필요합니다.",
   "The_emails_are_being_sent": "이메일을 전송 중입니다.",
-  "The_empty_room__roomName__will_be_removed_automatically": "사용하지 않는 대화방 <span style=\"font-weight: bold;\">{{roomName}}</span>은 자동으로 제거됩니다.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "사용하지 않는 대화방 <span style=\"font-weight: bold;\">{{roomName}}</span>은 자동으로 제거됩니다.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "서버에 ImageMagick 또는 GraphicMagick이 설치되어 있지 않아 이미지 크기를 재조정할 수 없습니다.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "그 메시지는 메시지 복구가 불가능한 토론입니다.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "모바일 알림이 모든 사용자에게 사용 중지되었습니다. \"관리자> 푸시\"로 이동하여 푸시 게이트웨이를 다시 사용으로 변경하십시오.",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index a4c5e7108a2f..184ea2fb736a 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -2360,7 +2360,7 @@
   "Thank_you_for_your_feedback": "Spas ji bo we Deng xwe",
   "The_application_name_is_required": "Navê sepanê pêwîst e",
   "The_channel_name_is_required": "The name kanala pêwîst e",
-  "The_emails_are_being_sent": "Mailan têne şandin.",   
+  "The_emails_are_being_sent": "Mailan têne şandin.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Mezinahiyê image xebata wê ne ji ber ku em nikarin bi durustî .Pêşîn an GraphicsMagick li ser server te sazkirin.",
   "The_redirectUri_is_required": "The redirectUri pêwîst e",
   "The_server_will_restart_in_s_seconds": "ڕاژەکارەکە هەڵ ئەبێتەوە لە %s چرکەدا",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index 547e9274a6ff..1f185faebfa3 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -2403,7 +2403,7 @@
   "Thank_you_for_your_feedback": "ຂໍ​ຂອບ​ໃຈ​ທ່ານ​ສໍາ​ລັບ​ການ​ຕໍາ​ນິ​ຕິ​ຊົມ​ຂອງ​ທ່ານ​",
   "The_application_name_is_required": "ຊື່ຄໍາຮ້ອງສະຫມັກແມ່ນຈໍາເປັນຕ້ອງ",
   "The_channel_name_is_required": "ຊື່ຊ່ອງທາງການຈໍາເປັນຕ້ອງ",
-  "The_emails_are_being_sent": "ອີເມວໄດ້ຖືກສົ່ງໄປແລ້ວ.",   
+  "The_emails_are_being_sent": "ອີເມວໄດ້ຖືກສົ່ງໄປແລ້ວ.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ການ resize ຮູບພາບຈະບໍ່ເຮັດວຽກເພາະວ່າພວກເຮົາບໍ່ສາມາດກວດພົບ ImageMagick ຫຼື GraphicsMagick ການຕິດຕັ້ງໃນເຄື່ອງແມ່ຂ່າຍຂອງທ່ານ.",
   "The_redirectUri_is_required": "The redirectUri ຈໍາເປັນຕ້ອງມີ",
   "The_server_will_restart_in_s_seconds": "ເຄື່ອງແມ່ຂ່າຍຂອງຈະເລີ່ມການເຮັດວຽກໃນ %s ວິນາທີ",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 7408a8eeb762..0394a7866387 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -2421,7 +2421,7 @@
   "Thank_you_for_your_feedback": "Dėkojame už jūsų atsiliepimus",
   "The_application_name_is_required": "Būtina nurodyti programos pavadinimą",
   "The_channel_name_is_required": "Reikalingas kanalo pavadinimas",
-  "The_emails_are_being_sent": "El. Laiškai siunčiami.",   
+  "The_emails_are_being_sent": "El. Laiškai siunčiami.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Vaizdo dydžio keitimas neveiks, nes negalime nustatyti serverio \"ImageMagick\" ar \"GraphicsMagick\".",
   "The_redirectUri_is_required": "Reikia redirectUri",
   "The_server_will_restart_in_s_seconds": "Serveris bus paleistas iš naujo po%s sekundžių",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index a9e38267b01c..eef5bccb6684 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -2375,7 +2375,7 @@
   "Thank_you_for_your_feedback": "Paldies par jūsu atsauksmēm",
   "The_application_name_is_required": "Pieteikuma nosaukums ir nepieciešams",
   "The_channel_name_is_required": "Ir nepieciešams kanāla nosaukums",
-  "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",   
+  "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Attēla izmēru maiņa nestrādās, jo mēs nevaram atrast jūsu serverī uzinstalētu ImageMagick vai GraphicsMagick.",
   "The_redirectUri_is_required": "Nepieciešams RedirectUri ",
   "The_server_will_restart_in_s_seconds": "Serveris restartēsies pēc %s sekundēm",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index 407c86309db8..d8277677b38d 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -2361,7 +2361,7 @@
   "Thank_you_for_your_feedback": "Таны санал хүсэлтэнд баярлалаа",
   "The_application_name_is_required": "Програмын нэр шаардлагатай",
   "The_channel_name_is_required": "Сувгийн нэр шаардлагатай",
-  "The_emails_are_being_sent": "Э-мэйл илгээж байна.",   
+  "The_emails_are_being_sent": "Э-мэйл илгээж байна.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick эсвэл GraphicsMagick-г сервер дээрээ суулгаж чаддаггүй болохоор зургийн хэмжээг өөрчлөх боломжгүй.",
   "The_redirectUri_is_required": "RedirectUri шаардлагатай",
   "The_server_will_restart_in_s_seconds": "Сервер%s секундын дараа дахин эхлүүлэх болно",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index 9e203c69baf3..911a9cdf8879 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -2372,7 +2372,7 @@
   "Thank_you_for_your_feedback": "Terima kasih atas maklum balas anda",
   "The_application_name_is_required": "Nama permohonan diperlukan",
   "The_channel_name_is_required": "Nama saluran diperlukan",
-  "The_emails_are_being_sent": "E-mel yang sedang dihantar.",   
+  "The_emails_are_being_sent": "E-mel yang sedang dihantar.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The saiz semula imej tidak akan berfungsi kerana kita tidak dapat mengesan ImageMagick atau GraphicsMagick dipasang pada pelayan anda.",
   "The_redirectUri_is_required": "The redirectUri diperlukan",
   "The_server_will_restart_in_s_seconds": "Server akan memulakan semula dalam %s saat",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index 9796181ae1bb..64fae6187ae6 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -4109,7 +4109,7 @@
   "The_application_name_is_required": "De naam van de applicatie is vereist",
   "The_channel_name_is_required": "De naam van het kanaal is vereist",
   "The_emails_are_being_sent": "De e-mails worden verzonden.",
-  "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Het wijzigen van de grootte van de afbeelding zal niet werken omdat we ImageMagick of GraphicsMagick niet kunnen detecteren die op uw server zijn geïnstalleerd.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Het bericht is een discussie, u kunt de berichten niet herstellen!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "De mobiele meldingen werden voor alle gebruikers uitgeschakeld, ga naar \"Admin > Push\" om de Push Gateway weer in te schakelen",
diff --git a/packages/i18n/src/locales/nn.i18n.json b/packages/i18n/src/locales/nn.i18n.json
index 6f31cf5a2e62..32db3455abd7 100644
--- a/packages/i18n/src/locales/nn.i18n.json
+++ b/packages/i18n/src/locales/nn.i18n.json
@@ -1 +1,4585 @@
-{ }
\ No newline at end of file
+{
+  "500": "Intern server feil",
+  "__agents__agents_and__count__conversations__period__": "{{agents}} agenter og {{count}} samtaler, {{period}}",
+  "__count__empty_rooms_will_be_removed_automatically": "{{count}} tomme rom vil bli fjernet automatisk.",
+  "__count__empty_rooms_will_be_removed_automatically__rooms__": "{{count}} tomme rom vil bli fjernet automatisk:<br/> {{rooms}}.",
+  "__count__message_pruned_one": "{{count}} melding beskjært",
+  "__count__message_pruned_other": "{{count}} meldinger beskjært",
+  "__count__conversations__period__": "{{count}} samtaler, {{period}}",
+  "__count__tags__and__count__conversations__period__": "{{count}}-tagger og {{conversations}}-samtaler, {{period}}",
+  "__departments__departments_and__count__conversations__period__": "{{departments}} avdelinger og {{count}} samtaler, {{period}}",
+  "__usersCount__member_joined_one": "+ {{count}} medlem ble med",
+  "__usersCount__member_joined_other": "+ {{count}} medlemmer ble med",
+  "__usersCount__people_will_be_invited": "{{usersCount}} personer blir invitert",
+  "__username__is_no_longer__role__defined_by__user_by_": "{{username}} er ikke lenger {{role}} av {{user_by}}",
+  "__username__was_set__role__by__user_by_": "{{username}} ble satt {{role}} av {{user_by}}",
+  "__count__without__department__": "{{count}} uten avdeling",
+  "__count__without__tags__": "{{count}} uten tagger",
+  "__count__without__assignee__": "{{count}} uten mottaker",
+  "__roomName__was_added_to_favorites": "{{roomName}} ble lagt til i favoritter",
+  "__roomName__encryption_keys_need_to_be_updated": "{{roomName}} krypteringsnøkler må oppdateres for å gi deg tilgang. Et annet rommedlem må være online for at dette skal skje.",
+  "removed__username__as__role_": "fjernet {{username}} som {{role}}",
+  "set__username__as__role_": "sett {{username}} som {{role}}",
+  "This_room_encryption_has_been_enabled_by__username_": "Dette rommets kryptering er aktivert av {{username}}",
+  "This_room_encryption_has_been_disabled_by__username_": "Dette rommets kryptering har blitt deaktivert av {{username}}",
+  "Third_party_login": "Tredjeparts innlogging",
+  "Enabled_E2E_Encryption_for_this_room": "aktivert E2E-kryptering for dette rommet",
+  "Enable_business_hours": "Aktiver åpningstider",
+  "disabled": "deaktivert",
+  "Disabled_E2E_Encryption_for_this_room": "deaktivert E2E-kryptering for dette rommet",
+  "@username": "@brukernavn",
+  "@username_message": "@brukernavn <message>",
+  "#channel": "#kanal",
+  "%_of_conversations": "% av samtaler",
+  "0_Errors_Only": "0 - Kun Feil",
+  "1_Errors_and_Information": "1 - Feil og informasjon",
+  "2_Erros_Information_and_Debug": "2 - Feil, Informasjon og Feilsøking",
+  "12_Hour": "12-timers klokke",
+  "24_Hour": "24-timers klokke",
+  "A_cloud-based_platform_for_those_needing_a_plug-and-play_app": "En skybasert plattform for de som trenger en plug-and-play-app.",
+  "A_new_owner_will_be_assigned_automatically_to__count__rooms": "En ny eier vil automatisk bli tildelt <span style=\"font-weight: bold;\">{{count}}</span> rom.",
+  "A_new_owner_will_be_assigned_automatically_to_the__roomName__room": "En ny eier vil automatisk bli tildelt <span style=\"font-weight: bold;\">{{roomName}}</span>-rommet.",
+  "A_new_owner_will_be_assigned_automatically_to_those__count__rooms__rooms__": "En ny eier vil automatisk bli tildelt disse <span style=\"font-weight: bold;\">{{count}}</span>-rommene:<br/> {{rooms}}.",
+  "A_secure_and_highly_private_self-managed_solution_for_conference_calls": "En sikker og privat selvstyrt løsning for konferansesamtaler.",
+  "A_workspace_admin_needs_to_install_and_configure_a_conference_call_app": "En arbeidsområdeadministrator må installere og konfigurere en konferansesamtale-app.",
+  "An_app_needs_to_be_installed_and_configured": "En app må installeres og konfigureres.",
+  "Accessibility": "Tilgjengelighet",
+  "Accessibility_and_Appearance": "Tilgjengelighet og utseende",
+  "Accessibility_activation": "Her kan du aktivere en rekke funksjoner for å forbedre nettleseropplevelsen din.",
+  "Accessibility_statement": "Tilgjengelighetserklæring",
+  "Accept_Call": "Godta anrop",
+  "Accept": "Aksepter",
+  "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Aksepter innkommende livechat selv om det ikke er noen online",
+  "Accept_new_livechats_when_agent_is_idle": "Godta nye omnikanalforespørsler når agenten er inaktiv",
+  "Accept_with_no_online_agents": "Aksepter uten påloggede agenter",
+  "Access_not_authorized": "Tilgang ikke autorisert",
+  "Access_Token_URL": "Tilgangstoken URL",
+  "Access_Your_Account": "Få tilgang til kontoen din",
+  "access_your_basic_information": "tilgang til din basis informasjon",
+  "access-mailer": "Tilgang til Mailer-skjermen",
+  "access-mailer_description": "Tillatelse til å sende masse e-post til alle brukere.",
+  "access-marketplace": "Få tilgang til markedsplassen",
+  "access-marketplace_description": "Tillatelse til å bla gjennom og hente apper fra markedsplassen",
+  "access-permissions": "Tilgang Tillatelser Skjerm",
+  "access-permissions_description": "Endre tillatelser for ulike roller.",
+  "access-setting-permissions": "Endre innstillingsbaserte tillatelser",
+  "access-setting-permissions_description": "Tillatelse til å endre innstillingsbaserte tillatelser",
+  "Accessing_permissions": "Få tilgang til tillatelser",
+  "Account_SID": "Konto SID",
+  "Account": "konto",
+  "Accounts": "kontoer",
+  "Accounts_Description": "Endre medlemskontoinnstillingene for arbeidsområdet.",
+  "Accounts_Admin_Email_Approval_Needed_Default": "<p>Brukeren <b>[name] ([email])</b> er registrert.</p><p>Vennligst sjekk \"Administrasjon ->Brukere\" for å aktivere eller slette den.</p>",
+  "Accounts_Admin_Email_Approval_Needed_Subject_Default": "En ny bruker registrert og trenger godkjenning",
+  "Accounts_Admin_Email_Approval_Needed_With_Reason_Default": "<p>Brukeren <b>[name] ([email])</b> er registrert.</p><p>Årsak: <b>[reason]</b></p><p>Vennligst sjekk \"Administrasjon ->Brukere\" for å aktivere eller slette den.</p>",
+  "Accounts_AllowAnonymousRead": "Tillat anonym lesing",
+  "Accounts_AllowAnonymousWrite": "Tillat anonym skriving",
+  "Accounts_AllowDeleteOwnAccount": "Tillat brukere å slette egen konto",
+  "Accounts_AllowedDomainsList": "Liste over aksepterte domener",
+  "Accounts_AllowedDomainsList_Description": "Kommaseparert liste over tillatte domener",
+  "Accounts_AllowInvisibleStatusOption": "Tillat usynlig status",
+  "Accounts_AllowEmailChange": "Tillat endring av e-post",
+  "Accounts_AllowEmailNotifications": "Tillat epostvarsling",
+  "Accounts_AllowFeaturePreview": "Tillat funksjonsforhåndsvisning",
+  "Accounts_AllowPasswordChange": "Tillat passordendring",
+  "Accounts_AllowPasswordChangeForOAuthUsers": "Tillat passordendring for OAuth-brukere",
+  "Accounts_AllowRealNameChange": "Tillat navneskift",
+  "Accounts_AllowUserAvatarChange": "Tillat brukervennlige endringer",
+  "Accounts_AllowUsernameChange": "Tillat endring av brukernavn",
+  "Accounts_AllowUserProfileChange": "Tillat endring av brukerprofil",
+  "Accounts_AllowUserStatusMessageChange": "Tillat egendefinert statusmelding",
+  "Accounts_AvatarBlockUnauthenticatedAccess": "Blokker ikke autentisert tilgang til avatarer",
+  "Accounts_AvatarCacheTime": "Avatar cache tid",
+  "Accounts_AvatarCacheTime_description": "Antall sekunder http-protokollen blir fortalt å cache avatabildene.",
+  "Accounts_AvatarExternalProviderUrl": "URL til ekstern tilbyder for avatar",
+  "Accounts_AvatarExternalProviderUrl_Description": "Eksempel: `https://acme.com/api/v1/{username}`",
+  "Accounts_AvatarResize": "Endre størrelsen på avatarer",
+  "Accounts_AvatarSize": "Avatar størrelse",
+  "Accounts_BlockedDomainsList": "Liste over blokkerte domener",
+  "Accounts_BlockedDomainsList_Description": "Kommaseparert liste over blokkerte domener",
+  "Accounts_BlockedUsernameList": "Blokkert brukernavnsliste",
+  "Accounts_BlockedUsernameList_Description": "Kommaseparert liste over blokkerte brukernavn (ikke-følsom)",
+  "Accounts_CustomFields_Description": "Skal være et gyldig JSON der nøkler er feltnavnene som inneholder en ordbok med feltinnstillinger. Eksempel:  \n`{\"role\":{ \"type\": \"select\", \"defaultValue\": \"student\", \"options\": [\"teacher\", \"student\"], \"required\": true, \"modifyRecordField\": {  \"array\": true,  \"field\": \"roles\" } }, \"twitter\": { \"type\": \"text\", \"required\": true, \"minLength\": 2, \"maxLength\": 10 }}`",
+  "Accounts_CustomFieldsToShowInUserInfo": "Egendefinerte felt å vise i brukerinformasjon",
+  "Accounts_Default_User_Preferences": "Standard brukerinnstillinger",
+  "Accounts_Default_User_Preferences_audioNotifications": "Lydvarsler Standardvarsel",
+  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Tillat bruker å velge \"Også send melding i kanal\"-adferden",
+  "Accounts_Default_User_Preferences_desktopNotifications": "Standardvarsling for stasjonære meldinger",
+  "Accounts_Default_User_Preferences_pushNotifications": "Standardvarsler for mobilvarsler",
+  "Accounts_Default_User_Preferences_not_available": "Kunne ikke hente brukerinnstillinger fordi de ennå ikke er konfigurert av brukeren",
+  "Accounts_Default_User_Preferences_showThreadsInMainChannel_Description": "Når aktivert, vil alle svar under en tråd også vises direkte i hovedrommet. Når den er deaktivert, vil svar i tråd vises basert på avsenderens valg.",
+  "Accounts_DefaultUsernamePrefixSuggestion": "Standard brukernavn Prefix Suggestion",
+  "Accounts_denyUnverifiedEmail": "Avvis unverifisert e-post",
+  "Accounts_Directory_DefaultView": "Standard katalogoppføring",
+  "Accounts_Email_Activated": "[navn]<br/><br/><p>Kontoen din ble aktivert.</p>",
+  "Accounts_Email_Activated_Subject": "Konto aktivert",
+  "Accounts_Email_Approved": "[navn]<br/><br/><p>Kontoen din ble godkjent.</p>",
+  "Accounts_Email_Approved_Subject": "Konto godkjent",
+  "Accounts_Email_Deactivated": "[navn]<br/><br/><p>Kontoen din ble deaktivert.</p>",
+  "Accounts_Email_Deactivated_Subject": "Konto deaktivert",
+  "Accounts_EmailVerification": "Krev e-postbekreftelse for å logge på",
+  "Accounts_EmailVerification_Description": "Kontroller at du har riktige SMTP-innstillinger for å bruke denne funksjonen",
+  "Accounts_Enrollment_Email": "Innmelding e-post",
+  "Accounts_Enrollment_Email_Default": "<h1>Velkommen til <strong>[Site_Name]</strong></h1><p>Gå til <a href=\"[Site_URL]\">[site_url]</a>og prøv den beste open source chat-løsningen tilgjengelig i dag!</p>",
+  "Accounts_Enrollment_Email_Description": "Du kan bruke følgende plassholdere:  \n - [navn], [fname], [lname] for brukerens fulle navn, fornavn eller etternavn.  \n - `[email]` for brukerens e-postadresse.  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen. ",
+  "Accounts_Enrollment_Email_Subject_Default": "Velkommen til [Site_Name]",
+  "Accounts_ForgetUserSessionOnWindowClose": "Glem brukersesjon på Vindu Lukk",
+  "Accounts_Iframe_api_method": "Api Metode",
+  "Accounts_Iframe_api_url": "API-nettadressen",
+  "Accounts_iframe_enabled": "aktivert",
+  "Accounts_iframe_url": "Iframe URL",
+  "Accounts_LoginExpiration": "Innlogging Utløp i dager",
+  "Accounts_ManuallyApproveNewUsers": "Godkjenn nye brukere manuelt",
+  "Accounts_OAuth_Apple": "Logg på med Apple",
+  "Accounts_OAuth_Apple_Description": "Hvis du vil at Apple-pålogging kun skal være aktivert på mobil, kan du la alle feltene stå tomme.",
+  "Accounts_OAuth_Custom_Access_Token_Param": "Parameternavn for \"access token\"",
+  "Accounts_OAuth_Custom_Authorize_Path": "Godkjenn sti",
+  "Accounts_OAuth_Custom_Avatar_Field": "Avatarfelt",
+  "Accounts_OAuth_Custom_Button_Color": "Knappfarge",
+  "Accounts_OAuth_Custom_Button_Label_Color": "Knapptekstfarge",
+  "Accounts_OAuth_Custom_Button_Label_Text": "Knapptekst",
+  "Accounts_OAuth_Custom_Channel_Admin": "Brukerdatagruppekart",
+  "Accounts_OAuth_Custom_Channel_Map": "OAuth gruppe Channel tildeling",
+  "Accounts_OAuth_Custom_Email_Field": "E-postfelt",
+  "Accounts_OAuth_Custom_Enable": "Aktiver",
+  "Accounts_OAuth_Custom_Groups_Claim": "Roller/Grupper felt for kanalkartlegging",
+  "Accounts_OAuth_Custom_id": "id",
+  "Accounts_OAuth_Custom_Identity_Path": "Identitetsvei",
+  "Accounts_OAuth_Custom_Identity_Token_Sent_Via": "Identitets Token Sendt Via",
+  "Accounts_OAuth_Custom_Key_Field": "Nøkkelfelt",
+  "Accounts_OAuth_Custom_Login_Style": "Logg inn stil",
+  "Accounts_OAuth_Custom_Map_Channels": "Tilordne roller/grupper til kanaler",
+  "Accounts_OAuth_Custom_Merge_Roles": "Slå sammen roller fra SSO",
+  "Accounts_OAuth_Custom_Merge_Users": "Slå sammen brukere",
+  "Accounts_OAuth_Custom_Merge_Users_Distinct_Services": "Slå sammen brukere fra forskjellige tjenester",
+  "Accounts_OAuth_Custom_Merge_Users_Distinct_Services_Description": "Når det angitte nøkkelfeltet samsvarer med feltet til en eksisterende bruker, la brukere fra denne OAuth-tjenesten slås sammen med eksisterende brukere uavhengig av opprinnelsestjenesten.",
+  "Accounts_OAuth_Custom_Name_Field": "Felt for navn",
+  "Accounts_OAuth_Custom_Roles_Claim": "Roller / Grupper feltnavn",
+  "Accounts_OAuth_Custom_Roles_To_Sync": "Roller som skal synkroniseres",
+  "Accounts_OAuth_Custom_Roles_To_Sync_Description": "OAuth roller som blir synkronisert på bruker innlogging og opprettelse (kommaseparert)",
+  "Accounts_OAuth_Custom_Scope": "omfang",
+  "Accounts_OAuth_Custom_Secret": "Hemmelig",
+  "Accounts_OAuth_Custom_Show_Button_On_Login_Page": "Vis knapp på innloggingsside",
+  "Accounts_OAuth_Custom_Token_Path": "Tokenbane",
+  "Accounts_OAuth_Custom_Token_Sent_Via": "Token Sendt Via",
+  "Accounts_OAuth_Custom_Username_Field": "Brukernavn felt",
+  "Accounts_OAuth_Drupal": "Drupal Logg inn aktivert",
+  "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI",
+  "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID",
+  "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret",
+  "Accounts_OAuth_Facebook": "Facebook Logg inn",
+  "Accounts_OAuth_Facebook_callback_url": "Facebook tilbakeringingsadresse",
+  "Accounts_OAuth_Facebook_id": "Facebook App ID",
+  "Accounts_OAuth_Facebook_secret": "Facebook Secret",
+  "Accounts_OAuth_Github": "OAuth aktivert",
+  "Accounts_OAuth_Github_callback_url": "Github tilbakeringingsadresse",
+  "Accounts_OAuth_GitHub_Enterprise": "OAuth aktivert",
+  "Accounts_OAuth_GitHub_Enterprise_callback_url": "GitHub Enterprise Tilbakeringingsadresse",
+  "Accounts_OAuth_GitHub_Enterprise_id": "Klient-ID",
+  "Accounts_OAuth_GitHub_Enterprise_secret": "Klientshemmelighet",
+  "Accounts_OAuth_Github_id": "Klient-ID",
+  "Accounts_OAuth_Github_secret": "Klientshemmelighet",
+  "Accounts_OAuth_Gitlab": "OAuth aktivert",
+  "Accounts_OAuth_Gitlab_callback_url": "GitLab tilbakeringingsadresse",
+  "Accounts_OAuth_Gitlab_id": "GitLab ID",
+  "Accounts_OAuth_Gitlab_identity_path": "Identitetsvei",
+  "Accounts_OAuth_Gitlab_merge_users": "Slå sammen brukere",
+  "Accounts_OAuth_Gitlab_secret": "Klientshemmelighet",
+  "Accounts_OAuth_Google": "Google-innlogging",
+  "Accounts_OAuth_Google_callback_url": "Google tilbakeringingsadresse",
+  "Accounts_OAuth_Google_id": "Google ID",
+  "Accounts_OAuth_Google_secret": "Google Hemmelig",
+  "Accounts_OAuth_Linkedin": "LinkedIn Login",
+  "Accounts_OAuth_Linkedin_callback_url": "Linkedin Tilbakeringingsadresse",
+  "Accounts_OAuth_Linkedin_id": "LinkedIn Id",
+  "Accounts_OAuth_Linkedin_secret": "LinkedIn Secret",
+  "Accounts_OAuth_Meteor": "Meteor Logg inn",
+  "Accounts_OAuth_Meteor_callback_url": "Meteor Tilbakeringingsadresse",
+  "Accounts_OAuth_Meteor_id": "Meteor ID",
+  "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Nextcloud": "OAuth aktivert",
+  "Accounts_OAuth_Nextcloud_callback_url": "Callback-URL for Nextcloud",
+  "Accounts_OAuth_Nextcloud_id": "Nextcloud Id",
+  "Accounts_OAuth_Nextcloud_secret": "Klientshemmelighet",
+  "Accounts_OAuth_Nextcloud_URL": "URL til Nextcloud server",
+  "Accounts_OAuth_Proxy_host": "Proxy-vert",
+  "Accounts_OAuth_Proxy_services": "Proxy-tjenester",
+  "Accounts_OAuth_Tokenpass": "Tokenpass Login",
+  "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass Tilbakeringingsadresse",
+  "Accounts_OAuth_Tokenpass_id": "Tokenpass ID",
+  "Accounts_OAuth_Tokenpass_secret": "Tokenpass Secret",
+  "Accounts_OAuth_Twitter": "Twitter Logg inn",
+  "Accounts_OAuth_Twitter_callback_url": "Twitter tilbakeringingsadresse",
+  "Accounts_OAuth_Twitter_id": "Twitter ID",
+  "Accounts_OAuth_Twitter_secret": "Twitter Secret",
+  "Accounts_OAuth_Wordpress": "WordPress Login",
+  "Accounts_OAuth_Wordpress_authorize_path": "Godkjenn sti",
+  "Accounts_OAuth_Wordpress_callback_url": "WordPress Tilbakeringingsadresse",
+  "Accounts_OAuth_Wordpress_id": "WordPress ID",
+  "Accounts_OAuth_Wordpress_identity_path": "Identitetsvei",
+  "Accounts_OAuth_Wordpress_identity_token_sent_via": "Identitets Token Sendt Via",
+  "Accounts_OAuth_Wordpress_scope": "omfang",
+  "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
+  "Accounts_OAuth_Wordpress_server_type_custom": "Tilpasset",
+  "Accounts_OAuth_Wordpress_server_type_wordpress_com": "Wordpress.com",
+  "Accounts_OAuth_Wordpress_server_type_wp_oauth_server": "WP OAuth Server Plugin",
+  "Accounts_OAuth_Wordpress_token_path": "Tokenbane",
+  "Accounts_Password_Policy_AtLeastOneLowercase": "I minst en liten bokstav",
+  "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Forstå at et passord inneholder minst en liten bokstav.",
+  "Accounts_Password_Policy_AtLeastOneNumber": "Ved minst ett nummer",
+  "Accounts_Password_Policy_AtLeastOneNumber_Description": "Forstå at et passord inneholder minst ett talltegn.",
+  "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "På minst ett symbol",
+  "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Forstå at et passord inneholder minst ett spesialtegn.",
+  "Accounts_Password_Policy_AtLeastOneUppercase": "Minst en stor bokstav",
+  "Accounts_Password_Policy_AtLeastOneUppercase_Description": "Forstå at et passord inneholder minst en liten bokstav.",
+  "Accounts_Password_Policy_Enabled": "Aktiver passordspolicy",
+  "Accounts_Password_Policy_Enabled_Description": "Når aktivert, må brukerpassordene overholde retningslinjene som er angitt. Merk: Dette gjelder bare nye passord, ikke eksisterende passord.",
+  "Accounts_Password_Policy_ForbidRepeatingCharacters": "Forby Repeterende Tegn",
+  "Accounts_Password_Policy_ForbidRepeatingCharacters_Description": "Sikrer at passord ikke inneholder samme karakter som gjentas ved siden av hverandre.",
+  "Accounts_Password_Policy_ForbidRepeatingCharactersCount": "Maks antall gjentatte tegn",
+  "Accounts_Password_Policy_ForbidRepeatingCharactersCount_Description": "Antall ganger et tegn kan gjentas før det ikke er tillatt.",
+  "Accounts_Password_Policy_MaxLength": "Maksimal lengde",
+  "Accounts_Password_Policy_MaxLength_Description": "Sikrer at passord ikke har mer enn denne mengden tegn. Bruk `-1` for å deaktivere.",
+  "Accounts_Password_Policy_MinLength": "Minimum lengde",
+  "Accounts_Password_Policy_MinLength_Description": "Sikrer at passord må ha minst denne mengden karakterer. Bruk `-1` for å deaktivere.",
+  "Accounts_PasswordReset": "Reset passord",
+  "Accounts_Registration_AuthenticationServices_Default_Roles": "Standardroller for godkjenningstjenester",
+  "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Standardroller (kommaseparerte) brukere vil bli gitt når de registreres via autentiseringstjenester",
+  "Accounts_Registration_AuthenticationServices_Enabled": "Registrering med godkjenningstjenester",
+  "Accounts_Registration_Users_Default_Roles": "Standard roller for brukere",
+  "Accounts_Registration_Users_Default_Roles_Description": "Standardroller (kommaseparert) brukere vil bli gitt ved registrering gjennom manuell registrering (inkludert via API)",
+  "Accounts_Registration_Users_Default_Roles_Enabled": "Aktiver standardroller for manuell registrering",
+  "Accounts_Registration_InviteUrlType": "Type invitasjonslenke",
+  "Accounts_Registration_InviteUrlType_Direct": "Direkte",
+  "Accounts_Registration_InviteUrlType_Proxy": "Proxy",
+  "Accounts_RegistrationForm": "Registreringsskjema",
+  "Accounts_RegistrationForm_Disabled": "Deaktivert",
+  "Accounts_RegistrationForm_LinkReplacementText": "Registreringsskjema Link Replacement Text",
+  "Accounts_RegistrationForm_Public": "Offentlig",
+  "Accounts_RegistrationForm_Secret_URL": "Hemmelig URL",
+  "Accounts_RegistrationForm_SecretURL": "Registreringsskjema Hemmelig URL",
+  "Accounts_RegistrationForm_SecretURL_Description": "Du må oppgi en tilfeldig streng som vil bli lagt til din registreringsadresse. Eksempel: `https://open.rocket.chat/register/[secret_hash]`",
+  "Accounts_RequireNameForSignUp": "Krever navn for registrering",
+  "Accounts_RequirePasswordConfirmation": "Kreve passordbekreftelse",
+  "Accounts_RoomAvatarExternalProviderUrl": "Room Avatar ekstern tilbyder URL",
+  "Accounts_RoomAvatarExternalProviderUrl_Description": "Eksempel: `https://acme.com/api/v1/{roomId}`",
+  "Accounts_SearchFields": "Felt som skal vurderes i søk",
+  "Accounts_Send_Email_When_Activating": "Send e-post til brukeren når brukeren blir aktivert",
+  "Accounts_Send_Email_When_Deactivating": "Send e-post til brukeren når brukeren blir deaktivert",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified": "Sett epostadresser for eksterne kontoer som bekreftet",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified_Description": "Kontoer opprettet fra eksterne tjenester, som LDAP, OAuth, osv., vil få epostadressene verifisert automatisk",
+  "Accounts_SetDefaultAvatar": "Angi Standard Avatar",
+  "Accounts_SetDefaultAvatar_Description": "Trenger å bestemme standard avatar basert på OAuth-konto eller Gravatar",
+  "Accounts_ShowFormLogin": "Vis skjemabasert pålogging",
+  "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "Aktiver tofaktorautentisering via TOTP",
+  "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "Brukere kan konfigurere sin tofaktorautentisering ved å bruke en hvilken som helst TOTP-app, som Google Authenticator eller Authy.",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Automatisk aktiver tofaktor via e-post for nye brukere",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "Nye brukere vil ha tofaktorautentisering via e-post aktivert som standard. De vil kunne deaktivere det på profilsiden.",
+  "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Tid i sekunder før koden sendt i e-post utløper",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled": "Aktiver tofaktorautentisering via e-post",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled_Description": "Brukere med bekreftet epostadresse og alternativet aktivert på profilsiden deres vil motta en e-post med en midlertidig kode for å autorisere visse handlinger som innlogging, lagring av profilen, etc.",
+  "Accounts_TwoFactorAuthentication_Enabled": "Aktiver to faktorautentiseringer",
+  "Accounts_TwoFactorAuthentication_Enabled_Description": "Brukere kan konfigurere tofaktorautentisering ved å bruke hvilken som helst TOTP-app, for eksempel Google Authenticator eller Authy",
+  "Accounts_TwoFactorAuthentication_Enforce_Password_Fallback": "Håndhev passordreservering",
+  "Accounts_TwoFactorAuthentication_Enforce_Password_Fallback_Description": "Brukere vil bli pålagt å skrive inn passordet sitt, for viktige handlinger, hvis ingen annen tofaktorautentiseringsmetode er aktivert for den brukeren og et passord er satt for vedkommende.",
+  "Accounts_TwoFactorAuthentication_MaxDelta": "Maksimal Delta",
+  "Accounts_TwoFactorAuthentication_MaxDelta_Description": "Maksimum Delta bestemmer hvor mange tokens er gyldige til enhver tid. Tokene genereres hvert 30. sekund, og gjelder for (30 * Maks. Delta) sekunder.  \nEksempel: Med et maksimalt Delta-sett på 10, kan hver token brukes opptil 300 sekunder før eller etter tidsstempel. Dette er nyttig når klientens klokke ikke er riktig synkronisert med serveren.",
+  "Accounts_TwoFactorAuthentication_RememberFor": "Husk tofaktor i (sekunder)",
+  "Accounts_TwoFactorAuthentication_RememberFor_Description": "Ikke be om ny tofaktorautorisasjonskode hvis en allerede har blitt gitt før på dette tidsintervallet.",
+  "Accounts_TwoFactorAuthentication_Max_Invalid_Email_Code_Attempts": "Maks antall ugyldig engangskoder fra e-post tillatt",
+  "Accounts_TwoFactorAuthentication_Max_Invalid_Email_Code_Attempts_Description": "Systemet tillater et maksimalt antall ugyldige engangskoder fra e-post, hvoretter en ny kode automatisk genereres. Vi anbefaler på det sterkeste å bruke denne innstillingen sammen med 'Blokkér mislykkede påloggingsforsøk etter brukernavn'.",
+  "Accounts_UseDefaultBlockedDomainsList": "Bruk standard blokkert domener liste",
+  "Accounts_UseDNSDomainCheck": "Bruk DNS Domain Check",
+  "API_EmbedDisabledFor": "Deaktiver embed for brukere",
+  "Accounts_UserAddedEmail_Default": "<h1>Velkommen til <strong>[Site_Name]</strong></h1><p>Gå til <a href=\"[Site_URL]\">site_url]</a> og prøve det beste åpen kildekode chat-løsning tilgjengelig i dag!</p><p>Du kan logge inn ved hjelp av e-postadressen din: [email] og passord: [passord]. Det kan hende du må endre det etter første innlogging.",
+  "Accounts_UserAddedEmail_Description": "Du kan bruke følgende plassholdere:  \n - [navn], [fname], [lname] for brukerens fulle navn, fornavn eller etternavn.  \n - `[email]` for brukerens e-postadresse.  \n - [passord] for brukerens passord.  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen. ",
+  "API_EmbedDisabledFor_Description": "Kommaseparert liste over brukernavn for å deaktivere forhåndsvisning av embedded link.",
+  "Accounts_UserAddedEmailSubject_Default": "Du har blitt lagt til i [Site_Name]",
+  "Accounts_Verify_Email_For_External_Accounts": "Merk e-post for eksterne kontoer som bekreftet",
+  "Action": "Handling",
+  "Action_required": "Handling kreves",
+  "Action_Available_After_Custom_Content_Added": "Denne handlingen blir tilgjengelig etter at det tilpassede innholdet er lagt til",
+  "Action_Available_After_Custom_Content_Added_And_Visible": "Denne handlingen blir tilgjengelig etter at det tilpassede innholdet er lagt til og gjort synlig for alle",
+  "Activate": "Aktiver",
+  "Active": "Aktiv",
+  "Active_users": "Aktive brukere",
+  "Activity": "Aktivitet",
+  "Add": "Legg til",
+  "Add_a_Message": "Legg til en melding",
+  "Add_agent": "Legg til agent",
+  "Add_custom_oauth": "Legg til egendefinert oauth",
+  "Add_Domain": "Legg til domene",
+  "Add_emoji": "Legg til emoji",
+  "Add_files_from": "Legg til filer fra",
+  "Add_manager": "Legg til leder",
+  "Add_monitor": "Legg til monitor",
+  "Add_Reaction": "Legg til reaksjon",
+  "Add_Role": "Legg til rolle",
+  "Add_Sender_To_ReplyTo": "Legg til avsender til svar-til",
+  "Add_Server": "Legg til server",
+  "Add_URL": "Legg til URL",
+  "Add_user": "Legg til bruker",
+  "Add_User": "Legg til bruker",
+  "Add_users": "Legg til brukere",
+  "Add_members": "Legg til medlemmer",
+  "add-all-to-room": "Legg til alle brukere i et rom",
+  "add-all-to-room_description": "Tillatelse til å legge til alle brukere i et rom",
+  "add-livechat-department-agents": "Legg til omnikanalagenter til avdelinger",
+  "add-livechat-department-agents_description": "Tillatelse til å legge til omnikanalagenter til avdelinger",
+  "add-oauth-service": "Legg til Oauth Service",
+  "add-oauth-service_description": "Tillatelse til å legge til en ny Oauth-tjeneste",
+  "bypass-time-limit-edit-and-delete": "Omgå tidsbegrensning",
+  "bypass-time-limit-edit-and-delete_description": "Tillatelse til å omgå tidsgrense for redigering og sletting av meldinger",
+  "add-team-channel": "Legg til Team Channel",
+  "add-team-channel_description": "Tillatelse til å legge til en kanal i et team",
+  "add-team-member": "Legg til et teammedlem",
+  "add-team-member_description": "Tillatelse til å legge til medlemmer i et team",
+  "Add_them": "Legg dem til",
+  "add-user": "Legg til bruker",
+  "add-user_description": "Tillatelse til å legge til nye brukere på serveren via brukerskjermbildet",
+  "add-user-to-any-c-room": "Legg til bruker til hvilken som helst offentlig kanal",
+  "add-user-to-any-c-room_description": "Tillatelse til å legge til en bruker i en hvilken som helst offentlig kanal",
+  "add-user-to-any-p-room": "Legg til bruker til hvilken som helst privat kanal",
+  "add-user-to-any-p-room_description": "Tillatelse til å legge til en bruker til enhver privat kanal",
+  "add-user-to-joined-room": "Legg til bruker til noen tilknyttet kanal",
+  "add-user-to-joined-room_description": "Tillatelse til å legge til en bruker i en tilkoblet kanal",
+  "added__roomName__to_team": "<strong>lagt til</strong> #{{roomName}} i dette teamet",
+  "Added__username__to_team": "<strong>lagt til</strong> @{{user_added}} til dette teamet",
+  "added__roomName__to_this_team": "la #{{roomName}} til dette teamet",
+  "Apps_Framework_enabled": "Aktiver App Framework",
+  "Added__username__to_this_team": "la til @{{user_added}} til dette teamet",
+  "Adding_OAuth_Services": "Legge til OAuth-tjenester",
+  "Adding_permission": "Legger til rettigheter",
+  "Adjustable_layout": "Justerbart oppsett",
+  "Adding_user": "Legger til bruker",
+  "Additional_emails": "Ekstra e-postadresser",
+  "Additional_Feedback": "Ekstra tilbakemelding",
+  "additional_integrations_Bots": "Hvis du leter etter hvordan du integrerer din egen bot, så se ikke lenger enn vår Hubot-adapter. <a href='https://github.com/RocketChat/hubot-rocketchat' target='_blank'>https://github.com/RocketChat/hubot-rocketchat</a>",
+  "Admin_disabled_encryption": "Din administrator har ikke aktivert ende-til-ende kryptering.",
+  "Admin_Info": "Admin Info",
+  "admin-no-active-video-conf-provider": "**Konferansesamtale ikke aktivert**: Konfigurer konferansesamtaler for å gjøre det tilgjengelig på dette arbeidsområdet.",
+  "admin-video-conf-provider-not-configured": "**Konferansesamtale ikke aktivert**: Konfigurer konferansesamtaler for å gjøre det tilgjengelig på dette arbeidsområdet.",
+  "admin-no-videoconf-provider-app": "**Konferansesamtale ikke aktivert**: Konferansesamtaler-apper er tilgjengelige på Rocket.Chat-markedet.",
+  "Administration": "Administrasjon",
+  "Address": "Adresse",
+  "Adjustable_font_size": "Justerbar skriftstørrelse",
+  "Adjustable_font_size_description": "Designet for de som foretrekker større eller mindre tekst for bedre lesbarhet. Denne fleksibiliteten fremmer inkludering ved å gi brukerne mulighet til å skreddersy brukergrensesnittet til deres spesifikke behov.",
+  "Adult_images_are_not_allowed": "Voksenbilder er ikke tillatt",
+  "Aerospace_and_Defense": "Luftfart og forsvar",
+  "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "Etter OAuth2-godkjenning, blir brukerne omdirigert til denne nettadressen",
+  "After_guest_registration": "Etter gjesteregistrering",
+  "Agent": "Agent",
+  "Agent_added": "Lagt til agent",
+  "Agent_Info": "Agentinfo",
+  "Agent_messages": "Agentbeskjed",
+  "Agent_Name": "Agentnavn",
+  "Agent_Name_Placeholder": "Vennligst skriv inn et agentnavn...",
+  "Agent_removed": "Fjernet agent",
+  "Agent_deactivated": "Agenten ble deaktivert",
+  "Agent_Without_Extensions": "Agent uten utvidelser",
+  "Agents": "Agenter",
+  "Agree": "Godta",
+  "Alerts": "varsler",
+  "Alias": "Alias",
+  "Alias_Format": "Aliasformat",
+  "Alias_Format_Description": "Importer meldinger fra Slack med et alias; %s er erstattet av brukernavnet til brukeren. Hvis tom, vil ikke noe alias bli brukt.",
+  "Alias_Set": "Alias ​​Set",
+  "AutoLinker_Email": "AutoLinker Email",
+  "Aliases": "Kallenavn",
+  "AutoLinker_Phone": "AutoLinker-telefon",
+  "AutoLinker_Phone_Description": "Automatisk koblet til telefonnumre. f.eks `(123) 456-7890`",
+  "All": "Alle",
+  "AutoLinker_StripPrefix": "AutoLinker Strip Prefix",
+  "All_Apps": "Alle apper",
+  "AutoLinker_StripPrefix_Description": "Kortvisning. f.eks https://rocket.chat => rocket.chat",
+  "All_added_tokens_will_be_required_by_the_user": "Alle tilsatte tokens vil bli pålagt av brukeren",
+  "All_categories": "Alle Kategorier",
+  "AutoLinker_Urls_Scheme": "AutoLinker Scheme: // URLs",
+  "All_channels": "Alle kanaler",
+  "AutoLinker_Urls_TLD": "AutoLinker TLD URLs",
+  "All_closed_chats_have_been_removed": "Alle lukkede chatter har blitt fjernet",
+  "AutoLinker_Urls_www": "AutoLinker 'www' URLs",
+  "All_logs": "Aller logger",
+  "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
+  "All_messages": "Alle meldinger",
+  "All_Prices": "Alle priser",
+  "All_status": "Alle statuser",
+  "All_users": "Alle brukere",
+  "All_users_in_the_channel_can_write_new_messages": "Alle brukere i kanalen kan skrive nye meldinger",
+  "Allow_collect_and_store_HTTP_header_informations": "Tillat å samle inn og lagre informasjon om HTTP headere.",
+  "Allow_collect_and_store_HTTP_header_informations_description": "Denne innstillingen bestemmer om Livechat har lov til å lagre informasjon samlet inn fra HTTP-header-data, for eksempel IP-adresse, User-Agent, og så videre.",
+  "Allow_Invalid_SelfSigned_Certs": "Tillat ugyldige selvsignerte sertifikater",
+  "Allow_Invalid_SelfSigned_Certs_Description": "Tillat ugyldig og selvsignert SSL-sertifikat for koblingsvalidering og forhåndsvisninger.",
+  "Allow_Marketing_Emails": "Tillat markedsføring e-post",
+  "Allow_Online_Agents_Outside_Business_Hours": "Tillat nettagenter utenom åpningstidene",
+  "Allow_Online_Agents_Outside_Office_Hours": "Tillat nettagenter utenom kontortiden",
+  "Allow_Save_Media_to_Gallery": "Tillat Lagre media til Galleri",
+  "Allow_switching_departments": "Tillat besøkende å bytte avdelinger",
+  "Almost_done": "Nesten ferdig",
+  "Alphabetical": "Alfabetisk",
+  "bold": "fet",
+  "Also_send_thread_message_to_channel_behavior": "Send også trådmelding til kanaladferd",
+  "Also_send_to_channel": "Send også til kanal",
+  "Always_open_in_new_window": "Alltid åpne i nytt vindu",
+  "Always_show_thread_replies_in_main_channel": "Vis alltid trådsvar i hovedkanalen",
+  "Analytic_reports": "Analyse rapporter",
+  "Analytics": "Analytics",
+  "Analytics_Description": "Se hvordan brukere samhandler med arbeidsområdet ditt.",
+  "Analytics_features_enabled": "Funksjoner aktivert",
+  "Analytics_features_messages_Description": "Sporer tilpassede hendelser relatert til handlinger en bruker gjør på meldinger.",
+  "Analytics_features_rooms_Description": "Sporer tilpassede hendelser relatert til handlinger på en kanal eller gruppe (opprett, forlatt, slett).",
+  "Analytics_features_users_Description": "Sporer tilpassede hendelser relatert til handlinger relatert til brukere (passord tilbakestilt ganger, profil bilde endring, etc).",
+  "Analytics_Google": "Google Analytics",
+  "Analytics_Google_id": "Sporings-ID",
+  "Analytics_page_briefing_first_paragraph": "Rocket.Chat samler inn anonyme brukserdata, som tjeneste. og tidsbruk, for å forbedre produktet for alle.",
+  "Analytics_page_briefing_second_paragraph": "Vi beskytter ditt personvern ved å aldri samle inn personlige eller sensitive data. Denne delen viser hva som samles inn, og tydeliggjør vår forpliktelse til åpenhet og tillit.",
+  "Analyze_practical_usage": "Analysere praktisk bruksstatistikk om brukere, meldinger og kanaler",
+  "and": "og",
+  "And_more": "Og {{length}} mer",
+  "Animals_and_Nature": "Dyr og natur",
+  "Announcement": "Kunngjøring",
+  "Anonymous": "Anonym",
+  "Answer_call": "Svar anrop",
+  "API": "API",
+  "API_Add_Personal_Access_Token": "Legg til ny personlig Access Token",
+  "API_Allow_Infinite_Count": "Tillat å få alt",
+  "API_Allow_Infinite_Count_Description": "Bør samtaler til REST API få lov til å returnere alt i en samtale?",
+  "API_Analytics": "Analytics",
+  "API_CORS_Origin": "CORS Origin",
+  "API_Apply_permission_view-outside-room_on_users-list": "Tildel tillatelsen `view-outside-room` til api `users.list`",
+  "API_Default_Count": "Standard Count",
+  "API_Default_Count_Description": "Standardtallet for REST API-resultater oppstår hvis forbrukeren ikke oppgav noen.",
+  "API_Drupal_URL": "Drupal Server URL",
+  "API_Drupal_URL_Description": "Eksempel: `https://domain.com` (unntatt trailing slash)",
+  "API_Embed": "Legge til Link-forhåndsvisninger",
+  "API_Embed_Description": "Om en forhåndsvisning av embedded link er aktivert eller ikke, når en bruker legger inn en link til et nettsted.",
+  "API_EmbedIgnoredHosts": "Integrer ignorerte verter",
+  "API_EmbedIgnoredHosts_Description": "Kommaseparert liste over verter eller CIDR-adresser, f.eks. localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16",
+  "API_EmbedSafePorts": "Safe Ports",
+  "API_EmbedSafePorts_Description": "Kommaseparert liste over porter tillatt for forhåndsvisning.",
+  "API_Embed_UserAgent": "Legge inn forespørsel brukeragent",
+  "API_EmbedCacheExpirationDays": "Embed Cache Expiration Days",
+  "API_Enable_CORS": "Aktiver CORS",
+  "API_Enable_Direct_Message_History_EndPoint": "Aktiver sluttpunkt for direkte meldingshistorikk",
+  "API_Enable_Direct_Message_History_EndPoint_Description": "Dette gjør det mulig for `/ api / v1 / im.messages.others` som lar visning av direkte meldinger sendt av andre brukere som den som ringer ikke er en del av.",
+  "API_Enable_Personal_Access_Tokens": "Aktiver personlige adgangstokener til REST APIet",
+  "API_Enable_Personal_Access_Tokens_Description": "Aktiver personlige adgangstokener for bruk med REST APIet",
+  "API_Enable_Rate_Limiter": "Aktiver Rate Limit",
+  "API_Enable_Rate_Limiter_Dev": "Aktiver Rate Limit i utvikling",
+  "API_Enable_Rate_Limiter_Dev_Description": "Bør begrense antallet kall til endepunktene i utviklingsmiljøet?",
+  "API_Enable_Rate_Limiter_Limit_Calls_Default": "Standard antall kall til rate-limiter",
+  "API_Enable_Rate_Limiter_Limit_Calls_Default_Description": "Tillatt antall kall innenfor hvert tidsrom for hvert endepunkt i REST API-et.",
+  "API_Enable_Rate_Limiter_Limit_Time_Default": "Standard tidsgrense for rate-limiter (i ms)",
+  "API_Enable_Rate_Limiter_Limit_Time_Default_Description": "Standard tidsavbrudd for å begrense antall kall til hvert endepunkt i REST APIet (i ms)",
+  "API_Enable_Shields": "Aktiver skjold",
+  "API_Enable_Shields_Description": "Aktiver skjold som er tilgjengelige på `/ api / v1 / shield.svg`",
+  "API_GitHub_Enterprise_URL": "Server URL",
+  "API_GitHub_Enterprise_URL_Description": "Eksempel: `https://domain.com` (unntatt trailing slash)",
+  "API_Gitlab_URL": "GitLab URL",
+  "API_Personal_Access_Token_Generated": "Personlig Access Token generert",
+  "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "Pass på å lagre tokenet ditt på et sikkert sted, da du ikke kan hente den ut igjen senere. <br/> Token: <strong>{{token}}</strong> <br/> Din bruker-ID: <strong>{{userId}}</strong>",
+  "API_Personal_Access_Token_Name": "Navn på personlig Access Token",
+  "API_Personal_Access_Tokens_Regenerate_It": "Generer ny token",
+  "API_Personal_Access_Tokens_Regenerate_Modal": "Hvis du har mistet eller glemt tokenet ditt kan du regenerere det, men husk at alle applikasjoner som bruker dette tokenet må oppdateres",
+  "API_Personal_Access_Tokens_Remove_Modal": "Er du sikker på at du vil fjerne denne access-tokenen?",
+  "API_Personal_Access_Tokens_To_REST_API": "Personlig access token til REST API",
+  "API_Rate_Limiter": "API-kallfrekvensbegrensing ",
+  "API_Shield_Types": "Skjoldtyper",
+  "API_Shield_Types_Description": "Typer skjold for å aktivere som en kommaseparert liste, velg fra `online`,` kanal` eller `*` for alle",
+  "Apps_Framework_Development_Mode": "Aktiver utviklermodus",
+  "API_Token": "API Token",
+  "Apps_Framework_Development_Mode_Description": "Utviklingsmodus tillater installasjon av apper som ikke er fra Rocket.Chats markedsplass.",
+  "API_Tokenpass_URL": "Tokenpass Server URL",
+  "API_Tokenpass_URL_Description": "Eksempel: `https://domain.com` (unntatt trailing slash)",
+  "API_Upper_Count_Limit": "Maks. Rekordbeløp",
+  "API_Upper_Count_Limit_Description": "Hva er det maksimale antall poster som REST API skal returnere (når det ikke er ubegrenset)?",
+  "API_Use_REST_For_DDP_Calls": "Bruk REST i stedet for websocket for Meteor-kall",
+  "API_User_Limit": "Brukergrense for å legge til alle brukere til kanal",
+  "API_Wordpress_URL": "WordPress URL",
+  "api-bypass-rate-limit": "Forbigå rate-limit for REST API",
+  "api-bypass-rate-limit_description": "Tillatelse til å kalle APIet uten kallfrekvensbegrensning ",
+  "Apiai_Key": "Api.ai Key",
+  "Apiai_Language": "Api.ai Språk",
+  "APIs": "APIer",
+  "App_author_homepage": "forfatter hjemmeside",
+  "App_Details": "Appdetaljer",
+  "App_Info": "App info",
+  "App_Information": "App Informasjon",
+  "Apps_context_enterprise": "Enterprise",
+  "App_Installation": "App installasjon",
+  "App_not_enabled": "App ikke aktivert",
+  "App_not_found": "App ikke funnet",
+  "App_status_auto_enabled": "aktivert",
+  "App_status_constructed": "konstruert",
+  "App_status_disabled": "Funksjonshemmet",
+  "App_status_error_disabled": "Deaktivert: Uncaught Error",
+  "App_status_initialized": "initialisert",
+  "App_status_invalid_license_disabled": "Deaktivert: Ugyldig lisens",
+  "Apps_disabled_when_Enterprise_trial_ended": "Apper deaktivert da Enterprise-prøveperioden ble avsluttet",
+  "App_status_invalid_settings_disabled": "Deaktivert: Konfigurasjon er nødvendig",
+  "App_status_manually_disabled": "Deaktivert: manuelt",
+  "App_status_manually_enabled": "aktivert",
+  "App_status_unknown": "Unknown",
+  "App_Store": "App Store",
+  "App_support_url": "støtte url",
+  "App_Url_to_Install_From": "Installer fra URL",
+  "App_Url_to_Install_From_File": "Installer fra fil",
+  "App_user_not_allowed_to_login": "Appbrukere har ikke lov til å logge inn direkte.",
+  "Appearance": "Utseende",
+  "Application_added": "Søknad lagt til",
+  "Application_delete_warning": "Du vil ikke kunne gjenopprette denne applikasjonen!",
+  "Application_Name": "Programnavn",
+  "Application_updated": "Søknad oppdatert",
+  "Apply": "Søke om",
+  "Apply_and_refresh_all_clients": "Påfør og oppdater alle klienter",
+  "Apps": "Apps",
+  "Apps_context_explore": "Utforske",
+  "Apps_context_installed": "Installert",
+  "Apps_context_requested": "Forespurt",
+  "Apps_context_private": "Private apper",
+  "Apps_context_premium": "Premium",
+  "Apps_Count_Enabled_one": "{{count}} app aktivert",
+  "Apps_Count_Enabled_other": "{{count}} apper aktivert",
+  "Private_Apps_Count_Enabled_one": "{{count}} privat app aktivert",
+  "Private_Apps_Count_Enabled_other": "{{count}} private apper aktivert",
+  "Apps_Count_Enabled_tooltip": "Community-arbeidsområder kan aktivere opptil {{number}} {{context}} apper",
+  "Apps_disabled_when_Premium_trial_ended": "Apper som ble deaktivert da Premium-prøveperioden avsluttet",
+  "Apps_disabled_when_Premium_trial_ended_description": "Community-arbeidsområder kan ha opptil 5 markedsplassapper og 3 private apper aktivert. Be arbeidsområdeadministratoren din om å reaktivere apper.",
+  "Apps_disabled_when_Premium_trial_ended_description_admin": "Community-arbeidsområder kan ha opptil 5 markedsplassapper og 3 private apper aktivert. Aktiver appene du trenger på nytt.",
+  "Apps_Engine_Version": "Versjon av Apps Engine",
+  "Apps_Error_private_app_install_disabled": "Installasjon og oppdateringer av private apper er deaktivert for dette arbeidsområdet",
+  "Apps_Essential_Alert": "Denne appen er viktig for følgende hendelser:",
+  "Apps_Framework_Source_Package_Storage_Type_Description": "Velg hvor alle appenes kildekode skal lagres. Apper kan ha flere megabyte i størrelse hver.",
+  "Apps_Framework_Source_Package_Storage_Type_Alert": "Hvis du endrer hvor appene er lagret, kan det føre til ustabilitet i apper som allerede er installert",
+  "Apps_Framework_Source_Package_Storage_FileSystem_Path": "Katalog for lagring av app-kildepakke",
+  "Apps_Framework_Source_Package_Storage_FileSystem_Alert": "Sørg for at den valgte katalogen eksisterer og at Rocket.Chat har tilgang til den (f.eks. tillatelse til å lese/skrive)",
+  "Apps_Game_Center": "Spillsenter",
+  "Apps_Game_Center_Back": "Tilbake til spillsenteret",
+  "Apps_Game_Center_Invite_Friends": "Inviter vennene dine til å bli med",
+  "Apps_Game_Center_Play_Game_Together": "@here La oss spille {{name}} sammen!",
+  "Apps_Interface_IPostExternalComponentClosed": "Hendelse som skjer etter at en ekstern komponent er lukket",
+  "Apps_Interface_IPostExternalComponentOpened": "Hendelse som skjer etter at en ekstern komponent er åpnet",
+  "Apps_Interface_IPostMessageDeleted": "Hendelse som skjer etter at en melding er slettet",
+  "Apps_Interface_IPostMessageSent": "Hendelse som skjer etter at en melding er sendt",
+  "Apps_Interface_IPostMessageUpdated": "Hendelse som skjer etter at en melding er oppdatert",
+  "Apps_Interface_IPostRoomCreate": "Hendelse som skjer etter at et rom er opprettet",
+  "Apps_Interface_IPostRoomDeleted": "Hendelse som skjer etter at et rom er slettet",
+  "Apps_Interface_IPostRoomUserJoined": "Hendelse som skjer etter at en bruker blir med i et rom (privat gruppe, offentlig kanal)",
+  "Apps_Interface_IPreMessageDeletePrevent": "Hendelse som skjer før en melding slettes",
+  "Apps_Interface_IPreMessageSentExtend": "Hendelse som skjer før en melding sendes",
+  "Apps_Interface_IPreMessageSentModify": "Hendelse som skjer før en melding sendes",
+  "Apps_Interface_IPreMessageSentPrevent": "Hendelse som skjer før en melding sendes",
+  "Apps_License_Message_maxSeats": "Lisensen tar ikke imot gjeldende antall aktive brukere. Vennligst øk antall seter",
+  "Apps_License_Message_publicKey": "Det har oppstått en feil under dekryptering av lisensen. Synkroniser arbeidsområdet ditt i Connectivity Service og prøv på nytt",
+  "Apps_License_Message_renewal": "Lisensen er utløpt og må fornyes",
+  "Apps_Logs_TTL": "Antall dager å lagre logger fra apper",
+  "Apps_Logs_TTL_7days": "syv dager",
+  "Apps_Logs_TTL_14days": "14 dager",
+  "Apps_Logs_TTL_30days": "30 dager",
+  "Apps_Logs_TTL_Alert": "Avhengig av størrelsen på loggsamlingen, kan endring av denne innstillingen føre til treghet i noen øyeblikk",
+  "Apps_Marketplace_Deactivate_App_Prompt": "Vil du virkelig deaktivere denne appen?",
+  "Apps_Marketplace_Login_Required_Description": "Kjøp av apper fra Rocket.Chat Marketplace krever registrering av arbeidsområdet og innlogging.",
+  "Apps_Marketplace_Login_Required_Title": "Markedsplass-pålogging er påkrevd",
+  "Apps_Marketplace_Modify_App_Subscription": "Endre abonnement",
+  "Apps_Marketplace_pricingPlan_monthly": "{{price}} / måned",
+  "Apps_Marketplace_pricingPlan_monthly_perUser": "{{price}} / måned per bruker",
+  "Apps_Marketplace_pricingPlan_monthly_trialDays": "{{price}} / måned-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_monthly_perUser_trialDays": "{{price}} / måned per bruker-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_+*_monthly": " {{price}}+* / måned",
+  "Apps_Marketplace_pricingPlan_+*_monthly_trialDays": " {{price}}+* / måned-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_+*_monthly_perUser": " {{price}}+* / måned per bruker",
+  "Apps_Marketplace_pricingPlan_+*_monthly_perUser_trialDays": " {{price}}+* / måned per bruker-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_+*_yearly": " {{price}}+* / år",
+  "Apps_Marketplace_pricingPlan_+*_yearly_trialDays": " {{price}}+* / år-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_+*_yearly_perUser": " {{price}}+* / år per bruker",
+  "Apps_Marketplace_pricingPlan_+*_yearly_perUser_trialDays": " {{price}}+* / år per bruker-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_yearly_trialDays": "{{price}} / år-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_pricingPlan_yearly_perUser_trialDays": "{{price}} / år per bruker-{{trialDays}}-dagers prøveperiode",
+  "Apps_Marketplace_Uninstall_App_Prompt": "Er du sikker på at du vil avinstallere denne appen?",
+  "Apps_Marketplace_Uninstall_Subscribed_App_Anyway": "Avinstaller det uansett",
+  "Apps_Marketplace_Uninstall_Subscribed_App_Prompt": "Denne appen har et aktivt abonnement. Avinstallering av appen vil ikke kansellere abonnementet. Hvis du ønsker å avinstallere appen, må du endre abonnementet ditt før du avinstallerer.",
+  "Apps_Permissions_Review_Modal_Title": "Nødvendige tillatelser",
+  "Apps_Permissions_Review_Modal_Subtitle": "Denne appen vil ha tilgang til følgende tillatelser. Aksepterer du?",
+  "Apps_Permissions_No_Permissions_Required": "Appen trenger ingen ytterligere tillatelser",
+  "Apps_Permissions_user_read": "Tilgang til brukerinformasjon",
+  "Apps_Permissions_user_write": "Endre brukerinformasjon",
+  "Apps_Permissions_upload_read": "Tilgang til filer lastet opp til denne serveren",
+  "Apps_Permissions_upload_write": "Last opp filer til denne serveren",
+  "Apps_Permissions_server-setting_read": "Tilgang til innstillingene på denne serveren",
+  "Apps_Permissions_server-setting_write": "Endre innstillingene på denne serveren",
+  "Apps_Permissions_room_read": "Tilgang til rominformasjon",
+  "Apps_Permissions_room_write": "Opprett og modifiser rom",
+  "Apps_Permissions_message_read": "Tilgang til meldinger",
+  "Apps_Permissions_message_write": "Sende og endre meldinger",
+  "Apps_Permissions_livechat-status_read": "Tilgang til Livechat-statusinformasjon",
+  "Apps_Permissions_livechat-custom-fields_write": "Endre Livechat egendefinert felt-instillinger",
+  "Apps_Permissions_livechat-visitor_read": "Tilgang til Livechat-besøksinformasjon",
+  "Apps_Permissions_livechat-visitor_write": "Endre Livechat-besøksinformasjon",
+  "Apps_Permissions_livechat-message_read": "Tilgang til Livechat-meldingsinformasjon",
+  "Apps_Permissions_livechat-message_write": "Endre Livechat-meldingsinformasjon",
+  "Apps_Permissions_livechat-room_read": "Tilgang til rominformasjon for Livechat",
+  "Apps_Permissions_livechat-room_write": "Endre Livechat rominformasjon",
+  "Apps_Permissions_livechat-department_read": "Tilgang til informasjon om Livechat-avdelingen",
+  "Apps_Permissions_livechat-department_multiple": "Tilgang til informasjon om flere Livechat-avdelinger",
+  "Apps_Permissions_slashcommand": "Registrer nye skråstrekkommandoer",
+  "Apps_Permissions_api": "Registrer nye HTTP-endepunkter",
+  "Apps_Permissions_networking": "Tilgang til dette servernettverket",
+  "Apps_Permissions_ui_interact": "Samhandle med brukergrensesnittet",
+  "Apps_Settings": "Appens innstillinger",
+  "Apps_Manual_Update_Modal_Title": "Denne appen er allerede installert",
+  "Apps_Manual_Update_Modal_Body": "Vil du oppdatere den?",
+  "Apps_User_Already_Exists": "Brukernavnet \"{{username}}\" brukes allerede. Gi nytt navn til eller fjern brukeren som bruker navnet, for å installere denne appen",
+  "AutoLinker": "AutoLinker",
+  "Apps_WhatIsIt": "Apper: Hva er de?",
+  "Apps_WhatIsIt_paragraph1": "Et nytt ikon i administrasjonsområdet! Hva betyr dette og hva er apper?",
+  "Apps_WhatIsIt_paragraph2": "For det første refererer Apper i denne sammenheng ikke til mobilapplikasjonene. Faktisk vil det være best å tenke på dem når det gjelder plugins eller avanserte integrasjoner.",
+  "Apps_WhatIsIt_paragraph3": "For det andre er de dynamiske skript eller pakker som lar deg tilpasse Rocket.Chat-forekomsten din uten å måtte forkaste kodebasen. Men vær oppmerksom på, dette er et nytt funksjonssett, og det kan derfor ikke være 100% stabilt. Også, vi utvikler fortsatt funksjonssettet slik at ikke alt kan tilpasses på dette tidspunktet. For mer informasjon om hvordan du begynner å utvikle en app, gå her for å lese:",
+  "Apps_WhatIsIt_paragraph4": "Men med det sagt, hvis du er interessert i å aktivere denne funksjonen og prøve den ut, klikker du denne knappen for å aktivere Apps-systemet.",
+  "Archive": "Arkiv",
+  "Archived": "arkivert",
+  "archive-room": "Arkiv-rom",
+  "archive-room_description": "Tillatelse til å arkivere en kanal",
+  "are_typing": "skriver",
+  "are_playing": "spiller av",
+  "is_playing": "spiller av",
+  "are_uploading": "laster opp",
+  "are_recording": "tar opp",
+  "is_uploading": "laster opp",
+  "is_recording": "tar opp",
+  "Are_you_sure": "Er du sikker?",
+  "Are_you_sure_delete_department": "Er du sikker på at du vil slette denne avdelingen? Denne handlingen kan ikke reverseres. Skriv inn avdelingsnavnet for å bekrefte.",
+  "Are_you_sure_you_want_to_close_this_chat": "Er du sikker på at du vil lukke denne chatten?",
+  "Are_you_sure_you_want_to_delete_your_account": "Er du sikker på at du vil slette din konto?",
+  "Are_you_sure_you_want_to_disable_Facebook_integration": "Er du sikker på at du vil deaktivere Facebook-integrasjon?",
+  "Are_you_sure_you_want_to_pin_this_message": "Er du sikker på at du vil feste denne meldingen?",
+  "Are_you_sure_you_want_to_reset_the_name_of_all_priorities": "Er du sikker på at du vil tilbakestille navnet på alle prioriteringer?",
+  "Assets_Description": "Tilpass arbeidsområdets logo, ikon, favorittikon og mer.",
+  "Assign_admin": "Tilordne admin",
+  "Assign_new_conversations_to_bot_agent": "Tilordne nye samtaler til robot-agenten",
+  "assign-admin-role": "Tilordne Admin-rolle",
+  "assign-admin-role_description": "Tillatelse til å tilordne administrasjonsrollen til andre brukere",
+  "assign-roles": "Tildel roller",
+  "assign-roles_description": "Tilgang til å tildele roller til andre brukere",
+  "Associate": "Forbinde",
+  "at": "på",
+  "At_least_one_added_token_is_required_by_the_user": "Minst ett tilleggstegn kreves av brukeren",
+  "AtlassianCrowd": "Atlassian Crowd",
+  "AtlassianCrowd_Description": "Integrer Atlassian Crowd.",
+  "Attachment_File_Uploaded": "Filopplastet",
+  "Attribute_handling": "Attributthåndtering",
+  "Audio": "Audio",
+  "Audio_message": "Lydmelding",
+  "Audio_Notification_Value_Description": "Kan være hvilken som helst egendefinert lyd eller standard: bipp, chelle, ding, dråpe, høyttaler, årstider",
+  "Audio_Notifications_Default_Alert": "Lydvarsler Standardvarsel",
+  "Audio_Notifications_Value": "Standard melding melding lyd",
+  "Audio_record": "Lydopptak",
+  "Audit": "Revider",
+  "Auth": "Tilgangsstyring",
+  "Auth_Token": "Auth Token",
+  "Authentication": "Autentisering",
+  "Author": "Forfatter",
+  "Author_Information": "Forfatterinformasjon",
+  "Author_Site": "Forfatterside",
+  "Authorization_URL": "Autorisasjonsadresse",
+  "Authorize": "Autorisere",
+  "Authorize_access_to_your_account": "Gi tilgang til din konto",
+  "Automatic_translation_not_available": "Automatisk oversettelse er ikke tilgjengelig",
+  "Automatic_translation_not_available_info": "Ende-til-ende-kryptering er aktivert for dette rommet, oversettelser fungerer ikke på krypterte meldinger ",
+  "Auto_Load_Images": "Auto Load Images",
+  "Auto_Selection": "Automatisk valg",
+  "Auto_Translate": "Auto-Trans",
+  "Calls_in_queue": "{{calls}} anrop i kø",
+  "auto-translate": "Automatisk Oversett",
+  "auto-translate_description": "Tillatelse til å bruke automatisk oversettelsesverktøy",
+  "Automatic_Translation": "Automatisk oversettelse",
+  "AutoTranslate": "Auto-Trans",
+  "AutoTranslate_APIKey": "API-nøkkel",
+  "AutoTranslate_Change_Language_Description": "Hvis du endrer språk for automatisk oversettelse, oversetter du ikke tidligere meldinger.",
+  "AutoTranslate_DeepL": "DeepL",
+  "AutoTranslate_Disabled_for_room": "Automatisk oversettelse er deaktivert for #{{roomName}}",
+  "AutoTranslate_Enabled": "Aktiver automatisk-translate",
+  "AutoTranslate_Enabled_Description": "Aktivering av automatisk oversettelse gjør at folk med `automatisk oversetter` tillatelse til å få alle meldinger automatisk oversatt til deres valgte språk. Avgifter kan gjelde, se [Googles dokumentasjon](https://cloud.google.com/translate/pricing)",
+  "AutoTranslate_Enabled_for_room": "Automatisk oversettelse er aktivert for #{{roomName}}",
+  "AutoTranslate_AutoEnableOnJoinRoom": "Automatisk oversettelse for ikke-standardspråklige medlemmer",
+  "AutoTranslate_AutoEnableOnJoinRoom_Description": "Dersom aktivert: Når en bruker blir med i et rom med et annet standardspråk enn brukerens språkpreferanse, blir meldinger automatisk oversatt for brukeren. ",
+  "AutoTranslate_Google": "Google",
+  "AutoTranslate_language_set_to": "Automatisk oversettelsesspråk satt til {{language}}",
+  "AutoTranslate_Microsoft": "Microsoft",
+  "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Abonnementsnøkkel",
+  "AutoTranslate_ServiceProvider": "Tjenesteleverandør",
+  "Available": "Tilgjengelig",
+  "Available_agents": "Tilgjengelige agenter",
+  "Available_departments": "Tilgjengelige avdelinger",
+  "Avatar": "Avatar",
+  "Avatars": "Avatarer",
+  "Avatar_changed_successfully": "Avatar ble endret",
+  "Avatar_URL": "Avatar-URL",
+  "Avatar_format_invalid": "Ugyldig format. Kun bildetype er tillatt",
+  "Avatar_url_invalid_or_error": "Den oppgitte nettadressen er ugyldig eller ikke tilgjengelig. Vennligst prøv igjen, men med en annen url.",
+  "Avg_chat_duration": "Gjennomsnittlig chatvarighet",
+  "Avg_first_response_time": "Gjennomsnitt av førstebesvarelsestid",
+  "Avg_of_abandoned_chats": "Gjennomsnitt av forlatte chatter",
+  "Avg_of_available_service_time": "Gjennomsnitt av tjenestens tilgjengelige tid",
+  "Avg_of_chat_duration_time": "Gjennomsnittlig chatvarighetstid",
+  "Avg_of_service_time": "Gjennomsnitt av tjenestetid",
+  "Avg_of_waiting_time": "Gjennomsnitt av ventetid",
+  "Avg_reaction_time": "Gjennomsnitt av reaksjonstid",
+  "Avg_response_time": "Gjennomsnitt av responstid",
+  "away": "borte",
+  "Away": "Borte",
+  "Back": "Tilbake",
+  "Back_to_applications": "Tilbake til programmer",
+  "Back_to_calendar": "Tilbake til kalenderen",
+  "Back_to_chat": "Tilbake til chat",
+  "Back_to_imports": "Tilbake til import",
+  "Back_to_integration_detail": "Tilbake til integrasjonsdetaljene",
+  "Back_to_integrations": "Tilbake til integrasjoner",
+  "Back_to_login": "Tilbake til login",
+  "Back_to_Manage_Apps": "Tilbake til Administrer apper",
+  "Back_to_permissions": "Tilbake til rettigheter",
+  "Back_to_room": "Tilbake til Room",
+  "Back_to_threads": "Tilbake til tråder",
+  "Backup_codes": "Sikkerhetskopieringskoder",
+  "ban-user": "Ban forbruker",
+  "ban-user_description": "Tillatelse til å forby en bruker fra en kanal",
+  "BBB_End_Meeting": "Avslutt møte",
+  "BBB_Enable_Teams": "Aktiver for Teams",
+  "BBB_Join_Meeting": "Bli med i møtet",
+  "BBB_Start_Meeting": "Start møte",
+  "BBB_Video_Call": "BBB-videoanrop",
+  "BBB_You_have_no_permission_to_start_a_call": "Du har ikke tillatelse til å starte en samtale",
+  "Be_the_first_to_join": "Bli med som den første",
+  "Belongs_To": "Tilhører",
+  "Best_first_response_time": "Beste første responstid",
+  "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta-funksjonen. Avhenger av videokonferanse for å være aktivert.",
+  "Better": "Bedre",
+  "Bio": "Bio",
+  "Bio_Placeholder": "Bio-plassholder",
+  "Block": "Blokker",
+  "Block_Multiple_Failed_Logins_Attempts_Until_Block_By_Ip": "Antall mislykkede forsøk før blokkering av IP-adresse",
+  "Block_Multiple_Failed_Logins_Attempts_Until_Block_by_User": "Antall mislykkede forsøk før blokkering av bruker",
+  "Block_Multiple_Failed_Logins_By_Ip": "Blokker mislykkede påloggingsforsøk for IP",
+  "Block_Multiple_Failed_Logins_By_User": "Blokker mislykkede påloggingsforsøk for brukernavn",
+  "Block_Multiple_Failed_Logins_Enable_Collect_Login_data_Description": "Lagrer IP og brukernavn fra innloggingsforsøk til en samling i databasen",
+  "Block_Multiple_Failed_Logins_Enabled": "Aktiver innsamling av innloggingsdata",
+  "Block_Multiple_Failed_Logins_Ip_Whitelist": "IP-tillitsliste  ",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_Ip_In_Minutes": "Varighet av IP-adresseblokkering (i minutter)",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_Ip_In_Minutes_Description": "Dette er hvor lenge en IP-adresse er blokkert, og tiden det tar før telleren for antall feilede forsøk tilbakestilles  ",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_User_In_Minutes": "Varighet av brukerblokkering (i minutter)",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_User_In_Minutes_Description": "Dette er varigheten brukeren er blokkert, og tiden mellom mislykkede forsøk før telleren tilbakestilles",
+  "Block_Multiple_Failed_Logins_Notify_Failed": "Varsle om mislykkede påloggingsforsøk",
+  "Block_Multiple_Failed_Logins_Notify_Failed_Channel": "Channel for å sende varslene",
+  "Block_Multiple_Failed_Logins_Notify_Failed_Channel_Desc": "Dette er hvor varslinger vil bli mottatt. Sørg for at kanalen eksisterer. Kanalnavnet skal ikke inneholde \"#\"",
+  "Block_User": "Blokker bruker",
+  "Blockchain": "Blockchain",
+  "block-ip-device-management_description": "Tillatelse til å blokkere en IP-adresse",
+  "Block_IP_Address": "Blokker IP-adresse",
+  "Blocked_IP_Addresses": "Blokkerte IP-adresser",
+  "Blockstack_Description": "Gi arbeidsområdets medlemmer muligheten til å logge på uten å være avhengig av tredjeparter eller eksterne servere.",
+  "Blockstack_Auth_Description": "Authentiseringsbeskrivelse",
+  "Blockstack_Generate_Username": "Generer brukernavn",
+  "Body": "Kropp",
+  "Bold": "Fet",
+  "bot_request": "Bot forespørsel",
+  "BotHelpers_userFields": "Brukerfelt",
+  "BotHelpers_userFields_Description": "CSV av brukerfelt som kan nås ved hjelp av botshjelpemetoder.",
+  "Bots": "bots",
+  "Bots_Description": "Angi feltene som kan refereres til og brukes når du utvikler roboter.",
+  "Branch": "Branch",
+  "Broadcast": "Kringkaste",
+  "Broadcast_channel": "Broadcast Channel",
+  "Broadcast_channel_Description": "Kun autoriserte brukere kan skrive nye meldinger, men de andre brukerne vil kunne svare",
+  "Broadcast_Connected_Instances": "Broadcast Connected Instances",
+  "Broadcasting_api_key": "Kringkastings-API-nøkkel",
+  "Broadcasting_client_id": "Kringkastingsklient-ID",
+  "Broadcasting_client_secret": "Kringkastingsklienthemmelighet",
+  "Broadcasting_enabled": "Kringkasting aktivert",
+  "Broadcasting_media_server_url": "Nettadresse for kringkastingsmedieserver",
+  "Browse_Files": "Bla gjennom filer",
+  "Browser_does_not_support_audio_element": "Nettleseren din støtter ikke lydelementet.",
+  "Browser_does_not_support_video_element": "Nettleseren din støtter ikke videoelementet.",
+  "Browser_does_not_support_recording_video": "Nettleseren din støtter ikke opptak av video",
+  "Bugsnag_api_key": "Bugsnag API-nøkkel",
+  "Build_Environment": "Bygg miljø",
+  "bulk-register-user": "Bulk Create Channels",
+  "bulk-register-user_description": "Tillatelse til å lage kanaler i bulk",
+  "Busiest_day": "Travleste dagen",
+  "Busiest_time": "Travleste tiden",
+  "Business_Hour": "Kontortid",
+  "Business_Hour_Removed": "Kontortid fjernet",
+  "Business_Hours": "Kontortid",
+  "Business_hours_enabled": "Forretningstid aktivert",
+  "Business_hours_is_disabled": "Forretningstid er deaktivert ",
+  "Business_hours_is_disabled_description": "Aktiver åpningstider i administrasjonspanelet for arbeidsområdet, for å fortelle kundene når du er tilgjengelig og når de kan forvente et svar.",
+  "busy": "opptatt",
+  "Busy": "Opptatt",
+  "Buy": "Kjøp",
+  "By": "Av",
+  "by": "av",
+  "cache_cleared": "Cache ryddet",
+  "Calendar_MeetingUrl_Regex": "Regulæruttrykk for møte-URL ",
+  "Calendar_MeetingUrl_Regex_Description": "Uttrykk som brukes til å oppdage møte-URLer i hendelsesbeskrivelser. Den første matchende gruppen med en gyldig URL vil bli brukt. HTML-kodede nettadresser vil bli dekodet automatisk.",
+  "Calendar_settings": "Kalenderinnstillinger",
+  "Call": "Ring",
+  "Call_again": "Ring igjen",
+  "Call_back": "Ring tilbake",
+  "Call_not_found": "Anropet ble ikke funnet",
+  "Call_not_found_error": "Dette kan skje når anrops-URLen ikke er gyldig, eller du har tilkoblingsproblemer. Sjekk med kilden til anrops-URLen og prøv igjen, eller snakk med administratoren for ditt  arbeidsområde hvis problemet vedvarer",
+  "Calling": "Ringer",
+  "Call_ended": "Anrop avsluttet",
+  "Calls": "Samtaler",
+  "Calls_in_queue_zero": "Køen er tom",
+  "Call_declined": "Anrop avvist!",
+  "Call_history_provides_a_record_of_when_calls_took_place_and_who_joined": "Samtalehistorikk gir en oversikt over når samtaler fant sted og hvem som var med.",
+  "Call_Information": "Anropsinformasjon",
+  "Call_Already_Ended": "Samtale allerede avsluttet",
+  "Call_number_premium_only": "Ring nummer (kun Premium-abonnementer)",
+  "call-management_description": "Tillatelse til å starte et møte",
+  "Call_ongoing": "Samtale pågår",
+  "Call_started": "Samtale startet",
+  "Call_was_not_answered": "Anropet ble ikke besvart",
+  "Caller": "Innringer",
+  "Camera_access_not_allowed": "Kameratilgang ble ikke tillatt, sjekk nettleserinnstillingene.",
+  "Cam_on": "Kamera på",
+  "Cam_off": "Kamera av",
+  "Cancel": "Avbryt",
+  "Cancel_message_input": "Avbryt",
+  "Canceled": "Avbrutt",
+  "Cancel_subscription": "Avbryt abonnement",
+  "Create_department": "Opprett avdeling",
+  "Create_direct_message": "Opprett direkte melding",
+  "Create_SLA_policy": "Lag SLA-retningslinjer",
+  "Cannot_invite_users_to_direct_rooms": "Kan ikke invitere brukere til å lede rom",
+  "Cannot_open_conversation_with_yourself": "Kan ikke sende melding til deg selv",
+  "Cannot_share_your_location": "Kan ikke dele din posisjonen...",
+  "Cant_join": "Kan ikke bli med",
+  "CAS_autoclose": "Autoclose Login Popup",
+  "CAS_base_url": "SSO Base URL",
+  "CAS_base_url_Description": "URLen til din eksterne SSO-tjeneste, for eksempel: https: //sso.example.undef/sso/",
+  "CAS_button_color": "Innloggingsknapp Bakgrunnsfarge",
+  "CAS_button_label_color": "Innloggingsknapp Tekstfarge",
+  "CAS_button_label_text": "Innloggingsknappetikett",
+  "CAS_enabled": "aktivert",
+  "CAS_Login_Layout": "CAS-innloggingslayout",
+  "CAS_login_url": "SSO-påloggingsadresse",
+  "CAS_login_url_Description": "Påloggingsadressen til din eksterne SSO-tjeneste, for eksempel: https: //sso.example.undef/sso/login",
+  "CAS_popup_height": "Logg inn Popup Høyde",
+  "CAS_popup_width": "Logg inn Popup Width",
+  "CAS_Sync_User_Data_Enabled": "Synkroniser alltid brukerdata",
+  "CAS_Sync_User_Data_Enabled_Description": "Synkroniser alltid eksterne CAS-brukerdata til tilgjengelige attributter ved innlogging. Merk: Attributter synkroniseres alltid når kontoen opprettes.",
+  "CAS_Sync_User_Data_FieldMap": "Attributtkart",
+  "CAS_Sync_User_Data_FieldMap_Description": "Bruk denne JSON-inngangen til å bygge interne attributter (nøkkel) fra eksterne attributter (verdi). Eksterne attributtnavn vedlagt med% vil bli interpolert i verdi strenger.  \nEksempel, `{\"email\":\"%e-post% \", \"navn\":\"%firstname%, %lastname% \"}`  \n  \nAttributtkartet er alltid interpolert. I CAS 1.0 er kun «brukernavnet» attributtet tilgjengelig. Tilgjengelige interne attributter er: brukernavn, navn, e-post, rom; rom er en kommaseparert liste over rom for å delta i brukeropprettelsen, for eksempel: `{\"rooms\": \"% team%,%avdeling%\"}` vil bli med i CAS-brukere ved opprettelse til deres team- og avdelingskanal.",
+  "CAS_version": "CAS versjon",
+  "CAS_version_Description": "Bruk bare en støttet CAS-versjon som støttes av din CAS SSO-tjeneste.",
+  "Categories": "Kategorier",
+  "Categories*": "Kategorier*",
+  "CDN_PREFIX": "CDN Prefix",
+  "Certificates_and_Keys": "Sertifikater og nøkler",
+  "changed_room_announcement_to__room_announcement_": "endret romkunngjøring til: {{room_announcement}}",
+  "changed_room_description_to__room_description_": "endret rombeskrivelse til: {{room_description}}",
+  "Change_Room_Type": "Endring av romtypen",
+  "Changing_email": "Endre e-post",
+  "channel": "kanal",
+  "Channel": "Kanal",
+  "Channel_already_exist": "Kanalen `#%s` finnes allerede.",
+  "Channel_already_exist_static": "Kanalen finnes allerede.",
+  "Channel_already_Unarchived": "Kanal med navn `#%s` er allerede i Unarchived state",
+  "Channel_Archived": "Kanal med navn `#%s` har blitt arkivert med hell",
+  "Channel_created": "Kanal `#%s` opprettet.",
+  "Channel_doesnt_exist": "Kanalen `#%s` eksisterer ikke.",
+  "Channel_name": "Kanalnavn",
+  "Channel_Name_Placeholder": "Vennligst skriv inn kanalnavn ...",
+  "Channel_to_listen_on": "Kanal å lytte på",
+  "Channel_Unarchived": "Kanal med navn `#%s` har blitt unarchived successfully",
+  "Channels": "kanaler",
+  "Channels_added": "Kanaler ble lagt til",
+  "Channels_are_where_your_team_communicate": "Kanaler er hvor teamet ditt kommuniserer",
+  "Channels_list": "Liste over offentlige kanaler",
+  "Chat_button": "Chat-knapp",
+  "Chat_closed": "Chat avsluttet",
+  "Chat_closed_by_agent": "Chat stengt av agent",
+  "Chat_closed_successfully": "Chat sluttet vellykket",
+  "Chat_History": "Chat historikk",
+  "Chat_Now": "Chat nå",
+  "Chat_On_Hold_Successfully": "Denne chatten ble satt på vent",
+  "Chat_resumed": "Chat gjenopptatt",
+  "Chat_started": "Chat startet",
+  "Chat_window": "Chat-vindu",
+  "Chatops_Enabled": "Aktiver Chatops",
+  "Chatops_Title": "Chatops Panel",
+  "Chatops_Username": "Chatops Brukernavn",
+  "Chat_Duration": "Chattens varighet",
+  "Chats_removed": "Chatter fjernet",
+  "Check_if_the_spelling_is_correct": "Sjekk om stavemåten er riktig",
+  "Check_device_activity": "Sjekk enhetsaktivitet",
+  "Choose_a_room": "Velg et rom",
+  "Choose_messages": "Velg meldinger",
+  "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Velg aliaset som vil vises før brukernavnet i meldinger.",
+  "Choose_the_username_that_this_integration_will_post_as": "Velg brukernavnet som denne integrasjonen vil legge inn som.",
+  "Choose_users": "Velg brukere",
+  "Clean_Usernames": "Fjern brukernavn",
+  "clean-channel-history": "Rengjør kanalhistorikken",
+  "clean-channel-history_description": "Tillatelse til å slette historien fra kanaler",
+  "clear": "Clear",
+  "Clear_all_unreads_question": "Fjern alle diskuter?",
+  "clear_cache_now": "Fjern cache nå",
+  "clear_history": "Slett logg",
+  "Click_here": "Klikk her",
+  "Click_here_for_more_details_or_contact_sales_for_a_new_license": "<a target=\"_blank\" href=\"{{url}}\">Klikk her</a> for mer informasjon eller kontakt <strong>{{email}}</strong> for en ny lisens.",
+  "Click_here_for_more_info": "Klikk her for mer info",
+  "Click_here_to_clear_the_selection": "Klikk her for å fjerne valget",
+  "Click_here_to_enter_your_encryption_password": "Klikk her for å angi krypteringspassordet ditt",
+  "Click_here_to_view_and_copy_your_password": "Klikk her for å se og kopiere passordet ditt.",
+  "Click_the_messages_you_would_like_to_send_by_email": "Klikk på meldingene du vil sende via e-post",
+  "Click_to_join": "Klikk for å bli med!",
+  "Click_to_load": "Klikk for å laste",
+  "Client_ID": "klient-ID",
+  "Client_Secret": "Klientshemmelighet",
+  "Client": "Klient",
+  "Clients_will_refresh_in_a_few_seconds": "Klienter vil oppdatere om noen få sekunder",
+  "close": "Lukk",
+  "Close": "Lukk",
+  "Close_chat": "Lukk chat",
+  "Close_room_description": "Du er i ferd med å lukke denne chatten. Er du sikker på at du vil fortsette?",
+  "close-livechat-room": "Lukk Livechat Room",
+  "close-livechat-room_description": "Tillatelse til å lukke den nåværende LiveChat-kanalen",
+  "close-others-livechat-room": "Lukk Livechat Room",
+  "close-others-livechat-room_description": "Tillatelse til å lukke andre LiveChat-kanaler",
+  "Close_Window": "Lukk vindu",
+  "Closed": "Lukket",
+  "Closed_At": "Stengt klokken",
+  "Closed_automatically": "Lukket automatisk av systemet",
+  "Closed_automatically_because_chat_was_onhold_for_seconds": "Lukket automatisk fordi chatten var på vent i {{onHoldTime}} sekunder",
+  "Closed_automatically_chat_queued_too_long": "Automatisk lukket av systemet (maksimal tid i kø overskredet)",
+  "Closed_by_visitor": "Stengt av besøkende",
+  "Closing_chat": "Avsluttende chat",
+  "Closing_chat_message": "Lukker chat-melding",
+  "Cloud_Apply_Offline_License": "Bruk frakoblet lisens",
+  "Cloud_Change_Offline_License": "Endre frakoblet lisens",
+  "Cloud_Invalid_license": "Ugyldig lisens!",
+  "Cloud_Apply_license": "Bruk lisens",
+  "Cloud_error_code": "Kode: {{errorCode}}",
+  "Cloud_registration_required": "Registrering nødvendig",
+  "Cloud_resend_email": "Send e-post på nytt",
+  "Cloud_Service_Agree_PrivacyTerms_Description": "Jeg godtar [vilkårene](https://rocket.chat/terms) og [personvernreglene](https://rocket.chat/privacy)",
+  "Cloud_status_page_description": "Hvis en bestemt skytjeneste har problemer, kan du se etter kjente problemer på statussiden vår på",
+  "Cloud_troubleshooting": "Feilsøking",
+  "Cloud_update_email": "Oppdater e-post",
+  "Cloud_what_is_it": "Hva er dette?",
+  "Copy_Link": "Kopier lenke",
+  "Copy_password": "Kopier passord",
+  "Cloud_what_is_it_additional": "I tillegg vil du kunne administrere lisenser, fakturering og support fra Rocket.Chat Cloud Console.",
+  "Cloud_what_is_it_description": "Rocket.Chat Cloud Connect lar deg koble ditt selvhostede Rocket.Chat Workspace til tjenester vi tilbyr i vår nettsky.",
+  "Cloud_what_is_it_services_like": "Tjenester som:",
+  "Cloud_workspace_connected": "Arbeidsområdet ditt er koblet til Rocket.Chat Cloud. Hvis du logger på Rocket.Chat Cloud-kontoen din her, kan du samhandle med tjenester som markedsplass.",
+  "Cloud_workspace_connected_plus_account": "Arbeidsområdet ditt er nå koblet til Rocket.Chat Cloud og en konto er tilknyttet.",
+  "Cloud_workspace_connected_without_account": "Arbeidsområdet ditt er nå koblet til Rocket.Chat Cloud. Hvis du vil, kan du logge på Rocket.Chat Cloud og knytte arbeidsområdet ditt til Cloud-kontoen din.",
+  "Cloud_workspace_disconnect": "Dersom du ikke lenger ønsker å bruke skytjenester, kan du koble fra arbeidsområdet ditt fra Rocket.Chat Cloud.",
+  "Cloud_workspace_support": "Hvis du har problemer med en skytjeneste, prøv å synkronisere først. Hvis problemet vedvarer, kan du kontakte support i Cloud Console.",
+  "Collaborative": "Samarbeidende",
+  "Collapse": "Kollapse",
+  "Collapse_Embedded_Media_By_Default": "Skjul innebygd media som standard",
+  "color": "Farge",
+  "Color": "Farge",
+  "Colors": "Farger",
+  "Commands": "kommandoer",
+  "Comment_to_leave_on_closing_session": "Kommenter å forlate på avslutnings sesjon",
+  "Comment": "Kommentar",
+  "Common_Access": "Felles tilgang",
+  "Community": "Samfunnet",
+  "Free_Edition": "Gratisversjon",
+  "Composer_not_available_phone_calls": "Meldinger er ikke tilgjengelige på telefonsamtaler",
+  "Condensed": "kondensert",
+  "Condition": "Betingelse",
+  "Completed": "Fullført",
+  "Computer": "Datamaskin",
+  "Conference_call_has_ended": "_Samtalen er avsluttet._",
+  "Configure_Incoming_Mail_IMAP": "Konfigurer innkommende e-post (IMAP)",
+  "Configure_Outgoing_Mail_SMTP": "Konfigurer utgående e-post (SMTP)",
+  "Confirm": "Bekreft",
+  "Confirm_new_encryption_password": "Bekreft nytt krypteringspassord",
+  "Confirm_new_password": "Bekrefte nytt passord",
+  "Confirm_New_Password_Placeholder": "Vennligst skriv nytt passord igjen ...",
+  "Confirm_password": "Bekreft passordet ditt",
+  "Confirm_your_password": "Bekreft passordet ditt",
+  "Confirm_configuration_update": "Bekreft konfigurasjonsoppdatering",
+  "Confirm_new_workspace_description": "Identifikasjonsdata og skytilkoblingsdata vil bli tilbakestilt.<br/><br/><strong>Advarsel</strong>: Lisensen kan bli påvirket hvis du endrer nettadressen til arbeidsområdet.",
+  "Confirm_new_workspace": "Bekreft nytt arbeidsområde",
+  "Confirmation": "Bekreftelse",
+  "Configure_video_conference": "Konfigurer konferansesamtale",
+  "Configuration_update_confirmed": "Konfigurasjonsoppdatering bekreftet",
+  "Configuration_update": "Konfigurasjonsoppdatering",
+  "Connect": "Koble til",
+  "Connected": "Tilkoblet",
+  "Connect_SSL_TLS": "Koble til med SSL/TLS",
+  "Connection_Closed": "Tilkoblingen er stengt",
+  "Connection_Reset": "Tilbakestilling av tilkobling",
+  "Connection_error": "Tilkoblingsfeil",
+  "Connection_failed": "LDAP-tilkobling feilet",
+  "Consulting": "Consulting",
+  "Contact": "Kontakt",
+  "Contacts": "Kontakter",
+  "Contact_Name": "kontakt navn",
+  "Contains_Security_Fixes": "Inneholder sikkerhetsoppdateringer",
+  "Contact_Info": "Kontaktinformasjon",
+  "Content": "Innhold",
+  "Continue": "Fortsette",
+  "Continue_Adding": "Fortsette å legge til?",
+  "Continuous_sound_notifications_for_new_livechat_room": "Kontinuerlige lydvarsler for nytt livechat-rom",
+  "Conversation": "Samtale",
+  "Conversation_closed": "Samtalen avsluttet: {{comment}}.",
+  "Conversation_closed_without_comment": "Samtalen ble avsluttet",
+  "Conversation_finished": "Samtalen er avsluttet",
+  "Conversation_finished_message": "Samtalen avsluttet melding",
+  "conversation_with_s": "samtalen med %s",
+  "Conversations": "Samtaler",
+  "Conversations_per_day": "Samtaler per dag",
+  "Convert": "Konverter",
+  "Convert_Ascii_Emojis": "Konverter ASCII til Emoji",
+  "Convert_to_channel": "Konverter til Channel",
+  "Converted__roomName__to_team": "<strong>konverterte</strong> #{{roomName}} til et team",
+  "Converted__roomName__to_channel": "<strong>konverterte</strong> #{{roomName}} til en kanal",
+  "Converted__roomName__to_a_team": "konverterte #{{roomName}} til et team",
+  "Converted__roomName__to_a_channel": "konverterte #{{roomName}} til en kanal",
+  "Converting_team_to_channel": "Konverterer team til kanal",
+  "Copied": "kopiert",
+  "Copy": "Kopi",
+  "Copy_text": "Kopier tekst",
+  "Copy_to_clipboard": "Kopiere til utklippstavle",
+  "COPY_TO_CLIPBOARD": "KOPIERE TIL UTKLIPPSTAVLE",
+  "Count": "Telle",
+  "Counters": "Tellere",
+  "Country": "Land",
+  "Country_Afghanistan": "Afghanistan",
+  "Country_Albania": "Albania",
+  "Country_Algeria": "Algerie",
+  "Country_American_Samoa": "Amerikansk Samoa",
+  "Country_Andorra": "Andorra",
+  "Country_Angola": "Angola",
+  "Country_Anguilla": "Anguilla",
+  "Country_Antarctica": "Antarktis",
+  "Country_Antigua_and_Barbuda": "Antigua og Barbuda",
+  "Country_Argentina": "Argentina",
+  "Country_Armenia": "Armenia",
+  "Country_Aruba": "Aruba",
+  "Country_Australia": "Australia",
+  "Country_Austria": "Østerrike",
+  "Country_Azerbaijan": "Aserbajdsjan",
+  "Country_Bahamas": "Bahamas",
+  "Country_Bahrain": "Bahrain",
+  "Country_Bangladesh": "Bangladesh",
+  "Country_Barbados": "Barbados",
+  "Country_Belarus": "Hviterussland",
+  "Country_Belgium": "Belgia",
+  "Country_Belize": "Belize",
+  "Country_Benin": "Benin",
+  "Country_Bermuda": "Bermuda",
+  "Country_Bhutan": "Bhutan",
+  "Country_Bolivia": "Bolivia",
+  "Country_Bosnia_and_Herzegovina": "Bosnia og Herzegovina",
+  "Country_Botswana": "Botswana",
+  "Country_Bouvet_Island": "Bouvetøya",
+  "Country_Brazil": "Brasil",
+  "Country_British_Indian_Ocean_Territory": "British Indian Ocean Territory",
+  "Country_Brunei_Darussalam": "Brunei Darussalam",
+  "Country_Bulgaria": "Bulgaria",
+  "Country_Burkina_Faso": "Burkina Faso",
+  "Country_Burundi": "Burundi",
+  "Country_Cambodia": "Kambodsja",
+  "Country_Cameroon": "Kamerun",
+  "Country_Canada": "Canada",
+  "Country_Cape_Verde": "Kapp Verde",
+  "Country_Cayman_Islands": "Caymanøyene",
+  "Country_Central_African_Republic": "Den sentralafrikanske republikk",
+  "Country_Chad": "Tsjad",
+  "Country_Chile": "Chile",
+  "Country_China": "Kina",
+  "Country_Christmas_Island": "jule~~POS=TRUNC Island",
+  "Country_Cocos_Keeling_Islands": "Cocos (Keeling) Islands",
+  "Country_Colombia": "Colombia",
+  "Country_Comoros": "Komorene",
+  "Country_Congo": "Kongo",
+  "Country_Congo_The_Democratic_Republic_of_The": "Kongo, Den demokratiske republikken The",
+  "Country_Cook_Islands": "Cookøyene",
+  "Country_Costa_Rica": "Costa Rica",
+  "Country_Cote_Divoire": "Elfenbenskysten",
+  "Country_Croatia": "Kroatia",
+  "Country_Cuba": "Cuba",
+  "Country_Cyprus": "Kypros",
+  "Country_Czech_Republic": "Tsjekkisk Republikk",
+  "Country_Denmark": "Danmark",
+  "Country_Djibouti": "Djibouti",
+  "Country_Dominica": "Dominica",
+  "Country_Dominican_Republic": "den dominikanske republikk",
+  "Country_Ecuador": "Ecuador",
+  "Country_Egypt": "Egypt",
+  "Country_El_Salvador": "El Salvador",
+  "Country_Equatorial_Guinea": "Ekvatorial-Guinea",
+  "Country_Eritrea": "Eritrea",
+  "Country_Estonia": "Estland",
+  "Country_Ethiopia": "Etiopia",
+  "Country_Falkland_Islands_Malvinas": "Falklandsøyene (Malvinas)",
+  "Country_Faroe_Islands": "Færøyene",
+  "Country_Fiji": "Fiji",
+  "Country_Finland": "Finland",
+  "Country_France": "Frankrike",
+  "Country_French_Guiana": "fransk Guyana",
+  "Country_French_Polynesia": "Fransk Polynesia",
+  "Country_French_Southern_Territories": "De franske sørterritorier",
+  "Country_Gabon": "Gabon",
+  "Country_Gambia": "Gambia",
+  "Country_Georgia": "Georgia",
+  "Country_Germany": "Tyskland",
+  "Country_Ghana": "Ghana",
+  "Country_Gibraltar": "Gibraltar",
+  "Country_Greece": "Hellas",
+  "Country_Greenland": "Grønland",
+  "Country_Grenada": "Grenada",
+  "Country_Guadeloupe": "Guadeloupe",
+  "Country_Guam": "Guam",
+  "Country_Guatemala": "Guatemala",
+  "Country_Guinea": "Guinea",
+  "Country_Guinea_bissau": "Guinea-Bissau",
+  "Country_Guyana": "Guyana",
+  "Country_Haiti": "Haiti",
+  "Country_Heard_Island_and_Mcdonald_Islands": "Heard Island og Mcdonald Islands",
+  "Country_Holy_See_Vatican_City_State": "Holy See (Vatikanstaten)",
+  "Country_Honduras": "Honduras",
+  "Country_Hong_Kong": "Hong Kong",
+  "Country_Hungary": "Ungarn",
+  "Country_Iceland": "Island",
+  "Country_India": "India",
+  "Country_Indonesia": "Indonesia",
+  "Country_Iran_Islamic_Republic_of": "Iran, Islamic Republic of",
+  "Country_Iraq": "Irak",
+  "Country_Ireland": "Irland",
+  "Country_Israel": "Israel",
+  "Country_Italy": "Italia",
+  "Country_Jamaica": "Jamaica",
+  "Country_Japan": "Japan",
+  "Country_Jordan": "Jordan",
+  "Country_Kazakhstan": "Kasakhstan",
+  "Country_Kenya": "Kenya",
+  "Country_Kiribati": "Kiribati",
+  "Country_Korea_Democratic_Peoples_Republic_of": "Korea, Demokratiske Folkerepublikken",
+  "Country_Korea_Republic_of": "Korea, Republikken",
+  "Country_Kuwait": "Kuwait",
+  "Country_Kyrgyzstan": "Kirgisistan",
+  "Country_Lao_Peoples_Democratic_Republic": "Lao Folkets demokratiske republikken",
+  "Country_Latvia": "Latvia",
+  "Country_Lebanon": "Libanon",
+  "Country_Lesotho": "Lesotho",
+  "Country_Liberia": "Liberia",
+  "Country_Libyan_Arab_Jamahiriya": "Libya",
+  "Country_Liechtenstein": "Liechtenstein",
+  "Country_Lithuania": "Litauen",
+  "Country_Luxembourg": "Luxembourg",
+  "Country_Macao": "Macao",
+  "Country_Macedonia_The_Former_Yugoslav_Republic_of": "Makedonia, Den tidligere jugoslaviske republikk",
+  "Country_Madagascar": "Madagaskar",
+  "Country_Malawi": "Malawi",
+  "Country_Malaysia": "Malaysia",
+  "Country_Maldives": "Maldivene",
+  "Country_Mali": "Mali",
+  "Country_Malta": "Malta",
+  "Country_Marshall_Islands": "Marshalløyene",
+  "Country_Martinique": "Martinique",
+  "Country_Mauritania": "Mauritania",
+  "Country_Mauritius": "Mauritius",
+  "Country_Mayotte": "Mayotte",
+  "Country_Mexico": "Mexico",
+  "Country_Micronesia_Federated_States_of": "Mikronesia, føderale stater av",
+  "Country_Moldova_Republic_of": "Moldova, Republikken",
+  "Country_Monaco": "Monaco",
+  "Country_Mongolia": "Mongolia",
+  "Country_Montserrat": "Montserrat",
+  "Country_Morocco": "Marokko",
+  "Country_Mozambique": "Mosambik",
+  "Country_Myanmar": "Myanmar",
+  "Country_Namibia": "Namibia",
+  "Country_Nauru": "Nauru",
+  "Country_Nepal": "Nepal",
+  "Country_Netherlands": "Nederland",
+  "Country_Netherlands_Antilles": "De nederlandske Antillene",
+  "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "Hvis du ikke har en, send en epost til [omni@rocket.chat] (mailto: omni@rocket.chat) for å få din.",
+  "Country_New_Caledonia": "Ny Caledonia",
+  "Country_New_Zealand": "New Zealand",
+  "Country_Nicaragua": "Nicaragua",
+  "Country_Niger": "Niger",
+  "Country_Nigeria": "Nigeria",
+  "Country_Niue": "Niue",
+  "Country_Norfolk_Island": "Norfolk Island",
+  "Country_Northern_Mariana_Islands": "Nord-Marianene",
+  "Country_Norway": "Norge",
+  "Country_Oman": "Oman",
+  "Country_Pakistan": "Pakistan",
+  "Country_Palau": "Palau",
+  "Country_Palestinian_Territory_Occupied": "Palestina",
+  "Country_Panama": "Panama",
+  "Country_Papua_New_Guinea": "Papua Ny-Guinea",
+  "Country_Paraguay": "Paraguay",
+  "Country_Peru": "Peru",
+  "Country_Philippines": "Filippinene",
+  "Country_Pitcairn": "Pitcairn",
+  "Country_Poland": "Polen",
+  "Country_Portugal": "Portugal",
+  "Country_Puerto_Rico": "Puerto Rico",
+  "Country_Qatar": "Qatar",
+  "Country_Reunion": "Gjenforening",
+  "Country_Romania": "Romania",
+  "Country_Russian_Federation": "Russland",
+  "Country_Rwanda": "Rwanda",
+  "Country_Saint_Helena": "Saint Helena",
+  "Country_Saint_Kitts_and_Nevis": "Saint Kitts og Nevis",
+  "Country_Saint_Lucia": "Saint Lucia",
+  "Country_Saint_Pierre_and_Miquelon": "Saint Pierre og Miquelon",
+  "Country_Saint_Vincent_and_The_Grenadines": "Saint Vincent og Grenadinene",
+  "Country_Samoa": "Samoa",
+  "Country_San_Marino": "San Marino",
+  "Country_Sao_Tome_and_Principe": "São Tomé og Príncipe",
+  "Country_Saudi_Arabia": "Saudi-Arabia",
+  "Country_Senegal": "Senegal",
+  "Country_Serbia_and_Montenegro": "Serbia og Montenegro",
+  "inline_code": "inline kode",
+  "Country_Seychelles": "Seychellene",
+  "Country_Sierra_Leone": "Sierra Leone",
+  "Country_Singapore": "Singapore",
+  "Country_Slovakia": "Slovakia",
+  "Country_Slovenia": "Slovenia",
+  "Country_Solomon_Islands": "Salomonøyene",
+  "Country_Somalia": "Somalia",
+  "Country_South_Africa": "Sør-Afrika",
+  "Country_South_Georgia_and_The_South_Sandwich_Islands": "Sør-Georgia og Sør-Sandwich-øyene",
+  "Country_Spain": "Spania",
+  "Country_Sri_Lanka": "Sri Lanka",
+  "Country_Sudan": "Sudan",
+  "Country_Suriname": "Surinam",
+  "Country_Svalbard_and_Jan_Mayen": "Svalbard og Jan Mayen",
+  "Country_Swaziland": "Swaziland",
+  "Country_Sweden": "Sverige",
+  "Country_Switzerland": "Sveits",
+  "Country_Syrian_Arab_Republic": "Syria",
+  "Country_Taiwan_Province_of_China": "Taiwan, provinsen Kina",
+  "Country_Tajikistan": "Tadsjikistan",
+  "Country_Tanzania_United_Republic_of": "Tanzania, United Republic of",
+  "Country_Thailand": "Thailand",
+  "Country_Timor_leste": "Øst-Timor",
+  "Country_Togo": "Å gå",
+  "Country_Tokelau": "Tokelau",
+  "Country_Tonga": "Tonga",
+  "Country_Trinidad_and_Tobago": "Trinidad og Tobago",
+  "Country_Tunisia": "Tunisia",
+  "Country_Turkey": "Kalkun",
+  "Country_Turkmenistan": "Turkmenistan",
+  "Country_Turks_and_Caicos_Islands": "Turks og Caicosøyene",
+  "Country_Tuvalu": "Tuvalu",
+  "Country_Uganda": "Uganda",
+  "Country_Ukraine": "Ukraina",
+  "Country_United_Arab_Emirates": "De forente arabiske emirater",
+  "Country_United_Kingdom": "Storbritannia",
+  "Country_United_States": "forente stater",
+  "Country_United_States_Minor_Outlying_Islands": "De mindre ytre øyene i USA",
+  "Country_Uruguay": "Uruguay",
+  "Country_Uzbekistan": "Usbekistan",
+  "Country_Vanuatu": "Vanuatu",
+  "Country_Venezuela": "Venezuela",
+  "Country_Viet_Nam": "Viet Nam",
+  "Country_Virgin_Islands_British": "Virgin Islands, British",
+  "Country_Virgin_Islands_US": "Virgin Islands, US-",
+  "Country_Wallis_and_Futuna": "Wallis og Futuna",
+  "Country_Western_Sahara": "Vest-Sahara",
+  "Country_Yemen": "Jemen",
+  "Country_Zambia": "Zambia",
+  "Country_Zimbabwe": "Zimbabwe",
+  "Create": "Skape",
+  "Create_custom_field": "Opprett egendefinert felt",
+  "Create_channel": "Opprett Channel",
+  "Create_channels": "Opprett kanaler",
+  "Create_A_New_Channel": "Opprett en ny kanal",
+  "Create_new": "Lag ny",
+  "Create_new_members": "Opprett nye medlemmer",
+  "Create_unique_rules_for_this_channel": "Opprett unike regler for denne kanalen",
+  "Create_unit": "Opprett enhet",
+  "create-c": "Opprett offentlige kanaler",
+  "create-c_description": "Tillatelse til å opprette offentlige kanaler",
+  "create-d": "Lag direkte meldinger",
+  "create-d_description": "Tillatelse til å starte direkte meldinger",
+  "create-invite-links": "Lag invitasjonslenker",
+  "create-invite-links_description": "Tillatelse til å opprette invitasjonslenker til kanaler",
+  "create-p": "Opprett private kanaler",
+  "create-p_description": "Tillatelse til å lage private kanaler",
+  "create-personal-access-tokens": "Opprett personlige tilgangstokener",
+  "create-personal-access-tokens_description": "Tillatelse til å opprette personlige tilgangstokener",
+  "create-team": "Opprett team",
+  "create-team_description": "Tillatelse til å opprette teams",
+  "create-user": "Opprett bruker",
+  "create-user_description": "Tillatelse til å opprette brukere",
+  "Created": "Opprettet",
+  "Created_as": "Opprettet som",
+  "Created_at": "Opprettet på",
+  "Created_at_s_by_s": "Opprettet på <strong>%s</strong> etter <strong>%s</strong>",
+  "Created_at_s_by_s_triggered_by_s": "Laget til <strong>%s</strong> etter <strong>%s</strong> utløst av <strong>%s</strong>",
+  "Created_by": "Opprettet av",
+  "CRM_Integration": "CRM Integrasjon",
+  "CROWD_Allow_Custom_Username": "Tillat egendefinerte brukernavn i Rocket.Chat",
+  "CROWD_Reject_Unauthorized": "Avvis Uautorisert",
+  "Crowd_sync_interval_Description": "Intervallet mellom synkroniseringer. Eksempel \"hver 24. time\" eller \"på den første dagen i uken\", flere eksempler på [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
+  "CSV": "CSV",
+  "Current_Chats": "Nåværende Chatter",
+  "Current_File": "Gjeldene fil",
+  "Current_Status": "Nåværende status",
+  "Currently_we_dont_support_joining_servers_with_this_many_people": "For øyeblikket støtter vi ikke å koble sammen servere med så mange mennesker",
+  "Custom": "Tilpasset",
+  "Custom CSS": "Tilpasset CSS",
+  "Custom_agent": "Tilpasset agent",
+  "Custom_dates": "Egendefinerte datoer",
+  "Custom_Emoji": "Egendefinert Emoji",
+  "Custom_Emoji_Add": "Legg til ny emoji",
+  "Custom_Emoji_Added_Successfully": "Tilpasset emoji ble lagt til",
+  "Custom_Emoji_Delete_Warning": "Slette en emoji kan ikke fortrykkes.",
+  "Custom_Emoji_Error_Invalid_Emoji": "Ugyldig emoji",
+  "Custom_Emoji_Error_Name_Or_Alias_Already_In_Use": "Den egendefinerte emoji eller en av aliasene er allerede i bruk.",
+  "Custom_Emoji_Error_Same_Name_And_Alias": "Det egendefinerte emojinavnet og aliasene deres skal være forskjellige.",
+  "Custom_Emoji_Has_Been_Deleted": "Den egendefinerte emoji er slettet.",
+  "Custom_Emoji_Info": "Egendefinert Emoji Info",
+  "Custom_Emoji_Updated_Successfully": "Egendefinert emoji ble oppdatert",
+  "Custom_Fields": "Egendefinerte felt",
+  "Custom_Field_Removed": "Egendefinert felt er fjernet",
+  "Custom_Field_Not_Found": "Egendefinert felt ble ikke funnet",
+  "Custom_Integration": "Tilpasset integrasjon",
+  "Custom_OAuth_has_been_added": "Egendefinert OAuth er lagt til",
+  "Custom_OAuth_has_been_removed": "Tilpasset OAuth er fjernet",
+  "Custom_oauth_helper": "Når du konfigurerer OAuth-leverandøren din, må du informere en tilbakekallingsadresse. Bruk <pre>%s</pre>.",
+  "Custom_oauth_unique_name": "Egendefinert oauth unikt navn",
+  "Custom_roles": "Egendefinerte roller",
+  "Custom_roles_upsell_add_custom_roles_workspace_description": "Egendefinerte roller lar deg angi tillatelser for personene i arbeidsområdet ditt. Angi alle rollene du trenger for å sikre at folk har et trygt miljø å jobbe i.",
+  "Custom_Script_Logged_In": "Tilpasset script for logget inn brukere",
+  "Custom_Script_Logged_Out": "Tilpasset script for logget ut brukere",
+  "Custom_Scripts": "Egendefinerte skript",
+  "Custom_Sound_Add": "Legg til tilpasset lyd",
+  "Custom_Sound_Delete_Warning": "Slette en lyd kan ikke fortrykkes.",
+  "Custom_Sound_Edit": "Rediger egendefinert lyd",
+  "Custom_Sound_Error_Invalid_Sound": "Ugyldig lyd",
+  "Custom_Sound_Error_Name_Already_In_Use": "Det egendefinerte lydnavnet er allerede i bruk.",
+  "Custom_Sound_Has_Been_Deleted": "Den egendefinerte lyden er slettet.",
+  "Custom_Sound_Info": "Tilpasset lydinfo",
+  "Custom_Sound_Saved_Successfully": "Tilpasset lyd lagret vellykket",
+  "Custom_Status": "Egendefinert status",
+  "Custom_Translations": "Tilpassede oversettelser",
+  "Custom_Translations_Description": "Bør være en gyldig JSON der nøkler er språk som inneholder en nøkkelord og oversettelser. Eksempel:  \n `{\"en\": {\"Channels\": \"Rooms\"},\"pt\": {\"Channels\": \"Salas\"}}`",
+  "Custom_User_Status": "Egendefinert brukerstatus",
+  "Custom_User_Status_Add": "Legg til egendefinert brukerstatus",
+  "Custom_User_Status_Edit": "Rediger egendefinert brukerstatus",
+  "Custom_User_Status_Error_Invalid_User_Status": "Ugyldig brukerstatus",
+  "Custom_User_Status_Has_Been_Deleted": "Egendefinert brukerstatus er slettet",
+  "Customer_without_registered_email": "Kunden har ikke registrert e-postadresse",
+  "Customize": "Tilpass",
+  "Customize_Content": "Tilpass innhold",
+  "CustomSoundsFilesystem": "Egendefinert lyds filsystem",
+  "CustomSoundsFilesystem_Description": "Spesifiser hvordan egendefinerte lyder lagres.",
+  "Daily_Active_Users": "Daglig aktive brukere",
+  "Dashboard": "Dashbord",
+  "Data_processing_consent_text": "Samtykketekst for databehandling",
+  "Date": "Dato",
+  "Date_From": "Fra",
+  "Date_to": "til",
+  "DAU_value": "DAU {{value}}",
+  "days": "dager",
+  "Days": "Dager",
+  "DB_Migration": "Databaseoverføring",
+  "DB_Migration_Date": "Databaseoverføringsdato",
+  "DDP_Rate_Limit_IP_Enabled": "Begrensning for IP: aktivert",
+  "DDP_Rate_Limit_IP_Interval_Time": "Begrensning for IP: intervalltid",
+  "DDP_Rate_Limit_IP_Requests_Allowed": "Begrensning for IP: forespørsler tillatt",
+  "Deactivate": "Deaktiver",
+  "Decline": "Avslå",
+  "default": "standard",
+  "Default": "Misligholde",
+  "Default_provider": "Standardleverandør",
+  "Default_value": "Standardverdi",
+  "Delete": "Slett",
+  "Deleting": "Sletter",
+  "Delete_account": "Slett konto",
+  "Delete_account?": "Slett konto?",
+  "Delete_all_closed_chats": "Slett alle lukkede chatter",
+  "Delete_Department?": "Vil du slette avdelingen?",
+  "Delete_message": "Slett melding",
+  "Delete_my_account": "Slett kontoen min",
+  "Delete_Role_Warning": "Dette kan ikke angres",
+  "Delete_Role_Warning_Not_Enterprise": "Dette kan ikke angres. Du vil ikke kunne opprette en ny egendefinert rolle, siden den funksjonaliteten ikke lenger er tilgjengelig for ditt nåværende abonnement.",
+  "Delete_Room_Warning": "Hvis du sletter et rom, slettes alle meldinger som er lagt inn i rommet. Dette kan ikke angres.",
+  "Delete_User_Warning": "Hvis du sletter en bruker, slettes alle meldinger fra den aktuelle brukeren. Dette kan ikke angres.",
+  "Delete_User_Warning_Delete": "Hvis du sletter en bruker, slettes alle meldinger fra den aktuelle brukeren. Dette kan ikke angres.",
+  "Delete_User_Warning_Keep": "Brukeren vil bli slettet, men meldingene deres vil forbli synlige. Dette kan ikke angres.",
+  "Delete_User_Warning_Unlink": "Hvis du sletter en bruker, fjernes brukernavnet fra alle sine meldinger. Dette kan ikke angres.",
+  "delete-c": "Slett offentlige kanaler",
+  "delete-c_description": "Tillatelse til å slette offentlige kanaler",
+  "delete-d": "Slett direkte meldinger",
+  "delete-d_description": "Tillatelse til å slette direkte meldinger",
+  "delete-message": "Slett melding",
+  "delete-message_description": "Tillatelse til å slette en melding i et rom",
+  "delete-own-message": "Slett egen melding",
+  "delete-own-message_description": "Tillatelse til å slette egen melding",
+  "delete-p": "Slett private kanaler",
+  "delete-p_description": "Tillatelse til å slette private kanaler",
+  "delete-team": "Slett team",
+  "delete-team_description": "Tillatelse til å slette team",
+  "delete-user": "Slett bruker",
+  "delete-user_description": "Tillatelse til å slette brukere",
+  "Deleted": "Slettet!",
+  "Deleted_user": "Slettet bruker",
+  "Deleted__roomName__": "<strong>slettet</strong> #{{roomName}}",
+  "Deleted__roomName__room": "slettet #{{roomName}}",
+  "Department": "Avdeling",
+  "Department_archived": "Avdeling arkivert",
+  "Department_name": "Avdelingsnavn",
+  "Department_not_found": "Avdeling ikke funnet",
+  "Department_removed": "Avdelingen fjernet",
+  "Department_Removal_Disabled": "Slettalternativet er deaktivert av administrator",
+  "Departments": "avdelinger",
+  "Deployment_ID": "Distribusjons-ID",
+  "Description": "Beskrivelse",
+  "Desktop": "Desktop",
+  "Desktop_Notification_Test": "Desktop Notification Test",
+  "Desktop_Notifications": "Bordmeldinger",
+  "Desktop_Notifications_Default_Alert": "Standardvarsling for stasjonære meldinger",
+  "Desktop_Notifications_Disabled": "Bordmeldinger er deaktivert. Endre innstillingene for nettleseren din hvis du trenger Notifications aktivert.",
+  "Desktop_Notifications_Duration": "Tidsavbrudd for stasjonær varsling",
+  "Desktop_Notifications_Duration_Description": "Sekunder for å vise skrivebordsmeddelelse. Dette kan påvirke OS X Notification Center. Angi 0 for å bruke standard nettleserinnstillinger og ikke påvirke OS X Notification Center.",
+  "Desktop_Notifications_Enabled": "Bordmeldinger er aktivert",
+  "Details": "Detaljer",
+  "Device_Management": "Enhetsstyring",
+  "Device_Management_Allow_Login_Email_preference": "Tillat medlemmer av arbeidsområdet å slå av e-poster for innloggingsforsøk",
+  "Device_Management_Client": "Klient",
+  "Device_Management_Device": "Enhet",
+  "line": "linje",
+  "Device_Management_Device_Unknown": "Ukjent",
+  "Device_Management_Enable_Login_Emails": "Aktiver e-poster for registrering av pålogging",
+  "Device_Management_Enable_Login_Emails_Description": "E-poster sendes til arbeidsområdemedlemmer hver gang nye pålogginger oppdages på deres kontoer.",
+  "Device_Management_IP": "IP",
+  "Device_Management_OS": "OS",
+  "Device_ID": "Enhets-ID",
+  "Device_Info": "Enhetsinformasjon",
+  "Device_Logged_Out": "Enheten logget ut",
+  "Devices": "Enheter",
+  "Device_settings": "Enhetsinnstillinger",
+  "Dialed_number_doesnt_exist": "Oppringt nummer eksisterer ikke",
+  "Dialed_number_is_incomplete": "Oppringt nummer er ufullstendig",
+  "Different_Style_For_User_Mentions": "Ulike stil for brukeren nevner",
+  "Livechat_Facebook_API_Key": "OmniChannel API-nøkkel",
+  "Direct": "Direkte",
+  "Direction": "Retning",
+  "Livechat_Facebook_API_Secret": "OmniChannel API Secret",
+  "Direct_Message": "Direktemelding",
+  "Livechat_Facebook_Enabled": "Facebook integrasjon aktivert",
+  "Direct_message_creation_description": "Du er i ferd med å opprette en chat med flere brukere. Legg til de du vil snakke med på ett sted via direktemeldinger.",
+  "Direct_message_someone": "Direkte melding noen",
+  "Direct_message_you_have_joined": "Du har blitt med i en ny direktemelding med",
+  "Direct_Messages": "Direktemeldinger",
+  "Direct_Reply": "Direkte svar",
+  "Direct_Reply_Debug": "Feilsøk Direkte Svar",
+  "Direct_Reply_Debug_Description": "[Beware] Aktivering av feilsøkingsmodus vil vise ditt \"Enkeltekstpassord\" i administrasjonskonsollen.",
+  "Direct_Reply_Delete": "Slett avlyssede e-poster",
+  "Direct_Reply_Enable": "Aktiver Direkte Svar",
+  "Direct_Reply_Frequency": "E-postkontrollfrekvens",
+  "Direct_Reply_Frequency_Description": "(i minutter, standard / minimum 2)",
+  "Direct_Reply_Host": "Direkte svar vert",
+  "Direct_Reply_IgnoreTLS": "IgnoreTLS",
+  "Direct_Reply_Password": "Passord",
+  "Direct_Reply_Port": "Direct_Reply_Port",
+  "Direct_Reply_Protocol": "Direkte svarprotokoll",
+  "Direct_Reply_Separator": "separator",
+  "Direct_Reply_Separator_Description": "[Endre bare hvis du vet nøyaktig hva du gjør, referer til dokumenter]  \nSeparator mellom base og tagdel av e-post",
+  "Direct_Reply_Username": "Brukernavn",
+  "Direct_Reply_Username_Description": "Bruk absolutt e-post, tagging er ikke tillatt, det ville være over-skrevet",
+  "Directory": "Directory",
+  "Disable": "Deaktiver",
+  "Disable_Facebook_integration": "Deaktiver Facebook-integrasjon",
+  "Disable_Notifications": "Deaktiver varslinger",
+  "Disable_two-factor_authentication": "Deaktiver tofaktorautentisering",
+  "Disable_two-factor_authentication_email": "Deaktiver tofaktorautentisering via e-post",
+  "Disabled": "Funksjonshemmet",
+  "Disallow_reacting": "Tillat ikke å reagere",
+  "Disallow_reacting_Description": "Tillater ikke å reagere",
+  "Discard": "Forkast",
+  "Disconnect": "Koble fra",
+  "Discussion": "Diskusjon",
+  "Discussion_Description": "Diskusjoner er en ekstra måte å organisere samtaler på, som gjør det mulig å invitere brukere fra eksterne kanaler til å delta i bestemte samtaler.",
+  "Discussion_description": "Hjelp til å holde oversikt over hva som skjer! Ved å opprette en diskusjon opprettes en underkanal til kanalen du valgte og begge kobles sammen.",
+  "Discussion_first_message_disabled_due_to_e2e": "Du kan begynne å sende ende-til-ende-krypterte meldinger i denne diskusjonen etter at den er opprettet.",
+  "Discussion_first_message_title": "Din melding",
+  "Discussion_name": "Diskusjonsnavn",
+  "Discussion_start": "Start en diskusjon",
+  "Discussion_target_channel": "Overordnet kanal eller gruppe",
+  "Discussion_target_channel_description": "Velg en kanal som er relatert til det du vil spørre om",
+  "Discussion_target_channel_prefix": "Du oppretter en diskusjon i",
+  "Discussion_title": "Opprett diskusjon",
+  "discussion-created": "{{message}}",
+  "Discussions": "Diskusjoner",
+  "Display_avatars": "Vis avatarer",
+  "Display_chat_permissions": "Vis chattillatelser",
+  "Display_offline_form": "Vis frakoblet skjema",
+  "Display_unread_counter": "Vis antall uleste meldinger",
+  "Displays_action_text": "Viser handlingstekst",
+  "Do_It_Later": "Gjør det senere",
+  "Do_not_display_unread_counter": "Ikke vis noen teller på denne kanalen",
+  "Do_not_provide_this_code_to_anyone": "Ikke oppgi denne koden til noen.",
+  "Do_Nothing": "Ikke gjør noe",
+  "Do_nothing": "Gjør ingenting",
+  "Do_you_want_to_accept": "Ønsker du å godta?",
+  "Do_you_want_to_change_to_s_question": "Vil du bytte til <strong>%s</strong>?",
+  "Documentation": "Dokumentasjon",
+  "Document_Domain": "Dokumentdomenet",
+  "Domain": "Domene",
+  "Domain_added": "domenet er lagt til",
+  "Domain_removed": "Domene fjernet",
+  "Domains": "domener",
+  "Domains_allowed_to_embed_the_livechat_widget": "Kommaseparert liste over domener får lov til å legge inn livechat-widgeten. La være tom for å tillate alle domener.",
+  "Done": "Ferdig",
+  "Dont_ask_me_again": "Ikke spør meg igjen!",
+  "Dont_ask_me_again_list": "Ikke spør meg igjen listen",
+  "Download": "Last ned",
+  "Download_Destkop_App": "Last ned desktop-appen",
+  "Download_Info": "Nedlastingsinformasjon",
+  "Download_My_Data": "Last ned mine data",
+  "Download_Pending_Avatars": "Last ned ventende avatarer",
+  "Download_Pending_Files": "Last ned ventende filer",
+  "Download_Snippet": "Last ned",
+  "Downloading_file_from_external_URL": "Laster ned fil fra ekstern URL",
+  "Drop_to_upload_file": "Drop for å laste opp fil",
+  "Dry_run": "Tørrkjøring",
+  "Dry_run_description": "Vil bare sende en e-post til samme adresse som i Fra. E-posten må tilhøre en gyldig bruker.",
+  "Duplicate_archived_channel_name": "En arkivert kanal med navn `#%s` finnes",
+  "Markdown_Headers": "Tillat Markdown-overskrifter i meldinger",
+  "Markdown_Marked_Breaks": "Aktiver merkede brudd",
+  "Duplicate_archived_private_group_name": "En arkivert Privatgruppe med navn '%s' eksisterer",
+  "Duplicate_channel_name": "En kanal med navn '%s' eksisterer",
+  "Markdown_Marked_GFM": "Aktiver merket GFM",
+  "Duplicate_file_name_found": "Duplikatfilnavn funnet.",
+  "Markdown_Marked_Pedantic": "Aktiver merket pedantisk",
+  "Markdown_Marked_SmartLists": "Aktiver merkede smarte lister",
+  "Duplicate_private_group_name": "En privat gruppe med navn '%s' eksisterer",
+  "Markdown_Marked_Smartypants": "Aktiver merkede Smartypants",
+  "Duplicated_Email_address_will_be_ignored": "Duplisert e-postadresse vil bli ignorert.",
+  "Markdown_Marked_Tables": "Aktiver merkede tabeller",
+  "E2E Encryption": "E2E-kryptering",
+  "E2E_Encryption_enabled_for_room": "Ende-til-Ende-kryptering er aktivert for #{{roomName}}",
+  "E2E_Encryption_disabled_for_room": "Ende-til-Ende-kryptering deaktivert for #{{roomName}}",
+  "Markdown_Parser": "Markdown Parser",
+  "Markdown_SupportSchemesForLink": "Markdown Støtteordninger for Link",
+  "E2E Encryption_Description": "Hold samtaler private, sørger for at bare avsender og tiltenkte mottakere kan lese dem.",
+  "Markdown_SupportSchemesForLink_Description": "Kommaseparert liste over tillatte ordninger",
+  "E2E_enable": "Aktiver E2E",
+  "E2E_disable": "Deaktiver E2E",
+  "E2E_Enable_description": "Aktiver alternativet for å opprette krypterte grupper og kunne endre grupper og direktemeldinger som skal krypteres",
+  "E2E_Enabled": "E2E aktivert",
+  "E2E_Enabled_Default_DirectRooms": "Aktiver kryptering for Direkterom som standard",
+  "E2E_Encryption_Password_Explanation": "Du kan nå opprette krypterte private grupper og direktemeldinger. Du kan også endre eksisterende private grupper eller direktemeldinger til krypterte.<br/><br/>Dette er ende-til-ende-kryptering, dvs. at nøkkelen til å kode/dekode meldingene dine vil ikke bli lagret på serveren. Av den grunn må du lagre passordet ditt et trygt sted. Du vil bli bedt om å angi den på andre enheter du ønsker å bruke ende-til-ende-kryptering på.",
+  "E2E_message_encrypted_placeholder": "Denne meldingen er ende-til-ende-kryptert. For å se den må du skrive inn krypteringsnøkkelen i kontoinnstillingene.",
+  "E2E_password_request_text": "For å få tilgang til dine krypterte private grupper og direktemeldinger, skriv inn krypteringspassordet ditt. <br/>Du må skrive inn dette passordet for å kode/dekode meldingene dine på hver klient du bruker, siden nøkkelen ikke er lagret på serveren.",
+  "E2E_password_reveal_text": "Lag sikre private rom og direktemeldinger med ende-til-ende-kryptering.<br/><br/>Lagre passordet ditt på en sikker måte, siden nøkkelen til å kode/dekode meldingene dine ikke blir lagret på serveren. Du må angi den på andre enheter for å bruke e2e-kryptering. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\" target=\"_blank\">Finn ut mer</a><br/><br/>Endre passord når som helst fra hvilken som helst nettleser du har skrevet det inn på. Husk å lagre passordet ditt før du avviser denne meldingen.<br/><br/>Passordet ditt er: <span style=\"font-weight: bold;\">{{randomPassword}}</span>",
+  "E2E_Reset_Email_Content": "Du er automatisk logget ut. Når du logger på igjen, vil Rocket.Chat generere en ny nøkkel og gjenopprette tilgangen din til et hvilket som helst kryptert rom som har ett eller flere medlemmer online. På grunn av E2E-krypteringens natur, vil Rocket.Chat ikke kunne gjenopprette tilgangen til et kryptert rom som ikke har noen medlemmer online.",
+  "E2E_Reset_Key_Explanation": "Dette alternativet vil fjerne din nåværende E2E-nøkkel og logge deg ut. <BR/>Når du logger på igjen, genererer Rocket.Chat deg en ny nøkkel og gjenoppretter tilgangen din til et hvilket som helst kryptert rom som har ett eller flere medlemmer online.<BR/>På grunn av E2E-krypteringens natur, vil Rocket.Chat ikke kunne gjenopprette tilgang til noe kryptert rom som ikke har noen medlemmer online.",
+  "E2E_Reset_Other_Key_Warning": "Tilbakestill gjeldende E2E-nøkkel vil logge ut brukeren. Når brukeren logger på igjen, vil Rocket.Chat generere en ny nøkkel og gjenopprette brukertilgangen til et hvilket som helst kryptert rom som har ett eller flere medlemmer online. På grunn av E2E-krypteringens natur, vil Rocket.Chat ikke kunne gjenopprette tilgangen til et kryptert rom som ikke har noen medlemmer online.",
+  "Edit": "Rediger",
+  "Edit_Business_Hour": "Rediger arbeidstid",
+  "Edit_Custom_Field": "Rediger egendefinert felt",
+  "Edit_Department": "Rediger avdeling",
+  "Message_AllowSnippeting": "Tillat meldingsutklipp",
+  "Edit_Invite": "Rediger invitasjon",
+  "Edit_previous_message": "`%s` - Rediger forrige melding",
+  "Edit_Priority": "Rediger prioritet",
+  "Edit_SLA_Policy": "Rediger SLA-retningslinjer",
+  "Edit_Status": "Rediger status",
+  "Edit_Tag": "Endre tagg",
+  "Edit_Trigger": "Rediger utløser",
+  "Edit_Unit": "Endre enhet",
+  "Message_Attachments_GroupAttach": "Knapper for gruppevedlegg",
+  "Message_Attachments_GroupAttachDescription": "Dette grupperer ikonene under en utvidbar meny. Tar opp mindre skjermplass.",
+  "Edit_User": "Rediger bruker",
+  "edit-message": "Rediger melding",
+  "edit-message_description": "Tillatelse til å redigere en melding i et rom",
+  "edit-other-user-active-status": "Rediger annen brukeraktiv status",
+  "edit-other-user-active-status_description": "Tillatelse til å aktivere eller deaktivere andre kontoer",
+  "edit-other-user-e2ee": "Rediger annen bruker E2E-kryptering",
+  "edit-other-user-e2ee_description": "Tillatelse til å endre andre brukeres E2E-kryptering.",
+  "edit-other-user-info": "Rediger annen brukerinformasjon",
+  "edit-other-user-info_description": "Tillatelse til å endre andre brukerens navn, brukernavn eller e-postadresse.",
+  "edit-other-user-password": "Rediger annet brukerpassord",
+  "edit-other-user-password_description": "Tillatelse til å endre andre brukeres passord. Krever redigering-andre-bruker-info tillatelse.",
+  "edit-privileged-setting": "Rediger privilegert innstilling",
+  "edit-privileged-setting_description": "Tillatelse til å redigere innstillinger",
+  "edit-team": "Rediger team",
+  "edit-team_description": "Tillatelse til å redigere team",
+  "edit-team-channel": "Rediger teamkanal",
+  "edit-team-channel_description": "Tillatelse til å redigere et teams kanal",
+  "edit-team-member": "Rediger teammedlem",
+  "edit-team-member_description": "Tillatelse til å redigere et teams medlemmer",
+  "edit-room": "Rediger rom",
+  "edit-room_description": "Tillatelse til å redigere et roms navn, emne, type (privat eller offentlig status) og status (aktiv eller arkivert)",
+  "edit-room-avatar": "Rediger romavatar",
+  "edit-room-avatar_description": "Tillatelse til å redigere et roms avatar.",
+  "edit-room-retention-policy": "Rediger romets retensjonspolicy",
+  "edit-room-retention-policy_description": "Tillatelse til å redigere et roms retensjonspolicy, for å automatisk slette meldinger i den",
+  "multi_line": "multi line",
+  "Edit_Contact_Profile": "Rediger kontaktprofil",
+  "edited": "redigert",
+  "Editing_room": "Redigeringsrom",
+  "Editing_user": "Redigerer bruker",
+  "Message_ShowEditedStatus": "Vis redigert status",
+  "Education": "Utdannelse",
+  "Message_ShowFormattingTips": "Vis formateringstips",
+  "Email": "E-post",
+  "Email_Description": "Konfigurasjoner for å sende kringkastede e-poster fra Rocket.Chat.",
+  "Email_address_to_send_offline_messages": "E-postadresse for å sende utkoblede meldinger",
+  "Email_already_exists": "E-post finnes allerede",
+  "Email_body": "E-post kroppen",
+  "Email_Change_Disabled": "Din Rocket.Chat-administrator har deaktivert endringen av e-post",
+  "Email_Changed_Description": "Du kan bruke følgende plassholdere:\n - `[email]` for brukerens e-post.\n- `[Site_Name]` og `[Site_URL]` for applikasjonsnavn og URL.",
+  "Email_Changed_Email_Subject": "[Site_Name] – E-postadressen er endret",
+  "Email_changed_section": "E-postadresse endret",
+  "Email_Footer_Description": "Du kan bruke følgende plassholdere:  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen. ",
+  "Email_from": "Fra",
+  "Email_Header_Description": "Du kan bruke følgende plassholdere:  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen. ",
+  "Email_Inbox": "E-post-innboks",
+  "Email_Inboxes": "E-post-innbokser",
+  "Email_Inbox_has_been_added": "E-postinnboks er lagt til",
+  "Email_Inbox_has_been_removed": "E-postinnboks er fjernet",
+  "Email_Notification_Mode": "Frakoblede e-postvarsler",
+  "Email_Notification_Mode_All": "Hver Nevn / DM",
+  "Email_Notification_Mode_Disabled": "Funksjonshemmet",
+  "Email_notification_show_message": "Vis melding i e-postvarsel",
+  "Email_Notifications_Change_Disabled": "Rocket.Chat-administratoren din har deaktivert e-postvarsel",
+  "Email_or_username": "E-post eller brukernavn",
+  "Email_Placeholder": "Vennligst skriv inn E-postadressen din...",
+  "Email_Placeholder_any": "Vennligst skriv inn e-postadresser ...",
+  "email_plain_text_only": "Send bare ren tekst-e-post",
+  "Enterprise_Description": "Oppdater Premium-lisensen din manuelt.",
+  "Email_subject": "Emne",
+  "Enterprise_License": "Enterpriselisens",
+  "Enterprise_License_Description": "Hvis arbeidsområdet ditt er registrert og lisensen er levert av Rocket.Chat Cloud trenger du ikke å oppdatere lisensen manuelt her.",
+  "Email_verified": "E-post bekreftet",
+  "Email_sent": "E-post sendt",
+  "Emoji": "Emoji",
+  "Emoji_picker": "Emoji-velger",
+  "EmojiCustomFilesystem": "Egendefinert Emoji-filsystem",
+  "EmojiCustomFilesystem_Description": "Spesifiser hvordan emojier lagres.",
+  "Empty_title": "Tom tittel",
+  "Enable": "Aktiver",
+  "Enable_Auto_Away": "Aktiver automatisk unna",
+  "Extra_CSP_Domains": "Ekstra CSP-domener",
+  "Enable_Desktop_Notifications": "Aktiver skrivebordsvarsler",
+  "Enable_omnichannel_auto_close_abandoned_rooms": "Aktiver automatisk stenging av rom som er forlatt av de besøkende",
+  "Enable_Password_History": "Aktiver passordhistorikk",
+  "Enable_Svg_Favicon": "Aktiver SVG favicon",
+  "Enable_two-factor_authentication": "Aktiver tofaktorautentisering",
+  "Enable_two-factor_authentication_email": "Aktiver tofaktorautentisering via e-post",
+  "Enabled": "aktivert",
+  "Encrypted": "Kryptert",
+  "Encrypted_channel_Description": "Ende-til-ende kryptert kanal. Søk fungerer ikke med krypterte kanaler, og varsler viser kanskje ikke meldingsinnholdet.",
+  "Encrypted_key_title": "Klikk her for å deaktivere ende-til-ende-kryptering for denne kanalen (krever e2e-tillatelse)",
+  "Encrypted_message": "Kryptert melding",
+  "Encrypted_not_available": "Ikke tilgjengelig for offentlige Channel",
+  "Encryption_key_saved_successfully": "Krypteringsnøkkelen din ble lagret.",
+  "EncryptionKey_Change_Disabled": "Du kan ikke angi et passord for krypteringsnøkkelen din, da din private nøkkel ikke er tilgjengelig på denne klienten. For å sette et nytt passord må du laste inn din private nøkkel ved å bruke ditt eksisterende passord eller bruke en klient der nøkkelen allerede er lastet inn.",
+  "End": "Avslutt",
+  "End_suspicious_sessions": "Avslutt alle mistenkelige økter",
+  "End_call": "Avslutt samtale",
+  "End_conversation": "Avslutt samtale",
+  "Expand_view": "Utvid visningen",
+  "Explore": "Utforsk",
+  "Explore_the_marketplace_to_find_awesome_apps": "Utforsk Marketplace for å finne fantastiske apper for Rocket.Chat",
+  "Export": "Eksporter",
+  "End_Call": "Avslutt samtale",
+  "End_OTR": "Avslutt OTR",
+  "Ensure_secure_workspace_access": "Sørg for sikker tilgang til arbeidsområdet",
+  "Enter_a_custom_message": "Skriv inn en egendefinert melding",
+  "Enter_a_name": "Skriv inn et navn",
+  "Enter_a_regex": "Skriv inn en regex",
+  "Enter_a_room_name": "Skriv inn et romnavn",
+  "Enter_a_username": "Skriv inn et brukernavn",
+  "Enter_Alternative": "Alternativ modus (send med Enter + Ctrl / Alt / Shift / CMD)",
+  "Enter_authentication_code": "Skriv inn autentiseringskode",
+  "Enter_Behaviour": "Skriv inn nøkkeladferd",
+  "Enter_Behaviour_Description": "Dette endres hvis enter-tasten sender en melding eller gjør en linjeskift",
+  "Enter_E2E_password": "Skriv inn Ende-Til-Ende-passord",
+  "Enter_name_here": "Skriv inn navn her",
+  "Enter_Normal": "Normal modus (send med Enter)",
+  "Enter_to": "Skriv inn til",
+  "Enter_your_E2E_password": "Skriv inn ditt Ende-Til-Ende-passord",
+  "Enter_your_password_to_delete_your_account": "Skriv inn ditt passord for å slette kontoen din. Dette kan ikke angres.",
+  "Enter_your_username_to_delete_your_account": "Skriv inn ditt brukernavn for å slette kontoen. Dette kan ikke angres.",
+  "Premium_License": "Premium-lisens",
+  "Premium_License_alert": "Hvis en lisens fjernes, må arbeidsområdet startes på nytt for å tre i kraft. <br/>Hvis arbeidsområdet er koblet til skyen, bør lisensen kanselleres der først, ellers vil skyen gi lisensen til arbeidsområdet igjen under omstart.",
+  "Premium_only": "Kun premium",
+  "Entertainment": "Underholdning",
+  "Error": "Feil",
+  "Error_something_went_wrong": "Oops! Noe gikk galt. Last inn siden på nytt eller kontakt en administrator.",
+  "Error_404": "Feil: 404",
+  "Error_changing_password": "Feil ved endring av passord",
+  "Error_loading_pages": "Feil ved lasting av sider",
+  "Error_login_blocked_for_ip": "Innlogging er midlertidig blokkert for denne IP-adressen",
+  "Error_login_blocked_for_user": "Innlogging er midlertidig blokkert for denne brukeren",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Feil: Rocket.Chat krever oplog tailing når du kjører i flere tilfeller",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Sørg for at MongoDB er på ReplicaSet-modus og MONGO_OPLOG_URL miljøvariabel er definert riktig på applikasjonsserveren",
+  "Error_Site_URL": "Ugyldig Site_Url",
+  "error-action-not-allowed": "{{action}} er ikke tillatt",
+  "error-application-not-found": "Søknad ikke funnet",
+  "error-archived-duplicate-name": "Det er en arkivert kanal med navn '{{room_name}}'",
+  "error-avatar-invalid-url": "Ugyldig avatar URL: {{url}}",
+  "error-avatar-url-handling": "Feil under behandling av avatarinnstilling fra en URL ({{url}}) for {{username}}",
+  "error-business-hour-finish-time-before-start-time": "Sluttid må være etter starttid",
+  "error-business-hour-finish-time-equals-start-time": "Start- og sluttid kan ikke være det samme",
+  "error-blocked-username": "**{{field}}** er blokkert og kan ikke brukes!",
+  "error-cannot-delete-app-user": "Sletting av appbruker er ikke tillatt. Avinstaller den tilsvarende appen for å fjerne den.",
+  "error-cant-invite-for-direct-room": "Kan ikke invitere brukeren til å lede rom",
+  "error-channels-setdefault-is-same": "Kanalinnstillingen er den samme som hva den ville bli endret til.",
+  "error-channels-setdefault-missing-default-param": "BodyParam 'standard' er påkrevd",
+  "error-could-not-change-email": "Kunne ikke endre e-post",
+  "error-could-not-change-name": "Kunne ikke endre navn",
+  "error-could-not-change-username": "Kunne ikke endre brukernavn",
+  "error-comment-is-required": "Kommentar er påkrevd",
+  "error-custom-field-name-already-exists": "Det egendefinerte feltnavnet er allerede i bruk",
+  "error-delete-protected-role": "Kan ikke slette en beskyttet rolle",
+  "error-department-not-found": "Avdeling ikke funnet",
+  "error-direct-message-file-upload-not-allowed": "Fildeling ikke tillatt i direkte meldinger",
+  "error-duplicate-channel-name": "En kanal med navn '{{channel_name}}' eksisterer",
+  "error-duplicate-priority-name": "En prioritet med samme navn finnes allerede",
+  "error-edit-permissions-not-allowed": "Redigering av tillatelser er ikke tillatt",
+  "error-email-domain-blacklisted": "E-postdomenet er svartelistet",
+  "error-email-body-not-initialized": "E-postteksten er ikke initialisert. Konfigurer e-postens topp- og bunntekst på e-postinnstillinger før du sender omfattende e-poster",
+  "error-email-send-failed": "Feil ved å prøve å sende e-post: {{message}}",
+  "error-essential-app-disabled": "Feil: en Rocket.Chat-app som er avgjørende for dette er deaktivert. Kontakt administratoren din",
+  "error-failed-to-delete-department": "Kunne ikke slette avdelingen",
+  "error-field-unavailable": "<strong>{{field}}</strong> er allerede i bruk :(",
+  "error-file-too-large": "Filen er for stor",
+  "error-forwarding-chat": "Noe gikk galt under videresending av chatten. Prøv igjen senere.",
+  "error-forwarding-chat-same-department": "Den valgte avdelingen og den aktuelle romavdelingen er like",
+  "error-forwarding-department-target-not-allowed": "Videresending til målavdelingen er ikke tillatt.",
+  "error-guests-cant-have-other-roles": "Gjestebrukere kan ikke ha andre roller.",
+  "error-import-file-extract-error": "Kunne ikke pakke ut importfilen.",
+  "error-import-file-is-empty": "Importert fil ser ut til å være tom.",
+  "error-import-file-missing": "Filen som skal importeres ble ikke funnet på den angitte plassen.",
+  "error-importer-not-defined": "Importøren ble ikke definert riktig, det mangler importklassen.",
+  "error-input-is-not-a-valid-field": "{{input}} er ikke gyldig {{field}}",
+  "error-insufficient-permission": "Feil! Du har ikke ' {{permission}} ' tillatelsen, som er nødvendig for å utføre denne handlingen",
+  "error-invalid-account": "Ugyldig konto",
+  "error-invalid-actionlink": "Ugyldig handlingskobling",
+  "error-invalid-arguments": "Ugyldige argumenter",
+  "error-invalid-asset": "Ugyldig ressurs",
+  "error-invalid-channel": "Ugyldig kanal.",
+  "error-invalid-channel-start-with-chars": "Ugyldig kanal. Start med @ eller #",
+  "error-invalid-custom-field": "Ugyldig tilpasset felt",
+  "error-invalid-custom-field-name": "Ugyldig egendefinert feltnavn. Bruk bare bokstaver, tall, bindestreker og understreker.",
+  "error-invalid-custom-field-value": "Ugyldig verdi for {{field}}-feltet",
+  "error-invalid-date": "Ugyldig dato oppgitt.",
+  "error-invalid-dates": "\"Fra-dato\" kan ikke være etter \"til-dato\"",
+  "error-invalid-description": "Ugyldig beskrivelse",
+  "error-invalid-domain": "Ugyldig domene",
+  "error-invalid-email": "Ugyldig e-post {{email}}",
+  "error-invalid-email-address": "Ugyldig epostadresse",
+  "error-invalid-email-inbox": "Ugyldig e-postinnboks",
+  "error-email-inbox-not-found": "Finner ikke e-postinnboks",
+  "error-invalid-file-height": "Ugyldig filhøyde",
+  "error-invalid-file-type": "ugyldig filtype",
+  "error-invalid-file-width": "Ugyldig filbredde",
+  "error-invalid-from-address": "Du har informert om en ugyldig FROM-adresse.",
+  "error-invalid-integration": "Ugyldig integrering",
+  "error-invalid-message": "Ugyldig melding",
+  "error-invalid-method": "Ugyldig metode",
+  "error-invalid-name": "Ugyldig navn",
+  "error-invalid-password": "Ugyldig passord",
+  "error-invalid-param": "Ugyldig parameter",
+  "error-invalid-params": "Ugyldige parametere",
+  "error-invalid-permission": "Ugyldig tillatelse",
+  "error-invalid-port-number": "Ugyldig portnummer",
+  "error-invalid-priority": "Ugyldig prioritet",
+  "error-invalid-redirectUri": "Ugyldig omadresseringUri",
+  "error-invalid-role": "Ugyldig rolle",
+  "error-invalid-room": "Ugyldig rom",
+  "error-invalid-room-name": "<strong>{{room_name}}</strong> er ikke et gyldig romnavn",
+  "error-invalid-room-type": "<strong>{{type}}</strong> er ikke en gyldig romtype.",
+  "error-invalid-settings": "Ugyldige innstillinger som tilbys",
+  "error-invalid-subscription": "Ugyldig abonnement",
+  "error-invalid-token": "Ugyldig token",
+  "error-invalid-triggerWords": "Ugyldig utløserWords",
+  "error-invalid-urls": "Ugyldige nettadresser",
+  "error-invalid-user": "Ugyldig bruker",
+  "error-invalid-username": "Ugyldig brukernavn",
+  "error-invalid-value": "ugyldig verdi",
+  "error-invalid-webhook-response": "Webhook-nettadressen reagerte med en annen status enn 200",
+  "error-license-user-limit-reached": "Maksimalt antall brukere er nådd.",
+  "error-logged-user-not-in-room": "Du er ikke på rommet `%s`",
+  "error-max-departments-number-reached": "Du har nådd det maksimale antallet avdelinger som tillates av lisensen din. Kontakt sale@rocket.chat for en ny lisens.",
+  "error-max-guests-number-reached": "Du har nådd maksimalt antall gjestebrukere tillatt av lisensen din. Kontakt sale@rocket.chat for en ny lisens.",
+  "error-max-number-simultaneous-chats-reached": "Det maksimale antallet samtidige chatter per agent er nådd.",
+  "error-max-rooms-per-guest-reached": "Maksimalt antall rom per gjest er nådd.",
+  "error-message-deleting-blocked": "Meldingen slettet er blokkert",
+  "error-message-editing-blocked": "Meldingsredigering er blokkert",
+  "error-message-size-exceeded": "Meldingsstørrelsen overstiger Message_MaxAllowedSize",
+  "error-missing-unsubscribe-link": "Du må gi koblingen [oppheve].",
+  "error-no-tokens-for-this-user": "Det er ingen tokens for denne brukeren",
+  "error-not-allowed": "Ikke tillatt",
+  "error-not-authorized": "Ikke autorisert",
+  "Estimated_due_time": "Estimert forfallstid",
+  "error-password-in-history": "Oppgitt passord er tidligere brukt",
+  "error-password-policy-not-met": "Passordet oppfyller ikke serverens retningslinjer",
+  "Estimated_due_time_in_minutes": "Estimert forfallstid (tid i minutter)",
+  "error-password-policy-not-met-maxLength": "Passordet oppfyller ikke serverens policy med maksimal lengde (passord for lenge)",
+  "error-password-policy-not-met-minLength": "Passordet oppfyller ikke serverens policy med minimumslengde (passord for kort)",
+  "error-password-policy-not-met-oneLowercase": "Passordet oppfyller ikke serverens policy med minst en liten bokstav",
+  "error-password-policy-not-met-oneNumber": "Passordet oppfyller ikke serverens policy med minst ett numerisk tegn",
+  "error-password-policy-not-met-oneSpecial": "Passordet oppfyller ikke serverens policy med minst ett spesialtegn",
+  "Please_go_to_the_Administration_page_then_Livechat_Facebook": "Gå til administrasjonssiden og deretter Livechat> Facebook",
+  "error-password-policy-not-met-oneUppercase": "Passordet oppfyller ikke serverens policy med minst en stor bokstav",
+  "error-password-policy-not-met-repeatingCharacters": "Passordet oppfyller ikke serverens retningslinjer for forbudte gjentatte tegn (du har for mange av de samme tegnene ved siden av hverandre)",
+  "error-password-same-as-current": "Inntastet passord er likt nåværende passord",
+  "error-personal-access-tokens-are-current-disabled": "Personlige tilgangstokener er for øyeblikket deaktivert",
+  "error-push-disabled": "Push er deaktivert",
+  "error-remove-last-owner": "Dette er den siste eieren. Vennligst sett inn en ny eier før du fjerner denne.",
+  "error-role-in-use": "Kan ikke slette rolle fordi den er i bruk",
+  "error-role-name-required": "Rolle navn er nødvendig",
+  "error-room-does-not-exist": "Dette rommet eksisterer ikke",
+  "error-role-already-present": "En rolle med dette navnet finnes allerede",
+  "error-room-already-closed": "Room er allerede stengt",
+  "error-room-is-not-closed": "Rommet er ikke lukket",
+  "error-room-onHold": "Feil! Room er på vent",
+  "error-room-is-already-on-hold": "Feil! Room er allerede på vent",
+  "error-room-not-on-hold": "Feil! Room er ikke på vent",
+  "error-selected-agent-room-agent-are-same": "Den valgte agenten og romagenten er de samme",
+  "error-the-field-is-required": "Feltet {{field}} er påkrevd.",
+  "error-this-is-not-a-livechat-room": "Dette er ikke et Livechat-rom",
+  "error-this-is-a-premium-feature": "Dette er fra en premium-funksjon",
+  "error-token-already-exists": "Et token med dette navnet finnes alt",
+  "error-token-does-not-exists": "Tokenet finnes ikke",
+  "error-too-many-requests": "Feil, for mange forespørsler. Vennligst senke farten. Du må vente {{seconds}} sekunder før du prøver igjen.",
+  "error-user-deactivated": "Brukeren er ikke aktiv",
+  "error-user-has-no-roles": "Brukeren har ingen roller",
+  "error-user-is-not-activated": "Brukeren er ikke aktivert",
+  "error-user-is-offline": "Brukeren er frakoblet",
+  "error-user-limit-exceeded": "Antall brukere du prøver å invitere til #kanalnavn overskrider grensen satt av administratoren",
+  "error-user-not-belong-to-department": "Bruker tilhører ikke denne avdelingen",
+  "error-user-not-in-room": "Brukeren er ikke i dette rommet",
+  "error-user-registration-disabled": "Brukerregistrering er deaktivert",
+  "error-user-registration-secret": "Brukerregistrering er bare tillatt via hemmelig URL",
+  "error-no-owner-channel": "Bare eiere kan legge til denne kanalen i teamet",
+  "error-unable-to-update-priority": "Kan ikke oppdatere prioritering",
+  "error-you-are-last-owner": "Du er den siste eieren. Vennligst sett inn ny eier før du forlater rommet.",
+  "error-saving-sla": "Det oppstod en feil under lagring av SLA",
+  "error-duplicated-sla": "En SLA med samme navn eller forfallstid eksisterer allerede",
+  "error-cannot-place-chat-on-hold": "Du kan ikke sette chatten på vent",
+  "error-unserved-rooms-cannot-be-placed-onhold": "Rommet kan ikke settes på vent før betjening",
+  "Workspace_exceeded_MAC_limit_disclaimer": "Arbeidsområdet har overskredet den månedlige grensen for aktive kontakter. Snakk med arbeidsområdeadministratoren din for å løse dette problemet.",
+  "You_do_not_have_permission_to_do_this": "Du har ikke tillatelse til å gjøre dette",
+  "You_do_not_have_permission_to_execute_this_command": "Du har ikke nødvendige tillatelser til å utføre kommandoen: `/{{command}}`",
+  "You_have_reached_the_limit_active_costumers_this_month": "Du har nådd grensen for aktive kunder denne måneden",
+  "Errors_and_Warnings": "Feil og advarsler",
+  "Esc_to": "Esc til",
+  "Estimated_wait_time": "Beregnet ventetid",
+  "Event_notifications": "Hendelsesvarsler",
+  "Event_Trigger": "Event Trigger",
+  "Event_Trigger_Description": "Velg hvilken type hendelse som utløser denne Utgående WebHook-integrasjonen",
+  "every_5_minutes": "En gang hvert 5. minutt",
+  "every_10_seconds": "En gang hvert 10. sekund",
+  "every_30_seconds": "En gang hvert 30. sekund",
+  "every_10_minutes": "En gang hvert 10. minutt",
+  "every_30_minutes": "En gang hvert 30. minutt",
+  "every_day": "En gang hver dag",
+  "every_hour": "En gang i timen",
+  "every_minute": "En gang i minuttet",
+  "every_second": "En gang hvert sekund",
+  "every_six_hours": "En gang hver sjette time",
+  "every_12_hours": "En gang hver 12. time",
+  "every_24_hours": "En gang hver 24. timer",
+  "every_48_hours": "En gang hver 48. time",
+  "Everyone_can_access_this_channel": "Alle kan få tilgang til denne kanalen",
+  "Exact": "Nøyaktig",
+  "Example_s": "Eksempel: <code class=\"inline\" >%s</code>",
+  "except_pinned": "(unntatt de som er festet)",
+  "Exclude_Botnames": "Ekskluder Bots",
+  "Exclude_Botnames_Description": "Ikke propagere meldinger fra bots hvis navn samsvarer med det vanlige uttrykket ovenfor. Hvis tomt er tomt, vil alle meldinger fra bots bli spredt.",
+  "Exclude_pinned": "Ekskluder pinnede meldinger",
+  "Execute_Synchronization_Now": "Utfør synkronisering nå",
+  "Exit_Full_Screen": "Avslutt fullskjerm",
+  "Expand": "Utvid",
+  "Experimental_Feature_Alert": "Dette er en eksperimentell funksjon! Vær oppmerksom på at den kan endres, gå i stykker eller til og med bli fjernet i fremtiden uten varsel.",
+  "Expired": "Utløpt",
+  "Expiration": "Utløp",
+  "Expiration_(Days)": "Utløp (dager)",
+  "Export_as_file": "Eksporter som fil",
+  "Export_Messages": "Eksporter meldinger",
+  "Export_My_Data": "Eksporter mine data",
+  "expression": "Uttrykk",
+  "Extended": "Utvidet",
+  "Extensions": "Utvidelser",
+  "Extension_Number": "Utvidelsesnummer",
+  "Extension_Status": "Utvidelsesstatus",
+  "External": "Ekstern",
+  "External_Domains": "Eksterne domener",
+  "External_Queue_Service_URL": "Ekstern køtjeneste-URL",
+  "External_Service": "Ekstern tjeneste",
+  "External_Users": "Eksterne brukere",
+  "Extremely_likely": "Ekstremt sannsynlig",
+  "Facebook": "Facebook",
+  "Facebook_Page": "Facebook-side",
+  "Failed": "Mislyktes",
+  "Failed_to_activate_invite_token": "Kunne ikke aktivere invitasjonstoken",
+  "Failed_to_add_monitor": "Kunne ikke legge til monitor",
+  "Failed_To_Download_Files": "Kunne ikke laste ned filer",
+  "Failed_to_generate_invite_link": "Kunne ikke generere invitasjonslenke",
+  "False": "Nei",
+  "Favorite": "Favoritt",
+  "Favorite_Rooms": "Aktiver favorittlokaler",
+  "Favorites": "Favoritter",
+  "Feature_Depends_on_Livechat_Visitor_navigation_as_a_message_to_be_enabled": "Denne funksjonen avhenger av \"Send besøkende navigasjonshistorikk som en melding\" for å være aktivert.",
+  "Federation_Example_matrix_server": "Eksempel: matrix.org",
+  "Federation_Public_key": "Offentlig nøkkel",
+  "FEDERATION_Domain": "Domene",
+  "FEDERATION_Public_Key": "Offentlig nøkkel",
+  "FEDERATION_Status": "Status",
+  "Retry_Count": "Prøv på nytt",
+  "Federation_Matrix_enabled": "aktivert",
+  "Federation_Matrix_id": "AppService-ID",
+  "Federation_Matrix_hs_token": "Hjemmeserver-token",
+  "Federation_Matrix_as_token": "AppService-token",
+  "Federation_Matrix_homeserver_url": "Hjemmeserver-URL",
+  "Federation_Matrix_registration_file": "Registreringsfil",
+  "Federation_Matrix_giving_same_permission_warning": "Du gir denne brukeren de samme rettighetene som deg selv, du vil ikke kunne angre denne endringen. Vil du fortsette?",
+  "Federation_Matrix_losing_privileges": "Mister privilegier",
+  "Federation_Matrix_losing_privileges_warning": "Du vil ikke kunne angre denne handlingen, siden du nedgraderer deg selv. Hvis du er den siste privilegerte brukeren, vil du ikke kunne gjenvinne dette privilegiet. Ønsker du fortsatt å utføre handlingen?",
+  "Federation_Matrix_not_allowed_to_change_moderator": "Du har ikke lov til å endre moderator",
+  "Federation_Matrix_not_allowed_to_change_owner": "Du har ikke lov til å endre eier",
+  "Federation_Matrix_max_size_of_public_rooms_users_Alert": "Husk at jo større rommet du tillater brukere å bli med i, jo mer tid vil det ta å bli med i rommet, i tillegg til hvor mye ressurs det vil bruke. <a target=\"_blank\" href=\"https://matrix.org/blog/2022/10/18/testing-faster-remote-room-joins\">Les mer</a>",
+  "Field": "Felt",
+  "Field_removed": "Felt fjernet",
+  "Field_required": "Felt kreves",
+  "File": "Fil",
+  "File_Downloads_Started": "Filnedlastinger startet",
+  "File_exceeds_allowed_size_of_bytes": "Filen overskrider tillatt størrelse på {{size}}.",
+  "File_name_Placeholder": "Søk filer ...",
+  "File_not_allowed_direct_messages": "Fildeling ikke tillatt i direkte meldinger.",
+  "File_removed_by_automatic_prune": "Fil fjernet av automatisk beskjæring",
+  "File_removed_by_prune": "Fil fjernet av beskjæring",
+  "File_type_is_not_accepted": "Filtype er ikke akseptert.",
+  "File_uploaded": "Fil opplastet",
+  "File_Upload_Disabled": "Filopplasting er deaktivert",
+  "File_URL": "Fil-URL",
+  "files": "filer",
+  "Files_only": "Bare fjern vedlagte filer, hold meldinger",
+  "FileSize_Bytes": "{{fileSize}} Bytes",
+  "FileSize_KB": "{{fileSize}} KB",
+  "FileSize_MB": "{{fileSize}} MB",
+  "FileUpload": "Filopplasting",
+  "FileUpload_Cannot_preview_file": "Kan ikke forhåndsvise filen",
+  "FileUpload_Disabled": "Filopplastinger er deaktivert.",
+  "FileUpload_Enable_json_web_token_for_files": "Aktiver Json Web Tokens-beskyttelse for filopplastinger",
+  "FileUpload_Restrict_to_room_members": "Begrens filer til rommenes medlemmer",
+  "FileUpload_Enabled": "Filopplastinger aktivert",
+  "FileUpload_Enabled_Direct": "Filopplastinger aktivert i direkte meldinger",
+  "FileUpload_Error": "Filopplastingsfeil",
+  "FileUpload_File_Empty": "Filen er tom",
+  "FileUpload_FileSystemPath": "Systemvei",
+  "FileUpload_GoogleStorage_AccessId": "Google Storage Access ID",
+  "FileUpload_GoogleStorage_AccessId_Description": "Tilgangs-ID-en er vanligvis i et e-postformat, for eksempel: \"`example-test@example.iam.gserviceaccount.com`\"",
+  "FileUpload_GoogleStorage_Bucket": "Google Storage Bucket Name",
+  "FileUpload_GoogleStorage_Bucket_Description": "Navnet på bøtte som filene skal lastes opp til.",
+  "FileUpload_GoogleStorage_ProjectId": "Prosjekt-ID",
+  "FileUpload_GoogleStorage_Proxy_Avatars": "Proxy Avatars",
+  "FileUpload_GoogleStorage_Proxy_Avatars_Description": "Proxy-avatar-filoverføringer via serveren din i stedet for direkte tilgang til aktivets nettadresse",
+  "FileUpload_GoogleStorage_Proxy_Uploads": "Proxy-opplastinger",
+  "FileUpload_GoogleStorage_Proxy_Uploads_Description": "Proxy overfører filoverføringer via serveren din i stedet for direkte tilgang til eiendelens URL",
+  "FileUpload_GoogleStorage_Secret": "Google Storage Secret",
+  "FileUpload_GoogleStorage_Secret_Description": "Vennligst følg [disse instruksjonene](https://github.com/CulturalMe/meteor-slingshot#google-cloud) og lim inn resultatet her.",
+  "FileUpload_MaxFileSize": "Maksimal filopplastingsstørrelse (i byte)",
+  "FileUpload_MaxFileSizeDescription": "Sett den til -1 for å fjerne begrensningen for filstørrelsen.",
+  "FileUpload_MediaType_NotAccepted__type__": "Medietypen er ikke akseptert: {{type}}",
+  "FileUpload_MediaType_NotAccepted": "Medietyper ikke akseptert",
+  "FileUpload_MediaTypeBlackList": "Blokkerte medietyper",
+  "FileUpload_MediaTypeBlackListDescription": "Kommaseparert liste over medietyper. Denne innstillingen har prioritet over de aksepterte medietypene.",
+  "FileUpload_MediaTypeWhiteList": "Godkjente medietyper",
+  "FileUpload_MediaTypeWhiteListDescription": "Kommaseparert liste over medietyper. La det være tomt for å akseptere alle medietyper.",
+  "FileUpload_ProtectFiles": "Beskytt opplastede filer",
+  "FileUpload_ProtectFilesDescription": "Kun autentiserte brukere vil ha tilgang",
+  "FileUpload_RotateImages": "Roter bilder ved opplasting",
+  "FileUpload_RotateImages_Description": "Aktivering av denne innstillingen kan føre til tap av bildekvalitet",
+  "FileUpload_S3_Acl": "Acl",
+  "FileUpload_S3_AWSAccessKeyId": "Tilgangsnøkkel",
+  "FileUpload_S3_AWSSecretAccessKey": "Hemmelig nøkkel",
+  "FileUpload_S3_Bucket": "Bøtte navn",
+  "FileUpload_S3_BucketURL": "Bucket URL",
+  "FileUpload_S3_CDN": "CDN-domene for nedlastinger",
+  "FileUpload_S3_ForcePathStyle": "Kraftvei Stil",
+  "FileUpload_S3_Proxy_Avatars": "Proxy Avatars",
+  "FileUpload_S3_Proxy_Avatars_Description": "Proxy-avatar-filoverføringer via serveren din i stedet for direkte tilgang til aktivets nettadresse",
+  "FileUpload_S3_Proxy_Uploads": "Proxy-opplastinger",
+  "FileUpload_S3_Proxy_Uploads_Description": "Proxy overfører filoverføringer via serveren din i stedet for direkte tilgang til eiendelens URL",
+  "FileUpload_S3_Region": "Region",
+  "FileUpload_S3_SignatureVersion": "Signaturversjon",
+  "FileUpload_S3_URLExpiryTimeSpan": "Nettadresser for utløpsdato",
+  "FileUpload_S3_URLExpiryTimeSpan_Description": "Tid etterpå vil Amazon S3 genererte nettadresser ikke lenger være gyldige (i sekunder). Hvis innstilt til mindre enn 5 sekunder, ignoreres dette feltet.",
+  "FileUpload_Storage_Type": "Lagringstype",
+  "FileUpload_Webdav_Password": "WebDAV-passord",
+  "FileUpload_Webdav_Proxy_Avatars": "Proxy Avatars",
+  "FileUpload_Webdav_Proxy_Avatars_Description": "Proxy-avatar-filoverføringer via serveren din i stedet for direkte tilgang til aktivets nettadresse",
+  "FileUpload_Webdav_Proxy_Uploads": "Proxy-opplastinger",
+  "FileUpload_Webdav_Proxy_Uploads_Description": "Proxy overfører filoverføringer via serveren din i stedet for direkte tilgang til eiendelens URL",
+  "FileUpload_Webdav_Server_URL": "WebDAV Server Access URL",
+  "FileUpload_Webdav_Upload_Folder_Path": "Last opp mappebane",
+  "FileUpload_Webdav_Upload_Folder_Path_Description": "WebDAV mappebane som filene skal lastes opp til",
+  "FileUpload_Webdav_Username": "WebDAV Brukernavn",
+  "Filter": "Filter",
+  "Filter_by_category": "Filtrer etter kategori",
+  "Filter_by_Custom_Fields": "Filtrer etter egendefinerte felt",
+  "Filter_By_Price": "Filtrer etter pris",
+  "Filter_By_Status": "Filtrer etter status",
+  "Filters": "Filtre",
+  "Financial_Services": "Finansielle tjenester",
+  "Finish": "Fullfør",
+  "Finish_Registration": "Fullfør registreringen",
+  "First_Channel_After_Login": "Første kanal etter innlogging",
+  "Flags": "Flags",
+  "Follow_message": "Følg melding",
+  "Follow_social_profiles": "Følg våre sosiale profiler, gaffel oss på github og del dine tanker om rocket.chat-appen på vår trello bord.",
+  "Fonts": "fonter",
+  "Food_and_Drink": "Mat drikke",
+  "Footer": "bunntekst",
+  "Footer_Direct_Reply": "Footer Når Direkte Svar er Aktivert",
+  "For_more_details_please_check_our_docs": "For mer informasjon vennligst se våre dokumenter.",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "For din sikkerhet må du skrive inn ditt nåværende passord for å fortsette",
+  "Force_Disable_OpLog_For_Cache": "Force Deaktiver OpLog for Cache",
+  "Force_Disable_OpLog_For_Cache_Description": "Vil ikke bruke OpLog til å synkronisere hurtigbufferen selv når den er tilgjengelig",
+  "Force_SSL": "Force SSL",
+  "Force_SSL_Description": "* Forsiktig! * _Force SSL_ skal aldri brukes med omvendt proxy. Hvis du har en omvendt proxy, bør du gjøre omadresseringen der. Dette alternativet finnes for distribusjoner som Heroku, som ikke tillater viderekoblingskonfigurasjonen på omvendt proxy.",
+  "force-delete-message": "Tving slett melding",
+  "force-delete-message_description": "Tillatelse til å slette en melding omgå alle begrensninger",
+  "Font_size": "Skriftstørrelse",
+  "Forgot_password": "Glemt passordet",
+  "Forgot_Password_Description": "Du kan bruke følgende plassholdere:  \n - `[Forgot_Password_Url]` for URL-adressen for passordgjenoppretting.  \n - [navn], [fname], [lname] for brukerens fulle navn, fornavn eller etternavn.  \n - `[email]` for brukerens e-postadresse.  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen.",
+  "Forgot_Password_Email": "Klikk <a href=\"[Forgot_Password_Url]\">her</a>for å tilbakestille passordet ditt.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Passordgjenoppretting",
+  "Forgot_password_section": "Glemt passord",
+  "Format": "Format",
+  "Forward": "Framover",
+  "Forward_chat": "Videresend chat",
+  "Forward_message": "Videresend melding",
+  "Forward_to_department": "Videresend til avdeling",
+  "Forward_to_user": "Videresend til bruker",
+  "Forwarding": "Videresending",
+  "Free": "Gratis",
+  "Free_Apps": "Gratis-apper",
+  "Frequently_Used": "Ofte brukt",
+  "Friday": "fredag",
+  "From": "Fra",
+  "From_Email": "Fra e-post",
+  "From_email_warning": "<b>Advarsel</b>: Feltet <b>Fra</b> er underlagt e-postserverinnstillingene dine.",
+  "Full_Name": "Fullt navn",
+  "Full_Screen": "Fullskjerm",
+  "Gaming": "Gaming",
+  "General": "Generell",
+  "General_Settings": "Generelle innstillinger",
+  "Generate_new_key": "Generer en ny nøkkel",
+  "Generate_New_Link": "Generer ny lenke",
+  "Generating_key": "Genererer nøkkel",
+  "Copy_link": "Kopier lenke",
+  "get-password-policy-forbidRepeatingCharacters": "Passordet bør ikke inneholde gjentakende tegn",
+  "get-password-policy-forbidRepeatingCharactersCount": "Passordet bør ikke inneholde mer enn {{forbidRepeatingCharactersCount}} gjentatte tegn",
+  "get-password-policy-maxLength": "Passordet bør maksimalt inneholde  {{maxLength}} tegn",
+  "get-password-policy-minLength": "Passordet bør inneholde minst {{minLength}} tegn",
+  "get-password-policy-mustContainAtLeastOneLowercase": "Passordet bør inneholde minst én liten bokstav",
+  "get-password-policy-mustContainAtLeastOneNumber": "Passordet bør inneholde minst ett tall",
+  "get-password-policy-mustContainAtLeastOneSpecialCharacter": "Passordet bør inneholde minst ett spesialtegn",
+  "get-password-policy-mustContainAtLeastOneUppercase": "Passordet bør inneholde minst én stor bokstav",
+  "get-password-policy-minLength-label": "Minst {{limit}} tegn",
+  "get-password-policy-maxLength-label": "Maks {{limit}} tegn",
+  "get-password-policy-forbidRepeatingCharactersCount-label": "Maks. {{limit}} gjentatte tegn",
+  "get-password-policy-mustContainAtLeastOneLowercase-label": "Minst én liten bokstav",
+  "get-password-policy-mustContainAtLeastOneUppercase-label": "Minst en stor bokstav",
+  "get-password-policy-mustContainAtLeastOneNumber-label": "Minst ett tall",
+  "get-password-policy-mustContainAtLeastOneSpecialCharacter-label": "Minst ett symbol",
+  "get-server-info": "Hente serverinformasjon",
+  "get-server-info_description": "Tillatelse til å hente serverinformasjon",
+  "github_no_public_email": "Du har ingen e-post som offentlig e-post i din GitHub-konto",
+  "github_HEAD": "HEAD",
+  "Give_a_unique_name_for_the_custom_oauth": "Gi et unikt navn til den egendefinerte oauth",
+  "strike": "streik",
+  "Give_the_application_a_name_This_will_be_seen_by_your_users": "Gi søknaden et navn. Dette vil bli sett av brukerne.",
+  "Global": "Global",
+  "Global Policy": "Global retningslinje ",
+  "Global_purge_override_warning": "En global retensjonspolitikk er på plass. Hvis du lar \"Overstyr global retensjonspolitikk\" av, kan du bare bruke en policy som er strengere enn den globale politikken.",
+  "Global_Search": "Globalt søk",
+  "Go_to_your_workspace": "Gå til arbeidsområdet ditt",
+  "Go_to_accessibility_and_appearance": "Gå til tilgjengelighet og utseende",
+  "Google_Meet_Premium_only": "Google Meet (kun Premium)",
+  "Google_Play": "Google Play",
+  "Hold_Call": "Sett samtale på vent",
+  "Hold_Call_Premium_only": "Sett samtale på vent (kun Premium)",
+  "GoogleCloudStorage": "Google Cloud Storage",
+  "GoogleNaturalLanguage_ServiceAccount_Description": "Tjenestekonto-nøkkel JSON-fil. Mer informasjon finner du her [https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
+  "GoogleTagManager_id": "Google Tag Manager ID",
+  "Government": "Regjering",
+  "Graphql_CORS": "GraphQL CORS",
+  "Graphql_Enabled": "GraphQL aktivert",
+  "Graphql_Subscription_Port": "GraphQL abonnementsport",
+  "Grid_view": "Rutenett visning",
+  "Snippet_Messages": "Utskriftsmeldinger",
+  "Group": "Gruppe",
+  "Group_by": "Grupper etter",
+  "Group_by_Type": "Gruppe etter type",
+  "snippet-message": "Utskriftsmelding",
+  "snippet-message_description": "Tillatelse til å opprette tekstmelding",
+  "Group_discussions": "Gruppediskusjoner",
+  "Group_favorites": "Gruppe favoritter",
+  "Group_mentions_disabled_x_members": "Gruppe nevner `@ alle` og` @ her` har blitt deaktivert for rom med flere enn {{total}} medlemmer.",
+  "Group_mentions_only": "Gruppe nevner bare",
+  "Grouping": "Gruppering",
+  "Guest": "Gjest",
+  "Hash": "hash",
+  "Header": "Overskrift",
+  "Header_and_Footer": "Topptekst og bunntekst",
+  "Pharmaceutical": "Farmasøytisk",
+  "Healthcare": "Helsevesen",
+  "Helpers": "Hjelpere",
+  "Here_is_your_authentication_code": "Her er din autentiseringskode:",
+  "Hex_Color_Preview": "Hex-fargeforhåndsvisning",
+  "Hi": "Hei",
+  "Hi_username": "Hei [navn]",
+  "Hidden": "skjult",
+  "Hide": "Skjul rom",
+  "Hide_counter": "Skjul teller",
+  "Hide_flextab": "Skjul høyre sidefelt med klikk",
+  "Hide_Group_Warning": "Er du sikker på at du vil gjemme gruppen \"%s\"?",
+  "Hide_Livechat_Warning": "Er du sikker på at du vil gjemme livechat med \"%s\"?",
+  "Hide_On_Workspace": "Skjul på arbeidsområdet",
+  "Hide_Private_Warning": "Er du sikker på at du vil gjemme diskusjonen med \"%s\"?",
+  "Hide_roles": "Skjul roller",
+  "Hide_room": "Skjul rom",
+  "Hide_Room_Warning": "Er du sikker på at du vil gjemme rommet \"%s\"?",
+  "Hide_System_Messages": "Skjul systemmeldinger",
+  "Hide_Unread_Room_Status": "Skjul ulest romstatus",
+  "Hide_usernames": "Skjul brukernavn",
+  "Hide_video": "Skjul video",
+  "High": "Høy",
+  "Highest": "Høyest",
+  "Highlights": "Høydepunkter",
+  "Highlights_How_To": "For å bli varslet når noen nevner et ord eller en setning, legg den til her. Du kan skille ord eller setninger med kommaer. Høydeord Ordene er ikke sosialfølsomme.",
+  "Highlights_List": "Fremhev ord",
+  "History": "Historie",
+  "Hold_Premium_only": "Vent (kun Premium-abonnement)",
+  "Home": "Hjem",
+  "Homepage": "Hjemmeside",
+  "Host": "Vert",
+  "hours": "timer",
+  "Hours": "timer",
+  "How_and_why_we_collect_usage_data": "Hvordan og hvorfor bruksdata samles inn",
+  "How_friendly_was_the_chat_agent": "Hvor vennlig var chatteagenten?",
+  "How_knowledgeable_was_the_chat_agent": "Hvor kunnskapsrik var chatagenten?",
+  "How_long_to_wait_after_agent_goes_offline": "Hvor lenge å vente etter agent går offline",
+  "How_responsive_was_the_chat_agent": "Hvor responsiv var chatagenten?",
+  "How_satisfied_were_you_with_this_chat": "Hvor fornøyd var du med denne chatten?",
+  "How_to_handle_open_sessions_when_agent_goes_offline": "Slik håndterer du åpne økter når agent går utenom",
+  "Http_timeout": "HTTP-tidsavbrudd (i millisekunder)",
+  "Http_timeout_value": "5000",
+  "HTML": "HTML",
+  "Icon": "Ikon",
+  "I_Saved_My_Password": "Jeg har lagret passordet mitt",
+  "Idle_Time_Limit": "Inaktiv tidsbegrensning",
+  "Idle_Time_Limit_Description": "Periode til status endres til vekk. Verdien må være i sekunder.",
+  "if_they_are_from": "(hvis de er fra %s)",
+  "If_this_email_is_registered": "Hvis denne e-posten er registrert, sender vi instruksjoner om hvordan du tilbakestiller passordet ditt. Hvis du ikke mottar en epost, vennligst kom tilbake og prøv igjen.",
+  "If_you_didnt_ask_for_reset_ignore_this_email": "Hvis du ikke har bedt om å tilbakestille passordet ditt, kan du ignorere denne e-posten.",
+  "If_you_didnt_try_to_login_in_your_account_please_ignore_this_email": "Hvis du ikke prøvde å logge på kontoen din, kan du ignorere denne e-posten.",
+  "Iframe_Integration": "Iframe Integrasjon",
+  "Iframe_Integration_receive_enable": "Aktiver mottak",
+  "Iframe_Integration_receive_enable_Description": "Tillat foreldrevinduet å sende kommandoer til Rocket.Chat.",
+  "Iframe_Integration_receive_origin": "Motta originaler",
+  "Iframe_Integration_receive_origin_Description": "Origins med protokoll prefiks, separert med komma, som får lov til å motta kommandoer, f.eks. 'https: // localhost, http: // localhost', eller * for å tillate mottak fra hvor som helst.",
+  "Iframe_Integration_send_enable": "Aktiver Send",
+  "Iframe_Integration_send_enable_Description": "Send hendelser til foreldrevinduet",
+  "Iframe_Integration_send_target_origin": "Send målopprinnelse",
+  "Iframe_Integration_send_target_origin_Description": "Opprinnelse med protokollprefikset, hvilke kommandoer sendes til f.eks. 'https: // localhost', eller * for å tillate sending til hvor som helst.",
+  "Ignore": "Overse",
+  "Ignored": "ignorert",
+  "Ignore_Two_Factor_Authentication": "Ignorer tofaktorautentisering",
+  "Images": "Bilder",
+  "IMAP_intercepter_already_running": "IMAP-intercepter kjører allerede",
+  "IMAP_intercepter_Not_running": "IMAP-intercepter Ikke kjører",
+  "Impersonate_next_agent_from_queue": "Legg til neste agent fra køen",
+  "Impersonate_user": "Forsink brukeren",
+  "Impersonate_user_description": "Når aktivert, integrering innlegg som brukeren som utløste integrasjon",
+  "Import": "Import",
+  "Import_New_File": "Importer ny fil",
+  "Importer_Archived": "arkivert",
+  "Importer_CSV_Information": "CSV-importøren krever et bestemt format, vennligst les dokumentasjonen for hvordan du strukturerer zip-filen din:",
+  "Importer_done": "Importerer komplett!",
+  "Importer_finishing": "Fullfører importen.",
+  "Importer_From_Description": "Importerer data fra {{from}} til Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Vær oppmerksom på at denne importen fortsatt er et pågående arbeid, vennligst rapporter eventuelle feil som oppstår i GitHub:",
+  "Importer_HipChatEnterprise_Information": "Filen som lastes opp må være en dekryptert tar.gz, vennligst les dokumentasjonen for ytterligere informasjon:",
+  "Importer_import_cancelled": "Import avbrutt.",
+  "Importer_import_failed": "Det oppsto en feil under kjøring av importen.",
+  "Importer_importing_channels": "Importerer kanalene.",
+  "Importer_importing_files": "Importerer filene.",
+  "Importer_importing_messages": "Importerer meldingene.",
+  "Importer_importing_started": "Starter importen.",
+  "Importer_importing_users": "Importerer brukerne.",
+  "Importer_not_in_progress": "Importøren kjører for øyeblikket ikke.",
+  "Importer_not_setup": "Importøren er ikke konfigurert riktig, da det ikke returnerte noen data.",
+  "Importer_Prepare_Restart_Import": "Start på nytt på nytt",
+  "Importer_Prepare_Start_Import": "Begynn å importere",
+  "Importer_Prepare_Uncheck_Archived_Channels": "Fjern merket for arkiverte kanaler",
+  "Importer_Prepare_Uncheck_Deleted_Users": "Fjern merket for slettede brukere",
+  "Importer_progress_error": "Kunne ikke få fremgang for importen.",
+  "Importer_setup_error": "Det oppsto en feil under oppsett av importøren.",
+  "Importer_Slack_Users_CSV_Information": "Filen som lastes opp må være Slack's Users-eksportfil, som er en CSV-fil. Se her for mer informasjon:",
+  "Importer_Source_File": "Kildefilvalg",
+  "importer_status_done": "Fullført",
+  "importer_status_downloading_file": "Laster ned fil",
+  "importer_status_file_loaded": "Filen er lastet inn",
+  "importer_status_finishing": "Nesten ferdig",
+  "importer_status_import_cancelled": "Avbrutt",
+  "importer_status_import_failed": "Feil",
+  "importer_status_importing_channels": "Importerer kanaler",
+  "importer_status_importing_files": "Importerer filer",
+  "importer_status_importing_messages": "Importerer meldinger",
+  "importer_status_importing_started": "Importerer data",
+  "importer_status_importing_users": "Importerer brukere",
+  "importer_status_new": "Ikke startet",
+  "importer_status_preparing_started": "Leser filer",
+  "importer_status_preparing_users": "Leser brukerfil",
+  "importer_status_uploading": "Laster opp fil",
+  "importer_status_user_selection": "Klar til å velge hva som skal importeres",
+  "Importer_Upload_FileSize_Message": "Serverinnstillingene dine tillater opplasting av filer i alle størrelser opptil {{maxFileSize}}.",
+  "Importer_Upload_Unlimited_FileSize": "Deres serverinnstillinger tillater opplasting av filer i alle størrelser.",
+  "Importing_channels": "Importerer kanaler",
+  "Importing_Data": "Importerer data",
+  "Importing_messages": "Importerer meldinger",
+  "Importing_users": "Importerer brukere",
+  "Inactivity_Time": "Inaktivitetstid",
+  "In_progress": "Pågår",
+  "inbound-voip-calls": "Innkommende VoIP-anrop",
+  "inbound-voip-calls_description": "Tillatelse til innkommende VoIP-samtaler",
+  "Inbox_Info": "Innboks info",
+  "Include_Offline_Agents": "Inkluder frakoblede agenter",
+  "Inclusive": "Inklusive",
+  "Incoming": "Innkommende",
+  "Incoming_call_from": "Innkommende anrop fra",
+  "Incoming_Livechats": "Innkommende Livechats",
+  "Incoming_WebHook": "Innkommende WebHook",
+  "Industry": "Industri",
+  "Info": "Info",
+  "initials_avatar": "Initialer Avatar",
+  "Inline_code": "Innline-kode",
+  "Install": "Installer",
+  "Install_anyway": "Installer allikevel ",
+  "Install_Extension": "Installer utvidelse",
+  "Install_FxOs": "Installer Rocket.Chat på din Firefox",
+  "Install_FxOs_done": "Flott! Du kan nå bruke Rocket.Chat via ikonet på startskjermen. Ha det gøy med Rocket.Chat!",
+  "Install_FxOs_error": "Beklager, det fungerte ikke som ønsket! Følgende feil oppstod:",
+  "Install_FxOs_follow_instructions": "Vennligst bekreft appinstallasjonen på enheten din (trykk på \"Installer\" når du blir bedt om det).",
+  "Installing": "Installerer",
+  "Install_package": "Installer pakken",
+  "Installation": "Installasjon",
+  "Installed": "Installert",
+  "Installed_at": "Installert på",
+  "Instance_Record": "Instans Record",
+  "Instructions": "Instruksjoner",
+  "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instruksjoner til din besøkende fyller skjemaet for å sende en melding",
+  "Insert_Contact_Name": "Skriv inn kontaktnavn",
+  "Install_rocket_chat_on_your_preferred_desktop_platform": "Installer Rocket.Chat på din foretrukne skrivebordsplattform.",
+  "Insurance": "Forsikring",
+  "Integration_added": "Integrasjon er lagt til",
+  "Integration_Advanced_Settings": "Avanserte innstillinger",
+  "Integration_Delete_Warning": "Sletting av en integrasjon kan ikke angres.",
+  "Integration_disabled": "Integrasjon deaktivert",
+  "Integration_History_Cleared": "Integrasjonshistorikk ble vellykket",
+  "Integration_Incoming_WebHook": "Innkommende WebHook Integrasjon",
+  "Integration_New": "Ny integrasjon",
+  "integration-scripts-disabled": "Integrasjonsskript er deaktivert",
+  "Integration_Outgoing_WebHook": "Utgående WebHook Integrasjon",
+  "Integration_Outgoing_WebHook_History": "Utgående WebHook Integration History",
+  "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Data bestått til integrasjon",
+  "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Data passert til URL",
+  "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Feil Stacktrace",
+  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP-respons",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "HTTP-responsfeil",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Meldinger sendt fra klargjør trinn",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Meldinger sendt fra prosessrespons trinn",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Tiden det avsluttet eller feil",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Time Integration Triggered",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Siste Trigger Trinn",
+  "Integration_Outgoing_WebHook_No_History": "Denne utgående webhook-integrasjonen har ennå ikke registrert noen historie.",
+  "Integration_Retry_Count": "Prøv på nytt",
+  "Integration_Retry_Count_Description": "Hvor mange ganger skal integrering bli forsøkt hvis samtalen til nettadressen mislykkes?",
+  "Integration_Retry_Delay": "Prøv på nytt",
+  "Integration_Retry_Delay_Description": "Hvilken forsinkelsesalgoritme skal prøve på nytt? <code class=\"inline\">10 ^ x</code> eller <code class=\"inline\">2 ^ x</code>` eller <code class=\"inline\">x * 2</code>",
+  "Integration_Retry_Failed_Url_Calls": "Prøv på nytt uten mislykkede samtaler",
+  "Integration_Retry_Failed_Url_Calls_Description": "Bør integrasjonen prøve en rimelig tid hvis samtalen ut til nettadressen mislykkes?",
+  "Integration_Run_When_Message_Is_Edited": "Kjør på redigeringer",
+  "Integration_Run_When_Message_Is_Edited_Description": "Bør integrasjonen gå når meldingen er redigert? Hvis du angir dette til feil, vil integrasjonen bare kjøre på **nye** meldinger.",
+  "Integration_updated": "Integrasjon har blitt oppdatert.",
+  "Integration_Word_Trigger_Placement": "Ordplassering hvor som helst",
+  "Integration_Word_Trigger_Placement_Description": "Bør Ordet bli utløst når det plasseres hvor som helst i setningen annet enn begynnelsen?",
+  "Integrations": "Integrasjoner",
+  "Integrations_for_all_channels": "Skriv inn <strong>all_public_channels</strong> for å lytte på alle offentlige kanaler, <strong>all_private_groups</strong> for å lytte på alle private grupper, og <strong>all_direct_messages</strong> for å lytte til alle direkte meldinger.",
+  "Integrations_Outgoing_Type_FileUploaded": "Filopplastet",
+  "Integrations_Outgoing_Type_RoomArchived": "Rom arkivert",
+  "Integrations_Outgoing_Type_RoomCreated": "Rom laget (offentlig og privat)",
+  "Integrations_Outgoing_Type_RoomJoined": "Bruker ble med i rommet",
+  "Integrations_Outgoing_Type_RoomLeft": "Bruker venstre rom",
+  "Integrations_Outgoing_Type_SendMessage": "Melding sendt",
+  "Integrations_Outgoing_Type_UserCreated": "Bruker laget",
+  "InternalHubot": "Intern Hubot",
+  "InternalHubot_EnableForChannels": "Aktiver for offentlige kanaler",
+  "InternalHubot_EnableForDirectMessages": "Aktiver for direkte meldinger",
+  "InternalHubot_EnableForPrivateGroups": "Aktiver for private kanaler",
+  "InternalHubot_PathToLoadCustomScripts": "Mappe for å laste inn skriptene",
+  "InternalHubot_reload": "Oppdater skriptene",
+  "InternalHubot_ScriptsToLoad": "Skript å laste",
+  "InternalHubot_ScriptsToLoad_Description": "Vennligst skriv inn en kommaseparert liste over skript som skal lastes fra din tilpassede mappe",
+  "InternalHubot_Username_Description": "Dette må være et gyldig brukernavn for en bot som er registrert på serveren din.",
+  "Invalid_confirm_pass": "Passordbekreftelsen stemmer ikke overens med passordet",
+  "Invalid_Department": "Ugyldig avdeling",
+  "Invalid_email": "E-posten som er oppgitt, er ugyldig",
+  "Invalid_Export_File": "Filen lastet opp er ikke en gyldig%s eksportfil.",
+  "Invalid_field": "Feltet må fylles ut",
+  "Invalid_Import_File_Type": "Ugyldig import filtype.",
+  "Invalid_name": "Navnet må ikke være tomt",
+  "Invalid_notification_setting_s": "Ugyldig varslingsinnstilling:%s",
+  "Invalid_OAuth_client": "Ugyldig OAuth-klient",
+  "Invalid_or_expired_invite_token": "Ugyldig eller utløpt invitasjonstoken",
+  "Invalid_pass": "Passordet må ikke være tomt",
+  "Invalid_password": "Ugyldig passord",
+  "Invalid_reason": "Grunnen til å bli med må ikke være tom",
+  "Invalid_room_name": "<strong>%s</strong> er ikke et gyldig romnavn",
+  "Invalid_secret_URL_message": "Nettadressen som er oppgitt, er ugyldig.",
+  "Invalid_setting_s": "Ugyldig innstilling:%s",
+  "Invalid_two_factor_code": "Ugyldig tofaktorkode",
+  "Invalid_username": "Brukernavnet som er oppgitt, er ugyldig",
+  "invisible": "usynlig",
+  "Invisible": "Usynlig",
+  "Invitation": "Invitasjon",
+  "Invitation_Email_Description": "Du kan bruke følgende plassholdere:  \n - `[email]` for mottakerens e-postadresse.  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen. ",
+  "Invitation_HTML": "Invitasjon HTML",
+  "Invitation_HTML_Default": "<h1>Du har blitt invitert til <strong>[Site_Name]</strong></h1><p>Gå til [Site_URL] og prøv den beste open source chat-løsningen tilgjengelig i dag!</p>",
+  "Invitation_Subject": "Invitasjonsfag",
+  "Invitation_Subject_Default": "Du har blitt invitert til [Site_Name]",
+  "Invite": "Invitasjon",
+  "Invites": "Invitasjoner",
+  "Invite_and_add_members_to_this_workspace_to_start_communicating": "Inviter og legg til medlemmer i dette arbeidsområdet for å begynne å kommunisere.",
+  "Invite_Link": "Invitasjonslenke",
+  "link": "lenke",
+  "Invite_link_generated": "Invitasjonslenken er generert",
+  "Invite_removed": "Invitasjonen ble fjernet",
+  "Invite_user_to_join_channel": "Be en bruker til å bli med på denne kanalen",
+  "Invite_user_to_join_channel_all_from": "Inviter alle brukere fra [#kanal] for å bli med på denne kanalen",
+  "Invite_user_to_join_channel_all_to": "Inviter alle brukere fra denne kanalen til å delta i [#kanal]",
+  "Invite_Users": "Invitere brukere",
+  "IP": "IP",
+  "IP_Address": "IP-adresse",
+  "IRC_Channel_Join": "Output av kommandoen JOIN.",
+  "IRC_Channel_Leave": "Output av DEL-kommandoen.",
+  "IRC_Channel_Users": "Output av kommandoen NAMES.",
+  "IRC_Channel_Users_End": "Slutten av utgangen av kommandoen NAMES.",
+  "IRC_Description": "Internet Relay Chat (IRC) er et tekstbasert gruppekommunikasjonsverktøy. Brukere blir tilknyttet unikt navngitte kanaler, eller rom, for åpen diskusjon. IRC støtter også private meldinger mellom individuelle brukere og fildelingsfunksjoner. Denne pakken integrerer disse lagene med funksjonalitet med Rocket.Chat.",
+  "IRC_Enabled": "Forsøk på å integrere IRC-støtte. Hvis du endrer denne verdien, må du starte Rocket.Chat på nytt.",
+  "IRC_Enabled_Alert": "IRC Support er et pågående arbeid. Bruk på et produksjonssystem anbefales ikke på dette tidspunktet.",
+  "IRC_Federation": "IRC-føderasjonen",
+  "IRC_Federation_Description": "Koble til andre IRC-servere.",
+  "IRC_Federation_Disabled": "IRC-føderasjonen er deaktivert.",
+  "IRC_Hostname": "IRC-vertsserveren for å koble til.",
+  "IRC_Login_Fail": "Output på en mislykket forbindelse til IRC-serveren.",
+  "IRC_Login_Success": "Output på en vellykket forbindelse til IRC-serveren.",
+  "IRC_Message_Cache_Size": "Cache grensen for utgående meldingshåndtering.",
+  "IRC_Port": "Porten å binde seg til på IRC-vertsserveren.",
+  "IRC_Private_Message": "Utgang av PRIVMSG-kommandoen.",
+  "IRC_Quit": "Output ved avslutte en IRC-økt.",
+  "is_typing": "skriver",
+  "Issue_Links": "Utgav trackerforbindelser",
+  "IssueLinks_Incompatible": "Advarsel: Ikke aktiver dette og 'Hex Color Preview' på samme tid.",
+  "IssueLinks_LinkTemplate": "Mal for utgavekoblinger",
+  "IssueLinks_LinkTemplate_Description": "Mal for utgavekoblinger; %s vil bli erstattet av problemnummeret.",
+  "It_works": "Det fungerer",
+  "It_Security": "IT-ikkerhet",
+  "Italic": "Kursiv",
+  "italics": "kursiv",
+  "Items_per_page:": "Elementer per side:",
+  "Job_Title": "Jobbtittel",
+  "Join": "Bli med",
+  "Join_with_password": "Bli med med passord",
+  "Join_audio_call": "Bli med på lydanrop",
+  "Join_call": "Bli med i samtalen",
+  "Join_Chat": "Bli med på Chat",
+  "Join_default_channels": "Bli med i standardkanaler",
+  "Join_the_Community": "Bli med i Fellesskapet",
+  "Join_the_given_channel": "Bli med på den oppgitte kanalen",
+  "Join_rooms": "Bli med rom",
+  "Join_video_call": "Bli med på videoanrop",
+  "Join_my_room_to_start_the_video_call": "Bli med i rommet mitt for å starte videosamtalen",
+  "join-without-join-code": "Bli med uten å delta koden",
+  "join-without-join-code_description": "Tillatelse til å omgå tilkoblingskoden i kanaler med tilkoblingskode aktivert",
+  "Joined": "Ble med",
+  "joined": "ble med",
+  "Joined_at": "Ble med klokken",
+  "JSON": "JSON",
+  "Jump": "Hoppe",
+  "Jump_to_first_unread": "Gå til første uleste",
+  "Jump_to_message": "Hopp til meldingen",
+  "Jump_to_recent_messages": "Hopp til siste meldinger",
+  "Just_invited_people_can_access_this_channel": "Bare inviterte personer kan få tilgang til denne kanalen.",
+  "kick-user-from-any-c-room": "Kast ut bruker fra alle offentlige Channel",
+  "kick-user-from-any-c-room_description": "Tillatelse til å sparke ut brukere fra alle offentlige kanaler",
+  "kick-user-from-any-p-room": "Spark brukeren fra private Channel",
+  "kick-user-from-any-p-room_description": "Tillatelse til å sparke en bruker fra private kanaler",
+  "Katex_Dollar_Syntax": "Tillat Dollar Syntax",
+  "Katex_Dollar_Syntax_Description": "Tillat bruk av $ katex blokk $ $ og $ inline katex $ syntakser",
+  "Katex_Enabled": "Katex Aktivert",
+  "Katex_Enabled_Description": "Tillat bruk av [katex](http://khan.github.io/KaTeX/) for matteoppsett i meldinger",
+  "Katex_Parenthesis_Syntax": "Tillat Parentesyntax",
+  "Katex_Parenthesis_Syntax_Description": "Tillat bruk av \\ [katex block \\] og \\ (inline katex \\) syntaksene",
+  "Keep_default_user_settings": "Hold standardinnstillingene",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Rediger forrige melding",
+  "Keyboard_Shortcuts_Keys_1": "Ctrl+ p",
+  "Keyboard_Shortcuts_Keys_2": "Pil opp",
+  "Keyboard_Shortcuts_Keys_3": "Kommando(eller Alt) + Venstre pil",
+  "Keyboard_Shortcuts_Keys_4": "Kommando(eller Alt) + Pil opp",
+  "Keyboard_Shortcuts_Keys_5": "Kommando(eller Alt) + Høyre pil",
+  "Keyboard_Shortcuts_Keys_6": "Kommando(eller Alt) + Pil ned",
+  "Keyboard_Shortcuts_Keys_7": "Skift+ Skriv inn",
+  "Keyboard_Shortcuts_Keys_8": "Shift (eller Ctrl) + ESC",
+  "Keyboard_Shortcuts_Mark_all_as_read": "Merker alle meldinger (i alle kanaler) som lest",
+  "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Flytt til begynnelsen av meldingen",
+  "Keyboard_Shortcuts_Move_To_End_Of_Message": "Flytt til slutten av meldingen",
+  "Keyboard_Shortcuts_New_Line_In_Message": "Ny linje i meldingen komponerer inngang",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Åpne kanal / brukersøk",
+  "Keyboard_Shortcuts_Title": "Tastatursnarveier",
+  "Knowledge_Base": "Kunnskapsbase",
+  "Label": "Etiketten",
+  "Language": "Språk",
+  "Language_Bulgarian": "Bulgarsk",
+  "Language_Chinese": "Kinesisk",
+  "Language_Czech": "Tsjekkisk",
+  "Language_Danish": "Dansk",
+  "Language_Dutch": "Nederlandsk",
+  "Language_English": "Engelsk",
+  "Language_Estonian": "Estisk",
+  "Language_Finnish": "Finsk",
+  "Language_French": "Fransk",
+  "Language_German": "Tysk",
+  "Language_Greek": "Gresk",
+  "Language_Hungarian": "Ungarsk",
+  "Language_Italian": "Italiensk",
+  "Language_Japanese": "Japansk",
+  "Language_Latvian": "Latvisk",
+  "Language_Lithuanian": "Litauisk",
+  "Language_Not_set": "Ingen spesifikk",
+  "Language_Polish": "Polsk",
+  "Language_Portuguese": "Portugisisk",
+  "Language_Romanian": "Rumensk",
+  "Language_Russian": "Russisk",
+  "Language_Slovak": "Slovakisk",
+  "Language_Slovenian": "Slovensk",
+  "Language_Spanish": "Spansk",
+  "Language_Swedish": "Svensk",
+  "Language_Version": "Engelsk versjon",
+  "Last_7_days": "Siste 7 dager",
+  "Last_15_days": "Siste 15 dager",
+  "Last_30_days": "Siste 30 dager",
+  "Last_90_days": "Siste 90 dager",
+  "Last_6_months": "Siste 6 måneder",
+  "Last_year": "I fjor",
+  "Last_active": "Sist aktiv",
+  "Last_Call": "Siste samtale",
+  "Last_login": "Siste innlogging",
+  "Last_Message": "Siste melding",
+  "Last_Message_At": "Siste melding på",
+  "Last_seen": "Sist sett",
+  "Launched_successfully": "Lansert vellykket",
+  "Layout": "Oppsett",
+  "Layout_Login_Hide_Logo": "Skjul logo",
+  "Layout_Login_Hide_Logo_Description": "Skjul logoen på påloggingssiden.",
+  "Layout_Login_Hide_Title": "Skjul tittel",
+  "Layout_Login_Hide_Title_Description": "Skjul tittelen på påloggingssiden.",
+  "Layout_Login_Template": "Påloggingsmal",
+  "Layout_Login_Template_Description": "Tilpass utseendet til påloggingssiden.",
+  "Layout_Login_Template_Vertical": "Vertikal",
+  "Layout_Login_Template_Horizontal": "Horisontal",
+  "Layout_Home_Title": "Hjemtittel",
+  "Layout_Login_Terms": "Innloggingsvilkår",
+  "Layout_Privacy_Policy": "Personvernerklæring",
+  "Layout_Home_Custom_Block_Visible": "Vis egendefinert innhold til hjemmesiden",
+  "Layout_Custom_Body_Only": "Kun vis tilpasset innhold",
+  "Layout_Sidenav_Footer": "Sidebeskrivelse Footer",
+  "Layout_Sidenav_Footer_description": "Footer størrelse er 260 x 70px",
+  "Layout_Sidenav_Footer_Dark_description": "Footer størrelse er 260 x 70px",
+  "Layout_Terms_of_Service": "Vilkår for bruk",
+  "LDAP": "LDAP",
+  "LDAP_Documentation": "LDAP-dokumentasjon",
+  "LDAP_Connection": "Forbindelse",
+  "LDAP_Connection_Authentication": "Autentisering",
+  "LDAP_Connection_Encryption": "Kryptering",
+  "LDAP_Connection_successful": "LDAP-tilkoblingen var vellykket ",
+  "LDAP_Connection_Timeouts": "Tidsavbrudd",
+  "LDAP_UserSearch": "Brukersøk",
+  "LDAP_UserSearch_Filter": "Søkefilter",
+  "LDAP_UserSearch_GroupFilter": "Gruppefilter",
+  "LDAP_DataSync": "Datasynkronisering",
+  "LDAP_DataSync_DataMap": "Kartlegging",
+  "LDAP_DataSync_Avatar": "Avatar",
+  "LDAP_DataSync_Advanced": "Avansert synkronisering",
+  "LDAP_DataSync_Roles": "Synkroniser roller",
+  "LDAP_DataSync_Channels": "Synkroniser kanaler",
+  "LDAP_DataSync_BackgroundSync": "Bakgrunnssynkronisering",
+  "LDAP_Server_Type": "Server Type",
+  "LDAP_Server_Type_Other": "Andre",
+  "LDAP_Advanced_Sync": "Avansert synkronisering",
+  "LDAP_Authentication": "Aktiver",
+  "LDAP_Authentication_Password": "Passord",
+  "LDAP_Authentication_UserDN": "Bruker DN",
+  "LDAP_Authentication_UserDN_Description": "LDAP-brukeren som utfører brukeroppslag for å autentisere andre brukere når de logger på.  \n Dette er vanligvis en tjenestekonto som er opprettet spesielt for tredjepartsintegrasjoner. Bruk et fullt kvalifisert navn, for eksempel `cn=Administrator,cn=Brukere,dc=Eksempel,dc=com`.",
+  "You_have_to_set_an_API_token_first_in_order_to_use_the_integration": "Du må sette en API-token først for å kunne bruke integrasjonen.",
+  "LDAP_Background_Sync": "Bakgrunnssynkronisering",
+  "LDAP_Background_Sync_Import_New_Users": "Bakgrunnssynkronisering Importer nye brukere",
+  "LDAP_Background_Sync_Import_New_Users_Description": "Vil importere alle brukere (basert på filterkriteriene) som finnes i LDAP og eksisterer ikke i Rocket.Chat",
+  "LDAP_Background_Sync_Interval": "Bakgrunnssynkroniseringsintervall",
+  "LDAP_Background_Sync_Interval_Description": "Intervallet mellom synkroniseringer. Eksempel \"hver 24. time\" eller \"på den første dagen i uken\", flere eksempler på [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated": "Bakgrunnssynkronisering Oppdater eksisterende brukere",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated_Description": "Vil synkronisere avataren, feltene, brukernavnet, etc (basert på konfigurasjonen) av alle brukere som allerede er importert fra LDAP på hver ** Sync Interval **",
+  "LDAP_Background_Sync_Merge_Existent_Users_Description": "Vil slå sammen alle brukere (basert på dine filterkriterier) som finnes i LDAP og også finnes i Rocket.Chat. For å aktivere dette, aktiver \"Slå sammen eksisterende brukere\"-innstillingen i kategorien Datasynkronisering.",
+  "LDAP_BaseDN": "Base DN",
+  "LDAP_BaseDN_Description": "Det fullt kvalifiserte Distinguished Name (DN) av en LDAP-subtree du vil søke etter brukere og grupper. Du kan legge til så mange som du liker; Hver gruppe må imidlertid defineres i samme domenebase som brukerne som tilhører den. Eksempel: `ou = Brukere + ou = Prosjekter, dc = Eksempel, dc = com`. Hvis du angir begrensede brukergrupper, er det bare brukere som tilhører disse gruppene. Vi anbefaler at du angir toppnivået til LDAP-katalogtreet ditt som domenebase og bruk søkefilter for å kontrollere tilgangen.",
+  "LDAP_CA_Cert": "CA Cert",
+  "LDAP_Connect_Timeout": "Tilkoblingstidsavbrudd (ms)",
+  "LDAP_DataSync_AutoLogout": "Automatisk utlogging av deaktiverte brukere",
+  "LDAP_Default_Domain": "Standard domenenavn",
+  "LDAP_Default_Domain_Description": "Hvis det leveres, vil standarddomenet brukes til å lage en unik e-post for brukere der e-post ikke ble importert fra LDAP. E-posten vil bli montert som `brukernavn@default_domai` eller`unique_id@default_domain`.  \n Eksempel: `rocket.chat`",
+  "LDAP_Enable": "Aktiver",
+  "LDAP_Enable_Description": "Forsøk å bruke LDAP for autentisering.",
+  "LDAP_Enable_LDAP_Groups_To_RC_Teams": "Aktiver teamkartlegging fra LDAP til Rocket.Chat",
+  "LDAP_Encryption": "kryptering",
+  "LDAP_Encryption_Description": "Krypteringsmetoden brukes til å sikre kommunikasjon til LDAP-serveren. Eksempler er \"plain\" (ingen kryptering), `SSL / LDAPS` (kryptert fra starten) og` StartTLS` (oppgradering til kryptert kommunikasjon når den er tilkoblet).",
+  "LDAP_Find_User_After_Login": "Finn bruker etter innlogging",
+  "LDAP_Find_User_After_Login_Description": "Vil utføre et søk av brukerens DN etter bind for å sikre at bindingen var vellykket for å forhindre innlogging med tomme passord når det ble tillatt av AD-konfigurasjonen.",
+  "LDAP_Group_Filter_Enable": "Aktiver LDAP-brukergruppefilter",
+  "LDAP_Group_Filter_Enable_Description": "Begrens tilgang til brukere i en LDAP-gruppe  \n Nyttig for OpenLDAP-servere uten overlegg som ikke tillater *memberOf* filter",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Gruppe ID-egenskap",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "F.eks **OpenLDAP:** `cn`",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Gruppemedlemskap",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "F.eks **OpenLDAP:** `uniqueMember`",
+  "LDAP_Group_Filter_Group_Member_Format": "Gruppemedlemsformat",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "F.eks * OpenLDAPs: * uid = # {brukernavn}, ou = brukere, o = Company, c = com",
+  "LDAP_Group_Filter_Group_Name": "Gruppenavn",
+  "LDAP_Group_Filter_Group_Name_Description": "Gruppens navn som det tilhører brukeren",
+  "LDAP_Group_Filter_ObjectClass": "Gruppe ObjectClass",
+  "LDAP_Group_Filter_ObjectClass_Description": "Den *objektklasse* som identifiserer gruppene.  \n f.eks. **OpenLDAP:** `groupOfUniqueNames`",
+  "LDAP_Groups_To_Rocket_Chat_Teams": "Teamkartlegging fra LDAP til Rocket.Chat.",
+  "LDAP_Host": "Vert",
+  "LDAP_Host_Description": "LDAP-verten, f.eks. `ldap.example.com` eller` 10.0.0.30`.",
+  "LDAP_Idle_Timeout": "Idle Timeout (ms)",
+  "LDAP_Idle_Timeout_Description": "Hvor mange millisekunder venter etter den siste LDAP-operasjonen til du lukker tilkoblingen. (Hver operasjon åpner en ny tilkobling)",
+  "LDAP_Import_Users_Description": "Den ekte synkroniseringsprosessen vil importere alle LDAP-brukere  \n *Forsiktig!* Angi søkefilter for ikke å importere overskytende brukere.",
+  "LDAP_Internal_Log_Level": "Internt loggnivå",
+  "LDAP_Login_Fallback": "Logg inn Fallback",
+  "LDAP_Login_Fallback_Description": "Hvis påloggingen på LDAP ikke lykkes, prøv å logge inn i standard / lokalt kontosystem. Hjelper når LDAP er nede av en eller annen grunn.",
+  "LDAP_Merge_Existing_Users": "Slå sammen eksisterende brukere",
+  "LDAP_Merge_Existing_Users_Description": "* Forsiktig! * Når du importerer en bruker fra LDAP, og en bruker med samme brukernavn allerede eksisterer, blir LDAP-info og passord satt inn i den eksisterende brukeren.",
+  "LDAP_Port": "Havn",
+  "LDAP_Port_Description": "Port for å få tilgang til LDAP. f.eks .: `389` eller` 636` for LDAPS",
+  "LDAP_Prevent_Username_Changes": "Hindre LDAP-brukere fra å endre Rocket.Chat-brukernavnet sitt",
+  "LDAP_Query_To_Get_User_Teams": "LDAP-spørring for å få brukergrupper",
+  "LDAP_Reconnect": "koble",
+  "LDAP_Reconnect_Description": "Prøv å koble til igjen automatisk når tilkoblingen avbrytes av en eller annen grunn mens du utfører operasjoner",
+  "LDAP_Reject_Unauthorized": "Avvis Uautorisert",
+  "LDAP_Reject_Unauthorized_Description": "Deaktiver dette alternativet for å tillate sertifikater som ikke kan verifiseres. Vanligvis vil selvsignerte sertifikater kreve at dette alternativet er deaktivert for å fungere",
+  "LDAP_Search_Page_Size": "Søkeformat",
+  "LDAP_Search_Page_Size_Description": "Maksimalt antall innføringer hver resultatside vil returnere for å bli behandlet",
+  "LDAP_Search_Size_Limit": "Søk størrelsesgrense",
+  "LDAP_Search_Size_Limit_Description": "Maksimalt antall oppføringer som skal returneres.  \n **Oppmerksomhet** Dette nummeret skal være større enn **Søk på sidestørrelse**",
+  "LDAP_Sync_Custom_Fields": "Synkroniser egendefinerte felter",
+  "LDAP_Sync_AutoLogout_Enabled": "Aktiver automatisk utlogging",
+  "LDAP_Sync_AutoLogout_Interval": "Intervall for automatisk utlogging",
+  "LDAP_Sync_Now": "Bakgrunnssynkronisering nå",
+  "LDAP_Sync_Now_Description": "Vil utføre **Background Sync** nå i stedet for å vente **Sync Interval** selv om **Bakgrunnssynkronisering** er False.  \n Denne handlingen er asynkron, se loggene for mer informasjon om prosess",
+  "LDAP_Sync_User_Active_State_Both": "Aktiver og deaktiver brukere",
+  "LDAP_Sync_User_Active_State_Disable": "Deaktiver brukere",
+  "LDAP_Sync_User_Active_State_Nothing": "Ikke gjør noe",
+  "LDAP_Sync_User_Avatar": "Synkroniser User Avatar",
+  "LDAP_Sync_User_Data_Roles": "Synkroniser LDAP-grupper",
+  "LDAP_Sync_User_Data_Channels": "Automatisk synkroniser LDAP-grupper til kanaler",
+  "LDAP_Sync_User_Data_Channels_Admin": "Kanaladministrator",
+  "LDAP_Sync_User_Data_Roles_AutoRemove": "Fjern brukerroller automatisk",
+  "LDAP_Sync_User_Data_Roles_Filter": "Brukergruppefilter",
+  "LDAP_Timeout": "Timeout (ms)",
+  "LDAP_Timeout_Description": "Hvor mange milesekunder venter på et søkeresultat før du returnerer en feil",
+  "LDAP_Unique_Identifier_Field": "Unikt identifikasjonsfelt",
+  "LDAP_Unique_Identifier_Field_Description": "Hvilket felt vil bli brukt til å koble LDAP-brukeren og Rocket.Chat-brukeren. Du kan informere flere verdier adskilt av komma for å prøve å få verdien fra LDAP-posten.  \n Standardverdien er `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
+  "LDAP_User_Found": "LDAP-bruker funnet",
+  "LDAP_User_Search_Field": "Søkefelt",
+  "LDAP_User_Search_Field_Description": "LDAP-attributtet som identifiserer LDAP-brukeren som forsøker godkjenning. Dette feltet skal være `sAMAccountName` for de fleste Active Directory-installasjoner, men det kan være` uid` for andre LDAP-løsninger, for eksempel OpenLDAP. Du kan bruke `e-post 'til å identifisere brukere via e-post eller hva som helst attributt du vil.  \n Du kan bruke flere verdier adskilt av komma for å tillate brukere å logge inn ved hjelp av flere identifikatorer som brukernavn eller e-post.",
+  "LDAP_User_Search_Filter": "Filter",
+  "LDAP_User_Search_Filter_Description": "Hvis det er spesifisert, vil bare brukere som samsvarer med dette filteret få lov til å logge inn. Hvis ikke noe filter er spesifisert, kan alle brukere innenfor omfanget av den angitte domenebasen logge inn.  \n E.g. for Active Directory `memberOf = cn = ROCKET_CHAT, ou = Generelle grupper`.  \n f.eks. for OpenLDAP (utvidbart søkeord) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_User_Search_Scope": "omfang",
+  "LDAP_Username_Field": "Brukernavn felt",
+  "LDAP_Username_Field_Description": "Hvilket felt vil bli brukt som *brukernavn* for nye brukere. Legg igjen tomt for å bruke brukernavnet informert på innloggingssiden.  \n Du kan også bruke maltekoder, som `#{givenName}.#{Sn}`.  \n Standardverdien er `sAMAccountName`.",
+  "LDAP_Username_To_Search": "Brukernavn å søke etter",
+  "Lead_capture_email_regex": "Lead capture email regex",
+  "Lead_capture_phone_regex": "Lead capture phone regex",
+  "Learn_more": "Lære mer",
+  "Learn_more_about_agents": "Finn ut mer om agenter",
+  "Learn_more_about_business_hours": "Finn ut mer om åpningstider",
+  "Learn_more_about_contacts": "Finn ut mer om kontakter",
+  "Learn_more_about_custom_fields": "Finn ut mer om egendefinerte felter",
+  "Learn_more_about_conversations": "Finn ut mer om samtaler",
+  "Learn_more_about_departments": "Lær mer om avdelinger",
+  "Learn_more_about_SLA_policies": "Lær mer om SLA-retningslinjer",
+  "Leave": "Forlat rom",
+  "Leave_a_comment": "Legg igjen en kommentar",
+  "Leave_Group_Warning": "Er du sikker på at du vil forlate gruppen \"%s\"?",
+  "Leave_Livechat_Warning": "Er du sikker på at du vil forlate livechat med \"%s\"?",
+  "Leave_Private_Warning": "Er du sikker på at du vil legge diskusjonen med \"%s\"?",
+  "Leave_room": "Forlat rom",
+  "Leave_Room_Warning": "Er du sikker på at du vil forlate rommet \"%s\"?",
+  "Leave_the_current_channel": "La den nåværende kanalen gå",
+  "leave-c": "La kanaler",
+  "leave-c_description": "Tillatelse til å forlate kanaler",
+  "leave-p": "Legg igjen private grupper",
+  "leave-p_description": "Tillatelse til å forlate private grupper",
+  "Let_them_know": "La dem vite",
+  "License": "Tillatelse",
+  "Line": "Linje",
+  "Link": "Lenke",
+  "List_of_Channels": "Liste over kanaler",
+  "List_of_Direct_Messages": "Liste over direkte meldinger",
+  "Livechat": "Livechat",
+  "Livechat_agents": "Livechat agenter",
+  "Livechat_Agents": "Agenter",
+  "Livechat_allow_manual_on_hold_Description": "Hvis aktivert, vil agenten få muligheten til å sette en chat på vent",
+  "Livechat_AllowedDomainsList": "Livechat Tillatte Domener",
+  "Livechat_Appearance": "Livechat-utseende",
+  "Livechat_Dashboard": "Livechat Dashboard",
+  "Livechat_enabled": "Livechat aktivert",
+  "Livechat_forward_open_chats": "Videresend åpne chatter",
+  "Livechat_forward_open_chats_timeout": "Timeout (i sekunder) for å videresende chat",
+  "Livechat_guest_count": "Gjesteteller",
+  "Livechat_Inquiry_Already_Taken": "Livechat forespørsel allerede tatt",
+  "Livechat_managers": "Livechat-ledere",
+  "Livechat_maximum_queue_wait_time": "Maksimal ventetid i kø",
+  "Livechat_offline": "Livechat offline",
+  "Omnichannel_On_Hold_manually": "Chatten ble manuelt satt på vent av {{user}}",
+  "Livechat_online": "Livechat online",
+  "Omnichannel_placed_chat_on_hold": "Chat på vent: {{comment}}",
+  "Omnichannel_hide_conversation_after_closing": "Skjul samtalen etter lukking",
+  "Livechat_Queue": "Livechat Queue",
+  "Livechat_registration_form": "Registreringsskjema",
+  "Livechat_room_count": "Livechat Room Count",
+  "Livechat_Routing_Method": "Livechat Routing Method",
+  "Livechat_Take_Confirm": "Vil du ta denne klienten?",
+  "Livechat_title": "Livechat-tittel",
+  "Livechat_title_color": "Livechat-tittel Bakgrunnsfarge",
+  "Livechat_transfer_return_to_the_queue": "{{from}} satte chatten tilbake i køen",
+  "Livechat_transfer_to_agent": "{{from}} overførte chatten til {{to}}",
+  "Livechat_transfer_to_agent_with_a_comment": "{{from}} overførte chatten til {{to}} med en kommentar: {{comment}}",
+  "Livechat_transfer_to_agent_auto_transfer_unanswered_chat": "{{from}} overførte chatten til {{to}} siden den var ubesvart i {{duration}} sekunder",
+  "Livechat_transfer_to_department": "{{from}} overførte chatten til avdelingen {{to}}",
+  "Livechat_transfer_to_department_with_a_comment": "{{from}} overførte chatten til avdelingen {{to}} med en kommentar: {{comment}}",
+  "Livechat_Users": "Livechat-brukere",
+  "Livestream_close": "Lukk Livestream",
+  "Livestream_enable_audio_only": "Aktiver kun lydmodus",
+  "Livestream_not_found": "Livestream ikke tilgjengelig",
+  "Livestream_popout": "Åpne Livestream",
+  "Livestream_source_changed_succesfully": "Livestream-kilden ble endret",
+  "Livestream_switch_to_room": "Bytt til dagens romstrøm",
+  "Livestream_url": "Livestream kilde URL",
+  "Livestream_url_incorrect": "Livestream url er feil",
+  "Load_Balancing": "Lastbalansering",
+  "Load_more": "Last mer",
+  "Loading": "Laster",
+  "Loading_more_from_history": "Laster mer fra historien",
+  "Loading_suggestion": "Laster inn forslag",
+  "Loading...": "Laster inn ...",
+  "Local_Time": "Lokal tid",
+  "Local_Time_time": "Lokal tid: {{time}}",
+  "Localization": "lokalisering",
+  "Location": "Lokasjon",
+  "Log_Exceptions_to_Channel": "Log unntak fra kanal",
+  "Log_Exceptions_to_Channel_Description": "En kanal som vil motta alle fanget unntak. La være tom for å ignorere unntak.",
+  "Log_File": "Vis fil og linje",
+  "Log_Level": "Lognivå",
+  "Log_Package": "Vis pakke",
+  "Log_Trace_Methods": "Spormetode samtaler",
+  "Log_Trace_Methods_Filter": "Spormetode filter",
+  "Log_Trace_Methods_Filter_Description": "Teksten her vil bli vurdert som RegExp (`ny RegExp ('text')`). Hold det tomt for å vise spor av hver samtale.",
+  "Log_Trace_Subscriptions": "Spor abonnementssamtaler",
+  "Log_Trace_Subscriptions_Filter": "Spor abonnement filter",
+  "Log_Trace_Subscriptions_Filter_Description": "Teksten her vil bli vurdert som RegExp (`ny RegExp ('text')`). Hold det tomt for å vise spor av hver samtale.",
+  "Log_View_Limit": "Logggrense",
+  "Logged_out_of_other_clients_successfully": "Logget ut av andre klienter",
+  "Login": "Logg inn",
+  "Login_with": "Logg inn med%s",
+  "Logistics": "logistikk",
+  "Logout": "Logg ut",
+  "Logout_Others": "Logg ut fra andre logget på steder",
+  "Logout_Device": "Logg ut enhet",
+  "Logs": "Logger",
+  "Low": "Lav",
+  "Lowest": "Laveste",
+  "Mail_Message_Invalid_emails": "Du har oppgitt en eller flere ugyldige e-poster:%s",
+  "Mail_Message_Missing_to": "Du må velge en eller flere brukere eller gi en eller flere e-postadresser, skilt av kommaer.",
+  "Mail_Message_No_messages_selected_select_all": "Du har ikke valgt noen meldinger",
+  "Mail_Messages": "E-postmeldinger",
+  "Mail_Messages_Instructions": "Velg hvilke meldinger du vil sende via e-post ved å klikke på meldingene",
+  "Mail_Messages_Subject": "Her er en valgt del av%s meldinger",
+  "mail-messages": "E-postmeldinger",
+  "mail-messages_description": "Tillatelse til å bruke alternativet for e-postmeldinger",
+  "Mailer": "Mailer",
+  "Mailer_body_tags": "Du <b>må</b> bruke [unsubscribe] for unsubscription linken.<br/>Du kan bruke [navn], [fname], [lname] for brukerens fulle navn, fornavn eller etternavn.<br/>Du kan bruke [e-post] for brukerens e-post.",
+  "Mailing": "mailing",
+  "Make_Admin": "Gjør admin",
+  "Make_sure_you_have_a_copy_of_your_codes_1": "Kontroller at du har en kopi av kodene dine:",
+  "Make_sure_you_have_a_copy_of_your_codes_2": "Hvis du mister tilgang til autentiseringsprogrammet, kan du bruke en av disse kodene for å logge inn.",
+  "manage-apps": "Administrer apper",
+  "manage-assets": "Administrer eiendeler",
+  "manage-assets_description": "Tillatelse til å administrere serverenes eiendeler",
+  "manage-emoji": "Administrer Emoji",
+  "manage-emoji_description": "Tillatelse til å administrere server emojis",
+  "messages_pruned": "meldinger beskjæres",
+  "manage-integrations": "Administrer integrasjoner",
+  "manage-integrations_description": "Tillatelse til å administrere serverintegrasjonene",
+  "manage-oauth-apps": "Administrer Oauth Apps",
+  "manage-oauth-apps_description": "Tillatelse til å administrere serveren Oauth apps",
+  "manage-own-integrations": "Administrer egne integrasjoner",
+  "manage-own-integrations_description": "Tillatelse slik at brukerne kan opprette og redigere egen integrasjon eller webhooks",
+  "manage-sounds": "Administrer lyder",
+  "manage-sounds_description": "Tillatelse til å administrere serverlyder",
+  "manage-the-app": "Administrer appen",
+  "Manager_added": "Manager lagt til",
+  "Manager_removed": "Manager fjernet",
+  "Managing_assets": "Administrere eiendeler",
+  "Managing_integrations": "Administrere integrasjoner",
+  "Manufacturing": "produksjon",
+  "MapView_Enabled": "Aktiver kartvisning",
+  "MapView_Enabled_Description": "Aktivering av kartvisning vil vise en plasseringstasteknapp til venstre for chatinputfeltet.",
+  "MapView_GMapsAPIKey": "Google Static Maps API-nøkkel",
+  "MapView_GMapsAPIKey_Description": "Dette kan hentes fra Google Developers Console gratis.",
+  "Mark_all_as_read": "`%s` - Merk alle meldinger (i alle kanaler) som lest",
+  "Mark_as_read": "Merk som lest",
+  "Mark_as_unread": "Merk som ulest",
+  "Mark_unread": "Merk som ulest",
+  "Marketplace_app_last_updated": "Sist oppdatert {{lastUpdated}}",
+  "MAU_value": "MAU {{value}}",
+  "Max_length_is": "Maks lengde er%s",
+  "Max_number_of_chats_per_agent": "Maks antall samtidige chatter",
+  "Max_number_of_chats_per_agent_description": "Maks antall samtidige chatter en agent kan delta i",
+  "Max_Retry": "Maksimalt antall forsøk på å koble til serveren på nytt",
+  "Maximum": "Maksimum",
+  "Maximum_number_of_guests_reached": "Maksimalt antall gjester er nådd",
+  "Me": "Meg",
+  "Media": "Media",
+  "Medium": "Medium",
+  "Members": "Medlemmer",
+  "Members_List": "Medlemsliste",
+  "mention-all": "Nevne alt",
+  "mention-all_description": "Tillatelse til å bruke @all nevne",
+  "Mentions_all_room_members": "Omtaler alle medlemmer av rommet",
+  "Mentions_online_room_members": "Omtaler alle påloggede medlemmer av rommet",
+  "Mentions_user": "Omtaler bruker",
+  "Mentions_channel": "Omtaler kanalen",
+  "Mentions_you": "Omtaler deg",
+  "mention-here": "Nevn her",
+  "mention-here_description": "Tillatelse til å bruke @here mention",
+  "Mentions": "nevner",
+  "Mentions_default": "Mentjoner (standard)",
+  "Mentions_only": "Kun mentene",
+  "Merge_Channels": "Flett kanaler",
+  "message": "melding",
+  "Message": "Beskjed",
+  "Message_Description": "Konfigurer meldingsinnstillinger.",
+  "Message_AllowBadWordsFilter": "Tillat melding om dårlig ord filtrering",
+  "Message_AllowDeleting": "Tillat melding å slette",
+  "Message_AllowDeleting_BlockDeleteInMinutes": "Blokker melding som slettes etter (n) minutter",
+  "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Angi 0 for å deaktivere blokkering.",
+  "Message_AllowDirectMessagesToYourself": "Tillat bruker direkte meldinger til deg selv",
+  "Message_AllowEditing": "Tillat meldingredigering",
+  "Message_AllowEditing_BlockEditInMinutes": "Blokker meldingsredigering etter (n) minutter",
+  "Message_AllowEditing_BlockEditInMinutesDescription": "Angi 0 for å deaktivere blokkering.",
+  "Message_AllowPinning": "Tillat meldingspinne",
+  "Message_AllowPinning_Description": "Tillat at meldinger festes til noen av kanalene.",
+  "Message_AllowStarring": "Tillat meldingstasting",
+  "Message_AllowUnrecognizedSlashCommand": "Tillat ukjente slashkommandoer",
+  "Message_AlwaysSearchRegExp": "Søk alltid med RegExp",
+  "Message_AlwaysSearchRegExp_Description": "Vi anbefaler at du sier «True» hvis språket ikke støttes på [Søk etter MongoDB tekst](https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages).",
+  "Message_Attachments": "Melding Vedlegg",
+  "Message_with_attachment": "Melding med vedlegg",
+  "Report_sent": "Rapport sendt",
+  "Message_Audio": "Lydmelding",
+  "Message_Audio_bitRate": "Lydmelding Bitrate",
+  "Message_AudioRecorderEnabled": "Lydopptaker aktivert",
+  "Message_AudioRecorderEnabled_Description": "Krever \"lyd / mp3\" -filer som en akseptert medietype i \"Filopplasting\" -innstillinger.",
+  "Message_BadWordsFilterList": "Legg til dårlige ord i svartelisten",
+  "Message_BadWordsFilterListDescription": "Legg til Liste over Kommaseparert liste over dårlige ord å filtrere",
+  "Message_DateFormat": "Datoformat",
+  "Message_DateFormat_Description": "Se også: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
+  "Message_deleting_blocked": "Denne meldingen kan ikke slettes lenger",
+  "Message_editing": "Meldingsredigering",
+  "Message_ErasureType": "Melding Erasure Type",
+  "Message_ErasureType_Delete": "Slett alle meldinger",
+  "Message_ErasureType_Description": "Bestem hva du skal gjøre med meldinger til brukere som fjerner kontoen sin.",
+  "Message_ErasureType_Keep": "Hold meldinger og brukernavn",
+  "Message_ErasureType_Unlink": "Fjern koblingen mellom bruker og meldinger",
+  "Message_GlobalSearch": "Global søk",
+  "Message_GroupingPeriod": "Grupperingstid (i sekunder)",
+  "Message_GroupingPeriodDescription": "Meldinger vil bli gruppert med forrige melding hvis begge er fra samme bruker og den forløpte tiden var mindre enn informert tid i sekunder.",
+  "Message_has_been_edited": "Meldingen er redigert",
+  "Message_has_been_edited_at": "Meldingen ble redigert  {{date}}",
+  "Message_has_been_edited_by": "Meldingen ble redigert av {{username}}",
+  "Message_has_been_edited_by_at": "Meldingen ble redigert av {{username}} den {{date}}",
+  "Message_has_been_forwarded": "Meldingen er videresendt",
+  "Message_HideType_au": "Skjul \"User Added\" meldinger",
+  "Message_HideType_mute_unmute": "Skjul \"User Muted / Unmuted\" meldinger",
+  "Message_HideType_ru": "Skjul \"Bruker fjernet\" meldinger",
+  "Message_HideType_uj": "Skjul \"User Join\" meldinger",
+  "Message_HideType_ul": "Skjul \"User Leave\" meldinger",
+  "Message_HideType_wm": "Skjul velkomstmeldinger",
+  "Message_Id": "Meldings-ID",
+  "Message_Ignored": "Denne meldingen ble ignorert",
+  "Message_info": "Melding info",
+  "Message_KeepHistory": "Behold beskjed om redigering av meldinger",
+  "Message_MaxAll": "Maksimal kanalstørrelse for ALL Melding",
+  "Message_MaxAllowedSize": "Maksimalt tillatte tegn per melding",
+  "Message_pinning": "Melding pinne",
+  "Message_QuoteChainLimit": "Maksimalt antall kjedede tilbud",
+  "Message_Read_Receipt_Enabled": "Vis Les kvitteringer",
+  "Message_Read_Receipt_Store_Users": "Detaljert Les kvitteringer",
+  "Message_Read_Receipt_Store_Users_Description": "Viser hver brukers leserkvitteringer",
+  "Message_removed": "Melding fjernet",
+  "Message_is_removed": "melding fjernet",
+  "Message_sent_by_email": "Melding sendt via e-post",
+  "Message_ShowDeletedStatus": "Vis slettet status",
+  "Message_starring": "Melding med hovedrollen",
+  "Message_Time": "Meldingstid",
+  "Message_TimeAndDateFormat": "Tid og datoformat",
+  "Message_TimeAndDateFormat_Description": "Se også: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
+  "Message_TimeFormat": "Tidsformat",
+  "Message_TimeFormat_Description": "Se også: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
+  "Message_too_long": "Melding for lenge",
+  "Message_UserId": "Bruker-ID",
+  "Message_view_mode_info": "Dette endrer mengden plassmeldinger som tas opp på skjermen.",
+  "Message_VideoRecorderEnabled": "Videoopptaker aktivert",
+  "Message_VideoRecorderEnabledDescription": "Krever at video / webm-filer skal være en akseptert medietype i \"Filopplastings\" -innstillinger.",
+  "messages": "meldinger",
+  "Messages": "meldinger",
+  "Messages_selected": "Meldinger er valgt",
+  "Messages_sent": "Meldinger sendt",
+  "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Meldinger som sendes til Incoming WebHook vil bli lagt ut her.",
+  "Meta": "Meta",
+  "Meta_custom": "Egendefinerte Meta Tags",
+  "Meta_fb_app_id": "Facebook App Id",
+  "Meta_google-site-verification": "Google Site Verification",
+  "Meta_language": "Språk",
+  "Meta_msvalidate01": "MSValidate.01",
+  "Meta_robots": "roboter",
+  "meteor_status_connected": "Tilkoblet",
+  "meteor_status_connecting": "Kobler til...",
+  "meteor_status_failed": "Servertilkoblingen mislyktes",
+  "meteor_status_offline": "Frakoblet modus.",
+  "meteor_status_reconnect_in_one": "prøver igjen om {{count}} sekunder...",
+  "meteor_status_reconnect_in_other": "prøver igjen om {{count}} sekunder...",
+  "meteor_status_try_now_offline": "Koble til igjen",
+  "meteor_status_try_now_waiting": "Prøv nå",
+  "meteor_status_waiting": "Venter på serverforbindelse,",
+  "Method": "Metode",
+  "Mic_on": "Mikrofon på",
+  "Microphone": "Mikrofon",
+  "Microphone_access_not_allowed": "Mikrofontilgang var ikke tillatt, sjekk nettleserinnstillingene.",
+  "Mic_off": "Mikrofon av",
+  "Min_length_is": "Min lengde er%s",
+  "Minimum": "Minimum",
+  "Minimum_balance": "Minimumsbalanse",
+  "minute": "minutt",
+  "minutes": "minutter",
+  "Missing_configuration": "Manglende konfigurasjon",
+  "Mobex_sms_gateway_from_number": "Fra",
+  "Mobex_sms_gateway_password": "Passord",
+  "Mobex_sms_gateway_username": "Brukernavn",
+  "Mobile": "Mobil",
+  "Mobile_Push_Notifications_Default_Alert": "Standardvarsler for mobilvarsler",
+  "Moderation_Show_reports": "Vis rapporter",
+  "Moderation_Go_to_message": "Gå til melding",
+  "Moderation_Delete_message": "Slett melding",
+  "Moderation_Dismiss_and_delete": "Avvis og slett",
+  "Moderation_Delete_this_message": "Slett meldingen",
+  "Moderation_Message_context_header": "Rapporterte melding(er)",
+  "Moderation_Action_View_reports": "Se rapporterte meldinger",
+  "Moderation_Hide_reports": "Skjul rapporter",
+  "Moderation_Deactivate_User": "Deaktiver bruker",
+  "Moderation_User_deactivated": "Bruker deaktivert",
+  "Moderation_Delete_all_messages": "Slett alle meldinger",
+  "Moderation_Duplicate_messages": "Dupliserte meldinger",
+  "Moderation_Reports": "Rapporter",
+  "Moderation_Reported_message": "Rapportert melding",
+  "Moderation_Message_already_deleted": "Meldingen er allerede slettet",
+  "Moderation_Reset_user_avatar": "Tilbakestill brukeravatar",
+  "Moderation_See_messages": "Se meldinger",
+  "Moderation_Avatar_reset_success": "Avatar tilbakestilt",
+  "Moderation_User_deleted_warning": "Brukeren som sendte meldingen(e) eksisterer ikke lenger eller er slettet.",
+  "Monday": "mandag",
+  "Mongo_version": "Mongo versjon",
+  "MongoDB": "MongoDB",
+  "MongoDB_Deprecated": "MongoDB avviklet",
+  "Monitor_history_for_changes_on": "Overvåk historikk for endringer på",
+  "Monthly_Active_Users": "Månedlige aktive brukere",
+  "More": "Mer",
+  "More_channels": "Flere kanaler",
+  "More_direct_messages": "Flere direkte meldinger",
+  "More_groups": "Flere private grupper",
+  "More_unreads": "Flere diskusjoner",
+  "Most_recent_updated": "Sist oppdatert",
+  "Move_beginning_message": "`%s` - Flytt til begynnelsen av meldingen",
+  "Move_end_message": "`%s` - Flytt til slutten av meldingen",
+  "Move_queue": "Flytt til køen",
+  "Msgs": "meld",
+  "multi": "multi",
+  "Multi_line": "Flerlinje",
+  "Mute": "Demp",
+  "Mute_and_dismiss": "Demp og avvis",
+  "Mute_all_notifications": "Slå av alle varsler",
+  "Mute_Focused_Conversations": "Mute Fokuserte samtaler",
+  "Mute_Group_Mentions": "Mute @all og @here nevner",
+  "Mute_someone_in_room": "Stum på noen i rommet",
+  "Mute_user": "Stopp brukeren",
+  "Mute_microphone": "Demp mikrofon",
+  "mute-user": "Slå av brukeren",
+  "mute-user_description": "Tillatelse til å dempe andre brukere i samme kanal",
+  "Muted": "dempet",
+  "My Data": "Mine data",
+  "My_Account": "Min konto",
+  "My_location": "Min posisjon",
+  "n_messages": "%s meldinger",
+  "N_new_messages": "%s nye meldinger",
+  "Name": "Navn",
+  "Name_cant_be_empty": "Navn kan ikke være tomt",
+  "Name_of_agent": "Navn på agent",
+  "Name_optional": "Navn (valgfritt)",
+  "Name_Placeholder": "Vennligst skriv inn navnet ditt...",
+  "Navigation": "Navigasjon",
+  "Navigation_bar": "Navigasjonslinje",
+  "Navigation_History": "Navigasjonshistorikk",
+  "Next": "Neste",
+  "Never": "Aldri",
+  "New": "Ny",
+  "New_Application": "Ny applikasjon",
+  "New_Call": "Ny samtale",
+  "New_chat_in_queue": "Ny chat i kø",
+  "New_contact": "Ny kontakt",
+  "New_Custom_Field": "Nytt tilpasset felt",
+  "New_Department": "Ny avdeling",
+  "New_discussion": "Ny diskusjon",
+  "New_discussion_name": "Et meningsfylt navn for diskusjonsrommet",
+  "New_Email_Inbox": "Ny e-postinnboks",
+  "New_integration": "Ny integrering",
+  "New_line_message_compose_input": "`%s` - Ny linje i meldingen komponerer inngang",
+  "New_logs": "Nye logger",
+  "New_Message_Notification": "Ny melding om melding",
+  "New_messages": "Nye meldinger",
+  "New_password": "Nytt passord",
+  "New_Password_Placeholder": "Vennligst oppgi nytt passord ...",
+  "New_SLA_Policy": "Ny SLA-retningslinje ",
+  "New_role": "Ny rolle",
+  "New_Room_Notification": "Nytt romvarsling",
+  "New_Tag": "Ny tagg",
+  "New_Trigger": "Ny utløser",
+  "New_Unit": "Ny enhet",
+  "New_users": "Nye brukere",
+  "New_user": "Ny bruker",
+  "New_version_available_(s)": "Ny versjon tilgjengelig (%s)",
+  "New_videocall_request": "Ny videosamtaleforespørsel",
+  "New_visitor_navigation": "Ny navigasjon: {{history}}",
+  "New_workspace_confirmed": "Nytt arbeidsområde bekreftet",
+  "New_workspace": "Nytt arbeidsområdet",
+  "Newer_than": "Nyere enn",
+  "Newer_than_may_not_exceed_Older_than": "\"Nyere enn\" kan ikke overstige \"Eldre enn\"",
+  "Nickname": "Kallenavn",
+  "Nickname_Placeholder": "Skriv inn kallenavnet ditt...",
+  "No": "Nei",
+  "No_available_agents_to_transfer": "Ingen tilgjengelige agenter for å overføre",
+  "No_channels_yet": "Du er ikke en del av en kanal ennå",
+  "No_chats_yet": "Ingen chatter ennå",
+  "No_chats_yet_description": "Alle chattene dine vises her.",
+  "No_calls_yet": "Ingen anrop enda",
+  "No_calls_yet_description": "Alle dine anrop vil vises her.",
+  "No_contacts_yet": "Ingen kontakter enda",
+  "No_contacts_yet_description": "Alle kontakter vil vises her.",
+  "No_custom_fields_yet": "Foreløpig ingen egendefinerte felter",
+  "No_departments_yet": "Enda ingen avdelinger",
+  "No_direct_messages_yet": "Ingen direkte meldinger.",
+  "No_Discussions_found": "Ingen diskusjoner funnet",
+  "No_discussions_yet": "Ingen diskusjoner enda",
+  "No_emojis_found": "Ingen emojier funnet",
+  "No_Encryption": "Ingen kryptering",
+  "No_files_found": "Ingen filer funnet",
+  "No_files_left_to_download": "Ingen filer igjen å laste ned",
+  "No_groups_yet": "Du har ingen private grupper enda.",
+  "No_history": "Ingen historikk",
+  "No_integration_found": "Ingen integrasjon funnet av den oppgitte id.",
+  "No_Limit": "Ingen grense",
+  "No_livechats": "Du har ingen livechats",
+  "No_members_found": "Ingen medlemmer funnet",
+  "No_mentions_found": "Ingen meldinger funnet",
+  "No_messages_yet": "Ingen meldinger ennå",
+  "No_pages_yet_Try_hitting_Reload_Pages_button": "Ingen sider ennå. Prøv å trykke på \"Last inn sider\" -knappen.",
+  "No_pinned_messages": "Ingen pinnede meldinger",
+  "No_previous_chat_found": "Ingen tidligere chat funnet",
+  "No_results_found": "Ingen resultater",
+  "No_results_found_for": "Ingen resultater funnet for:",
+  "No_SLA_policies_yet": "Ingen SLA-retningslinjer enda",
+  "No_snippet_messages": "Ingen utdrag",
+  "No_starred_messages": "Ingen stjernemerkede meldinger",
+  "No_such_command": "Ingen slik kommando: `/ {{command}}`",
+  "No_Threads": "Ingen tråder funnet",
+  "Nobody_available": "Ingen tilgjengelig",
+  "Node_version": "Node Versjon",
+  "None": "None",
+  "Nonprofit": "nonprofit",
+  "Not_authorized": "Ikke autorisert",
+  "Normal": "Normal",
+  "Not_Available": "Ikke tilgjengelig",
+  "Not_assigned": "Ikke tildelt",
+  "Not_found_or_not_allowed": "Ikke funnet eller ikke tillatt",
+  "Not_in_channel": "Ikke i kanalen",
+  "Not_started": "Ikke påbegynt",
+  "Not_Visible_To_Workspace": "Ikke synlig for arbeidsområdet",
+  "Nothing": "Ingenting",
+  "Nothing_found": "Ingenting funnet",
+  "Notification_Desktop_Default_For": "Vis skrivebordsvarsler for",
+  "Notification_Push_Default_For": "Push Mobile Notifications For",
+  "Notifications": "Påminnelser",
+  "Notifications_Max_Room_Members": "Maksimumsrom medlemmer før deaktivere alle meldingsvarsler",
+  "Notifications_Max_Room_Members_Description": "Maks antall medlemmer i rommet når meldinger for alle meldinger blir deaktivert. Brukere kan fortsatt endre seg per rominnstilling for å motta alle varsler på individuell basis. (0 for å deaktivere)",
+  "Notifications_Muted_Description": "Hvis du velger å dempe alt, vil du ikke se romlyset i listen når det er nye meldinger, med unntak av nevner. Muting notifikasjoner vil overstyre meldingsinnstillinger.",
+  "Notifications_Preferences": "Meldingsinnstillinger",
+  "Notifications_Sound_Volume": "Meldinger lydvolum",
+  "Notify_active_in_this_room": "Gi beskjed til aktive brukere i dette rommet",
+  "Notify_all_in_this_room": "Gi beskjed om alt i dette rommet",
+  "Now_Its_Visible_For_Everyone": "Nå er det synlig for alle",
+  "Default_Server_Timezone": "Server-tidssone",
+  "Default_Custom_Timezone": "Egendefinert tidssone",
+  "Default_User_Timezone": "Brukerens nåværende tidssone",
+  "Num_Agents": "# Agenter",
+  "Number_in_seconds": "Antall i sekunder",
+  "Number_of_events": "Antall hendelser",
+  "Number_of_messages": "Antall meldinger",
+  "Number_of_most_recent_chats_estimate_wait_time": "Antall nylige chatter for å beregne estimert ventetid",
+  "Number_of_most_recent_chats_estimate_wait_time_description": "Dette tallet definerer antall sist betjente rom som skal brukes til å beregne ventetid for kø.",
+  "OAuth": "OAuth",
+  "OAuth_Application": "OAuth Application",
+  "Objects": "objekter",
+  "Off": "Av",
+  "Off_the_record_conversation": "Off-record-samtalen",
+  "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-record-samtalen er ikke tilgjengelig for nettleseren eller enheten din.",
+  "Office_Hours": "Kontortid",
+  "Office_hours_enabled": "Kontortimer aktivert",
+  "Office_hours_updated": "Kontortid oppdatert",
+  "offline": "frakoblet",
+  "Offline": "offline",
+  "Offline_DM_Email": "Direkte e-post-emne",
+  "Offline_Email_Subject_Description": "Du kan bruke følgende plassholdere:  \n - `[Site_Name]`, `[Site_URL]`, [User] og [Room] for henholdsvis søknadens navn, URL, brukernavn og romnavn. ",
+  "Offline_form": "Offline skjema",
+  "Offline_form_unavailable_message": "Frakoblet skjema Utilgjengelig melding",
+  "Offline_Link_Message": "GÅ TIL MELDING",
+  "Offline_Mention_All_Email": "Nevn alt e-post emne",
+  "Offline_Mention_Email": "Nevn e-post",
+  "Offline_message": "Frakoblet melding",
+  "Offline_success_message": "Frakoblet suksessmelding",
+  "Offline_unavailable": "Frakoblet utilgjengelig",
+  "Ok": "Ok",
+  "Old Colors": "Gamle farger",
+  "Older_than": "Eldre enn",
+  "Omnichannel_External_Frame_Encryption_JWK": "Krypteringsnøkkel (JWK)",
+  "omnichannel_sla_change_history": "SLA-retningslinjene er endret: {{user}} endret SLA-retningslinjene til {{sla}}",
+  "Omnichannel_enable_department_removal": "Aktiver fjerning av avdeling",
+  "Omnichannel_enable_department_removal_alert": "Fjernede avdelinger kan ikke gjenopprettes, vi anbefaler å arkivere avdelingen i stedet.",
+  "Omnichannel_Reports_Status_Open": "Åpne",
+  "Omnichannel_Reports_Status_Closed": "Lukket",
+  "Omnichannel_Reports_Channels_Empty_Subtitle": "Dette diagrammet viser de mest brukte kanalene.",
+  "Omnichannel_Reports_Departments_Empty_Subtitle": "Dette diagrammet viser avdelingene som mottar flest samtaler.",
+  "Omnichannel_Reports_Status_Empty_Subtitle": "Dette diagrammet vil oppdateres så snart samtalene starter.",
+  "Omnichannel_Reports_Tags_Empty_Subtitle": "Dette diagrammet viser de mest brukte taggene.",
+  "Omnichannel_Reports_Agents_Empty_Subtitle": "Dette diagrammet viser hvilke agenter som mottar det høyeste volumet av samtaler.",
+  "On": "På",
+  "On_Hold": "På vent",
+  "On_Hold_Chats": "På vent",
+  "On_Hold_conversations": "Samtaler på vent",
+  "online": "på nett",
+  "Online": "på nett",
+  "Only_authorized_users_can_write_new_messages": "Kun autoriserte brukere kan skrive nye meldinger",
+  "Only_authorized_users_can_react_to_messages": "Kun autoriserte brukere kan reagere på meldinger",
+  "Only_from_users": "Bare beskjære innhold fra disse brukerne (la tomt for å beskjære alles innhold)",
+  "Only_On_Desktop": "Skrivebordsmodus (sendes bare med enter på skrivebordet)",
+  "Only_you_can_see_this_message": "Bare du kan se denne meldingen",
+  "Only_invited_users_can_acess_this_channel": "Bare inviterte brukere har tilgang til denne kanalen",
+  "Oops_page_not_found": "Ups, siden ble ikke funnet",
+  "Oops!": "Oops",
+  "Person_Or_Channel": "Person eller Channel",
+  "Open": "Åpne",
+  "Open_call": "Åpen samtale",
+  "Open_call_in_new_tab": "Åpne samtale i ny fane",
+  "Open_channel_user_search": "`%s` - Åpne kanal / brukeresøk",
+  "Open_conversations": "Åpne samtaler",
+  "Open_Days": "Åpne dager",
+  "Open_days_of_the_week": "Åpen dager i uken",
+  "Open_Dialpad": "Åpne tastaturet",
+  "Open_directory": "Åpne katalogen",
+  "Open_Livechats": "Åpne Livechats",
+  "Open_Outlook": "Åpne Outlook",
+  "Open_settings": "Åpne innstillinger",
+  "Open_thread": "Åpne tråd",
+  "Opened": "åpnet",
+  "Opened_in_a_new_window": "Åpnet i nytt vindu.",
+  "Opens_a_channel_group_or_direct_message": "Åpner en kanal, gruppe eller direkte melding",
+  "Optional": "Valgfri",
+  "optional": "valgfri",
+  "Options": "Egenskaper",
+  "or": "eller",
+  "Or_talk_as_anonymous": "Eller snakk så anonymt",
+  "Order": "Rekkefølge",
+  "Organization_Email": "Organisasjons Email",
+  "Organization_Info": "Organisasjonsinfo",
+  "Organization_Name": "Organisasjonsnavn",
+  "Organization_Type": "Organisasjonstype",
+  "Original": "Opprinnelig",
+  "OS": "OS",
+  "OS_Arch": "OS Arch",
+  "OS_Cpus": "OS CPU Count",
+  "OS_Freemem": "OS Free Memory",
+  "OS_Loadavg": "OS Load Average",
+  "OS_Platform": "OS plattform",
+  "OS_Release": "OS Release",
+  "OS_Totalmem": "OS totalt minne",
+  "OS_Type": "OS Type",
+  "OS_Uptime": "OS oppetid",
+  "Other": "Andre",
+  "others": "andre",
+  "Others": "Andre",
+  "OTR": "OTR",
+  "OTR_is_only_available_when_both_users_are_online": "OTR er bare tilgjengelig når begge brukerne er online",
+  "outbound-voip-calls": "Utgående VoIP-anrop",
+  "Outgoing": "Utgående",
+  "Outgoing_WebHook": "Utgående WebHook",
+  "Outgoing_WebHook_Description": "Få data ut av Rocket.Chat i sanntid.",
+  "Outlook_authentication": "Outlook-autentisering",
+  "Outlook_authentication_disabled": "Outlook-autentisering er deaktivert",
+  "Outlook_calendar": "Outlook-kalender",
+  "Outlook_calendar_settings": "Outlook-kalenderinnstillinger",
+  "Outlook_Calendar": "Outlook-kalender",
+  "Outlook_Calendar_Enabled": "aktivert",
+  "Outlook_Calendar_Outlook_Url": "Outlook URL",
+  "Outlook_Calendar_Outlook_Url_Description": "URL som brukes til å starte Outlook-nettappen.",
+  "Output_format": "Utgående format",
+  "Outlook_Sync_Failed": "Kunne ikke laste inn Outlook-hendelser.",
+  "Outlook_Sync_Success": "Outlook-hendelser synkronisert.",
+  "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Overstyr URL-adressen til hvilke filer som lastes opp. Denne nettadressen brukes også til nedlastinger med mindre en CDN er gitt",
+  "Owner": "Eier",
+  "Page_not_exist_or_not_permission": "Siden eksisterer ikke, eller du har kanskje ikke tilgangstillatelse",
+  "Page_not_found": "Fant ikke siden",
+  "Page_title": "Side tittel",
+  "Page_URL": "Side URL",
+  "Pages": "Sider",
+  "Parent_channel_doesnt_exist": "Channel finnes ikke.",
+  "Participants": "Deltakere",
+  "Password": "Passord",
+  "Password_Change_Disabled": "Din Rocket.Chat-administrator har deaktivert endring av passord",
+  "Password_Changed_Description": "Du kan bruke følgende plassholdere:\n - `[passord]` for det midlertidige passordet.\n - `[navn]`, `[fname]`, `[lname]` for henholdsvis brukerens fulle navn, fornavn eller etternavn.\n - `[email]` for brukerens e-post.\n - `[Site_Name]` og `[Site_URL]` for henholdsvis applikasjonsnavn og URL.",
+  "Password_Changed_Email_Subject": "[Site_Name] - Passord endret",
+  "Password_changed_section": "Passord endret",
+  "Password_changed_successfully": "Passordet ble endret",
+  "Password_History": "Passordhistorikk",
+  "Password_History_Amount": "Lengde på passordhistorikk",
+  "Password_History_Amount_Description": "Antall sist brukte passord for å hindre brukere i å gjenbruke.",
+  "Password_must_have": "Passordet må ha:",
+  "Password_Policy": "Passordpolicy",
+  "Password_Policy_Aria_Description": "Nedenfor er det oppført verifikasjoner av passordkrav",
+  "Password_must_meet_the_complexity_requirements": "Passordet må oppfylle kompleksitetskravene.",
+  "Password_to_access": "Passord for tilgang",
+  "Passwords_do_not_match": "passordene er ikke like",
+  "Past_Chats": "Tidligere Chats",
+  "Paste_here": "Lim inn her...",
+  "Paste": "Lim inn",
+  "Pause": "Pause",
+  "Paste_error": "Kunne ikke lese fra utklippstavlen",
+  "Paid_Apps": "Betalte apper",
+  "Payload": "nyttelast",
+  "PDF": "PDF",
+  "People": "Mennesker",
+  "Permalink": "permalink",
+  "Permissions": "tillatelser",
+  "Personal_Access_Tokens": "Personlige tilgangstokener",
+  "Phone": "Telefon",
+  "Phone_call": "Telefonsamtale",
+  "Phone_Number": "Telefonnummer",
+  "Thank_you_exclamation_mark": "Takk skal du ha!",
+  "Thank_You_For_Choosing_RocketChat": "Takk for at du valgte Rocket.Chat!",
+  "Phone_already_exists": "Telefonen finnes allerede",
+  "Phone_number": "Telefonnummer",
+  "PID": "PID",
+  "Pin_Message": "Pin melding",
+  "pin-message": "Pin melding",
+  "pin-message_description": "Tillatelse til å knytte en melding i en kanal",
+  "Pinned_a_message": "Pinned en melding:",
+  "Pinned_Messages": "Pinned Meldinger",
+  "PiwikAdditionalTrackers": "Ekstra Piwik-områder",
+  "PiwikAdditionalTrackers_Description": "Skriv inn tilleggs-Piwik-nettadresser og SiteIDs i følgende format hvis du vil spore de samme dataene på forskjellige nettsteder: [{\"trackerURL\": \"https: //my.piwik.domain2/\", \"siteId\": 42}, {\"trackerURL\": \"https: //my.piwik.domain3/\", \"siteId\": 15}]",
+  "PiwikAnalytics_cookieDomain": "Alle underdomener",
+  "PiwikAnalytics_cookieDomain_Description": "Spor besøkende over alle underdomener",
+  "PiwikAnalytics_domains": "Skjul utgående koblinger",
+  "PiwikAnalytics_domains_Description": "Skjul klikk til kjente alias-nettadresser i rapporten 'Utstillinger'. Vennligst sett inn ett domene per linje og bruk ikke noen separatorer.",
+  "PiwikAnalytics_prependDomain": "Prepend Domain",
+  "PiwikAnalytics_prependDomain_Description": "Forbedre nettsteddomenet til sidetittelen når du sporer",
+  "PiwikAnalytics_siteId_Description": "Nettstedet ID for å identifisere dette nettstedet. Eksempel: 17",
+  "PiwikAnalytics_url_Description": "Den url hvor Piwik er bosatt, sørg for å inkludere den bakre skråstreken. Eksempel: `https://piwik.rocket.chat/`",
+  "Placeholder_for_email_or_username_login_field": "Plassholder for e-post eller brukernavn påloggingsfelt",
+  "Placeholder_for_password_login_field": "Plassholder for passordloggfelt",
+  "Platform_Windows": "Windows",
+  "Platform_Linux": "Linux",
+  "Platform_Mac": "Mac",
+  "Please_add_a_comment": "Vennligst legg til en kommentar",
+  "Please_add_a_comment_to_close_the_room": "Vennligst legg til en kommentar for å lukke rommet",
+  "Please_answer_survey": "Ta et øyeblikk for å svare på en rask undersøkelse om denne chatten",
+  "Please_enter_usernames": "Vennligst skriv inn brukernavn ...",
+  "please_enter_valid_domain": "Vennligst skriv inn et gyldig domene",
+  "Please_enter_value_for_url": "Vennligst skriv inn en verdi for nettadressen til avataren din.",
+  "Please_enter_your_new_password_below": "Vennligst skriv inn ditt nye passord nedenfor:",
+  "Please_enter_your_password": "Vennligst skriv inn passordet ditt",
+  "Please_fill_a_label": "Vennligst fyll ut en etikett",
+  "Please_fill_a_name": "Vennligst fyll inn et navn",
+  "Please_fill_a_username": "Vennligst fyll inn et brukernavn",
+  "Please_fill_all_the_information": "Vennligst fyll ut all informasjonen",
+  "Please_fill_name_and_email": "Vennligst fyll inn navn og e-post",
+  "Please_select_an_user": "Vennligst velg en bruker",
+  "Please_select_enabled_yes_or_no": "Vennligst velg et alternativ for Aktivert",
+  "Please_select_visibility": "Vennligst velg an synlighet",
+  "Please_wait": "Vennligst vent",
+  "Please_wait_activation": "Vennligst vent, dette kan ta litt tid.",
+  "Please_wait_while_OTR_is_being_established": "Vent mens OTR etableres",
+  "Please_wait_while_your_account_is_being_deleted": "Vennligst vent mens kontoen din blir slettet ...",
+  "Please_wait_while_your_profile_is_being_saved": "Vennligst vent mens profilen din blir lagret ...",
+  "Policies": "Retningslinjer",
+  "Port": "Havn",
+  "Post_as": "Legg inn som",
+  "Post_to_Channel": "Legg til i kanal",
+  "Post_to_s_as_s": "Legg til <strong>%s</strong> som <strong>%s</strong>",
+  "post-readonly": "Post OnlyOnly",
+  "post-readonly_description": "Tillatelse til å legge inn en melding i en skrivebeskyttet kanal",
+  "Preferences": "Preferanser",
+  "Preferences_saved": "Innstillinger lagret",
+  "Preparing_list_of_channels": "Forbereder kanalliste",
+  "Preparing_list_of_messages": "Forbereder meldingsliste",
+  "Preparing_list_of_users": "Forbereder brukerliste",
+  "Presence": "Tilstedeværelse",
+  "Preview": "Forhåndsvisning",
+  "preview-c-room": "Forhåndsvis offentlig kanal",
+  "preview-c-room_description": "Tillatelse til å vise innholdet i en offentlig kanal før de ble med",
+  "Previous_month": "Forrige måned",
+  "Previous_week": "Forrige uke",
+  "Price": "Pris",
+  "Priorities": "Prioriteringer",
+  "Priority": "Prioritering",
+  "Priority_saved": "Prioritering lagret",
+  "Priority_removed": "Prioritering fjernet",
+  "Priorities_restored": "Prioriteringer gjenopprettet",
+  "Privacy": "Privatliv",
+  "Privacy_Policy": "Personvernerklæring",
+  "Privacy_policy": "Personvernerklæring",
+  "Privacy_summary": "Personvernsammendrag",
+  "Private": "Privat",
+  "private": "privat",
+  "Private_channels": "Private kanaler",
+  "Private_Apps": "Private apper",
+  "Private_Channel": "Privat kanal",
+  "Private_Channels": "Private kanaler",
+  "Private_Chats": "Private chatter",
+  "Private_Group": "Privat gruppe",
+  "Private_Groups": "Private grupper",
+  "Private_Groups_list": "Liste over private grupper",
+  "Private_Team": "Privat team",
+  "Productivity": "Produktivitet",
+  "Profile": "Profil",
+  "Profile_details": "Profildetaljer",
+  "Profile_picture": "Profilbilde",
+  "Profile_saved_successfully": "Profilen er lagret vellykket",
+  "Prometheus": "Prometheus",
+  "Prune": "Sviske",
+  "Prune_finished": "Prune ferdig",
+  "Prune_Messages": "Beskjære meldinger",
+  "Prune_Modal": "Er du sikker på at du vil beskjære disse meldingene? Beskjærte meldinger kan ikke gjenopprettes.",
+  "Prune_Warning_after": "Dette vil slette alle %s i %s etter %s.",
+  "Prune_Warning_all": "Dette vil slette alle %s i %s!",
+  "Prune_Warning_before": "Dette vil slette alle %s i %s før %s.",
+  "Prune_Warning_between": "Dette vil slette alle %s i %s mellom %s og %s.",
+  "Pruning_files": "Beskjæring av filer ...",
+  "Pruning_messages": "Beskjæring av meldinger ...",
+  "Public": "Offentlig",
+  "public": "offentlig",
+  "Public_Channel": "Offentlig kanal",
+  "Public_Channels": "Offentlige kanaler",
+  "Public_Community": "Offentlig fellesskap",
+  "Public_URL": "Offentlig URL",
+  "Purchased": "Anskaffet",
+  "Push": "Trykk",
+  "Push_apn_cert": "APN-sertifisering",
+  "Push_apn_dev_cert": "APN Dev Cert",
+  "Push_apn_dev_key": "APN Dev-nøkkel",
+  "Push_apn_dev_passphrase": "APN Dev Passphrase",
+  "Push_apn_key": "APN-nøkkel",
+  "Push_apn_passphrase": "APN Passphrase",
+  "Push_enable": "Aktiver",
+  "Push_enable_gateway": "Aktiver Gateway",
+  "Push_gateway": "Inngangsport",
+  "Push_gcm_api_key": "GCM API-nøkkel",
+  "Push_gcm_project_number": "GCM prosjektnummer",
+  "Push_production": "Produksjon",
+  "Push_show_message": "Vis melding i varsling",
+  "Push_show_username_room": "Vis kanal / gruppe / brukernavn i varsling",
+  "Push_test_push": "Test",
+  "Query": "Spørsmål",
+  "Query_description": "Tilleggsbetingelser for å bestemme hvilke brukere som skal sende e-posten til. Uberegnede brukere blir automatisk fjernet fra spørringen. Det må være et gyldig JSON. Eksempel: \"{\" createdAt \": {\" $ gt \": {\" $ date \":\" 2015-01-01T00: 00: 00.000Z \"}}}\"",
+  "Query_is_not_valid_JSON": "Spørringen er ikke gyldig JSON",
+  "Queue": "Kø",
+  "Queued": "Satt i kø",
+  "Queues": "Køer",
+  "Queue_Time": "Køtid",
+  "Queue_management": "Køstyring",
+  "quote": "sitat",
+  "Quote": "Sitat",
+  "Random": "Tilfeldig",
+  "Rate Limiter": "Frekvensbegrensning ",
+  "Rate Limiter_Description": "Kontroller frekvensen av forespørsler som sendes eller mottas av serveren din for å forhindre cyberangrep og skraping.",
+  "React_when_read_only": "Tillat reaksjon",
+  "React_when_read_only_changed_successfully": "Tillat å reagere når bare lest ble endret",
+  "Reacted_with": "Reagert med",
+  "Reactions": "reaksjoner",
+  "Read_by": "Les av",
+  "Read_only": "Les bare",
+  "Readability": "Lesbarhet",
+  "This_room_is_read_only": "Dette rommet er kun skrivebeskyttet",
+  "Read_only_changed_successfully": "Bare lest endret",
+  "Read_only_channel": "Les kun kanal",
+  "Read_only_group": "Read Only Group",
+  "Real_Estate": "Eiendom",
+  "RealName_Change_Disabled": "Din Rocket.Chat-administrator har deaktivert endring av navn",
+  "Reason_To_Join": "Årsak til å bli med",
+  "Receive_alerts": "Motta varsler",
+  "Receive_Group_Mentions": "Motta @all og @here nevner",
+  "Receive_login_notifications": "Motta påloggingsvarsler",
+  "Receive_Login_Detection_Emails": "Motta påloggingsdeteksjons-e-poster",
+  "Receive_Login_Detection_Emails_Description": "Motta en e-post hver gang en ny pålogging oppdages på kontoen din.",
+  "Record": "Ta opp",
+  "recording": "opptak",
+  "Redirect_URI": "Omdirigere URI",
+  "Refresh_keys": "Oppdater nøkler",
+  "Refresh_oauth_services": "Oppdater OAuth-tjenester",
+  "Refresh_your_page_after_install_to_enable_screen_sharing": "Oppdater siden din etter installasjon for å aktivere skjermdeling",
+  "Regenerate_codes": "Regenerere koder",
+  "Register": "Registrer en ny konto",
+  "Register_Server": "Registrer server",
+  "Register_Server_Info": "Bruk forhåndsdefinerte gateways og proxyer fra Rocket.Chat Technologies Corp.",
+  "Register_Server_Opt_In": "Nyhetsbrev, tilbud og produktoppdateringer",
+  "Register_Server_Registered": "Registrer deg for å få tilgang",
+  "Register_Server_Registered_Livechat": "Livechat omnichannel proxy",
+  "Register_Server_Registered_Marketplace": "Apps Marketplace",
+  "Register_Server_Registered_OAuth": "OAuth-proxy for sosialt nettverk",
+  "Register_Server_Registered_Push_Notifications": "Mobile push notifications gateway",
+  "Register_Server_Standalone": "Hold deg fritt, må du",
+  "Register_Server_Standalone_Own_Certificates": "Kompompilere de mobile appene med dine egne sertifikater",
+  "Register_Server_Standalone_Service_Providers": "Opprett kontoer hos tjenesteleverandører",
+  "Register_Server_Standalone_Update_Settings": "Oppdater de forhåndsinnstilte innstillingene",
+  "Registration": "Registrering",
+  "Registration_Succeeded": "Registrering lyktes",
+  "Registration_via_Admin": "Registrering via Admin",
+  "Regular_Expressions": "Vanlig uttrykk",
+  "Reject_call": "Avvis anrop",
+  "Release": "Utgivelse",
+  "Releases": "Utgivelser",
+  "Religious": "Religiøs",
+  "Reload": "Last",
+  "Reload_page": "Last inn siden på nytt",
+  "Reload_Pages": "Oppdater sidene",
+  "Remove": "Fjerne",
+  "Remove_Admin": "Fjern Admin",
+  "Remove_as_leader": "Fjern som leder",
+  "Remove_as_moderator": "Fjern som moderator",
+  "Remove_as_owner": "Fjern som eier",
+  "Remove_Channel_Links": "Fjern kanallenker",
+  "Remove_custom_oauth": "Fjern tilpasset oauth",
+  "Remove_from_room": "Fjern fra rommet",
+  "Remove_from_team": "Fjern fra teamet",
+  "Remove_last_admin": "Fjerner siste admin",
+  "Remove_someone_from_room": "Fjern noen fra rommet",
+  "remove-team-channel": "Fjern Teamkanal",
+  "remove-user": "Fjern bruker",
+  "remove-user_description": "Tillatelse til å fjerne en bruker fra et rom",
+  "Removed": "fjernet",
+  "Removed_User": "Fjernet bruker",
+  "Removed__roomName__from_this_team": "<strong>fjernet</strong> #{{roomName}} fra dette teamet",
+  "Removed__username__from_team": "<strong>fjernet</strong> @{{user_removed}} fra dette teamet",
+  "Removed__roomName__from_the_team": "fjernet #{{roomName}} fra dette teamet",
+  "Removed__username__from_the_team": "fjernet @{{user_removed}} fra dette teamet",
+  "Reply": "Svare",
+  "Reply_in_direct_message": "Svar i direktemelding",
+  "Reply_in_thread": "Svar i tråden",
+  "Reply_via_Email": "Svar via e-post",
+  "ReplyTo": "Svare på",
+  "Reports": "Rapporter",
+  "Report_Abuse": "Rapporter misbruk",
+  "Report_exclamation_mark": "Rapportere!",
+  "Report_this_message_question_mark": "Rapporter denne meldingen?",
+  "Report_User": "Rapporter bruker",
+  "Reporting": "rapportering",
+  "Request_comment_when_closing_conversation_description": "Hvis aktivert, må agenten angi en kommentar før samtalen avsluttes.",
+  "requests": "forespørsler",
+  "Requests": "Forespørsler",
+  "Requested": "Forespurt",
+  "Requested_At": "Forespurt klokken",
+  "Requested_By": "Forespurt av",
+  "Required": "Påkrevd",
+  "required": "påkrevd",
+  "Require_all_tokens": "Krev alle tokens",
+  "Require_any_token": "Krev noen token",
+  "Require_password_change": "Krev passordendring",
+  "Resend_verification_email": "Send bekreftelsesmeldingen på nytt",
+  "Reset": "Tilbakestill",
+  "Reset_priorities": "Tilbakestill prioriteter",
+  "Reset_Connection": "Tilbakestill tilkobling",
+  "Reset_E2E_Key": "Tilbakestill E2E-nøkkel",
+  "Reset_password": "Tilbakestilling av passord",
+  "Reset_section_settings": "Tilbakestill til standardinnstillinger",
+  "Reset_TOTP": "Tilbakestill TOTP",
+  "Responding": "Svarer",
+  "Restart": "Omstart",
+  "Restart_the_server": "Start serveren på nytt",
+  "restart-server": "Start serveren på nytt",
+  "restart-server_description": "Tillatelse til å starte serveren på nytt",
+  "Results": "Resultater",
+  "Resume": "Gjenoppta",
+  "Retail": "Detaljhandel",
+  "Retention_setting_changed_successfully": "Retenspolicyinnstillingen ble endret",
+  "RetentionPolicy": "Retensjonspolitikk",
+  "RetentionPolicy_AppliesToChannels": "Gjelder kanaler",
+  "RetentionPolicy_AppliesToDMs": "Gjelder direkte meldinger",
+  "RetentionPolicy_AppliesToGroups": "Gjelder for private grupper",
+  "RetentionPolicy_Description": "Beskytter automatisk gamle meldinger over Rocket.Chat-forekomsten din.",
+  "RetentionPolicy_Enabled": "aktivert",
+  "RetentionPolicy_ExcludePinned": "Ekskluder pinnede meldinger",
+  "RetentionPolicy_FilesOnly": "Bare slett filer",
+  "RetentionPolicy_FilesOnly_Description": "Bare filer vil bli slettet, meldingene selv vil forbli på plass.",
+  "RetentionPolicy_MaxAge": "Maksimal meldingsalder",
+  "RetentionPolicy_MaxAge_Channels": "Maksimal meldingsalder i kanaler",
+  "RetentionPolicy_MaxAge_Description": "Beskjær alle meldinger som er eldre enn denne verdien, i dager",
+  "RetentionPolicy_MaxAge_DMs": "Maksimal meldingsalder i direkte meldinger",
+  "RetentionPolicy_MaxAge_Groups": "Maksimal meldingsalder i private grupper",
+  "RetentionPolicy_Precision": "Timer Precision",
+  "RetentionPolicy_Precision_Description": "Hvor ofte prune timer skal løpe. Innstilling av dette til en mer presis verdi gjør at kanaler med raske retensjonstidtakere fungerer bedre, men kan koste ekstra prosessorkraft på store lokalsamfunn.",
+  "RetentionPolicyRoom_Enabled": "Beskjær automatisk gamle meldinger",
+  "RetentionPolicyRoom_ExcludePinned": "Ekskluder pinnede meldinger",
+  "RetentionPolicyRoom_FilesOnly": "Bare beskjyll filer, hold beskjeder",
+  "RetentionPolicyRoom_MaxAge": "Maksimal meldingsalder i dager (standard: {{max}})",
+  "RetentionPolicyRoom_OverrideGlobal": "Overstyr global retensjonspolicy",
+  "RetentionPolicyRoom_ReadTheDocs": "Pass på! Å endre disse innstillingene uten ytterst forsiktighet kan ødelegge all meldingshistorikk. Les dokumentasjonen før du slår på funksjonen <a href=\"https://docs.rocket.chat/use-rocket.chat/workspace-administration/settings/retention-policies\">her</a>her.",
+  "Retry": "Prøv på nytt",
+  "Required_action": "Påkrevd handling",
+  "Notes": "Notater",
+  "Unsafe_Url": "Usikker URL",
+  "Role": "rolle",
+  "Roles": "Roller",
+  "Role_Editing": "Rollredigering",
+  "Role_Mapping": "Rollekobling",
+  "Role_removed": "Rolle fjernet",
+  "Room": "Rom",
+  "Room_announcement_changed_successfully": "Rommeldingen ble endret",
+  "Room_archivation_state": "Tilstand",
+  "Room_archivation_state_false": "Aktiv",
+  "Room_archivation_state_true": "arkivert",
+  "Room_archived": "Rom arkivert",
+  "room_changed_announcement": "Rommeldingen endret til: {{room_announcement}}av {{user_by}}",
+  "room_changed_avatar": "Romavatar endret av {{user_by}}",
+  "room_changed_description": "Rombeskrivelsen endret til: {{room_description}}av {{user_by}}",
+  "room_changed_privacy": "Romtype er endret til: {{room_type}}av {{user_by}}",
+  "room_changed_topic": "Romemne endret til: {{room_topic}}av {{user_by}}",
+  "room_changed_type": "endret rommet til {{room_type}}",
+  "room_changed_topic_to": "endret rommets emne til {{room_topic}}",
+  "Room_default_change_to_private_will_be_default_no_more": "Dette er en standardkanal, og endring av den til en privat gruppe vil føre til at den ikke lenger er en standardkanal. Vil du fortsette?",
+  "Room_description_changed_successfully": "Rombeskrivelsen ble endret",
+  "room_disallowed_reactions": "ikke tillatte reaksjoner",
+  "Room_has_been_archived": "Rom har blitt arkivert",
+  "Room_has_been_converted": "Room er konvertert",
+  "Room_has_been_created": "Room er opprettet",
+  "Room_has_been_removed": "Room er fjernet",
+  "Room_has_been_unarchived": "Rom har blitt arkivert",
+  "Room_Info": "Rominformasjon",
+  "room_is_blocked": "Dette rommet er blokkert",
+  "room_account_deactivated": "Denne kontoen er deaktivert",
+  "room_is_read_only": "Dette rommet er kun skrivebeskyttet",
+  "room_name": "Romnavn",
+  "Room_name_changed": "Romnavnet endret til: {{room_name}}av {{user_by}}",
+  "Room_name_changed_to": "endret romnavn til {{room_name}}",
+  "Room_name_changed_successfully": "Romnavnet ble endret",
+  "Room_not_exist_or_not_permission": "Rommet eksisterer ikke eller du har ikke tilgang",
+  "Room_not_found": "Rom ikke funnet",
+  "Room_password_changed_successfully": "Rompassordet ble endret",
+  "Room_Status_Open": "Åpen",
+  "Room_topic_changed_successfully": "Romemne endret seg vellykket",
+  "Room_type_changed_successfully": "Romtype er endret",
+  "Room_type_of_default_rooms_cant_be_changed": "Dette er et standardrom, og typen kan ikke endres, vennligst kontakt med administratoren din.",
+  "Room_unarchived": "Rom unarchived",
+  "Room_updated_successfully": "Rommet ble oppdatert!",
+  "Room_uploaded_file_list": "Filer Liste",
+  "Room_uploaded_file_list_empty": "Ingen filer tilgjengelig.",
+  "Rooms": "Rom",
+  "Rooms_added_successfully": "Romet ble lagt til",
+  "Run_only_once_for_each_visitor": "Kjør bare én gang for hver besøkende",
+  "run-import": "Kjør import",
+  "run-import_description": "Tillatelse til å kjøre importørene",
+  "run-migration": "Kjør migrering",
+  "run-migration_description": "Tillatelse til å kjøre overføringene",
+  "Running_Instances": "Kjører forekomster",
+  "Runtime_Environment": "Runtime Environment",
+  "S_new_messages_since_s": "%s nye meldinger siden%s",
+  "S_new_messages": "%s nye meldinger",
+  "Same_As_Token_Sent_Via": "Samme som \"Token Sent Via\"",
+  "Same_Style_For_Mentions": "Samme stil for nevner",
+  "SAML": "SAML",
+  "SAML_Connection": "Tilkobling",
+  "SAML_General": "Generell",
+  "SAML_Custom_Cert": "Tilpasset sertifikat",
+  "SAML_Custom_Debug": "Aktiver feilsøking",
+  "SAML_Custom_Entry_point": "Tilpasset oppføringspunkt",
+  "SAML_Custom_Generate_Username": "Generer brukernavn",
+  "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO Omadresser URL",
+  "SAML_Custom_Immutable_Property_EMail": "E-post",
+  "SAML_Custom_Immutable_Property_Username": "Brukernavn",
+  "SAML_Custom_Issuer": "Tilpasset utsteder",
+  "SAML_Custom_Logout_Behaviour": "Logout Behavior",
+  "SAML_Custom_Logout_Behaviour_End_Only_RocketChat": "Kun logg ut fra Rocket.Chat",
+  "SAML_Custom_Logout_Behaviour_Terminate_SAML_Session": "Avslutt SAML-økten",
+  "SAML_Custom_Private_Key": "Privat nøkkelinnhold",
+  "SAML_Custom_Provider": "Tilpasset leverandør",
+  "SAML_Custom_Public_Cert": "Offentlig sertifisering",
+  "SAML_Custom_user_data_fieldmap": "Brukerdatafeltkart",
+  "SAML_Custom_Username_Field": "Feltnavn for brukernavn",
+  "SAML_Custom_Username_Normalize": "Normaliser brukernavn",
+  "SAML_Custom_Username_Normalize_Lowercase": "Til små bokstaver",
+  "SAML_Custom_Username_Normalize_None": "Ingen normalisering",
+  "SAML_Role_Attribute_Sync": "Synkroniser brukerroller",
+  "SAML_Section_1_User_Interface": "Brukergrensesnitt",
+  "SAML_Section_2_Certificate": "Sertifikat",
+  "SAML_Section_3_Behavior": "Oppførsel",
+  "SAML_Section_4_Roles": "Roller",
+  "SAML_Section_5_Mapping": "Kartlegging",
+  "SAML_Section_6_Advanced": "Avansert",
+  "Saturday": "lørdag",
+  "Save": "Lagre",
+  "Save_changes": "Lagre endringer",
+  "Save_Mobile_Bandwidth": "Lagre mobil båndbredde",
+  "Save_to_enable_this_action": "Lagre for å aktivere denne handlingen",
+  "save-others-livechat-room-info": "Lagre andre Livechat Room Info",
+  "save-others-livechat-room-info_description": "Tillatelse til å lagre informasjon fra andre livechat-kanaler",
+  "Saved": "lagret",
+  "Saving": "besparende",
+  "Scan_QR_code": "Bruk en autentiseringsapp som Google Authenticator, Authy eller Duo, skann QR-koden. Det vil vise en 6-sifret kode som du må skrive inn nedenfor.",
+  "Scan_QR_code_alternative_s": "Hvis du ikke kan skanne QR-koden, kan du skrive inn kode manuelt i stedet:",
+  "Scope": "omfang",
+  "Screen_Share": "Skjermdel",
+  "Script": "Script",
+  "Script_Enabled": "Skript aktivert",
+  "Search": "Søk",
+  "Searchable": "Søkbar",
+  "Search_Apps": "Søk i apper",
+  "Search_Installed_Apps": "Søk i installerte apper",
+  "Search_Private_apps": "Søk i private apper",
+  "Search_Premium_Apps": "Søk i Premium-apper",
+  "Search_by_file_name": "Søk etter filnavn",
+  "Search_by_username": "Søk etter brukernavn",
+  "Search_by_category": "Søk på kategori",
+  "Search_Channels": "Søk kanaler",
+  "Search_Chat_History": "Søk chathistorikk",
+  "Search_current_provider_not_active": "Gjeldende søkeleverandør er ikke aktiv",
+  "Search_Devices_Users": "Søk etter enheter eller brukere",
+  "Search_Files": "Søk etter filer",
+  "Search_message_search_failed": "Søkeforespørsel mislyktes",
+  "Search_Messages": "Søk meldinger",
+  "Search_Page_Size": "Sidestørrelse",
+  "Search_Private_Groups": "Søk i private grupper",
+  "Search_Provider": "Søk leverandør",
+  "Search_rooms": "Søk etter rom",
+  "Search_Rooms": "Søk etter rom",
+  "Search_Users": "Søk brukere",
+  "used_limit_infinite": "{{brukt, tall}} / ∞",
+  "seconds": "sekunder",
+  "Secret_token": "Hemmelig Token",
+  "Security": "Sikkerhet",
+  "See_all_themes": "Se alle temaene",
+  "See_documentation": "Se dokumentasjon",
+  "See_Pricing": "Se Priser",
+  "See_full_profile": "Se hele profilen",
+  "See_history": "Se historikk",
+  "Select": "Velg",
+  "Select_a_department": "Velg en avdeling",
+  "Select_a_room": "Velg et rom",
+  "Select_a_user": "Velg en bruker",
+  "Select_an_avatar": "Velg en avatar",
+  "Select_an_option": "Velg et alternativ",
+  "Select_at_least_one_user": "Velg minst én bruker",
+  "Select_at_least_two_users": "Velg minst to brukere",
+  "Select_department": "Velg en avdeling",
+  "Select_file": "Velg Fil",
+  "Select_role": "Velg en rolle",
+  "Select_service_to_login": "Velg en tjeneste for å logge inn for å laste inn bildet eller laste det opp direkte fra datamaskinen",
+  "Select_the_channels_you_want_the_user_to_be_removed_from": "Velg kanalene du vil at brukeren skal fjernes fra",
+  "Select_atleast_one_channel_to_forward_the_messsage_to": "Velg minst én kanal å videresende meldingen til",
+  "Select_user": "Velg bruker",
+  "Select_users": "Velg brukere",
+  "Select_period": "Velg periode",
+  "Selected_agents": "Utvalgte agenter",
+  "Selected_departments": "Valgte avdelinger",
+  "Selecting_users": "Velger brukere",
+  "Send": "Sende",
+  "Send_a_message": "Send en melding",
+  "Send_a_test_mail_to_my_user": "Send en testmelding til brukeren min",
+  "Send_a_test_push_to_my_user": "Send en test push til min bruker",
+  "Send_confirmation_email": "Send bekreftelses-e-post",
+  "Send_data_into_RocketChat_in_realtime": "Send data til Rocket.Chat i sanntid.",
+  "Send_email": "Send e-post",
+  "Send_Email_SMTP_Warning": "For å sende denne e-posten må du <a href=\"{{url}}\">konfigurere SMTP-e-postserveren</a>",
+  "Send_invitation_email": "Send invitasjons-e-post",
+  "Send_invitation_email_error": "Du har ikke oppgitt noen gyldig e-postadresse.",
+  "Send_invitation_email_info": "Du kan sende flere e-post invitasjoner samtidig.",
+  "Send_invitation_email_success": "Du har sendt en invitasjons-e-post til følgende adresser:",
+  "Send_it_as_attachment_instead_question": "Sende det som vedlegg i stedet?",
+  "Send_request_on_agent_message": "Send forespørsel om agentmeldinger",
+  "Send_request_on_chat_close": "Send forespørsel om chat Lukk",
+  "Send_request_on_lead_capture": "Send forespørsel om blyopptak",
+  "Send_request_on_offline_messages": "Send forespørsel om offline meldinger",
+  "Send_request_on_visitor_message": "Send forespørsel om besøksmeldinger",
+  "Send_Test": "Send test",
+  "Export_as_PDF": "Eksporter som PDF",
+  "Send_Visitor_navigation_history_as_a_message": "Send besøksnavigasjonsloggen som en melding",
+  "Send_visitor_navigation_history_on_request": "Send besøksnavigasjonshistorikk på forespørsel",
+  "Send_welcome_email": "Send velkomstmelding",
+  "Send_your_JSON_payloads_to_this_URL": "Send JSON nyttelastene til denne nettadressen.",
+  "send-mail_description": "Tillatelse til å sende e-poster",
+  "send-many-messages": "Send mange meldinger",
+  "Sender_Info": "Avsender info",
+  "Sending": "Sender ...",
+  "Sending_Invitations": "Sender invitasjoner",
+  "Sending_your_mail_to_s": "Sender e-posten din til %s",
+  "Sent_an_attachment": "Sender et vedlegg",
+  "Sent_from": "Sendt fra",
+  "Separate_multiple_words_with_commas": "Skill flere ord med komma",
+  "Served_By": "Servert av",
+  "Server": "Server",
+  "Server_already_added": "Server allerede lagt til",
+  "Server_doesnt_exist": "Serveren eksisterer ikke",
+  "Servers": "Servere",
+  "Server_Configuration": "Serverkonfigurasjon",
+  "Server_Info": "Serverinfo",
+  "Server_name": "Server navn",
+  "Server_Type": "Server Type",
+  "Service": "Tjeneste",
+  "Service_account_key": "Tjenesten konto nøkkel",
+  "Set_as_favorite": "Sett som favoritt",
+  "Set_as_leader": "Sett som leder",
+  "Set_as_moderator": "Sett som moderator",
+  "Set_as_owner": "Sett som eier",
+  "Upload_app": "Last opp app",
+  "Set_random_password_and_send_by_email": "Angi tilfeldig passord og send via e-post",
+  "set-moderator": "Sett moderator",
+  "set-moderator_description": "Tillatelse til å sette andre brukere som moderator på en kanal",
+  "set-owner": "Sett eier",
+  "set-owner_description": "Tillatelse til å sette andre brukere som eier av en kanal",
+  "set-react-when-readonly": "Sett React Når ReadOnly",
+  "set-react-when-readonly_description": "Tillatelse til å angi evnen til å reagere på meldinger i en skrivebeskyttet kanal",
+  "set-readonly": "Still inn ReadOnly",
+  "set-readonly_description": "Tillatelse til å angi en kanal for å lese kun kanal",
+  "Settings": "Innstillinger",
+  "Settings_updated": "innstillingene er oppdatert",
+  "Setup_SMTP": "Sett opp SMTP",
+  "Setup_Wizard": "Setup Wizard",
+  "Setup_Wizard_Description": "Grunnleggende informasjon om arbeidsområdet ditt, for eksempel organisasjonsnavn og land.",
+  "Setup_Wizard_Info": "Vi veileder deg gjennom å sette opp din første admin bruker, konfigurere organisasjonen din og registrere serveren din for å motta gratis push notifications og mer.",
+  "Share": "Dele",
+  "Share_Location_Title": "Del lokasjon?",
+  "Shared_Location": "Felles plassering",
+  "Shortcut": "Snarvei",
+  "shortcut_name": "snarveisnavn",
+  "Should_be_a_URL_of_an_image": "Skal være en URL til et bilde.",
+  "Should_exists_a_user_with_this_username": "Brukeren må allerede eksistere.",
+  "Show_agent_email": "Vis agent-e-post",
+  "Show_all": "Vis alt",
+  "Show_Avatars": "Vis avatars",
+  "Show_counter": "Vis teller",
+  "Show_default_content": "Vis standardinnhold",
+  "Show_email_field": "Vis e-postfelt",
+  "Show_more": "Vis mer",
+  "Show_name_field": "Vis navnefelt",
+  "show_offline_users": "vis offline brukere",
+  "Show_on_registration_page": "Vis på registreringsside",
+  "Show_only_online": "Vis bare på nettet",
+  "Show_preregistration_form": "Vis forhåndsregistreringsskjema",
+  "Show_queue_list_to_all_agents": "Vis køliste til alle agenter",
+  "Show_room_counter_on_sidebar": "Vis romteller på sidebar",
+  "Show_Setup_Wizard": "Vis oppsettveiviseren",
+  "Show_the_keyboard_shortcut_list": "Vis hurtigtastlisten for tastaturet",
+  "Show_To_Workspace": "Vis til arbeidsområdet",
+  "Show_video": "Vis video",
+  "Showing_archived_results": "<p>Viser <b>%s</b> arkiverte resultater</p>",
+  "Showing_current_of_total": "Viser {{current}} av {{total}}",
+  "Showing_online_users": "Viser: <b>{{total_showing}}</b>, Online: {{online}}, Totalt: {{total}} brukere",
+  "Showing_results": "<p>Viser <b>%s</b> resultater</p>",
+  "Showing_results_of": "Viser resultater %s - %s av %s",
+  "Show_usernames": "Vis brukernavn",
+  "Show_roles": "Vis roller",
+  "Show_or_hide_the_user_roles_of_message_authors": "Vis eller skjul brukerrollene til meldingsforfattere.",
+  "Show_or_hide_the_username_of_message_authors": "Vis eller skjul brukernavnet til meldingsforfatterne.",
+  "Sidebar": "sidebar",
+  "Sidebar_list_mode": "Sidebar Kanallistemodus",
+  "Sign_in_to_start_talking": "Logg inn for å begynne å snakke",
+  "Sign_in_with__provider__": "Logg på med {{provider}}",
+  "since_creation": "siden%s",
+  "Site_Name": "Side navn",
+  "Site_Url": "Nettstedets nettadresse",
+  "Site_Url_Description": "Eksempel: `https://chat.domain.com/`",
+  "Size": "Størrelse",
+  "Skin_tone": "Hudfarge",
+  "Skip": "Hopp",
+  "Skip_to_main_content": "Gå til hovedinnhold",
+  "SLA_Policy": "SLA-retningslinje",
+  "SLA_Policies": "SLA-retningslinjer",
+  "SLA_removed": "SLA fjernet",
+  "Slack": "Slack",
+  "Slack_Users": "Slack's Brukere CSV",
+  "SlackBridge_APIToken": "API-tokens (Legacy)",
+  "SlackBridge_UseLegacy": "Bruk Legacy API-tokens",
+  "SlackBridge_APIToken_Description": "Du kan konfigurere flere Slack-servere ved å legge til én API-token per linje.",
+  "SlackBridge_BotToken": "Bot-tokens",
+  "SlackBridge_BotToken_Description": "Du kan konfigurere flere Slack servere ved å legge til en Bot Token per linje.",
+  "SlackBridge_AppToken": "App-tokens",
+  "SlackBridge_AppToken_Description": "Du kan konfigurere flere Slack servere ved å legge til en apptoken per linje.",
+  "SlackBridge_SigningSecret_Description": "Du kan konfigurere flere Slack-servere ved å legge til én innloggingshemmelighet per linje.",
+  "SlackBridge_error": "SlackBridge fikk en feil mens du importerte meldingene dine på%s:%s",
+  "SlackBridge_finish": "SlackBridge er ferdig med å importere meldingene på%s. Vennligst last inn for å se alle meldinger.",
+  "SlackBridge_Out_All": "SlackBridge Out All",
+  "SlackBridge_Out_All_Description": "Send meldinger fra alle kanaler som finnes i Slack, og boten har sluttet seg",
+  "SlackBridge_Out_Channels": "SlackBridge ut kanaler",
+  "SlackBridge_Out_Channels_Description": "Velg hvilke kanaler som vil sende meldinger tilbake til Slack",
+  "SlackBridge_Out_Enabled": "SlackBridge ut aktivert",
+  "SlackBridge_Out_Enabled_Description": "Velg om SlackBridge også skal sende meldingene dine tilbake til Slack",
+  "SlackBridge_Remove_Channel_Links_Description": "Fjern den interne koblingen mellom Rocket.Chat-kanaler og Slack-kanaler. Koblingene vil bli gjenskapt basert på kanalnavnene.",
+  "SlackBridge_start": "@%s har startet en SlackBridge-import på `#%s`. Vi forteller deg når den er ferdig.",
+  "Slash_Gimme_Description": "Viser (つ ◕ ◕) つ før meldingen din",
+  "Slash_LennyFace_Description": "Viser (͡ ° ͜ʖ ͡ °) etter meldingen",
+  "Slash_Shrug_Description": "Viser ¯ \\ _ (ツ) _ / ¯ etter meldingen",
+  "Slash_Status_Description": "Angi statusmeldingen din",
+  "Slash_Status_Params": "Statusmelding",
+  "Slash_Tableflip_Description": "Viser (╯ ° □ °) ╯ (┻━┻",
+  "Slash_TableUnflip_Description": "Viser ── ノ (゜ - ゜ ノ)",
+  "Slash_Topic_Description": "Angi emne",
+  "Slash_Topic_Params": "Emne melding",
+  "Smarsh_Email": "Smarsh Email",
+  "Smarsh_Email_Description": "Smarsh Email Address for å sende .eml filen til.",
+  "Smarsh_Enabled": "Smarsh aktivert",
+  "Smarsh_Enabled_Description": "Hvorvidt Smarsh eml-kontakten er aktivert eller ikke (trenger 'Fra e-post' fylt ut under Email -> SMTP).",
+  "Smarsh_Interval": "Smarsh Intervall",
+  "Smarsh_Interval_Description": "Hvor lang tid å vente før du sender chattene (trenger 'Fra e-post' fylt ut under Email -> SMTP).",
+  "Smarsh_MissingEmail_Email": "Manglende e-post",
+  "Smarsh_MissingEmail_Email_Description": "E-posten som skal vises for en brukerkonto når e-postadressen mangler, skjer vanligvis med botkontoer.",
+  "Smileys_and_People": "Smileys & People",
+  "SMS": "SMS",
+  "SMS_Enabled": "SMS aktivert",
+  "SMTP": "SMTP",
+  "SMTP_Host": "SMTP-verten",
+  "SMTP_Password": "SMTP-passord",
+  "SMTP_Port": "SMTP-port",
+  "SMTP_Server_Not_Setup_Title": "SMTP-serveren er ikke konfigurert enda",
+  "SMTP_Test_Button": "Test SMTP-innstillinger",
+  "SMTP_Username": "SMTP Brukernavn",
+  "Snippet_Added": "Opprettet på%s",
+  "Snippet_name": "Kuttnavn",
+  "Snippeted_a_message": "Lagde et utdrag {{snippetLink}}",
+  "Social_Network": "Sosialt nettverk",
+  "Something_went_wrong": "Noe gikk galt",
+  "Something_went_wrong_try_again_later": "Noe gikk galt. Prøv igjen senere.",
+  "Sorry_page_you_requested_does_not_exist_or_was_deleted": "Beklager, siden du ba om, finnes ikke eller ble slettet!",
+  "Sort": "Sortere",
+  "Sort_By": "Sorter etter",
+  "Sorting_mechanism": "Sorteringsmekanisme",
+  "Sort_by_activity": "Sorter etter aktivitet",
+  "Sound": "Lyd",
+  "Sounds": "Lyder",
+  "Sound_File_mp3": "Lydfil (mp3)",
+  "Sound File": "Lydfil",
+  "Source": "Kilde",
+  "Speakers": "Høyttalere",
+  "SSL": "SSL",
+  "Star_Message": "Stjernemelding",
+  "Starred_Messages": "Stjernemerkede meldinger",
+  "Start": "Start",
+  "Start_a_call": "Start en samtale",
+  "Start_a_free_trial": "Start en gratis prøveperiode",
+  "Start_audio_call": "Start lydanrop",
+  "Start_call": "Start samtale",
+  "Start_Chat": "Start Chat",
+  "Start_free_trial": "Start gratis prøveperiode",
+  "Start_of_conversation": "Start samtalen",
+  "Start_OTR": "Start OTR",
+  "Start_video_call": "Start videosamtale",
+  "Start_video_conference": "Start videokonferanse?",
+  "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Start med <code class=\"inline\" >%s</code>for bruker eller <code class=\"inline\" >%s</code>for kanal. Eksempel: <code class=\"inline\" >%s</code>eller <code class=\"inline\" >%s</code>",
+  "Started": "Startet",
+  "Started_a_video_call": "Startet et videoanrop",
+  "Started_At": "Startet på",
+  "Statistics": "Statistikk",
+  "Statistics_reporting": "Send statistikk til Rocket.Chat",
+  "Statistics_reporting_Description": "Ved å sende statistikken din, kan du hjelpe oss med å identifisere hvor mange forekomster av Rocket.Chat som brukes, samt hvor bra systemet fungerer, slik at vi kan forbedre den ytterligere. Ikke bekymre deg, siden ingen brukerinformasjon er sendt, og all informasjon vi mottar, holdes konfidensiell.",
+  "Stats_Active_Users": "Aktive brukere",
+  "Stats_Avg_Channel_Users": "Gjennomsnittlig kanalbrukere",
+  "Stats_Avg_Private_Group_Users": "Gjennomsnittlig Privat Gruppe Brukere",
+  "Stats_Away_Users": "Bortbrukere",
+  "Stats_Max_Room_Users": "Maks rom brukere",
+  "Stats_Non_Active_Users": "Inaktive brukere",
+  "Stats_Offline_Users": "Offline brukere",
+  "Stats_Online_Users": "Online brukere",
+  "Stats_Total_Active_Apps": "Totalt aktive apper",
+  "Stats_Total_Channels": "Totalt antall kanaler",
+  "Stats_Total_Connected_Users": "Totalt antall tilkoblede brukere",
+  "Stats_Total_Direct_Messages": "Direktemeldinger",
+  "Stats_Total_Installed_Apps": "Totalt antall installerte apper",
+  "Stats_Total_Livechat_Rooms": "Totalt Livechat-rom",
+  "Stats_Total_Messages": "Totalt antall meldinger",
+  "Stats_Total_Messages_Channel": "Totalt antall meldinger i kanaler",
+  "Stats_Total_Messages_Direct": "Totalt antall meldinger i direkte meldinger",
+  "Stats_Total_Messages_Livechat": "Totalt antall meldinger i Livechats",
+  "Stats_Total_Messages_PrivateGroup": "Totalt antall meldinger i private grupper",
+  "Stats_Total_Messages_Discussions": "I diskusjoner",
+  "Stats_Total_Private_Groups": "Totalt Private Grupper",
+  "Stats_Total_Rooms": "Totalt rom",
+  "Stats_Total_Uploads": "Totalt antall opplastinger",
+  "Stats_Total_Users": "Totalt antall brukere",
+  "Status": "Status",
+  "StatusMessage": "Statusmelding",
+  "StatusMessage_Changed_Successfully": "Statusmeldingen ble endret.",
+  "StatusMessage_Placeholder": "Hva gjør du akkurat nå?",
+  "StatusMessage_Too_Long": "Statusmeldingen må være kortere enn 120 tegn.",
+  "Step": "Trinn",
+  "Stop_call": "Stopp samtale",
+  "Stop_Recording": "Stopp innspilling",
+  "Store_Last_Message": "Lagre siste melding",
+  "Store_Last_Message_Sent_per_Room": "Lagre siste melding sendt på hvert rom.",
+  "Stream_Cast": "Stream Cast",
+  "Stream_Cast_Address": "Stream Cast-adresse",
+  "Stream_Cast_Address_Description": "IP eller vert av Rocket.Chat sentral Stream Cast. F.eks `192.168.1.1: 3000` eller` localhost: 4000`",
+  "Subject": "Emne",
+  "Submit": "Sende inn",
+  "Subscribe": "Abonner",
+  "Success": "Suksess",
+  "Success_message": "Suksessmelding",
+  "Suggestion_from_recent_messages": "Forslag fra siste meldinger",
+  "Sunday": "søndag",
+  "Support": "Support",
+  "Survey": "undersøkelse",
+  "Survey_instructions": "Vurder hvert spørsmål i henhold til din tilfredshet, 1 som betyr at du er helt utilfreds og 5 betyr at du er helt fornøyd.",
+  "Symbols": "Symboler",
+  "Sync": "Synkroniser",
+  "Sync / Import": "Synkroniser / importer",
+  "Sync_in_progress": "Synkronisering pågår",
+  "Sync_Interval": "Synkroniseringsintervall",
+  "Sync_success": "Synk suksess",
+  "Sync_Users": "Synkronisere brukere",
+  "System_messages": "Systemmeldinger",
+  "Tag": "stikkord",
+  "Tag_removed": "Tagg fjernet",
+  "Take_it": "Ta det!",
+  "Talk_Time": "Samtaletid ",
+  "Talk_to_an_expert": "Snakk med en ekspert",
+  "Talk_to_sales": "Snakk med salg",
+  "Talk_to_your_workspace_administrator_about_enabling_video_conferencing": "Snakk med arbeidsområdeadministratoren din om å aktivere videokonferanser",
+  "Talk_to_your_workspace_admin_to_address_this_issue": "Snakk med arbeidsområdeadministratoren din for å løse dette problemet.",
+  "Target user not allowed to receive messages": "Valgt bruker har ikke tillatelse til å motta meldinger",
+  "TargetRoom": "Målrommet",
+  "TargetRoom_Description": "Rommet der meldinger vil bli sendt som er et resultat av at denne hendelsen blir sparket. Bare ett målrom er tillatt og det må eksistere.",
+  "Team": "Team",
+  "Team_Add_existing_channels": "Legg til eksisterende kanaler",
+  "Team_Add_existing": "Legg til eksisterende",
+  "Team_Channels": "Team-Channel",
+  "Team_Delete_Channel_modal_content_danger": "Dette kan ikke angres.",
+  "Team_Delete_Channel_modal_content": "Vil du slette denne Channel?",
+  "Team_has_been_created": "Teamet er opprettet",
+  "Team_has_been_deleted": "Teamet er slettet",
+  "Team_Info": "Teaminformasjon",
+  "Team_Mapping": "Teamkartlegging",
+  "Team_Name": "Teamnavn",
+  "Team_Remove_from_team_modal_content": "Vil du fjerne denne kanalen fra {{teamName}}? Kanalen flyttes tilbake til arbeidsområdet.",
+  "Team_Remove_from_team": "Fjern fra team",
+  "Teams": "Team",
+  "Teams_channels_didnt_leave": "Du valgte ikke følgende kanaler, så du forlater dem ikke:",
+  "Teams_channels_last_owner_delete_channel_warning": "Du er den siste eieren av denne kanalen. Når du konverterer teamet til en kanal, vil kanalen bli flyttet til arbeidsområdet.",
+  "Teams_channels_last_owner_leave_channel_warning": "Du er den siste eieren av denne kanalen. Når du forlater teamet, vil kanalen bli holdt inne i teamet, men du vil administrere den utenfra.",
+  "Teams_leaving_team": "Du forlater dette teamet.",
+  "Teams_channels": "Teamets kanaler",
+  "Teams_convert_channel_to_team": "Konverter til Team",
+  "Teams_delete_team_choose_channels": "Velg kanalene du vil slette. De du bestemmer deg for å beholde, vil være tilgjengelige på arbeidsområdet ditt.",
+  "Teams_delete_team_public_notice": "Vær oppmerksom på at offentlige Channel fortsatt vil være offentlige og synlige for alle.",
+  "Teams_delete_team_Warning": "Når du sletter et team, vil alt chatinnhold og konfigurasjon bli slettet.",
+  "Teams_delete_team": "Du er i ferd med å slette dette teamet.",
+  "Teams_deleted_channels": "Følgende Channel vil bli slettet:",
+  "Teams_Errors_Already_exists": "Teamet `{{name}}` eksisterer allerede.",
+  "Teams_Errors_team_name": "Du kan ikke bruke \"{{name}}\" som et teamnavn.",
+  "Teams_move_channel_to_team": "Flytt til Team",
+  "Teams_New_Title": "Opprett team",
+  "Teams_New_Name_Label": "Navn",
+  "Teams_Info": "Teaminformasjon",
+  "Teams_leave": "Forlat teamet",
+  "Teams_left_team_successfully": "Du forlot teamet",
+  "Teams_members": "Teamets medlemmer",
+  "Teams_New_Add_members_Label": "Legg til medlemmer",
+  "Teams_New_Broadcast_Description": "Kun autoriserte brukere kan skrive nye meldinger, men de andre brukerne vil kunne svare",
+  "Teams_New_Description_Label": "Emne",
+  "Teams_New_Encrypted_Label": "Kryptert",
+  "Teams_New_Private_Label": "Privat",
+  "Teams_New_Read_only_Description": "Alle brukere i dette teamet kan skrive meldinger",
+  "Teams_Public_Team": "Offentlig team",
+  "Teams_Private_Team": "Privat team",
+  "Teams_removing_member": "Fjerner medlem",
+  "Teams_removing__username__from_team": "Du fjerner {{username}} fra dette teamet",
+  "Teams_removing__username__from_team_and_channels": "Du fjerner {{username}} fra dette teamet og alle dets Channel.",
+  "Teams_Select_a_team": "Velg et team",
+  "Teams_Search_teams": "Søk etter team",
+  "Teams_New_Read_only_Label": "Les bare",
+  "Technology_Services": "Teknologi Tjenester",
+  "Terms": "Vilkår",
+  "Terms_of_use": "Bruksvilkår",
+  "Test_Connection": "Testforbindelse",
+  "Upgrade_tab_trial_guide": "Prøveveiledning",
+  "Test_Desktop_Notifications": "Test skrivebordsbeskjeder",
+  "test-push-notifications": "Test push-varsler",
+  "test-push-notifications_description": "Tillatelse til å teste push-varsler",
+  "Texts": "Tekster",
+  "Thank_you_for_your_feedback": "Takk for din tilbakemelding",
+  "The_application_name_is_required": "Programnavnet kreves",
+  "The_application_will_be_able_to": "<1>{{appName}}</1> vil kunne:",
+  "The_channel_name_is_required": "Kanalnavnet er påkrevd",
+  "The_emails_are_being_sent": "E-postene blir sendt.",
+  "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Bildestørrelsen fungerer ikke fordi vi ikke kan oppdage ImageMagick eller GraphicsMagick installert på serveren din.",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meldingen er en diskusjon, du vil ikke kunne gjenopprette meldingene!",
+  "The_necessary_browser_permissions_for_location_sharing_are_not_granted": "De nødvendige nettlesertillatelsene for posisjonsdeling ble ikke gitt",
+  "The_redirectUri_is_required": "RedirectUri er påkrevd",
+  "The_selected_user_is_not_an_agent": "Den valgte brukeren er ikke en agent",
+  "The_server_will_restart_in_s_seconds": "Serveren starter på nytt i%s sekunder",
+  "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Innstillingen <strong>%s</strong> er konfigurert til <strong>%s</strong> og du får tilgang fra <strong>%s</strong>!",
+  "The_user_s_will_be_removed_from_role_s": "Brukeren %s vil bli fjernet fra rollen %s",
+  "The_user_will_be_removed_from_s": "Brukeren blir fjernet fra%s",
+  "The_user_wont_be_able_to_type_in_s": "Brukeren kan ikke skrive inn%s",
+  "The_workspace_has_exceeded_the_monthly_limit_of_active_contacts": "Arbeidsområdet har overskredet den månedlige grensen for aktive kontakter.",
+  "Theme": "Tema",
+  "Themes": "Temaer",
+  "theme-color-attention-color": "Oppmerksomhetsfarge",
+  "theme-color-component-color": "Komponentfarge",
+  "theme-color-content-background-color": "Innhold Bakgrunnsfarge",
+  "theme-color-custom-scrollbar-color": "Tilpasset rullegardinfarge",
+  "theme-color-error-color": "Feilfarge",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Link Font Color",
+  "theme-color-pending-color": "Venter på farge",
+  "theme-color-primary-action-color": "Primær handlingsfarge",
+  "theme-color-primary-background-color": "Primær bakgrunnsfarge",
+  "theme-color-primary-font-color": "Primær skrifttype farge",
+  "theme-color-rc-color-alert": "Varsling",
+  "theme-color-rc-color-alert-light": "Alert Light",
+  "theme-color-rc-color-alert-message-primary": "Varslingsmelding Primær",
+  "theme-color-rc-color-alert-message-primary-background": "Varslingsmelding Primær bakgrunn",
+  "theme-color-rc-color-button-primary": "Knapp Primær",
+  "theme-color-rc-color-button-primary-light": "Knapp Primærlys",
+  "theme-color-rc-color-content": "Innhold",
+  "theme-color-rc-color-error": "Feil",
+  "theme-color-rc-color-error-light": "Feil lys",
+  "theme-color-rc-color-primary": "primær~~POS=TRUNC",
+  "theme-color-rc-color-primary-dark": "Primær mørk",
+  "theme-color-rc-color-primary-darkest": "Primær mørkeste",
+  "theme-color-rc-color-primary-light": "Primærlys",
+  "theme-color-rc-color-primary-light-medium": "Primærlysmedium",
+  "theme-color-rc-color-primary-lightest": "Primærlyseste",
+  "theme-color-rc-color-success": "Suksess",
+  "theme-color-rc-color-success-light": "Suksesslys",
+  "theme-color-secondary-action-color": "Sekundær handlingsfarge",
+  "theme-color-secondary-background-color": "Sekundær bakgrunnsfarge",
+  "theme-color-secondary-font-color": "Sekundær skriftfarge",
+  "theme-color-selection-color": "Valgfarge",
+  "theme-color-status-away": "Vekk statusfarge",
+  "theme-color-status-busy": "Opptatt statusfarge",
+  "theme-color-status-offline": "Frakoblet statusfarge",
+  "theme-color-status-online": "Online statusfarge",
+  "theme-color-success-color": "Suksessfarge",
+  "theme-color-transparent-dark": "Gjennomsiktig Mørk",
+  "theme-color-transparent-darker": "Transparent mørkere",
+  "theme-color-transparent-lightest": "Gjennomsiktig Letteste",
+  "theme-color-unread-notification-color": "Uleste varslingsfarger",
+  "theme-custom-css": "Tilpasset CSS",
+  "theme-font-body-font-family": "Body Font Family",
+  "There_are_no_agents_added_to_this_department_yet": "Det er ingen agenter lagt til i denne avdelingen ennå.",
+  "There_are_no_applications": "Ingen oAuth-programmer har blitt lagt til ennå.",
+  "There_are_no_applications_installed": "Det er for øyeblikket ingen Rocket.Chat-programmer installert.",
+  "There_are_no_departments_added_to_this_tag_yet": "Ingen enheter er lagt til denne taggen enda",
+  "There_are_no_departments_added_to_this_unit_yet": "Ingen avdelinger er lagt til denne enheten enda",
+  "There_are_no_departments_available": "Det er ingen tilgjengelige avdelinger",
+  "There_are_no_integrations": "Det er ingen integrasjoner",
+  "There_are_no_rooms_for_the_given_search_criteria": "Det er ingen rom for de oppgitte søkekriteriene",
+  "There_are_no_users_in_this_role": "Det er ingen brukere i denne rollen.",
+  "These_notes_will_be_available_in_the_call_summary": "Disse notatene vil være tilgjengelige i samtalesammendraget",
+  "This_agent_was_already_selected": "Denne agenten er allerede valgt",
+  "This_cant_be_undone": "Dette kan ikke angres.",
+  "This_conversation_is_already_closed": "Denne samtalen er allerede stengt.",
+  "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Denne e-posten er allerede brukt og har ikke blitt verifisert. Vennligst endre passordet ditt.",
+  "This_feature_is_currently_in_alpha": "Denne funksjonen er for øyeblikket i alpha!",
+  "This_is_a_desktop_notification": "Dette er et stasjonært varsel",
+  "Input": "Input ",
+  "This_is_a_push_test_messsage": "Dette er en push-testmelding",
+  "This_room_has_been_archived_by__username_": "Dette rommet er arkivert av {{username}}",
+  "This_room_has_been_unarchived_by__username_": "Dette rommet er blitt arkivert av {{username}}",
+  "Threads": "Tråder",
+  "Thursday": "Torsdag",
+  "Time_in_seconds": "Tid i sekunder",
+  "Timeouts": "Tidsavbrudd",
+  "Timezone": "Tidssone",
+  "Title": "Tittel",
+  "Title_bar_color": "Tittel bar farge",
+  "Title_bar_color_offline": "Tittellinjefarge offline",
+  "Title_offline": "Tittel offline",
+  "To": "Til",
+  "To_additional_emails": "Til flere e-poster",
+  "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "For å installere Rocket.Chat Livechat på nettstedet ditt, kopier &amp; lim inn denne koden over det siste <strong>&lt; / body &gt;</strong> ta på nettstedet ditt.",
+  "To_prevent_seeing_this_message_again_allow_popups_from_workspace_URL": "For å unngå å se denne meldingen igjen, sørg for at nettleserinnstillingene tillater åpning av popup-vinduer fra arbeidsområdets URL:",
+  "to_see_more_details_on_how_to_integrate": "for å se flere detaljer om hvordan å integrere.",
+  "To_users": "Til brukere",
+  "Today": "I dag",
+  "Toggle_original_translated": "Bytt original / oversatt",
+  "toggle-room-e2e-encryption_description": "Tillatelse til å veksle e2e-krypteringsrom",
+  "Token": "Token",
+  "Token_Access": "Token Access",
+  "Token_Controlled_Access": "Token kontrollert tilgang",
+  "Token_has_been_removed": "Token er fjernet",
+  "Token_required": "Token kreves",
+  "Tokens_Minimum_Needed_Balance": "Minst nødvendig tokenbalanse",
+  "Tokens_Minimum_Needed_Balance_Description": "Angi laveste nødvendige balanse for hvert token. Blank eller \"0\" for ikke grense.",
+  "Tokens_Minimum_Needed_Balance_Placeholder": "Balanseverdi",
+  "Tokens_Required": "Token kreves",
+  "Tokens_Required_Input_Description": "Skriv inn en eller flere tokens aktiva navn skilt med komma.",
+  "Tokens_Required_Input_Error": "Ugyldige skrevet tokens.",
+  "Tokens_Required_Input_Placeholder": "Tokens aktiva navn",
+  "Topic": "Emne",
+  "Total_abandoned_chats": "Totalt antall forlatte chatter",
+  "Total_conversations": "Totalt antall samtaler",
+  "Total_Discussions": "Totalt antall diskusjoner",
+  "Total_messages": "Totalt antall meldinger",
+  "Total_rooms": "Totalt antall rom",
+  "Total_Threads": "Totalt antall tråder",
+  "Total_visitors": "Totalt antall besøkende",
+  "TOTP Invalid [totp-invalid]": "Kode eller passord er ugyldig",
+  "totp-invalid": "Kode eller passord er ugyldig",
+  "Transcript_Enabled": "Spør besøkende hvis de vil ha en transkripsjon etter at Chat er lukket",
+  "Transcript_message": "Melding til å vise når du spør om transkripsjon",
+  "Transcript_of_your_livechat_conversation": "Transkripsjon av livechat-samtalen.",
+  "Translate": "Oversett",
+  "Translated": "oversatt",
+  "Translate_to": "Oversett til",
+  "Translations": "Oversettelser",
+  "Travel_and_Places": "Reise og steder",
+  "Trigger_removed": "Trigger fjernet",
+  "Trigger_Words": "Trigger Ord",
+  "Triggers": "Triggers",
+  "Troubleshoot": "Feilsøk",
+  "Troubleshoot_Disable_Notifications": "Deaktiver varslinger",
+  "True": "Ja",
+  "Try_now": "Prøv nå",
+  "Tuesday": "tirsdag",
+  "Turn_OFF": "Skru av",
+  "Turn_ON": "Slå på",
+  "Turn_on_video": "Slå på video",
+  "Turn_on_microphone": "Slå på mikrofon",
+  "Turn_off_microphone": "Slå av mikrofon",
+  "Turn_off_video": "Slå av video",
+  "Two Factor Authentication": "Tofaktorautentisering",
+  "Two-factor_authentication": "Tofaktorautentisering",
+  "Two-factor_authentication_via_TOTP": "Tofaktorautentisering",
+  "Two-factor_authentication_disabled": "Tofaktorautentisering deaktivert",
+  "Two-factor_authentication_email": "Tofaktorautentisering via e-post",
+  "Two-factor_authentication_email_is_currently_disabled": "Tofaktorautentisering via e-post er deaktivert for øyeblikket ",
+  "Two-factor_authentication_enabled": "Tofaktorautentisering aktivert",
+  "Two-factor_authentication_is_currently_disabled": "Tofaktorautentisering er for øyeblikket deaktivert",
+  "Two-factor_authentication_native_mobile_app_warning": "ADVARSEL: Når du har aktivert dette, vil du ikke kunne logge på de innkommende mobilappene (Rocket.Chat +) ved hjelp av passordet ditt før de implementerer 2FA.",
+  "Type": "Type",
+  "Types": "Typer",
+  "Type_your_email": "Skriv inn din e-postadresse",
+  "Type_your_job_title": "Skriv inn jobbtittel",
+  "Type_your_message": "Skriv inn meldingen din",
+  "Type_your_name": "Skriv inn navnet ditt",
+  "Type_your_password": "Skriv inn passordet ditt",
+  "Type_your_username": "Skriv inn brukernavnet ditt",
+  "UI_Allow_room_names_with_special_chars": "Tillat spesialtegn i romnavn",
+  "UI_Click_Direct_Message": "Klikk for å opprette direkte melding",
+  "UI_Click_Direct_Message_Description": "Hopp over åpningsprofil-fanen, i stedet gå direkte til samtale",
+  "UI_DisplayRoles": "Vis roller",
+  "UI_Group_Channels_By_Type": "Gruppekanaler etter type",
+  "UI_Merge_Channels_Groups": "Slett private grupper med kanaler",
+  "UI_Unread_Counter_Style": "Ulest counter stil",
+  "UI_Use_Name_Avatar": "Bruk Full Name Initials til å generere Standard Avatar",
+  "UI_Use_Real_Name": "Bruk Real Name",
+  "unable-to-get-file": "Kan ikke hente filen",
+  "Unarchive": "Opphev arkivering",
+  "unarchive-room": "Unarchive Room",
+  "unarchive-room_description": "Tillatelse til å unarchive kanaler",
+  "Unassigned": "Ikke tildelt",
+  "unauthorized": "Ikke autorisert",
+  "Unavailable": "Utilgjengelig",
+  "Unblock": "Fjern blokkering",
+  "Unblock_User": "Fjern blokkering av bruker",
+  "Uncheck_All": "Fjern avmerking for alle",
+  "Undefined": "Ikke definert",
+  "Unfavorite": "Fjern fra favoritt",
+  "Unfollow_message": "Slutt å følge melding",
+  "Unignore": "Ikke ignorer",
+  "Uninstall": "Avinstaller",
+  "Unit_removed": "Enhet  fjernet",
+  "Unique_ID_change_detected_learn_more_link": "<a href=\"https://go.rocket.chat/i/fingerprint-changed-faq\" target=\"_blank\">Les mer</a>",
+  "Unique_ID_change_detected": "Oppdaget endring av unik ID",
+  "Unknown_User": "Ukjent bruker",
+  "Unlimited": "Ubegrenset",
+  "Unmute_someone_in_room": "Slå på noen på rommet",
+  "Unmute_user": "Slå av brukeren",
+  "Unnamed": "unnamed",
+  "Unpin_Message": "Unpin Message",
+  "Unprioritized": "Uprioritert",
+  "Unread": "ulest",
+  "Unread_Count": "Ulest antall",
+  "Unread_Count_DM": "Ulest antall for direkte meldinger",
+  "Unread_Messages": "Uleste meldinger",
+  "Unread_on_top": "Ulest på toppen",
+  "Unread_Rooms": "Uleste rom",
+  "Unread_Rooms_Mode": "Uleste rommodus",
+  "Unread_Tray_Icon_Alert": "Uread Tray Icon Alert",
+  "Unstar_Message": "Fjern stjerne",
+  "Update": "Oppdater",
+  "Update_to_version": "Oppdater til {{version}}",
+  "Update_your_RocketChat": "Oppdater Rocket.Chat",
+  "Updated_at": "Oppdatert på",
+  "Upload": "Last opp",
+  "Upload_private_app": "Last opp privat app",
+  "Upload_file_description": "Filbeskrivelse",
+  "Upload_file_name": "Filnavn",
+  "Upload_file_question": "Last opp fil?",
+  "Upload_Folder_Path": "Last opp mappebane",
+  "Upload_From": "Last opp fra {{name}}",
+  "Upload_user_avatar": "Last opp avatar",
+  "Uploading_file": "Laster opp fil ...",
+  "Uptime": "oppetid",
+  "URL": "URL",
+  "URLs": "URL-er",
+  "Use": "Bruk",
+  "Use_account_preference": "Bruk kontoinnstillinger",
+  "Use_Emojis": "Bruk Emojis",
+  "Use_Global_Settings": "Bruk Globale innstillinger",
+  "Use_initials_avatar": "Bruk ditt brukernavn initialer",
+  "Use_minor_colors": "Bruk mindre fargepalett (standard arve store farger)",
+  "Use_service_avatar": "Bruk%s avatar",
+  "Use_this_response": "Bruk dette svaret",
+  "Use_this_username": "Bruk dette brukernavnet",
+  "Use_uploaded_avatar": "Bruk opplastet avatar",
+  "Use_url_for_avatar": "Bruk URL for avatar",
+  "Use_User_Preferences_or_Global_Settings": "Bruk brukerinnstillinger eller globale innstillinger",
+  "User": "Bruker",
+  "User_menu": "Brukermeny",
+  "User Search": "Brukersøk",
+  "User__username__is_now_a_leader_of__room_name_": "Bruker {{username}} er nå leder av {{room_name}}",
+  "User__username__is_now_a_moderator_of__room_name_": "Bruker {{username}} er nå en moderator av {{room_name}}",
+  "User__username__is_now_an_owner_of__room_name_": "Bruker {{username}} er nå eier av {{room_name}}",
+  "User__username__muted_in_room__roomName__": "Bruker {{username}} er dempet i rom {{roomName}}",
+  "User__username__removed_from__room_name__leaders": "Bruker {{username}} fjernet fra {{room_name}} ledere",
+  "User__username__removed_from__room_name__moderators": "Bruker {{username}} fjernet fra {{room_name}} moderatorer",
+  "User__username__removed_from__room_name__owners": "Bruker {{username}} fjernet fra {{room_name}} eiere",
+  "User__username__unmuted_in_room__roomName__": "Bruker {{username}}, er ikke lengre dempet i rommet {{roomName}}",
+  "User_added": "Bruker lagt til",
+  "User_added_by": "Bruker {{user_added}}lagt til av {{user_by}}.",
+  "User_added_to": "la til {{user_added}}",
+  "User_added_successfully": "Bruker lagt til",
+  "User_and_group_mentions_only": "Bruker og gruppe nevner bare",
+  "User_default": "Brukerstandard",
+  "User_doesnt_exist": "Ingen bruker eksisterer ved navnet `@%s`.",
+  "User_has_been_activated": "Brukeren har blitt aktivert",
+  "User_has_been_deactivated": "Brukeren er deaktivert",
+  "User_has_been_deleted": "Brukeren er slettet",
+  "User_has_been_ignored": "Brukeren er ignorert",
+  "User_has_been_muted_in_s": "Brukeren har blitt dempet i%s",
+  "User_has_been_removed_from_s": "Brukeren er fjernet fra%s",
+  "User_has_been_removed_from_team": "Brukeren er fjernet fra teamet",
+  "User_has_been_unignored": "Brukeren ignoreres ikke lenger",
+  "User_Info": "brukerinformasjon",
+  "User_Interface": "Brukergrensesnitt",
+  "User_is_blocked": "Brukeren er blokkert",
+  "User_is_no_longer_an_admin": "Brukeren er ikke lenger en administrator",
+  "User_is_now_an_admin": "Brukeren er nå en administrator",
+  "User_is_unblocked": "Brukeren er ulåst",
+  "User_joined_channel": "Har sluttet seg til kanalen.",
+  "User_joined_the_channel": "ble med i kanalen",
+  "User_joined_the_conversation": "ble med i samtalen",
+  "User_left": "Har forlatt kanalen.",
+  "User_left_this_channel": "forlot kanalen",
+  "User_left_this_team": "forlot laget",
+  "User_logged_out": "Brukeren er logget ut",
+  "User_management": "brukeradministrasjon",
+  "User_mentions_only": "Bruker nevner bare",
+  "User_muted": "Bruker Muted",
+  "User_muted_by": "Bruker {{user_muted}}dempet av {{user_by}}.",
+  "User_has_been_muted": "dempet {{user_muted}}",
+  "User_not_found": "Bruker ikke funnet",
+  "User_not_found_or_incorrect_password": "Bruker ikke funnet eller feil passord",
+  "User_or_channel_name": "Bruker- eller kanalnavn",
+  "User_Presence": "Brukerens tilstedeværelse",
+  "User_removed": "Brukeren er fjernet",
+  "User_removed_by": "Bruker {{user_removed}}fjernet av {{user_by}}.",
+  "User_has_been_removed": "fjernet {{user_removed}}",
+  "User_sent_a_message_on_channel": "<strong>{{username}}</strong> sendte en melding på <strong>{{channel}}</strong>",
+  "User_sent_a_message_to_you": "<strong>{{username}}</strong> sendte deg en melding",
+  "user_sent_an_attachment": "{{user}} sendte et vedlegg",
+  "User_Settings": "Brukerinstillinger",
+  "User_started_a_new_conversation": "{{username}} startet en ny samtale",
+  "User_unmuted_by": "Bruker {{user_unmuted}}unmuted av {{user_by}}.",
+  "User_has_been_unmuted": "dempet {{user_unmuted}}",
+  "User_unmuted_in_room": "Bruker uutløst i rommet",
+  "User_updated_successfully": "Brukeren er oppdatert vellykket",
+  "User_uploaded_a_file_on_channel": "<strong>{{username}}</strong> lastet opp en fil på <strong>{{channel}}</strong>",
+  "User_uploaded_a_file_to_you": "<strong>{{username}}</strong> sendte deg en fil",
+  "User_uploaded_file": "Lastet opp en fil",
+  "User_uploaded_image": "Lastet opp et bilde",
+  "user-generate-access-token": "Brukergenerering Adkomst Token",
+  "user-generate-access-token_description": "Tillatelse for brukere å generere tilgangstokener",
+  "UserData_EnableDownload": "Aktiver nedlasting av brukerdata",
+  "UserData_FileSystemPath": "Systemvei (eksporterte filer)",
+  "UserData_FileSystemZipPath": "Systemvei (komprimert fil)",
+  "UserData_MessageLimitPerRequest": "Meldingsgrense pr. Forespørsel",
+  "UserData_ProcessingFrequency": "Behandlingsfrekvens (minutter)",
+  "UserDataDownload": "Brukerdata nedlasting",
+  "UserDataDownload_CompletedRequestExisted_Text": "Datafilen din ble allerede generert. Sjekk e-postkontoen din for nedlastingslenken.",
+  "UserDataDownload_EmailBody": "Datafilen er nå klar til nedlasting. Klikk <a href=\"{{download_link}}\">her</a>for å laste den ned.",
+  "UserDataDownload_EmailSubject": "Datafilen er klar til nedlasting",
+  "UserDataDownload_Requested": "Last ned fil som er ønsket",
+  "Username": "Brukernavn",
+  "Username_already_exist": "Brukernavn finnes allerede. Vennligst prøv et nytt brukernavn.",
+  "Username_and_message_must_not_be_empty": "Brukernavn og melding må ikke være tom.",
+  "Username_cant_be_empty": "Brukernavnet kan ikke være tomt",
+  "Username_Change_Disabled": "Din Rocket.Chat-administrator har deaktivert endring av brukernavn",
+  "Username_denied_the_OTR_session": "{{username}} nektet OTR-sesjonen",
+  "Username_description": "Brukernavnet brukes til å tillate andre å nevne deg i meldinger.",
+  "Username_doesnt_exist": "Brukernavnet `%s` eksisterer ikke.",
+  "Username_ended_the_OTR_session": "{{username}} endte OTR-sesjonen",
+  "Username_invalid": "<strong>%s</strong> er ikke et gyldig brukernavn,<br/> bruker bare bokstaver, tall, prikker, bindestreker og understreker",
+  "Username_is_already_in_here": "`@%s` er allerede her inne.",
+  "Username_Placeholder": "Vennligst skriv inn brukernavn ...",
+  "Username_title": "Registrer brukernavn",
+  "Username_has_been_updated": "Brukernavnet ble oppdatert",
+  "Username_wants_to_start_otr_Do_you_want_to_accept": "{{username}} vil starte OTR. Ønsker du å godta?",
+  "Username_name_email": "Brukernavn, navn eller e-post",
+  "Users": "brukere",
+  "Users must use Two Factor Authentication": "Brukere må bruke tofaktorautentisering",
+  "Users_added": "Brukerne har blitt lagt til",
+  "Users_in_role": "Brukere i rollen",
+  "UTC_Timezone": "UTC-tidssone",
+  "UTF8_Names_Slugify": "UTF8 Navn Slugify",
+  "Videocall_enabled": "Videoanrop aktivert",
+  "Validate_email_address": "Bekreft e-postadresse",
+  "Validation": "Validering",
+  "Value_messages": "{{value}} meldinger",
+  "Value_users": "{{value}} brukere",
+  "Verification": "Bekreftelse",
+  "Verification_Description": "Du kan bruke følgende plassholdere:  \n - `[Verification_Url]` for verifikasjonsadressen.  \n - [navn], [fname], [lname] for brukerens fulle navn, fornavn eller etternavn.  \n - `[email]` for brukerens e-postadresse.  \n - `[Site_Name]` og `[Site_URL]` for henholdsvis programnavnet og nettadressen. ",
+  "Verification_Email": "Klikk <a href=\"[Verification_Url]\">her</a>for å bekrefte kontoen din.",
+  "Verification_email_body": "Vennligst klikk på knappen nedenfor for å bekrefte e-postadressen din.",
+  "Verification_email_sent": "Verifikasjons e-post sendt",
+  "Verification_Email_Subject": "[Site_Name] - Bekreft kontoen din",
+  "Verified": "Verified",
+  "Verify": "Bekreft",
+  "Verify_your_email": "Bekreft e-posten din",
+  "Version": "Versjon",
+  "Version_version": "Versjon {{version}}",
+  "Video_Chat_Window": "Video Chat",
+  "Video_Conference": "Video konferanse",
+  "Video_Conference_Info": "Møteinformasjon",
+  "Video_Conference_Url": "Møte-URL",
+  "Video_message": "Videomelding",
+  "Videocall_declined": "Videoanrop avslått.",
+  "video_conference_started": "_Startet en samtale._",
+  "video_conference_ended": "_Samtalen har sluttet._",
+  "video_livechat_started": "_Startet en videosamtale._",
+  "video_direct_calling": "_Ringer._",
+  "video_direct_ended": "_Samtalen er avsluttet._",
+  "View_mode": "Visningsmodus",
+  "View_All": "Se alle medlemmer",
+  "View_channels": "Se kanaler",
+  "View_Logs": "Se logger",
+  "View_the_Logs_for": "Se loggene for: \"{{name}}\"",
+  "view-all-teams": "Se alle team",
+  "view-all-teams_description": "Tillatelse til å se alle team",
+  "view-all-team-channels": "Se alle teamkanaler",
+  "view-broadcast-member-list": "Se Medlemsliste i Broadcast Room",
+  "view-c-room": "Se offentlig kanal",
+  "view-c-room_description": "Tillatelse til å vise offentlige kanaler",
+  "view-d-room": "Se direkte meldinger",
+  "view-d-room_description": "Tillatelse til å vise direkte meldinger",
+  "view-device-management": "Se enhetsstyring",
+  "view-full-other-user-info": "Se full annen brukerinformasjon",
+  "view-full-other-user-info_description": "Tillatelse til å se hele profilen til andre brukere, inkludert kontoopprettelsesdato, siste innlogging, etc.",
+  "view-history": "Se historikk",
+  "view-history_description": "Tillatelse til å se kanalhistorikken",
+  "onboarding.component.form.action.registerNow": "Registrer deg nå",
+  "view-join-code": "Vis Bli medlem",
+  "view-join-code_description": "Tillatelse til å vise kanalen bli med koden",
+  "view-joined-room": "Se tilknyttet rom",
+  "view-joined-room_description": "Tillatelse til å vise de tilkoblede kanalene",
+  "view-l-room": "Se Livechat-rom",
+  "view-l-room_description": "Tillatelse til å vise livechat-kanaler",
+  "onboarding.page.awaitingConfirmation.subtitle": "Vi har sendt deg en e-post til {{emailAddress}} med en bekreftelseslenke. Vennligst bekreft at sikkerhetskoden nedenfor samsvarer med den i e-posten.",
+  "view-livechat-manager": "Se Livechat Manager",
+  "view-livechat-manager_description": "Tillatelse til å vise andre livechat-ledere",
+  "view-livechat-rooms": "Se Livechat-rom",
+  "view-livechat-rooms_description": "Tillatelse til å vise andre livechat kanaler",
+  "view-logs": "Se logger",
+  "view-logs_description": "Tillatelse til å vise serverloggene",
+  "view-other-user-channels": "Se andre brukerkanaler",
+  "view-other-user-channels_description": "Tillatelse til å vise kanaler eid av andre brukere",
+  "view-outside-room": "Se utenfor rommet",
+  "view-p-room": "Se privat rom",
+  "view-p-room_description": "Tillatelse til å vise private kanaler",
+  "view-privileged-setting": "Se Privileged Setting",
+  "view-privileged-setting_description": "Tillatelse til å vise innstillinger",
+  "view-room-administration": "Se Romadministrasjon",
+  "view-room-administration_description": "Tillatelse til å vise offentlig, privat og direkte meldingsstatistikk. Inkluderer ikke muligheten til å vise samtaler eller arkiver",
+  "view-statistics": "Se statistikk",
+  "view-statistics_description": "Tillatelse til å vise systemstatistikk som antall brukere logget inn, antall rom, operativsysteminformasjon",
+  "view-user-administration": "Se Brukeradministrasjon",
+  "view-user-administration_description": "Tillatelse til delvis, skrivebeskyttet listevisning av andre brukerkontoer som for øyeblikket er logget inn i systemet. Ingen brukerkontoinformasjon er tilgjengelig med denne tillatelsen",
+  "Viewing_room_administration": "Vise rom administrasjon",
+  "Visibility": "Synlighet",
+  "Visible": "Synlig",
+  "Visible_To_Workspace": "Synlig for arbeidsområdet",
+  "Visitor": "Besøkende",
+  "Visitor_Info": "Visitor Info",
+  "Visitor_not_found": "Besøkende ikke funnet",
+  "Visitor_Navigation": "Visitor Navigasjon",
+  "Visitor_page_URL": "URL for besøkende siden",
+  "Visitor_time_on_site": "Besøkende tid på stedet",
+  "VoIP_Management_Server_Username": "Brukernavn",
+  "VoIP_Management_Server_Password": "Passord",
+  "Voip_call_duration": "Samtalen varte i {{duration}}",
+  "Voip_call_ended_unexpectedly": "Samtalen ble avbrutt uventet: {{reason}}",
+  "Wait_activation_warning": "Før du kan logge inn, må kontoen din aktiveres manuelt av en administrator.",
+  "Waiting_queue": "Kø",
+  "Waiting_queue_message": "Melding for kø",
+  "Waiting_queue_message_description": "Melding som vises til besøkende når de er i kø",
+  "Warnings": "advarsler",
+  "WAU_value": "WAU {{value}}",
+  "We_are_offline_Sorry_for_the_inconvenience": "Vi er frakoblet. Beklager bryet.",
+  "We_have_sent_password_email": "Vi har sendt deg en epost med instruksjoner for tilbakestilling av passord. Hvis du ikke mottar en epost, vennligst kom tilbake og prøv igjen.",
+  "We_have_sent_registration_email": "Vi har sendt deg en e-post for å bekrefte din registrering. Hvis du ikke mottar en epost, vennligst kom tilbake og prøv igjen.",
+  "Webdav_Password": "WebDAV-passord",
+  "Webdav_Server_URL": "WebDAV Server Access URL",
+  "Webdav_Username": "WebDAV Brukernavn",
+  "Webhook_URL": "Webhook URL",
+  "Webhook_URL_not_set": "Webhook-URL er ikke angitt",
+  "Webhooks": "Webhooks",
+  "WebRTC_direct_audio_call_from_%s": "Direkte lydanrop fra%s",
+  "WebRTC_direct_video_call_from_%s": "Direkte videosamtale fra%s",
+  "WebRTC_Enable_Channel": "Aktiver for offentlige kanaler",
+  "WebRTC_Enable_Direct": "Aktiver for direkte meldinger",
+  "WebRTC_Enable_Private": "Aktiver for private kanaler",
+  "WebRTC_group_audio_call_from_%s": "Gruppe lydanrop fra%s",
+  "WebRTC_group_video_call_from_%s": "Gruppe videosamtale fra%s",
+  "WebRTC_monitor_call_from_%s": "Overvåk anrop fra%s",
+  "WebRTC_Servers": "STUN / TURN servere",
+  "WebRTC_Servers_Description": "En liste over STUN- og TURN-servere adskilt med komma.  \n Brukernavn, passord og port er tillatt i formatet «brukernavn:passord@stun:vert:port` eller `brukernavn:passord@tur:vert:port`.",
+  "WebRTC_call_ended_message": "<i class=\"icon-phone\"></i> Samtalen ble avsluttet {{endTime}} – varte {{callDuration}}",
+  "Website": "nettsted",
+  "Wednesday": "onsdag",
+  "Weekly_Active_Users": "Ukentlige aktive brukere",
+  "Welcome": "Velkommen <em>%s</em>.",
+  "Welcome_to": "Velkommen til [Site_Name]",
+  "Welcome_to_workspace": "Velkommen til {{Site_Name}}",
+  "Welcome_to_the": "Velkommen til",
+  "Why_did_you_chose__score__": "Hvorfor valgte du {{score}}?",
+  "Why_do_you_want_to_report_question_mark": "Hvorfor vil du rapportere?",
+  "will_be_able_to": "vil kunne",
+  "Without_SLA": "Uten SLA",
+  "Worldwide": "Verdensomspennende",
+  "Would_you_like_to_return_the_inquiry": "Vil du returnere forespørselen?",
+  "Yes": "Ja",
+  "Yes_archive_it": "Ja, arkiver det!",
+  "Yes_clear_all": "Ja, fjern alt!",
+  "Yes_continue": "Ja, fortsett!",
+  "Yes_delete_it": "Ja, slett det!",
+  "Yes_hide_it": "Ja, skjul det!",
+  "Yes_leave_it": "Ja, la det være!",
+  "Yes_mute_user": "Ja, stum bruker!",
+  "Yes_prune_them": "Ja, beskjære dem!",
+  "Yes_pin_message": "Ja, fest melding",
+  "Yes_remove_user": "Ja, fjern bruker!",
+  "Yes_unarchive_it": "Ja, unarchive det!",
+  "yesterday": "i går",
+  "You": "Du",
+  "You_reacted_with": "Du reagerte med {{emoji}}",
+  "Users_reacted_with": "{{users}} reagerte med {{emoji}}",
+  "Users_and_more_reacted_with": "{{users}} og {{counter}} andre reagerte med {{emoji}}",
+  "You_and_users_Reacted_with": "Du og {{users}} reagerte med {{emoji}}",
+  "You_users_and_more_Reacted_with": "Du, {{users}} og {{counter}} andre reagerte med {{emoji}}",
+  "you_are_in_preview_mode_of": "Du er i forhåndsvisningsmodus av kanal # <strong>{{room_name}}</strong>",
+  "You_are_logged_in_as": "Du er innlogget som",
+  "You_are_not_authorized_to_view_this_page": "Du er ikke autorisert til å vise denne siden.",
+  "You_can_change_a_different_avatar_too": "Du kan overstyre avataren som brukes til å legge inn fra denne integrasjonen.",
+  "You_can_search_using_RegExp_eg": "Du kan søke med <a href=\"https://en.wikipedia.org/wiki/Regular_expression\" target=\"_blank\">RegExp</a>, f.eks. <code class=\"code-colors inline\">/^tekst$/i</code>",
+  "You_can_use_an_emoji_as_avatar": "Du kan også bruke en emoji som en avatar.",
+  "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Du kan bruke webhooks for enkelt å integrere livechat med CRM.",
+  "You_cant_leave_a_livechat_room_Please_use_the_close_button": "Du kan ikke forlate et livechat-rom. Vennligst bruk lukkeknappen.",
+  "You_have_been_muted": "Du har blitt dempet og kan ikke snakke i dette rommet",
+  "You_have_been_removed_from__roomName_": "Du har blitt fjernet fra rommet {{roomName}}",
+  "You_have_n_codes_remaining": "Du har {{number}} koder igjen.",
+  "You_have_not_verified_your_email": "Du har ikke bekreftet e-posten din.",
+  "You_have_successfully_unsubscribed": "Du har sluttet å abonnere fra vår mailliste.",
+  "You_must_join_to_view_messages_in_this_channel": "Du må bli med for å vise meldinger i denne kanalen",
+  "You_mentioned___mentions__but_theyre_not_in_this_room": "Du nevnte {{mentions}}, men de er ikke i dette rommet.",
+  "You_mentioned___mentions__but_theyre_not_in_this_room_You_can_ask_a_room_admin_to_add_them": "Du nevnte {{mentions}}, men de er ikke i dette rommet. Du kan be en romadministrator om å legge dem til.",
+  "You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm": "Du nevnte {{mentions}}, men de er ikke i dette rommet. Du gir dem beskjed via DM.",
+  "You_need_confirm_email": "Du må bekrefte din e-post for å logge inn!",
+  "You_need_install_an_extension_to_allow_screen_sharing": "Du må installere en utvidelse for å tillate skjermdeling",
+  "You_need_to_change_your_password": "Du må endre passordet ditt",
+  "You_need_to_type_in_your_password_in_order_to_do_this": "Du må skrive inn passordet ditt for å gjøre dette!",
+  "You_need_to_type_in_your_username_in_order_to_do_this": "Du må skrive inn brukernavnet ditt for å kunne gjøre dette!",
+  "You_need_to_verifiy_your_email_address_to_get_notications": "Du må bekrefte e-postadressen din for å få varsler",
+  "You_need_to_write_something": "Du må skrive noe!",
+  "You_should_inform_one_url_at_least": "Du bør definere minst en nettadresse.",
+  "You_should_name_it_to_easily_manage_your_integrations": "Du bør nevne det for å enkelt håndtere integrasjonene dine.",
+  "You_will_not_be_able_to_recover": "Du vil ikke kunne gjenopprette denne meldingen!",
+  "You_will_not_be_able_to_recover_file": "Du vil ikke kunne gjenopprette denne filen!",
+  "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "Du mottar ikke e-postvarsler fordi du ikke har bekreftet e-posten din.",
+  "Your_email_has_been_queued_for_sending": "E-posten din har vært i kø for å sende",
+  "Your_entry_has_been_deleted": "Oppføringen din er slettet.",
+  "Your_file_has_been_deleted": "Filen din er slettet.",
+  "Your_invite_link_will_expire_after__usesLeft__uses": "Invitasjonslenken din utløper etter {{usesLeft}} anvendelser.",
+  "Your_invite_link_will_expire_on__date__": "Invitasjonslenken din utløper {{date}}.",
+  "Your_invite_link_will_expire_on__date__or_after__usesLeft__uses": "Invitasjonskoblingen din utløper {{date}} eller etter  {{usesLeft}} anvendelser.",
+  "your_message": "din beskjed",
+  "your_message_optional": "meldingen din (valgfritt)",
+  "Your_password_is_wrong": "Ditt passord er feil!",
+  "Your_push_was_sent_to_s_devices": "Din push ble sendt til%s-enheter",
+  "Your_request_to_join__roomName__has_been_made_it_could_take_up_to_15_minutes_to_be_processed": "Din forespørsel om å bli med i {{roomName}} er opprettet. Det kan ta opptil 15 minutter å behandle den. Du vil bli varslet når den er klar til bruk.",
+  "Your_server_link": "Din serverkobling",
+  "Your_workspace_is_ready": "Ditt arbeidsområde er klar til bruk 🎉",
+  "Youre_not_a_part_of__channel__and_I_mentioned_you_there": "Du er ikke en del av {{channel}} og jeg nevnte deg der",
+  "registration.page.login.errors.wrongCredentials": "Bruker finnes ikke eller så er passordet feil",
+  "registration.page.login.errors.invalidEmail": "Ugyldig e-post",
+  "registration.page.login.errors.loginBlockedForIp": "Innlogging er midlertidig blokkert for denne IP-adressen",
+  "registration.page.login.errors.loginBlockedForUser": "Innlogging er midlertidig blokkert for denne brukeren",
+  "registration.page.login.errors.licenseUserLimitReached": "Maksimalt antall brukere er nådd.",
+  "registration.page.login.errors.AppUserNotAllowedToLogin": "Appbrukere har ikke lov til å logge inn direkte.",
+  "registration.page.registration.waitActivationWarning": "Før du kan logge inn, må kontoen din aktiveres manuelt av en administrator.",
+  "registration.page.login.register": "Ny her? <1>Opprett en konto</1>",
+  "registration.page.resetPassword.sent": "Hvis denne e-posten er registrert, sender vi instruksjoner om hvordan du tilbakestiller passordet ditt. Hvis du ikke mottar en epost, vennligst kom tilbake og prøv igjen.",
+  "registration.page.resetPassword.sendInstructions": "Send instruksjoner",
+  "registration.page.resetPassword.errors.invalidEmail": "Ugyldig epost",
+  "registration.page.guest.chooseHowToJoin": "Velg hvordan du vil bli med",
+  "registration.page.guest.loginWithRocketChat": "Logg inn med Rocket.Chat",
+  "registration.page.guest.continueAsGuest": "Fortsett som gjest",
+  "registration.component.welcome": "Velkommen til <1>Rocket.Chat</1> arbeidsområdet",
+  "registration.component.login": "Logg inn",
+  "registration.component.login.userNotFound": "Bruker ikke funnet",
+  "registration.component.login.incorrectPassword": "feil passord",
+  "registration.component.switchLanguage": "Bytt til <1>{{name}}</1>",
+  "registration.component.resetPassword": "Tilbakestilling av passord",
+  "registration.component.form.username": "Brukernavn",
+  "registration.component.form.name": "Navn",
+  "registration.component.form.nameOptional": "Valgfritt navn",
+  "registration.component.form.createAnAccount": "Opprett en konto",
+  "registration.component.form.userAlreadyExist": "Brukernavn finnes allerede. Vennligst prøv et annet brukernavn.",
+  "registration.component.form.emailAlreadyExists": "E-post finnes allerede",
+  "registration.component.form.usernameAlreadyExists": "Brukernavn finnes allerede. Vennligst prøv et nytt brukernavn.",
+  "registration.component.form.invalidEmail": "E-posten som er oppgitt, er ugyldig",
+  "registration.component.form.email": "E-post",
+  "registration.component.form.emailPlaceholder": "eksempel@eksempel.no",
+  "registration.component.form.password": "Passord",
+  "registration.component.form.divider": "eller",
+  "registration.component.form.submit": "Sende inn",
+  "registration.component.form.joinYourTeam": "Bli med teamet ditt",
+  "registration.component.form.reasonToJoin": "Årsak til å bli med",
+  "registration.component.form.invalidConfirmPass": "Passordbekreftelsen stemmer ikke overens med passordet",
+  "registration.component.form.confirmPassword": "Bekreft passordet ditt",
+  "registration.component.form.confirmation": "Bekreftelse",
+  "registration.component.form.sendConfirmationEmail": "Send bekreftelses-e-post",
+  "onboarding.component.form.action.registerWorkspace": "Registrer arbeidsområde",
+  "onboarding.component.form.action.registerOffline": "Registrer deg offline",
+  "onboarding.component.form.action.completeRegistration": "Fullfør registrering",
+  "onboarding.component.emailCodeFallback": "Ikke mottatt e-post? <1>Send på nytt</1> eller <3>Endre e-post</3>.",
+  "onboarding.form.awaitConfirmationForm.content.securityCode": "Sikkerhetskode",
+  "onboarding.form.organizationInfoForm.subtitle": "Vi trenger å vite hvem du er.",
+  "onboarding.form.registeredServerForm.title": "Registrer arbeidsområdet ditt",
+  "subscription.callout.guestUsers": "gjester",
+  "subscription.callout.roomsPerGuest": "maks gjest per rom",
+  "subscription.callout.privateApps": "installerte private apper",
+  "subscription.callout.monthlyActiveContacts": "månedlige aktive kontakter",
+  "Upload_anyway": "Last opp allikevel",
+  "App_limit_reached": "Appgrensen er nådd",
+  "App_limit_exceeded": "Appgrensen er overskredet",
+  "Private_apps_limit_reached": "Grensen for private apper er nådd",
+  "Private_apps_limit_exceeded": "Grensen for private apper er overskredet",
+  "Community_Private_apps_limit_exceeded": "Grensen for Community-apper er overskredet.",
+  "Theme_high_contrast": "Høy kontrast",
+  "Highlighted_chosen_word": "Uthevet valgt ord",
+  "Join_your_team": "Bli med teamet ditt",
+  "Create_a_password": "Opprett et passord",
+  "Create_an_account": "Opprett en konto",
+  "Get_all_apps": "Få alle appene teamet ditt trenger",
+  "No_private_apps_installed": "Ingen private apper installert",
+  "Contact_email": "Kontakt-epost ",
+  "Customer": "Kunde",
+  "Time": "Tid",
+  "Undo_request": "Angre forespørsel",
+  "No_permission": "Ingen tillatelse",
+  "User_Status": "Brukerstatus",
+  "New_custom_status": "Ny egendefinert status",
+  "Service_disabled": "Tjenesten er nå deaktivert",
+  "User_status_disabled_learn_more": "Brukerstatus er deaktivert",
+  "Go_to_workspace_settings": "Gå til arbeidsområdeinnstillinger",
+  "User_status_temporarily_disabled": "Brukerstatus er midlertidig deaktivert",
+  "Use_token": "Bruk token",
+  "Disconnected": "Frakoblet",
+  "Security_code": "Sikkerhetskode",
+  "Registration_Token": "Registreringstoken",
+  "RegisterWorkspace_Button": "Registrer arbeidsområde",
+  "RegisterWorkspace_Features_Marketplace_Disconnect": "Det vil ikke lenger være mulig å installere apper.",
+  "RegisterWorkspace_Features_ThirdPartyLogin_Title": "Tredjeparts innlogging",
+  "RegisterWorkspace_Setup_Steps": "Steg {{step}} av {{numberOfSteps}}",
+  "RegisterWorkspace_Setup_Have_Account_Title": "Har en konto?",
+  "RegisterWorkspace_Setup_No_Account_Title": "Har du ikke en konto?",
+  "RegisterWorkspace_Syncing_Complete": "Synkronisering fullført",
+  "Uninstall_grandfathered_app": "Vil du avinstallere {{appName}}?",
+  "All_rooms": "Alle rom",
+  "All_visible": "Alle synlige",
+  "Filter_by_room": "Filtrer etter romtype",
+  "Filter_by_visibility": "Filtrer etter synlighet",
+  "Premium": "Premium",
+  "Enterprise": "Premium",
+  "Solve_issues": "Løs problemer",
+  "Outdated": "Utdatert",
+  "Latest": "Siste",
+  "New_version_available": "Ny versjon tilgjengelig",
+  "trial": "prøve",
+  "Subscription": "Abonnement",
+  "Private_apps": "Privatapper",
+  "n_days_left": "{{n}} dager igjen",
+  "Contact_sales": "Kontakt salg",
+  "Finish_purchase": "Fullfør kjøpet",
+  "free_per_month_user": "$0 per måned per bruker",
+  "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
+  "Buy_more": "Kjøp mer"
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index a89485a5f6c3..32db3455abd7 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -16,6 +16,8 @@
   "__count__without__department__": "{{count}} uten avdeling",
   "__count__without__tags__": "{{count}} uten tagger",
   "__count__without__assignee__": "{{count}} uten mottaker",
+  "__roomName__was_added_to_favorites": "{{roomName}} ble lagt til i favoritter",
+  "__roomName__encryption_keys_need_to_be_updated": "{{roomName}} krypteringsnøkler må oppdateres for å gi deg tilgang. Et annet rommedlem må være online for at dette skal skje.",
   "removed__username__as__role_": "fjernet {{username}} som {{role}}",
   "set__username__as__role_": "sett {{username}} som {{role}}",
   "This_room_encryption_has_been_enabled_by__username_": "Dette rommets kryptering er aktivert av {{username}}",
@@ -28,7 +30,7 @@
   "@username": "@brukernavn",
   "@username_message": "@brukernavn <message>",
   "#channel": "#kanal",
-  "%_of_conversations": "%% av samtaler",
+  "%_of_conversations": "% av samtaler",
   "0_Errors_Only": "0 - Kun Feil",
   "1_Errors_and_Information": "1 - Feil og informasjon",
   "2_Erros_Information_and_Debug": "2 - Feil, Informasjon og Feilsøking",
@@ -44,6 +46,7 @@
   "Accessibility": "Tilgjengelighet",
   "Accessibility_and_Appearance": "Tilgjengelighet og utseende",
   "Accessibility_activation": "Her kan du aktivere en rekke funksjoner for å forbedre nettleseropplevelsen din.",
+  "Accessibility_statement": "Tilgjengelighetserklæring",
   "Accept_Call": "Godta anrop",
   "Accept": "Aksepter",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Aksepter innkommende livechat selv om det ikke er noen online",
@@ -114,7 +117,7 @@
   "Accounts_Email_Approved_Subject": "Konto godkjent",
   "Accounts_Email_Deactivated": "[navn]<br/><br/><p>Kontoen din ble deaktivert.</p>",
   "Accounts_Email_Deactivated_Subject": "Konto deaktivert",
-  "Accounts_EmailVerification": "epostbekreftelse",
+  "Accounts_EmailVerification": "Krev e-postbekreftelse for å logge på",
   "Accounts_EmailVerification_Description": "Kontroller at du har riktige SMTP-innstillinger for å bruke denne funksjonen",
   "Accounts_Enrollment_Email": "Innmelding e-post",
   "Accounts_Enrollment_Email_Default": "<h1>Velkommen til <strong>[Site_Name]</strong></h1><p>Gå til <a href=\"[Site_URL]\">[site_url]</a>og prøv den beste open source chat-løsningen tilgjengelig i dag!</p>",
@@ -3962,7 +3965,7 @@
   "The_application_name_is_required": "Programnavnet kreves",
   "The_application_will_be_able_to": "<1>{{appName}}</1> vil kunne:",
   "The_channel_name_is_required": "Kanalnavnet er påkrevd",
-  "The_emails_are_being_sent": "E-postene blir sendt.",   
+  "The_emails_are_being_sent": "E-postene blir sendt.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Bildestørrelsen fungerer ikke fordi vi ikke kan oppdage ImageMagick eller GraphicsMagick installert på serveren din.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meldingen er en diskusjon, du vil ikke kunne gjenopprette meldingene!",
   "The_necessary_browser_permissions_for_location_sharing_are_not_granted": "De nødvendige nettlesertillatelsene for posisjonsdeling ble ikke gitt",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index e909624ad4a9..2f58f3ba9302 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -8,9 +8,9 @@
   "__count__message_pruned_other": "{{count}} wiadomość(i) usuniętych",
   "__count__message_pruned_many": "{{count}} wiadomość(i) usuniętych",
   "__count__conversations__period__": "{{count}} rozmowy, {{period}}",
-  "__usersCount__member_joined_few": "+ {{count}} członków dołączyło",
   "__count__tags__and__count__conversations__period__": "{{count}} tagów i {{conversations}} konwersacji, {{period}}",
   "__departments__departments_and__count__conversations__period__": "{{departments}} działów i {{count}} rozmów, {{period}}",
+  "__usersCount__member_joined_few": "+ {{count}} członków dołączyło",
   "__usersCount__member_joined_one": "+ {{count}} członek dołączył",
   "__usersCount__member_joined_other": "+ {{count}} członków dołączyło",
   "__usersCount__people_will_be_invited": "{{usersCount}} ludzi zostanie zostanie zaproszonych",
@@ -231,6 +231,7 @@
   "Accounts_Password_Policy_AtLeastOneLowercase": "Co najmniej jedna mała litera",
   "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Wymuś, aby hasło zawierało co najmniej jedną małą literę.",
   "Accounts_Password_Policy_AtLeastOneNumber": "Przynajmniej jedna cyfra",
+  "Calls_in_queue_many": "{{count}} połączeń w kolejce",
   "Accounts_Password_Policy_AtLeastOneNumber_Description": "Wymuś, aby hasło zawierało co najmniej jedną cyfrę.",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "Co najmniej jeden symbol",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Wymuś, aby hasło zawierało co najmniej jeden znak specjalny.",
@@ -250,6 +251,7 @@
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Domyślne role dla usług uwierzytelniania",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Domyślne role (rozdzielone przecinkami), które zostaną przypisane użytkownikom podczas rejestracji za pośrednictwem usług uwierzytelniania",
   "Accounts_Registration_AuthenticationServices_Enabled": "Rejestracja przy użyciu usług uwierzytelniania",
+  "Calls_in_queue_few": "{{count}} połączeń w kolejce",
   "Accounts_Registration_Users_Default_Roles": "Domyślne role dla użytkowników",
   "Accounts_Registration_Users_Default_Roles_Description": "Domyślne role (rozdzielone przecinkami), które zostaną przypisane użytkownikom podczas rejestracji ręcznej (w tym przez API)",
   "Accounts_Registration_Users_Default_Roles_Enabled": "Włącz domyślne role dla rejestracji ręcznej",
@@ -277,7 +279,6 @@
   "Accounts_ShowFormLogin": "Pokaż domyślny formularz logowania",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "Włącz uwierzytelnianie dwuskładnikowe za pomocą TOTP",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "Użytkownicy mogą skonfigurować uwierzytelnianie dwuskładnikowe za pomocą dowolnej aplikacji TOTP, takiej jak Google Authenticator lub Authy.",
-  "Calls_in_queue_many": "{{count}} połączeń w kolejce",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Uruchom automatycznie uwierzytelnianie dwuskładnikowe nowych użytkowników za pomocą poczty e-mail",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "Nowi użytkownicy będą mieć domyślnie włączone uwierzytelnianie dwuskładnikowe za pomocą poczty e-mail. Mogą je wyłączyć na stronie swojego profilu.",
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Czas wygaśnięcia kodu wysłanego w wiadomości e-mail w sekundach",
@@ -296,7 +297,6 @@
   "API_EmbedDisabledFor": "Wyłącz osadzanie dla użytkowników",
   "Accounts_UserAddedEmail_Default": "<h1>Witamy w <strong>[Site_Name]</strong></h1><p>Przejdź na stronę <a href=\"[Site_URL]\">[Site_URL]</a> i wypróbuj najlepsze dziś dostępne otwarte rozwiązanie czatu!</p><p> Możesz zalogować się przy użyciu adresu e-mail: [email] i hasła: [password]. Może wystąpić konieczność zmiany hasła po pierwszym logowaniu.",
   "Accounts_UserAddedEmail_Description": "Możesz użyć znaczników:  \n - `[name]`, `[fname]`, `[lname]`, aby wstawić odpowiednio pełną nazwę użytkownika, jego imię lub nazwisko.  \n - `[email]`, aby wstawić adres e-mail użytkownika.  \n - `[password]`, aby wstawić hasło użytkownika.  \n - `[Site_Name]` i `[Site_URL]`, aby wstawić odpowiednio nazwę aplikacji i adres URL. ",
-  "Calls_in_queue_few": "{{count}} połączeń w kolejce",
   "API_EmbedDisabledFor_Description": "Rozdzielona przecinkami lista nazw użytkowników, którym należy wyłączyć podgląd osadzonych linków.",
   "Accounts_UserAddedEmailSubject_Default": "Dodano Cię do [Site_Name]",
   "Accounts_Verify_Email_For_External_Accounts": "Oznaczaj Email dla kont zewnętrznych jako zweryfikowany",
@@ -690,6 +690,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "Włącz tłumaczenie automatyczne",
   "AutoTranslate_Enabled_Description": "Włączenie tłumaczenia automatycznego umożliwi osobom z uprawnieniem `Tłumacz automatycznie` tłumaczenie automatyczne wszystkich wiadomości na wybrany przez nich język. Mogą obowiązywać opłaty.",
+  "message_counter_many": "{{count}} wiadomości",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Subscription-Key",
@@ -701,6 +702,7 @@
   "Avatars": "Awatary",
   "Avatar_changed_successfully": "Awatar został zmieniony",
   "Avatar_URL": "Adres URL awatara",
+  "meteor_status_reconnect_in_many": "spróbuj jeszcze raz za {{count}} sekund...",
   "Avatar_format_invalid": "Niepoprawny format. Dozwolony jest tylko typ obrazu",
   "Avatar_url_invalid_or_error": "Podany adres URL jest nieprawidłowy lub nie jest dostępny. Spróbuj ponownie, ale z innym adresem URL.",
   "Avg_chat_duration": "Średni czas rozmów",
@@ -767,6 +769,7 @@
   "Blockstack_ButtonLabelText": "Tekst etykiety przycisku",
   "Blockstack_Generate_Username": "Wygeneruj nazwę użytkownika",
   "Body": "Zawartość",
+  "message_counter_few": "{{count}} wiadomości",
   "bot_request": "Żądanie bota",
   "BotHelpers_userFields": "Pola użytkownika",
   "BotHelpers_userFields_Description": "CSV pól użytkownika, do których można uzyskać dostęp za pomocą metod pomocy bota.",
@@ -796,6 +799,7 @@
   "Busiest_time": "Najpracowitszy czas",
   "Business_Hour": "Godzina pracy",
   "Business_Hour_Removed": "Godzina pracy usunięta",
+  "meteor_status_reconnect_in_few": "spróbuj jeszcze raz za {{count}} sekund...",
   "Business_Hours": "Godziny pracy",
   "Business_hours_enabled": "Godziny pracy włączone",
   "Business_hours_updated": "Godziny pracy zaktualizowane",
@@ -864,7 +868,6 @@
   "CAS_enabled": "Włączone",
   "CAS_Login_Layout": "Układ logowania CAS",
   "CAS_login_url": "Adres URL logowania SSO",
-  "message_counter_many": "{{count}} wiadomości",
   "CAS_login_url_Description": "Adres URL logowania zewnętrznej usługi SSO, np.: `https://sso.example.undef/sso/login`",
   "CAS_popup_height": "Wysokość okna logowania",
   "CAS_popup_width": "Szerokość okna logowania",
@@ -880,7 +883,6 @@
   "Categories*": "Kategorie*",
   "CDN_JSCSS_PREFIX": "Prefiks CDN dla JS/CSS",
   "CDN_PREFIX": "Prefiks CDN",
-  "meteor_status_reconnect_in_many": "spróbuj jeszcze raz za {{count}} sekund...",
   "CDN_PREFIX_ALL": "Używaj prefiksu CDN dla wszystkich zasobów",
   "Certificates_and_Keys": "Certyfikaty i klucze",
   "changed_room_announcement_to__room_announcement_": "zmieniono ogłoszenie o pokoju na: {{room_announcement}}",
@@ -957,7 +959,6 @@
   "Click_here": "Kliknij tutaj",
   "Click_here_for_more_details_or_contact_sales_for_a_new_license": "<a target=\"_blank\" href=\"{{url}}\">Kliknij tutaj</a>, aby uzyskać więcej informacji, lub napisz na adres <strong>{{email}}</strong> w celu uzyskania nowej licencji.",
   "Click_here_for_more_info": "Kliknij tutaj, aby uzyskać więcej informacji",
-  "message_counter_few": "{{count}} wiadomości",
   "Click_here_to_clear_the_selection": "Kliknij tutaj aby wyczyścić wybór",
   "Click_here_to_enter_your_encryption_password": "Kliknij tutaj, aby wprowadzić hasło szyfrowania",
   "Click_here_to_view_and_copy_your_password": "Kliknij tutaj, aby wyświetlić i skopiować hasło.",
@@ -991,7 +992,6 @@
   "Cloud_Invalid_license": "Nieprawidłowa licencja!",
   "Cloud_Apply_license": "Zastosuj licencję",
   "Cloud_connectivity": "Łączność w chmurze",
-  "meteor_status_reconnect_in_few": "spróbuj jeszcze raz za {{count}} sekund...",
   "Cloud_address_to_send_registration_to": "Adres, na który należy wysłać wiadomość e-mail z prośbą o rejestrację w chmurze.",
   "Cloud_click_here": "Po skopiowaniu tekstu przejdź do [konsola chmury (kliknij tutaj)]({{cloudConsoleUrl}}).",
   "Cloud_console": "Konsola chmury",
@@ -4543,7 +4543,7 @@
   "The_application_name_is_required": "Wymagana jest nazwa aplikacji",
   "The_channel_name_is_required": "Wymagana jest nazwa pokoju",
   "The_emails_are_being_sent": "Wiadomości e-mail są wysyłane.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmiana rozmiaru obrazu nie będzie działać, ponieważ nie możemy wykryć zainstalowanego ImageMagick lub GraphicsMagick na serwerze.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Wiadomość jest dyskusją, której nie będziesz w stanie odzyskać!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Powiadomienia mobilne zostały wyłączone dla wszystkich użytkowników, idź do \"Admin>Push\" aby uruchomić ponownie bramę push",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index a68473eadb93..4d986be29219 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -207,6 +207,7 @@
   "Accounts_Password_Policy_AtLeastOneLowercase": "Pelo menos uma minúscula",
   "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Forçar que a senha contenha pelo menos um caractere minúsculo.",
   "Accounts_Password_Policy_AtLeastOneNumber": "Pelo menos um numero",
+  "Calls_in_queue_many": "{{count}} chamadas na fila",
   "Accounts_Password_Policy_AtLeastOneNumber_Description": "Forçar que a senha contenha pelo menos um caractere numérico.",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "Pelo menos um símbolo",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Forçar que a senha contenha pelo menos um caractere especial.",
@@ -253,7 +254,6 @@
   "Accounts_ShowFormLogin": "Mostrar formulário de login padrão",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "Ativar autenticação de dois fatores por TOTP",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "Os usuários podem configurar sua Autenticação de dois fatores usando qualquer aplicativo de TOTP, como o Google Authenticator ou o Authy.",
-  "Calls_in_queue_many": "{{count}} chamadas na fila",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Ativar automaticamente a autenticação de duas etapas via e-mail para novos usuários",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "Novos usuários terão a autenticação de duas etapas via e-mail ativada por padrão. Eles poderão desabilitá-la em sua página de perfil.",
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Tempo para expirar o código enviado por e-mail (em segundos)",
@@ -643,6 +643,7 @@
   "AutoTranslate_Disabled_for_room": "Tradução automática desabilitada para #{{roomName}}",
   "AutoTranslate_Enabled": "Habilitar tradução automática",
   "AutoTranslate_Enabled_Description": "Habilitar a tradução automática implicará em permitir que as pessoas com a permissão `auto-translate`  tenham todas as suas mensagens automaticamente traduzidas para seu idioma. Taxas podem ser cobradas.",
+  "message_counter_many": "{{count}} mensagens",
   "AutoTranslate_Enabled_for_room": "Tradução automática habilitada para #{{roomName}}",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_language_set_to": "Linguagem para tradução automática definida como {{language}}",
@@ -655,6 +656,7 @@
   "Avatar": "Avatar",
   "Avatar_changed_successfully": "Avatar alterado com sucesso",
   "Avatar_URL": "URL do avatar",
+  "meteor_status_reconnect_in_many": "tentando novamente em {{count}} segundos...",
   "Avatar_format_invalid": "Formato inválido. Apenas imagens são permitidas.",
   "Avatar_url_invalid_or_error": "O URL fornecido é inválido ou não acessível. Tente novamente, mas com um URL diferente.",
   "Avg_chat_duration": "Duração média da conversa",
@@ -761,10 +763,10 @@
   "Call_Information": "Informação da chamada",
   "Call_provider": "Provedor de chamada",
   "Call_Already_Ended": "Chamada já encerrada",
-  "Call_transfered_to__name__": "Chamada transferida para {{name}}",
-  "Call_terminated": "Chamada encerrada",
   "call-management": "Gestão de chamadas",
   "call-management_description": "Permissão para iniciar reunião",
+  "Call_transfered_to__name__": "Chamada transferida para {{name}}",
+  "Call_terminated": "Chamada encerrada",
   "Caller": "Autor da chamada",
   "Caller_Id": "ID do autor da chamada",
   "Cancel": "Cancelar",
@@ -794,7 +796,6 @@
   "CAS_enabled": "Habilitado",
   "CAS_Login_Layout": "Layout de login CAS",
   "CAS_login_url": "URL de login SSO",
-  "message_counter_many": "{{count}} mensagens",
   "CAS_login_url_Description": "O URL de login de seu serviço SSO externo (exemplo: https://sso.exemplo.indef/sso/login)",
   "CAS_popup_height": "Altura do pop-up de login",
   "CAS_popup_width": "Largura do pop-up de login",
@@ -810,7 +811,6 @@
   "Categories*": "Categorias*",
   "CDN_JSCSS_PREFIX": "Prefixo CDN para JS/CSS",
   "CDN_PREFIX": "Prefixo CDN",
-  "meteor_status_reconnect_in_many": "tentando novamente em {{count}} segundos...",
   "CDN_PREFIX_ALL": "Use o prefixo da CDN para todos os recursos",
   "Certificates_and_Keys": "Certificados e chaves",
   "change-livechat-room-visitor": "Alterar visitantes da Sala Livechat",
@@ -1464,8 +1464,8 @@
   "Disable_Notifications": "Desativar as notificações",
   "Disable_two-factor_authentication": "Desativar a autenticação de dois fatores por TOTP",
   "Disable_two-factor_authentication_email": "Desativar a autenticação de dois fatores por e-mail",
-  "Disable_voice_calling": "Desabilitar chamadas de voz",
   "Disabled": "Desabilitado",
+  "Disable_voice_calling": "Desabilitar chamadas de voz",
   "Disallow_reacting": "Não permitir reagir",
   "Disallow_reacting_Description": "Não permite reagir",
   "Discard": "Descartar",
@@ -3889,8 +3889,8 @@
   "Select_the_teams_channels_you_would_like_to_delete": "Selecione os Canais da equipe que deseja remover, os que você não selecionar serão movidos para o espaço de trabalho.",
   "Select_user": "Selecionar usuário",
   "Select_users": "Selecione usuários",
-  "Selected_agents": "Agentes selecionados",
   "Select_someone_to_transfer_the_call_to": "Selecione alguém para transferir a chamada",
+  "Selected_agents": "Agentes selecionados",
   "Selected_departments": "Departamentos selecionados",
   "Selected_monitors": "Monitores selecionados",
   "Selecting_users": "Selecionando usuários",
@@ -4246,7 +4246,7 @@
   "The_application_name_is_required": "O nome do aplicativo é obrigatório",
   "The_channel_name_is_required": "O nome do canal é obrigatório",
   "The_emails_are_being_sent": "Os e-mails estão sendo enviados.",
-  "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar se o ImageMagick ou GraphicsMagick está instalado no seu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, você não poderá recuperar as mensagens!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "As notificações móveis foram desativadas para todos os usuários, vá para  \"Admin > Push\" para ativar o Push Gateway novamente",
@@ -4674,10 +4674,10 @@
   "Version_version": "Versão {{version}}",
   "Video_Chat_Window": "Vídeochat",
   "Video_Conference": "Videoconferência",
+  "Video_call": "Chamada de vídeo",
   "Video_message": "Mensagem de vídeo",
   "Videocall_declined": "Chamada de vídeo negada.",
   "Video_and_Audio_Call": "Chamadas de vídeo e áudio",
-  "Video_call": "Chamada de vídeo",
   "Videos": "Vídeos",
   "View_mode": "Modo de visualização",
   "View_All": "Ver todos os membros",
@@ -5051,4 +5051,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Auditoria de mensagem"
-}
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 84d840b92a53..5c282e5a9275 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -2729,7 +2729,7 @@
   "Thank_you_for_your_feedback": "Obrigado pelo sua opinião",
   "The_application_name_is_required": "O nome da aplicação é obrigatório",
   "The_channel_name_is_required": "O nome do canal é obrigatório",
-  "The_emails_are_being_sent": "Os emails estão a ser enviados.",   
+  "The_emails_are_being_sent": "Os emails estão a ser enviados.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar ImageMagick ou GraphicsMagick instalado no seu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, não poderá recuperar as mensagens!",
   "The_peer__peer__does_not_exist": "O par <em>{{peer}}</em> não existe.",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index 7266b1883386..c5c84a33a094 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -2364,7 +2364,7 @@
   "Thank_you_for_your_feedback": "Vă mulțumim pentru feedback",
   "The_application_name_is_required": "Este nevoie de numele aplicației",
   "The_channel_name_is_required": "Este nevoie de numele canalului",
-  "The_emails_are_being_sent": "E-mail-urile sunt trimise.",   
+  "The_emails_are_being_sent": "E-mail-urile sunt trimise.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Redimensionarea imaginii nu va funcționa, deoarece nu putem detecta ImageMagick sau GraphicsMagick instalat pe server.",
   "The_redirectUri_is_required": "URI de redirectare este necesar",
   "The_server_will_restart_in_s_seconds": "Serverul va reporni în %s secunde",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 6edc8030513f..ebc651aa2e08 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -178,11 +178,13 @@
   "Accounts_OAuth_Meteor_id": "Идентификатор Meteor",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
   "Accounts_OAuth_Nextcloud": "OAuth включен",
+  "Apps_Count_Enabled_many": "{{count}} приложений(-я) включено",
   "Accounts_OAuth_Nextcloud_callback_url": "URL обратного вызова Nextcloud",
   "Accounts_OAuth_Nextcloud_id": "Nextcloud ID",
   "Accounts_OAuth_Nextcloud_secret": "Client Secret",
   "Accounts_OAuth_Nextcloud_URL": "URL сервера Nextcloud",
   "Accounts_OAuth_Proxy_host": "Прокси хост",
+  "Private_Apps_Count_Enabled_many": "{{count}} приватных приложений включено",
   "Accounts_OAuth_Proxy_services": "Прокси сервисы",
   "Accounts_OAuth_Tokenpass": "Tokenpass Логин",
   "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass Callback URL",
@@ -206,11 +208,10 @@
   "Accounts_OAuth_Wordpress_token_path": "Token Path",
   "Accounts_Password_Policy_AtLeastOneLowercase": "Хотя бы одну букву в нижнем регистре",
   "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Убедитесь, что пароль содержит хотя бы одну букву в нижнем регистре.",
-  "Apps_Count_Enabled_many": "{{count}} приложений(-я) включено",
   "Accounts_Password_Policy_AtLeastOneNumber": "Хотя бы одну цифру",
+  "Calls_in_queue_many": "{{count}} Звонков в очереди",
   "Accounts_Password_Policy_AtLeastOneNumber_Description": "Убедитесь, что пароль содержит хотя бы один цифровой символ.",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "Хотя бы один специальный символ",
-  "Private_Apps_Count_Enabled_many": "{{count}} приватных приложений включено",
   "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Убедитесь, что пароль содержит хотя бы один специальный символ.",
   "Accounts_Password_Policy_AtLeastOneUppercase": "Хотя бы одну букву в верхнем регистре",
   "Accounts_Password_Policy_AtLeastOneUppercase_Description": "Убедитесь, что пароль содержит хотя бы одну букву в верхнем регистре.",
@@ -228,6 +229,7 @@
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Роли по-умолчанию для сервисов аутентификации",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Роли по-умолчанию (разделенные запятой), назначаемые пользователям при регистрации через сервисы аутентификации",
   "Accounts_Registration_AuthenticationServices_Enabled": "Регистрация сервисами проверки подлинности",
+  "Calls_in_queue_few": "{{count}} Звонков в очереди",
   "Accounts_Registration_Users_Default_Roles": "Роли по умолчанию для пользователей",
   "Accounts_Registration_Users_Default_Roles_Description": "Роли по умолчанию (разделенные запятыми), которые пользователи будут получать при регистрации вручную (в том числе через API)",
   "Accounts_Registration_Users_Default_Roles_Enabled": "Включение ролей по умолчанию для ручной регистрации",
@@ -255,7 +257,6 @@
   "Accounts_ShowFormLogin": "Показать логин на основе формы",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "Включить двухфакторную аутентификацию через TOTP",
   "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "Пользователи могут настроить двухфакторную аутентификацию с помощью любого приложения TOTP, например, Google Authenticator или Authy.",
-  "Calls_in_queue_many": "{{count}} Звонков в очереди",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Автоматический настраивать двухфакторную аутентификацию по электронной почте для новых пользователей",
   "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "У новых пользователей по умолчанию будет включена двухфакторная аутентификация по электронной почте. Они смогут отключить ее на странице своего профиля.",
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Время до истечения срока действия кода, отправленного по электронной почте, в секундах",
@@ -274,7 +275,6 @@
   "API_EmbedDisabledFor": "Отключить вставку для пользователей",
   "Accounts_UserAddedEmail_Default": "<h1>Добро пожаловать в <strong>[Site_Name]</strong></h1><p>Посетите <a href=\"[Site_URL]\">[Site_URL]</a> и попробуйте лучшее решение для чатов с открытым исходным кодом на сегодняшний день!</p> <p>Вы можете войти в систему, используя адрес электронной почты: [email] и пароль: [password]. Возможно, вам потребуется сменить его после первого входа в систему.",
   "Accounts_UserAddedEmail_Description": "Вы можете использовать следующие обозначения:  \n -  `[name]`, `[fname]`, `[lname]` для полного имени пользователя, только имени или только фамилии  соответственно).  \n -  [email] -  для email адреса пользователя.  \n -  [password] - для пароля пользователя.  \n - `[Site_Name]` и `[Site_URL]` - название вашего приложения и его URL.  ",
-  "Calls_in_queue_few": "{{count}} Звонков в очереди",
   "API_EmbedDisabledFor_Description": "Список логинов, разделенных запятыми, для отключения предварительного просмотра ссылок.",
   "Accounts_UserAddedEmailSubject_Default": "Вы были добавлены в [Site_Name]",
   "Accounts_Verify_Email_For_External_Accounts": "Отметить электронную почту для внешних учетных записей проверенной",
@@ -305,6 +305,7 @@
   "Add_users": "Добавить пользователей",
   "Add_members": "Добавить участников",
   "add-all-to-room": "Добавить всех пользователей в чат",
+  "Apps_Count_Enabled_few": "{{count}} приложений(-я) включено",
   "add-all-to-room_description": "Разрешение на добавление всех пользователей в чат",
   "add-livechat-department-agents": "Добавить Livechat Агентов в Отделы",
   "add-livechat-department-agents_description": "Разрешение на добавление омниканальных агентов в отделы",
@@ -312,6 +313,7 @@
   "add-oauth-service_description": "Разрешение на добавление новых сервисов Oauth",
   "bypass-time-limit-edit-and-delete": "Обход ограничения по времени",
   "bypass-time-limit-edit-and-delete_description": "Разрешение на обход ограничения по времени для редактирования и удаления сообщений",
+  "Private_Apps_Count_Enabled_few": "{{count}} приватных приложений включено",
   "add-team-channel": "Добавить Channel Команды",
   "add-team-channel_description": "Разрешение на добавление канала в Команду",
   "add-team-member": "Добавить участника Команды",
@@ -336,14 +338,12 @@
   "Additional_Feedback": "Дополнительная обратная связь",
   "additional_integrations_Bots": "Если вы ищете, как интегрировать собственного бота, посмотрите наш адаптер Hubot. <a href=\"https://github.com/RocketChat/hubot-rocketchat\" target=\"_blank\">https://github.com/RocketChat/hubot-rocketchat</a>",
   "Admin_disabled_encryption": "Ваш администратор не включил шифрование E2E.",
-  "Apps_Count_Enabled_few": "{{count}} приложений(-я) включено",
   "Admin_Info": "Информация Администратора",
   "admin-no-active-video-conf-provider": "**Функция звонков не включена**: Настройте звонки, чтобы сделать их доступными для вашего сервера.",
   "admin-video-conf-provider-not-configured": "**Функция звонков не включена**: Настройте звонки, чтобы сделать их доступными для вашего сервера.",
   "admin-no-videoconf-provider-app": "**Функция звонков не включена**: Приложения для звонков могут быть установлены из магазина приложений Rocket.Chat администратором сервера.",
   "Administration": "Администрирование",
   "Address": "Адрес",
-  "Private_Apps_Count_Enabled_few": "{{count}} приватных приложений включено",
   "Adult_images_are_not_allowed": "Изображения для взрослых запрещены",
   "Aerospace_and_Defense": "Аэрокосмическая промышленность и оборона",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "После аутентификации OAuth2, пользователи будут перенаправляться на этот URL-адрес",
@@ -686,6 +686,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "Включить авто-перевод",
   "AutoTranslate_Enabled_Description": "Включение автоматического перевода позволит пользователям с разрешением на `автоматический перевод `  переводить все сообщения на их язык. Может взиматься оплата.",
+  "message_counter_many": "{{count}} сообщения",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Subscription-Key",
@@ -697,6 +698,7 @@
   "Avatars": "Аватары",
   "Avatar_changed_successfully": "Аватар успешно изменен",
   "Avatar_URL": "URL-адрес Аватара",
+  "meteor_status_reconnect_in_many": "пытается снова через {{count}} секунд ...",
   "Avatar_format_invalid": "Не верный формат. Разрешены только графические типы.",
   "Avatar_url_invalid_or_error": "Предоставленный URL-адрес недействителен или недоступен. Пожалуйста, повторите попытку с другим URL-адресом.",
   "Avg_chat_duration": "В среднем продолжительность беседы",
@@ -762,6 +764,7 @@
   "Blockstack_ButtonLabelText": "Текст ярлыка кнопки",
   "Blockstack_Generate_Username": "Сгенерировать логин",
   "Body": "Body",
+  "message_counter_few": "{{count}} сообщения",
   "bot_request": "Запрос бота",
   "BotHelpers_userFields": "Пользовательские поля",
   "BotHelpers_userFields_Description": "CSV полей пользователя, к которым можно получить доступ с помощью методов ботов помощников.",
@@ -792,6 +795,7 @@
   "Busiest_time": "Занятое время",
   "Business_Hour": "Рабочие часы",
   "Business_Hour_Removed": "Рабочие часы удалены",
+  "meteor_status_reconnect_in_few": "пытается снова через {{count}} секунд ...",
   "Business_Hours": "Рабочие часы",
   "Business_hours_enabled": "Рабочие часы включены",
   "Business_hours_updated": "Рабочие часы обновлены",
@@ -854,7 +858,6 @@
   "CAS_enabled": "Включено",
   "CAS_Login_Layout": "Стиль окна CAS авторизации",
   "CAS_login_url": "SSO логин URL",
-  "message_counter_many": "{{count}} сообщения",
   "CAS_login_url_Description": "Логин URL вашего внешнего сервиса SSO. Например: `https://sso.example.undef/sso/login`",
   "CAS_popup_height": "Высота всплывающего окна входа",
   "CAS_popup_width": "Ширина всплывающего окна входа",
@@ -870,7 +873,6 @@
   "Categories*": "Категории*",
   "CDN_JSCSS_PREFIX": "Префикс CDN для JS/CSS",
   "CDN_PREFIX": "CDN префикс",
-  "meteor_status_reconnect_in_many": "пытается снова через {{count}} секунд ...",
   "CDN_PREFIX_ALL": "Использовать Префикс CDN для всех активов",
   "Certificates_and_Keys": "Ключи и сертификаты",
   "change-livechat-room-visitor": "Изменить посетителей чата Livechat",
@@ -940,7 +942,6 @@
   "Click_here": "кликните сюда",
   "Click_here_for_more_details_or_contact_sales_for_a_new_license": "<a target=\"_blank\" href=\"{{url}}\">Нажмите сюда</a>  для получения подробной информации или свяжитесь <strong>{{email}}</strong> для получения новой лицензии.",
   "Click_here_for_more_info": "Больше информации здесь",
-  "message_counter_few": "{{count}} сообщения",
   "Click_here_to_enter_your_encryption_password": "Нажмите здесь, чтобы ввести пароль для шифрования.",
   "Click_here_to_view_and_copy_your_password": "Нажмите здесь, чтобы просмотреть и скопировать пароль.",
   "Click_the_messages_you_would_like_to_send_by_email": "Выберите сообщения, которые вы хотите отправить по email.",
@@ -972,7 +973,6 @@
   "Cloud_Invalid_license": "Недействительная лицензия!",
   "Cloud_Apply_license": "Применить лицензию",
   "Cloud_connectivity": "Облачная связь",
-  "meteor_status_reconnect_in_few": "пытается снова через {{count}} секунд ...",
   "Cloud_address_to_send_registration_to": "Адрес для отправки электронного письма с регистрацией в облаке.",
   "Cloud_click_here": "После копирования текста перейдите на Cloud Console. [Щелкните здесь]({{cloudConsoleUrl}})",
   "Cloud_console": "Облачная Консоль",
@@ -4294,7 +4294,7 @@
   "The_application_name_is_required": "Требуется название приложения",
   "The_channel_name_is_required": "Требуется название канала",
   "The_emails_are_being_sent": "Письма отправляются.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Пустой чат <span style=\"font-weight: bold;\">{{roomName}}</span> будет удален автоматически.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Пустой чат <span style=\"font-weight: bold;\">{{roomName}}</span> будет удален автоматически.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Изменить размер изображения не получится, потому что мы не можем обнаружить установленные на вашем сервере ImageMagick или GraphicsMagick.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Сообщение обсуждения, вы не сможете восстановить сообщения!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Мобильные уведомления были отключены для всех пользователей, перейдите в \"Admin > Push\", чтобы снова включить Push Gateway",
diff --git a/packages/i18n/src/locales/se.i18n.json b/packages/i18n/src/locales/se.i18n.json
new file mode 100644
index 000000000000..b890eb5b10f0
--- /dev/null
+++ b/packages/i18n/src/locales/se.i18n.json
@@ -0,0 +1,6621 @@
+{
+  "500": "Internal Server Error",
+  "__agents__agents_and__count__conversations__period__": "{{agents}} agents and {{count}} conversations, {{period}}",
+  "__count__empty_rooms_will_be_removed_automatically": "{{count}} empty rooms will be removed automatically.",
+  "__count__empty_rooms_will_be_removed_automatically__rooms__": "{{count}} empty rooms will be removed automatically:<br/> {{rooms}}.",
+  "__count__message_pruned_one": "{{count}} message pruned",
+  "__count__message_pruned_other": "{{count}} messages pruned",
+  "__count__message_pruned_two": "{{count}} messages pruned",
+  "__count__conversations__period__": "{{count}} conversations, {{period}}",
+  "__count__tags__and__count__conversations__period__": "{{count}} tags and {{conversations}} conversations, {{period}}",
+  "__departments__departments_and__count__conversations__period__": "{{departments}} departments and {{count}} conversations, {{period}}",
+  "__usersCount__member_joined_one": "+ {{count}} member joined",
+  "__usersCount__member_joined_other": "+ {{count}} members joined",
+  "__usersCount__member_joined_two": "+ {{count}} members joined",
+  "__usersCount__people_will_be_invited": "{{usersCount}} people will be invited",
+  "__username__is_no_longer__role__defined_by__user_by_": "{{username}} is no longer {{role}} by {{user_by}}",
+  "__username__was_set__role__by__user_by_": "{{username}} was set {{role}} by {{user_by}}",
+  "__count__without__department__": "{{count}} without department",
+  "__count__without__tags__": "{{count}} without tags",
+  "__count__without__assignee__": "{{count}} without assignee",
+  "__roomName__was_added_to_favorites": "{{roomName}} was added to favorites",
+  "__roomName__was_removed_from_favorites": "{{roomName}} was removed from favorites",
+  "__roomName__is_encrypted": "{{roomName}} is encrypted",
+  "__roomName__encryption_keys_need_to_be_updated": "{{roomName}} encryption keys need to be updated to give you access. Another room member needs to be online for this to happen.",
+  "removed__username__as__role_": "removed {{username}} as {{role}}",
+  "set__username__as__role_": "set {{username}} as {{role}}",
+  "sequential_message": "sequential message",
+  "This_room_encryption_has_been_enabled_by__username_": "This room's encryption has been enabled by {{username}}",
+  "This_room_encryption_has_been_disabled_by__username_": "This room's encryption has been disabled by {{username}}",
+  "Third_party_login": "Third-party login",
+  "Enabled_E2E_Encryption_for_this_room": "enabled E2E Encryption for this room",
+  "Enable_business_hours": "Enable business hours",
+  "disabled": "disabled",
+  "Disabled_E2E_Encryption_for_this_room": "disabled E2E Encryption for this room",
+  "@username": "@username",
+  "@username_message": "@username <message>",
+  "#channel": "#channel",
+  "%_of_conversations": "% of Conversations",
+  "0_Errors_Only": "0 - Errors Only",
+  "1_Errors_and_Information": "1 - Errors and Information",
+  "2_Erros_Information_and_Debug": "2 - Errors, Information and Debug",
+  "12_Hour": "12-hour clock",
+  "24_Hour": "24-hour clock",
+  "A_cloud-based_platform_for_those_needing_a_plug-and-play_app": "A cloud-based platform for those needing a plug-and-play app.",
+  "A_new_owner_will_be_assigned_automatically_to__count__rooms": "A new owner will be assigned automatically to <span style=\"font-weight: bold;\">{{count}}</span> rooms.",
+  "A_new_owner_will_be_assigned_automatically_to_the__roomName__room": "A new owner will be assigned automatically to the <span style=\"font-weight: bold;\">{{roomName}}</span> room.",
+  "A_new_owner_will_be_assigned_automatically_to_those__count__rooms__rooms__": "A new owner will be assigned automatically to those <span style=\"font-weight: bold;\">{{count}}</span> rooms:<br/> {{rooms}}.",
+  "A_secure_and_highly_private_self-managed_solution_for_conference_calls": "A secure and highly private self-managed solution for conference calls.",
+  "A_workspace_admin_needs_to_install_and_configure_a_conference_call_app": "A workspace admin needs to install and configure a conference call app.",
+  "An_app_needs_to_be_installed_and_configured": "An app needs to be installed and configured.",
+  "Accessibility": "Accessibility",
+  "Accessibility_and_Appearance": "Accessibility & appearance",
+  "Accessibility_activation": "Here you can activate a range of features to enhance your browsing experience.",
+  "Accessibility_statement": "Accessibility statement",
+  "Accessibility_feature_documentation": "Accessibility feature documentation",
+  "Accept_Call": "Accept Call",
+  "Accept": "Accept",
+  "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Accept incoming omnichannel requests even if there are no online agents",
+  "Accept_new_livechats_when_agent_is_idle": "Accept new omnichannel requests when the agent is idle",
+  "Accept_with_no_online_agents": "Accept with No Online Agents",
+  "Access_not_authorized": "Access not authorized",
+  "Access_Token_URL": "Access Token URL",
+  "Access_Your_Account": "Access Your Account",
+  "access_your_basic_information": "access your basic information",
+  "access-mailer": "Access Mailer Screen",
+  "access-mailer_description": "Permission to send mass email to all users.",
+  "access-marketplace": "Access marketplace",
+  "access-marketplace_description": "Permission to browse and get apps from the marketplace",
+  "access-permissions": "Access Permissions Screen",
+  "access-permissions_description": "Modify permissions for various roles.",
+  "access-setting-permissions": "Modify Setting-Based Permissions",
+  "access-setting-permissions_description": "Permission to modify setting-based permissions",
+  "Accessing_permissions": "Accessing permissions",
+  "Account_SID": "Account SID",
+  "Account": "Account",
+  "Accounts": "Accounts",
+  "Accounts_Description": "Modify workspace member account settings.",
+  "Accounts_Admin_Email_Approval_Needed_Default": "<p>The user <b>[name] ([email])</b> has been registered.</p><p>Please check \"Administration -> Users\" to activate or delete it.</p>",
+  "Accounts_Admin_Email_Approval_Needed_Subject_Default": "A new user registered and needs approval",
+  "Accounts_Admin_Email_Approval_Needed_With_Reason_Default": "<p>The user <b>[name] ([email])</b> has been registered.</p><p>Reason: <b>[reason]</b></p><p>Please check \"Administration -> Users\" to activate or delete it.</p>",
+  "Accounts_AllowAnonymousRead": "Allow Anonymous Read",
+  "Accounts_AllowAnonymousWrite": "Allow Anonymous Write",
+  "Accounts_AllowDeleteOwnAccount": "Allow Users to Delete Own Account",
+  "Accounts_AllowedDomainsList": "Allowed Domains List",
+  "Accounts_AllowedDomainsList_Description": "Comma-separated list of allowed domains",
+  "Accounts_AllowInvisibleStatusOption": "Allow Invisible status option",
+  "Accounts_AllowEmailChange": "Allow Email Change",
+  "Accounts_AllowEmailNotifications": "Allow Email Notifications",
+  "Accounts_AllowFeaturePreview": "Allow Feature Preview",
+  "Accounts_AllowFeaturePreview_Description": "Make feature preview available to all workspace members.",
+  "Accounts_AllowPasswordChange": "Allow Password Change",
+  "Accounts_AllowPasswordChangeForOAuthUsers": "Allow Password Change for OAuth Users",
+  "Accounts_AllowRealNameChange": "Allow Name Change",
+  "Accounts_AllowUserAvatarChange": "Allow User Avatar Change",
+  "Accounts_AllowUsernameChange": "Allow Username Change",
+  "Accounts_AllowUserProfileChange": "Allow User Profile Change",
+  "Accounts_AllowUserStatusMessageChange": "Allow Custom Status Message",
+  "Accounts_AvatarBlockUnauthenticatedAccess": "Block Unauthenticated Access to Avatars",
+  "Accounts_AvatarCacheTime": "Avatar cache time",
+  "Accounts_AvatarCacheTime_description": "Number of seconds the http protocol is told to cache the avatar images.",
+  "Accounts_AvatarExternalProviderUrl": "Avatar External Provider URL",
+  "Accounts_AvatarExternalProviderUrl_Description": "Example: `https://acme.com/api/v1/{username}`",
+  "Accounts_AvatarResize": "Resize Avatars",
+  "Accounts_AvatarSize": "Avatar Size",
+  "Accounts_BlockedDomainsList": "Blocked Domains List",
+  "Accounts_BlockedDomainsList_Description": "Comma-separated list of blocked domains",
+  "Accounts_BlockedUsernameList": "Blocked Username List",
+  "Accounts_BlockedUsernameList_Description": "Comma-separated list of blocked usernames (case-insensitive)",
+  "Accounts_CustomFields_Description": "Should be a valid JSON where keys are the field names containing a dictionary of field settings. Example:  \n`{\"role\":{ \"type\": \"select\", \"defaultValue\": \"student\", \"options\": [\"teacher\", \"student\"], \"required\": true, \"modifyRecordField\": {  \"array\": true,  \"field\": \"roles\" } }, \"twitter\": { \"type\": \"text\", \"required\": true, \"minLength\": 2, \"maxLength\": 10 }}`",
+  "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info",
+  "Accounts_Default_User_Preferences": "Default User Preferences",
+  "Accounts_Default_User_Preferences_audioNotifications": "Audio Notifications Default Alert",
+  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the Also send to channel behavior",
+  "Accounts_Default_User_Preferences_desktopNotifications": "Desktop Notifications Default Alert",
+  "Accounts_Default_User_Preferences_pushNotifications": "Push Notifications Default Alert",
+  "Accounts_Default_User_Preferences_not_available": "Failed to retrieve User Preferences because they haven't been set up by the user yet",
+  "Accounts_Default_User_Preferences_showThreadsInMainChannel_Description": "When enabled, all replies under a thread will also be displayed directly in the main room. When disabled, thread replies will be displayed based on the sender's choice.",
+  "Accounts_DefaultUsernamePrefixSuggestion": "Default Username Prefix Suggestion",
+  "Accounts_denyUnverifiedEmail": "Deny unverified email",
+  "Accounts_Directory_DefaultView": "Default Directory Listing",
+  "Accounts_Email_Activated": "[name]<br/><br/><p>Your account was activated.</p>",
+  "Accounts_Email_Activated_Subject": "Account activated",
+  "Accounts_Email_Approved": "[name]<br/><br/><p>Your account was approved.</p>",
+  "Accounts_Email_Approved_Subject": "Account approved",
+  "Accounts_Email_Deactivated": "[name]<br/><br/><p>Your account was deactivated.</p>",
+  "Accounts_Email_Deactivated_Subject": "Account deactivated",
+  "Accounts_EmailVerification": "Require email verification to login",
+  "Accounts_EmailVerification_Description": "Ensure SMTP is configured to enable",
+  "Accounts_Enrollment_Email": "Enrollment Email",
+  "Accounts_Enrollment_Email_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to <a href=\"[Site_URL]\">[Site_URL]</a> and try the best open source chat solution available today!</p>",
+  "Accounts_Enrollment_Email_Description": "You may use the following placeholders:  \n - `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.  \n - `[email]` for the user's email.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "Accounts_Enrollment_Email_Subject_Default": "Welcome to [Site_Name]",
+  "Accounts_ForgetUserSessionOnWindowClose": "Forget User Session on Window Close",
+  "Accounts_Iframe_api_method": "Api Method",
+  "Accounts_Iframe_api_url": "API URL",
+  "Accounts_iframe_enabled": "Enabled",
+  "Accounts_iframe_url": "Iframe URL",
+  "Accounts_LoginExpiration": "Login Expiration in Days",
+  "Accounts_ManuallyApproveNewUsers": "Manually Approve New Users",
+  "Accounts_OAuth_Apple": "Sign in with Apple",
+  "Accounts_OAuth_Apple_Description": "If you want Apple login enabled only on mobile, you can leave all fields empty.",
+  "Accounts_OAuth_Custom_Access_Token_Param": "Param Name for access token",
+  "Accounts_OAuth_Custom_Authorize_Path": "Authorize Path",
+  "Accounts_OAuth_Custom_Avatar_Field": "Avatar field",
+  "Accounts_OAuth_Custom_Button_Color": "Button Color",
+  "Accounts_OAuth_Custom_Button_Label_Color": "Button Text Color",
+  "Accounts_OAuth_Custom_Button_Label_Text": "Button Text",
+  "Accounts_OAuth_Custom_Channel_Admin": "User Data Group Map",
+  "Accounts_OAuth_Custom_Channel_Map": "OAuth Group Channel Map",
+  "Accounts_OAuth_Custom_Email_Field": "Email field",
+  "Accounts_OAuth_Custom_Enable": "Enable",
+  "Accounts_OAuth_Custom_Groups_Claim": "Roles/Groups field for channel mapping",
+  "Accounts_OAuth_Custom_id": "Id",
+  "Accounts_OAuth_Custom_Identity_Path": "Identity Path",
+  "Accounts_OAuth_Custom_Identity_Token_Sent_Via": "Identity Token Sent Via",
+  "Accounts_OAuth_Custom_Key_Field": "Key Field",
+  "Accounts_OAuth_Custom_Login_Style": "Login Style",
+  "Accounts_OAuth_Custom_Map_Channels": "Map Roles/Groups to channels",
+  "Accounts_OAuth_Custom_Merge_Roles": "Merge Roles from SSO",
+  "Accounts_OAuth_Custom_Merge_Users": "Merge users",
+  "Accounts_OAuth_Custom_Merge_Users_Distinct_Services": "Merge users from distinct services",
+  "Accounts_OAuth_Custom_Merge_Users_Distinct_Services_Description": "When the given key field matches the one of an existing user, allow users from this OAuth service to be merged to existing users regardless of their origin service.",
+  "Accounts_OAuth_Custom_Name_Field": "Name field",
+  "Accounts_OAuth_Custom_Roles_Claim": "Roles/Groups field name",
+  "Accounts_OAuth_Custom_Roles_To_Sync": "Roles to Sync",
+  "Accounts_OAuth_Custom_Roles_To_Sync_Description": "OAuth Roles to sync on user login and creation (comma-separated).",
+  "Accounts_OAuth_Custom_Scope": "Scope",
+  "Accounts_OAuth_Custom_Secret": "Secret",
+  "Accounts_OAuth_Custom_Show_Button_On_Login_Page": "Show Button on Login Page",
+  "Accounts_OAuth_Custom_Token_Path": "Token Path",
+  "Accounts_OAuth_Custom_Token_Sent_Via": "Token Sent Via",
+  "Accounts_OAuth_Custom_Username_Field": "Username field",
+  "Accounts_OAuth_Drupal": "Drupal Login Enabled",
+  "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI",
+  "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID",
+  "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret",
+  "Accounts_OAuth_Facebook": "Facebook Login",
+  "Accounts_OAuth_Facebook_callback_url": "Facebook Callback URL",
+  "Accounts_OAuth_Facebook_id": "Facebook App ID",
+  "Accounts_OAuth_Facebook_secret": "Facebook Secret",
+  "Accounts_OAuth_Github": "OAuth Enabled",
+  "Accounts_OAuth_Github_callback_url": "Github Callback URL",
+  "Accounts_OAuth_GitHub_Enterprise": "OAuth Enabled",
+  "Accounts_OAuth_GitHub_Enterprise_callback_url": "GitHub Enterprise Callback URL",
+  "Accounts_OAuth_GitHub_Enterprise_id": "Client Id",
+  "Accounts_OAuth_GitHub_Enterprise_secret": "Client Secret",
+  "Accounts_OAuth_Github_id": "Client Id",
+  "Accounts_OAuth_Github_secret": "Client Secret",
+  "Accounts_OAuth_Gitlab": "OAuth Enabled",
+  "Accounts_OAuth_Gitlab_callback_url": "GitLab Callback URL",
+  "Accounts_OAuth_Gitlab_id": "GitLab Id",
+  "Accounts_OAuth_Gitlab_identity_path": "Identity Path",
+  "Accounts_OAuth_Gitlab_merge_users": "Merge Users",
+  "Accounts_OAuth_Gitlab_secret": "Client Secret",
+  "Accounts_OAuth_Google": "Google Login",
+  "Accounts_OAuth_Google_callback_url": "Google Callback URL",
+  "Accounts_OAuth_Google_id": "Google Id",
+  "Accounts_OAuth_Google_secret": "Google Secret",
+  "Accounts_OAuth_Linkedin": "LinkedIn Login",
+  "Accounts_OAuth_Linkedin_callback_url": "Linkedin Callback URL",
+  "Accounts_OAuth_Linkedin_id": "LinkedIn Id",
+  "Accounts_OAuth_Linkedin_secret": "LinkedIn Secret",
+  "Accounts_OAuth_Meteor": "Meteor Login",
+  "Accounts_OAuth_Meteor_callback_url": "Meteor Callback URL",
+  "Accounts_OAuth_Meteor_id": "Meteor Id",
+  "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Nextcloud": "OAuth Enabled",
+  "Accounts_OAuth_Nextcloud_callback_url": "Nextcloud Callback URL",
+  "Accounts_OAuth_Nextcloud_id": "Nextcloud Id",
+  "Accounts_OAuth_Nextcloud_secret": "Client Secret",
+  "Accounts_OAuth_Nextcloud_URL": "Nextcloud Server URL",
+  "Accounts_OAuth_Proxy_host": "Proxy Host",
+  "Accounts_OAuth_Proxy_services": "Proxy Services",
+  "Accounts_OAuth_Tokenpass": "Tokenpass Login",
+  "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass Callback URL",
+  "Accounts_OAuth_Tokenpass_id": "Tokenpass Id",
+  "Accounts_OAuth_Tokenpass_secret": "Tokenpass Secret",
+  "Accounts_OAuth_Twitter": "Twitter Login",
+  "Accounts_OAuth_Twitter_callback_url": "Twitter Callback URL",
+  "Accounts_OAuth_Twitter_id": "Twitter Id",
+  "Accounts_OAuth_Twitter_secret": "Twitter Secret",
+  "Accounts_OAuth_Wordpress": "WordPress Login",
+  "Accounts_OAuth_Wordpress_authorize_path": "Authorize Path",
+  "Accounts_OAuth_Wordpress_callback_url": "WordPress Callback URL",
+  "Accounts_OAuth_Wordpress_id": "WordPress Id",
+  "Accounts_OAuth_Wordpress_identity_path": "Identity Path",
+  "Accounts_OAuth_Wordpress_identity_token_sent_via": "Identity Token Sent Via",
+  "Accounts_OAuth_Wordpress_scope": "Scope",
+  "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
+  "Accounts_OAuth_Wordpress_server_type_custom": "Custom",
+  "Accounts_OAuth_Wordpress_server_type_wordpress_com": "Wordpress.com",
+  "Accounts_OAuth_Wordpress_server_type_wp_oauth_server": "WP OAuth Server Plugin",
+  "Accounts_OAuth_Wordpress_token_path": "Token Path",
+  "Accounts_Password_Policy_AtLeastOneLowercase": "At Least One Lowercase",
+  "Accounts_Password_Policy_AtLeastOneLowercase_Description": "Enforce that a password contain at least one lowercase character.",
+  "Accounts_Password_Policy_AtLeastOneNumber": "At Least One Number",
+  "Accounts_Password_Policy_AtLeastOneNumber_Description": "Enforce that a password contain at least one numerical character.",
+  "Accounts_Password_Policy_AtLeastOneSpecialCharacter": "At Least One Symbol",
+  "Accounts_Password_Policy_AtLeastOneSpecialCharacter_Description": "Enforce that a password contain at least one special character.",
+  "Accounts_Password_Policy_AtLeastOneUppercase": "At Least One Uppercase",
+  "Accounts_Password_Policy_AtLeastOneUppercase_Description": "Enforce that a password contain at least one uppercase character.",
+  "Accounts_Password_Policy_Enabled": "Enable Password Policy",
+  "Accounts_Password_Policy_Enabled_Description": "When enabled, user passwords must adhere to the policies set forth. Note: this only applies to new passwords, not existing passwords.",
+  "Accounts_Password_Policy_ForbidRepeatingCharacters": "Forbid Repeating Characters",
+  "Accounts_Password_Policy_ForbidRepeatingCharacters_Description": "Ensures passwords do not contain the same character repeating next to each other.",
+  "Accounts_Password_Policy_ForbidRepeatingCharactersCount": "Max Repeating Characters",
+  "Accounts_Password_Policy_ForbidRepeatingCharactersCount_Description": "The amount of times a character can be repeating before it is not allowed.",
+  "Accounts_Password_Policy_MaxLength": "Maximum Length",
+  "Accounts_Password_Policy_MaxLength_Description": "Ensures that passwords do not have more than this amount of characters. Use `-1` to disable.",
+  "Accounts_Password_Policy_MinLength": "Minimum Length",
+  "Accounts_Password_Policy_MinLength_Description": "Ensures that passwords must have at least this amount of characters. Use `-1` to disable.",
+  "Accounts_PasswordReset": "Password Reset",
+  "Accounts_Registration_AuthenticationServices_Default_Roles": "Default Roles for Authentication Services",
+  "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Default roles (comma-separated) users will be given when registering through authentication services",
+  "Accounts_Registration_AuthenticationServices_Enabled": "Registration with Authentication Services",
+  "Accounts_Registration_Users_Default_Roles": "Default Roles for Users",
+  "Accounts_Registration_Users_Default_Roles_Description": "Default roles (comma-separated) users will be given when registering through manual registration (including via API)",
+  "Accounts_Registration_Users_Default_Roles_Enabled": "Enable Default Roles for Manual Registration",
+  "Accounts_Registration_InviteUrlType": "Invite URL Type",
+  "Accounts_Registration_InviteUrlType_Direct": "Direct",
+  "Accounts_Registration_InviteUrlType_Proxy": "Proxy",
+  "Accounts_RegistrationForm": "Registration Form",
+  "Accounts_RegistrationForm_Disabled": "Disabled",
+  "Accounts_RegistrationForm_LinkReplacementText": "Registration Form Link Replacement Text",
+  "Accounts_RegistrationForm_Public": "Public",
+  "Accounts_RegistrationForm_Secret_URL": "Secret URL",
+  "Accounts_RegistrationForm_SecretURL": "Registration Form Secret URL",
+  "Accounts_RegistrationForm_SecretURL_Description": "You must provide a random string that will be added to your registration URL. Example: `https://open.rocket.chat/register/[secret_hash]`",
+  "Accounts_RequireNameForSignUp": "Require Name For Signup",
+  "Accounts_RequirePasswordConfirmation": "Require Password Confirmation",
+  "Accounts_RoomAvatarExternalProviderUrl": "Room Avatar External Provider URL",
+  "Accounts_RoomAvatarExternalProviderUrl_Description": "Example: `https://acme.com/api/v1/{roomId}`",
+  "Accounts_SearchFields": "Fields to Consider in Search",
+  "Accounts_Send_Email_When_Activating": "Send email to user when user is activated",
+  "Accounts_Send_Email_When_Deactivating": "Send email to user when user is deactivated",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified": "Set email of external accounts as verified",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified_Description": "Accounts created from external services, like LDAP, OAuth, etc, will have their emails verified automatically",
+  "Accounts_SetDefaultAvatar": "Set Default Avatar",
+  "Accounts_SetDefaultAvatar_Description": "Tries to determine default avatar based on OAuth Account or Gravatar",
+  "Accounts_ShowFormLogin": "Show Default Login Form",
+  "Accounts_TwoFactorAuthentication_By_TOTP_Enabled": "Enable Two Factor Authentication via TOTP",
+  "Accounts_TwoFactorAuthentication_By_TOTP_Enabled_Description": "Users can setup their Two Factor Authentication using any TOTP App, like Google Authenticator or Authy.",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Auto opt in new users for Two Factor via Email",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "New users will have the Two Factor Authentication via Email enabled by default. They will be able to disable it in their profile page.",
+  "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Time to expire the code sent via email in seconds",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled": "Enable Two Factor Authentication via Email",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled_Description": "Users with email verified and the option enabled in their profile page will receive an email with a temporary code to authorize certain actions like login, save the profile, etc.",
+  "Accounts_twoFactorAuthentication_email_available_for_OAuth_users": "Make two factor via email available for oAuth users",
+  "Accounts_twoFactorAuthentication_email_available_for_OAuth_users_Description": "People that use oAuth will receive an email with a temporary code to authorize actions like login, save profile, etc.",
+  "Accounts_TwoFactorAuthentication_Enabled": "Enable Two Factor Authentication",
+  "Accounts_TwoFactorAuthentication_Enabled_Description": "If deactivated, this setting will deactivate all Two Factor Authentication.  \nTo force users to use Two Factor Authentication, the admin has to configure the 'user' role to enforce it.",
+  "Accounts_TwoFactorAuthentication_Enforce_Password_Fallback": "Enforce password fallback",
+  "Accounts_TwoFactorAuthentication_Enforce_Password_Fallback_Description": "Users will be forced to enter their password, for important actions, if no other Two Factor Authentication method is enabled for that user and a password is set for him.",
+  "Accounts_TwoFactorAuthentication_MaxDelta": "Maximum Delta",
+  "Accounts_TwoFactorAuthentication_MaxDelta_Description": "The Maximum Delta determines how many tokens are valid at any given time. Tokens are generated every 30 seconds, and are valid for (30 * Maximum Delta) seconds.  \nExample: With a Maximum Delta set to 10, each token can be used up to 300 seconds before or after it's timestamp. This is useful when the client's clock is not properly synced with the server.",
+  "Accounts_TwoFactorAuthentication_RememberFor": "Remember Two Factor for (seconds)",
+  "Accounts_TwoFactorAuthentication_RememberFor_Description": "Do not request two factor authorization code if it was already provided before in the given time.",
+  "Accounts_TwoFactorAuthentication_Max_Invalid_Email_Code_Attempts": "Maximun Invalid Email OTP Codes Allowed",
+  "Accounts_TwoFactorAuthentication_Max_Invalid_Email_Code_Attempts_Description": "The system allows a maximum number of invalid email OTP codes, after which a new code is automatically generated. We highly recommend using this setting along with 'Block failed login attempts by Username'.",
+  "Accounts_UseDefaultBlockedDomainsList": "Use Default Blocked Domains List",
+  "Accounts_UseDNSDomainCheck": "Use DNS Domain Check",
+  "API_EmbedDisabledFor": "Disable Embed for Users",
+  "Accounts_UserAddedEmail_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to <a href=\"[Site_URL]\">[Site_URL]</a> and try the best open source chat solution available today!</p><p>You may login using your email: [email] and password: [password]. You may be required to change it after your first login.",
+  "Accounts_UserAddedEmail_Description": "You may use the following placeholders:  \n - `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.  \n - `[email]` for the user's email.  \n - `[password]` for the user's password.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "API_EmbedDisabledFor_Description": "Comma-separated list of usernames to disable the embedded link previews.",
+  "Accounts_UserAddedEmailSubject_Default": "You have been added to [Site_Name]",
+  "Accounts_Verify_Email_For_External_Accounts": "Mark Email for External Accounts Verified",
+  "Action": "Action",
+  "Action_required": "Action required",
+  "Action_Available_After_Custom_Content_Added": "This action will become available after the custom content has been added",
+  "Action_Available_After_Custom_Content_Added_And_Visible": "This action will become available after the custom content has been added and made visible to everyone",
+  "Action_not_available_encrypted_content": "{{action}} not available on encrypted content",
+  "Activate": "Activate",
+  "Activation": "Activation",
+  "Active": "Active",
+  "active": "active",
+  "Active_users": "Active users",
+  "Activity": "Activity",
+  "Add": "Add",
+  "Add_a_Message": "Add a Message",
+  "Add_agent": "Add agent",
+  "Add_custom_oauth": "Add custom OAuth",
+  "Add_Domain": "Add Domain",
+  "Add_emoji": "Add emoji",
+  "Add_files_from": "Add files from",
+  "Add_manager": "Add manager",
+  "Add_monitor": "Add monitor",
+  "Add_more_users": "Add more users",
+  "Add_link": "Add link",
+  "Add_Reaction": "Add reaction",
+  "Add_Role": "Add Role",
+  "Add_Sender_To_ReplyTo": "Add Sender to Reply-To",
+  "Add_Server": "Add Server",
+  "Add_URL": "Add URL",
+  "Add_user": "Add user",
+  "Add_User": "Add User",
+  "Add_users": "Add users",
+  "Add_members": "Add Members",
+  "add-to-room": "Add to room",
+  "add-all-to-room": "Add all users to a room",
+  "add-all-to-room_description": "Permission to add all users to a room",
+  "add-livechat-department-agents": "Add Omnichannel Agents to Departments",
+  "add-livechat-department-agents_description": "Permission to add omnichannel agents to departments",
+  "add-oauth-service": "Add OAuth Service",
+  "add-oauth-service_description": "Permission to add a new OAuth service",
+  "bypass-time-limit-edit-and-delete": "Bypass time limit",
+  "bypass-time-limit-edit-and-delete_description": "Permission to Bypass time limit for editing and deleting messages",
+  "add-team-channel": "Add Team Channel",
+  "add-team-channel_description": "Permission to add a channel to a team",
+  "add-team-member": "Add Team Member",
+  "add-team-member_description": "Permission to add members to a team",
+  "Add_them": "Add them",
+  "add-user": "Add User",
+  "add-user_description": "Permission to add new users to the server via users screen",
+  "add-user-to-any-c-room": "Add User to Any Public Channel",
+  "add-user-to-any-c-room_description": "Permission to add a user to any public channel",
+  "add-user-to-any-p-room": "Add User to Any Private Channel",
+  "add-user-to-any-p-room_description": "Permission to add a user to any private channel",
+  "add-user-to-joined-room": "Add User to Any Joined Channel",
+  "add-user-to-joined-room_description": "Permission to add a user to a currently joined channel",
+  "added__roomName__to_team": "<strong>added</strong> #{{roomName}} to this Team",
+  "Added__username__to_team": "<strong>added</strong> @{{user_added}} to this Team",
+  "added__roomName__to_this_team": "added #{{roomName}} to this team",
+  "Apps_Framework_enabled": "Enable the App Framework",
+  "Added__username__to_this_team": "added @{{user_added}} to this team",
+  "Adding_OAuth_Services": "Adding OAuth Services",
+  "Adding_permission": "Adding permission",
+  "Adjustable_layout": "Adjustable layout",
+  "Adding_user": "Adding user",
+  "Additional_emails": "Additional Emails",
+  "Additional_Feedback": "Additional Feedback",
+  "additional_integrations_Bots": "If you are looking for how to integrate your own bot, then look no further than our Hubot adapter. <a href='https://github.com/RocketChat/hubot-rocketchat' target='_blank'>https://github.com/RocketChat/hubot-rocketchat</a>",
+  "Admin_disabled_encryption": "Your administrator did not enable E2E encryption.",
+  "Admin_Info": "Admin Info",
+  "admin-no-active-video-conf-provider": "**Conference call not enabled**: Configure conference calls in order to make it available on this workspace.",
+  "admin-video-conf-provider-not-configured": "**Conference call not enabled**: Configure conference calls in order to make it available on this workspace.",
+  "admin-no-videoconf-provider-app": "**Conference call not enabled**: Conference call apps are available in the Rocket.Chat marketplace.",
+  "Administration": "Administration",
+  "Address": "Address",
+  "Adjustable_font_size": "Adjustable font size",
+  "Adjustable_font_size_description": "Designed for those who prefer larger or smaller text for improved readability. This flexibility promotes inclusivity by empowering users to tailor the software interface to their specific needs.",
+  "Adult_images_are_not_allowed": "Adult images are not allowed",
+  "Aerospace_and_Defense": "Aerospace & Defense",
+  "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "After OAuth2 authentication, users will be redirected to an URL on this list. You can add one URL per line.",
+  "After_guest_registration": "After guest registration",
+  "Agent": "Agent",
+  "Agent_added": "Agent added",
+  "Agent_Info": "Agent Info",
+  "Agent_messages": "Agent Messages",
+  "Agent_Name": "Agent Name",
+  "Agent_Name_Placeholder": "Please enter an agent name...",
+  "Agent_removed": "Agent removed",
+  "Agent_deactivated": "Agent was deactivated",
+  "Agent_Without_Extensions": "Agent Without Extensions",
+  "Agents": "Agents",
+  "Agree": "Agree",
+  "Alerts": "Alerts",
+  "Alias": "Alias",
+  "Alias_Format": "Alias Format",
+  "Alias_Format_Description": "Import messages from Slack with an alias; %s is replaced by the username of the user. If empty, no alias will be used.",
+  "Alias_Set": "Alias Set",
+  "AutoLinker_Email": "AutoLinker Email",
+  "Aliases": "Aliases",
+  "AutoLinker_Phone": "AutoLinker Phone",
+  "AutoLinker_Phone_Description": "Automatically linked for Phone numbers. e.g. `(123)456-7890`",
+  "All": "All",
+  "AutoLinker_StripPrefix": "AutoLinker Strip Prefix",
+  "All_Apps": "All Apps",
+  "AutoLinker_StripPrefix_Description": "Short display. e.g. https://rocket.chat => rocket.chat",
+  "All_added_tokens_will_be_required_by_the_user": "All added tokens will be required by the user",
+  "All_categories": "All categories",
+  "AutoLinker_Urls_Scheme": "AutoLinker Scheme:// URLs",
+  "All_channels": "All channels",
+  "AutoLinker_Urls_TLD": "AutoLinker TLD URLs",
+  "All_closed_chats_have_been_removed": "All closed chats have been removed",
+  "AutoLinker_Urls_www": "AutoLinker 'www' URLs",
+  "All_logs": "All logs",
+  "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
+  "All_messages": "All messages",
+  "All_Prices": "All prices",
+  "All_roles": "All roles",
+  "All_status": "All status",
+  "All_users": "All users",
+  "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
+  "Allow_collect_and_store_HTTP_header_informations": "Allow to collect and store HTTP header informations",
+  "Allow_collect_and_store_HTTP_header_informations_description": "This setting determines whether Livechat is allowed to store information collected from HTTP header data, such as IP address, User-Agent, and so on.",
+  "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",
+  "Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.",
+  "Allow_Marketing_Emails": "Allow Marketing Emails",
+  "Allow_Online_Agents_Outside_Business_Hours": "Allow online agents outside of business hours",
+  "Allow_Online_Agents_Outside_Office_Hours": "Allow online agents outside of office hours",
+  "Allow_Save_Media_to_Gallery": "Allow Save Media to Gallery",
+  "Allow_switching_departments": "Allow Visitor to Switch Departments",
+  "Almost_done": "Almost done",
+  "Alphabetical": "Alphabetical",
+  "bold": "bold",
+  "Also_send_thread_message_to_channel_behavior": "Also send thread message to channel behavior",
+  "Also_send_to_channel": "Also send to channel",
+  "Always_open_in_new_window": "Always Open in New Window",
+  "Always_show_thread_replies_in_main_channel": "Always show thread replies in main channel",
+  "Analytic_reports": "Analytic reports",
+  "Analytics": "Analytics",
+  "Analytics_Description": "See how users interact with your workspace.",
+  "Analytics_features_enabled": "Features Enabled",
+  "Analytics_features_messages_Description": "Tracks custom events related to actions a user does on messages.",
+  "Analytics_features_rooms_Description": "Tracks custom events related to actions on a channel or group (create, leave, delete).",
+  "Analytics_features_users_Description": "Tracks custom events related to actions related to users (password reset times, profile picture change, etc).",
+  "Analytics_Google": "Google Analytics",
+  "Analytics_Google_id": "Tracking ID",
+  "Analytics_page_briefing_first_paragraph": "Rocket.Chat collects anonymous usage data, such as feature usage and session lengths, to improve the product for everyone.",
+  "Analytics_page_briefing_second_paragraph": "We protect your privacy by never collecting personal or sensitive data. This section shows what is collected, reinforcing our commitment to transparency and trust.",
+  "Analyze_practical_usage": "Analyze practical usage statistics about users, messages and channels",
+  "and": "and",
+  "And_more": "And {{length}} more",
+  "Animals_and_Nature": "Animals & Nature",
+  "Announcement": "Announcement",
+  "Anonymous": "Anonymous",
+  "Answer_call": "Answer Call",
+  "API": "API",
+  "API_Add_Personal_Access_Token": "Add new Personal Access Token",
+  "API_Allow_Infinite_Count": "Allow Getting Everything",
+  "API_Allow_Infinite_Count_Description": "Should calls to the REST API be allowed to return everything in one call?",
+  "API_Analytics": "Analytics",
+  "API_CORS_Origin": "CORS Origin",
+  "API_Apply_permission_view-outside-room_on_users-list": "Apply permission `view-outside-room` to api `users.list`",
+  "API_Apply_permission_view-outside-room_on_users-list_Description": "Temporary setting to enforce permission. Will be removed on next Major release within the change to always enforce the permission",
+  "API_Default_Count": "Default Count",
+  "API_Default_Count_Description": "The default count for REST API results if the consumer did not provided any.",
+  "API_Drupal_URL": "Drupal Server URL",
+  "API_Drupal_URL_Description": "Example: `https://domain.com` (excluding trailing slash)",
+  "API_Embed": "Embed Link Previews",
+  "API_Embed_Description": "Whether embedded link previews are enabled or not when a user posts a link to a website.",
+  "API_EmbedIgnoredHosts": "Embed Ignored Hosts",
+  "API_EmbedIgnoredHosts_Description": "Comma-separated list of hosts or CIDR addresses, eg. localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16",
+  "API_EmbedSafePorts": "Safe Ports",
+  "API_EmbedSafePorts_Description": "Comma-separated list of ports allowed for previewing.",
+  "API_Embed_UserAgent": "Embed Request User Agent",
+  "API_EmbedCacheExpirationDays": "Embed Cache Expiration Days",
+  "API_Enable_CORS": "Enable CORS",
+  "API_Enable_Direct_Message_History_EndPoint": "Enable Direct Message History Endpoint",
+  "API_Enable_Direct_Message_History_EndPoint_Description": "This enables the `/api/v1/im.messages.others` which allows the viewing of direct messages sent by other users that the caller is not part of.",
+  "API_Enable_Personal_Access_Tokens": "Enable Personal Access Tokens to REST API",
+  "API_Enable_Personal_Access_Tokens_Description": "Enable personal access tokens for use with the REST API",
+  "API_Enable_Rate_Limiter": "Enable Rate Limiter",
+  "API_Enable_Rate_Limiter_Dev": "Enable Rate Limiter in development",
+  "API_Enable_Rate_Limiter_Dev_Description": "Should limit the amount of calls to the endpoints in the development environment?",
+  "API_Enable_Rate_Limiter_Limit_Calls_Default": "Default number calls to the rate limiter",
+  "API_Enable_Rate_Limiter_Limit_Calls_Default_Description": "Number of default calls for each endpoint of the REST API, allowed within the time range defined below",
+  "API_Enable_Rate_Limiter_Limit_Time_Default": "Default time limit for the rate limiter (in ms)",
+  "API_Enable_Rate_Limiter_Limit_Time_Default_Description": "Default timeout to limit the number of calls at each endpoint of the REST API(in ms)",
+  "API_Enable_Shields": "Enable Shields",
+  "API_Enable_Shields_Description": "Enable shields available at `/api/v1/shield.svg`",
+  "API_GitHub_Enterprise_URL": "Server URL",
+  "API_GitHub_Enterprise_URL_Description": "Example: `https://domain.com` (excluding trailing slash)",
+  "API_Gitlab_URL": "GitLab URL",
+  "API_Personal_Access_Token_Generated": "Personal Access Token successfully generated",
+  "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "Please save your token carefully as you will no longer be able to view it afterwards. <br/>Token: <strong>{{token}}</strong><br/>Your user Id: <strong>{{userId}}</strong>",
+  "API_Personal_Access_Token_Name": "Personal Access Token Name",
+  "API_Personal_Access_Tokens_Regenerate_It": "Regenerate token",
+  "API_Personal_Access_Tokens_Regenerate_Modal": "If you lost or forgot your token, you can regenerate it, but remember that all applications that use this token should be updated",
+  "API_Personal_Access_Tokens_Remove_Modal": "Are you sure you wish to remove this personal access token?",
+  "API_Personal_Access_Tokens_To_REST_API": "Personal access tokens to REST API",
+  "API_Rate_Limiter": "API Rate Limiter",
+  "API_Shield_Types": "Shield Types",
+  "API_Shield_Types_Description": "Types of shields to enable as a comma separated list, choose from `online`, `channel` or `*` for all",
+  "Apps_Framework_Development_Mode": "Enable development mode",
+  "API_Shield_user_require_auth": "Require authentication for users shields",
+  "API_Token": "API Token",
+  "Apps_Framework_Development_Mode_Description": "Development mode allows the installation of Apps that are not from the Rocket.Chat's Marketplace.",
+  "API_Tokenpass_URL": "Tokenpass Server URL",
+  "API_Tokenpass_URL_Description": "Example: `https://domain.com` (excluding trailing slash)",
+  "API_Upper_Count_Limit": "Max Record Amount",
+  "API_Upper_Count_Limit_Description": "What is the maximum number of records the REST API should return (when not unlimited)?",
+  "API_Use_REST_For_DDP_Calls": "Use REST instead of websocket for Meteor calls",
+  "API_User_Limit": "User Limit for Adding All Users to Channel",
+  "API_Wordpress_URL": "WordPress URL",
+  "api-bypass-rate-limit": "Bypass rate limit for REST API",
+  "api-bypass-rate-limit_description": "Permission to call api without rate limitation",
+  "Apiai_Key": "Api.ai Key",
+  "Apiai_Language": "Api.ai Language",
+  "APIs": "APIs",
+  "App_author_homepage": "author homepage",
+  "App_Details": "App details",
+  "App_Info": "App Info",
+  "App_Information": "App Information",
+  "Apps_context_enterprise": "Enterprise",
+  "App_Installation": "App Installation",
+  "App_Installation_Deprecation_Title": "Deprecation Warning",
+  "App_Installation_Deprecation": "Install apps from URL is deprecated and will be removed in the next major release.",
+  "App_not_enabled": "App not enabled",
+  "App_not_found": "App not found",
+  "App_status_auto_enabled": "Enabled",
+  "App_status_constructed": "Constructed",
+  "App_status_disabled": "Disabled",
+  "App_status_error_disabled": "Disabled: Uncaught Error",
+  "App_status_initialized": "Initialized",
+  "App_status_invalid_license_disabled": "Disabled: Invalid License",
+  "Apps_disabled_when_Enterprise_trial_ended": "Apps disabled when Enterprise trial ended",
+  "App_status_invalid_settings_disabled": "Disabled: Configuration Needed",
+  "App_status_manually_disabled": "Disabled: Manually",
+  "App_status_manually_enabled": "Enabled",
+  "App_status_unknown": "Unknown",
+  "App_Store": "App Store",
+  "App_support_url": "support url",
+  "App_Url_to_Install_From": "Install from URL",
+  "App_Url_to_Install_From_File": "Install from file",
+  "App_user_not_allowed_to_login": "App users are not allowed to log in directly.",
+  "Appearance": "Appearance",
+  "Application_added": "Application added",
+  "Application_delete_warning": "You will not be able to recover this Application!",
+  "Application_Name": "Application Name",
+  "Application_updated": "Application updated",
+  "Apply": "Apply",
+  "Apply_and_refresh_all_clients": "Apply and refresh all clients",
+  "Apps": "Apps",
+  "Apps_context_explore": "Explore",
+  "Apps_context_installed": "Installed",
+  "Apps_context_requested": "Requested",
+  "Apps_context_private": "Private Apps",
+  "Apps_context_premium": "Premium",
+  "Apps_Count_Enabled_one": "{{count}} app enabled",
+  "Apps_Count_Enabled_other": "{{count}} apps enabled",
+  "Apps_Count_Enabled_two": "{{count}} apps enabled",
+  "Private_Apps_Count_Enabled_one": "{{count}} private app enabled",
+  "Private_Apps_Count_Enabled_other": "{{count}} private apps enabled",
+  "Private_Apps_Count_Enabled_two": "{{count}} private apps enabled",
+  "Apps_Count_Enabled_tooltip": "Community workspaces can enable up to {{number}} {{context}} apps",
+  "Apps_disabled_when_Premium_trial_ended": "Apps disabled when Premium plan trial ended",
+  "Apps_disabled_when_Premium_trial_ended_description": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Ask your workspace admin to reenable apps.",
+  "Apps_disabled_when_Premium_trial_ended_description_admin": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Reenable the apps you require.",
+  "Apps_Engine_Version": "Apps Engine Version",
+  "Apps_Error_private_app_install_disabled": "Private app installation and updates are disabled in this workspace",
+  "Apps_Essential_Alert": "This app is essential for the following events:",
+  "Apps_Essential_Disclaimer": "Events listed above will be disrupted if this app is disabled. If you want Rocket.Chat to work without this app's functionality, you need to uninstall it",
+  "Apps_Framework_Source_Package_Storage_Type": "Apps' Source Package Storage type",
+  "Apps_Framework_Source_Package_Storage_Type_Description": "Choose where all the apps' source code will be stored. Apps can have multiple megabytes in size each.",
+  "Apps_Framework_Source_Package_Storage_Type_Alert": "Changing where the apps are stored may cause instabilities in apps there are already installed",
+  "Apps_Framework_Source_Package_Storage_FileSystem_Path": "Directory for storing apps source package",
+  "Apps_Framework_Source_Package_Storage_FileSystem_Path_Description": "Absolute path in the filesystem for storing the apps' source code (in zip file format)",
+  "Apps_Framework_Source_Package_Storage_FileSystem_Alert": "Make sure the chosen directory exist and Rocket.Chat can access it (e.g. permission to read/write)",
+  "Apps_Game_Center": "Game Center",
+  "Apps_Game_Center_Back": "Back to Game Center",
+  "Apps_Game_Center_Invite_Friends": "Invite your friends to join",
+  "Apps_Game_Center_Play_Game_Together": "@here Let's play {{name}} together!",
+  "Apps_Interface_IPostExternalComponentClosed": "Event happening after an external component is closed",
+  "Apps_Interface_IPostExternalComponentOpened": "Event happening after an external component is opened",
+  "Apps_Interface_IPostMessageDeleted": "Event happening after a message is deleted",
+  "Apps_Interface_IPostMessageSent": "Event happening after a message is sent",
+  "Apps_Interface_IPostMessageUpdated": "Event happening after a message is updated",
+  "Apps_Interface_IPostRoomCreate": "Event happening after a room is created",
+  "Apps_Interface_IPostRoomDeleted": "Event happening after a room is deleted",
+  "Apps_Interface_IPostRoomUserJoined": "Event happening after a user joins a room (private group, public channel)",
+  "Apps_Interface_IPreMessageDeletePrevent": "Event happening before a message is deleted",
+  "Apps_Interface_IPreMessageSentExtend": "Event happening before a message is sent",
+  "Apps_Interface_IPreMessageSentModify": "Event happening before a message is sent",
+  "Apps_Interface_IPreMessageSentPrevent": "Event happening before a message is sent",
+  "Apps_Interface_IPreMessageUpdatedExtend": "Event happening before a message is updated",
+  "Apps_Interface_IPreMessageUpdatedModify": "Event happening before a message is updated",
+  "Apps_Interface_IPreMessageUpdatedPrevent": "Event happening before a message is updated",
+  "Apps_Interface_IPreRoomCreateExtend": "Event happening before a room is created",
+  "Apps_Interface_IPreRoomCreateModify": "Event happening before a room is created",
+  "Apps_Interface_IPreRoomCreatePrevent": "Event happening before a room is created",
+  "Apps_Interface_IPreRoomDeletePrevent": "Event happening before a room is deleted",
+  "Apps_Interface_IPreRoomUserJoined": "Event happening before a user joins a room (private group, public channel)",
+  "Apps_License_Message_appId": "License hasn't been issued for this app",
+  "Apps_License_Message_bundle": "License issued for a bundle that does not contain the app",
+  "Apps_License_Message_expire": "License is no longer valid and needs to be renewed",
+  "Apps_License_Message_maxSeats": "License does not accomodate the current amount of active users. Please increase the number of seats",
+  "Apps_License_Message_publicKey": "There has been an error trying to decrypt the license. Please sync your workspace in the Connectivity Services and try again",
+  "Apps_License_Message_renewal": "License has expired and needs to be renewed",
+  "Apps_License_Message_seats": "License does not have enough seats to accommodate the current amount of active users. Please increase the number of seats",
+  "Apps_Logs_TTL": "Number of days to keep logs from apps stored",
+  "Apps_Logs_TTL_7days": "7 days",
+  "Apps_Logs_TTL_14days": "14 days",
+  "Apps_Logs_TTL_30days": "30 days",
+  "Apps_Logs_TTL_Alert": "Depending on the size of the Logs collection, changing this setting may cause slowness for some moments",
+  "Apps_Marketplace_Deactivate_App_Prompt": "Do you really want to disable this app?",
+  "Apps_Marketplace_Login_Required_Description": "Purchasing apps from the Rocket.Chat Marketplace requires registering your workspace and logging in.",
+  "Apps_Marketplace_Login_Required_Title": "Marketplace Login Required",
+  "Apps_Marketplace_Modify_App_Subscription": "Modify Subscription",
+  "Apps_Marketplace_pricingPlan_monthly": "{{price}} / month",
+  "Apps_Marketplace_pricingPlan_monthly_perUser": "{{price}} / month per user",
+  "Apps_Marketplace_pricingPlan_monthly_trialDays": "{{price}} / month-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_monthly_perUser_trialDays": "{{price}} / month per user-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_+*_monthly": " {{price}}+* / month",
+  "Apps_Marketplace_pricingPlan_+*_monthly_trialDays": " {{price}}+* / month-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_+*_monthly_perUser": " {{price}}+* / month per user",
+  "Apps_Marketplace_pricingPlan_+*_monthly_perUser_trialDays": " {{price}}+* / month per user-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_+*_yearly": " {{price}}+* / year",
+  "Apps_Marketplace_pricingPlan_+*_yearly_trialDays": " {{price}}+* / year-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_+*_yearly_perUser": " {{price}}+* / year per user",
+  "Apps_Marketplace_pricingPlan_+*_yearly_perUser_trialDays": " {{price}}+* / year per user-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_yearly_trialDays": "{{price}} / year-{{trialDays}}-day trial",
+  "Apps_Marketplace_pricingPlan_yearly_perUser_trialDays": "{{price}} / year per user-{{trialDays}}-day trial",
+  "Apps_Marketplace_Uninstall_App_Prompt": "Do you really want to uninstall this app?",
+  "Apps_Marketplace_Uninstall_Subscribed_App_Anyway": "Uninstall it anyway",
+  "Apps_Marketplace_Uninstall_Subscribed_App_Prompt": "This app has an active subscription and uninstalling will not cancel it. If you'd like to do that, please modify your subscription before uninstalling.",
+  "Apps_Permissions_Review_Modal_Title": "Required Permissions",
+  "Apps_Permissions_Review_Modal_Subtitle": "This app would like access to the following permissions. Do you agree?",
+  "Apps_Permissions_No_Permissions_Required": "The App does not require additional permissions",
+  "Apps_Permissions_cloud_workspace-token": "Interact with Cloud Services on behalf of this server",
+  "Apps_Permissions_user_read": "Access user information",
+  "Apps_Permissions_user_write": "Modify user information",
+  "Apps_Permissions_upload_read": "Access files uploaded to this server",
+  "Apps_Permissions_upload_write": "Upload files to this server",
+  "Apps_Permissions_server-setting_read": "Access settings in this server",
+  "Apps_Permissions_server-setting_write": "Modify settings in this server",
+  "Apps_Permissions_room_read": "Access room information",
+  "Apps_Permissions_room_write": "Create and modify rooms",
+  "Apps_Permissions_message_read": "Access messages",
+  "Apps_Permissions_message_write": "Send and modify messages",
+  "Apps_Permissions_livechat-status_read": "Access Livechat status information",
+  "Apps_Permissions_livechat-custom-fields_write": "Modify Livechat custom field configuration",
+  "Apps_Permissions_livechat-visitor_read": "Access Livechat visitor information",
+  "Apps_Permissions_livechat-visitor_write": "Modify Livechat visitor information",
+  "Apps_Permissions_livechat-message_read": "Access Livechat message information",
+  "Apps_Permissions_livechat-message_write": "Modify Livechat message information",
+  "Apps_Permissions_livechat-room_read": "Access Livechat room information",
+  "Apps_Permissions_livechat-room_write": "Modify Livechat room information",
+  "Apps_Permissions_livechat-department_read": "Access Livechat department information",
+  "Apps_Permissions_livechat-department_multiple": "Access to multiple Livechat departments information",
+  "Apps_Permissions_livechat-department_write": "Modify Livechat department information",
+  "Apps_Permissions_slashcommand": "Register new slash commands",
+  "Apps_Permissions_api": "Register new HTTP endpoints",
+  "Apps_Permissions_env_read": "Access minimal information about this server environment",
+  "Apps_Permissions_networking": "Access to this server network",
+  "Apps_Permissions_persistence": "Store internal data in the database",
+  "Apps_Permissions_scheduler": "Register and maintain scheduled jobs",
+  "Apps_Permissions_ui_interact": "Interact with the UI",
+  "Apps_Settings": "App's Settings",
+  "Apps_Manual_Update_Modal_Title": "This app is already installed",
+  "Apps_Manual_Update_Modal_Body": "Do you want to update it?",
+  "Apps_User_Already_Exists": "The username \"{{username}}\" is already being used. Rename or remove the user using it to install this App",
+  "AutoLinker": "AutoLinker",
+  "Apps_WhatIsIt": "Apps: What Are They?",
+  "Apps_WhatIsIt_paragraph1": "A new icon in the administration area! What does this mean and what are Apps?",
+  "Apps_WhatIsIt_paragraph2": "First off, Apps in this context do not refer to the mobile applications. In fact, it would be best to think of them in terms of plugins or advanced integrations.",
+  "Apps_WhatIsIt_paragraph3": "Secondly, they are dynamic scripts or packages which will allow you to customize your Rocket.Chat instance without having to fork the codebase. But do keep in mind, this is a new feature set and due to that it might not be 100% stable. Also, we are still developing the feature set so not everything can be customized at this point in time. For more information about getting started developing an app, go here to read:",
+  "Apps_WhatIsIt_paragraph4": "But with that said, if you are interested in enabling this feature and trying it out then here click this button to enable the Apps system.",
+  "Archive": "Archive",
+  "Archived": "Archived",
+  "archive-room": "Archive Room",
+  "archive-room_description": "Permission to archive a channel",
+  "are_typing": "are typing",
+  "are_playing": "are playing",
+  "is_playing": "is playing",
+  "are_uploading": "are uploading",
+  "are_recording": "are recording",
+  "is_uploading": "is uploading",
+  "is_recording": "is recording",
+  "Are_you_sure": "Are you sure?",
+  "Are_you_sure_delete_department": "Are you sure you want to delete this department? This action cannot be undone. Please enter the department name to confirm.",
+  "Are_you_sure_you_want_to_clear_all_unread_messages": "Are you sure you want to clear all unread messages?",
+  "Are_you_sure_you_want_to_close_this_chat": "Are you sure you want to close this chat?",
+  "Are_you_sure_you_want_to_delete_this_record": "Are you sure you want to delete this record?",
+  "Are_you_sure_you_want_to_delete_your_account": "Are you sure you want to delete your account?",
+  "Are_you_sure_you_want_to_disable_Facebook_integration": "Are you sure you want to disable Facebook integration?",
+  "Are_you_sure_you_want_to_pin_this_message": "Are you sure you want to pin this message?",
+  "Are_you_sure_you_want_to_reset_the_name_of_all_priorities": "Are you sure you want to reset the name of all priorities?",
+  "Assets": "Assets",
+  "Assets_Description": "Modify your workspace's logo, icon, favicon and more.",
+  "Asset_preview": "Asset preview",
+  "Assign_admin": "Assigning admin",
+  "Assign_extension": "Assign extension",
+  "Assign_new_conversations_to_bot_agent": "Assign new conversations to bot agent",
+  "Assign_new_conversations_to_bot_agent_description": "The routing system will attempt to find a bot agent before addressing new conversations to a human agent.",
+  "assign-admin-role": "Assign Admin Role",
+  "assign-admin-role_description": "Permission to assign the admin role to other users",
+  "assign-roles": "Assign Roles",
+  "assign-roles_description": "Permission to assign roles to other users",
+  "Associate": "Associate",
+  "Associate_Agent": "Associate Agent",
+  "Associate_Agent_to_Extension": "Associate Agent to Extension",
+  "Associate_Extension": "Associate Extension",
+  "Associate_User_to_Extension": "Associate User to Extension",
+  "at": "at",
+  "At_least_one_added_token_is_required_by_the_user": "At least one added token is required by the user",
+  "AtlassianCrowd": "Atlassian Crowd",
+  "AtlassianCrowd_Description": "Integrate Atlassian Crowd.",
+  "Attachment_File_Uploaded": "File Uploaded",
+  "Attribute_handling": "Attribute handling",
+  "Audio": "Audio",
+  "Audio_message": "Audio message",
+  "Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
+  "Audio_Notifications_Value": "Default Message Notification Audio",
+  "Audio_record": "Audio record",
+  "Audios": "Audios",
+  "Audit": "Audit",
+  "Auditing": "Auditing",
+  "Auth": "Auth",
+  "Auth_Token": "Auth Token",
+  "Authentication": "Authentication",
+  "Author": "Author",
+  "Author_Information": "Author Information",
+  "Author_Site": "Author site",
+  "Authorization_URL": "Authorization URL",
+  "Authorize": "Authorize",
+  "Authorize_access_to_your_account": "Authorize access to your account",
+  "Automatic_translation_not_available": "Automatic translation not available",
+  "Automatic_translation_not_available_info": "This room has E2E encryption enabled, translation cannot work with encrypted messages",
+  "Auto_Load_Images": "Auto Load Images",
+  "Auto_Selection": "Auto Selection",
+  "Auto_Translate": "Auto-Translate",
+  "Calls_in_queue": "{{calls}} call in queue",
+  "auto-translate": "Auto Translate",
+  "auto-translate_description": "Permission to use the auto translate tool",
+  "Automatic_Translation": "Automatic Translation",
+  "AutoTranslate": "Auto-Translate",
+  "AutoTranslate_APIKey": "API Key",
+  "AutoTranslate_Change_Language_Description": "Changing the auto-translate language does not translate previous messages.",
+  "AutoTranslate_DeepL": "DeepL",
+  "AutoTranslate_Disabled_for_room": "Auto-translate disabled for #{{roomName}}",
+  "AutoTranslate_Enabled": "Enable Auto-Translate",
+  "AutoTranslate_Enabled_Description": "Enabling auto-translation will allow people with the `auto-translate` permission to have all messages automatically translated into their selected language. Fees may apply.",
+  "AutoTranslate_Enabled_for_room": "Auto-translate enabled for #{{roomName}}",
+  "AutoTranslate_AutoEnableOnJoinRoom": "Auto-Translate for non-default language members",
+  "AutoTranslate_AutoEnableOnJoinRoom_Description": "If enabled, whenever a user with a language preference different than the workspace default joins a room, it will be automatically translated for them.",
+  "AutoTranslate_Google": "Google",
+  "AutoTranslate_language_set_to": "Auto-translate language set to {{language}}",
+  "AutoTranslate_Microsoft": "Microsoft",
+  "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Subscription-Key",
+  "AutoTranslate_ServiceProvider": "Service Provider",
+  "Available": "Available",
+  "Available_agents": "Available agents",
+  "Available_departments": "Available Departments",
+  "Avatar": "Avatar",
+  "Avatars": "Avatars",
+  "Avatar_changed_successfully": "Avatar changed successfully",
+  "Avatar_URL": "Avatar URL",
+  "Avatar_format_invalid": "Invalid Format. Only image type is allowed",
+  "Avatar_url_invalid_or_error": "The url provided is invalid or not accessible. Please try again, but with a different url.",
+  "Avg_chat_duration": "Average of Chat Duration",
+  "Avg_first_response_time": "Average of First Response Time",
+  "Avg_of_abandoned_chats": "Average of Abandoned Chats",
+  "Avg_of_available_service_time": "Average of Service Available Time",
+  "Avg_of_chat_duration_time": "Average of Chat Duration Time",
+  "Avg_of_service_time": "Average of Service Time",
+  "Avg_of_waiting_time": "Average of Waiting Time",
+  "Avg_reaction_time": "Average of Reaction Time",
+  "Avg_response_time": "Average of Response Time",
+  "away": "away",
+  "Away": "Away",
+  "Back": "Back",
+  "Back_to_applications": "Back to applications",
+  "Back_to_calendar": "Back to calendar",
+  "Back_to_chat": "Back to chat",
+  "Back_to_home": "Back to home",
+  "Back_to_imports": "Back to imports",
+  "Back_to_integration_detail": "Back to the integration detail",
+  "Back_to_integrations": "Back to integrations",
+  "Back_to_login": "Back to login",
+  "Back_to_Manage_Apps": "Back to Manage Apps",
+  "Back_to_permissions": "Back to permissions",
+  "Back_to_room": "Back to Room",
+  "Back_to_threads": "Back to threads",
+  "Backup_codes": "Backup codes",
+  "ban-user": "Ban User",
+  "ban-user_description": "Permission to ban a user from a channel",
+  "BBB_End_Meeting": "End Meeting",
+  "BBB_Enable_Teams": "Enable for Teams",
+  "BBB_Join_Meeting": "Join Meeting",
+  "BBB_Start_Meeting": "Start Meeting",
+  "BBB_Video_Call": "BBB Video Call",
+  "BBB_You_have_no_permission_to_start_a_call": "You have no permission to start a call",
+  "Be_the_first_to_join": "Be the first to join",
+  "Belongs_To": "Belongs To",
+  "Best_first_response_time": "Best first response time",
+  "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta feature. Depends on Video Conference to be enabled.",
+  "Better": "Better",
+  "Bio": "Bio",
+  "Bio_Placeholder": "Bio Placeholder",
+  "Block": "Block",
+  "Block_Multiple_Failed_Logins_Attempts_Until_Block_By_Ip": "Amount of failed attempts before blocking IP address",
+  "Block_Multiple_Failed_Logins_Attempts_Until_Block_by_User": "Amount of failed attempts before blocking user",
+  "Block_Multiple_Failed_Logins_By_Ip": "Block failed login attempts by IP",
+  "Block_Multiple_Failed_Logins_By_User": "Block failed login attempts by Username",
+  "Block_Multiple_Failed_Logins_Enable_Collect_Login_data_Description": "Stores IP and username from log in attempts to a collection on database",
+  "Block_Multiple_Failed_Logins_Enabled": "Enable collect log in data",
+  "Block_Multiple_Failed_Logins_Ip_Whitelist": "IP Whitelist",
+  "Block_Multiple_Failed_Logins_Ip_Whitelist_Description": "Comma-separated list of whitelisted IPs",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_Ip_In_Minutes": "Duration of IP address block (in minutes)",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_Ip_In_Minutes_Description": "This is the time the IP address is blocked by, and the time in which the failed attempts can happen before the counter resets",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_User_In_Minutes": "Duration of user block (in minutes)",
+  "Block_Multiple_Failed_Logins_Time_To_Unblock_By_User_In_Minutes_Description": "This is the time the user is blocked by, and the time in which the failed attempts can happen before the counter resets",
+  "Block_Multiple_Failed_Logins_Notify_Failed": "Notify of failed login attempts",
+  "Block_Multiple_Failed_Logins_Notify_Failed_Channel": "Channel to send the notifications",
+  "Block_Multiple_Failed_Logins_Notify_Failed_Channel_Desc": "This is where notifications will be received. Make sure the channel exists. The channel name should not include # symbol",
+  "Block_User": "Block User",
+  "Blockchain": "Blockchain",
+  "block-ip-device-management": "Block IP Device Management",
+  "block-ip-device-management_description": "Permission to block an IP adress",
+  "Block_IP_Address": "Block IP Address",
+  "Blocked_IP_Addresses": "Blocked IP addresses",
+  "Blockstack": "Blockstack",
+  "Blockstack_Description": "Give workspace members the ability to sign in without relying on any third parties or remote servers.",
+  "Blockstack_Auth_Description": "Auth description",
+  "Blockstack_ButtonLabelText": "Button label text",
+  "Blockstack_Generate_Username": "Generate username",
+  "Body": "Body",
+  "Bold": "Bold",
+  "bot_request": "Bot request",
+  "BotHelpers_userFields": "User Fields",
+  "BotHelpers_userFields_Description": "CSV of user fields that can be accessed by bots helper methods.",
+  "Bot": "Bot",
+  "Bots": "Bots",
+  "Bots_Description": "Set the fields that can be referenced and used when developing bots.",
+  "Branch": "Branch",
+  "Broadcast": "Broadcast",
+  "Broadcast_channel": "Broadcast Channel",
+  "Broadcast_channel_Description": "Only authorized users can write new messages, but the other users will be able to reply",
+  "Broadcast_Connected_Instances": "Broadcast Connected Instances",
+  "Broadcasting_api_key": "Broadcasting API Key",
+  "Broadcasting_client_id": "Broadcasting Client ID",
+  "Broadcasting_client_secret": "Broadcasting Client Secret",
+  "Broadcasting_enabled": "Broadcasting Enabled",
+  "Broadcasting_media_server_url": "Broadcasting Media Server URL",
+  "Browse_Files": "Browse Files",
+  "Browser_does_not_support_audio_element": "Your browser does not support the audio element.",
+  "Call_number_enterprise_only": "Call number (Enterprise Edition only)",
+  "Browser_does_not_support_video_element": "Your browser does not support the video element.",
+  "Browser_does_not_support_recording_video": "Your browser does not support recording video",
+  "Bugsnag_api_key": "Bugsnag API Key",
+  "Build_Environment": "Build Environment",
+  "bulk-register-user": "Bulk Create Users",
+  "bulk-register-user_description": "Permission to create users in bulk",
+  "Bundles": "Bundles",
+  "Busiest_day": "Busiest Day",
+  "Busiest_time": "Busiest Time",
+  "Business_Hour": "Business Hour",
+  "Business_Hour_Removed": "Business Hour Removed",
+  "Business_Hours": "Business Hours",
+  "Business_hours_enabled": "Business hours enabled",
+  "Business_hours_is_disabled": "Business hours is disabled",
+  "Business_hours_is_disabled_description": "Enable business hours at the workspace admin panel to let customers know when you're available and when can they expect a response.",
+  "Business_hours_updated": "Business hours updated",
+  "Business_hours_will_update_automatically": "Business hours will update automatically",
+  "busy": "busy",
+  "Busy": "Busy",
+  "Buy": "Buy",
+  "By": "By",
+  "by": "by",
+  "cache_cleared": "Cache cleared",
+  "Calendar_MeetingUrl_Regex": "Meeting url Regular Expression",
+  "Calendar_MeetingUrl_Regex_Description": "Expression used to detect meeting URLs in event descriptions. The first matching group with a valid url will be used. HTML encoded urls will be decoded automatically.",
+  "Calendar_settings": "Calendar settings",
+  "Call": "Call",
+  "Call_again": "Call again",
+  "Call_back": "Call back",
+  "Call_not_found": "Call not found",
+  "Call_not_found_error": "This could happen when the call URL is not valid, or you're having connection issues. Please check with the source of the call URL and try again, or talk to your workspace administrator if the problem persists",
+  "Calling": "Calling",
+  "Call_Center": "Voice Channel",
+  "Call_Center_Description": "Configure Rocket.Chat's voice channels",
+  "Call_ended": "Call ended",
+  "Calls": "Calls",
+  "Calls_in_queue_zero": "Queue is empty",
+  "Calls_in_queue_one": "{{count}} call in queue",
+  "Calls_in_queue_other": "{{count}} calls in queue",
+  "Call_declined": "Call Declined!",
+  "Call_history_provides_a_record_of_when_calls_took_place_and_who_joined": "Call history provides a record of when calls took place and who joined.",
+  "Call_Information": "Call Information",
+  "Call_provider": "Call Provider",
+  "Call_Already_Ended": "Call Already Ended",
+  "Call_number": "Call number",
+  "Call_number_premium_only": "Call number (Premium plans only)",
+  "call-management": "Call Management",
+  "call-management_description": "Permission to start a meeting",
+  "Call_ongoing": "Call ongoing",
+  "Call_started": "Call started",
+  "Call_unavailable_for_federation": "Call is unavailable for Federated rooms",
+  "Call_was_not_answered": "Call was not answered",
+  "Call_transfered_to__name__": "Call transfered to {{name}}",
+  "Call_terminated": "Call terminated",
+  "Caller": "Caller",
+  "Caller_Id": "Caller ID",
+  "Camera_access_not_allowed": "Camera access was not allowed, please check your browser settings.",
+  "Cam_on": "Cam On",
+  "Cam_off": "Cam Off",
+  "can-audit": "Can Audit",
+  "can-audit_description": "Permission to access audit",
+  "can-audit-log": "Can Audit Log",
+  "can-audit-log_description": "Permission to access audit log",
+  "Cancel": "Cancel",
+  "Cancel_message_input": "Cancel",
+  "Canceled": "Canceled",
+  "Cancel_subscription": "Cancel subscription",
+  "Canned_Response_Created": "Canned Response created",
+  "Canned_Response_Updated": "Canned Response updated",
+  "Canned_Response_Delete_Warning": "Deleting a canned response cannot be undone.",
+  "Canned_Response_Removed": "Canned Response Removed",
+  "Canned_Response_Sharing_Department_Description": "Anyone in the selected department can access this canned response",
+  "Canned_Response_Sharing_Private_Description": "Only you and Omnichannel managers can access this canned response",
+  "Canned_Response_Sharing_Public_Description": "Anyone can access this canned response",
+  "Canned_Responses": "Canned Responses",
+  "Canned_Responses_Enable": "Enable Canned Responses",
+  "Create_department": "Create department",
+  "Create_direct_message": "New direct message",
+  "Create_tag": "Create tag",
+  "Create_trigger": "Create trigger",
+  "Create_SLA_policy": "Create SLA policy",
+  "Cannot_invite_users_to_direct_rooms": "Cannot invite users to direct rooms",
+  "Cannot_open_conversation_with_yourself": "Cannot Direct Message with yourself",
+  "Cannot_share_your_location": "Cannot share your location...",
+  "Cannot_disable_while_on_call": "Can't change status during calls ",
+  "Cant_join": "Can't join",
+  "CAS": "CAS",
+  "CAS_Description": "Central Authentication Service allows members to use one set of credentials to sign in to multiple sites over multiple protocols.",
+  "CAS_autoclose": "Autoclose Login Popup",
+  "CAS_base_url": "SSO Base URL",
+  "CAS_base_url_Description": "The base URL of your external SSO service e.g: `https://sso.example.undef/sso/`",
+  "CAS_button_color": "Login Button Background Color",
+  "CAS_button_label_color": "Login Button Text Color",
+  "CAS_button_label_text": "Login Button Label",
+  "CAS_Creation_User_Enabled": "Allow user creation",
+  "CAS_Creation_User_Enabled_Description": "Allow CAS User creation from data provided by the CAS ticket.",
+  "CAS_enabled": "Enabled",
+  "CAS_Login_Layout": "CAS Login Layout",
+  "CAS_login_url": "SSO Login URL",
+  "CAS_login_url_Description": "The login URL of your external SSO service e.g: `https://sso.example.undef/sso/login`",
+  "CAS_popup_height": "Login Popup Height",
+  "CAS_popup_width": "Login Popup Width",
+  "CAS_Sync_User_Data_Enabled": "Always Sync User Data",
+  "CAS_Sync_User_Data_Enabled_Description": "Always synchronize external CAS User data into available attributes upon login. Note: Attributes are always synced upon account creation anyway.",
+  "CAS_Sync_User_Data_FieldMap": "Attribute Map",
+  "CAS_Sync_User_Data_FieldMap_Description": "Use this JSON input to build internal attributes (key) from external attributes (value). External attribute names enclosed with '%' will interpolated in value strings.  \nExample, `{\"email\":\"%email%\", \"name\":\"%firstname%, %lastname%\"}`  \n  \nThe attribute map is always interpolated. In CAS 1.0 only the `username` attribute is available. Available internal attributes are: username, name, email, rooms; rooms is a comma separated list of rooms to join upon user creation e.g: `{\"rooms\": \"%team%,%department%\"}` would join CAS users on creation to their team and department channel.",
+  "CAS_trust_username": "Trust CAS username",
+  "CAS_trust_username_description": "When enabled, Rocket.Chat will trust that any username from CAS belongs to the same user on Rocket.Chat.  \nThis may be needed if a user is renamed on CAS, but may also allow people to take control of Rocket.Chat accounts by renaming their own CAS users.",
+  "CAS_version": "CAS Version",
+  "CAS_version_Description": "Only use a supported CAS version supported by your CAS SSO service.",
+  "Categories": "Categories",
+  "Categories*": "Categories*",
+  "CDN_JSCSS_PREFIX": "CDN Prefix for JS/CSS",
+  "CDN_PREFIX": "CDN Prefix",
+  "CDN_PREFIX_ALL": "Use CDN Prefix for all assets",
+  "Certificates_and_Keys": "Certificates and Keys",
+  "changed_room_announcement_to__room_announcement_": "changed room announcement to: {{room_announcement}}",
+  "changed_room_description_to__room_description_": "changed room description to: {{room_description}}",
+  "change-livechat-room-visitor": "Change Livechat Room Visitors",
+  "change-livechat-room-visitor_description": "Permission to add additional information to the livechat room visitor",
+  "Change_Room_Type": "Changing the Room Type",
+  "Changing_email": "Changing email",
+  "channel": "channel",
+  "Channel": "Channel",
+  "Channel_info": "Channel info",
+  "Channel_already_exist": "The channel `#%s` already exists.",
+  "Channel_already_exist_static": "The channel already exists.",
+  "Channel_already_Unarchived": "Channel with name `#%s` is already in Unarchived state",
+  "Channel_Archived": "Channel with name `#%s` has been archived successfully",
+  "Channel_created": "Channel `#%s` created.",
+  "Channel_doesnt_exist": "The channel `#%s` does not exist.",
+  "Channel_Export": "Channel Export",
+  "Channel_name": "Channel Name",
+  "Channel_Name_Placeholder": "Please enter channel name...",
+  "Channel_to_listen_on": "Channel to listen on",
+  "Channel_Unarchived": "Channel with name `#%s` has been Unarchived successfully",
+  "Channel__roomName__": "Channel {{roomName}}.",
+  "Channels": "Channels",
+  "Channels_added": "Channels added sucessfully",
+  "Channels_are_where_your_team_communicate": "Channels are where your team communicate",
+  "Channels_list": "List of public channels",
+  "Channel_what_is_this_channel_about": "What is this channel about?",
+  "Chart": "Chart",
+  "Chats": "Chats",
+  "Chat_button": "Chat button",
+  "Chat_close": "Chat Close",
+  "Chat_closed": "Chat closed",
+  "Chat_closed_by_agent": "Chat closed by agent",
+  "Chat_closed_successfully": "Chat closed successfully",
+  "Chat_History": "Chat History",
+  "Chat_Now": "Chat Now",
+  "chat_on_hold_due_to_inactivity": "This chat is on-hold due to inactivity",
+  "Chat_On_Hold": "Chat On-Hold",
+  "Chat_On_Hold_Successfully": "This chat was successfully placed On-Hold",
+  "Chat_queued": "Chat Queued",
+  "Chat_removed": "Chat Removed",
+  "Chat_resumed": "Chat Resumed",
+  "Chat_start": "Chat Start",
+  "Chat_started": "Chat started",
+  "Chat_taken": "Chat Taken",
+  "Chat_window": "Chat window",
+  "Chatops_Enabled": "Enable Chatops",
+  "Chatops_Title": "Chatops Panel",
+  "Chatops_Username": "Chatops Username",
+  "Chat_Duration": "Chat Duration",
+  "Chats_removed": "Chats Removed",
+  "Check_All": "Check All",
+  "Check_back_later": "Check back later",
+  "Check_if_the_spelling_is_correct": "Check if the spelling is correct",
+  "Check_Progress": "Check Progress",
+  "Check_device_activity": "Check device activity",
+  "Choose_a_room": "Choose a room",
+  "Choose_messages": "Choose messages",
+  "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Choose the alias that will appear before the username in messages.",
+  "Choose_the_username_that_this_integration_will_post_as": "Choose the username that this integration will post as.",
+  "Choose_users": "Choose users",
+  "Clean_History_unavailable_for_federation": "Clean history is unavailable for federation",
+  "Clean_Usernames": "Clear usernames",
+  "clean-channel-history": "Clean Channel History",
+  "clean-channel-history_description": "Permission to Clear the history from channels",
+  "clear": "Clear",
+  "Clear_all_unreads_question": "Clear all unreads?",
+  "clear_cache_now": "Clear Cache Now",
+  "Clear_filters": "Clear filters",
+  "clear_history": "Clear History",
+  "Clear_livechat_session_when_chat_ended": "Clear guest session when chat ended",
+  "clear-oembed-cache": "Clear OEmbed cache",
+  "clear-oembed-cache_description": "Permission to clear OEmbed cache",
+  "Click_here": "Click here",
+  "Click_here_for_more_details_or_contact_sales_for_a_new_license": "<a target=\"_blank\" href=\"{{url}}\">Click here</a> for more details or contact <strong>{{email}}</strong> for a new license.",
+  "Click_here_for_more_info": "Click here for more info",
+  "Click_here_to_clear_the_selection": "Click here to clear the selection",
+  "Click_here_to_enter_your_encryption_password": "Click here to enter your encryption password",
+  "Click_here_to_view_and_copy_your_password": "Click here to view and copy your password.",
+  "Click_the_messages_you_would_like_to_send_by_email": "Click the messages you would like to send by e-mail",
+  "Click_to_join": "Click to Join!",
+  "Click_to_load": "Click to load",
+  "Client_ID": "Client ID",
+  "Client_Secret": "Client Secret",
+  "Client": "Client",
+  "Clients_will_refresh_in_a_few_seconds": "Clients will refresh in a few seconds",
+  "close": "close",
+  "Close": "Close",
+  "Close_chat": "Close chat",
+  "Close_Dialpad": "Close Dialpad",
+  "Close_room_description": "You are about to close this chat. Are you sure you want to continue?",
+  "close-livechat-room": "Close Omnichannel Room",
+  "close-livechat-room_description": "Permission to close the current Omnichannel room",
+  "close-others-livechat-room": "Close Other Omnichannel Room",
+  "close-others-livechat-room_description": "Permission to close other Omnichannel rooms",
+  "Close_Window": "Close Window",
+  "Closed": "Closed",
+  "Closed_At": "Closed at",
+  "Closed_automatically": "Closed automatically by the system",
+  "Closed_automatically_because_chat_was_onhold_for_seconds": "Closed automatically because chat was On Hold for {{onHoldTime}} seconds",
+  "Closed_automatically_chat_queued_too_long": "Closed automatically by the system (queue maximum time exceeded)",
+  "Closed_by_visitor": "Closed by visitor",
+  "Wrap_up_conversation": "Wrap up conversation",
+  "These_options_affect_this_conversation_only_To_set_default_selections_go_to_My_Account_Omnichannel": "These options affect this conversation only. To set default selections, go to My Account > Omnichannel.",
+  "This_option_affect_this_conversation_only_To_set_default_selection_go_to_My_Account_Omnichannel": "This option affect this conversation only. To set default selection, go to My Account > Omnichannel.",
+  "Closing_chat": "Closing chat",
+  "Closing_chat_message": "Closing chat message",
+  "Cloud": "Cloud",
+  "Cloud_Apply_Offline_License": "Apply Offline License",
+  "Cloud_Change_Offline_License": "Change Offline License",
+  "Cloud_License_applied_successfully": "License applied successfully!",
+  "Cloud_Invalid_license": "Invalid license!",
+  "Cloud_Apply_license": "Apply license",
+  "Cloud_connectivity": "Cloud Connectivity",
+  "Cloud_address_to_send_registration_to": "The address to send your Cloud registration email to.",
+  "Cloud_click_here": "After copying the text, go to [cloud console (click here)]({{cloudConsoleUrl}}).",
+  "Cloud_console": "Cloud Console",
+  "Cloud_error_code": "Code:  {{errorCode}}",
+  "Cloud_error_in_authenticating": "Error received while authenticating",
+  "Cloud_Info": "Cloud Info",
+  "Cloud_login_to_cloud": "Login to Rocket.Chat Cloud",
+  "Cloud_logout": "Logout of Rocket.Chat Cloud",
+  "Cloud_manually_input_token": "Enter the token received from the Cloud Console.",
+  "Cloud_register_error": "There has been an error trying to process your request. Please try again later.",
+  "Cloud_Register_manually": "Register Offline",
+  "Cloud_register_offline_finish_helper": "After completing the registration process in the Cloud Console you should be presented with some text. Please paste it here to finish the registration.",
+  "Cloud_register_offline_helper": "Workspaces can be manually registered if airgapped or network access is restricted. Copy the text below and go to our Cloud Console to complete the process.",
+  "Cloud_register_success": "Your workspace has been successfully registered!",
+  "Cloud_registration_required": "Registration Required",
+  "Cloud_registration_required_description": "Looks like during setup you didn't chose to register your workspace.",
+  "Cloud_registration_required_link_text": "Click here to register your workspace.",
+  "Cloud_resend_email": "Resend email",
+  "Cloud_Service_Agree_PrivacyTerms": "Cloud Service Privacy Terms Agreement",
+  "Cloud_Service_Agree_PrivacyTerms_Description": "I agree with the [Terms](https://rocket.chat/terms) & [Privacy Policy](https://rocket.chat/privacy)",
+  "Cloud_Service_Agree_PrivacyTerms_Login_Disabled_Warning": "You should accept the cloud privacy terms (Setup Wizard > Cloud Info > Cloud Service Privacy Terms Agreement) to connect to your cloud workspace",
+  "Cloud_status_page_description": "If a particular Cloud Service is having issues you can check for known issues on our status page at",
+  "Cloud_token_instructions": "To Register your workspace go to Cloud Console. Login or Create an account and click register self-managed. Paste the token provided below",
+  "Cloud_troubleshooting": "Troubleshooting",
+  "Cloud_update_email": "Update Email",
+  "Cloud_what_is_it": "What is this?",
+  "Copy_Link": "Copy Link",
+  "Copy_password": "Copy password",
+  "Cloud_what_is_it_additional": "In addition you will be able to manage licenses, billing and support from the Rocket.Chat Cloud Console.",
+  "Cloud_what_is_it_description": "Rocket.Chat Cloud Connect allows you to connect your self-hosted Rocket.Chat Workspace to services we provide in our Cloud.",
+  "Cloud_what_is_it_services_like": "Services like:",
+  "Cloud_workspace_connected": "Your workspace is connected to Rocket.Chat Cloud.  Logging into your Rocket.Chat Cloud account here will allow you to interact with some services like marketplace.",
+  "Cloud_workspace_connected_plus_account": "Your workspace is now connected to the Rocket.Chat Cloud and an account is associated.",
+  "Cloud_workspace_connected_without_account": "Your workspace is now connected to the Rocket.Chat Cloud. If you would like, you can login to the Rocket.Chat Cloud and associate your workspace with your Cloud account.",
+  "Cloud_workspace_disconnect": "If you no longer wish to utilize cloud services you can disconnect your workspace from Rocket.Chat Cloud.",
+  "Cloud_workspace_support": "If you have trouble with a cloud service, please try to sync first.  Should the issue persist, please open a support ticket in the Cloud Console.",
+  "Cloud_Workspace_Id": "Cloud Workspace ID",
+  "Collaborative": "Collaborative",
+  "Collapse": "Collapse",
+  "Collapse_Embedded_Media_By_Default": "Collapse Embedded Media by Default",
+  "color": "Color",
+  "Color": "Color",
+  "Colors": "Colors",
+  "Commands": "Commands",
+  "Comment_to_leave_on_closing_session": "Comment to Leave on Closing Session",
+  "Comment": "Comment",
+  "Common_Access": "Common Access",
+  "Commit": "Commit",
+  "Community": "Community",
+  "Contextualbar_resizable": "Resizable contextual bar",
+  "Contextualbar_resizable_description": "Adjust the size of the contextual bar by clicking and dragging the edge, giving you instant customization and flexibility.",
+  "Free_Edition": "Free edition",
+  "Composer_not_available_phone_calls": "Messages are not available on phone calls",
+  "Condensed": "Condensed",
+  "Condition": "Condition",
+  "Commit_details": "Commit Details",
+  "Completed": "Completed",
+  "Computer": "Computer",
+  "Conference_call_apps": "Conference call apps",
+  "Conference_call_has_ended": "_Call has ended._",
+  "Conference_name": "Conference name",
+  "Configure_Incoming_Mail_IMAP": "Configure Incoming Mail (IMAP)",
+  "Configure_Outgoing_Mail_SMTP": "Configure Outgoing Mail (SMTP)",
+  "Configure_video_conference_to_make_it_available_on_this_workspace": "Configure video conference to make it available on this workspace",
+  "Confirm": "Confirm",
+  "Confirm_new_encryption_password": "Confirm new encryption password",
+  "Confirm_new_password": "Confirm New Password",
+  "Confirm_New_Password_Placeholder": "Please re-enter new password...",
+  "Confirm_password": "Confirm password",
+  "Confirm_your_password": "Confirm your password",
+  "Confirm_configuration_update_description": "Identification data and cloud connection data will be retained.<br/><br/><strong>Warning</strong>: If this is actually a new workspace, please go back and select new workspace option to avoid communication conflicts.",
+  "Confirm_configuration_update": "Confirm configuration update",
+  "Confirm_new_workspace_description": "Identification data and cloud connection data will be reset.<br/><br/><strong>Warning</strong>: License can be affected if changing workspace URL.",
+  "Confirm_new_workspace": "Confirm new workspace",
+  "Confirmation": "Confirmation",
+  "Configure_video_conference": "Configure conference call",
+  "Configuration_update_confirmed": "Configuration update confirmed",
+  "Configuration_update": "Configuration update",
+  "Connect": "Connect",
+  "Connected": "Connected",
+  "Connect_SSL_TLS": "Connect with SSL/TLS",
+  "Connection_Closed": "Connection closed",
+  "Connection_Reset": "Connection reset",
+  "Connection_error": "Connection error",
+  "Connection_failed": "LDAP Connection Failed",
+  "Connectivity_Services": "Connectivity Services",
+  "Consulting": "Consulting",
+  "Consumer_Packaged_Goods": "Consumer Packaged Goods",
+  "Contact": "Contact",
+  "Contacts": "Contacts",
+  "Contact_Name": "Contact Name",
+  "Contact_Center": "Contact Center",
+  "Contact_Chat_History": "Contact Chat History",
+  "Contains_Security_Fixes": "Contains Security Fixes",
+  "Contact_Manager": "Contact Manager",
+  "Contact_not_found": "Contact not found",
+  "Contact_Profile": "Contact Profile",
+  "Contact_Info": "Contact Information",
+  "Content": "Content",
+  "Continue": "Continue",
+  "Continue_Adding": "Continue Adding?",
+  "Continuous_sound_notifications_for_new_livechat_room": "Continuous sound notifications for new omnichannel room",
+  "convert-team": "Convert Team",
+  "convert-team_description": "Permission to convert team to channel",
+  "Conversation": "Conversation",
+  "Conversation_closed": "Conversation closed: {{comment}}.",
+  "Conversation_closed_without_comment": "Conversation closed",
+  "Conversation_closing_tags": "Conversation closing tags",
+  "Conversation_closing_tags_description": "Closing tags will be automatically assigned to conversations at closing.",
+  "Conversation_finished": "Conversation Finished",
+  "Conversation_finished_message": "Conversation Finished Message",
+  "Conversation_finished_text": "Conversation Finished Text",
+  "conversation_with_s": "the conversation with %s",
+  "Conversation_with__roomName__": "Conversation with {{roomName}}.",
+  "Conversations": "Conversations",
+  "Conversations_per_day": "Conversations per Day",
+  "Convert": "Convert",
+  "Convert_Ascii_Emojis": "Convert ASCII to Emoji",
+  "Convert_to_channel": "Convert to Channel",
+  "Converting_channel_to_a_team": "You are converting this Channel to a Team. All members will be kept.",
+  "Converted__roomName__to_team": "<strong>converted</strong> #{{roomName}} to a Team",
+  "Converted__roomName__to_channel": "<strong>converted</strong> #{{roomName}} to a Channel",
+  "Converted__roomName__to_a_team": "converted #{{roomName}} to a team",
+  "Converted__roomName__to_a_channel": "converted #{{roomName}} to channel",
+  "Converting_team_to_channel": "Converting Team to Channel",
+  "Copied": "Copied",
+  "Copy": "Copy",
+  "Copy_text": "Copy text",
+  "Copy_phone_number": "Copy phone number",
+  "Copy_to_clipboard": "Copy to clipboard",
+  "COPY_TO_CLIPBOARD": "COPY TO CLIPBOARD",
+  "could-not-access-webdav": "Could not access WebDAV",
+  "Count": "Count",
+  "Counters": "Counters",
+  "Country": "Country",
+  "Country_Afghanistan": "Afghanistan",
+  "Country_Albania": "Albania",
+  "Country_Algeria": "Algeria",
+  "Country_American_Samoa": "American Samoa",
+  "Country_Andorra": "Andorra",
+  "Country_Angola": "Angola",
+  "Country_Anguilla": "Anguilla",
+  "Country_Antarctica": "Antarctica",
+  "Country_Antigua_and_Barbuda": "Antigua and Barbuda",
+  "Country_Argentina": "Argentina",
+  "Country_Armenia": "Armenia",
+  "Country_Aruba": "Aruba",
+  "Country_Australia": "Australia",
+  "Country_Austria": "Austria",
+  "Country_Azerbaijan": "Azerbaijan",
+  "Country_Bahamas": "Bahamas",
+  "Country_Bahrain": "Bahrain",
+  "Country_Bangladesh": "Bangladesh",
+  "Country_Barbados": "Barbados",
+  "Country_Belarus": "Belarus",
+  "Country_Belgium": "Belgium",
+  "Country_Belize": "Belize",
+  "Country_Benin": "Benin",
+  "Country_Bermuda": "Bermuda",
+  "Country_Bhutan": "Bhutan",
+  "Country_Bolivia": "Bolivia",
+  "Country_Bosnia_and_Herzegovina": "Bosnia and Herzegovina",
+  "Country_Botswana": "Botswana",
+  "Country_Bouvet_Island": "Bouvet Island",
+  "Country_Brazil": "Brazil",
+  "Country_British_Indian_Ocean_Territory": "British Indian Ocean Territory",
+  "Country_Brunei_Darussalam": "Brunei Darussalam",
+  "Country_Bulgaria": "Bulgaria",
+  "Country_Burkina_Faso": "Burkina Faso",
+  "Country_Burundi": "Burundi",
+  "Country_Cambodia": "Cambodia",
+  "Country_Cameroon": "Cameroon",
+  "Country_Canada": "Canada",
+  "Country_Cape_Verde": "Cape Verde",
+  "Country_Cayman_Islands": "Cayman Islands",
+  "Country_Central_African_Republic": "Central African Republic",
+  "Country_Chad": "Chad",
+  "Country_Chile": "Chile",
+  "Country_China": "China",
+  "Country_Christmas_Island": "Christmas Island",
+  "Country_Cocos_Keeling_Islands": "Cocos (Keeling) Islands",
+  "Country_Colombia": "Colombia",
+  "Country_Comoros": "Comoros",
+  "Country_Congo": "Congo",
+  "Country_Congo_The_Democratic_Republic_of_The": "Congo, The Democratic Republic of The",
+  "Country_Cook_Islands": "Cook Islands",
+  "Country_Costa_Rica": "Costa Rica",
+  "Country_Cote_Divoire": "Cote D'ivoire",
+  "Country_Croatia": "Croatia",
+  "Country_Cuba": "Cuba",
+  "Country_Cyprus": "Cyprus",
+  "Country_Czech_Republic": "Czech Republic",
+  "Country_Denmark": "Denmark",
+  "Country_Djibouti": "Djibouti",
+  "Country_Dominica": "Dominica",
+  "Country_Dominican_Republic": "Dominican Republic",
+  "Country_Ecuador": "Ecuador",
+  "Country_Egypt": "Egypt",
+  "Country_El_Salvador": "El Salvador",
+  "Country_Equatorial_Guinea": "Equatorial Guinea",
+  "Country_Eritrea": "Eritrea",
+  "Country_Estonia": "Estonia",
+  "Country_Ethiopia": "Ethiopia",
+  "Country_Falkland_Islands_Malvinas": "Falkland Islands (Malvinas)",
+  "Country_Faroe_Islands": "Faroe Islands",
+  "Country_Fiji": "Fiji",
+  "Country_Finland": "Finland",
+  "Country_France": "France",
+  "Country_French_Guiana": "French Guiana",
+  "Country_French_Polynesia": "French Polynesia",
+  "Country_French_Southern_Territories": "French Southern Territories",
+  "Country_Gabon": "Gabon",
+  "Country_Gambia": "Gambia",
+  "Country_Georgia": "Georgia",
+  "Country_Germany": "Germany",
+  "Country_Ghana": "Ghana",
+  "Country_Gibraltar": "Gibraltar",
+  "Country_Greece": "Greece",
+  "Country_Greenland": "Greenland",
+  "Country_Grenada": "Grenada",
+  "Country_Guadeloupe": "Guadeloupe",
+  "Country_Guam": "Guam",
+  "Country_Guatemala": "Guatemala",
+  "Country_Guinea": "Guinea",
+  "Country_Guinea_bissau": "Guinea-bissau",
+  "Country_Guyana": "Guyana",
+  "Country_Haiti": "Haiti",
+  "Country_Heard_Island_and_Mcdonald_Islands": "Heard Island and Mcdonald Islands",
+  "Country_Holy_See_Vatican_City_State": "Holy See (Vatican City State)",
+  "Country_Honduras": "Honduras",
+  "Country_Hong_Kong": "Hong Kong",
+  "Country_Hungary": "Hungary",
+  "Country_Iceland": "Iceland",
+  "Country_India": "India",
+  "Country_Indonesia": "Indonesia",
+  "Country_Iran_Islamic_Republic_of": "Iran, Islamic Republic of",
+  "Country_Iraq": "Iraq",
+  "Country_Ireland": "Ireland",
+  "Country_Israel": "Israel",
+  "Country_Italy": "Italy",
+  "Country_Jamaica": "Jamaica",
+  "Country_Japan": "Japan",
+  "Country_Jordan": "Jordan",
+  "Country_Kazakhstan": "Kazakhstan",
+  "Country_Kenya": "Kenya",
+  "Country_Kiribati": "Kiribati",
+  "Country_Korea_Democratic_Peoples_Republic_of": "Korea, Democratic People's Republic of",
+  "Country_Korea_Republic_of": "Korea, Republic of",
+  "Country_Kuwait": "Kuwait",
+  "Country_Kyrgyzstan": "Kyrgyzstan",
+  "Country_Lao_Peoples_Democratic_Republic": "Lao People's Democratic Republic",
+  "Country_Latvia": "Latvia",
+  "Country_Lebanon": "Lebanon",
+  "Country_Lesotho": "Lesotho",
+  "Country_Liberia": "Liberia",
+  "Country_Libyan_Arab_Jamahiriya": "Libyan Arab Jamahiriya",
+  "Country_Liechtenstein": "Liechtenstein",
+  "Country_Lithuania": "Lithuania",
+  "Country_Luxembourg": "Luxembourg",
+  "Country_Macao": "Macao",
+  "Country_Macedonia_The_Former_Yugoslav_Republic_of": "Macedonia, The Former Yugoslav Republic of",
+  "Country_Madagascar": "Madagascar",
+  "Country_Malawi": "Malawi",
+  "Country_Malaysia": "Malaysia",
+  "Country_Maldives": "Maldives",
+  "Country_Mali": "Mali",
+  "Country_Malta": "Malta",
+  "Country_Marshall_Islands": "Marshall Islands",
+  "Country_Martinique": "Martinique",
+  "Country_Mauritania": "Mauritania",
+  "Country_Mauritius": "Mauritius",
+  "Country_Mayotte": "Mayotte",
+  "Country_Mexico": "Mexico",
+  "Country_Micronesia_Federated_States_of": "Micronesia, Federated States of",
+  "Country_Moldova_Republic_of": "Moldova, Republic of",
+  "Country_Monaco": "Monaco",
+  "Country_Mongolia": "Mongolia",
+  "Country_Montserrat": "Montserrat",
+  "Country_Morocco": "Morocco",
+  "Country_Mozambique": "Mozambique",
+  "Country_Myanmar": "Myanmar",
+  "Country_Namibia": "Namibia",
+  "Country_Nauru": "Nauru",
+  "Country_Nepal": "Nepal",
+  "Country_Netherlands": "Netherlands",
+  "Country_Netherlands_Antilles": "Netherlands Antilles",
+  "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "If you don't have one send an email to [omni@rocket.chat](mailto:omni@rocket.chat) to get yours.",
+  "Country_New_Caledonia": "New Caledonia",
+  "Country_New_Zealand": "New Zealand",
+  "Country_Nicaragua": "Nicaragua",
+  "Country_Niger": "Niger",
+  "Country_Nigeria": "Nigeria",
+  "Country_Niue": "Niue",
+  "Country_Norfolk_Island": "Norfolk Island",
+  "Country_Northern_Mariana_Islands": "Northern Mariana Islands",
+  "Country_Norway": "Norway",
+  "Country_Oman": "Oman",
+  "Country_Pakistan": "Pakistan",
+  "Country_Palau": "Palau",
+  "Country_Palestinian_Territory_Occupied": "Palestinian Territory, Occupied",
+  "Country_Panama": "Panama",
+  "Country_Papua_New_Guinea": "Papua New Guinea",
+  "Country_Paraguay": "Paraguay",
+  "Country_Peru": "Peru",
+  "Country_Philippines": "Philippines",
+  "Country_Pitcairn": "Pitcairn",
+  "Country_Poland": "Poland",
+  "Country_Portugal": "Portugal",
+  "Country_Puerto_Rico": "Puerto Rico",
+  "Country_Qatar": "Qatar",
+  "Country_Reunion": "Reunion",
+  "Country_Romania": "Romania",
+  "Country_Russian_Federation": "Russian Federation",
+  "Country_Rwanda": "Rwanda",
+  "Country_Saint_Helena": "Saint Helena",
+  "Country_Saint_Kitts_and_Nevis": "Saint Kitts and Nevis",
+  "Country_Saint_Lucia": "Saint Lucia",
+  "Country_Saint_Pierre_and_Miquelon": "Saint Pierre and Miquelon",
+  "Country_Saint_Vincent_and_The_Grenadines": "Saint Vincent and The Grenadines",
+  "Country_Samoa": "Samoa",
+  "Country_San_Marino": "San Marino",
+  "Country_Sao_Tome_and_Principe": "Sao Tome and Principe",
+  "Country_Saudi_Arabia": "Saudi Arabia",
+  "Country_Senegal": "Senegal",
+  "Country_Serbia_and_Montenegro": "Serbia and Montenegro",
+  "inline_code": "inline code",
+  "Country_Seychelles": "Seychelles",
+  "Country_Sierra_Leone": "Sierra Leone",
+  "Country_Singapore": "Singapore",
+  "Country_Slovakia": "Slovakia",
+  "Country_Slovenia": "Slovenia",
+  "Country_Solomon_Islands": "Solomon Islands",
+  "Country_Somalia": "Somalia",
+  "Country_South_Africa": "South Africa",
+  "Country_South_Georgia_and_The_South_Sandwich_Islands": "South Georgia and The South Sandwich Islands",
+  "Country_Spain": "Spain",
+  "Country_Sri_Lanka": "Sri Lanka",
+  "Country_Sudan": "Sudan",
+  "Country_Suriname": "Suriname",
+  "Country_Svalbard_and_Jan_Mayen": "Svalbard and Jan Mayen",
+  "Country_Swaziland": "Swaziland",
+  "Country_Sweden": "Sweden",
+  "Country_Switzerland": "Switzerland",
+  "Country_Syrian_Arab_Republic": "Syrian Arab Republic",
+  "Country_Taiwan_Province_of_China": "Taiwan, Province of China",
+  "Country_Tajikistan": "Tajikistan",
+  "Country_Tanzania_United_Republic_of": "Tanzania, United Republic of",
+  "Country_Thailand": "Thailand",
+  "Country_Timor_leste": "Timor-leste",
+  "Country_Togo": "Togo",
+  "Country_Tokelau": "Tokelau",
+  "Country_Tonga": "Tonga",
+  "Country_Trinidad_and_Tobago": "Trinidad and Tobago",
+  "Country_Tunisia": "Tunisia",
+  "Country_Turkey": "Turkey",
+  "Country_Turkmenistan": "Turkmenistan",
+  "Country_Turks_and_Caicos_Islands": "Turks and Caicos Islands",
+  "Country_Tuvalu": "Tuvalu",
+  "Country_Uganda": "Uganda",
+  "Country_Ukraine": "Ukraine",
+  "Country_United_Arab_Emirates": "United Arab Emirates",
+  "Country_United_Kingdom": "United Kingdom",
+  "Country_United_States": "United States",
+  "Country_United_States_Minor_Outlying_Islands": "United States Minor Outlying Islands",
+  "Country_Uruguay": "Uruguay",
+  "Country_Uzbekistan": "Uzbekistan",
+  "Country_Vanuatu": "Vanuatu",
+  "Country_Venezuela": "Venezuela",
+  "Country_Viet_Nam": "Viet Nam",
+  "Country_Virgin_Islands_British": "Virgin Islands, British",
+  "Country_Virgin_Islands_US": "Virgin Islands, U.S.",
+  "Country_Wallis_and_Futuna": "Wallis and Futuna",
+  "Country_Western_Sahara": "Western Sahara",
+  "Country_Yemen": "Yemen",
+  "Country_Zambia": "Zambia",
+  "Country_Zimbabwe": "Zimbabwe",
+  "Create": "Create",
+  "Create_canned_response": "Create canned response",
+  "Create_custom_field": "Create custom field",
+  "Create_channel": "Create channel",
+  "Create_channels": "Create channels",
+  "Create_a_public_channel_that_new_workspace_members_can_join": "Create a public channel that new workspace members can join.",
+  "Create_A_New_Channel": "Create a New Channel",
+  "Create_new": "Create new",
+  "Create_new_members": "Create New Members",
+  "Create_unique_rules_for_this_channel": "Create unique rules for this channel",
+  "Create_unit": "Create unit",
+  "create-c": "Create Public Channels",
+  "create-c_description": "Permission to create public channels",
+  "create-d": "Create Direct Messages",
+  "create-d_description": "Permission to start direct messages",
+  "create-invite-links": "Create Invite Links",
+  "create-invite-links_description": "Permission to create invite links to channels",
+  "create-p": "Create Private Channels",
+  "create-p_description": "Permission to create private channels",
+  "create-personal-access-tokens": "Create Personal Access Tokens",
+  "create-personal-access-tokens_description": "Permission to create Personal Access Tokens",
+  "create-team": "Create Team",
+  "create-team_description": "Permission to create teams",
+  "create-user": "Create User",
+  "create-user_description": "Permission to create users",
+  "Created": "Created",
+  "Created_as": "Created as",
+  "Created_at": "Created at",
+  "Created_at_s_by_s": "Created at <strong>%s</strong> by <strong>%s</strong>",
+  "Created_at_s_by_s_triggered_by_s": "Created at <strong>%s</strong> by <strong>%s</strong> triggered by <strong>%s</strong>",
+  "Created_by": "Created by",
+  "CRM_Integration": "CRM Integration",
+  "CROWD_Allow_Custom_Username": "Allow custom username in Rocket.Chat",
+  "Crowd_Connection_successful": "Crowd Connection Successful",
+  "CROWD_Reject_Unauthorized": "Reject Unauthorized",
+  "Crowd_Remove_Orphaned_Users": "Remove Orphaned Users",
+  "Crowd_sync_interval_Description": "The interval between synchronizations. Example `every 24 hours` or `on the first day of the week`, more examples at [Cron Text Parser](http://bunkat.github.io/later/parsers.html#text)",
+  "CSV": "CSV",
+  "Current_Chats": "Current Chats",
+  "Current_File": "Current File",
+  "Current_Import_Operation": "Current Import Operation",
+  "Current_Status": "Current Status",
+  "Currently_we_dont_support_joining_servers_with_this_many_people": "Currently we don't support joining servers with this many people",
+  "Custom": "Custom",
+  "Custom CSS": "Custom CSS",
+  "Custom_agent": "Custom agent",
+  "Custom_dates": "Custom Dates",
+  "Custom_Emoji": "Custom Emoji",
+  "Custom_Emoji_Add": "Add New Emoji",
+  "Custom_Emoji_Added_Successfully": "Custom emoji added successfully",
+  "Custom_Emoji_Delete_Warning": "Deleting an emoji cannot be undone.",
+  "Custom_Emoji_Error_Invalid_Emoji": "Invalid emoji",
+  "Custom_Emoji_Error_Name_Or_Alias_Already_In_Use": "The custom emoji or one of its aliases is already in use.",
+  "Custom_Emoji_Error_Same_Name_And_Alias": "The custom emoji name and their aliases should be different.",
+  "Custom_Emoji_Has_Been_Deleted": "The custom emoji has been deleted.",
+  "Custom_Emoji_Info": "Custom Emoji Info",
+  "Custom_Emoji_Updated_Successfully": "Custom emoji updated successfully",
+  "Custom_Fields": "Custom Fields",
+  "Custom_Field_Removed": "Custom Field Removed",
+  "Custom_Field_Not_Found": "Custom Field not found",
+  "Custom_Integration": "Custom Integration",
+  "Custom_OAuth_has_been_added": "Custom OAuth has been added",
+  "Custom_OAuth_has_been_removed": "Custom OAuth has been removed",
+  "Custom_oauth_helper": "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
+  "Custom_oauth_unique_name": "Custom OAuth unique name",
+  "Custom_roles": "Custom roles",
+  "Custom_roles_upsell_add_custom_roles_workspace": "Add custom roles to suit your workspace",
+  "Custom_roles_upsell_add_custom_roles_workspace_description": "Custom roles allow you to set permissions for the people in your workspace. Set all the roles you need to make sure people have a safe environment to work on.",
+  "Custom_Script_Logged_In": "Custom Script for Logged In Users",
+  "Custom_Script_Logged_In_Description": "Custom Script that will run ALWAYS and to ANY user that is logged in. e.g. (whenever you enter the chat and you are logged in)",
+  "Custom_Script_Logged_Out": "Custom Script for Logged Out Users",
+  "Custom_Script_Logged_Out_Description": "Custom Script that will run ALWAYS and to ANY user that is NOT logged in. e.g. (whenever you enter the login page)",
+  "Custom_Script_On_Logout": "Custom Script for Logout Flow",
+  "Custom_Script_On_Logout_Description": "Custom Script that will run on execute logout flow  ONLY",
+  "Custom_Scripts": "Custom Scripts",
+  "Custom_Sound_Add": "Add Custom Sound",
+  "Custom_Sound_Delete_Warning": "Deleting a sound cannot be undone.",
+  "Custom_Sound_Edit": "Edit Custom Sound",
+  "Custom_Sound_Error_Invalid_Sound": "Invalid sound",
+  "Custom_Sound_Error_Name_Already_In_Use": "The custom sound name is already in use.",
+  "Custom_Sound_Has_Been_Deleted": "The custom sound has been deleted.",
+  "Custom_Sound_Info": "Custom Sound Info",
+  "Custom_Sound_Saved_Successfully": "Custom sound saved successfully",
+  "Custom_Status": "Custom Status",
+  "Custom_Translations": "Custom Translations",
+  "Custom_Translations_Description": "Should be a valid JSON where keys are languages containing a dictionary of key and translations. Example: `{\"en\": {\"Channels\": \"Rooms\"},\"pt\": {\"Channels\": \"Salas\"}}`",
+  "Custom_User_Status": "Custom User Status",
+  "Custom_User_Status_Add": "Add Custom User Status",
+  "Custom_User_Status_Added_Successfully": "Custom User Status Added Successfully",
+  "Custom_User_Status_Delete_Warning": "Deleting a Custom User Status cannot be undone.",
+  "Custom_User_Status_Edit": "Edit Custom User Status",
+  "Custom_User_Status_Error_Invalid_User_Status": "Invalid User Status",
+  "Custom_User_Status_Error_Name_Already_In_Use": "The Custom User Status Name is already in use.",
+  "Custom_User_Status_Has_Been_Deleted": "Custom User Status Has Been Deleted",
+  "Custom_User_Status_Info": "Custom User Status Info",
+  "Custom_User_Status_Updated_Successfully": "Custom User Status Updated Successfully",
+  "Customer_without_registered_email": "The customer does not have a registered email address",
+  "Customize": "Customize",
+  "Customize_Content": "Customize content",
+  "CustomSoundsFilesystem": "Custom Sounds Filesystem",
+  "CustomSoundsFilesystem_Description": "Specify how custom sounds are stored.",
+  "Daily_Active_Users": "Daily Active Users",
+  "Dashboard": "Dashboard",
+  "Data_modified": "Data Modified",
+  "Data_processing_consent_text": "Data processing consent text",
+  "Data_processing_consent_text_description": "Use this setting to explain that you can collect, store and process customer's personal informations along the conversation.",
+  "Date": "Date",
+  "Date_From": "From",
+  "Date_to": "to",
+  "DAU_value": "DAU {{value}}",
+  "days": "days",
+  "Days": "Days",
+  "Daylight_savings_time": "Timezone observes daylight saving time",
+  "DB_Migration": "Database Migration",
+  "DB_Migration_Date": "Database Migration Date",
+  "DDP_Rate_Limiter": "DDP Rate Limit",
+  "DDP_Rate_Limit_Connection_By_Method_Enabled": "Limit by Connection per Method: enabled",
+  "DDP_Rate_Limit_Connection_By_Method_Interval_Time": "Limit by Connection per Method: interval time",
+  "DDP_Rate_Limit_Connection_By_Method_Requests_Allowed": "Limit by Connection per Method: requests allowed",
+  "DDP_Rate_Limit_Connection_Enabled": "Limit by Connection: enabled",
+  "DDP_Rate_Limit_Connection_Interval_Time": "Limit by Connection: interval time",
+  "DDP_Rate_Limit_Connection_Requests_Allowed": "Limit by Connection: requests allowed",
+  "DDP_Rate_Limit_IP_Enabled": "Limit by IP: enabled",
+  "DDP_Rate_Limit_IP_Interval_Time": "Limit by IP: interval time",
+  "DDP_Rate_Limit_IP_Requests_Allowed": "Limit by IP: requests allowed",
+  "DDP_Rate_Limit_User_By_Method_Enabled": "Limit by User per Method: enabled",
+  "DDP_Rate_Limit_User_By_Method_Interval_Time": "Limit by User per Method: interval time",
+  "DDP_Rate_Limit_User_By_Method_Requests_Allowed": "Limit by User per Method: requests allowed",
+  "DDP_Rate_Limit_User_Enabled": "Limit by User: enabled",
+  "DDP_Rate_Limit_User_Interval_Time": "Limit by User: interval time",
+  "DDP_Rate_Limit_User_Requests_Allowed": "Limit by User: requests allowed",
+  "Deactivate": "Deactivate",
+  "Deactivated": "Deactivated",
+  "deactivated": "deactivated",
+  "Decline": "Decline",
+  "default": "default",
+  "Default": "Default",
+  "Default_provider": "Default provider",
+  "Default_value": "Default value",
+  "Delete": "Delete",
+  "Deleting": "Deleting",
+  "Delete_account": "Delete account",
+  "Delete_account?": "Delete account?",
+  "Delete_all_closed_chats": "Delete all closed chats",
+  "Delete_Department?": "Delete Department?",
+  "Delete_File_Warning": "Deleting a file will delete it forever. This cannot be undone.",
+  "Delete_message": "Delete message",
+  "Delete_my_account": "Delete my account",
+  "Delete_Role_Warning": "This cannot be undone",
+  "Delete_Role_Warning_Not_Enterprise": "This cannot be undone. You won't be able to create a new custom role, since that feature is no longer available for your current plan.",
+  "Delete_Room_Warning": "Deleting this {{roomType}} will also delete all contained message. This cannot be undone.",
+  "Delete_User_Warning": "Deleting a user will delete all messages from that user as well. This cannot be undone.",
+  "Delete_User_Warning_Delete": "Deleting a user will delete all messages from that user as well. This cannot be undone.",
+  "Delete_User_Warning_Keep": "The user will be deleted, but their messages will remain visible. This cannot be undone.",
+  "Delete_User_Warning_Unlink": "Deleting a user will remove the user name from all their messages. This cannot be undone.",
+  "delete-c": "Delete Public Channels",
+  "delete-c_description": "Permission to delete public channels",
+  "delete-d": "Delete Direct Messages",
+  "delete-d_description": "Permission to delete direct messages",
+  "delete-message": "Delete Message",
+  "delete-message_description": "Permission to delete a message within a room",
+  "delete-own-message": "Delete Own Message",
+  "delete-own-message_description": "Permission to delete own message",
+  "delete-p": "Delete Private Channels",
+  "delete-p_description": "Permission to delete private channels",
+  "delete-team": "Delete Team",
+  "delete-team_description": "Permission to delete teams",
+  "delete-user": "Delete User",
+  "delete-user_description": "Permission to delete users",
+  "Deleted": "Deleted!",
+  "Deleted_user": "Deleted user",
+  "Deleted__roomName__": "<strong>deleted</strong> #{{roomName}}",
+  "Deleted__roomName__room": "deleted #{{roomName}}",
+  "Department": "Department",
+  "Department_archived": "Department archived",
+  "Department_name": "Department name",
+  "Department_not_found": "Department not found",
+  "Department_removed": "Department removed",
+  "Department_Removal_Disabled": "Delete option disabled by admin",
+  "Department_unarchived": "Department unarchived",
+  "Departments": "Departments",
+  "Deployment_ID": "Deployment ID",
+  "Deployment": "Deployment",
+  "Description": "Description",
+  "Desktop": "Desktop",
+  "Desktop_apps": "Desktop apps",
+  "Desktop_Notification_Test": "Desktop Notification Test",
+  "Desktop_Notifications": "Desktop Notifications",
+  "Desktop_Notifications_Default_Alert": "Desktop Notifications Default Alert",
+  "Desktop_Notifications_Disabled": "Desktop Notifications are Disabled. Change your browser preferences if you need Notifications enabled.",
+  "Desktop_Notifications_Duration": "Desktop Notifications Duration",
+  "Desktop_Notifications_Duration_Description": "Seconds to display desktop notification. This may affect OS X Notification Center. Enter 0 to use default browser settings and not affect OS X Notification Center.",
+  "Desktop_Notifications_Enabled": "Desktop Notifications are Enabled",
+  "Desktop_Notifications_Not_Enabled": "Desktop Notifications are Not Enabled",
+  "Unselected_by_default": "Unselected by default",
+  "Unseen_features": "Unseen features",
+  "Details": "Details",
+  "Device_Changes_Not_Available": "Device changes not available in this browser. For guaranteed availability, please use Rocket.Chat's official desktop app.",
+  "Device_Changes_Not_Available_Insecure_Context": "Device changes are only available on secure contexts (e.g. https://)",
+  "Device_Management": "Device management",
+  "Device_Management_Allow_Login_Email_preference": "Allow workspace members to turn off login detection emails",
+  "Device_Management_Allow_Login_Email_preference_Description": "Individual members can set their preference. Useful when frequent login expirations are set causing members to login frequently.",
+  "Device_Management_Client": "Client",
+  "Device_Management_Description": "Configure security and access control policies.",
+  "Device_Management_Device": "Device",
+  "line": "line",
+  "Device_Management_Device_Unknown": "Unknown",
+  "Device_Management_Email_Subject": "[Site_Name] - Login Detected",
+  "Device_Management_Email_Body": "You may use the following placeholders: `<h2 class=\"rc-color\">{Login_Detected}</h2><p><strong>[name] ([username]) {Logged_In_Via}</strong></p><p><strong>{Device_Management_Client}:</strong> [browserInfo]<br><strong>{Device_Management_OS}:</strong> [osInfo]<br><strong>{Device_Management_Device}:</strong> [deviceInfo]<br><strong>{Device_Management_IP}:</strong>[ipInfo]</p><p><small>[userAgent]</small></p><a class=\"btn\" href=\"[Site_URL]\">{Access_Your_Account}</a><p>{Or_Copy_And_Paste_This_URL_Into_A_Tab_Of_Your_Browser}<br><a href=\"[Site_URL]\">[SITE_URL]</a></p><p>{Thank_You_For_Choosing_RocketChat}</p>`",
+  "Device_Management_Enable_Login_Emails": "Enable login detection emails",
+  "Device_Management_Enable_Login_Emails_Description": "Emails are sent to workspace members each time new logins are detected on their accounts.",
+  "Device_Management_IP": "IP",
+  "Device_Management_OS": "OS",
+  "Device_ID": "Device ID",
+  "Device_Info": "Device Info",
+  "Device_Logged_Out": "Device logged out",
+  "Device_Logout_Text": "Device will be logged out from workspace and current session will be ended. User will be able to log in again with the same device.",
+  "Devices": "Devices",
+  "Devices_Set": "Devices Set",
+  "Device_settings": "Device Settings",
+  "Device_settings_not_supported_by_browser": "Device settings (not supported by the browser)",
+  "Dialed_number_doesnt_exist": "Dialed number doesn't exist",
+  "Dialed_number_is_incomplete": "Dialed number is not complete",
+  "Different_Style_For_User_Mentions": "Different style for user mentions",
+  "Livechat_Facebook_API_Key": "OmniChannel API Key",
+  "Direct": "Direct",
+  "Direction": "Direction",
+  "Livechat_Facebook_API_Secret": "OmniChannel API Secret",
+  "DirectMesssage_maxUsers": "Max users in direct messages",
+  "Direct_Message": "Direct message",
+  "Livechat_Facebook_Enabled": "Facebook integration enabled",
+  "Direct_message_creation_description": "Select one or more people to message",
+  "Direct_message_creation_error": "Select at least one person",
+  "Direct_message_creation_description_hint": "More people cannot be added once created",
+  "Direct_message_someone": "Direct message someone",
+  "Direct_message_you_have_joined": "You have joined a new direct message with",
+  "Direct_Messages": "Direct messages",
+  "Direct_message": "Direct message",
+  "Direct_Reply": "Direct Reply",
+  "Direct_Reply_Advice": "You can directly reply to this email. Do not modify previous emails in the thread.",
+  "Direct_Reply_Debug": "Debug Direct Reply",
+  "Direct_Reply_Debug_Description": "[Beware] Enabling Debug mode would display your 'Plain Text Password' in Admin console.",
+  "Direct_Reply_Delete": "Delete Emails",
+  "Direct_Reply_Delete_Description": "[Attention!] If this option is activated, all unread messages are irrevocably deleted, even those that are not direct replies. The configured e-mail mailbox is then always empty and cannot be processed in \"parallel\" by humans.",
+  "Direct_Reply_Enable": "Enable Direct Reply",
+  "Direct_Reply_Enable_Description": "[Attention!] If \"Direct Reply\" is enabled, Rocket.Chat will control the configured email mailbox. All unread e-mails are retrieved, marked as read and processed. \"Direct Reply\" should only be activated if the mailbox used is intended exclusively for access by Rocket.Chat and is not read/processed \"in parallel\" by humans.",
+  "Direct_Reply_Frequency": "Email Check Frequency",
+  "Direct_Reply_Frequency_Description": "(in minutes, default/minimum 2)",
+  "Direct_Reply_Host": "Direct Reply Host",
+  "Direct_Reply_IgnoreTLS": "IgnoreTLS",
+  "Direct_Reply_Password": "Password",
+  "Direct_Reply_Port": "Direct_Reply_Port",
+  "Direct_Reply_Protocol": "Direct Reply Protocol",
+  "Direct_Reply_Separator": "Separator",
+  "Direct_Reply_Separator_Description": "[Alter only if you know exactly what you are doing, refer docs]  \nSeparator between base & tag part of email",
+  "Direct_Reply_Username": "Username",
+  "Direct_Reply_Username_Description": "Please use absolute email, tagging is not allowed, it would be over-written",
+  "Directory": "Directory",
+  "Disable": "Disable",
+  "Disable_Facebook_integration": "Disable Facebook integration",
+  "Disable_Notifications": "Disable Notifications",
+  "Disable_two-factor_authentication": "Disable two-factor authentication via TOTP",
+  "Disable_two-factor_authentication_email": "Disable two-factor authentication via Email",
+  "Disabled": "Disabled",
+  "Disable_voice_calling": "Disable voice calling",
+  "Disallow_reacting": "Disallow Reacting",
+  "Disallow_reacting_Description": "Disallows reacting",
+  "Discard": "Discard",
+  "Disconnect": "Disconnect",
+  "Discover_public_channels_and_teams_in_the_workspace_directory": "Discover public channels and teams in the workspace directory.",
+  "Discussion": "Discussion",
+  "Discussion_info": "Discussion info",
+  "Discussion_Description": "Discussions are an additional way to organize conversations that allows inviting users from outside channels to participate in specific conversations.",
+  "Discussion_description": "Discussions allow separate conversations around a specific topic inside a channel or team where any workspace member can be added.",
+  "Discussion_first_message_disabled_due_to_e2e": "You can start sending End-to-end encrypted messages in this discussion after its creation.",
+  "Discussion_first_message_title": "Message",
+  "Discussion_name": "Discussion name",
+  "Discussion_start": "Start a Discussion",
+  "Discussion_target_channel": "Parent channel or team",
+  "Discussion_target_channel_description": "Select a channel which is related to what you want to ask",
+  "Discussion_target_channel_prefix": "You are creating a discussion in",
+  "Discussion_title": "Create discussion",
+  "Discussions_unavailable_for_federation": "Discussions are unavailable for Federated rooms",
+  "discussion-created": "{{message}}",
+  "Discussions": "Discussions",
+  "Display": "Display",
+  "Display_avatars": "Display Avatars",
+  "Display_Avatars_Sidebar": "Display Avatars in Sidebar",
+  "Display_chat_permissions": "Display chat permissions",
+  "Display_mentions_counter": "Display badge for direct mentions only",
+  "Display_offline_form": "Display Offline Form",
+  "Display_setting_permissions": "Display permissions to change settings",
+  "Display_unread_counter": "Display room as unread when there are unread messages",
+  "Displays_action_text": "Displays action text",
+  "Do_It_Later": "Do it later",
+  "Displayed_next_to_name": "Displayed next to name",
+  "Do_not_display_unread_counter": "Do not display any counter of this channel",
+  "Do_not_provide_this_code_to_anyone": "Do not provide this code to anyone.",
+  "Do_Nothing": "Do Nothing",
+  "Do_nothing": "Do nothing",
+  "Do_you_have_any_notes_for_this_conversation": "Do you have any notes for this conversation?",
+  "Do_you_want_to_accept": "Do you want to accept?",
+  "Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
+  "Documentation": "Documentation",
+  "Document_Domain": "Document Domain",
+  "Domain": "Domain",
+  "Domain_added": "domain Added",
+  "Domain_removed": "Domain Removed",
+  "Domains": "Domains",
+  "Domains_allowed_to_embed_the_livechat_widget": "Comma-separated list of domains allowed to embed the livechat widget. Leave blank to allow all domains.",
+  "Done": "Done",
+  "Dont_ask_me_again": "Don't ask me again!",
+  "Dont_ask_me_again_list": "Don't ask me again list",
+  "Download": "Download",
+  "Download_Destkop_App": "Download Desktop App",
+  "Download_Disabled": "Download disabled",
+  "Download_Info": "Download info",
+  "Download_My_Data": "Download My Data (HTML)",
+  "Download_Pending_Avatars": "Download Pending Avatars",
+  "Download_Pending_Files": "Download Pending Files",
+  "Download_Snippet": "Download",
+  "Downloading_file_from_external_URL": "Downloading file from external URL",
+  "Drop_to_upload_file": "Drop to upload file",
+  "Dry_run": "Dry run",
+  "Dry_run_description": "Will only send one email, to the same address as in From. The email must belong to a valid user.",
+  "Duplicate_archived_channel_name": "An archived Channel with name `#%s` exists",
+  "Markdown_Headers": "Allow Markdown headers in messages",
+  "Markdown_Marked_Breaks": "Enable Marked Breaks",
+  "Duplicate_archived_private_group_name": "An archived Private Group with name '%s' exists",
+  "Duplicate_channel_name": "A Channel with name '%s' exists",
+  "Markdown_Marked_GFM": "Enable Marked GFM",
+  "Duplicate_file_name_found": "Duplicate file name found.",
+  "Markdown_Marked_Pedantic": "Enable Marked Pedantic",
+  "Markdown_Marked_SmartLists": "Enable Marked Smart Lists",
+  "Duplicate_private_group_name": "A Private Group with name '%s' exists",
+  "Markdown_Marked_Smartypants": "Enable Marked Smartypants",
+  "Duplicated_Email_address_will_be_ignored": "Duplicated email address will be ignored.",
+  "Markdown_Marked_Tables": "Enable Marked Tables",
+  "duplicated-account": "Duplicated account",
+  "E2E_Allow_Unencrypted_Messages": "Access unencrypted content in encrypted rooms",
+  "E2E_Allow_Unencrypted_Messages_Description": "Allow access to encrypted rooms to people without room encryption keys. They'll be able to see and send unencrypted messages.",
+  "E2E Encryption": "E2E Encryption",
+  "E2E_Encryption_enabled_for_room": "End-to-end encryption enabled for #{{roomName}}",
+  "E2E_Encryption_disabled_for_room": "End-to-end encryption disabled for #{{roomName}}",
+  "E2EE_not_available_OTR": "This room has OTR enabled, E2E encryption cannot work with OTR.",
+  "Markdown_Parser": "Markdown Parser",
+  "Markdown_SupportSchemesForLink": "Markdown Support Schemes for Link",
+  "E2E Encryption_Description": "Keep conversations private, ensuring only the sender and intended recipients are able to read them.",
+  "Markdown_SupportSchemesForLink_Description": "Comma-separated list of allowed schemes",
+  "E2E_enable": "Enable E2E",
+  "E2E_disable": "Disable E2E",
+  "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- Bots may not be able to see encrypted messages until they implement support for it.",
+  "E2E_Enable_description": "Enable option to create encrypted groups and be able to change groups and direct messages to be encrypted",
+  "E2E_Enabled": "E2E Enabled",
+  "E2E_Enabled_Default_DirectRooms": "Enable encryption for Direct Rooms by default",
+  "E2E_Enabled_Default_PrivateRooms": "Enable encryption for Private Rooms by default",
+  "E2E_Enabled_Mentions": "Mentions",
+  "E2E_Enabled_Mentions_Description": "Notify people, and highlight user, channel, and team mentions in encrypted content.",
+  "E2E_Enable_Encrypt_Files": "Encrypt files",
+  "E2E_Enable_Encrypt_Files_Description": "Encrypt files sent inside encrypted rooms. Check for possible conflicts in [file upload settings.](admin/settings/FileUpload)",
+  "E2E_Encryption_Password_Change": "Change Encryption Password",
+  "E2E_Encryption_Password_Explanation": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.<br/><br/>This is end-to-end encryption so the key to encode/decode your messages will not be saved on the server. For that reason you need to store your password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on.",
+  "E2E_key_reset_email": "E2E Key Reset Notification",
+  "E2E_message_encrypted_placeholder": "This message is end-to-end encrypted. To view it, you must enter your encryption key in your account settings.",
+  "E2E_password_request_text": "To access your encrypted channels and direct messages, enter your encryption password. This is not stored on the server, so you’ll need to use it on every device.",
+  "E2E_password_reveal_text": "Create secure private rooms and direct messages with end-to-end encryption. This password won’t be stored on the server. You can use it on all your devices.",
+  "E2E_password_save_text": "This will only be displayed once, please save it now.",
+  "E2E_Reset_Email_Content": "You've been automatically logged out. When you log in again, a new key will be generated and access will be restored to any encrypted room with at least one member online. If no members are online, access will be restored as soon as a member comes online.",
+  "E2E_Reset_Key_Explanation": "This will remove your current E2EE key and log you out. <BR/>When you log in again, a new key will be generated and access will be restored to any encrypted room with at least one member online.<BR/>If no members are online, access will be restored as soon as a member comes online.",
+  "E2E_Reset_Other_Key_Warning": "Resetting the E2EE key will log out the user. When the user logs in again, a new key will be generated and access will be restored to any encrypted room with at least one member online. If no members are online, access will be restored as soon as a member comes online.",
+  "E2E_unavailable_for_federation": "E2E is unavailable for federated rooms",
+  "ECDH_Enabled": "Enable second layer encryption for data transport",
+  "Edit": "Edit",
+  "Edit_team": "Edit team",
+  "Edit_channel": "Edit channel",
+  "Edit_discussion": "Edit discussion",
+  "Edit_Business_Hour": "Edit Business Hour",
+  "Edit_Canned_Response": "Edit Canned Response",
+  "Edit_Canned_Responses": "Edit Canned Responses",
+  "Edit_Custom_Field": "Edit Custom Field",
+  "Edit_Department": "Edit Department",
+  "Edit_Federated_User_Not_Allowed": "Not possible to edit a federated user",
+  "Message_AllowSnippeting": "Allow Message Snippeting",
+  "Edit_Invite": "Edit Invite",
+  "Edit_previous_message": "`%s` - Edit previous message",
+  "Edit_Priority": "Edit Priority",
+  "Edit_SLA_Policy": "Edit SLA policy",
+  "Edit_Status": "Edit Status",
+  "Edit_Tag": "Edit Tag",
+  "Edit_Trigger": "Edit Trigger",
+  "Edit_Unit": "Edit Unit",
+  "Message_Attachments_GroupAttach": "Group Attachment Buttons",
+  "Message_Attachments_GroupAttachDescription": "This groups the icons under an expandable menu. Takes up less screen space.",
+  "Edit_User": "Edit User",
+  "edit-livechat-room-customfields": "Edit Livechat Room Custom Fields",
+  "edit-livechat-room-customfields_description": "Permission to edit the custom fields of livechat room",
+  "edit-message": "Edit Message",
+  "edit-message_description": "Permission to edit a message within a room",
+  "edit-other-user-active-status": "Edit Other User Active Status",
+  "edit-other-user-active-status_description": "Permission to enable or disable other accounts",
+  "edit-other-user-avatar": "Edit Other User Avatar",
+  "edit-other-user-avatar_description": "Permission to change other user's avatar.",
+  "edit-other-user-e2ee": "Edit Other User E2E Encryption",
+  "edit-other-user-e2ee_description": "Permission to modify other user's E2E Encryption.",
+  "edit-other-user-info": "Edit Other User Information",
+  "edit-other-user-info_description": "Permission to change other user's name, username or email address.",
+  "edit-other-user-password": "Edit Other User Password",
+  "edit-other-user-password_description": "Permission to modify other user's passwords. Requires edit-other-user-info permission.",
+  "edit-other-user-totp": "Edit Other User Two Factor TOTP",
+  "edit-other-user-totp_description": "Permission to edit other user's Two Factor TOTP",
+  "edit-privileged-setting": "Edit Privileged Setting",
+  "edit-privileged-setting_description": "Permission to edit settings",
+  "edit-team": "Edit Team",
+  "edit-team_description": "Permission to edit teams",
+  "edit-team-channel": "Edit Team Channel",
+  "edit-team-channel_description": "Permission to edit a team's channel",
+  "edit-team-member": "Edit Team Member",
+  "edit-team-member_description": "Permission to edit a team's members",
+  "edit-room": "Edit Room",
+  "edit-room_description": "Permission to edit a room's name, topic, type (private or public status) and status (active or archived)",
+  "edit-room-avatar": "Edit Room Avatar",
+  "edit-room-avatar_description": "Permission to edit a room's avatar.",
+  "edit-room-retention-policy": "Edit Room's Retention Policy",
+  "edit-room-retention-policy_description": "Permission to edit a room’s retention policy, to automatically delete messages in it",
+  "edit-omnichannel-contact": "Edit Omnichannel Contact",
+  "Use_Legacy_Message_Template": "Use legacy message template",
+  "multi_line": "multi line",
+  "edit-omnichannel-contact_description": "Permission to edit Omnichannel Contact",
+  "Edit_Contact_Profile": "Edit Contact Profile",
+  "edited": "edited",
+  "Editing_message": "Editing message",
+  "Editing_message_hint": "<strong>esc</strong> to cancel · <strong>enter</strong> to save",
+  "Editing_room": "Editing room",
+  "Editing_user": "Editing user",
+  "Editor": "Editor",
+  "Message_ShowEditedStatus": "Show Edited Status",
+  "Education": "Education",
+  "Message_ShowFormattingTips": "Show Formatting Tips",
+  "Email": "Email",
+  "Email_Description": "Configurations for sending broadcast emails from inside Rocket.Chat.",
+  "Email_address_to_send_offline_messages": "Email Address to Send Offline Messages",
+  "Email_already_exists": "Email already exists",
+  "Email_body": "Email body",
+  "Email_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of email",
+  "Email_Changed_Description": "You may use the following placeholders:  \n - `[email]` for the user's email.  \n- `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively.",
+  "Email_Changed_Email_Subject": "[Site_Name] - Email address has been changed",
+  "Email_changed_section": "Email Address Changed",
+  "Email_Footer_Description": "You may use the following placeholders:  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "Email_from": "From",
+  "Email_Header_Description": "You may use the following placeholders:  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "Email_Inbox": "Email Inbox",
+  "Email_Inboxes": "Email inboxes",
+  "Email_Inbox_has_been_added": "Email Inbox has been added",
+  "Email_Inbox_has_been_removed": "Email Inbox has been removed",
+  "Email_is_required": "Email is required",
+  "Email_Notification_Mode": "Offline Email Notifications",
+  "Email_Notification_Mode_All": "Every Mention/DM",
+  "Email_Notification_Mode_Disabled": "Disabled",
+  "Email_notification_show_message": "Show Message in Email Notification",
+  "Email_Notifications_Change_Disabled": "Your Rocket.Chat administrator has disabled email notifications",
+  "Email_or_username": "Email or username",
+  "Enterprise_capability": "Enterprise capability",
+  "Email_Placeholder": "Please enter your email address...",
+  "Enterprise_capabilities": "Enterprise capabilities",
+  "Email_Placeholder_any": "Please enter email addresses...",
+  "email_plain_text_only": "Send only plain text emails",
+  "Enterprise_Departments_description_upgrade": "Workspaces on Community Edition can create just one department. Upgrade to Enterprise to remove limits and supercharge your workspace.",
+  "Enterprise_Departments_description_free_trial": "Workspaces on Community Edition can create one department. Start a free Enterprise trial to create multiple departments today!",
+  "email_style_description": "Avoid nested selectors",
+  "email_style_label": "Email Style",
+  "Enterprise_Description": "Manually update your Premium license.",
+  "Email_subject": "Email Subject",
+  "Enterprise_License": "Enterprise License",
+  "Enterprise_License_Description": "If your workspace is registered and license is provided by Rocket.Chat cloud you don't need to manually update the license here.",
+  "Email_two-factor_authentication": "Email two-factor authentication",
+  "Email_verified": "Email verified",
+  "Enterprise_Only": "Enterprise only",
+  "Encrypted_field_hint": "Messages are end-to-end encrypted, search will not work and notifications may not show message content",
+  "Encrypted_file_not_allowed": "Encrypted file not allowed",
+  "Email_sent": "Email sent",
+  "Email_verification_isnt_required": "Email verification to login is not required. To require, enable setting in <a href=\"{{url}}\">Accounts</a> > Registration",
+  "Emoji": "Emoji",
+  "Emoji_picker": "Emoji picker",
+  "EmojiCustomFilesystem": "Custom Emoji Filesystem",
+  "EmojiCustomFilesystem_Description": "Specify how emojis are stored.",
+  "Empty_no_agent_selected": "Empty, no agent selected",
+  "Empty_title": "Empty title",
+  "Enable": "Enable",
+  "Enable_Auto_Away": "Enable Auto Away",
+  "Enable_CSP": "Enable Content-Security-Policy",
+  "Enable_CSP_Description": "Do not disable this option unless you have a custom build and are having problems due to inline-scripts",
+  "Extra_CSP_Domains": "Extra CSP Domains",
+  "Extra_CSP_Domains_Description": "Extra domains to add to the Content-Security-Policy",
+  "Enable_Desktop_Notifications": "Enable Desktop Notifications",
+  "Enable_encryption": "Enable encryption",
+  "Enable_inquiry_fetch_by_stream": "Enable inquiry data fetch from server using a stream",
+  "Enable_omnichannel_auto_close_abandoned_rooms": "Enable automatic closing of rooms abandoned by the visitor",
+  "Enable_Password_History": "Enable Password History",
+  "Enable_Password_History_Description": "When enabled, users won't be able to update their passwords to some of their most recently used passwords.",
+  "Enable_Svg_Favicon": "Enable SVG favicon",
+  "Enable_timestamp": "Timestamp in messages",
+  "Enable_timestamp_description": "Render Unix timestamps inside messages in your local (system) timezone.",
+  "Enable_to_bypass_email_verification": "Enable to bypass email verification",
+  "Enable_two-factor_authentication": "Enable two-factor authentication via TOTP",
+  "Enable_two-factor_authentication_email": "Enable two-factor authentication via Email",
+  "Enable_unlimited_apps": "Enable unlimited apps",
+  "Enable_voice_calling": "Enable voice calling",
+  "Enabled": "Enabled",
+  "Encrypted": "Encrypted",
+  "Encrypted_channel_Description": "Messages are end-to-end encrypted, search will not work and notifications may not show message content",
+  "Encrypted_content_cannot_be_searched": "Encrypted content cannot be searched.",
+  "Encrypted_key_title": "Click here to disable end-to-end encryption for this channel (requires e2ee-permission)",
+  "Encrypted_message": "Encrypted message",
+  "Encrypted_RoomType": "Encrypted {{roomType}}",
+  "Encrypted_message_preview_unavailable": "Encrypted message, preview unavailable",
+  "Encrypted_setting_changed_successfully": "Encrypted setting changed successfully",
+  "Encrypted_not_available": "Not available for public {{roomType}}",
+  "Encryption_key_saved_successfully": "Your encryption key was saved successfully.",
+  "EncryptionKey_Change_Disabled": "You can't set a password for your encryption key because your private key is not present on this client. In order to set a new password you need load your private key using your existing password or use a client where the key is already loaded.",
+  "End": "End",
+  "End_suspicious_sessions": "End any suspicious sessions",
+  "End_call": "End call",
+  "End_conversation": "End conversation",
+  "End_To_End_Encryption_Enabled": "End-to-end encryption is enabled",
+  "End_To_End_Encryption_Not_Enabled": "End-to-end encryption is not enabled",
+  "Expand_view": "Expand view",
+  "Explore": "Explore",
+  "Explore_marketplace": "Explore Marketplace",
+  "Explore_the_marketplace_to_find_awesome_apps": "Explore the Marketplace to find awesome apps for Rocket.Chat",
+  "Export": "Export",
+  "End_Call": "End Call",
+  "End_OTR": "End OTR",
+  "Engagement": "Engagement",
+  "Engagement_Dashboard": "Engagement dashboard",
+  "Enrich_your_workspace": "Enrich your workspace perspective with the engagement dashboard. Analyze practical usage statistics about your users, messages and channels. Included in Premium plans.",
+  "Ensure_secure_workspace_access": "Ensure secure workspace access",
+  "ensure_email_address_valid": "Invalid email address",
+  "Enter": "Enter",
+  "Enter_a_custom_message": "Enter a custom message",
+  "Enter_a_department_name": "Enter a department name",
+  "Enter_a_name": "Enter a name",
+  "Enter_a_regex": "Enter a regex",
+  "Enter_a_room_name": "Enter a room name",
+  "Enter_a_tag": "Enter a tag",
+  "Enter_a_username": "Enter a username",
+  "Enter_Alternative": "Alternative mode (send with Enter + Ctrl/Alt/Shift/CMD)",
+  "Enter_authentication_code": "Enter authentication code",
+  "Enter_Behaviour": "Enter key Behaviour",
+  "Enter_Behaviour_Description": "This changes if the enter key will send a message or do a line break",
+  "Enter_code_here": "Enter code here",
+  "Enter_E2E_password": "Enter E2EE password",
+  "Enter_name_here": "Enter name here",
+  "Enter_Normal": "Normal mode (send with Enter)",
+  "Enter_the_code_we_just_emailed_you": "Enter the code we just emailed you.",
+  "Enter_to": "Enter to",
+  "Enter_TOTP_password": "Enter TOTP password",
+  "Enter_your_E2E_password": "Enter your E2E password",
+  "Enter_your_E2E_password_to_access": "Enter your end-to-end encryption password to access",
+  "Enter_your_password_to_delete_your_account": "Enter your password to delete your account. This cannot be undone.",
+  "Enter_your_username_to_delete_your_account": "Enter your username to delete your account. This cannot be undone.",
+  "Premium_capabilities": "Premium capabilities",
+  "Premium_Departments_title": "Assign customers to queues and improve agent productivity",
+  "Premium_Departments_description_upgrade": "Workspaces on Community can create just one department. Upgrade to a Premium plan to remove limits and supercharge your workspace.",
+  "Premium_Departments_description_free_trial": "Workspaces on Community can create one department. Start a free Premium trial to create multiple departments today!",
+  "Premium_License": "Premium License",
+  "Premium_License_alert": "If a license is removed the workspace must be restarted to take effect. <br/>If the workspace is connected to the cloud the license should be canceled there first otherwise cloud will provide the license to the workspace again during the restart.",
+  "Premium_only": "Premium only",
+  "Entertainment": "Entertainment",
+  "Error": "Error",
+  "Error_something_went_wrong": "Oops! Something went wrong. Please reload the page or contact an administrator.",
+  "Error_404": "Error:404",
+  "Error_changing_password": "Error changing password",
+  "Error_loading_pages": "Error loading pages",
+  "Error_login_blocked_for_ip": "Login has been temporarily blocked for this IP",
+  "Error_login_blocked_for_user": "Login has been temporarily blocked for this User",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
+  "Error_sending_livechat_offline_message": "Error sending Omnichannel offline message",
+  "Error_sending_livechat_transcript": "Error sending Omnichannel transcript",
+  "Error_Site_URL": "Invalid Site_Url",
+  "Error_Site_URL_description": "Please, update your \"Site_Url\" setting find more information [here](https://go.rocket.chat/i/invalid-site-url)",
+  "error-action-not-allowed": "{{action}} is not allowed",
+  "error-agent-offline": "Agent is offline",
+  "error-agent-status-service-offline": "Agent status is offline or Omnichannel service is not active",
+  "error-application-not-found": "Application not found",
+  "error-archived-duplicate-name": "There's an archived channel with name '{{room_name}}'",
+  "error-avatar-invalid-url": "Invalid avatar URL: {{url}}",
+  "error-avatar-url-handling": "Error while handling avatar setting from a URL ({{url}}) for {{username}}",
+  "error-business-hours-are-closed": "Business Hours are closed",
+  "error-business-hour-finish-time-before-start-time": "Finish time must be after start time",
+  "error-business-hour-finish-time-equals-start-time": "Start and Finish time cannot be the same",
+  "error-blocked-username": "**{{field}}** is blocked and can't be used!",
+  "error-canned-response-not-found": "Canned Response Not Found",
+  "error-cannot-delete-app-user": "Deleting app user is not allowed, uninstall the corresponding app to remove it.",
+  "error-cant-add-federated-users": "Can't add federated users to a non-federated room",
+  "error-cant-invite-for-direct-room": "Can't invite user to direct rooms",
+  "error-channels-setdefault-is-same": "The channel default setting is the same as what it would be changed to.",
+  "error-channels-setdefault-missing-default-param": "The bodyParam 'default' is required",
+  "error-could-not-change-email": "Could not change email",
+  "error-could-not-change-name": "Could not change name",
+  "error-could-not-change-username": "Could not change username",
+  "error-comment-is-required": "Comment is required",
+  "error-custom-field-name-already-exists": "Custom field name already exists",
+  "error-delete-protected-role": "Cannot delete a protected role",
+  "error-department-not-found": "Department not found",
+  "error-department-removal-disabled": "Department removal is disabled by administration, please contact your administrator",
+  "error-direct-message-max-user-exceeded": "You cannot add more than {{maxUsers}} users, including yourself to a direct message",
+  "error-direct-message-file-upload-not-allowed": "File sharing not allowed in direct messages",
+  "error-duplicate-channel-name": "A channel with name '{{channel_name}}' exists",
+  "error-duplicate-priority-name": "A priority with the same name already exists",
+  "error-edit-permissions-not-allowed": "Editing permissions is not allowed",
+  "error-email-domain-blacklisted": "The email domain is blacklisted",
+  "error-email-body-not-initialized": "Email body not initialized. Setup Email's Header & Footer on Email settings before sending rich emails",
+  "error-email-send-failed": "Error trying to send email: {{message}}",
+  "error-essential-app-disabled": "Error: a Rocket.Chat App that is essential for this is disabled. Please contact your administrator",
+  "error-failed-to-delete-department": "Failed to delete department",
+  "error-field-unavailable": "<strong>{{field}}</strong> is already in use :(",
+  "error-file-too-large": "File is too large",
+  "error-forwarding-chat": "Something went wrong while forwarding the chat, Please try again later.",
+  "error-forwarding-chat-same-department": "The selected department and the current room department are the same",
+  "error-forwarding-department-target-not-allowed": "The forwarding to the target department is not allowed.",
+  "error-guests-cant-have-other-roles": "Guest users can't have any other role.",
+  "error-import-file-extract-error": "Failed to extract import file.",
+  "error-import-file-is-empty": "Imported file seems to be empty.",
+  "error-import-file-missing": "The file to be imported was not found on the specified path.",
+  "error-importer-not-defined": "The importer was not defined correctly, it is missing the Import class.",
+  "error-input-is-not-a-valid-field": "{{input}} is not a valid {{field}}",
+  "error-insufficient-permission": "Error! You don't have ' {{permission}} ' permission which is required to perform this operation",
+  "error-inquiry-taken": "Inquiry already taken",
+  "error-invalid-account": "Invalid Account",
+  "error-invalid-actionlink": "Invalid action link",
+  "error-invalid-arguments": "Invalid arguments",
+  "error-invalid-asset": "Invalid asset",
+  "error-invalid-channel": "Invalid channel.",
+  "error-invalid-channel-start-with-chars": "Invalid channel. Start with @ or #",
+  "error-invalid-custom-field": "Invalid custom field",
+  "error-invalid-custom-field-name": "Invalid custom field name. Use only letters, numbers, hyphens and underscores.",
+  "error-invalid-custom-field-value": "Invalid value for {{field}} field",
+  "error-custom-field-not-allowed": "Custom field {{key}} is not allowed",
+  "error-invalid-date": "Invalid date provided.",
+  "error-invalid-dates": "From date cannot be after To date",
+  "error-invalid-description": "Invalid description",
+  "error-invalid-domain": "Invalid domain",
+  "error-invalid-email": "Invalid email {{email}}",
+  "error-invalid-email-address": "Invalid email address",
+  "error-invalid-email-inbox": "Invalid Email Inbox",
+  "error-email-inbox-not-found": "Email Inbox not found",
+  "error-this-is-an-ee-feature": "This is an enterprise edition feature",
+  "error-invalid-file-height": "Invalid file height",
+  "error-invalid-file-type": "Invalid file type",
+  "error-invalid-file-width": "Invalid file width",
+  "error-invalid-from-address": "You informed an invalid FROM address.",
+  "error-invalid-inquiry": "Invalid inquiry",
+  "error-invalid-image-url": "Invalid image URL",
+  "error-invalid-integration": "Invalid integration",
+  "error-invalid-message": "Invalid message",
+  "error-invalid-method": "Invalid method",
+  "error-invalid-name": "Invalid name",
+  "error-invalid-password": "Invalid password",
+  "error-invalid-param": "Invalid param",
+  "error-invalid-params": "Invalid params",
+  "error-invalid-permission": "Invalid permission",
+  "error-invalid-port-number": "Invalid port number",
+  "error-invalid-priority": "Invalid priority",
+  "error-invalid-redirectUri": "Invalid redirectUri",
+  "error-invalid-role": "Invalid role",
+  "error-invalid-room": "Invalid room",
+  "error-invalid-room-name": "<strong>{{room_name}}</strong> is not a valid room name",
+  "error-invalid-room-type": "<strong>{{type}}</strong> is not a valid room type.",
+  "error-invalid-settings": "Invalid settings provided",
+  "error-invalid-subscription": "Invalid subscription",
+  "error-invalid-token": "Invalid token",
+  "error-invalid-triggerWords": "Invalid triggerWords",
+  "error-invalid-urls": "Invalid URLs",
+  "error-invalid-user": "Invalid user",
+  "error-invalid-username": "Invalid username",
+  "error-invalid-value": "Invalid value",
+  "error-invalid-webhook-response": "The webhook URL responded with a status other than 200",
+  "error-invalid-external-service-response": "The external service response is not valid",
+  "error-license-user-limit-reached": "The maximum number of users has been reached.",
+  "error-logged-user-not-in-room": "You are not in the room `%s`",
+  "error-max-departments-number-reached": "You reached the maximum number of departments allowed by your license. Contact sale@rocket.chat for a new license.",
+  "error-max-guests-number-reached": "You reached the maximum number of guest users allowed by your license. Contact sale@rocket.chat for a new license.",
+  "error-max-number-simultaneous-chats-reached": "The maximum number of simultaneous chats per agent has been reached.",
+  "error-max-rooms-per-guest-reached": "The maximum number of rooms per guest has been reached.",
+  "error-mac-limit-reached": "The maximum number of monthly active contacts for this workspace has been reached.",
+  "error-message-deleting-blocked": "Message deleting is blocked",
+  "error-message-editing-blocked": "Message editing is blocked",
+  "error-message-size-exceeded": "Message size exceeds Message_MaxAllowedSize",
+  "error-missing-unsubscribe-link": "You must provide the [unsubscribe] link.",
+  "error-no-tokens-for-this-user": "There are no tokens for this user",
+  "error-no-agents-online-in-department": "No agents online in the department",
+  "error-no-message-for-unread": "There are no messages to mark unread",
+  "error-not-allowed": "Not allowed",
+  "error-not-authorized": "Not authorized",
+  "error-office-hours-are-closed": "The office hours are closed.",
+  "Estimated_due_time": "Estimated due time",
+  "error-password-in-history": "Entered password has been previously used",
+  "error-password-policy-not-met": "Password does not meet the server's policy",
+  "Estimated_due_time_in_minutes": "Estimated due time (time in minutes)",
+  "error-password-policy-not-met-maxLength": "Password does not meet the server's policy of maximum length (password too long)",
+  "error-password-policy-not-met-minLength": "Password does not meet the server's policy of minimum length (password too short)",
+  "error-password-policy-not-met-oneLowercase": "Password does not meet the server's policy of at least one lowercase character",
+  "error-password-policy-not-met-oneNumber": "Password does not meet the server's policy of at least one numerical character",
+  "error-password-policy-not-met-oneSpecial": "Password does not meet the server's policy of at least one special character",
+  "Please_go_to_the_Administration_page_then_Livechat_Facebook": "Please go to the Administration page then Omnichannel > Facebook",
+  "error-password-policy-not-met-oneUppercase": "Password does not meet the server's policy of at least one uppercase character",
+  "error-password-policy-not-met-repeatingCharacters": "Password not not meet the server's policy of forbidden repeating characters (you have too many of the same characters next to each other)",
+  "error-password-same-as-current": "Entered password same as current password",
+  "error-personal-access-tokens-are-current-disabled": "Personal Access Tokens are currently disabled",
+  "error-pinning-message": "Message could not be pinned",
+  "error-push-disabled": "Push is disabled",
+  "error-remove-last-owner": "This is the last owner. Please set a new owner before removing this one.",
+  "error-returning-inquiry": "Error returning inquiry to the queue",
+  "error-role-in-use": "Cannot delete role because it's in use",
+  "error-role-name-required": "Role name is required",
+  "error-room-does-not-exist": "This room does not exist",
+  "error-role-already-present": "A role with this name already exists",
+  "error-room-already-closed": "Room is already closed",
+  "error-room-is-not-closed": "Room is not closed",
+  "error-room-onHold": "Error! Room is On Hold",
+  "error-room-is-already-on-hold": "Error! Room is already On Hold",
+  "error-room-not-on-hold": "Error! Room is not On Hold",
+  "error-selected-agent-room-agent-are-same": "The selected agent and the room agent are the same",
+  "error-starring-message": "Message could not be stared",
+  "error-tags-must-be-assigned-before-closing-chat": "Tag(s) must be assigned before closing the chat",
+  "error-the-field-is-required": "The field {{field}} is required.",
+  "error-this-is-not-a-livechat-room": "This is not a Omnichannel room",
+  "error-this-is-a-premium-feature": "Only available on premium plans",
+  "error-token-already-exists": "A token with this name already exists",
+  "error-token-does-not-exists": "Token does not exists",
+  "error-too-many-requests": "Error, too many requests. Please slow down. You must wait {{seconds}} seconds before trying again.",
+  "error-transcript-already-requested": "Transcript already requested",
+  "error-unpinning-message": "Message could not be unpinned",
+  "error-user-deactivated": "User is not active",
+  "error-user-has-no-roles": "User has no roles",
+  "error-user-is-not-activated": "User is not activated",
+  "error-user-is-not-agent": "User is not an Omnichannel Agent",
+  "error-user-is-offline": "User is offline",
+  "error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator",
+  "error-user-not-belong-to-department": "User does not belong to this department",
+  "error-user-not-in-room": "User is not in this room",
+  "error-user-registration-disabled": "User registration is disabled",
+  "error-user-registration-secret": "User registration is only allowed via Secret URL",
+  "error-validating-department-chat-closing-tags": "At least one closing tag is required when the department requires tag(s) on closing conversations.",
+  "error-no-permission-team-channel": "You don't have permission to add this channel to the team",
+  "error-no-owner-channel": "Only owners can add this channel to the team",
+  "error-unable-to-update-priority": "Unable to update priority",
+  "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.",
+  "error-saving-sla": "An error ocurred while saving the SLA",
+  "error-duplicated-sla": "An SLA with the same name or due time already exists",
+  "error-cannot-place-chat-on-hold": "You cannot place chat on-hold",
+  "error-contact-sent-last-message-so-cannot-place-on-hold": "You cannot place chat on-hold, when the Contact has sent the last message",
+  "error-unserved-rooms-cannot-be-placed-onhold": "Room cannot be placed on hold before being served",
+  "error-timeout": "The request has timed out",
+  "Workspace_exceeded_MAC_limit_disclaimer": "The workspace has exceeded the monthly limit of active contacts. Talk to your workspace admin to address this issue.",
+  "You_do_not_have_permission_to_do_this": "You do not have permission to do this",
+  "You_do_not_have_permission_to_execute_this_command": "You do not have enough permissions to execute command: `/{{command}}`",
+  "You_have_reached_the_limit_active_costumers_this_month": "You have reached the limit of active customers this month",
+  "Errors_and_Warnings": "Errors and Warnings",
+  "Esc_to": "Esc to",
+  "Estimated_wait_time": "Estimated wait time",
+  "Estimated_wait_time_in_minutes": "Estimated wait time (time in minutes)",
+  "Event_notifications": "Event notifications",
+  "Event_notifications_description": "By disabling this setting you’ll prevent the app from notifying you of upcoming events.",
+  "Event_Trigger": "Event Trigger",
+  "Event_Trigger_Description": "Select which type of event will trigger this Outgoing WebHook Integration",
+  "every_5_minutes": "Once every 5 minutes",
+  "every_10_seconds": "Once every 10 seconds",
+  "every_30_seconds": "Once every 30 seconds",
+  "every_10_minutes": "Once every 10 minutes",
+  "every_30_minutes": "Once every 30 minutes",
+  "every_day": "Once every day",
+  "every_hour": "Once every hour",
+  "every_minute": "Once every minute",
+  "every_second": "Once every second",
+  "every_six_hours": "Once every six hours",
+  "every_12_hours": "Once every 12 hours",
+  "every_24_hours": "Once every 24 hours",
+  "every_48_hours": "Once every 48 hours",
+  "Everyone_can_access_this_channel": "Everyone can access this channel",
+  "Exact": "Exact",
+  "Example_payload": "Example payload",
+  "Example_s": "Example: <code class=\"inline\">%s</code>",
+  "Federation_Matrix_join_public_rooms_is_enterprise": "Join federated rooms is an Enterprise Edition feature",
+  "except_pinned": "(except those that are pinned)",
+  "Exclude_Botnames": "Exclude Bots",
+  "Exclude_Botnames_Description": "Do not propagate messages from bots whose name matches the regular expression above. If left empty, all messages from bots will be propagated.",
+  "Exclude_pinned": "Exclude pinned messages",
+  "Execute_Synchronization_Now": "Execute Synchronization Now",
+  "Exit_Full_Screen": "Exit Full Screen",
+  "Expand": "Expand",
+  "Experimental_Feature_Alert": "This is an experimental feature! Please be aware that it may change, break, or even be removed in the future without any notice.",
+  "Expired": "Expired",
+  "Expiration": "Expiration",
+  "Expiration_(Days)": "Expiration (Days)",
+  "Export_as_file": "Export as file",
+  "Export_Messages": "Export Messages",
+  "Export_My_Data": "Export My Data (JSON)",
+  "expression": "Expression",
+  "Extended": "Extended",
+  "Extension": "Extension",
+  "Extension_removed": "Extension removed",
+  "Extensions": "Extensions",
+  "Extension_Number": "Extension Number",
+  "Extension_Status": "Extension Status",
+  "External": "External",
+  "External_Domains": "External Domains",
+  "External_Queue_Service_URL": "External Queue Service URL",
+  "External_Service": "External Service",
+  "External_service_url": "External service URL",
+  "External_service_action_hint": "Send a custom message using external service. For more details please check our docs.",
+  "External_service_test_hint": "Click on \"Send test\" before saving the trigger.",
+  "External_service_returned_valid_response": "External service returned a valid response",
+  "External_Users": "External Users",
+  "Extremely_likely": "Extremely likely",
+  "Facebook": "Facebook",
+  "Facebook_Page": "Facebook Page",
+  "Failed": "Failed",
+  "Failed_to_activate_invite_token": "Failed to activate invite token",
+  "Failed_to_add_monitor": "Failed to add monitor",
+  "Failed_To_Download_Files": "Failed to download files",
+  "Failed_to_generate_invite_link": "Failed to generate invite link",
+  "Failed_To_Load_Import_Data": "Failed to load import data",
+  "Failed_To_Load_Import_History": "Failed to load import history",
+  "Failed_To_Load_Import_Operation": "Failed to load import operation",
+  "Failed_To_Start_Import": "Failed to start import operation",
+  "Failed_To_upload_Import_File": "Failed to upload import file",
+  "Failed_to_validate_invite_token": "Failed to validate invite token",
+  "Failed_to_copy_phone_number": "Failed to copy phone number",
+  "Failed_to_transfer_call": "Failed to transfer call",
+  "Failure": "Failure",
+  "False": "False",
+  "Fallback_forward_department": "Fallback department for forwarding",
+  "Fallback_forward_department_description": "Allows you to define a fallback department which will receive the chats forwarded to this one in case there's no online agents at the moment",
+  "Fallback_message": "Fallback message",
+  "Favorite": "Favorite",
+  "Favorite_Rooms": "Enable Favorite Rooms",
+  "Favorites": "Favorites",
+  "Feature_preview": "Feature preview",
+  "Feature_preview_page_description": "Enable the latest features that are currently under development.",
+  "Feature_preview_page_callout": "Feature previews are being tested and may not be stable or fully functional. Features may become premium capabilities once officially released.",
+  "Feature_preview_admin_page_description": "Choose what feature previews to make available to workspace members.",
+  "Feature_preview_admin_page_callout": "Features enabled here will be enabled to each user in their feature preview preferences.",
+  "featured": "featured",
+  "Featured": "Featured",
+  "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "This feature depends on the above selected call provider to be enabled from the administration settings (Admin -> Video Conference).",
+  "Feature_Depends_on_Livechat_Visitor_navigation_as_a_message_to_be_enabled": "This feature depends on \"Send Visitor Navigation History as a Message\" to be enabled.",
+  "Feature_Limiting": "Feature Limiting",
+  "Features": "Features",
+  "Federation": "Federation",
+  "Federation_Description": "Federation allows an unlimited number of workspaces to communicate with each other.",
+  "Federation_Enable": "Enable Federation",
+  "Federation_Example_matrix_server": "Example: matrix.org",
+  "Federation_Matrix_enable_ephemeral_events": "Enable Matrix ephemeral events",
+  "Federation_Matrix_enable_ephemeral_events_Alert": "This requires a restart. </br> Enabling ephemeral events like user typing indicator can affect the performance of your Matrix Homeserver and Rocket.Chat server for federated communication",
+  "Federation_Federated_room_search": "Federated room search",
+  "Federation_Public_key": "Public Key",
+  "Federation_Search_federated_rooms": "Search federated rooms",
+  "Federation_slash_commands": "Federation commands",
+  "FEDERATION_Discovery_Method": "Discovery Method",
+  "FEDERATION_Discovery_Method_Description": "You can use the hub or a SRV and a TXT entry on your DNS records.",
+  "FEDERATION_Domain": "Domain",
+  "FEDERATION_Domain_Alert": "Do not change this after enabling the feature, we can't handle domain changes yet.",
+  "FEDERATION_Domain_Description": "Add the domain that this server should be linked to - for example: @rocket.chat.",
+  "FEDERATION_Enabled": "Attempt to integrate federation support.",
+  "FEDERATION_Enabled_Alert": "Federation Support is a work in progress. Use on a production system is not recommended at this time.",
+  "FEDERATION_Public_Key": "Public Key",
+  "FEDERATION_Public_Key_Description": "This is the key you need to share with your peers.",
+  "FEDERATION_Status": "Status",
+  "FEDERATION_Test_Setup": "Test setup",
+  "FEDERATION_Test_Setup_Error": "Could not find your server using your setup, please review your settings.",
+  "FEDERATION_Test_Setup_Success": "Your federation setup is working and other servers can find you!",
+  "Retry_Count": "Retry Count",
+  "Federation_Matrix": "Federation V2",
+  "Federation_Matrix_enabled": "Enabled",
+  "Federation_Matrix_Enabled_Alert": "<a target=\"_blank\" href=\"https://go.rocket.chat/i/matrix-federation\">More Information about Matrix Federation support can be found here</> (After any configuration, a restart is required to the changes take effect)",
+  "Federation_Matrix_Federated": "Federated",
+  "Federation_Matrix_Federated_Description": "By creating a federated room you'll not be able to enable encryption nor broadcast",
+  "Federation_Matrix_Federated_Description_disabled": "Federation is currently disabled on this workspace",
+  "Federation_Matrix_id": "AppService ID",
+  "Federation_Matrix_hs_token": "Homeserver Token",
+  "Federation_Matrix_as_token": "AppService Token",
+  "Federation_Matrix_homeserver_url": "Homeserver URL",
+  "Federation_Matrix_homeserver_url_alert": "We recommend a new, empty homeserver, to use with our federation",
+  "Federation_Matrix_homeserver_domain": "Homeserver Domain",
+  "Federation_Matrix_homeserver_domain_alert": "No user should connect to the homeserver with third party clients, only Rocket.Chat",
+  "Federation_Matrix_bridge_url": "Bridge URL",
+  "Federation_Matrix_bridge_localpart": "AppService User Localpart",
+  "Federation_Matrix_registration_file": "Registration File",
+  "Federation_Matrix_registration_file_Alert": "Important: Enabling ephemeral events will make the server receive all the typing status of all users from all servers you are connected to.</br> To enable it, please update your registration file (.yaml file you are using to registrate Rocket.Chat to your home server), adding the following:</br> de.sorunome.msc2409.push_ephemeral: true",
+  "Federation_Matrix_error_applying_room_roles": "Something went wrong while applying the room roles over the federated network",
+  "Federation_Matrix_giving_same_permission_warning": "You're giving this user the same privileges as yourself, you will not be able to undo this change. Do you want to proceed?",
+  "Federation_Matrix_losing_privileges": "Losing privileges",
+  "Federation_Matrix_losing_privileges_warning": "You won't be able to undo this action, as you're demoting yourself. If you're the last privileged user you won't be able to regain this privilege. Do you want to proceed still?",
+  "Federation_Matrix_not_allowed_to_change_moderator": "You are not allowed to change the moderator",
+  "Federation_Matrix_not_allowed_to_change_owner": "You are not allowed to change the owner",
+  "Federation_Matrix_join_public_rooms_is_premium": "Join federated rooms is a Premium feature",
+  "Federation_Matrix_max_size_of_public_rooms_users": "Maximum number of members when joining a public room in a remote server",
+  "Federation_Matrix_max_size_of_public_rooms_users_desc": "The user limit from a public room in a remote server that can still be joined. Rooms that exceed this setting will still be listed, but users won't be able to join them",
+  "Federation_Matrix_max_size_of_public_rooms_users_Alert": "Keep in mind, that the bigger the room you allow for users to join, the more time it will take to join that room, besides the amount of resource it will use. <a target=\"_blank\" href=\"https://matrix.org/blog/2022/10/18/testing-faster-remote-room-joins\">Read more</a>",
+  "Federation_Matrix_serve_well_known": "Serve Well Known",
+  "Federation_Matrix_serve_well_known_Description": "Serve /.well-known/matrix/server and /.well-known/matrix/client directly from within Rocket.Chat instead of reverse proxy for federation",
+  "Federation_Matrix_serve_well_known_Alert": "Keep this off if using DNS srv records for federation, or use a reverse proxy to return static JSON if federation traffic is heavy. <a target=\"_blank\" href=\"https://matrix-org.github.io/synapse/latest/federate.html\">Read mode</a>.",
+  "Federation_Matrix_check_configuration": "Verify configuration",
+  "Federation_Matrix_configuration_status": "Configuration status",
+  "Field": "Field",
+  "Field_removed": "Field removed",
+  "Field_required": "Field required",
+  "File": "File",
+  "File_Downloads_Started": "File Downloads Started",
+  "File_exceeds_allowed_size_of_bytes": "File size exceeds upload limit of {{size}}.",
+  "File_name_Placeholder": "Search files...",
+  "File_not_allowed_direct_messages": "File sharing not allowed in direct messages.",
+  "File_Path": "File Path",
+  "file_pruned": "file pruned",
+  "File_removed_by_automatic_prune": "File removed by automatic prune",
+  "File_removed_by_prune": "File removed by prune",
+  "File_Type": "File Type",
+  "File_type_is_not_accepted": "File type is not accepted.",
+  "File_uploaded": "File uploaded",
+  "File_Upload_Disabled": "File upload disabled",
+  "File_uploaded_successfully": "File uploaded successfully",
+  "File_URL": "File URL",
+  "FileType": "File Type",
+  "files": "files",
+  "Files": "Files",
+  "Files_only": "Only remove the attached files, keep messages",
+  "FileSize_Bytes": "{{fileSize}} Bytes",
+  "FileSize_KB": "{{fileSize}} KB",
+  "FileSize_MB": "{{fileSize}} MB",
+  "FileUpload": "File Upload",
+  "FileUpload_Description": "Configure file upload and storage.",
+  "FileUpload_Cannot_preview_file": "Cannot preview file",
+  "FileUpload_Disabled": "File uploads are disabled.",
+  "FileUpload_Enable_json_web_token_for_files": "Enable Json Web Tokens protection to file uploads",
+  "FileUpload_Enable_json_web_token_for_files_description": "Appends a JWT to uploaded files urls",
+  "FileUpload_Restrict_to_room_members": "Restrict files to rooms' members",
+  "FileUpload_Restrict_to_room_members_Description": "Restrict the access of files uploaded on rooms to the rooms' members only",
+  "FileUpload_Restrict_to_users_who_can_access_room": "Restrict files to users who can access the room",
+  "FileUpload_Restrict_to_users_who_can_access_room_Description": "Restrict the access of files uploaded on rooms to the users who can access the room. This option is mutually exclusive with the \"Restrict files to rooms' members\" option as this one allows for users that are not part of some rooms but have special permissions that allow them to see it to access the files uploaded, for example, Omnichannel Managers & Monitors",
+  "FileUpload_Enabled": "File Uploads Enabled",
+  "FileUpload_Enabled_Direct": "File Uploads Enabled in Direct Messages ",
+  "FileUpload_Error": "File Upload Error",
+  "FileUpload_File_Empty": "File empty",
+  "FileUpload_FileSystemPath": "System Path",
+  "FileUpload_GoogleStorage_AccessId": "Google Storage Access Id",
+  "FileUpload_GoogleStorage_AccessId_Description": "The Access Id is generally in an email format, for example: \"`example-test@example.iam.gserviceaccount.com`\"",
+  "FileUpload_GoogleStorage_Bucket": "Google Storage Bucket Name",
+  "FileUpload_GoogleStorage_Bucket_Description": "The name of the bucket which the files should be uploaded to.",
+  "FileUpload_GoogleStorage_ProjectId": "Project ID",
+  "FileUpload_GoogleStorage_ProjectId_Description": "The project ID from the Google Developer's Console",
+  "FileUpload_GoogleStorage_Proxy_Avatars": "Proxy Avatars",
+  "FileUpload_GoogleStorage_Proxy_Avatars_Description": "Proxy avatar file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_GoogleStorage_Proxy_Uploads": "Proxy Uploads",
+  "FileUpload_GoogleStorage_Proxy_Uploads_Description": "Proxy upload file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_GoogleStorage_Secret": "Google Storage Secret",
+  "FileUpload_GoogleStorage_Proxy_UserDataFiles": "Proxy User Data Files",
+  "FileUpload_GoogleStorage_Proxy_UserDataFiles_Description": "Proxy user data file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_GoogleStorage_Secret_Description": "Please follow [these instructions](https://github.com/CulturalMe/meteor-slingshot#google-cloud) and paste the result here.",
+  "FileUpload_json_web_token_secret_for_files": "File Upload Json Web Token Secret",
+  "FileUpload_json_web_token_secret_for_files_description": "File Upload Json Web Token Secret (Used to be able to access uploaded files without authentication)",
+  "FileUpload_MaxFileSize": "Maximum File Upload Size (in bytes)",
+  "FileUpload_MaxFileSizeDescription": "Set it to -1 to remove the file size limitation.",
+  "FileUpload_MediaType_NotAccepted__type__": "Media Type Not Accepted: {{type}}",
+  "FileUpload_MediaType_NotAccepted": "Media Types Not Accepted",
+  "FileUpload_MediaTypeBlackList": "Blocked Media Types",
+  "FileUpload_MediaTypeBlackListDescription": "Comma-separated list of media types. This setting has priority over the Accepted Media Types.",
+  "FileUpload_MediaTypeBlackList_Alert": "The default media type for unknown file extensions is \"application/octet-stream\", to work only with known file extensions you can add it to the \"Blocked Media Types\" list.",
+  "FileUpload_MediaTypeWhiteList": "Accepted Media Types",
+  "FileUpload_MediaTypeWhiteListDescription": "Comma-separated list of media types. Leave it blank for accepting all media types.",
+  "FileUpload_ProtectFiles": "Protect Uploaded Files",
+  "FileUpload_ProtectFilesDescription": "Only authenticated users will have access",
+  "FileUpload_ProtectFilesEnabled_JWTNotSet": "Uploaded files are protected, but JWT access is not setup, this is required for Twilio to send media messages. Setup in Settings -> FileUpload",
+  "FileUpload_RotateImages": "Rotate images on upload",
+  "FileUpload_RotateImages_Description": "Enabling this setting may cause image quality loss",
+  "FileUpload_S3_Acl": "Acl",
+  "FileUpload_S3_AWSAccessKeyId": "Access Key",
+  "FileUpload_S3_AWSAccessKeyId_desc": "Leave this empty if running on an ec2 instance with attached instance profile that has the right s3 permissions on the configured bucket.",
+  "FileUpload_S3_AWSSecretAccessKey": "Secret Key",
+  "FileUpload_S3_AWSSecretAccessKey_desc": "Leave this empty if running on an ec2 instance with attached instance profile that has the right s3 permissions on the configured bucket.",
+  "FileUpload_S3_Bucket": "Bucket name",
+  "FileUpload_S3_BucketURL": "Bucket URL",
+  "FileUpload_S3_CDN": "CDN Domain for Downloads",
+  "FileUpload_S3_ForcePathStyle": "Force Path Style",
+  "Google_Meet_Enterprise_only": "Google Meet (Enterprise only)",
+  "FileUpload_S3_Proxy_Avatars": "Proxy Avatars",
+  "FileUpload_S3_Proxy_Avatars_Description": "Proxy avatar file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_S3_Proxy_Uploads": "Proxy Uploads",
+  "FileUpload_S3_Proxy_Uploads_Description": "Proxy upload file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_S3_Proxy_UserDataFiles": "Proxy User Data Files",
+  "FileUpload_S3_Proxy_UserDataFiles_Description": "Proxy user data file transmissions through your server instead of direct access to the asset's URL",
+  "Hold_Call_EE_only": "Hold Call (Enterprise Edition only)",
+  "FileUpload_S3_Region": "Region",
+  "FileUpload_S3_SignatureVersion": "Signature Version",
+  "FileUpload_S3_URLExpiryTimeSpan": "URLs Expiration Timespan",
+  "FileUpload_S3_URLExpiryTimeSpan_Description": "Time after which Amazon S3 generated URLs will no longer be valid (in seconds). If set to less than 5 seconds, this field will be ignored.",
+  "FileUpload_Storage_Type": "Storage Type",
+  "FileUpload_Webdav_Password": "WebDAV Password",
+  "FileUpload_Webdav_Proxy_Avatars": "Proxy Avatars",
+  "FileUpload_Webdav_Proxy_Avatars_Description": "Proxy avatar file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_Webdav_Proxy_Uploads": "Proxy Uploads",
+  "FileUpload_Webdav_Proxy_Uploads_Description": "Proxy upload file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_Webdav_Proxy_UserDataFiles": "Proxy User Data Files",
+  "FileUpload_Webdav_Proxy_UserDataFiles_Description": "Proxy user data file transmissions through your server instead of direct access to the asset's URL",
+  "FileUpload_Webdav_Server_URL": "WebDAV Server Access URL",
+  "FileUpload_Webdav_Upload_Folder_Path": "Upload Folder Path",
+  "FileUpload_Webdav_Upload_Folder_Path_Description": "WebDAV folder path which the files should be uploaded to",
+  "FileUpload_Webdav_Username": "WebDAV Username",
+  "Filter": "Filter",
+  "Filter_by_category": "Filter by Category",
+  "Filter_by_Custom_Fields": "Filter by Custom Fields",
+  "Filter_By_Price": "Filter by price",
+  "Filter_by_role": "Filter by role",
+  "Filter_By_Status": "Filter by status",
+  "Filters": "Filters",
+  "Filters_applied": "Filters applied",
+  "Financial_Services": "Financial Services",
+  "Finish": "Finish",
+  "Finish_Registration": "Finish Registration",
+  "First_Channel_After_Login": "First Channel After Login",
+  "First_response_time": "First Response Time",
+  "Flags": "Flags",
+  "Follow_message": "Follow message",
+  "Follow_social_profiles": "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.",
+  "Following": "Following",
+  "Fonts": "Fonts",
+  "Food_and_Drink": "Food & Drink",
+  "Footer": "Footer",
+  "Footer_Direct_Reply": "Footer When Direct Reply is Enabled",
+  "For_more_details_please_check_our_docs": "For more details please check our docs.",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue",
+  "Force_Disable_OpLog_For_Cache": "Force Disable OpLog for Cache",
+  "Force_Disable_OpLog_For_Cache_Description": "Will not use OpLog to sync cache even when it's available",
+  "Force_Screen_Lock": "Force screen lock",
+  "Force_Screen_Lock_After": "Force screen lock after",
+  "Force_Screen_Lock_After_description": "The time to request password again after the finish of the latest session, in seconds.",
+  "Force_Screen_Lock_description": "When enabled, you'll force your users to use a PIN/BIOMETRY/FACEID to unlock the app.",
+  "Force_SSL": "Force SSL",
+  "Force_SSL_Description": "*Caution!* _Force SSL_ should never be used with reverse proxy. If you have a reverse proxy, you should do the redirect THERE. This option exists for deployments like Heroku, that does not allow the redirect configuration at the reverse proxy.",
+  "Force_visitor_to_accept_data_processing_consent": "Force visitor to accept data processing consent",
+  "Force_visitor_to_accept_data_processing_consent_description": "Visitors are not allowed to start chatting without consent.",
+  "Force_visitor_to_accept_data_processing_consent_enabled_alert": "Agreement with data processing must be based on a transparent understanding of the reason for processing. Because of this, you must fill out the setting below which will be displayed to users in order to provide the reasons for collecting and processing your personal information.",
+  "force-delete-message": "Force Delete Message",
+  "force-delete-message_description": "Permission to delete a message bypassing all restrictions",
+  "Font_size": "Font size",
+  "Forgot_password": "Forgot your password?",
+  "Forgot_Password_Description": "You may use the following placeholders:  \n - `[Forgot_Password_Url]` for the password recovery URL.  \n - `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.  \n - `[email]` for the user's email.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively.",
+  "Forgot_Password_Email": "Click <a href=\"[Forgot_Password_Url]\">here</a> to reset your password.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Password Recovery",
+  "Forgot_password_section": "Forgot password",
+  "Hold_EE_only": "Hold (Enterprise Edition only)",
+  "Format": "Format",
+  "Forward": "Forward",
+  "Forward_chat": "Forward chat",
+  "Forward_message": "Direct_message",
+  "Forward_to_department": "Forward to department",
+  "Forward_to_user": "Forward to user",
+  "Forwarding": "Forwarding",
+  "Free": "Free",
+  "Free_Extension_Numbers": "Free Extension Numbers",
+  "Free_Apps": "Free Apps",
+  "Frequently_Used": "Frequently Used",
+  "Friday": "Friday",
+  "From": "From",
+  "From_Email": "From Email",
+  "From_email_warning": "<b>Warning</b>: The field <b>From</b> is subject to your mail server settings.",
+  "Full_Name": "Full Name",
+  "Full_Screen": "Full Screen",
+  "Gaming": "Gaming",
+  "General": "General",
+  "General_Description": "Configure general workspace settings.",
+  "General_Settings": "General Settings",
+  "Generate_new_key": "Generate a new key",
+  "Generate_New_Link": "Generate New Link",
+  "Generating_key": "Generating key",
+  "Copy_link": "Copy link",
+  "get-password-policy-forbidRepeatingCharacters": "The password should not contain repeating characters",
+  "get-password-policy-forbidRepeatingCharactersCount": "The password should not contain more than {{forbidRepeatingCharactersCount}} repeating characters",
+  "get-password-policy-maxLength": "The password should be maximum {{maxLength}} characters long",
+  "get-password-policy-minLength": "The password should be minimum {{minLength}} characters long",
+  "get-password-policy-mustContainAtLeastOneLowercase": "The password should contain at least one lowercase letter",
+  "get-password-policy-mustContainAtLeastOneNumber": "The password should contain at least one number",
+  "get-password-policy-mustContainAtLeastOneSpecialCharacter": "The password should contain at least one special character",
+  "get-password-policy-mustContainAtLeastOneUppercase": "The password should contain at least one uppercase letter",
+  "get-password-policy-minLength-label": "At least {{limit}} characters",
+  "get-password-policy-maxLength-label": "At most {{limit}} characters",
+  "get-password-policy-forbidRepeatingCharactersCount-label": "Max. {{limit}} repeating characters",
+  "get-password-policy-mustContainAtLeastOneLowercase-label": "At least one lowercase letter",
+  "get-password-policy-mustContainAtLeastOneUppercase-label": "At least one uppercase letter",
+  "get-password-policy-mustContainAtLeastOneNumber-label": "At least one number",
+  "get-password-policy-mustContainAtLeastOneSpecialCharacter-label": "At least one symbol",
+  "get-server-info": "Get Server Info",
+  "get-server-info_description": "Permission to get server info",
+  "github_no_public_email": "You don't have any email as public email in your GitHub account",
+  "github_HEAD": "HEAD",
+  "Give_a_unique_name_for_the_custom_oauth": "Give a unique name for the custom OAuth",
+  "strike": "strike",
+  "Give_the_application_a_name_This_will_be_seen_by_your_users": "Give the application a name. This will be seen by your users.",
+  "Global": "Global",
+  "Global Policy": "Global Policy",
+  "Global_purge_override_warning": "A global retention policy is in place. If you leave \"Override global retention policy\" off, you can only apply a policy that is stricter than the global policy.",
+  "Global_Search": "Global search",
+  "Glossary_of_simplified_terms": "Glossary of simplified terms",
+  "Go_to_your_workspace": "Go to your workspace",
+  "Go_to_accessibility_and_appearance": "Go to accessibility and appearance",
+  "Google_Meet_Premium_only": "Google Meet (Premium only)",
+  "Google_Play": "Google Play",
+  "Hold_Call": "Hold Call",
+  "Hold_Call_Premium_only": "Hold Call (Premium plans only)",
+  "GoogleCloudStorage": "Google Cloud Storage",
+  "GoogleNaturalLanguage_ServiceAccount_Description": "Service account key JSON file. More information can be found [here](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
+  "GoogleTagManager_id": "Google Tag Manager Id",
+  "Got_it": "Got it",
+  "Government": "Government",
+  "Grandfathered_app": "Grandfathered app - counts towards app limit but limit is not applied to this app",
+  "Graphql_CORS": "GraphQL CORS",
+  "Graphql_Enabled": "GraphQL Enabled",
+  "Graphql_Subscription_Port": "GraphQL Subscription Port",
+  "Grid_view": "Grid View",
+  "Snippet_Messages": "Snippet Messages",
+  "Group": "Group",
+  "Group_by": "Group by",
+  "Group_by_Type": "Group by Type",
+  "snippet-message": "Snippet Message",
+  "snippet-message_description": "Permission to create snippet message",
+  "Group_discussions": "Group discussions",
+  "Group_favorites": "Group favorites",
+  "Group_mentions_disabled_x_members": "Group mentions `@all` and `@here` have been disabled for rooms with more than {{total}} members.",
+  "Group_mentions_only": "Group mentions only",
+  "Grouping": "Grouping",
+  "Guest": "Guest",
+  "Hash": "Hash",
+  "Hang_up_and_transfer_call": "Hang up and transfer call",
+  "Header": "Header",
+  "Header_and_Footer": "Header and Footer",
+  "Pharmaceutical": "Pharmaceutical",
+  "Healthcare": "Healthcare",
+  "Helpers": "Helpers",
+  "Here_is_your_authentication_code": "Here is your authentication code:",
+  "Hex_Color_Preview": "Hex Color Preview",
+  "Hi": "Hi",
+  "Hi_username": "Hi [name]",
+  "Hidden": "Hidden",
+  "Hide": "Hide",
+  "Hide_additional_fields": "Hide additional fields",
+  "Hide_counter": "Hide counter",
+  "Hide_flextab": "Hide Contextual Bar by clicking outside of it",
+  "Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
+  "Hide_Livechat_Warning": "Are you sure you want to hide the chat with \"%s\"?",
+  "Hide_On_Workspace": "Hide on workspace",
+  "Hide_Private_Warning": "Are you sure you want to hide the discussion with \"%s\"?",
+  "Hide_roles": "Hide Roles",
+  "Hide_room": "Hide",
+  "Hide_Room_Warning": "Are you sure you want to hide the channel \"%s\"?",
+  "Hide_System_Messages": "Hide system messages",
+  "Hide_Unread_Room_Status": "Hide Unread Room Status",
+  "Hide_usernames": "Hide Usernames",
+  "Hide_video": "Hide video",
+  "High": "High",
+  "Highest": "Highest",
+  "Highlights": "Highlights",
+  "Highlights_How_To": "To be notified when someone mentions a word or phrase, add it here. You can separate words or phrases with commas. Highlight Words are not case sensitive.",
+  "Highlights_List": "Highlight words",
+  "HipChat (tar.gz)": "HipChat (tar.gz)",
+  "History": "History",
+  "Hold_Time": "Hold Time",
+  "Hold": "Hold",
+  "Hold_Premium_only": "Hold (Premium plans only)",
+  "Home": "Home",
+  "Homepage": "Homepage",
+  "Homepage_Custom_Content_Default_Message": "Admins may insert content html to be rendered in this white space.",
+  "Host": "Host",
+  "Hospitality_Businness": "Hospitality Business",
+  "hours": "hours",
+  "Hours": "Hours",
+  "How_and_why_we_collect_usage_data": "How and why usage data is collected",
+  "How_friendly_was_the_chat_agent": "How friendly was the chat agent?",
+  "How_knowledgeable_was_the_chat_agent": "How knowledgeable was the chat agent?",
+  "How_long_to_wait_after_agent_goes_offline": "How Long to Wait After Agent Goes Offline",
+  "How_long_to_wait_to_consider_visitor_abandonment": "How Long to Wait to Consider Visitor Abandonment?",
+  "How_long_to_wait_to_consider_visitor_abandonment_in_seconds": "How Long to Wait to Consider Visitor Abandonment?",
+  "How_responsive_was_the_chat_agent": "How responsive was the chat agent?",
+  "How_satisfied_were_you_with_this_chat": "How satisfied were you with this chat?",
+  "How_to_handle_open_sessions_when_agent_goes_offline": "How to Handle Open Sessions When Agent Goes Offline",
+  "Http_timeout": "HTTP timeout (in milliseconds)",
+  "Http_timeout_value": "5000",
+  "HTML": "HTML",
+  "Icon": "Icon",
+  "I_Saved_My_Password": "I saved my password",
+  "Idle_Time_Limit": "Idle Time Limit",
+  "Idle_Time_Limit_Description": "Period of time until status changes to away. Value needs to be in seconds.",
+  "if_they_are_from": "(if they are from %s)",
+  "If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
+  "If_you_didnt_ask_for_reset_ignore_this_email": "If you didn't ask for your password reset, you can ignore this email.",
+  "If_you_didnt_try_to_login_in_your_account_please_ignore_this_email": "If you didn't try to login in your account please ignore this email.",
+  "Iframe_Integration": "Iframe Integration",
+  "Iframe_Integration_receive_enable": "Enable Receive",
+  "Iframe_Integration_receive_enable_Description": "Allow parent window to send commands to Rocket.Chat.",
+  "Iframe_Integration_receive_origin": "Receive Origins",
+  "Iframe_Integration_receive_origin_Description": "Origins with protocol prefix, separated by commas, which are allowed to receive commands e.g. `https://localhost, http://localhost`, or * to allow receiving from anywhere.",
+  "Iframe_Integration_send_enable": "Enable Send",
+  "Iframe_Integration_send_enable_Description": "Send events to parent window",
+  "Iframe_Integration_send_target_origin": "Send Target Origin",
+  "Iframe_Integration_send_target_origin_Description": "Origin with protocol prefix, which commands are sent to e.g. `https://localhost`, or * to allow sending to anywhere.",
+  "Iframe_Restrict_Access": "Restrict access inside any Iframe",
+  "Iframe_Restrict_Access_Description": "This setting enable/disable restrictions to load the RC inside any iframe",
+  "Iframe_X_Frame_Options": "Options to X-Frame-Options",
+  "Iframe_X_Frame_Options_Description": "Options to X-Frame-Options. [You can see all the options here.](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options#Syntax)",
+  "Ignore": "Ignore",
+  "Ignored": "Ignored",
+  "Ignore_Two_Factor_Authentication": "Ignore Two Factor Authentication",
+  "Images": "Images",
+  "IMAP_intercepter_already_running": "IMAP intercepter already running",
+  "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
+  "Impersonate_next_agent_from_queue": "Impersonate next agent from queue",
+  "Impersonate_user": "Impersonate User",
+  "Impersonate_user_description": "When enabled, integration posts as the user that triggered integration",
+  "Import": "Import",
+  "Import_New_File": "Import New File",
+  "Import_Operation_Failed": "Import operation failed",
+  "Import_requested_successfully": "Import Requested Successfully",
+  "Import_Type": "Import Type",
+  "Importer_Archived": "Archived",
+  "Importer_CSV_Information": "The CSV importer requires a specific format, please read the documentation for how to structure your zip file:",
+  "Importer_done": "Importing complete!",
+  "Importer_ExternalUrl_Description": "You can also use an URL for a publicly accessible file:",
+  "Importer_finishing": "Finishing up the import.",
+  "Importer_From_Description": "Imports {{from}} data into Rocket.Chat.",
+  "Importer_From_Description_CSV": "Imports CSV data into Rocket.Chat. The uploaded file must be a ZIP file.",
+  "Importer_HipChatEnterprise_BetaWarning": "Please be aware that this import is still a work in progress, please report any errors which occur in GitHub:",
+  "Importer_HipChatEnterprise_Information": "The file uploaded must be a decrypted tar.gz, please read the documentation for further information:",
+  "Importer_import_cancelled": "Import cancelled.",
+  "Importer_import_failed": "An error occurred while running the import.",
+  "Importer_importing_channels": "Importing the channels.",
+  "Importer_importing_files": "Importing the files.",
+  "Importer_importing_messages": "Importing the messages.",
+  "Importer_importing_started": "Starting the import.",
+  "Importer_importing_users": "Importing the users.",
+  "Importer_not_in_progress": "The importer is currently not running.",
+  "Importer_not_setup": "The importer is not setup correctly, as it didn't return any data.",
+  "Importer_Prepare_Restart_Import": "Restart Import",
+  "Importer_Prepare_Start_Import": "Start Importing",
+  "Importer_Prepare_Uncheck_Archived_Channels": "Uncheck Archived Channels",
+  "Importer_Prepare_Uncheck_Deleted_Users": "Uncheck Deleted Users",
+  "Importer_progress_error": "Failed to get the progress for the import.",
+  "Importer_setup_error": "An error occurred while setting up the importer.",
+  "Importer_Slack_Users_CSV_Information": "The file uploaded must be Slack's Users export file, which is a CSV file. See here for more information:",
+  "Importer_Source_File": "Source File Selection",
+  "importer_status_done": "Completed successfully",
+  "importer_status_downloading_file": "Downloading file",
+  "importer_status_file_loaded": "File loaded",
+  "importer_status_finishing": "Almost done",
+  "importer_status_import_cancelled": "Cancelled",
+  "importer_status_import_failed": "Error",
+  "importer_status_importing_channels": "Importing channels",
+  "importer_status_importing_files": "Importing files",
+  "importer_status_importing_messages": "Importing messages",
+  "importer_status_importing_started": "Importing data",
+  "importer_status_importing_users": "Importing users",
+  "importer_status_new": "Not started",
+  "importer_status_preparing_channels": "Reading channels file",
+  "importer_status_preparing_messages": "Reading message files",
+  "importer_status_preparing_started": "Reading files",
+  "importer_status_preparing_users": "Reading users file",
+  "importer_status_uploading": "Uploading file",
+  "importer_status_user_selection": "Ready to select what to import",
+  "Importer_Upload_FileSize_Message": "Your server settings allow the upload of files of any size up to {{maxFileSize}}.",
+  "Importer_Upload_Unlimited_FileSize": "Your server settings allow the upload of files of any size.",
+  "Importing_channels": "Importing channels",
+  "Importing_Data": "Importing Data",
+  "Importing_messages": "Importing messages",
+  "Importing_users": "Importing users",
+  "Inactivity_Time": "Inactivity Time",
+  "In_progress": "In progress",
+  "inbound-voip-calls": "Inbound Voip Calls",
+  "inbound-voip-calls_description": "Permission to inbound voip calls",
+  "Inbox_Info": "Inbox Info",
+  "Include_Offline_Agents": "Include offline agents",
+  "Inclusive": "Inclusive",
+  "Incoming": "Incoming",
+  "Incoming_call": "Incoming call",
+  "Incoming_call_transfer": "Incoming call transfer",
+  "Incoming_call_from": "Incoming call from",
+  "Incoming_Livechats": "Queued chats",
+  "Incoming_WebHook": "Incoming WebHook",
+  "Industry": "Industry",
+  "Info": "Info",
+  "Information_to_keep_top_of_mind": "Information to keep top-of-mind",
+  "initials_avatar": "Initials Avatar",
+  "Inline_code": "Inline code",
+  "Install": "Install",
+  "Install_anyway": "Install anyway",
+  "Install_Extension": "Install Extension",
+  "Install_FxOs": "Install Rocket.Chat on your Firefox",
+  "Install_FxOs_done": "Great! You can now use Rocket.Chat via the icon on your homescreen. Have fun with Rocket.Chat!",
+  "Install_FxOs_error": "Sorry, that did not work as intended! The following error appeared:",
+  "Install_FxOs_follow_instructions": "Please confirm the app installation on your device (press \"Install\" when prompted).",
+  "Installing": "Installing",
+  "Install_package": "Install package",
+  "Installation": "Installation",
+  "Installed": "Installed",
+  "Installed_at": "Installed at",
+  "Instance": "Instance",
+  "Instances": "Instances",
+  "Instances_health": "Instances Health",
+  "Instance_Record": "Instance Record",
+  "Instructions": "Instructions",
+  "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instructions to your visitor fill the form to send a message",
+  "Insert_Contact_Name": "Insert the Contact Name",
+  "Insert_Placeholder": "Insert Placeholder",
+  "Install_rocket_chat_on_your_preferred_desktop_platform": "Install Rocket.Chat on your preferred desktop platform.",
+  "Insurance": "Insurance",
+  "Integration_added": "Integration has been added",
+  "Integration_Advanced_Settings": "Advanced Settings",
+  "Integration_Delete_Warning": "Deleting an Integrations cannot be undone.",
+  "Integration_disabled": "Integration disabled",
+  "Integration_History_Cleared": "Integration History Successfully Cleared",
+  "Integration_Incoming_WebHook": "Incoming WebHook Integration",
+  "Integration_New": "New Integration",
+  "integration-scripts-disabled": "Integration Scripts are Disabled",
+  "integration-scripts-isolated-vm-disabled": "The \"Secure Sandbox\" may not be used on new or modified scripts.",
+  "integration-scripts-vm2-disabled": "The \"Compatible Sandbox\" may not be used on new or modified scripts.",
+  "Integration_Outgoing_WebHook": "Outgoing WebHook Integration",
+  "Integration_Outgoing_WebHook_History": "Outgoing WebHook Integration History",
+  "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Data Passed to Integration",
+  "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Data Passed to URL",
+  "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Error Stacktrace",
+  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP Response",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "HTTP Response Error",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Messages Sent from Prepare Step",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Messages Sent from Process Response Step",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Time it Ended or Error'd",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Time Integration Triggered",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Last Trigger Step",
+  "Integration_Outgoing_WebHook_No_History": "This outgoing webhook integration has yet to have any history recorded.",
+  "Integration_Retry_Count": "Retry Count",
+  "Integration_Retry_Count_Description": "How many times should the integration be tried if the call to the url fails?",
+  "Integration_Retry_Delay": "Retry Delay",
+  "Integration_Retry_Delay_Description": "Which delay algorithm should the retrying use?  <code class=\"inline\">10 ^ x</code>  or <code class=\"inline\">2 ^ x</code>  or <code class=\"inline\">x * 2</code> ",
+  "Integration_Retry_Failed_Url_Calls": "Retry Failed Url Calls",
+  "Integration_Retry_Failed_Url_Calls_Description": "Should the integration try a reasonable amount of time if the call out to the url fails?",
+  "Integration_Run_When_Message_Is_Edited": "Run On Edits",
+  "Integration_Run_When_Message_Is_Edited_Description": "Should the integration run when the message is edited? Setting this to false will cause the integration to only run on **new** messages.",
+  "Integration_updated": "Integration has been updated.",
+  "Integration_Word_Trigger_Placement": "Word Placement Anywhere",
+  "Integration_Word_Trigger_Placement_Description": "Should the Word be Triggered when placed anywhere in the sentence other than the beginning?",
+  "Integrations": "Integrations",
+  "Integrations_for_all_channels": "Enter <strong>all_public_channels</strong> to listen on all public channels, <strong>all_private_groups</strong> to listen on all private groups, and <strong>all_direct_messages</strong> to listen to all direct messages.",
+  "Integrations_Outgoing_Type_FileUploaded": "File Uploaded",
+  "Integrations_Outgoing_Type_RoomArchived": "Room Archived",
+  "Integrations_Outgoing_Type_RoomCreated": "Room Created (public and private)",
+  "Integrations_Outgoing_Type_RoomJoined": "User Joined Room",
+  "Integrations_Outgoing_Type_RoomLeft": "User Left Room",
+  "Integrations_Outgoing_Type_SendMessage": "Message Sent",
+  "Integrations_Outgoing_Type_UserCreated": "User Created",
+  "Integrations_table": "Integrations table",
+  "InternalHubot": "Internal Hubot",
+  "InternalHubot_EnableForChannels": "Enable for Public Channels",
+  "InternalHubot_EnableForDirectMessages": "Enable for Direct Messages",
+  "InternalHubot_EnableForPrivateGroups": "Enable for Private Channels",
+  "InternalHubot_PathToLoadCustomScripts": "Folder to Load the Scripts",
+  "InternalHubot_reload": "Reload the scripts",
+  "InternalHubot_ScriptsToLoad": "Scripts to Load",
+  "InternalHubot_ScriptsToLoad_Description": "Please enter a comma separated list of scripts to load from your custom folder",
+  "InternalHubot_Username_Description": "This must be a valid username of a bot registered on your server.",
+  "Invalid Canned Response": "Invalid Canned Response",
+  "Invalid_confirm_pass": "The password confirmation does not match password",
+  "Invalid_Department": "Invalid Department",
+  "Invalid_email": "The email entered is invalid",
+  "Invalid_Export_File": "The file uploaded isn't a valid %s export file.",
+  "Invalid_field": "The field must not be empty",
+  "Invalid_Import_File_Type": "Invalid Import file type.",
+  "Invalid_name": "The name must not be empty",
+  "Invalid_notification_setting_s": "Invalid notification setting: %s",
+  "Invalid_OAuth_client": "Invalid OAuth client",
+  "Invalid_or_expired_invite_token": "Invalid or expired invite token",
+  "Invalid_pass": "The password must not be empty",
+  "Invalid_password": "Invalid password",
+  "Invalid_reason": "The reason to join must not be empty",
+  "Invalid_room_name": "<strong>%s</strong> is not a valid room name",
+  "Invalid_secret_URL_message": "The URL provided is invalid.",
+  "Invalid_setting_s": "Invalid setting: %s",
+  "Invalid_two_factor_code": "Invalid two factor code",
+  "Invalid_username": "The username entered is invalid",
+  "invisible": "invisible",
+  "Invisible": "Invisible",
+  "Invitation": "Invitation",
+  "Invitation_Email_Description": "You may use the following placeholders:  \n - `[email]` for the recipient email.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "Invitation_HTML": "Invitation HTML",
+  "Invitation_HTML_Default": "<h1>You have been invited to <strong>[Site_Name]</strong></h1><p>Go to [Site_URL] and try the best open source chat solution available today!</p>",
+  "Invitation_Subject": "Invitation Subject",
+  "Invitation_Subject_Default": "You have been invited to [Site_Name]",
+  "Invite": "Invite",
+  "Invites": "Invites",
+  "Invite_and_add_members_to_this_workspace_to_start_communicating": "Invite and add members to this workspace to start communicating.",
+  "Invite_Link": "Invite Link",
+  "link": "link",
+  "Invite_link_generated": "Invite link has been generated",
+  "Invite_removed": "Invite removed successfully",
+  "Invite_user_to_join_channel": "Invite one user to join this channel",
+  "Invite_user_to_join_channel_all_from": "Invite all users from [#channel] to join this channel",
+  "Invite_user_to_join_channel_all_to": "Invite all users from this channel to join [#channel]",
+  "Invite_Users": "Invite Members",
+  "IP": "IP",
+  "IP_Address": "IP Address",
+  "IRC_Channel_Join": "Output of the JOIN command.",
+  "IRC_Channel_Leave": "Output of the PART command.",
+  "IRC_Channel_Users": "Output of the NAMES command.",
+  "IRC_Channel_Users_End": "End of output of the NAMES command.",
+  "IRC_Description": "Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between individual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat.",
+  "IRC_Enabled": "Attempt to integrate IRC support. Changing this value requires restarting Rocket.Chat.",
+  "IRC_Enabled_Alert": "IRC Support is a work in progress. Use on a production system is not recommended at this time.",
+  "IRC_Federation": "IRC Federation",
+  "IRC_Federation_Description": "Connect to other IRC servers.",
+  "IRC_Federation_Disabled": "IRC Federation is disabled.",
+  "IRC_Hostname": "The IRC host server to connect to.",
+  "IRC_Login_Fail": "Output upon a failed connection to the IRC server.",
+  "IRC_Login_Success": "Output upon a successful connection to the IRC server.",
+  "IRC_Message_Cache_Size": "The cache limit for outbound message handling.",
+  "IRC_Port": "The port to bind to on the IRC host server.",
+  "IRC_Private_Message": "Output of the PRIVMSG command.",
+  "IRC_Quit": "Output upon quitting an IRC session.",
+  "is_typing": "is typing",
+  "Issue_Links": "Issue tracker links",
+  "IssueLinks_Incompatible": "Warning: do not enable this and the 'Hex Color Preview' at the same time.",
+  "IssueLinks_LinkTemplate": "Template for issue links",
+  "IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.",
+  "It_Will_Hide_All_Other_Content_Blocks_In_The_Homepage": "It will hide all other content blocks in the homepage",
+  "It_Will_Show_All_Other_Content_Blocks_In_The_Homepage": "It will show all other content blocks in the homepage",
+  "It_works": "It works",
+  "It_Security": "It Security",
+  "Italic": "Italic",
+  "italics": "italics",
+  "Items_per_page:": "Items per page:",
+  "Jitsi_included_with_Community": "Jitsi, included with Community",
+  "Job_Title": "Job Title",
+  "Join": "Join",
+  "Join_with_password": "Join with password",
+  "Join_audio_call": "Join audio call",
+  "Join_call": "Join call",
+  "Join_Chat": "Join Chat",
+  "Join_conference": "Join conference",
+  "Join_default_channels": "Join default channels",
+  "Join_discussion": "Join discussion",
+  "Join_the_Community": "Join the Community",
+  "Join_the_given_channel": "Join the given channel",
+  "Join_rooms": "Join rooms",
+  "Join_video_call": "Join video call",
+  "Join_my_room_to_start_the_video_call": "Join my room to start the video call",
+  "join-without-join-code": "Join Without Join Code",
+  "join-without-join-code_description": "Permission to bypass the join code in channels with join code enabled",
+  "Joined": "Joined",
+  "joined": "joined",
+  "Joined_at": "Joined at",
+  "JSON": "JSON",
+  "Jump": "Jump",
+  "Jump_to_first_unread": "Jump to first unread",
+  "Jump_to_message": "Jump to message",
+  "Jump_to_recent_messages": "Jump to recent messages",
+  "Just_invited_people_can_access_this_channel": "Just invited people can access this channel.",
+  "kick-user-from-any-c-room": "Kick User from Any Public Channel",
+  "kick-user-from-any-c-room_description": "Permission to kick a user from any public channel",
+  "kick-user-from-any-p-room": "Kick User from Any Private Channel",
+  "kick-user-from-any-p-room_description": "Permission to kick a user from any private channel",
+  "Katex_Dollar_Syntax": "Allow Dollar Syntax",
+  "Katex_Dollar_Syntax_Description": "Allow using $$katex block$$ and $inline katex$ syntaxes",
+  "Katex_Enabled": "Katex Enabled",
+  "Katex_Enabled_Description": "Allow using [katex](http://khan.github.io/KaTeX/)  for math typesetting in messages",
+  "Katex_Parenthesis_Syntax": "Allow Parenthesis Syntax",
+  "Katex_Parenthesis_Syntax_Description": "Allow using \\[katex block\\] and \\(inline katex\\) syntaxes",
+  "Keep_default_user_settings": "Keep the default settings",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Edit previous message",
+  "Keyboard_Shortcuts_Keys_1": "Command (or Ctrl) + p OR Command (or Ctrl) + k",
+  "Keyboard_Shortcuts_Keys_2": "Up Arrow",
+  "Keyboard_Shortcuts_Keys_3": "Command (or Alt) + Left Arrow",
+  "Keyboard_Shortcuts_Keys_4": "Command (or Alt) + Up Arrow",
+  "Keyboard_Shortcuts_Keys_5": "Command (or Alt) + Right Arrow",
+  "Keyboard_Shortcuts_Keys_6": "Command (or Alt) + Down Arrow",
+  "Keyboard_Shortcuts_Keys_7": "Shift + Enter",
+  "Keyboard_Shortcuts_Keys_8": "Shift (or Ctrl) + ESC",
+  "Keyboard_Shortcuts_Mark_all_as_read": "Mark all messages (in all channels) as read",
+  "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Move to the beginning of the message",
+  "Keyboard_Shortcuts_Move_To_End_Of_Message": "Move to the end of the message",
+  "Keyboard_Shortcuts_New_Line_In_Message": "New line in message compose input",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Open Channel / User search",
+  "Keyboard_Shortcuts_Title": "Keyboard Shortcuts",
+  "Knowledge_Base": "Knowledge Base",
+  "Label": "Label",
+  "Language": "Language",
+  "Language_setting_warning": "<strong>Server language setting does not affect user's client</strong><br/>Each user has their own preference for language, that will be kept if this setting is changed.",
+  "Language_Bulgarian": "Bulgarian",
+  "Language_Chinese": "Chinese",
+  "Language_Czech": "Czech",
+  "Language_Danish": "Danish",
+  "Language_Dutch": "Dutch",
+  "Language_English": "English",
+  "Language_Estonian": "Estonian",
+  "Language_Finnish": "Finnish",
+  "Language_French": "French",
+  "Language_German": "German",
+  "Language_Greek": "Greek",
+  "Language_Hungarian": "Hungarian",
+  "Language_Italian": "Italian",
+  "Language_Japanese": "Japanese",
+  "Language_Latvian": "Latvian",
+  "Language_Lithuanian": "Lithuanian",
+  "Language_Not_set": "No specific",
+  "Language_Polish": "Polish",
+  "Language_Portuguese": "Portuguese",
+  "Language_Romanian": "Romanian",
+  "Language_Russian": "Russian",
+  "Language_Slovak": "Slovak",
+  "Language_Slovenian": "Slovenian",
+  "Language_Spanish": "Spanish",
+  "Language_Swedish": "Swedish",
+  "Language_Version": "English Version",
+  "Last_7_days": "Last 7 Days",
+  "Last_15_days": "Last 15 Days",
+  "Last_30_days": "Last 30 Days",
+  "Last_90_days": "Last 90 Days",
+  "Last_6_months": "Last 6 months",
+  "Last_year": "Last year",
+  "Last_active": "Last active",
+  "Last_Call": "Last Call",
+  "Last_Chat": "Last Chat",
+  "Last_Heartbeat_Time": "Last Heartbeat Time",
+  "Last_login": "Last login",
+  "Last_Message": "Last Message",
+  "Last_Message_At": "Last Message At",
+  "Last_seen": "Last seen",
+  "Last_Status": "Last Status",
+  "Last_token_part": "Last token part",
+  "Last_Updated": "Last Updated",
+  "Launched_successfully": "Launched successfully",
+  "Layout": "Layout",
+  "Layout_Login_Hide_Logo": "Hide Logo",
+  "Layout_Login_Hide_Logo_Description": "Hide the logo on the login page.",
+  "Layout_Login_Hide_Title": "Hide Title",
+  "Layout_Login_Hide_Title_Description": "Hide the title on the login page.",
+  "Layout_Login_Hide_Powered_By": "Hide \"Powered by\"",
+  "Layout_Login_Hide_Powered_By_Description": "Hide the \"Powered by\" on the login page.",
+  "Layout_Login_Template": "Login Template",
+  "Layout_Login_Template_Description": "Customize the look of the login page.",
+  "Layout_Login_Template_Vertical": "Vertical",
+  "Layout_Login_Template_Horizontal": "Horizontal",
+  "Layout_Description": "Customize the look of your workspace.",
+  "Layout_Home_Body": "Content block",
+  "Layout_Home_Page_Content": "Layout / Home page content",
+  "Layout_Home_Page_Content_Title": "Home page content",
+  "Layout_Home_Title": "Home Title",
+  "Layout_Legal_Notice": "Legal Notice",
+  "Layout_Login_Terms": "Login Terms",
+  "Layout_Login_Terms_Content": "By proceeding you are agreeing to our <a href='terms-of-service'>Terms of Service</a>, <a href='privacy-policy'>Privacy Policy</a> and <a href='legal-notice'>Legal Notice</a>.",
+  "Layout_Privacy_Policy": "Privacy Policy",
+  "Layout_Show_Home_Button": "Show home page button on sidebar header",
+  "Layout_Custom_Content_Description": "Here goes your custom content. It may be placed inside a white block or may take the all space available in the homepage, if you’re on a Premium plan.",
+  "Layout_Home_Custom_Block_Visible": "Show custom content to homepage",
+  "Layout_Custom_Body_Only": "Show custom content only",
+  "Layout_Custom_Body_Only_Description": "It will hide all other content blocks in the homepage.",
+  "Layout_Sidenav_Footer": "Side Navigation Footer",
+  "Layout_Sidenav_Footer_Dark": "Side Navigation Footer - Dark Theme",
+  "Layout_Sidenav_Footer_description": "Footer size is 260 x 70px",
+  "Layout_Sidenav_Footer_Dark_description": "Footer size is 260 x 70px",
+  "Layout_Terms_of_Service": "Terms of Service",
+  "LDAP": "LDAP",
+  "LDAP_Description": "Lightweight Directory Access Protocol enables anyone to locate data about your server or company.",
+  "LDAP_Documentation": "LDAP Documentation",
+  "LDAP_Connection": "Connection",
+  "LDAP_Connection_Authentication": "Authentication",
+  "LDAP_Connection_Encryption": "Encryption",
+  "LDAP_Connection_successful": "LDAP Connection Successful",
+  "LDAP_Connection_Timeouts": "Timeouts",
+  "LDAP_UserSearch": "User Search",
+  "LDAP_UserSearch_Filter": "Search Filter",
+  "LDAP_UserSearch_GroupFilter": "Group Filter",
+  "LDAP_DataSync": "Data Sync",
+  "LDAP_DataSync_DataMap": "Mapping",
+  "LDAP_DataSync_Avatar": "Avatar",
+  "LDAP_DataSync_Advanced": "Advanced Sync",
+  "LDAP_DataSync_CustomFields": "Sync Custom Fields",
+  "LDAP_DataSync_Roles": "Sync Roles",
+  "LDAP_DataSync_Channels": "Sync Channels",
+  "LDAP_DataSync_Teams": "Sync Teams",
+  "LDAP_Enterprise": "Premium",
+  "LDAP_DataSync_BackgroundSync": "Background Sync",
+  "LDAP_Server_Type": "Server Type",
+  "LDAP_Server_Type_AD": "Active Directory",
+  "LDAP_Server_Type_Other": "Other",
+  "LDAP_Name_Field": "Name Field",
+  "LDAP_Email_Field": "Email Field",
+  "LDAP_Update_Data_On_Login": "Update User Data on Login",
+  "LDAP_Update_Data_On_OAuth_Login": "Update User Data on Login with OAuth services",
+  "LDAP_Advanced_Sync": "Advanced Sync",
+  "LDAP_Authentication": "Enable",
+  "LDAP_Authentication_Password": "Password",
+  "LDAP_Authentication_UserDN": "User DN",
+  "LDAP_Authentication_UserDN_Description": "The LDAP user that performs user lookups to authenticate other users when they sign in.  \n This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`.",
+  "LDAP_Avatar_Field": "User Avatar Field",
+  "You_have_to_set_an_API_token_first_in_order_to_use_the_integration": "You have to set an API token first in order to use the integration.",
+  "LDAP_Avatar_Field_Description": " Which field will be used as *avatar* for users. Leave empty to use `thumbnailPhoto` first and `jpegPhoto` as fallback.",
+  "LDAP_Background_Sync": "Background Sync",
+  "LDAP_Background_Sync_Avatars": "Avatar Background Sync",
+  "LDAP_Background_Sync_Avatars_Description": "Enable a separate background process to sync user avatars.",
+  "LDAP_Background_Sync_Avatars_Interval": "Avatar Background Sync Interval",
+  "LDAP_Background_Sync_Disable_Missing_Users": "Automatically disable users that are no longer found on LDAP",
+  "LDAP_Background_Sync_Disable_Missing_Users_Description": "This option will deactivate users on Rocket.Chat when their data is not found on LDAP. Any rooms owned by those users will be automatically assigned to new owners, or removed if no other user has access to them.",
+  "LDAP_Background_Sync_Import_New_Users": "Background Sync Import New Users",
+  "LDAP_Background_Sync_Import_New_Users_Description": "Will import all users (based on your filter criteria) that exists in LDAP and does not exists in Rocket.Chat",
+  "LDAP_Background_Sync_Interval": "Background Sync Interval",
+  "LDAP_Background_Sync_Interval_Description": "The interval between synchronizations. Example `every 24 hours` or `on the first day of the week`, more examples at [Cron Text Parser](http://bunkat.github.io/later/parsers.html#text)",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated": "Background Sync Update Existing Users",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated_Description": "Will sync the avatar, fields, username, etc (based on your configuration) of all users already imported from LDAP on every **Sync Interval**",
+  "LDAP_Background_Sync_Merge_Existent_Users": "Background Sync Merge Existing Users",
+  "LDAP_Background_Sync_Merge_Existent_Users_Description": "Will merge all users (based on your filter criteria) that exist in LDAP and also exist in Rocket.Chat. To enable this, activate the 'Merge Existing Users' setting in the Data Sync tab.",
+  "LDAP_BaseDN": "Base DN",
+  "LDAP_BaseDN_Description": "The fully qualified Distinguished Name (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. Example: `ou=Users+ou=Projects,dc=Example,dc=com`. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use search filter to control access.",
+  "LDAP_CA_Cert": "CA Cert",
+  "LDAP_Connect_Timeout": "Connection Timeout (ms)",
+  "LDAP_DataSync_AutoLogout": "Auto Logout Deactivated Users",
+  "LDAP_Default_Domain": "Default Domain",
+  "LDAP_Default_Domain_Description": "If provided the Default Domain will be used to create an unique email for users where email was not imported from LDAP. The email will be mounted as `username@default_domain` or `unique_id@default_domain`.  \n Example: `rocket.chat`",
+  "LDAP_Enable": "Enable",
+  "LDAP_Enable_Description": "Attempt to utilize LDAP for authentication.",
+  "LDAP_Enable_LDAP_Groups_To_RC_Teams": "Enable team mapping from LDAP to Rocket.Chat",
+  "LDAP_Encryption": "Encryption",
+  "LDAP_Encryption_Description": "The encryption method used to secure communications to the LDAP server. Examples include `plain` (no encryption), `SSL/LDAPS` (encrypted from the start), and `StartTLS` (upgrade to encrypted communication once connected).",
+  "LDAP_Find_User_After_Login": "Find user after login",
+  "LDAP_Find_User_After_Login_Description": "Will perform a search of the user's DN after bind to ensure the bind was successful preventing login with empty passwords when allowed by the AD configuration.",
+  "LDAP_Group_Filter_Enable": "Enable LDAP User Group Filter",
+  "LDAP_Group_Filter_Enable_Description": "Restrict access to users in a LDAP group  \n Useful for allowing OpenLDAP servers without a *memberOf* filter to restrict access by groups",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Group ID Attribute",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "E.g. **OpenLDAP:** `cn`",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Group Member Attribute",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "E.g. **OpenLDAP:** `uniqueMember`",
+  "LDAP_Group_Filter_Group_Member_Format": "Group Member Format",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "E.g. **OpenLDAP:** `uid=#{username},ou=users,o=Company,c=com`",
+  "LDAP_Group_Filter_Group_Name": "Group name",
+  "LDAP_Group_Filter_Group_Name_Description": "Group name to which it belong the user",
+  "LDAP_Group_Filter_ObjectClass": "Group ObjectClass",
+  "LDAP_Group_Filter_ObjectClass_Description": "The *objectclass* that identify the groups.  \n  E.g. **OpenLDAP:** `groupOfUniqueNames`",
+  "LDAP_Groups_To_Rocket_Chat_Teams": "Team mapping from LDAP to Rocket.Chat.",
+  "LDAP_Host": "Host",
+  "LDAP_Host_Description": "The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`.",
+  "LDAP_Idle_Timeout": "Idle Timeout (ms)",
+  "LDAP_Idle_Timeout_Description": "How many milliseconds wait after the latest LDAP operation until close the connection. (Each operation will open a new connection)",
+  "LDAP_Import_Users_Description": "It True sync process will be import all LDAP users  \n  *Caution!* Specify search filter to not import excess users.",
+  "LDAP_Internal_Log_Level": "Internal Log Level",
+  "LDAP_Login_Fallback": "Login Fallback",
+  "LDAP_Login_Fallback_Description": "If the login on LDAP is not successful try to login in default/local account system. Helps when the LDAP is down for some reason.",
+  "LDAP_Merge_Existing_Users": "Merge Existing Users",
+  "LDAP_Merge_Existing_Users_Description": "*Caution!* When importing a user from LDAP and an user with same username already exists the LDAP info and password will be set into the existing user.",
+  "LDAP_Port": "Port",
+  "LDAP_Port_Description": "Port to access LDAP. eg: `389` or `636` for LDAPS",
+  "LDAP_Prevent_Username_Changes": "Prevent LDAP users from changing their Rocket.Chat username",
+  "LDAP_Query_To_Get_User_Teams": "LDAP query to get user groups",
+  "LDAP_Reconnect": "Reconnect",
+  "LDAP_Reconnect_Description": "Try to reconnect automatically when connection is interrupted by some reason while executing operations",
+  "LDAP_Reject_Unauthorized": "Reject Unauthorized",
+  "LDAP_Reject_Unauthorized_Description": "Disable this option to allow certificates that can not be verified. Usually Self Signed Certificates will require this option disabled to work",
+  "LDAP_Search_Page_Size": "Search Page Size",
+  "LDAP_Search_Page_Size_Description": "The maximum number of entries each result page will return to be processed",
+  "LDAP_Search_Size_Limit": "Search Size Limit",
+  "LDAP_Search_Size_Limit_Description": "The maximum number of entries to return.  \n **Attention** This number should greater than **Search Page Size**",
+  "LDAP_Sync_Custom_Fields": "Sync Custom Fields",
+  "LDAP_CustomFieldMap": "Custom Fields Mapping",
+  "LDAP_Sync_AutoLogout_Enabled": "Enable Auto Logout",
+  "LDAP_Sync_AutoLogout_Interval": "Auto Logout Interval",
+  "LDAP_Sync_Now": "Sync Now",
+  "LDAP_Sync_Now_Description": "This will start a **Background Sync** operation now, without waiting for the next scheduled Sync.  \nThis action is asynchronous, please see the logs for more information.",
+  "LDAP_Sync_User_Active_State": "Sync User Active State",
+  "LDAP_Sync_User_Active_State_Both": "Enable and Disable Users",
+  "LDAP_Sync_User_Active_State_Description": "Determine if users should be enabled or disabled on Rocket.Chat based on the LDAP status. The 'pwdAccountLockedTime' attribute will be used to determine if the user is disabled.",
+  "LDAP_Sync_User_Active_State_Disable": "Disable Users",
+  "LDAP_Sync_User_Active_State_Enable": "Enable Users",
+  "LDAP_Sync_User_Active_State_Nothing": "Do Nothing",
+  "LDAP_Sync_User_Avatar": "Sync User Avatar",
+  "LDAP_Sync_User_Data_Roles": "Sync LDAP Groups",
+  "LDAP_Sync_User_Data_Channels": "Auto Sync LDAP Groups to Channels",
+  "LDAP_Sync_User_Data_Channels_Admin": "Channel Admin",
+  "LDAP_Sync_User_Data_Channels_Admin_Description": "When channels are auto-created that do not exist during a sync, this user will automatically become the admin for the channel.",
+  "LDAP_Sync_User_Data_Channels_BaseDN": "LDAP Group BaseDN",
+  "LDAP_Sync_User_Data_Channels_Description": "Enable this feature to automatically add users to a channel based on their LDAP group. If you would like to also remove users from a channel, see the option below about auto removing users.",
+  "LDAP_Sync_User_Data_Channels_Enforce_AutoChannels": "Auto Remove Users from Channels",
+  "LDAP_Sync_User_Data_Channels_Enforce_AutoChannels_Description": "**Attention**: Enabling this will remove any users in a channel that do not have the corresponding LDAP group! Only enable this if you know what you're doing.",
+  "LDAP_Sync_User_Data_Channels_Filter": "User Group Filter",
+  "LDAP_Sync_User_Data_Channels_Filter_Description": "The LDAP search filter used to check if a user is in a group.",
+  "LDAP_Sync_User_Data_Channels_GroupMembershipValidationStrategy": "Group membership validation strategy",
+  "LDAP_Sync_User_Data_Channels_GroupMembershipValidationStrategy_Description": "Determine how users' memberships to LDAP groups should be validated.  \n - **Apply filter for each group**: apply the LDAP user group filter for each group (key) defined in the LDAP group channel map. This is slower, but can be useful in case you need to use the `#{groupName}` replacement tag to define membership;  \n - **Apply filter once to get all memberships**: apply the LDAP user group filter once for each user. A given user will be considered a member of all groups returned by the LDAP search. This is a **faster** option that can be applied in case the `#{groupName}` replacement tag is not used by the filter (e.g. when filtering by the `member` field in groups).",
+  "LDAP_Sync_User_Data_ChannelsMap": "LDAP Group Channel Map",
+  "LDAP_Sync_User_Data_ChannelsMap_Default": "// Enable Auto Sync LDAP Groups to Channels above",
+  "LDAP_Sync_User_Data_ChannelsMap_Description": "Map LDAP groups to Rocket.Chat channels.  \n As an example, `{\"employee\":\"general\"}` will add any user in the LDAP group employee, to the general channel.",
+  "LDAP_Sync_User_Data_GroupMembershipValidationStrategy_EachGroup": "Apply filter for each group",
+  "LDAP_Sync_User_Data_GroupMembershipValidationStrategy_Once": "Apply filter once to get all memberships",
+  "LDAP_Sync_User_Data_Roles_AutoRemove": "Auto Remove User Roles",
+  "LDAP_Sync_User_Data_Roles_AutoRemove_Description": "**Attention**: Enabling this will automatically remove users from a role if they are not assigned in LDAP! This will only remove roles automatically that are set under the user data group map below.",
+  "LDAP_Sync_User_Data_Roles_BaseDN": "LDAP Group BaseDN",
+  "LDAP_Sync_User_Data_Roles_BaseDN_Description": "The LDAP BaseDN used to lookup users.",
+  "LDAP_Sync_User_Data_Roles_Filter": "User Group Filter",
+  "LDAP_Sync_User_Data_Roles_Filter_Description": "The LDAP search filter used to check if a user is in a group.",
+  "LDAP_Sync_User_Data_Roles_GroupMembershipValidationStrategy": "Group membership validation strategy",
+  "LDAP_Sync_User_Data_Roles_GroupMembershipValidationStrategy_Description": "Determine how users' memberships to LDAP groups should be validated.  \n - **Apply filter for each group**: apply the LDAP user group filter for each group (key) defined in the LDAP group channel map. This is slower, but can be useful in case you need to use the `#{groupName}` replacement tag to define membership;  \n - **Apply filter once to get all memberships**: apply the LDAP user group filter once for each user. A given user will be considered a member of all groups returned by the LDAP search. This is a **faster** option that can be applied in case the `#{groupName}` replacement tag is not used by the filter (e.g. when filtering by the `member` field in groups).",
+  "LDAP_Sync_User_Data_RolesMap": "User Data Group Map",
+  "LDAP_Sync_User_Data_RolesMap_Description": "Map LDAP groups to Rocket.Chat user roles  \n As an example, `{\"rocket-admin\":\"admin\", \"tech-support\":\"support\", \"manager\":[\"leader\", \"moderator\"]}` will map the rocket-admin LDAP group to Rocket's \"admin\" role.",
+  "LDAP_Teams_BaseDN": "LDAP Teams BaseDN",
+  "LDAP_Teams_BaseDN_Description": "The LDAP BaseDN used to lookup user teams.",
+  "LDAP_Teams_Name_Field": "LDAP Team Name Attribute",
+  "LDAP_Teams_Name_Field_Description": "The LDAP attribute that Rocket.Chat should use to load the team's name. You can specify more than one possible attribute name if you separate them with a comma.",
+  "LDAP_Timeout": "Timeout (ms)",
+  "LDAP_Timeout_Description": "How many mileseconds wait for a search result before return an error",
+  "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
+  "LDAP_Unique_Identifier_Field_Description": "Which field will be used to link the LDAP user and the Rocket.Chat user. You can inform multiple values separated by comma to try to get the value from LDAP record.  \n Default value is `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
+  "LDAP_User_Found": "LDAP User Found",
+  "LDAP_User_Search_AttributesToQuery": "Attributes to Query",
+  "LDAP_User_Search_AttributesToQuery_Description": "Specify which attributes should be returned on LDAP queries, separating them with commas. Defaults to everything. `*` represents all regular attributes and `+` represents all operational attributes. Make sure to include every attribute that is used by every Rocket.Chat sync option.",
+  "LDAP_User_Search_Field": "Search Field",
+  "LDAP_User_Search_Field_Description": "The LDAP attribute that identifies the LDAP user who attempts authentication. This field should be `sAMAccountName` for most Active Directory installations, but it may be `uid` for other LDAP solutions, such as OpenLDAP. You can use `mail` to identify users by email or whatever attribute you want.  \n You can use multiple values separated by comma to allow users to login using multiple identifiers like username or email.",
+  "LDAP_User_Search_Filter": "Filter",
+  "LDAP_User_Search_Filter_Description": "If specified, only users that match this filter will be allowed to log in. If no filter is specified, all users within the scope of the specified domain base will be able to sign in.  \n E.g. for Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.  \n E.g. for OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_User_Search_Scope": "Scope",
+  "LDAP_Username_Field": "Username Field",
+  "LDAP_Username_Field_Description": "Which field will be used as *username* for new users. Leave empty to use the username informed on login page.  \n You can use template tags too, like `#{givenName}.#{sn}`.  \n Default value is `sAMAccountName`.",
+  "LDAP_Username_To_Search": "Username to search",
+  "LDAP_Validate_Teams_For_Each_Login": "Validate mapping for each login",
+  "LDAP_Validate_Teams_For_Each_Login_Description": "Determine if users' teams should be updated every time they login to Rocket.Chat. If this is turned off the team will be loaded only on their first login.",
+  "Lead_capture_email_regex": "Lead capture email regex",
+  "Lead_capture_phone_regex": "Lead capture phone regex",
+  "Learn_more": "Learn more",
+  "Learn_more_about_agents": "Learn more about agents",
+  "Learn_more_about_accessibility": "Learn more about our commitment with accessibility here:",
+  "Learn_more_about_business_hours": "Learn more about business hours",
+  "Learn_more_about_canned_responses": "Learn more about canned responses",
+  "Learn_more_about_contacts": "Learn more about contacts",
+  "Learn_more_about_current_chats": "Learn more about current chats",
+  "Learn_more_about_custom_fields": "Learn more about custom fields",
+  "Learn_more_about_conversations": "Learn more about conversations",
+  "Learn_more_about_departments": "Learn more about departments",
+  "Learn_more_about_E2EE": "Learn more about E2EE",
+  "Learn_more_about_managers": "Learn more about managers",
+  "Learn_more_about_monitors": "Learn more about monitors",
+  "Learn_more_about_SLA_policies": "Learn more about SLA policies",
+  "Learn_more_about_tags": "Learn more about tags",
+  "Learn_more_about_triggers": "Learn more about triggers",
+  "Learn_more_about_units": "Learn more about units",
+  "Learn_more_about_voice_channel": "Learn more about voice channel",
+  "Least_recent_updated": "Least recent updated",
+  "Learn_how_to_unlock_the_myriad_possibilities_of_rocket_chat": "Learn how to unlock the myriad possibilities of Rocket.Chat.",
+  "Leave": "Leave",
+  "Leave_a_comment": "Leave a comment",
+  "Leave_Group_Warning": "Are you sure you want to leave the group \"%s\"?",
+  "Leave_Livechat_Warning": "Are you sure you want to leave the omnichannel with \"%s\"?",
+  "Leave_Private_Warning": "Are you sure you want to leave the discussion with \"%s\"?",
+  "Leave_room": "Leave",
+  "Leave_Room_Warning": "Are you sure you want to leave the channel \"%s\"?",
+  "Leave_the_current_channel": "Leave the current channel",
+  "Leave_the_description_field_blank_if_you_dont_want_to_show_the_role": "Leave the description field blank if you don't want to show the role",
+  "leave-c": "Leave Channels",
+  "leave-c_description": "Permission to leave channels",
+  "leave-p": "Leave Private Groups",
+  "leave-p_description": "Permission to leave private groups",
+  "Lets_get_you_new_one_": "Let's get you a new one!",
+  "Let_moderators_know_what_the_issue_is": "Let moderators know what the issue is",
+  "Let_them_know": "Let them know",
+  "Left": "Left",
+  "License": "License",
+  "Line": "Line",
+  "Link": "Link",
+  "Link_Preview": "Link Preview",
+  "List_of_Channels": "List of Channels",
+  "List_of_departments_for_forward": "List of departments allowed for forwarding (Optional)",
+  "List_of_departments_for_forward_description": "Allow to set a restricted list of departments that can receive chats from this department",
+  "List_of_departments_to_apply_this_business_hour": "List of departments to apply this business hour",
+  "List_of_Direct_Messages": "List of Direct Messages",
+  "List_view": "List View",
+  "Livechat": "Livechat",
+  "Livechat_AdditionalWidgetScripts": "Livechat Widget Additional Scripts",
+  "Livechat_AdditionalWidgetScripts_Description": "Use this setting to add additional JS scripts to the widget bundle. You can add a list of scripts by separating them by commas, for example: `https://yourUrl/customScript1.js,https://yourUrl/customScript2.js`",
+  "Livechat_WidgetLayoutClasses": "Livechat Widget Additional CSS",
+  "Livechat_WidgetLayoutClasses_Description": "Use this setting to add additional CSS to the widget bundle. You can add a list of CSS files by separating them by commas, for example: `https://yourUrl/customFile1.css,https://yourUrl/customFile2.css`",
+  "Livechat_abandoned_rooms_action": "How to handle Visitor Abandonment",
+  "Livechat_abandoned_rooms_closed_custom_message": "Custom message when room is automatically closed by visitor inactivity",
+  "Livechat_agents": "Omnichannel agents",
+  "Livechat_Agents": "Agents",
+  "Livechat_allow_manual_on_hold": "Allow agents to manually place chat On Hold",
+  "Livechat_allow_manual_on_hold_Description": "If enabled, the agent will get the option to place a chat On Hold",
+  "Livechat_allow_manual_on_hold_upon_agent_engagement_only": "Chats on hold only after agent engagement",
+  "Livechat_allow_manual_on_hold_upon_agent_engagement_only_Description": "Only allow chats to be put on hold if the agent is the one who sent the last message in the conversation.",
+  "Livechat_AllowedDomainsList": "Livechat Allowed Domains",
+  "Livechat_Appearance": "Livechat Appearance",
+  "Livechat_auto_close_on_hold_chats_custom_message": "Custom message for closed chats in On Hold queue",
+  "Livechat_auto_close_on_hold_chats_custom_message_Description": "Custom Message to be sent when a room in On-Hold queue gets automatically closed by the system",
+  "Livechat_auto_close_on_hold_chats_timeout": "How long to wait before closing a chat in On Hold Queue ?",
+  "Livechat_auto_close_on_hold_chats_timeout_Description": "Define how long the chat will remain in the On Hold queue until it's automatically closed by the system. Time in seconds",
+  "Livechat_auto_transfer_chat_timeout": "Timeout (in seconds) for automatic transfer of unanswered chats to another agent",
+  "Livechat_auto_transfer_chat_timeout_Description": "This event takes place only when the chat has just started. After the first transfering for inactivity, the room is no longer monitored.",
+  "Livechat_business_hour_type": "Business Hour Type (Single or Multiple)",
+  "Livechat_chat_transcript_sent": "Chat transcript sent: {{transcript}}",
+  "Livechat_close_chat": "Close chat",
+  "Livechat_custom_fields_options_placeholder": "Comma-separated list used to select a pre-configured value. Spaces between elements are not accepted.",
+  "Livechat_custom_fields_public_description": "Public custom fields will be displayed in external applications, such as Livechat, etc.",
+  "Livechat_Dashboard": "Omnichannel Dashboard",
+  "Livechat_DepartmentOfflineMessageToChannel": "Send this department's Livechat offline messages to a channel",
+  "Livechat_enable_message_character_limit": "Enable message character limit",
+  "Livechat_enabled": "Omnichannel enabled",
+  "Livechat_forward_open_chats": "Forward open chats",
+  "Livechat_forward_open_chats_timeout": "Timeout (in seconds) to forward chats",
+  "Livechat_guest_count": "Guest Counter",
+  "Livechat_Inquiry_Already_Taken": "Omnichannel inquiry already taken",
+  "Livechat_Installation": "Livechat Installation",
+  "Livechat_last_chatted_agent_routing": "Last-Chatted Agent Preferred",
+  "Livechat_last_chatted_agent_routing_Description": "The Last-Chatted Agent setting allocates chats to the agent who previously interacted with the same visitor if the agent is available when the chat starts.",
+  "Livechat_managers": "Omnichannel managers",
+  "Livechat_Managers": "Managers",
+  "Livechat_max_queue_wait_time_action": "How to handle queued chats when the maximum wait time is reached",
+  "Livechat_maximum_queue_wait_time": "Maximum waiting time in queue",
+  "Livechat_maximum_queue_wait_time_description": "Maximum time (in minutes) to keep chats on queue. -1 means unlimited",
+  "Livechat_message_character_limit": "Livechat message character limit",
+  "Livechat_monitors": "Livechat monitors",
+  "Livechat_Monitors": "Monitors",
+  "Livechat_offline": "Omnichannel offline",
+  "Livechat_offline_message_sent": "Livechat offline message sent",
+  "Livechat_OfflineMessageToChannel_enabled": "Send Livechat offline messages to a channel",
+  "Livechat_hide_system_messages": "Hide system messages",
+  "Livechat_widget_position_on_the_screen": "Livechat widget position on the screen",
+  "Livechat_background": "Livechat background",
+  "Livechat_background_description": "Define a background using hexadecimal (#F5455C), a color name (red) or an image using a URL (`url('https://example.com/image.png')`). This field follows CSS standards. [See documentation](https://developer.mozilla.org/en-US/docs/Web/CSS/background).",
+  "Omnichannel_chat_closed_due_to_inactivity": "The chat was automatically closed because we haven't received any reply from {{guest}} in {{timeout}} seconds",
+  "Omnichannel_actions": "Omnichannel actions",
+  "Omnichannel_on_hold_chat_resumed": "On Hold Chat Resumed: {{comment}}",
+  "Omnichannel_on_hold_chat_automatically": "The chat was automatically resumed from On Hold upon receiving a new message from {{guest}}",
+  "Omnichannel_on_hold_chat_resumed_manually": "The chat was manually resumed from On Hold by {{user}}",
+  "Omnichannel_On_Hold_due_to_inactivity": "The chat was automatically placed On Hold because we haven't received any reply from {{guest}} in {{timeout}} seconds",
+  "Omnichannel_On_Hold_manually": "The chat was manually placed On Hold by {{user}}",
+  "Omnichannel_onHold_Chat": "Place chat On-Hold",
+  "Omnichannel_quick_actions": "Omnichannel Quick Actions",
+  "Omnichannel_sorting_disclaimer": "Omnichannel conversations are sorted by {{sortingMechanism}}, edit a room to apply.",
+  "Livechat_online": "Omnichannel on-line",
+  "Omnichannel_placed_chat_on_hold": "Chat On Hold: {{comment}}",
+  "Omnichannel_hide_conversation_after_closing": "Hide conversation after closing",
+  "Omnichannel_hide_conversation_after_closing_description": "After closing the conversation you will be redirected to Home.",
+  "Livechat_Queue": "Omnichannel Queue",
+  "Livechat_registration_form": "Registration Form",
+  "Livechat_registration_form_message": "Registration Form Message",
+  "Livechat_room_count": "Omnichannel Room Count",
+  "Livechat_Routing_Method": "Omnichannel Routing Method",
+  "Livechat_status": "Livechat Status",
+  "Livechat_Take_Confirm": "Do you want to take this client?",
+  "Livechat_title": "Livechat Title",
+  "Livechat_title_color": "Livechat Title Background Color",
+  "Livechat_transcript_already_requested_warning": "The transcript of this chat has already been requested and will be sent as soon as the conversation ends.",
+  "Livechat_transcript_has_been_requested": "Export requested. It may take a few seconds.",
+  "Livechat_transcript_show_system_messages": "Include system messages in transcripts",
+  "Livechat_email_transcript_has_been_requested": "The transcript has been requested. It may take a few seconds.",
+  "Livechat_transcript_request_has_been_canceled": "The chat transcription request has been canceled.",
+  "Livechat_transcript_sent": "Omnichannel transcript sent",
+  "Livechat_transcript_send_always": "Always send conversation transcript to visitors via email",
+  "Livechat_transcript_send_always_Description": "Once finished, send conversation transcript via email to visitors automatically, regardless of agent's preferences.",
+  "Livechat_transcript_email_subject": "Custom email subject for transcript",
+  "Livechat_transcript_email_subject_Description": "Allows to customize the email subject for transcripts sent via email. It can be overriden by passing a `subject` property when closing a room. Leave it empty to use default subject.",
+  "Livechat_transfer_return_to_the_queue": "{{from}} returned the chat to the queue",
+  "Livechat_transfer_return_to_the_queue_with_a_comment": "{{from}} returned the chat to the queue with a comment: {{comment}}",
+  "Livechat_transfer_return_to_the_queue_auto_transfer_unanswered_chat": "{{from}} returned the chat to the queue since it was unanswered for {{duration}} seconds",
+  "Livechat_transfer_to_agent": "{{from}} transferred the chat to {{to}}",
+  "Livechat_transfer_to_agent_with_a_comment": "{{from}} transferred the chat to {{to}} with a comment: {{comment}}",
+  "Livechat_transfer_to_agent_auto_transfer_unanswered_chat": "{{from}} transferred the chat to {{to}} since it was unanswered for {{duration}} seconds",
+  "Livechat_transfer_to_department": "{{from}} transferred the chat to the department {{to}}",
+  "Livechat_transfer_to_department_with_a_comment": "{{from}} transferred the chat to the department {{to}}  with a comment: {{comment}}",
+  "Livechat_transfer_failed_fallback": "The original department ( {{from}} ) doesn't have online agents. Chat succesfully transferred to {{to}}",
+  "Livechat_Triggers": "Livechat Triggers",
+  "Livechat_user_sent_chat_transcript_to_visitor": "{{agent}} sent the chat transcript to {{guest}}",
+  "Livechat_Users": "Omnichannel Users",
+  "Livechat_Calls": "Livechat Calls",
+  "Livechat_visitor_email_and_transcript_email_do_not_match": "Visitor's email and transcript's email do not match",
+  "Livechat_visitor_transcript_request": "{{guest}} requested the chat transcript",
+  "Assets_livechat_widget_logo": "Livechat widget logo (svg, png, jpg)",
+  "Livechat_hide_watermark": "Hide \"powered by Rocket.Chat\"",
+  "Livechat_hide_watermark_description": "Remove the Rocket.Chat logo from the widget",
+  "LiveStream & Broadcasting": "LiveStream & Broadcasting",
+  "LiveStream & Broadcasting_Description": "This integration between Rocket.Chat and YouTube Live allows channel owners to broadcast their camera feed live to livestream inside a channel.",
+  "Livestream": "Livestream",
+  "Livestream_close": "Close Livestream",
+  "Livestream_enable_audio_only": "Enable only audio mode",
+  "Livestream_enabled": "Livestream Enabled",
+  "Livestream_not_found": "Livestream not available",
+  "Livestream_unavailable_for_federation": "Livestram is unavailable for Federated rooms",
+  "Livestream_popout": "Open Livestream",
+  "Livestream_source_changed_succesfully": "Livestream source changed successfully",
+  "Livestream_switch_to_room": "Switch to current room's livestream",
+  "Livestream_url": "Livestream source url",
+  "Livestream_url_incorrect": "Livestream url is incorrect",
+  "Livestream_live_now": "Live now!",
+  "Load_Balancing": "Load Balancing",
+  "Load_more": "Load more",
+  "Load_Rotation": "Load Rotation",
+  "Loading": "Loading",
+  "Loading_more_from_history": "Loading more from history",
+  "marketplace_featured_section_community_featured": "Featured Community Apps",
+  "Loading_suggestion": "Loading suggestions",
+  "marketplace_featured_section_community_supported": "Community Supported Apps",
+  "Loading...": "Loading...",
+  "marketplace_featured_section_enterprise": "Featured Enterprise Apps",
+  "Local": "Local",
+  "marketplace_featured_section_featured": "Featured Apps",
+  "marketplace_featured_section_most_popular": "Most Popular Apps",
+  "Local_Domains": "Local Domains",
+  "marketplace_featured_section_new_arrivals": "New Arrivals",
+  "Local_Password": "Local Password",
+  "marketplace_featured_section_popular_this_month": "Apps Popular this Month",
+  "Local_Time": "Local Time",
+  "marketplace_featured_section_recommended": "Recommended Apps",
+  "Local_Timezone": "Local Timezone",
+  "marketplace_featured_section_social": "Social Apps",
+  "Local_Time_time": "Local Time: {{time}}",
+  "marketplace_featured_section_trending": "Trending Apps",
+  "Localization": "Localization",
+  "Location": "Location",
+  "marketplace_featured_section_omnichannel": "Omnichannel Apps",
+  "marketplace_featured_section_video_conferencing": "Video Conferencing Apps",
+  "Log_Exceptions_to_Channel": "Log Exceptions to Channel",
+  "Log_Exceptions_to_Channel_Description": "A channel that will receive all captured exceptions. Leave empty to ignore exceptions.",
+  "Log_File": "Show File and Line",
+  "Log_Level": "Log Level",
+  "Log_Package": "Show Package",
+  "Log_Trace_Methods": "Trace method calls",
+  "Log_Trace_Methods_Filter": "Trace method filter",
+  "Log_Trace_Methods_Filter_Description": "The text here will be evaluated as RegExp (`new RegExp('text')`). Keep it empty to show trace of every call.",
+  "Log_Trace_Subscriptions": "Trace subscription calls",
+  "Log_Trace_Subscriptions_Filter": "Trace subscription filter",
+  "Log_Trace_Subscriptions_Filter_Description": "The text here will be evaluated as RegExp (`new RegExp('text')`). Keep it empty to show trace of every call.",
+  "Log_View_Limit": "Log View Limit",
+  "Logged_Out_Banner_Text": "Your session was ended on this device, please log in again to continue.",
+  "Logged_out_of_other_clients_successfully": "Logged out of other clients successfully",
+  "Login": "Login",
+  "Log_in_to_sync": "Log in to sync",
+  "Login_Attempts": "Failed Login Attempts",
+  "Login_Detected": "Login detected",
+  "Logged_In_Via": "Logged in via",
+  "Login_Logs": "Login Logs",
+  "Login_Logs_ClientIp": "Show Client IP on failed login attempts logs",
+  "Login_Logs_Enabled": "Log (on console) failed login attempts",
+  "Login_Logs_ForwardedForIp": "Show Forwarded IP on failed login attempts logs",
+  "Login_Logs_UserAgent": "Show UserAgent on failed login attempts logs",
+  "Login_Logs_Username": "Show Username on failed login attempts logs",
+  "Login_with": "Login with %s",
+  "Logistics": "Logistics",
+  "Logout": "Logout",
+  "Logout_Others": "Logout From Other Logged In Locations",
+  "Logout_Device": "Log out device",
+  "Log_out_devices_remotely": "Log out devices remotely",
+  "logout-device-management": "Logout Device Management",
+  "logout-device-management_description": "Permission to logout other users from device management dashboard",
+  "logout-other-user": "Logout Other User",
+  "logout-other-user_description": "Permission to logout other users",
+  "Logs": "Logs",
+  "Logs_Description": "Configure how server logs are received.",
+  "Long_press_to_do_x": "Long press to do {{action}}",
+  "Longest_chat_duration": "Longest Chat Duration",
+  "Longest_reaction_time": "Longest Reaction Time",
+  "Longest_response_time": "Longest Response Time",
+  "Looked_for": "Looked for",
+  "Low": "Low",
+  "Lowest": "Lowest",
+  "Mail_Message_Invalid_emails": "You have provided one or more invalid emails: %s",
+  "Mail_Message_Missing_subject": "You must provide an email subject.",
+  "Mail_Message_Missing_to": "You must select one or more users or provide one or more email addresses, separated by commas.",
+  "Mail_Message_No_messages_selected_select_all": "You haven't selected any messages",
+  "Mail_Messages": "Mail Messages",
+  "Mail_Messages_Instructions": "Choose which messages you want to send via email by clicking the messages",
+  "Mail_Messages_Subject": "Here's a selected portion of %s messages",
+  "mail-messages": "Mail Messages",
+  "mail-messages_description": "Permission to use the mail messages option",
+  "Mailer": "Mailer",
+  "Mailer_body_tags": "You <b>must</b> use [unsubscribe] for the unsubscription link.<br/>You may use `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.<br/>You may use [email] for the user's email.",
+  "Mailing": "Mailing",
+  "Make_Admin": "Make Admin",
+  "Make_sure_you_have_a_copy_of_your_codes_1": "Make sure you have a copy of your codes:",
+  "Make_sure_you_have_a_copy_of_your_codes_2": "If you lose access to your authenticator app, you can use one of these codes to log in.",
+  "Manage": "Manage",
+  "manage-agent-extension-association": "Manage Agent Extension Association",
+  "manage-agent-extension-association_description": "Permission to manage agent extension association",
+  "manage-apps": "Manage Apps",
+  "manage-apps_description": "Permission to manage all apps",
+  "manage-assets": "Manage Assets",
+  "manage-assets_description": "Permission to manage the server assets",
+  "manage-cloud": "Manage Cloud",
+  "manage-cloud_description": "Permission to manage cloud",
+  "Manage_Devices": "Manage Devices",
+  "manage-email-inbox": "Manage Email Inbox",
+  "manage-email-inbox_description": "Permission to manage email inboxes",
+  "manage-emoji": "Manage Emoji",
+  "manage-emoji_description": "Permission to manage the server emojis",
+  "messages_pruned": "messages pruned",
+  "manage-incoming-integrations": "Manage Incoming Integrations",
+  "manage-incoming-integrations_description": "Permission to manage the server incoming integrations",
+  "manage-integrations": "Manage Integrations",
+  "manage-integrations_description": "Permission to manage the server integrations",
+  "manage-livechat-agents": "Manage Omnichannel Agents",
+  "manage-livechat-agents_description": "Permission to manage omnichannel agents",
+  "manage-livechat-canned-responses": "Manage Omnichannel Canned Responses",
+  "manage-livechat-canned-responses_description": "Permission to manage omnichannel canned responses",
+  "manage-livechat-departments": "Manage Omnichannel Departments",
+  "manage-livechat-departments_description": "Permission to manage omnichannel departments",
+  "manage-livechat-managers": "Manage Omnichannel Managers",
+  "manage-livechat-managers_description": "Permission to manage omnichannel managers",
+  "manage-livechat-monitors": "Manage Omnichannel Monitors",
+  "manage-livechat-monitors_description": "Permission to manage omnichannel monitors",
+  "manage-livechat-priorities": "Manage Omnichannel Priorities",
+  "manage-livechat-priorities_description": "Permission to manage omnichannel priorities",
+  "manage-livechat-sla": "Manage Omnichannel SLA",
+  "manage-livechat-sla_description": "Permission to manage omnichannel SLA",
+  "manage-livechat-tags": "Manage Omnichannel Tags",
+  "manage-livechat-tags_description": "Permission to manage omnichannel tags",
+  "manage-livechat-units": "Manage Omnichannel Units",
+  "manage-livechat-units_description": "Permission to manage omnichannel units",
+  "manage-oauth-apps": "Manage OAuth Apps",
+  "manage-oauth-apps_description": "Permission to manage the server OAuth apps",
+  "manage-outgoing-integrations": "Manage Outgoing Integrations",
+  "manage-outgoing-integrations_description": "Permission to manage the server outgoing integrations",
+  "manage-own-incoming-integrations": "Manage Own Incoming Integrations",
+  "manage-own-incoming-integrations_description": "Permission to allow users to create and edit their own incoming integration or webhooks",
+  "manage-own-integrations": "Manage Own Integrations",
+  "manage-own-integrations_description": "Permition to allow users to create and edit their own integration or webhooks",
+  "manage-own-outgoing-integrations": "Manage Own Outgoing Integrations",
+  "manage-own-outgoing-integrations_description": "Permission to allow users to create and edit their own outgoing integration or webhooks",
+  "manage-selected-settings": "Change Some Settings",
+  "manage-selected-settings_description": "Permission to change settings which are explicitly granted to be changed",
+  "manage-sounds": "Manage Sounds",
+  "manage-sounds_description": "Permission to manage the server sounds",
+  "manage-the-app": "Manage the App",
+  "manage-user-status": "Manage User Status",
+  "manage-user-status_description": "Permission to manage the server custom user statuses",
+  "manage-voip-call-settings": "Manage Voip Call Settings",
+  "manage-voip-call-settings_description": "Permission to manage voip call settings",
+  "manage-voip-extensions": "Manage Voip Extensions",
+  "manage-voip-extensions_description": "Permission to manage voip extensions assigned to users",
+  "manage-voip-contact-center-settings": "Manage Voip Contact Center Settings",
+  "manage-voip-contact-center-settings_description": "Permission to manage voip contact center settings",
+  "Manage_Omnichannel": "Manage Omnichannel",
+  "Manage_workspace": "Manage workspace",
+  "Manager_added": "Manager added",
+  "Manager_removed": "Manager removed",
+  "Managers": "Managers",
+  "Manage_server_list": "Manage server list",
+  "Manage_servers": "Manage servers",
+  "Manage_which_devices": "Manage which devices are connecting to this workspace to help ensure security. Information such as device ID, login data is included as is the ability to log out devices remotely.",
+  "Management_Server": "Asterisk Manager Interface (AMI)",
+  "Managing_assets": "Managing assets",
+  "Managing_integrations": "Managing integrations",
+  "Manual_Selection": "Manual Selection",
+  "Manually_created_users_briefing": "Manually created users will initially be shown as pending. Once they log in for the first time, they will be shown as active.",
+  "Manufacturing": "Manufacturing",
+  "MapView_Enabled": "Enable Mapview",
+  "MapView_Enabled_Description": "Enabling mapview will display a location share button on the right of the chat input field.",
+  "MapView_GMapsAPIKey": "Google Static Maps API Key",
+  "MapView_GMapsAPIKey_Description": "This can be obtained from the Google Developers Console for free.",
+  "Mark_all_as_read": "`%s` - Mark all messages (in all channels) as read",
+  "Mark_as_read": "Mark as read",
+  "Mark_as_unread": "Mark as unread",
+  "Mark_email_as_verified": "Mark email as verified",
+  "Mark_read": "Mark Read",
+  "Mark_unread": "Mark Unread",
+  "Marketplace": "Marketplace",
+  "Marketplace_app_last_updated": "Last updated {{lastUpdated}}",
+  "Marketplace_view_marketplace": "View Marketplace",
+  "Marketplace_error": "Cannot connect to internet or your workspace may be an offline install.",
+  "MAU_value": "MAU {{value}}",
+  "Max_length_is": "Max length is %s",
+  "Max_number_incoming_livechats_displayed": "Max number of items displayed in the queue",
+  "Max_number_incoming_livechats_displayed_description": "(Optional) Max number of items displayed in the incoming Omnichannel queue.",
+  "Max_number_of_chats_per_agent": "Max. number of simultaneous chats",
+  "Max_number_of_chats_per_agent_description": "The max. number of simultaneous chats that the agents can attend",
+  "Max_number_of_uses": "Max number of uses",
+  "Max_Retry": "Maximum attemps to reconnect to the server",
+  "Maximum": "Maximum",
+  "Maximum_number_of_guests_reached": "Maximum number of guests reached",
+  "Me": "Me",
+  "Media": "Media",
+  "Medium": "Medium",
+  "Members": "Members",
+  "Members_List": "Members List",
+  "mention-all": "Mention All",
+  "mention-all_description": "Permission to use the @all mention",
+  "Mentions_all_room_members": "Mentions all room members",
+  "Mentions_online_room_members": "Mentions online room members",
+  "Mentions_user": "Mentions user",
+  "Mentions_channel": "Mentions channel",
+  "Mentions_you": "Mentions you",
+  "mention-here": "Mention Here",
+  "mention-here_description": "Permission to use the @here mention",
+  "Mentions": "Mentions",
+  "Mentions_default": "Mentions (default)",
+  "Mentions_only": "Mentions only",
+  "Mentions_with_@_symbol": "Mentions with @ symbol",
+  "Mentions_with_@_symbol_description": "Mentions notify and highlight messages for groups or specific users, facilitating targeted communication.\n\nThe screen reader functionality is optimized when the \"@\" symbol is employed in the mention feature. This ensures that users relying on screen readers can easily interpret and engage with these mentions.",
+  "Merge_Channels": "Merge Channels",
+  "message": "message",
+  "Message": "Message",
+  "Message_Description": "Configure message settings.",
+  "Message_AllowBadWordsFilter": "Allow Message bad words filtering",
+  "Message_AllowConvertLongMessagesToAttachment": "Allow converting long messages to attachment",
+  "Message_AllowDeleting": "Allow Message Deleting",
+  "Message_AllowDeleting_BlockDeleteInMinutes": "Block Message Deleting After (n) Minutes",
+  "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Enter 0 to disable blocking.",
+  "Message_AllowDirectMessagesToYourself": "Allow user direct messages to yourself",
+  "Message_AllowEditing": "Allow Message Editing",
+  "Message_AllowEditing_BlockEditInMinutes": "Block Message Editing After (n) Minutes",
+  "Message_AllowEditing_BlockEditInMinutesDescription": "Enter 0 to disable blocking.",
+  "Message_AllowPinning": "Allow Message Pinning",
+  "Message_AllowPinning_Description": "Allow messages to be pinned to any of the channels.",
+  "Message_AllowStarring": "Allow Message Starring",
+  "Message_AllowUnrecognizedSlashCommand": "Allow Unrecognized Slash Commands",
+  "Message_Already_Sent": "This message has already been sent and is being processed by the server",
+  "Message_AlwaysSearchRegExp": "Always Search Using RegExp",
+  "Message_AlwaysSearchRegExp_Description": "We recommend to set `True` if your language is not supported on [MongoDB text search](https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages).",
+  "Message_Attachments": "Message Attachments",
+  "Message_Attachments_Thumbnails_Enabled": "Enable image thumbnails to save bandwith",
+  "Message_Attachments_Thumbnails_Width": "Thumbnail's max width (in pixels)",
+  "Message_Attachments_Thumbnails_Height": "Thumbnail's max height (in pixels)",
+  "Message_with_attachment": "Message with attachment",
+  "Report_sent": "Report sent",
+  "Message_Attachments_Thumbnails_EnabledDesc": "Thumbnails will be served instead of the original image to reduce bandwith usage. Images at original resolution can be downloaded using the icon next to the attachment's name.",
+  "Message_Attachments_Strip_Exif": "Remove EXIF metadata from supported files",
+  "Message_Attachments_Strip_ExifDescription": "Strips out EXIF metadata from image files (jpeg, tiff, etc). This setting is not retroactive, so files uploaded while disabled will have EXIF data",
+  "Message_Audio": "Audio Message",
+  "Message_Audio_bitRate": "Audio Message Bit Rate",
+  "Message_AudioRecorderEnabled": "Audio Recorder Enabled",
+  "Message_AudioRecorderEnabled_Description": "Requires 'audio/mp3' files to be an accepted media type within 'File Upload' settings.",
+  "Message_Audio_Recording_Disabled": "Message audio recording disabled",
+  "Message_auditing": "Audit messages",
+  "Message_auditing_log": "Audit logs",
+  "Message_BadWordsFilterList": "Add Bad Words to the Blacklist",
+  "Message_BadWordsFilterListDescription": "Add List of Comma-separated list of bad words to filter",
+  "Message_BadWordsWhitelist": "Remove words from the Blacklist",
+  "Message_BadWordsWhitelistDescription": "Add a comma-separated list of words to be removed from filter",
+  "Message_Characther_Limit": "Message Character Limit",
+  "Message_Code_highlight": "Code highlighting languages list",
+  "Message_Code_highlight_Description": "Comma separated list of languages (all supported languages at [highlight.js](https://github.com/highlightjs/highlight.js/tree/11.6.0#supported-languages)) that will be used to highlight code blocks",
+  "Message_CustomDomain_AutoLink": "Custom Domain Whitelist for Auto Link",
+  "Message_CustomDomain_AutoLink_Description": "If you want to auto link internal links like `https://internaltool.intranet` or `internaltool.intranet`, you need to add the `intranet` domain to the field, multiple domains need to be separated by comma.",
+  "Message_CustomFields_Enabled": "Allow Custom Fields in Messages",
+  "Message_CustomFields": "Custom Fields Validation",
+  "Message_CustomFields_Description": "Custom Fields will be validated according to the rules defined in this setting.\nCheck [ajv.js.org](https://ajv.js.org/json-schema.html) for more information regarding validation options.\nProperties `type` and `additionalProperties` will be forced to `object` and `false` respectively.",
+  "message_counter_one": "{{count}} message",
+  "message_counter_other": "{{count}} messages",
+  "message_counter_two": "{{count}} messages",
+  "Message_DateFormat": "Date Format",
+  "Message_DateFormat_Description": "See also: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
+  "Message_deleting_blocked": "This message cannot be deleted anymore",
+  "Message_editing": "Message editing",
+  "Message_ErasureType": "Message Erasure Type",
+  "Message_ErasureType_Delete": "Delete All Messages",
+  "Message_ErasureType_Description": "Determine what to do with messages of users who remove their account.  \n -  **Keep Messages and User Name:** The message and files history of the user will be deleted from Direct Messages but will be kept in other rooms.  \n - **Delete All Messages:**  All messages and files from the user will be deleted from the database and it will not be possible to locate the user anymore.  \n - **Remove link between user and messages:** This option will assign all messages and files of the user to Rocket.Cat bot and Direct Messages are going to be deleted.",
+  "Message_ErasureType_Keep": "Keep Messages and User Name",
+  "Message_ErasureType_Unlink": "Remove Link Between User and Messages",
+  "Message_GlobalSearch": "Global Search",
+  "Message_GroupingPeriod": "Grouping Period (in seconds)",
+  "Message_GroupingPeriodDescription": "Messages will be grouped with previous message if both are from the same user and the elapsed time was less than the informed time in seconds.",
+  "Message_has_been_edited": "Message has been edited",
+  "Message_has_been_edited_at": "Message has been edited at {{date}}",
+  "Message_has_been_edited_by": "Message has been edited by {{username}}",
+  "Message_has_been_edited_by_at": "Message has been edited by {{username}} at {{date}}",
+  "Message_has_been_forwarded": "Message has been forwarded",
+  "Message_has_been_pinned": "Message has been pinned",
+  "Message_has_been_starred": "Message has been starred",
+  "Message_has_been_unpinned": "Message has been unpinned",
+  "Message_has_been_unstarred": "Message has been unstarred",
+  "Message_HideType_au": "User added",
+  "Message_HideType_added_user_to_team": "User added to team",
+  "Message_HideType_mute_unmute": "User muted / unmuted",
+  "Message_HideType_r": "Room name changed",
+  "Message_HideType_rm": "Message removed",
+  "Message_HideType_room_allowed_reacting": "Room allowed reacting",
+  "Message_HideType_room_archived": "Room archived",
+  "Message_HideType_room_changed_avatar": "Room avatar changed",
+  "Message_HideType_room_changed_privacy": "Room type changed",
+  "Message_HideType_room_changed_topic": "Room topic changed",
+  "Message_HideType_room_disallowed_reacting": "Room disallowed reacting",
+  "Message_HideType_room_enabled_encryption": "Room encryption enabled",
+  "Message_HideType_room_disabled_encryption": "Room encryption disabled",
+  "Message_HideType_room_set_read_only": "Room set to Read Only",
+  "Message_HideType_room_removed_read_only": "Room added writing permission",
+  "Message_HideType_room_unarchived": "Room unarchived",
+  "Message_HideType_ru": "User removed",
+  "Message_HideType_removed_user_from_team": "User removed from team",
+  "Message_HideType_subscription_role_added": "Was set role",
+  "Message_HideType_subscription_role_removed": "Role no longer defined",
+  "Message_HideType_uj": "User joined",
+  "Message_HideType_ujt": "User joined team",
+  "New_Call_Enterprise_Edition_Only": "New Call (Enterprise Edition Only)",
+  "Message_HideType_ul": "User left",
+  "Message_HideType_ult": "User left team",
+  "Message_HideType_user_added_room_to_team": "User added room to team",
+  "Message_HideType_user_converted_to_channel": "User converted team to a channel",
+  "Message_HideType_user_converted_to_team": "User converted channel to a team",
+  "Message_HideType_user_deleted_room_from_team": "User deleted room from team",
+  "Message_HideType_user_removed_room_from_team": "User removed room from team",
+  "Message_HideType_changed_description": "Room description changed",
+  "Message_HideType_changed_announcement": "Room announcement changed",
+  "Message_HideType_ut": "User joined conversation",
+  "Message_HideType_wm": "Welcome",
+  "Message_HideType_livechat_closed": "Hide \"Conversation finished\" messages",
+  "Message_HideType_livechat_started": "Hide \"Conversation started\" messages",
+  "Message_HideType_livechat_transfer_history": "Hide \"Conversation transfered\" messages",
+  "Message_Id": "Message Id",
+  "Message_Ignored": "This message was ignored",
+  "message-impersonate": "Impersonate Other Users",
+  "message-impersonate_description": "Permission to impersonate other users using message alias",
+  "Message_info": "Message info",
+  "Message_KeepHistory": "Keep Per Message Editing History",
+  "Message_MaxAll": "Maximum Channel Size for ALL Message",
+  "Message_MaxAllowedSize": "Maximum Allowed Characters Per Message",
+  "Message_pinning": "Message pinning",
+  "message_pruned": "message pruned",
+  "Message_QuoteChainLimit": "Maximum Number of Chained Quotes",
+  "Message_Read_Receipt_Enabled": "Show Read Receipts",
+  "Message_Read_Receipt_Store_Users": "Detailed Read Receipts",
+  "Message_Read_Receipt_Store_Users_Description": "Shows each user's read receipts",
+  "Message_removed": "message removed",
+  "Message_is_removed": "message removed",
+  "Message_sent_by_email": "Message sent by Email",
+  "Message_ShowDeletedStatus": "Show Deleted Status",
+  "Message_Formatting_Toolbox": "Formatting Toolbox",
+  "Message_composer_toolbox_primary_actions": "Composer Primary Actions",
+  "Message_composer_toolbox_secondary_actions": "Composer Secondary Actions",
+  "Message_starring": "Message starring",
+  "Message_Time": "Message Time",
+  "Message_TimeAndDateFormat": "Time and Date Format",
+  "Message_TimeAndDateFormat_Description": "See also: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
+  "Message_TimeFormat": "Time Format",
+  "Message_TimeFormat_Description": "See also: [Moment.js](http://momentjs.com/docs/#/displaying/format/)",
+  "Message_too_long": "Message too long",
+  "Message_UserId": "User Id",
+  "Message_view_mode_info": "This changes the amount of space messages take up on screen.",
+  "Message_VideoRecorderEnabled": "Video Recorder Enabled",
+  "Message_Video_Recording_Disabled": "Message video recording disabled",
+  "MessageBox_view_mode": "MessageBox View Mode",
+  "Message_VideoRecorderEnabledDescription": "Requires 'video/webm' files to be an accepted media type within 'File Upload' settings.",
+  "messages": "messages",
+  "Messages": "Messages",
+  "Messages_selected": "Messages selected",
+  "Messages_sent": "Messages sent",
+  "Message_sent": "Message sent",
+  "Message_viewed": "Message viewed",
+  "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Messages that are sent to the Incoming WebHook will be posted here.",
+  "Meta": "Meta",
+  "Meta_Description": "Set custom Meta properties.",
+  "Meta_custom": "Custom Meta Tags",
+  "Meta_fb_app_id": "Facebook App Id",
+  "Meta_google-site-verification": "Google Site Verification",
+  "Meta_language": "Language",
+  "Meta_msvalidate01": "MSValidate.01",
+  "Meta_robots": "Robots",
+  "meteor_status_connected": "Connected",
+  "meteor_status_connecting": "Connecting...",
+  "meteor_status_failed": "Connection attempt failed",
+  "meteor_status_offline": "You’re offline",
+  "meteor_status_reconnect_in_one": "Trying to reconnect in 1 second",
+  "meteor_status_reconnect_in_other": "Trying to reconnect in {{count}} seconds",
+  "meteor_status_reconnect_in_two": "Trying to reconnect in {{count}} seconds",
+  "meteor_status_try_again_later": "Please try again later or ask your workspace admin for assistance",
+  "meteor_status_try_now_offline": "Connect again",
+  "meteor_status_try_now_waiting": "Try now",
+  "meteor_status_waiting": "You’re offline",
+  "Method": "Method",
+  "Mic_on": "Mic On",
+  "Microphone": "Microphone",
+  "Microphone_access_not_allowed": "Microphone access was not allowed, please check your browser settings.",
+  "Mic_off": "Mic Off",
+  "Min_length_is": "Min length is %s",
+  "Minimum": "Minimum",
+  "Minimum_balance": "Minimum balance",
+  "minute": "minute",
+  "minutes": "minutes",
+  "Missing_configuration": "Missing configuration",
+  "Mobex_sms_gateway_address": "Mobex SMS Gateway Address",
+  "Mobex_sms_gateway_address_desc": "IP or Host of your Mobex service with specified port. E.g. `http://192.168.1.1:1401` or `https://www.example.com:1401`",
+  "Mobex_sms_gateway_from_number": "From",
+  "Mobex_sms_gateway_from_number_desc": "Originating address/phone number when sending a new SMS to livechat client",
+  "Mobex_sms_gateway_from_numbers_list": "List of numbers to send SMS from",
+  "Mobex_sms_gateway_from_numbers_list_desc": "Comma-separated list of numbers to use in sending brand new messages, eg. 123456789, 123456788, 123456888",
+  "Mobex_sms_gateway_password": "Password",
+  "Mobex_sms_gateway_restful_address": "Mobex SMS REST API Address",
+  "Mobex_sms_gateway_restful_address_desc": "IP or Host of your Mobex REST API. E.g. `http://192.168.1.1:8080` or `https://www.example.com:8080`",
+  "Mobex_sms_gateway_username": "Username",
+  "Mobile": "Mobile",
+  "Mobile_apps": "Mobile apps",
+  "Mobile_Description": "Define behaviors for connecting to your workspace from mobile devices.",
+  "mobile-upload-file": "Allow file upload on mobile devices",
+  "mobile-upload-file_description": "Permission to allow file upload on mobile devices",
+  "Mobile_Push_Notifications_Default_Alert": "Push Notifications Default Alert",
+  "Moderation": "Moderation",
+  "Moderation_Show_reports": "Show reports",
+  "Moderation_See_reports": "See reports",
+  "Moderation_Go_to_message": "Go to message",
+  "Moderation_Delete_message": "Delete message",
+  "Moderation_Dismiss_and_delete": "Dismiss and delete",
+  "Moderation_Delete_this_message": "Delete this message",
+  "Moderation_Message_context_header": "Reported message(s)",
+  "Moderation_Message_deleted": "Message deleted and reports dismissed",
+  "Moderation_Messages_deleted": "Messages deleted and reports dismissed",
+  "Moderation_Action_View_reports": "View reported messages",
+  "Moderation_Hide_reports": "Hide reports",
+  "Moderation_Dismiss_all_reports": "Dismiss all reports",
+  "Moderation_Deactivate_User": "Deactivate user",
+  "Moderation_User_deactivated": "User deactivated",
+  "Moderation_Delete_all_messages": "Delete all messages",
+  "Moderation_Dismiss_reports": "Dismiss reports",
+  "Moderation_Duplicate_messages": "Duplicated messages",
+  "Moderation_Duplicate_messages_warning": "Following may contain same messages sent in multiple rooms.",
+  "Moderation_Report_date": "Report date",
+  "Moderation_Reports": "Reports",
+  "Moderation_Reported_message": "Reported message",
+  "Moderation_Reports_dismissed": "Reports dismissed",
+  "Moderation_Reports_all_dismissed": "All reports dismissed",
+  "Moderation_Message_already_deleted": "Message is already deleted",
+  "Moderation_Reset_user_avatar": "Reset user avatar",
+  "Moderation_See_messages": "See messages",
+  "Moderation_Avatar_reset_success": "Avatar reset",
+  "Moderation_Dismiss_reports_confirm": "Reports will be deleted and the reported message won't be affected.",
+  "Moderation_Dismiss_all_reports_confirm": "All reports will be deleted and the reported messages won't be affected.",
+  "Moderation_Are_you_sure_you_want_to_delete_this_message": "This message will be permanently deleted from its respective room and the report will be dismissed.",
+  "Moderation_Are_you_sure_you_want_to_reset_the_avatar": "Resetting user avatar will permanently remove their current avatar.",
+  "Moderation_Are_you_sure_you_want_to_deactivate_this_user": "User will be unable to log in unless reactivated. All reported messages will be permanently deleted from their respective room.",
+  "Moderation_Are_you_sure_you_want_to_delete_all_reported_messages_from_this_user": "All reported messages from this user will be permanently deleted from their respective room and the report will be dismissed.",
+  "Moderation_User_deleted_warning": "The user who sent the message(s) no longer exists or has been removed.",
+  "Monday": "Monday",
+  "Mongo_storageEngine": "Mongo Storage Engine",
+  "Mongo_version": "Mongo Version",
+  "MongoDB": "MongoDB",
+  "MongoDB_Deprecated": "MongoDB Deprecated",
+  "MongoDB_version_s_is_deprecated_please_upgrade_your_installation": "MongoDB version %s is deprecated, please upgrade your installation.",
+  "Monitor_added": "Monitor Added",
+  "Monitor_new_and_suspicious_logins": "Monitor new and suspicious logins",
+  "Monitor_history_for_changes_on": "Monitor History for Changes on",
+  "Monitor_removed": "Monitor removed",
+  "Monitors": "Monitors",
+  "Monthly_Active_Users": "Monthly Active Users",
+  "More": "More",
+  "More_actions": "More actions",
+  "More_channels": "More channels",
+  "More_direct_messages": "More direct messages",
+  "More_groups": "More private groups",
+  "More_unreads": "More unreads",
+  "More_options": "More options",
+  "Most_popular_channels_top_5": "Most popular channels (Top 5)",
+  "Most_recent_updated": "Most recent updated",
+  "Most_recent_requested": "Most recent requested",
+  "Move_beginning_message": "`%s` - Move to the beginning of the message",
+  "Move_end_message": "`%s` - Move to the end of the message",
+  "Move_queue": "Move to the queue",
+  "Msgs": "Msgs",
+  "multi": "multi",
+  "Multi_line": "Multi line",
+  "Multiple_monolith_instances_alert": "You are operating multiple instances without an active Premium license - some features may not behave as designed",
+  "Mute": "Mute",
+  "Mute_and_dismiss": "Mute and dismiss",
+  "Mute_all_notifications": "Mute all notifications",
+  "Mute_Focused_Conversations": "Mute Focused Conversations",
+  "Mute_Group_Mentions": "Mute @all and @here mentions",
+  "Mute_someone_in_room": "Mute someone in the room",
+  "Mute_user": "Mute user",
+  "Mute_microphone": "Mute Microphone",
+  "mute-user": "Mute User",
+  "mute-user_description": "Permission to mute other users in the same channel",
+  "Muted": "Muted",
+  "My Data": "My Data",
+  "My_Account": "My Account",
+  "My_location": "My location",
+  "n_messages": "%s messages",
+  "N_new_messages": "%s new messages",
+  "Name": "Name",
+  "Name_cant_be_empty": "Name can't be empty",
+  "Name_of_agent": "Name of agent",
+  "Name_optional": "Name (optional)",
+  "Name_Placeholder": "Please enter your name...",
+  "Navigation": "Navigation",
+  "Navigation_bar": "Navigation bar",
+  "Navigation_bar_description": "Introducing the navigation bar — a higher-level navigation designed to help users quickly find what they need. With its compact design and intuitive organization, this streamlined sidebar optimizes screen space while providing easy access to essential software features and sections.",
+  "Navigation_History": "Navigation History",
+  "Next": "Next",
+  "Never": "Never",
+  "New": "New",
+  "New_Application": "New Application",
+  "New_Business_Hour": "New Business Hour",
+  "New_Call": "New Call",
+  "New_Call_Premium_Only": "New Call (Premium Plans Only)",
+  "New_chat_in_queue": "New chat in queue",
+  "New_chat_priority": "Priority Changed: {{user}} changed the priority to {{priority}}",
+  "New_chat_transfer": "New Chat Transfer: {{transfer}}",
+  "New_chat_transfer_fallback": "Transferred to fallback department: {{fallback}}",
+  "New_contact": "New contact",
+  "New_Custom_Field": "New Custom Field",
+  "New_Department": "New Department",
+  "New_discussion": "New discussion",
+  "New_discussion_first_message": "Usually, a discussion starts with a question, like “How do I upload a picture?”",
+  "New_discussion_name": "A meaningful name for the discussion room",
+  "New_Email_Inbox": "New Email Inbox",
+  "New_encryption_password": "New encryption password",
+  "New_integration": "New integration",
+  "New_line_message_compose_input": "`%s` - New line in message compose input",
+  "New_Livechat_offline_message_has_been_sent": "A new Livechat offline Message has been sent",
+  "New_logs": "New logs",
+  "New_Message_Notification": "New Message Notification",
+  "New_messages": "New messages",
+  "New_OTR_Chat": "New OTR Chat",
+  "New_password": "New Password",
+  "New_Password_Placeholder": "Please enter new password...",
+  "New_Priority": "New Priority",
+  "New_SLA_Policy": "New SLA policy",
+  "New_role": "New role",
+  "New_Room_Notification": "New Room Notification",
+  "New_Tag": "New Tag",
+  "New_Trigger": "New Trigger",
+  "New_Unit": "New Unit",
+  "New_users": "New users",
+  "New_user": "New user",
+  "New_user_manually_created": "New user manually created",
+  "New_version_available_(s)": "New version available (%s)",
+  "New_videocall_request": "New Video Call Request",
+  "New_visitor_navigation": "New Navigation: {{history}}",
+  "New_workspace_confirmed": "New workspace confirmed",
+  "New_workspace": "New workspace",
+  "Newer_than": "Newer than",
+  "New_messages_cannot_be_sent": "New messages cannot be sent",
+  "Newer_than_may_not_exceed_Older_than": "\"Newer than\" may not exceed \"Older than\"",
+  "Nickname": "Nickname",
+  "Nickname_Placeholder": "Enter your nickname...",
+  "No": "No",
+  "no-active-video-conf-provider": "**Conference call not enabled**: A workspace admin needs to enable the conference call feature first.",
+  "No_available_agents_to_transfer": "No available agents to transfer",
+  "No_app_matches": "No app matches",
+  "No_app_matches_for": "No app matches for",
+  "No_apps_installed": "No Apps Installed",
+  "No_Canned_Responses": "No Canned Responses",
+  "No_Canned_Responses_Yet": "No canned responses yet",
+  "No_Canned_Responses_Yet-description": "Use canned responses to provide quick and consistent answers to frequently asked questions.",
+  "No_channels_in_team": "No Channels on this Team",
+  "No_agents_yet": "No agents yet",
+  "No_agents_yet_description": "Add agents to engage with your audience and provide optimized customer service.",
+  "No_channels_yet": "You aren't part of any channels yet",
+  "No_chats_yet": "No chats yet",
+  "No_chats_yet_description": "All your chats will appear here.",
+  "No_calls_yet": "No calls yet",
+  "No_calls_yet_description": "All your calls will appear here.",
+  "No_contacts_yet": "No contacts yet",
+  "No_contacts_yet_description": "All contacts will appear here.",
+  "No_custom_fields_yet": "No custom fields yet",
+  "No_custom_fields_yet_description": "Add custom fields into contact or ticket details or display them on the live chat registration form for new visitors.",
+  "No_departments_yet": "No departments yet",
+  "No_departments_yet_description": "Organize agents into departments, set how tickets get forwarded and monitor their performance.",
+  "No_managers_yet": "No managers yet",
+  "No_managers_yet_description": "Managers have access to all omnichannel controls, being able to monitor and take actions.",
+  "No_content_was_provided": "No content was provided",
+  "No_data_found": "No data found",
+  "No_data_available_for_the_selected_period": "No data available for the selected period",
+  "No_direct_messages_yet": "No Direct Messages.",
+  "No_Discussions_found": "No discussions found",
+  "No_discussions_yet": "No discussions yet",
+  "No_emojis_found": "No emojis found",
+  "No_Encryption": "No Encryption",
+  "No_files_found": "No files found",
+  "No_files_left_to_download": "No files left to download",
+  "No_groups_yet": "You have no private groups yet.",
+  "No_history": "No history",
+  "No_installed_app_matches": "No installed app matches",
+  "No_integration_found": "No integration found by the provided id.",
+  "No_Limit": "No Limit",
+  "No_livechats": "You have no livechats",
+  "No_marketplace_matches_for": "No Marketplace matches for",
+  "No_members_found": "No members found",
+  "No_mentions_found": "No mentions found",
+  "No_messages_found_to_prune": "No messages found to prune",
+  "No_message_reports": "No message reports",
+  "No_messages_yet": "No messages yet",
+  "No_monitors_yet": "No monitors yet",
+  "No_monitors_yet_description": "Monitors have partial control of Omnichannel. They can view department analytics and activities of the business units they are assigned.",
+  "No_tags_yet": "No tags yet",
+  "No_tags_yet_description": "Add tags to tickets to make organizing and finding related conversations easier.",
+  "No_triggers_yet": "No triggers yet",
+  "No_triggers_yet_description": "Triggers are events that cause the live chat widget to open and send messages automatically.",
+  "No_units_yet": "No units yet",
+  "No_units_yet_description": "Use units to group departments and manage them better.",
+  "No_user_reports": "No user reports",
+  "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
+  "No_pinned_messages": "No pinned messages",
+  "No_previous_chat_found": "No previous chat found",
+  "No_release_information_provided": "No release information provided",
+  "No_requested_apps": "No requested apps",
+  "No_requests": "No requests",
+  "No_results_found": "No results found",
+  "No_results_found_for": "No results found for:",
+  "No_SLA_policies_yet": "No SLA policies yet",
+  "No_SLA_policies_yet_description": "Use SLA policies to change the order of Omnichannel queues based on estimated wait time.",
+  "No_snippet_messages": "No snippet",
+  "No_starred_messages": "No starred messages",
+  "No_such_command": "No such command: `/{{command}}`",
+  "No_Threads": "No threads found",
+  "no-videoconf-provider-app": "**Conference call not available**: Conference call apps can be installed in the Rocket.Chat marketplace by a workspace admin.",
+  "Nobody_available": "Nobody available",
+  "Node_version": "Node Version",
+  "None": "None",
+  "Nonprofit": "Nonprofit",
+  "Not_authorized": "Not authorized",
+  "Pexip_Enterprise_only": "Pexip (Enterprise only)",
+  "Normal": "Normal",
+  "Not_Available": "Not Available",
+  "Not_assigned": "Not assigned",
+  "Not_enough_data": "Not enough data",
+  "Not_following": "Not following",
+  "Not_Following": "Not Following",
+  "Not_found_or_not_allowed": "Not Found or Not Allowed",
+  "Not_Imported_Messages_Title": "The following messages were not imported successfully",
+  "Not_in_channel": "Not in channel",
+  "Not_likely": "Not likely",
+  "Not_started": "Not started",
+  "Not_verified": "Not verified",
+  "Not_Visible_To_Workspace": "Not visible to workspace",
+  "Nothing": "Nothing",
+  "Nothing_found": "Nothing found",
+  "Notice_that_public_channels_will_be_public_and_visible_to_everyone": "Notice that public Channels will be public and visible to everyone.",
+  "Notification_Desktop_Default_For": "Show Desktop Notifications For",
+  "Notification_Push_Default_For": "Send Push Notifications For",
+  "Notification_RequireInteraction": "Require Interaction to Dismiss Desktop Notification",
+  "Notification_RequireInteraction_Description": "Works only with Chrome browser versions > 50. Utilizes the parameter *requireInteraction* to show the desktop notification to indefinite until the user interacts with it.",
+  "Notifications": "Notifications",
+  "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
+  "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
+  "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
+  "Notifications_Preferences": "Notifications Preferences",
+  "Notifications_Sound_Volume": "Notifications sound volume",
+  "Notify_active_in_this_room": "Notify active users in this room",
+  "Notify_all_in_this_room": "Notify all in this room",
+  "Notify_Calendar_Events": "Notify calendar events",
+  "Now_Its_Visible_For_Everyone": "Now it's visible for everyone",
+  "Now_Its_Visible_Only_For_Admins": "Now it's visible only for admins",
+  "NPS_survey_enabled": "Enable NPS Survey",
+  "NPS_survey_enabled_Description": "Allow NPS survey run for all users. Admins will receive an alert 2 months upfront the survey is launched",
+  "NPS_survey_is_scheduled_to-run-at__date__for_all_users": "NPS survey is scheduled to run at {{date}} for all users. It's possible to turn off the survey on 'Admin > General > NPS'",
+  "Default_Timezone_For_Reporting": "Default timezone for reporting",
+  "Default_Timezone_For_Reporting_Description": "Sets the default timezone that will be used when showing dashboards or sending emails",
+  "Default_Server_Timezone": "Server timezone",
+  "Default_Custom_Timezone": "Custom timezone",
+  "Default_User_Timezone": "User's current timezone",
+  "Num_Agents": "# Agents",
+  "Number_in_seconds": "Number in seconds",
+  "Number_of_events": "Number of events",
+  "Number_of_federated_servers": "Number of federated servers",
+  "Number_of_federated_users": "Number of federated users",
+  "Number_of_messages": "Number of messages",
+  "Number_of_most_recent_chats_estimate_wait_time": "Number of recent chats to calculate estimate wait time",
+  "Number_of_most_recent_chats_estimate_wait_time_description": "This number defines the number of last served rooms that will be used to calculate queue wait times.",
+  "Number_of_users_autocomplete_suggestions": "Number of users' autocomplete suggestions",
+  "OAuth": "OAuth",
+  "OAuth_Description": "Configure authentication methods beyond just username and password.",
+  "OAuth_Application": "OAuth Application",
+  "Objects": "Objects",
+  "Off": "Off",
+  "Off_the_record_conversation": "Off-the-Record Conversation",
+  "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-Record conversation is not available for your browser or device.",
+  "Office_Hours": "Office Hours",
+  "Office_hours_enabled": "Office Hours Enabled",
+  "Office_hours_updated": "Office hours updated",
+  "offline": "offline",
+  "Offline": "Offline",
+  "Offline_DM_Email": "Direct Message Email Subject",
+  "Offline_Email_Subject_Description": "You may use the following placeholders:  \n - `[Site_Name]`, `[Site_URL]`, `[User]` & `[Room]` for the Application Name, URL, Username & Roomname respectively. ",
+  "Offline_form": "Offline form",
+  "Offline_form_unavailable_message": "Offline Form Unavailable Message",
+  "Offline_Link_Message": "GO TO MESSAGE",
+  "Offline_Mention_All_Email": "Mention All Email Subject",
+  "Offline_Mention_Email": "Mention Email Subject",
+  "Offline_message": "Offline message",
+  "Offline_Message": "Offline Message",
+  "Offline_Message_Use_DeepLink": "Use Deep Link URL Format",
+  "Offline_messages": "Offline Messages",
+  "Offline_success_message": "Offline Success Message",
+  "Offline_unavailable": "Offline unavailable",
+  "Ok": "Ok",
+  "Old Colors": "Old Colors",
+  "Old Colors (minor)": "Old Colors (minor)",
+  "Older_than": "Older than",
+  "Omnichannel": "Omnichannel",
+  "Omnichannel_Description": "Set up Omnichannel to communicate with customers from one place, regardless of how they connect with you.",
+  "Omnichannel_Directory": "Omnichannel Directory",
+  "Omnichannel_appearance": "Omnichannel Appearance",
+  "Omnichannel_calculate_dispatch_service_queue_statistics": "Calculate and dispatch Omnichannel waiting queue statistics",
+  "Omnichannel_calculate_dispatch_service_queue_statistics_Description": "Processing and dispatching waiting queue statistics such as position and estimated waiting time. If *Livechat channel* is not in use, it is recommended to disable this setting and prevent the server from doing unnecessary processes.",
+  "Omnichannel_Contact_Center": "Omnichannel Contact Center",
+  "Omnichannel_contact_manager_routing": "Assign new conversations to the contact manager",
+  "Omnichannel_contact_manager_routing_Description": "This setting allocates a chat to the assigned Contact Manager, as long as the Contact Manager is online when the chat starts",
+  "Omnichannel_External_Frame": "External Frame",
+  "Omnichannel_External_Frame_Enabled": "External frame enabled",
+  "Omnichannel_External_Frame_Encryption_JWK": "Encryption key (JWK)",
+  "Omnichannel_External_Frame_Encryption_JWK_Description": "If provided it will encrypt the user's token with the provided key and the external system will need to decrypt the data to access the token",
+  "Omnichannel_External_Frame_URL": "External frame URL",
+  "omnichannel_priority_change_history": "Priority changed: {{user}} changed the priority to {{priority}}",
+  "omnichannel_sla_change_history": "SLA Policy changed: {{user}} changed the SLA Policy to {{sla}}",
+  "Omnichannel_enable_department_removal": "Enable department removal",
+  "Omnichannel_enable_department_removal_alert": "Departments removed cannot be restored, we recommend archiving the department instead.",
+  "Omnichannel_Reports_Status_Open": "Open",
+  "Omnichannel_Reports_Status_Closed": "Closed",
+  "Omnichannel_Reports_Channels_Empty_Subtitle": "This chart shows the most used channels.",
+  "Omnichannel_Reports_Departments_Empty_Subtitle": "This chart displays the departments that receive the most conversations.",
+  "Omnichannel_Reports_Status_Empty_Subtitle": "This chart will update as soon as conversations start.",
+  "Omnichannel_Reports_Tags_Empty_Subtitle": "This chart shows the most frequently used tags.",
+  "Omnichannel_Reports_Agents_Empty_Subtitle": "This chart displays which agents receive the highest volume of conversations.",
+  "Omnichannel_Reports_Summary": "Gain insights into your operation and export your metrics.",
+  "Omnichannel_max_fallback_forward_depth": "Maximum fallback forward departments depth",
+  "Omnichannel_max_fallback_forward_depth_Description": "Maximum number of hops that a room being transfered will do when the target department has a Fallback Forward Department set up. When limit is reached, chat won't be transferred and process will stop. Depending on your configuration, setting a high number may cause performance issues.",
+  "Omnichannel_allow_visitors_to_close_conversation": "Allow visitors to finish conversations",
+  "Omnichannel_allow_visitors_to_close_conversation_Description": "When disabled, visitors won't be able to finish an ongoing conversation either via UI or via API.",
+  "On": "On",
+  "on-hold-livechat-room": "On Hold Omnichannel Room",
+  "on-hold-livechat-room_description": "Permission to on hold omnichannel room",
+  "on-hold-others-livechat-room": "On Hold Others Omnichannel Room",
+  "on-hold-others-livechat-room_description": "Permission to on hold others omnichannel room",
+  "On_Hold": "On hold",
+  "On_Hold_Chats": "On hold",
+  "On_Hold_conversations": "On hold conversations",
+  "online": "online",
+  "Online": "Online",
+  "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
+  "Only_authorized_users_can_react_to_messages": "Only authorized users can react to messages",
+  "Only_from_users": "Only prune content from these users (leave empty to prune everyone's content)",
+  "Only_Members_Selected_Department_Can_View_Channel": "Only members of selected department can view chats on this channel",
+  "Only_On_Desktop": "Desktop mode (only sends with enter on desktop)",
+  "Only_works_with_chrome_version_greater_50": "Only works with Chrome browser versions > 50",
+  "Only_you_can_see_this_message": "Only you can see this message",
+  "Only_invited_users_can_acess_this_channel": "Only invited users can access this channel",
+  "Oops_page_not_found": "Oops, page not found",
+  "Oops!": "Oops",
+  "Person_Or_Channel": "Person or Channel",
+  "Open": "Open",
+  "Open_call": "Open call",
+  "Open_call_in_new_tab": "Open call in new tab",
+  "Open_channel_user_search": "`%s` - Open Channel / User search",
+  "Open_conversations": "Open Conversations",
+  "Open_Days": "Open days",
+  "Open_days_of_the_week": "Open Days of the Week",
+  "Open_Dialpad": "Open Dialpad",
+  "Open_directory": "Open directory",
+  "Open_Livechats": "Chats in progress",
+  "Open_Outlook": "Open Outlook",
+  "Open_settings": "Open settings",
+  "Open_sidebar": "Open sidebar",
+  "Open-source_conference_call_solution": "Open-source conference call solution.",
+  "Open_thread": "Open Thread",
+  "Enter_the_code_provided_by_your_authentication_app_to_continue": "Enter the code provided by your authentication app to continue. You can also use one of your backup codes.",
+  "Opened": "Opened",
+  "Opened_in_a_new_window": "Opened in a new window.",
+  "Opens_a_channel_group_or_direct_message": "Opens a channel, group or direct message",
+  "Optional": "Optional",
+  "optional": "optional",
+  "Options": "Options",
+  "or": "or",
+  "Or_Copy_And_Paste_This_URL_Into_A_Tab_Of_Your_Browser": "Or copy and paste this URL into a tab of your browser",
+  "Or_talk_as_anonymous": "Or talk as anonymous",
+  "Order": "Order",
+  "Organization_Email": "Organization Email",
+  "Organization_Info": "Organization Info",
+  "Organization_Name": "Organization Name",
+  "Organization_Type": "Organization Type",
+  "Original": "Original",
+  "OS": "OS",
+  "OS_Arch": "OS Arch",
+  "OS_Cpus": "OS CPU Count",
+  "OS_Freemem": "OS Free Memory",
+  "OS_Loadavg": "OS Load Average",
+  "OS_Platform": "OS Platform",
+  "OS_Release": "OS Release",
+  "OS_Totalmem": "OS Total Memory",
+  "OS_Type": "OS Type",
+  "OS_Uptime": "OS Uptime",
+  "Other": "Other",
+  "others": "others",
+  "Others": "Others",
+  "OTR": "OTR",
+  "OTR_unavailable_for_federation": "OTR is unavailable for federated rooms",
+  "OTR_Description": "Off-the-record chats are secure, private and disappear once ended.",
+  "OTR_Chat_Declined_Title": "OTR Chat invite Declined",
+  "OTR_Chat_Declined_Description": "%s declined OTR chat invite. For privacy protection local cache was deleted, including all related system messages.",
+  "OTR_Chat_Error_Title": "Chat ended due to failed key refresh",
+  "OTR_Chat_Error_Description": "For privacy protection local cache was deleted, including all related system messages.",
+  "OTR_Chat_Timeout_Title": "OTR chat invite expired",
+  "OTR_Chat_Timeout_Description": "%s failed to accept OTR chat invite in time. For privacy protection local cache was deleted, including all related system messages.",
+  "OTR_Enable_Description": "Enable option to use off-the-record (OTR) messages in direct messages between 2 users. OTR messages are not recorded on the server and exchanged directly and encrypted between the 2 users.",
+  "OTR_message": "OTR Message",
+  "OTR_not_available": "OTR not available",
+  "OTR_not_available_e2ee": "This room has E2E encryption enabled, OTR cannot work with encrypted messages.",
+  "OTR_is_only_available_when_both_users_are_online": "OTR is only available when both users are online",
+  "OTR_Session_ended_other_user_went_offline": "OTR Session has ended. User {{username}} went offline",
+  "outbound-voip-calls": "Outbound Voip Calls",
+  "outbound-voip-calls_description": "Permission to outbound voip calls",
+  "Out_of_seats": "Out of Seats",
+  "Outgoing": "Outgoing",
+  "Outgoing_WebHook": "Outgoing WebHook",
+  "Outgoing_WebHook_Description": "Get data out of Rocket.Chat in real-time.",
+  "Outlook_authentication": "Outlook authentication",
+  "Outlook_authentication_disabled": "Outlook authentication disabled",
+  "Outlook_authentication_description": "Disable this to clear any outlook credentials stored in this machine.",
+  "Outlook_calendar": "Outlook calendar",
+  "Outlook_calendar_event": "Outlook calendar event",
+  "Outlook_calendar_settings": "Outlook calendar settings",
+  "Outlook_Calendar": "Outlook Calendar",
+  "Outlook_Calendar_Enabled": "Enabled",
+  "Outlook_Calendar_Exchange_Url": "Exchange URL",
+  "Outlook_Calendar_Exchange_Url_Description": "Host URL for the EWS api.",
+  "Outlook_Calendar_Outlook_Url": "Outlook URL",
+  "Outlook_Calendar_Outlook_Url_Description": "URL used to launch the Outlook web app.",
+  "Output_format": "Output format",
+  "Outlook_Sync_Failed": "Failed to load outlook events.",
+  "Outlook_Sync_Success": "Outlook events synchronized.",
+  "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Override URL to which files are uploaded. This url also used for downloads unless a CDN is given",
+  "Override_Destination_Channel": "Allow to overwrite destination channel in the body parameters",
+  "Owner": "Owner",
+  "Play": "Play",
+  "Page_not_exist_or_not_permission": "The page does not exist or you may not have access permission",
+  "Page_not_found": "Page not found",
+  "Page_title": "Page title",
+  "Page_URL": "Page URL",
+  "Pages": "Pages",
+  "Parent_channel_doesnt_exist": "Channel does not exist.",
+  "Parent_channel_or_team": "Parent channel or team",
+  "Participants": "Participants",
+  "Password": "Password",
+  "Password_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of passwords",
+  "Password_Changed_Description": "You may use the following placeholders:  \n - `[password]` for the temporary password.  \n - `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.  \n - `[email]` for the user's email.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "Password_Changed_Email_Subject": "[Site_Name] - Password Changed",
+  "Password_changed_section": "Password Changed",
+  "Password_changed_successfully": "Password changed successfully",
+  "Password_History": "Password History",
+  "Password_History_Amount": "Password History Length",
+  "Password_History_Amount_Description": "Amount of most recently used passwords to prevent users from reusing.",
+  "Password_must_have": "Password must have:",
+  "Password_Policy": "Password Policy",
+  "Password_Policy_Aria_Description": "Below it's listed the password requirement verifications",
+  "Password_must_meet_the_complexity_requirements": "Password must meet the complexity requirements.",
+  "Password_to_access": "Password to access",
+  "Passwords_do_not_match": "Passwords do not match",
+  "Past_Chats": "Past Chats",
+  "Paste_here": "Paste here...",
+  "Paste": "Paste",
+  "Pause": "Pause",
+  "Paste_error": "Error reading from clipboard",
+  "Paid_Apps": "Paid Apps",
+  "Payload": "Payload",
+  "PDF": "PDF",
+  "pdf_success_message": "PDF Transcript successfully generated",
+  "pdf_error_message": "Error generating PDF Transcript",
+  "Peer_Password": "Peer Password",
+  "Pending": "Pending",
+  "pending": "pending",
+  "Pending_action": "Pending action",
+  "Pending Avatars": "Pending Avatars",
+  "Pending Files": "Pending Files",
+  "People": "People",
+  "Permalink": "Permalink",
+  "Permissions": "Permissions",
+  "Personal_Access_Tokens": "Personal Access Tokens",
+  "Pexip_Premium_only": "Pexip (Premium only)",
+  "Phone": "Phone",
+  "Phone_call": "Phone Call",
+  "Phone_Number": "Phone Number",
+  "Thank_you_exclamation_mark": "Thank you!",
+  "Thank_You_For_Choosing_RocketChat": "Thank you for choosing Rocket.Chat!",
+  "Phone_already_exists": "Phone already exists",
+  "Phone_number": "Phone number",
+  "Phone_number_copied": "Phone number copied",
+  "PID": "PID",
+  "Pin": "Pin",
+  "Pin_Message": "Pin Message",
+  "pin-message": "Pin Message",
+  "pin-message_description": "Permission to pin a message in a channel",
+  "Pinned_a_message": "Pinned a message:",
+  "Pinned_Messages": "Pinned Messages",
+  "Pinned_messages_are_visible_to_everyone": "Pinned messages are visible to everyone",
+  "Pinned_messages_unavailable_for_federation": "Pinned Messages are not available for federated rooms.",
+  "pinning-not-allowed": "Pinning is not allowed",
+  "PiwikAdditionalTrackers": "Additional Piwik Sites",
+  "PiwikAdditionalTrackers_Description": "Enter addtitional Piwik website URLs and SiteIDs in the following format, if you want to track the same data into different websites: `[ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]`",
+  "PiwikAnalytics_cookieDomain": "All Subdomains",
+  "PiwikAnalytics_cookieDomain_Description": "Track visitors across all subdomains",
+  "PiwikAnalytics_domains": "Hide Outgoing Links",
+  "PiwikAnalytics_domains_Description": "In the 'Outlinks' report, hide clicks to known alias URLs. Please insert one domain per line and do not use any separators.",
+  "PiwikAnalytics_prependDomain": "Prepend Domain",
+  "PiwikAnalytics_prependDomain_Description": "Prepend the site domain to the page title when tracking",
+  "PiwikAnalytics_siteId_Description": "The site id to use for identifying this site. Example: 17",
+  "PiwikAnalytics_url_Description": "The url where the Piwik resides, be sure to include the trailing slash. Example: `https://piwik.rocket.chat/`",
+  "Placeholder_for_email_or_username_login_field": "Placeholder for Email or Username Login Field",
+  "Placeholder_for_password_login_confirm_field": "Confirm Placeholder for Password Login Field",
+  "Placeholder_for_password_login_field": "Placeholder for Password Login Field",
+  "Platform_Windows": "Windows",
+  "Platform_Linux": "Linux",
+  "Platform_Mac": "Mac",
+  "Please_add_a_comment": "Please add a comment",
+  "Please_add_a_comment_to_close_the_room": "Please, add a comment to close the room",
+  "Please_answer_survey": "Please take a moment to answer a quick survey about this chat",
+  "Please_enter_usernames": "Please enter usernames...",
+  "please_enter_valid_domain": "Please enter a valid domain",
+  "Please_enter_value_for_url": "Please enter a value for the url of your avatar.",
+  "Please_enter_your_new_password_below": "Please enter your new password below:",
+  "Please_enter_your_password": "Please enter your password",
+  "Please_enter_E2EE_password": "Please enter your E2EE password",
+  "Please_fill_a_label": "Please fill a label",
+  "Please_fill_a_name": "Please fill a name",
+  "Please_fill_a_token_name": "Please fill a valid token name",
+  "Please_fill_a_username": "Please fill a username",
+  "Please_fill_all_the_information": "Please fill all the information",
+  "Please_fill_an_email": "Please fill an email",
+  "Please_fill_name_and_email": "Please fill name and email",
+  "Please_select_an_user": "Please select an user",
+  "Please_select_enabled_yes_or_no": "Please select an option for Enabled",
+  "Please_select_visibility": "Please select a visibility",
+  "Please_wait": "Please wait",
+  "Please_wait_activation": "Please wait, this can take some time.",
+  "Please_wait_while_OTR_is_being_established": "Please wait while OTR is being established",
+  "Please_wait_while_your_account_is_being_deleted": "Please wait while your account is being deleted...",
+  "Please_wait_while_your_profile_is_being_saved": "Please wait while your profile is being saved...",
+  "Policies": "Policies",
+  "Pool": "Pool",
+  "Port": "Port",
+  "Post_as": "Post as",
+  "Post_to": "Post to",
+  "Post_to_Channel": "Post to Channel",
+  "Post_to_s_as_s": "Post to <strong>%s</strong> as <strong>%s</strong>",
+  "post-readonly": "Post ReadOnly",
+  "post-readonly_description": "Permission to post a message in a read-only channel",
+  "Powered_by_JoyPixels": "Powered by JoyPixels",
+  "Powered_by_RocketChat": "Powered by Rocket.Chat",
+  "powers-of-ten": "powers of ten",
+  "powers-of-two": "powers of two",
+  "increments-of-two": "increments of two",
+  "Preferences": "Preferences",
+  "Preferences_saved": "Preferences saved",
+  "Preparing_data_for_import_process": "Preparing data for import process",
+  "Preparing_list_of_channels": "Preparing list of channels",
+  "Preparing_list_of_messages": "Preparing list of messages",
+  "Preparing_list_of_users": "Preparing list of users",
+  "Presence": "Presence",
+  "Preview": "Preview",
+  "preview-c-room": "Preview Public Channel",
+  "preview-c-room_description": "Permission to view the contents of a public channel before joining",
+  "Previous_month": "Previous Month",
+  "Previous_week": "Previous Week",
+  "Price": "Price",
+  "Priorities": "Priorities",
+  "Priority": "Priority",
+  "Priority_saved": "Priority saved",
+  "Priority_removed": "Priority removed",
+  "Priorities_restored": "Priorities restored",
+  "Privacy": "Privacy",
+  "Privacy_Policy": "Privacy Policy",
+  "Privacy_policy": "Privacy policy",
+  "Privacy_summary": "Privacy summary",
+  "Private": "Private",
+  "private": "private",
+  "Private_channels": "Private channels",
+  "Private_Apps": "Private Apps",
+  "Private_Channel": "Private Channel",
+  "Private_Channels": "Private channels",
+  "Private_Chats": "Private Chats",
+  "Private_Discussion": "Private discussion",
+  "Private_Group": "Private Group",
+  "Private_Groups": "Private groups",
+  "Private_Groups_list": "List of Private Groups",
+  "Private_Team": "Private Team",
+  "Productivity": "Productivity",
+  "Profile": "Profile",
+  "Profile_details": "Profile Details",
+  "Profile_picture": "Profile Picture",
+  "Profile_saved_successfully": "Profile saved successfully",
+  "Prometheus": "Prometheus",
+  "Prometheus_API_User_Agent": "API: Track User Agent",
+  "Prometheus_Garbage_Collector": "Collect NodeJS GC",
+  "Prometheus_Garbage_Collector_Alert": "Restart required to deactivate",
+  "Prometheus_Reset_Interval": "Reset Interval (ms)",
+  "Protocol": "Protocol",
+  "Prune": "Prune",
+  "Prune_finished": "Prune finished",
+  "Prune_Messages": "Prune Messages",
+  "Prune_Modal": "Are you sure you wish to prune these messages? Pruned messages cannot be recovered.",
+  "Prune_Warning_after": "This will delete all %s in %s after %s.",
+  "Prune_Warning_all": "This will delete all %s in %s!",
+  "Prune_Warning_before": "This will delete all %s in %s before %s.",
+  "Prune_Warning_between": "This will delete all %s in %s between %s and %s.",
+  "Pruning_files": "Pruning files...",
+  "Pruning_messages": "Pruning messages...",
+  "Public": "Public",
+  "public": "public",
+  "Public_Channel": "Public Channel",
+  "Public_Channels": "Public channels",
+  "Public_Community": "Public Community",
+  "Public_URL": "Public URL",
+  "Purchase_for_free": "Purchase for FREE",
+  "Purchase_for_price": "Purchase for $%s",
+  "Purchased": "Purchased",
+  "Push": "Push",
+  "Push_Description": "Enable and configure push notifications for workspace members using mobile devices.",
+  "Push_Notifications": "Push Notifications",
+  "Push_apn_cert": "APN Cert",
+  "Push_apn_dev_cert": "APN Dev Cert",
+  "Push_apn_dev_key": "APN Dev Key",
+  "Push_apn_dev_passphrase": "APN Dev Passphrase",
+  "Push_apn_key": "APN Key",
+  "Push_apn_passphrase": "APN Passphrase",
+  "Push_enable": "Enable",
+  "Push_UseLegacy": "Use legacy notification provider",
+  "Push_Setting_Legacy_Warning": "The legacy notification provider will be deprecated after June 20, 2024. See: https://firebase.google.com/support/faq#fcm-23-deprecation",
+  "Push_enable_gateway": "Enable Gateway",
+  "Push_enable_gateway_Description": "**Warning:** You need to accept to register your server (Setup Wizard > Organization Info > Register Server) and our privacy terms (Setup Wizard > Cloud Info > Cloud Service Privacy Terms Agreement) to enabled this setting and use our gateway. Even if this setting is on it **won't** work if the server isn't registered.",
+  "Push_gateway": "Gateway",
+  "Push_gateway_description": "Multiple lines can be used to specify multiple gateways",
+  "Push_gcm_api_key": "GCM API Key",
+  "Push_google_api_credentials": "Google FCM API Credentials",
+  "Push_gcm_project_number": "GCM Project Number",
+  "Push_production": "Production",
+  "Push_request_content_from_server": "Hide message content from Apple and Google (and the Gateway, if enabled)",
+  "Push_request_content_from_server_Description": "Instead of exposing the message content to Apple/Google by including it in the push notification data, push only a message id.  The mobile client will dynamically fetch the content from the server and update the notification before displaying it.  In the event of an API error, it will display “You have a new message”.  This setting takes effect only on a Premium plan.",
+  "Push_Setting_Requires_Restart_Alert": "Changing this value requires restarting Rocket.Chat.",
+  "Push_show_message": "Show Message in Notification",
+  "Push_show_username_room": "Show Channel/Group/Username in Notification",
+  "Push_test_push": "Test",
+  "Query": "Query",
+  "Query_description": "Additional conditions for determining which users to send the email to. Unsubscribed users are automatically removed from the query. It must be a valid JSON. Example: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
+  "Query_is_not_valid_JSON": "Query is not valid JSON",
+  "Queue": "Queue",
+  "Queued": "Queued",
+  "Queues": "Queues",
+  "Queue_delay_timeout": "Queue processing delay timeout",
+  "Queue_Time": "Queue Time",
+  "Queue_management": "Queue Management",
+  "Quick_reactions": "Quick reactions",
+  "Quick_reactions_description": "Easily access your most used and most recent emoji message reactions by hovering on a message.",
+  "quote": "quote",
+  "Quote": "Quote",
+  "Random": "Random",
+  "Rate Limiter": "Rate Limiter",
+  "Rate Limiter_Description": "Control the rate of requests sent or received by your server to prevent cyber attacks and scraping.",
+  "Rate_Limiter_Limit_RegisterUser": "Default number calls to the rate limiter for registering a user",
+  "Rate_Limiter_Limit_RegisterUser_Description": "Number of default calls for user registering endpoints(REST and real-time API's), allowed within the time range defined in the API Rate Limiter section.",
+  "React_when_read_only": "Allow reacting",
+  "React_when_read_only_changed_successfully": "Allow reacting when read only changed successfully",
+  "React_with__reaction__": "Reacted with {{reaction}}",
+  "Reacted_with": "Reacted with",
+  "Reactions": "Reactions",
+  "Read_by": "Read by",
+  "Read_only": "Read-only",
+  "Read_only_field_hint_enabled": "Only {{roomType}} owners can send new messages",
+  "Read_only_field_hint_disabled": "Anyone can send new messages",
+  "Read_Receipts": "Read receipts",
+  "Readability": "Readability",
+  "This_room_is_read_only": "This room is read only",
+  "Only_people_with_permission_can_send_messages_here": "Only people with permission can send messages here",
+  "Read_only_changed_successfully": "Read only changed successfully",
+  "Read_only_channel": "Read Only Channel",
+  "Read_only_group": "Read Only Group",
+  "Real_Estate": "Real Estate",
+  "Real_Time_Monitoring": "Real-time Monitoring",
+  "RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names",
+  "Reason_for_joining": "Reason for joining",
+  "Reason_for_report": "Reason for report",
+  "Reason_To_Join": "Reason to Join",
+  "Receive_alerts": "Receive alerts",
+  "Receive_Group_Mentions": "Receive @all and @here mentions",
+  "Receive_login_notifications": "Receive login notifications",
+  "Receive_Login_Detection_Emails": "Receive login detection emails",
+  "Receive_Login_Detection_Emails_Description": "Receive an email each time a new login is detected on your account.",
+  "Recent_Import_History": "Recent Import History",
+  "Record": "Record",
+  "Records": "Records",
+  "recording": "recording",
+  "Redirect_URI": "Redirect URI",
+  "Redirect_URL_does_not_match": "Redirect URL does not match",
+  "Refresh": "Refresh",
+  "Refresh_keys": "Refresh keys",
+  "Refresh_oauth_services": "Refresh OAuth Services",
+  "Refresh_your_page_after_install_to_enable_screen_sharing": "Refresh your page after install to enable screen sharing",
+  "Refreshing": "Refreshing",
+  "Regenerate_codes": "Regenerate codes",
+  "Regexp_validation": "Validation by regular expression",
+  "Register": "Register",
+  "Register_new_account": "Register a new account",
+  "Register_Server": "Register Server",
+  "Register_Server_Info": "Use the preconfigured gateways and proxies provided by Rocket.Chat Technologies Corp.",
+  "Register_Server_Opt_In": "Product and Security Updates",
+  "Register_Server_Registered": "Register to access",
+  "Register_Server_Registered_I_Agree": "I agree with the",
+  "Register_Server_Registered_Livechat": "Livechat omnichannel proxy",
+  "Register_Server_Registered_Marketplace": "Apps Marketplace",
+  "Register_Server_Registered_OAuth": "OAuth proxy for social network",
+  "Register_Server_Registered_Push_Notifications": "Mobile push notifications gateway",
+  "Register_Server_Standalone": "Keep standalone, you'll need to",
+  "Register_Server_Standalone_Own_Certificates": "Recompile the mobile apps with your own certificates",
+  "Register_Server_Standalone_Service_Providers": "Create accounts with service providers",
+  "Register_Server_Standalone_Update_Settings": "Update the preconfigured settings",
+  "Register_Server_Terms_Alert": "Please agree to terms to complete registration",
+  "register-on-cloud": "Register On Cloud",
+  "register-on-cloud_description": "Permission to register on cloud",
+  "Registration": "Registration",
+  "Registration_status": "Registration status",
+  "Registration_Succeeded": "Registration Succeeded",
+  "Registration_via_Admin": "Registration via Admin",
+  "Registration_information_not_found": "Registration information not found",
+  "Regular_Expressions": "Regular Expressions",
+  "Reject_call": "Reject call",
+  "Release": "Release",
+  "Releases": "Releases",
+  "Religious": "Religious",
+  "Reload": "Reload",
+  "Reload_page": "Reload Page",
+  "Reload_Pages": "Reload Pages",
+  "Remember_my_credentials": "Remember my credentials",
+  "Remove": "Remove",
+  "Remove_Admin": "Remove Admin",
+  "Remove_Association": "Remove Association",
+  "Remove_as_leader": "Remove as leader",
+  "Remove_as_moderator": "Remove as moderator",
+  "Remove_as_owner": "Remove as owner",
+  "remove-canned-responses": "Remove Canned Responses",
+  "remove-canned-responses_description": "Permission to remove canned responses",
+  "Remove_Channel_Links": "Remove channel links",
+  "Remove_custom_oauth": "Remove custom OAuth",
+  "Remove_from_room": "Remove from room",
+  "Remove_from_team": "Remove from team",
+  "Remove_extension": "Remove extension",
+  "Remove_last_character": "Remove last character",
+  "Remove_last_admin": "Removing last admin",
+  "Remove_someone_from_room": "Remove someone from the room",
+  "remove-closed-livechat-room": "Remove Closed Omnichannel Room",
+  "remove-closed-livechat-room_description": "Permission to remove closed omnichannel room",
+  "remove-closed-livechat-rooms": "Remove All Closed Omnichannel Rooms",
+  "remove-closed-livechat-rooms_description": "Permission to remove all closed omnichannel rooms",
+  "remove-livechat-department": "Remove Omnichannel Departments",
+  "remove-livechat-department_description": "Permission to remove omnichannel departments",
+  "remove-slackbridge-links": "Remove Slackbridge Links",
+  "remove-slackbridge-links_description": "Permission to remove slackbridge links",
+  "remove-team-channel": "Remove Team Channel",
+  "remove-team-channel_description": "Permission to remove a team's channel",
+  "remove-user": "Remove User",
+  "remove-user_description": "Permission to remove a user from a room",
+  "Removed": "Removed",
+  "Removed_User": "Removed User",
+  "Removed__roomName__from_this_team": "<strong>removed</strong> #{{roomName}} from this Team",
+  "Removed__username__from_team": "<strong>removed</strong> @{{user_removed}} from this Team",
+  "Removed__roomName__from_the_team": "removed #{{roomName}} from this team",
+  "Removed__username__from_the_team": "removed @{{user_removed}} from this team",
+  "Replay": "Replay",
+  "Replied_on": "Replied on",
+  "Replies": "Replies",
+  "Reply": "Reply",
+  "Reply_in_direct_message": "Reply in direct message",
+  "Reply_in_thread": "Reply in thread",
+  "Reply_via_Email": "Reply via email",
+  "ReplyTo": "Reply-To",
+  "Report": "Report",
+  "Reports": "Reports",
+  "Report_Abuse": "Report Abuse",
+  "Reported_Messages": "Reported messages",
+  "Reported_Users": "Reported users",
+  "Report_exclamation_mark": "Report!",
+  "Report_has_been_sent": "Report has been sent",
+  "Report_Number": "Report Number",
+  "Report_reason": "Report reason",
+  "Report_this_message_question_mark": "Report this message?",
+  "Report_User": "Report user",
+  "Reporting": "Reporting",
+  "Request": "Request",
+  "Request_comment_when_closing_conversation": "Request comment when closing conversation",
+  "Request_comment_when_closing_conversation_description": "If enabled, the agent will need to set a comment before the conversation is closed.",
+  "Request_tag_before_closing_chat": "Request tag(s) before closing conversation",
+  "request": "request",
+  "requests": "requests",
+  "Requests": "Requests",
+  "Search_Enterprise_Apps": "Search Enterprise apps",
+  "Requested": "Requested",
+  "Requested_apps_will_appear_here": "Requested apps will appear here",
+  "request-pdf-transcript": "Request PDF Transcript",
+  "request-pdf-transcript_description": "Permission to request a PDF transcript for a given Omnichannel room",
+  "Requested_At": "Requested At",
+  "Requested_By": "Requested By",
+  "Require": "Require",
+  "Required": "Required",
+  "required": "required",
+  "Require_all_tokens": "Require all tokens",
+  "Require_any_token": "Require any token",
+  "Require_password_change": "Require password change",
+  "Require_Two_Factor_Authentication": "Require Two Factor Authentication",
+  "Resend_verification_email": "Resend verification email",
+  "Resend_welcome_email": "Resend welcome email",
+  "Reset": "Reset",
+  "Reset_priorities": "Reset priorities",
+  "Reset_Connection": "Reset Connection",
+  "Reset_E2E_Key": "Reset E2E Key",
+  "Reset_password": "Reset password",
+  "Reset_section_settings": "Restore defaults",
+  "Reset_TOTP": "Reset TOTP",
+  "reset-other-user-e2e-key": "Reset Other User E2E Key",
+  "Responding": "Responding",
+  "Response_description_post": "Empty bodies or bodies with an empty text property will simply be ignored. Non-200 responses will be retried a reasonable number of times. A response will be posted using the alias and avatar specified above. You can override these informations as in the example above.",
+  "Response_description_pre": "If the handler wishes to post a response back into the channel, the following JSON should be returned as the body of the response:",
+  "Restart": "Restart",
+  "Restart_the_server": "Restart The Server",
+  "restart-server": "Restart the server",
+  "restart-server_description": "Permission to restart the server",
+  "Results": "Results",
+  "Resume": "Resume",
+  "Retail": "Retail",
+  "Retention_setting_changed_successfully": "Retention policy setting changed successfully",
+  "RetentionPolicy": "Retention Policy",
+  "RetentionPolicy_Advanced_Precision": "Use Advanced Retention Policy configuration",
+  "RetentionPolicy_Advanced_Precision_Cron": "Use Advanced Retention Policy Cron",
+  "RetentionPolicy_Advanced_Precision_Cron_Description": "How often the prune timer should run defined by cron job expression. Setting this to a more precise value makes channels with fast retention timers work better, but might cost extra processing power on large communities.",
+  "RetentionPolicy_AppliesToChannels": "Prune in public rooms",
+  "RetentionPolicy_AppliesToChannels_Description": "Includes public channels, discussions and teams.",
+  "RetentionPolicy_AppliesToDMs": "Prune in direct messages",
+  "RetentionPolicy_AppliesToGroups": "Prune in private rooms",
+  "RetentionPolicy_AppliesToGroups_Description": "Includes private channels, discussions and teams.",
+  "RetentionPolicy_Description": "Automatically prune old messages and files across your workspace.",
+  "RetentionPolicy_DoNotPruneDiscussion": "Do not prune discussion messages",
+  "RetentionPolicy_DoNotPrunePinned": "Do not prune pinned messages",
+  "RetentionPolicy_DoNotPruneThreads": "Do not prune Threads",
+  "RetentionPolicy_Enabled": "Enabled",
+  "RetentionPolicy_ExcludePinned": "Exclude pinned messages",
+  "RetentionPolicy_FilesOnly": "Only delete files",
+  "RetentionPolicy_FilesOnly_Description": "Only files will be deleted, the messages themselves will stay in place.",
+  "RetentionPolicy_MaxAge": "Maximum message age",
+  "RetentionPolicy_TTL_Channels": "Prune messages older than",
+  "RetentionPolicy_TTL_DMs": "Prune messages older than",
+  "RetentionPolicy_TTL_Groups": "Prune messages older than",
+  "RetentionPolicy_MaxAge_Channels": "Maximum message age in channels",
+  "RetentionPolicy_MaxAge_Description": "Prune all messages older than this value, in days",
+  "RetentionPolicy_MaxAge_DMs": "Maximum message age in direct messages",
+  "RetentionPolicy_MaxAge_Groups": "Maximum message age in private groups",
+  "RetentionPolicy_Precision": "Timer Precision",
+  "RetentionPolicy_Precision_Description": "How often the prune timer should run. Setting this to a more precise value makes channels with fast retention timers work better, but might cost extra processing power on large communities.",
+  "RetentionPolicy_RoomWarning_NextRunDate": "Messages older than {{maxAge}} will be pruned on {{nextRunDate}}",
+  "RetentionPolicy_RoomWarning_FilesOnly_NextRunDate": "Files older than {{maxAge}} will be pruned on {{nextRunDate}}.",
+  "RetentionPolicy_RoomWarning_Unpinned_NextRunDate": "Unpinned messages older than {{maxAge}} will be pruned on {{nextRunDate}}.",
+  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly_NextRunDate": "Unpinned files older than {{maxAge}} will be pruned on {{nextRunDate}}.",
+  "RetentionPolicyRoom_Enabled": "Automatically prune old messages",
+  "RetentionPolicyRoom_ExcludePinned": "Exclude pinned messages",
+  "RetentionPolicyRoom_FilesOnly": "Prune files only, keep messages",
+  "RetentionPolicyRoom_MaxAge": "Maximum message age in days (default: {{max}})",
+  "RetentionPolicyRoom_OverrideGlobal": "Override global retention policy",
+  "RetentionPolicyRoom_ReadTheDocs": "Watch out! Tweaking these settings without utmost care can destroy all message history. Please read the documentation before turning the feature on <a href='https://docs.rocket.chat/use-rocket.chat/workspace-administration/settings/retention-policies'>here</a>.",
+  "Retention_policy_warning_banner": "Retention policy warning banner",
+  "Retention_policy_warning_callout": "Retention policy warning callout",
+  "Retry": "Retry",
+  "Return_to_home": "Return to home",
+  "Return_to_previous_page": "Return to previous page",
+  "Return_to_the_queue": "Return back to the Queue",
+  "Review_devices": "Review when and where devices are connecting from",
+  "Ringing": "Ringing",
+  "Ringtones_and_visual_indicators_notify_people_of_incoming_calls": "Ringtones and visual indicators notify people of incoming calls.",
+  "Right": "Right",
+  "Robot_Instructions_File_Content": "Robots.txt File Contents",
+  "Root": "Root",
+  "Required_action": "Required action",
+  "Required_field": "{{field}} required",
+  "Default_Referrer_Policy": "Default Referrer Policy",
+  "Default_Referrer_Policy_Description": "This controls the 'referrer' header that's sent when requesting embedded media from other servers. For more information, refer to [this link from MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy). Remember, a full page refresh is required for this to take effect",
+  "No_feature_to_preview": "No feature to preview",
+  "No_Referrer": "No Referrer",
+  "No_Referrer_When_Downgrade": "No referrer when downgrade",
+  "Notes": "Notes",
+  "Origin": "Origin",
+  "Origin_When_Cross_Origin": "Origin when cross origin",
+  "Same_Origin": "Same origin",
+  "Strict_Origin": "Strict origin",
+  "Strict_Origin_When_Cross_Origin": "Strict origin when cross origin",
+  "UIKit_Interaction_Timeout": "App has failed to respond. Please try again or contact your admin",
+  "Unsafe_Url": "Unsafe URL",
+  "Rocket_Chat_Alert": "Rocket.Chat Alert",
+  "Role": "Role",
+  "Roles": "Roles",
+  "Role_Editing": "Role Editing",
+  "Role_Mapping": "Role mapping",
+  "Role_removed": "Role removed",
+  "Room": "Room",
+  "room_allowed_reacting": "Room allowed reacting by {{user_by}}",
+  "room_allowed_reactions": "allowed reactions",
+  "Room_announcement_changed_successfully": "Room announcement changed successfully",
+  "Room_archivation_state": "State",
+  "Room_archivation_state_false": "Active",
+  "Room_archivation_state_true": "Archived",
+  "Room_archived": "Room archived",
+  "room_changed_announcement": "Room announcement changed to: {{room_announcement}} by {{user_by}}",
+  "room_changed_avatar": "Room avatar changed by {{user_by}}",
+  "room_avatar_changed": "changed room avatar",
+  "room_changed_description": "Room description changed to: {{room_description}} by {{user_by}}",
+  "room_changed_privacy": "Room type changed to: {{room_type}} by {{user_by}}",
+  "room_changed_topic": "Room topic changed to: {{room_topic}} by {{user_by}}",
+  "room_changed_type": "changed room to {{room_type}}",
+  "room_changed_topic_to": "changed room topic to {{room_topic}}",
+  "Room_default_change_to_private_will_be_default_no_more": "This is a default channel and changing it to a private group will cause it to no longer be a default channel. Do you want to proceed?",
+  "Room_description_changed_successfully": "Room description changed successfully",
+  "room_disallowed_reacting": "Room disallowed reacting by {{user_by}}",
+  "room_disallowed_reactions": "disallowed reactions",
+  "Room_Edit": "Room Edit",
+  "Room_has_been_archived": "Room has been archived",
+  "Room_has_been_converted": "Room has been converted",
+  "Room_has_been_created": "Room has been created",
+  "Room_has_been_removed": "Room has been removed",
+  "Room_has_been_unarchived": "Room has been unarchived",
+  "Room_Info": "Room Information",
+  "room_is_blocked": "This room is blocked",
+  "room_account_deactivated": "This account is deactivated",
+  "room_is_read_only": "This room is read only",
+  "room_name": "room name",
+  "Room_name_changed": "Room name changed to: {{room_name}} by {{user_by}}",
+  "Room_name_changed_to": "changed room name to {{room_name}}",
+  "Room_name_changed_successfully": "Room name changed successfully",
+  "Room_not_exist_or_not_permission": "The room does not exist or you may not have access permission",
+  "Room_not_found": "Room not found",
+  "Room_password_changed_successfully": "Room password changed successfully",
+  "room_removed_read_only": "Room added writing permission by {{user_by}}",
+  "room_set_read_only": "Room set as Read Only by {{user_by}}",
+  "Room_Status_Open": "Open",
+  "room_removed_read_only_permission": "removed read only permission",
+  "room_set_read_only_permission": "set room to read only",
+  "Room_topic_changed_successfully": "Room topic changed successfully",
+  "Room_type_changed_successfully": "Room type changed successfully",
+  "Room_type_of_default_rooms_cant_be_changed": "This is a default room and the type can not be changed, please consult with your administrator.",
+  "Room_unarchived": "Room unarchived",
+  "Room_updated_successfully": "Room updated successfully!",
+  "Room_uploaded_file_list": "Files List",
+  "Room_uploaded_file_list_empty": "No files available.",
+  "Rooms": "Rooms",
+  "Rooms_added_successfully": "Rooms added successfully",
+  "Routing": "Routing",
+  "Run_only_once_for_each_visitor": "Run only once for each visitor",
+  "run-import": "Run Import",
+  "run-import_description": "Permission to run the importers",
+  "run-migration": "Run Migration",
+  "run-migration_description": "Permission to run the migrations",
+  "Running_Instances": "Running Instances",
+  "Runtime_Environment": "Runtime Environment",
+  "S_new_messages_since_s": "%s new messages since %s",
+  "S_new_messages": "%s new messages",
+  "Same_As_Token_Sent_Via": "Same as \"Token Sent Via\"",
+  "Same_Style_For_Mentions": "Same style for mentions",
+  "SAML": "SAML",
+  "SAML_Description": "Security Assertion Markup Language used for exchanging authentication and authorization data.",
+  "SAML_Allowed_Clock_Drift": "Allowed clock drift from Identity Provider",
+  "SAML_Allowed_Clock_Drift_Description": "The clock of the Identity Provider may drift slightly ahead of your system clocks. You can allow for a small amount of clock drift. Its value must be given in a number of milliseconds (ms). The value given is added to the current time at which the response is validated.",
+  "SAML_AuthnContext_Template": "AuthnContext Template",
+  "SAML_AuthnContext_Template_Description": "You can use any variable from the AuthnRequest Template here.  \n  \n To add additional authn contexts, duplicate the {{AuthnContextClassRef}} tag and replace the {{\\_\\_authnContext\\_\\}} variable with the new context.",
+  "SAML_AuthnRequest_Template": "AuthnRequest Template",
+  "SAML_AuthnRequest_Template_Description": "The following variables are available:  \n- **\\_\\_newId\\_\\_**: Randomly generated id string  \n- **\\_\\_instant\\_\\_**: Current timestamp  \n- **\\_\\_callbackUrl\\_\\_**: The Rocket.Chat callback URL.  \n- **\\_\\_entryPoint\\_\\_**: The value of the {{Custom Entry Point}} setting.  \n- **\\_\\_issuer\\_\\_**: The value of the {{Custom Issuer}} setting.  \n- **\\_\\_identifierFormatTag\\_\\_**: The contents of the {{NameID Policy Template}} if a valid {{Identifier Format}} is configured.  \n- **\\_\\_identifierFormat\\_\\_**: The value of the {{Identifier Format}} setting.  \n- **\\_\\_authnContextTag\\_\\_**: The contents of the {{AuthnContext Template}} if a valid {{Custom Authn Context}} is configured.  \n- **\\_\\_authnContextComparison\\_\\_**: The value of the {{Authn Context Comparison}} setting.  \n- **\\_\\_authnContext\\_\\_**: The value of the {{Custom Authn Context}} setting.",
+  "SAML_Connection": "Connection",
+  "SAML_Enterprise": "Premium",
+  "SAML_General": "General",
+  "SAML_Custom_Authn_Context": "Custom Authn Context",
+  "SAML_Custom_Authn_Context_Comparison": "Authn Context Comparison",
+  "SAML_Custom_Authn_Context_description": "Leave this empty to omit the authn context from the request.  \n  \n To add multiple authn contexts, add the additional ones directly to the {{AuthnContext Template}} setting.",
+  "SAML_Custom_Cert": "Custom Certificate",
+  "SAML_Custom_Debug": "Enable Debug",
+  "SAML_Custom_EMail_Field": "E-Mail field name",
+  "SAML_Custom_Entry_point": "Custom Entry Point",
+  "SAML_Custom_Generate_Username": "Generate Username",
+  "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO Redirect URL",
+  "SAML_Custom_Immutable_Property": "Immutable field name",
+  "SAML_Custom_Immutable_Property_EMail": "E-Mail",
+  "SAML_Custom_Immutable_Property_Username": "Username",
+  "SAML_Custom_Issuer": "Custom Issuer",
+  "SAML_Custom_Logout_Behaviour": "Logout Behaviour",
+  "SAML_Custom_Logout_Behaviour_End_Only_RocketChat": "Only log out from Rocket.Chat",
+  "SAML_Custom_Logout_Behaviour_Terminate_SAML_Session": "Terminate SAML-session",
+  "SAML_Custom_mail_overwrite": "Overwrite user mail (use idp attribute)",
+  "SAML_Custom_name_overwrite": "Overwrite user fullname (use idp attribute)",
+  "SAML_Custom_Private_Key": "Private Key Contents",
+  "SAML_Custom_Provider": "Custom Provider",
+  "SAML_Custom_Public_Cert": "Public Cert Contents",
+  "SAML_Custom_signature_validation_all": "Validate All Signatures",
+  "SAML_Custom_signature_validation_assertion": "Validate Assertion Signature",
+  "SAML_Custom_signature_validation_either": "Validate Either Signature",
+  "SAML_Custom_signature_validation_response": "Validate Response Signature",
+  "SAML_Custom_signature_validation_type": "Signature Validation Type",
+  "SAML_Custom_signature_validation_type_description": "This setting will be ignored if no Custom Certificate is provided.",
+  "SAML_Custom_user_data_fieldmap": "User Data Field Map",
+  "SAML_Custom_user_data_fieldmap_description": "Configure how user account fields (like email) are populated from a record in SAML (once found).  \nAs an example, `{\"name\":\"cn\", \"email\":\"mail\"}` will choose a person's human readable name from the cn attribute, and their email from the mail attribute.  \nAvailable fields in Rocket.Chat: `name`, `email` and `username`, everything else will be discarted.  \n`{\"email\": \"mail\",\"username\": {\"fieldName\": \"mail\",\"regex\": \"(.*)@.+$\",\"template\": \"user-regex\"}, \"name\": { \"fieldNames\": [\"firstName\", \"lastName\"], \"template\": \"{{firstName}} {{lastName}}\"}, \"{{identifier}}\": \"uid\"}`",
+  "SAML_Custom_user_data_custom_fieldmap": "User Data Custom Field Map",
+  "SAML_Custom_user_data_custom_fieldmap_description": "Configure how user custom fields are populated from a record in SAML (once found).",
+  "SAML_Custom_Username_Field": "Username field name",
+  "SAML_Custom_Username_Normalize": "Normalize username",
+  "SAML_Custom_Username_Normalize_Lowercase": "To Lowercase",
+  "SAML_Custom_Username_Normalize_None": "No normalization",
+  "SAML_Default_User_Role": "Default User Role",
+  "SAML_Default_User_Role_Description": "You can specify multiple roles, separating them with commas.",
+  "SAML_Identifier_Format": "Identifier Format",
+  "SAML_Identifier_Format_Description": "Leave this empty to omit the NameID Policy from the request.",
+  "SAML_LogoutRequest_Template": "Logout Request Template",
+  "SAML_LogoutRequest_Template_Description": "The following variables are available:  \n- **\\_\\_newId\\_\\_**: Randomly generated id string  \n- **\\_\\_instant\\_\\_**: Current timestamp  \n- **\\_\\_idpSLORedirectURL\\_\\_**: The IDP Single LogOut URL to redirect to.  \n- **\\_\\_issuer\\_\\_**: The value of the {{Custom Issuer}} setting.  \n- **\\_\\_identifierFormat\\_\\_**: The value of the {{Identifier Format}} setting.  \n- **\\_\\_nameID\\_\\_**: The NameID received from the IdP when the user logged in.  \n- **\\_\\_sessionIndex\\_\\_**: The sessionIndex received from the IdP when the user logged in.",
+  "SAML_LogoutResponse_Template": "Logout Response Template",
+  "SAML_LogoutResponse_Template_Description": "The following variables are available:  \n- **\\_\\_newId\\_\\_**: Randomly generated id string  \n- **\\_\\_inResponseToId\\_\\_**: The ID of the Logout Request received from the IdP  \n- **\\_\\_instant\\_\\_**: Current timestamp  \n- **\\_\\_idpSLORedirectURL\\_\\_**: The IDP Single LogOut URL to redirect to.  \n- **\\_\\_issuer\\_\\_**: The value of the {{Custom Issuer}} setting.  \n- **\\_\\_identifierFormat\\_\\_**: The value of the {{Identifier Format}} setting.  \n- **\\_\\_nameID\\_\\_**: The NameID received from the IdP Logout Request.  \n- **\\_\\_sessionIndex\\_\\_**: The sessionIndex received from the IdP Logout Request.",
+  "SAML_Metadata_Certificate_Template_Description": "The following variables are available:  \n- **\\_\\_certificate\\_\\_**: The private certificate for assertion encryption.",
+  "SAML_Metadata_Template": "Metadata Template",
+  "SAML_Metadata_Template_Description": "The following variables are available:  \n- **\\_\\_sloLocation\\_\\_**: The Rocket.Chat Single LogOut URL.  \n- **\\_\\_issuer\\_\\_**: The value of the {{Custom Issuer}} setting.  \n- **\\_\\_identifierFormat\\_\\_**: The value of the {{Identifier Format}} setting.  \n- **\\_\\_certificateTag\\_\\_**: If a private certificate is configured, this will include the {{Metadata Certificate Template}}, otherwise it will be ignored.  \n- **\\_\\_callbackUrl\\_\\_**: The Rocket.Chat callback URL.",
+  "SAML_MetadataCertificate_Template": "Metadata Certificate Template",
+  "SAML_NameIdPolicy_Template": "NameID Policy Template",
+  "SAML_NameIdPolicy_Template_Description": "You can use any variable from the Authorize Request Template here.",
+  "SAML_Role_Attribute_Name": "Role Attribute Name",
+  "SAML_Role_Attribute_Name_Description": "If this attribute is found on the SAML response, it's values will be used as role names for new users.",
+  "SAML_Role_Attribute_Sync": "Sync User Roles",
+  "SAML_Role_Attribute_Sync_Description": "Sync SAML user roles on login (overwrites local user roles).",
+  "SAML_Section_1_User_Interface": "User Interface",
+  "SAML_Section_2_Certificate": "Certificate",
+  "SAML_Section_3_Behavior": "Behavior",
+  "SAML_Section_4_Roles": "Roles",
+  "SAML_Section_5_Mapping": "Mapping",
+  "SAML_Section_6_Advanced": "Advanced",
+  "SAML_Custom_channels_update": "Update Room Subscriptions on Each Login",
+  "SAML_Custom_channels_update_description": "Ensures user is a member of all channels in SAML assertion on every login.",
+  "SAML_Custom_include_private_channels_update": "Include Private Rooms in Room Subscription",
+  "SAML_Custom_include_private_channels_update_description": "Adds user to any private rooms that exist in the SAML assertion.",
+  "Saturday": "Saturday",
+  "Save": "Save",
+  "Save_changes": "Save changes",
+  "Save_E2EE_password": "Save E2EE password",
+  "Save_Mobile_Bandwidth": "Save Mobile Bandwidth",
+  "Save_to_enable_this_action": "Save to enable this action",
+  "Save_To_Webdav": "Save to WebDAV",
+  "Save_user": "Save user",
+  "Save_your_encryption_password": "Save your encryption password",
+  "Save_your_encryption_password_to_access": "Save your end-to-end encryption password to access",
+  "save-all-canned-responses": "Save All Canned Responses",
+  "save-all-canned-responses_description": "Permission to save all canned responses",
+  "save-canned-responses": "Save Canned Responses",
+  "save-canned-responses_description": "Permission to save canned responses",
+  "save-department-canned-responses": "Save Department Canned Responses",
+  "save-department-canned-responses_description": "Permission to save department canned responses",
+  "save-others-livechat-room-info": "Save Others Omnichannel Room Info",
+  "save-others-livechat-room-info_description": "Permission to save information from other omnichannel rooms",
+  "Saved": "Saved",
+  "Saving": "Saving",
+  "Scan_QR_code": "Using an authenticator app like Google Authenticator, Authy or Duo, scan the QR code. It will display a 6 digit code which you need to enter below.",
+  "Scan_QR_code_alternative_s": "If you can't scan the QR code, you may enter code manually instead:",
+  "Scope": "Scope",
+  "Score": "Score",
+  "Screen_Lock": "Screen Lock",
+  "Screen_Share": "Screen Share",
+  "Script": "Script",
+  "Script_Enabled": "Script Enabled",
+  "Script_Engine": "Script Sandbox",
+  "Script_Engine_Description": "Older scripts may require the compatible sandbox to run properly, but all new scripts should try to use the secure sandbox instead.",
+  "Script_Engine_vm2": "Compatible Sandbox (Deprecated)",
+  "Script_Engine_isolated_vm": "Secure Sandbox",
+  "Search": "Search",
+  "Searchable": "Searchable",
+  "Search_Apps": "Search apps",
+  "Search_Installed_Apps": "Search installed apps",
+  "Search_Private_apps": "Search private apps",
+  "Search_Requested_Apps": "Search requested apps",
+  "Search_Premium_Apps": "Search Premium apps",
+  "Search_by_file_name": "Search by file name",
+  "Search_by_username": "Search by username",
+  "Search_by_category": "Search by category",
+  "Search_Channels": "Search Channels",
+  "Search_Chat_History": "Search Chat History",
+  "Search_current_provider_not_active": "Current Search Provider is not active",
+  "Search_Description": "Select workspace search provider and configure search related settings.",
+  "Search_Devices_Users": "Search devices or users",
+  "Search_Files": "Search Files",
+  "Search_for_a_more_general_term": "Search for a more general term",
+  "Search_for_a_more_specific_term": "Search for a more specific term",
+  "Search_Integrations": "Search Integrations",
+  "Search_message_search_failed": "Search request failed",
+  "Search_Messages": "Search Messages",
+  "Search_on_marketplace": "Search on Marketplace",
+  "Search_Page_Size": "Page Size",
+  "Search_Private_Groups": "Search Private Groups",
+  "Search_Provider": "Search Provider",
+  "Search_roles": "Search roles",
+  "Search_rooms": "Search rooms",
+  "Search_Rooms": "Search Rooms",
+  "Search_Users": "Search Users",
+  "Seats_Available": "{{seatsLeft, number}} Seats Available",
+  "MAC_Available": "{{macLeft, number}} MAC's Available",
+  "used_limit": "{{used, number}} / {{limit, number}}",
+  "used_limit_infinite": "{{used, number}} / ∞",
+  "Seats_usage": "Seats Usage",
+  "seconds": "seconds",
+  "Secret_token": "Secret Token",
+  "Secure_SaaS_solution": "Secure SaaS solution.",
+  "Security": "Security",
+  "See_all_themes": "See all themes",
+  "See_documentation": "See documentation",
+  "See_Paid_Plan": "See paid plan",
+  "See_Pricing": "See Pricing",
+  "See_full_profile": "See full profile",
+  "See_history": "See history",
+  "See_on_Engagement_Dashboard": "See on Engagement Dashboard",
+  "Select": "Select",
+  "Select_a_department": "Select a department",
+  "Select_a_room": "Select a room",
+  "Select_a_user": "Select a user",
+  "Select_a_webdav_server": "Select a WebDAV server",
+  "Select_an_avatar": "Select an avatar",
+  "Select_an_option": "Select an option",
+  "Select_at_least_one_user": "Select at least one user",
+  "Select_at_least_two_users": "Select at least two users",
+  "Select_department": "Select a department",
+  "Select_file": "Select file",
+  "Select_role": "Select a Role",
+  "Select_service_to_login": "Select a service to login to load your picture or upload one directly from your computer",
+  "Select_tag": "Select a tag",
+  "Select_the_channels_you_want_the_user_to_be_removed_from": "Select the channels you want the user to be removed from",
+  "Select_the_teams_channels_you_would_like_to_delete": "Select the Team’s Channels you would like to delete, the ones you do not select will be moved to the Workspace.",
+  "Select_atleast_one_channel_to_forward_the_messsage_to": "Select at least one channel to forward the message to",
+  "Select_user": "Select user",
+  "Select_users": "Select users",
+  "Select_period": "Select period",
+  "Select_someone_to_transfer_the_call_to": "Select someone to transfer the call to",
+  "Selected_agents": "Selected agents",
+  "Selected_by_default": "Selected by default",
+  "Selected_departments": "Selected Departments",
+  "Selected_first_reply_unselected_following_replies": "Selected for first reply, unselected for following replies",
+  "Selected_monitors": "Selected Monitors",
+  "Selecting_users": "Selecting users",
+  "Send": "Send",
+  "Send_a_message": "Send a message",
+  "Send_a_message_external_service": "Send a message (external service)",
+  "Send_a_test_mail_to_my_user": "Send a test mail to my user",
+  "Send_a_test_push_to_my_user": "Send a test push to my user",
+  "Send_confirmation_email": "Send confirmation email",
+  "Send_data_into_RocketChat_in_realtime": "Send data into Rocket.Chat in real-time.",
+  "Send_email": "Send Email",
+  "Send_Email_SMTP_Warning": "Set up the SMTP server in <a href=\"{{url}}\">email settings</a> to enable.",
+  "Send_invitation_email": "Send invitation email",
+  "Send_invitation_email_error": "You haven't provided any valid email address.",
+  "Send_invitation_email_info": "You can send multiple email invitations at once.",
+  "Send_invitation_email_success": "You have successfully sent an invitation email to the following addresses:",
+  "Send_it_as_attachment_instead_question": "Send it as attachment instead?",
+  "Send_me_the_code_again": "Send me the code again",
+  "Send_request_on": "Send Request on",
+  "Send_request_on_agent_message": "Send Request on Agent Messages",
+  "Send_request_on_chat_close": "Send Request on Chat Close",
+  "Send_request_on_chat_queued": "Send request on Chat Queued",
+  "Send_request_on_chat_start": "Send Request on Chat Start",
+  "Send_request_on_chat_taken": "Send Request on Chat Taken",
+  "Send_request_on_forwarding": "Send Request on Forwarding",
+  "Send_request_on_lead_capture": "Send request on lead capture",
+  "Send_request_on_offline_messages": "Send Request on Offline Messages",
+  "Send_request_on_visitor_message": "Send Request on Visitor Messages",
+  "Send_Test": "Send Test",
+  "Send_Test_Email": "Send test email",
+  "Send_via_email": "Send via email",
+  "Send_via_Email_as_attachment": "Send via Email as attachment",
+  "Export_as_PDF": "Export as PDF",
+  "Export_enabled_at_the_end_of_the_conversation": "Export enabled at the end of the conversation",
+  "Send_Visitor_navigation_history_as_a_message": "Send Visitor Navigation History as a Message",
+  "Send_visitor_navigation_history_on_request": "Send Visitor Navigation History on Request",
+  "Send_welcome_email": "Send welcome email",
+  "Send_your_JSON_payloads_to_this_URL": "Send your JSON payloads to this URL.",
+  "send-mail": "Send Emails",
+  "send-mail_description": "Permission to send emails",
+  "send-many-messages": "Send Many Messages",
+  "send-many-messages_description": "Permission to bypasses rate limit of 5 messages per second",
+  "send-omnichannel-chat-transcript": "Send Omnichannel Conversation Transcript",
+  "send-omnichannel-chat-transcript_description": "Permission to send omnichannel conversation transcript",
+  "Sender": "Sender",
+  "Sender_Info": "Sender Info",
+  "Sending": "Sending...",
+  "Sending_Invitations": "Sending invitations",
+  "Sending_your_mail_to_s": "Sending your mail to %s",
+  "Sent_an_attachment": "Sent an attachment",
+  "Sent_from": "Sent from",
+  "Separate_multiple_words_with_commas": "Separate multiple words with commas",
+  "Served_By": "Served By",
+  "Server": "Server",
+  "Server_already_added": "Server already added",
+  "Server_doesnt_exist": "Server doesn't exist",
+  "Servers": "Servers",
+  "Server_Configuration": "Server Configuration",
+  "Server_File_Path": "Server File Path",
+  "Server_Folder_Path": "Server Folder Path",
+  "Server_Info": "Server Info",
+  "Server_name": "Server name",
+  "Server_Type": "Server Type",
+  "Service": "Service",
+  "Service_account_key": "Service account key",
+  "Service_fallback_message_hint": "External service is currently active. Leave the field empty if you do not wish to send the message after the timeout ends.",
+  "Set_as_favorite": "Set as favorite",
+  "Set_as_leader": "Set as leader",
+  "Set_as_moderator": "Set as moderator",
+  "Set_as_owner": "Set as owner",
+  "Upload_app": "Upload App",
+  "Set_randomly_and_send_by_email": "Set randomly and send by email",
+  "Set_random_password_and_send_by_email": "Set random password and send by email",
+  "set-leader": "Set Leader",
+  "set-leader_description": "Permission to set other users as leader of a channel",
+  "Set_manually": "Set manually",
+  "set-moderator": "Set Moderator",
+  "set-moderator_description": "Permission to set other users as moderator of a channel",
+  "set-owner": "Set Owner",
+  "set-owner_description": "Permission to set other users as owner of a channel",
+  "set-react-when-readonly": "Set React When ReadOnly",
+  "set-react-when-readonly_description": "Permission to set the ability to react to messages in a read only channel",
+  "set-readonly": "Set ReadOnly",
+  "set-readonly_description": "Permission to set a channel to read only channel",
+  "Settings": "Settings",
+  "Settings_updated": "Settings updated",
+  "Setup_SMTP": "Set up SMTP",
+  "Setup_Wizard": "Setup Wizard",
+  "Setup_Wizard_Description": "Basic info about your workspace such as organization name and country.",
+  "Setup_Wizard_Info": "We'll guide you through setting up your first admin user, configuring your organisation and registering your server to receive free push notifications and more.",
+  "Share": "Share",
+  "Share_Location_Title": "Share Location?",
+  "Share_screen": "Share screen",
+  "New_CannedResponse": "New Canned Response",
+  "Edit_CannedResponse": "Edit Canned Response",
+  "Sharing": "Sharing",
+  "Shared_Location": "Shared Location",
+  "Shared_Secret": "Shared Secret",
+  "Shortcut": "Shortcut",
+  "shortcut_name": "shortcut name",
+  "Should_be_a_URL_of_an_image": "Should be a URL of an image.",
+  "Should_exists_a_user_with_this_username": "The user must already exist.",
+  "Show_additional_fields": "Show additional fields",
+  "Show_agent_email": "Show agent email",
+  "Show_agent_info": "Show agent information",
+  "Show_all": "Show All",
+  "Show_Avatars": "Show Avatars",
+  "Show_counter": "Mark as unread",
+  "Show_default_content": "Show default content",
+  "Show_email_field": "Show email field",
+  "Show_mentions": "Show badge for mentions",
+  "Show_more": "Show more",
+  "Show_name_field": "Show name field",
+  "show_offline_users": "show offline users",
+  "Accept_receive_inquiry_no_online_agents": "Allow department to receive forwarded inquiries even when there's no available agents",
+  "Accept_receive_inquiry_no_online_agents_Hint": "This method is effective only with automatic assignment routing methods, and does not apply to Manual Selection.",
+  "Show_on_offline_page": "Show on offline page",
+  "Show_on_registration_page": "Show on registration page",
+  "Show_only_online": "Show Online Only",
+  "Show_Only_This_Content": "Show only this content",
+  "Show_preregistration_form": "Show Pre-registration Form",
+  "Show_queue_list_to_all_agents": "Show Queue List to All Agents",
+  "Show_room_counter_on_sidebar": "Show room counter on sidebar",
+  "Show_Setup_Wizard": "Show Setup Wizard",
+  "Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list",
+  "Show_To_Workspace": "Show to workspace",
+  "Show_video": "Show video",
+  "Showing": "Showing",
+  "Showing_archived_results": "<p>Showing <b>%s</b> archived results</p>",
+  "Showing_current_of_total": "Showing {{current}} of {{total}}",
+  "Showing_online_users": "Showing: <b>{{total_showing}}</b>, Online: {{online}}, Total: {{total}} users",
+  "Showing_results": "<p>Showing <b>%s</b> results</p>",
+  "Showing_results_of": "Showing results %s - %s of %s",
+  "Show_usernames": "Show usernames",
+  "Show_roles": "Show roles",
+  "Show_or_hide_the_user_roles_of_message_authors": "Show or hide the user roles of message authors.",
+  "Show_or_hide_the_username_of_message_authors": "Show or hide the username of message authors.",
+  "Sidebar": "Sidebar",
+  "Sidebar_actions": "Sidebar actions",
+  "Sidebar_list_mode": "Sidebar Channel List Mode",
+  "Sign_in_to_start_talking": "Sign in to start talking",
+  "Sign_in_with__provider__": "Sign in with {{provider}}",
+  "since_creation": "since %s",
+  "Site_Name": "Site Name",
+  "Site_Url": "Site URL",
+  "Site_Url_Description": "Example: `https://chat.domain.com/`",
+  "Size": "Size",
+  "Skin_tone": "Skin tone",
+  "Skip": "Skip",
+  "Skip_to_main_content": "Skip to main content",
+  "SLA_Policy": "SLA Policy",
+  "SLA_Policies": "SLA Policies",
+  "SLA_removed": "SLA removed",
+  "Slack": "Slack",
+  "Slack_Users": "Slack's Users CSV",
+  "SlackBridge_APIToken": "API Tokens (Legacy)",
+  "SlackBridge_UseLegacy": "Use Legacy API Tokens",
+  "SlackBridge_APIToken_Description": "You can configure multiple slack servers by adding one API Token per line.",
+  "SlackBridge_BotToken": "Bot Tokens",
+  "SlackBridge_BotToken_Description": "You can configure multiple slack servers by adding one Bot Token per line.",
+  "SlackBridge_AppToken": "App Tokens",
+  "SlackBridge_AppToken_Description": "You can configure multiple slack servers by adding one App Token per line.",
+  "SlackBridge_SigningSecret": "Signing Secret",
+  "SlackBridge_SigningSecret_Description": "You can configure multiple slack servers by adding one signing secret per line.",
+  "Slackbridge_channel_links_removed_successfully": "The slackbridge channel links have been removed successfully.",
+  "SlackBridge_Description": "Enable Rocket.Chat to communicate directly with Slack.",
+  "SlackBridge_error": "SlackBridge got an error while importing your messages at %s: %s",
+  "SlackBridge_finish": "SlackBridge has finished importing the messages at %s. Please reload to view all messages.",
+  "SlackBridge_Out_All": "SlackBridge Out All",
+  "SlackBridge_Out_All_Description": "Send messages from all channels that exist in Slack and the bot has joined",
+  "SlackBridge_Out_Channels": "SlackBridge Out Channels",
+  "SlackBridge_Out_Channels_Description": "Choose which channels will send messages back to Slack",
+  "SlackBridge_Out_Enabled": "SlackBridge Out Enabled",
+  "SlackBridge_Out_Enabled_Description": "Choose whether SlackBridge should also send your messages back to Slack",
+  "SlackBridge_Remove_Channel_Links_Description": "Remove the internal link between Rocket.Chat channels and Slack channels. The links will afterwards be recreated based on the channel names.",
+  "SlackBridge_start": "@%s has started a SlackBridge import at `#%s`. We'll let you know when it's finished.",
+  "Slash_Gimme_Description": "Displays ༼ つ ◕_◕ ༽つ before your message",
+  "Slash_LennyFace_Description": "Displays ( ͡° ͜ʖ ͡°) after your message",
+  "Slash_Shrug_Description": "Displays ¯\\_(ツ)_/¯ after your message",
+  "Slash_Status_Description": "Set your status message",
+  "Slash_Status_Params": "Status message",
+  "Slash_Tableflip_Description": "Displays (╯°□°）╯︵ ┻━┻",
+  "Slash_TableUnflip_Description": "Displays ┬─┬ ノ( ゜-゜ノ)",
+  "Slash_Topic_Description": "Set topic",
+  "Slash_Topic_Params": "Topic message",
+  "Smarsh": "Smarsh",
+  "Smarsh_Description": "Configurations to preserve email communication.",
+  "Smarsh_Email": "Smarsh Email",
+  "Smarsh_Email_Description": "Smarsh Email Address to send the .eml file to.",
+  "Smarsh_Enabled": "Smarsh Enabled",
+  "Smarsh_Enabled_Description": "Whether the Smarsh eml connector is enabled or not (needs 'From Email' filled in under Email -> SMTP).",
+  "Smarsh_Interval": "Smarsh Interval",
+  "Smarsh_Interval_Description": "The amount of time to wait before sending the chats (needs 'From Email' filled in under Email -> SMTP).",
+  "Smarsh_MissingEmail_Email": "Missing Email",
+  "Smarsh_MissingEmail_Email_Description": "The email to show for a user account when their email address is missing, generally happens with bot accounts.",
+  "Smarsh_Timezone": "Smarsh Timezone",
+  "Smileys_and_People": "Smileys & People",
+  "SMS": "SMS",
+  "SMS_Description": "Enable and configure SMS gateways on your workspace.",
+  "SMS_Default_Omnichannel_Department": "Omnichannel Department (Default)",
+  "SMS_Default_Omnichannel_Department_Description": "If set, all new incoming chats initiated by this integration will be routed to this department.  \nThis setting can be overwritten by passing department query param in the request.  \ne.g. `https://{{SERVER_URL}}/api/v1/livechat/sms-incoming/twilio?department={{Department Id or Name}}`.  \nNote: if you're using Department Name, then it should be URL safe.",
+  "SMS_Enabled": "SMS Enabled",
+  "SMS_Twilio_NotConfigured": "Twilio SMS is not configured yet. Go to Settings -> SMS to configure it",
+  "SMS_Twilio_InvalidCredentials": "Twilio SMS credentials are invalid, cannot send messages",
+  "SMTP": "SMTP",
+  "SMTP_Host": "SMTP Host",
+  "SMTP_Password": "SMTP Password",
+  "SMTP_Port": "SMTP Port",
+  "SMTP_Server_Not_Setup_Title": "SMTP server is not setup yet",
+  "SMTP_Server_Not_Setup_Description": "Set up your SMTP emailing server to start sending invites or add users manually",
+  "SMTP_Test_Button": "Test SMTP Settings",
+  "SMTP_Username": "SMTP Username",
+  "Snippet_Added": "Created on %s",
+  "Snippet_name": "Snippet name",
+  "Snippeted_a_message": "Created a snippet {{snippetLink}}",
+  "Social_Network": "Social Network",
+  "Some_ideas_to_get_you_started": "Some ideas to get you started",
+  "Something_went_wrong": "Something went wrong",
+  "Something_went_wrong_try_again_later": "Something went wrong, try again later.",
+  "Something_went_wrong_while_executing_command": "Something went wrong while executing command: `/{{command}}`",
+  "Sorry_page_you_requested_does_not_exist_or_was_deleted": "Sorry, page you requested does not exist or was deleted!",
+  "Sort": "Sort",
+  "Sort_By": "Sort by",
+  "Sorting_mechanism": "Sorting mechanism",
+  "Service_level_agreements": "Service level agreements",
+  "Sort_by_activity": "Sort by Activity",
+  "Sound": "Sound",
+  "Sounds": "Sounds",
+  "Sound_File_mp3": "Sound File (mp3)",
+  "Sound File": "Sound File",
+  "Source": "Source",
+  "Speakers": "Speakers",
+  "Speaker": "Speaker",
+  "spy-voip-calls": "Spy Voip Calls",
+  "spy-voip-calls_description": "Permission to spy voip calls",
+  "SSL": "SSL",
+  "Star": "Star",
+  "Star_Message": "Star Message",
+  "Starred_Messages": "Starred Messages",
+  "Starred_messages_are_only_visible_to_you": "Starred messages are only visible to you",
+  "Start": "Start",
+  "Start_a_call": "Start a call",
+  "Start_a_call_in__roomName__": "Start a call in {{roomName}}",
+  "Start_a_call_with__roomName__": "Start a call with {{roomName}}",
+  "Start_a_free_trial": "Start a free trial",
+  "Start_audio_call": "Start audio call",
+  "Start_call": "Start call",
+  "Start_Chat": "Start Chat",
+  "Start_conference_call": "Start conference call",
+  "Start_free_trial": "Start free trial",
+  "Start_of_conversation": "Start of conversation",
+  "Start_OTR": "Start OTR",
+  "Start_video_call": "Start video call",
+  "Start_video_conference": "Start conference call?",
+  "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Start with <code class=\"inline\">%s</code> for user or <code class=\"inline\">%s</code> for channel. Eg: <code class=\"inline\">%s</code> or <code class=\"inline\">%s</code>",
+  "start-discussion": "Start Discussion",
+  "start-discussion_description": "Permission to start a discussion",
+  "start-discussion-other-user": "Start Discussion (Other-User)",
+  "start-discussion-other-user_description": "Permission to start a discussion, which gives permission to the user to create a discussion from a message sent by another user as well",
+  "Started": "Started",
+  "Started_a_video_call": "Started a Video Call",
+  "Started_At": "Started At",
+  "Statistics": "Statistics",
+  "Statistics_reporting": "Send Statistics to Rocket.Chat",
+  "Statistics_reporting_Description": "By sending your statistics, you'll help us identify how many instances of Rocket.Chat are deployed, as well as how good the system is behaving, so we can further improve it. Don't worry, as no user information is sent and all the information we receive is kept confidential.",
+  "Stats_Active_Guests": "Activated Guests",
+  "Stats_Active_Users": "Activated Users",
+  "Stats_App_Users": "Rocket.Chat App Users",
+  "Stats_Avg_Channel_Users": "Average Channel Users",
+  "Stats_Avg_Private_Group_Users": "Average Private Group Users",
+  "Stats_Away_Users": "Away Users",
+  "Stats_Max_Room_Users": "Max Rooms Users",
+  "Stats_Non_Active_Users": "Deactivated Users",
+  "Stats_Offline_Users": "Offline Users",
+  "Stats_Online_Users": "Online Users",
+  "Stats_Total_Active_Apps": "Total Active Apps",
+  "Stats_Total_Active_Incoming_Integrations": "Total Active Incoming Integrations",
+  "Stats_Total_Active_Outgoing_Integrations": "Total Active Outgoing Integrations",
+  "Stats_Total_Channels": "Channels",
+  "Stats_Total_Connected_Users": "Total Connected Users",
+  "Stats_Total_Direct_Messages": "Direct messages",
+  "Stats_Total_Incoming_Integrations": "Total Incoming Integrations",
+  "Stats_Total_Installed_Apps": "Total Installed Apps",
+  "Stats_Total_Integrations": "Total Integrations",
+  "Stats_Total_Integrations_With_Script_Enabled": "Total Integrations With Script Enabled",
+  "Stats_Total_Livechat_Rooms": "Omnichannel Rooms",
+  "Stats_Total_Messages": "Messages",
+  "Stats_Total_Messages_Channel": "In channels",
+  "Stats_Total_Messages_Direct": "In direct messages",
+  "Stats_Total_Messages_Livechat": "In omnichannel",
+  "Stats_Total_Messages_PrivateGroup": "In private groups",
+  "Stats_Total_Messages_Discussions": "In discussions",
+  "Stats_Total_Outgoing_Integrations": "Total Outgoing Integrations",
+  "Stats_Total_Private_Groups": "Private Groups",
+  "Stats_Total_Rooms": "Rooms",
+  "Stats_Total_Uploads": "Total Uploads",
+  "Stats_Total_Uploads_Size": "Total Uploads Size",
+  "Stats_Total_Users": "Total Users",
+  "Status": "Status",
+  "StatusMessage": "Status message",
+  "StatusMessage_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of status messages",
+  "StatusMessage_Changed_Successfully": "Status message changed successfully.",
+  "StatusMessage_Placeholder": "What are you doing right now?",
+  "StatusMessage_Too_Long": "Status message must be shorter than 120 characters.",
+  "Step": "Step",
+  "Stop_call": "Stop call",
+  "Stop_Recording": "Stop Recording",
+  "Store_Last_Message": "Store Last Message",
+  "Store_Last_Message_Sent_per_Room": "Store last message sent on each room.",
+  "Stream_Cast": "Stream Cast",
+  "Stream_Cast_Address": "Stream Cast Address",
+  "Stream_Cast_Address_Description": "IP or Host of your Rocket.Chat central Stream Cast. E.g. `192.168.1.1:3000` or `localhost:4000`",
+  "Strike": "Strike",
+  "Style": "Style",
+  "Subject": "Subject",
+  "Submit": "Submit",
+  "Subscribe": "Subscribe",
+  "Success": "Success",
+  "Success_message": "Success message",
+  "Successfully_downloaded_file_from_external_URL_should_start_preparing_soon": "Successfully downloaded file from external URL, should start preparing soon",
+  "Suggestion_from_recent_messages": "Suggestion from recent messages",
+  "Sunday": "Sunday",
+  "Support": "Support",
+  "Survey": "Survey",
+  "Survey_instructions": "Rate each question according to your satisfaction, 1 meaning you are completely unsatisfied and 5 meaning you are completely satisfied.",
+  "Symbols": "Symbols",
+  "Sync": "Sync",
+  "Sync / Import": "Sync / Import",
+  "Sync_in_progress": "Synchronization in progress",
+  "Sync_Interval": "Sync interval",
+  "Sync_success": "Sync success",
+  "Sync_Users": "Sync Users",
+  "sync-auth-services-users": "Sync authentication services' users",
+  "sync-auth-services-users_description": "Permission to sync authentication services' users",
+  "System_messages": "System Messages",
+  "system_message": "system message",
+  "Tag": "Tag",
+  "Tags": "Tags",
+  "Tag_removed": "Tag Removed",
+  "Tag_already_exists": "Tag already exists",
+  "Take_it": "Take it!",
+  "Take_rocket_chat_with_you_with_mobile_applications": "Take Rocket.Chat with you with mobile applications.",
+  "Taken_at": "Taken at",
+  "Talk_Time": "Talk Time",
+  "Talk_to_an_expert": "Talk to an expert",
+  "Talk_to_sales": "Talk to sales",
+  "Talk_to_your_workspace_administrator_about_enabling_video_conferencing": "Talk to your workspace administrator about enabling video conferencing",
+  "Talk_to_your_workspace_admin_to_address_this_issue": "Talk to your workspace admin to address this issue.",
+  "Target user not allowed to receive messages": "Target user not allowed to receive messages",
+  "TargetRoom": "Target Room",
+  "TargetRoom_Description": "The room where messages will be sent which are a result of this event being fired. Only one target room is allowed and it must exist.",
+  "Team": "Team",
+  "Team_Add_existing_channels": "Add Existing Channels",
+  "Team_Add_existing": "Add Existing",
+  "Team_Auto-join": "Auto-join",
+  "Team_Auto-join_exceeded_user_limit": "Auto-join has a limit of {{limit}} members, #{{channelName}} now has {{numberOfMembers}} members",
+  "Team_Auto-join_updated": "#{{channelName}} now has {{numberOfMembers}} members",
+  "Team_Channels": "Team Channels",
+  "Team_Delete_Channel_modal_content_danger": "This can’t be undone.",
+  "Team_Delete_Channel_modal_content": "Would you like to delete this Channel?",
+  "Team_has_been_created": "Team has been created",
+  "Team_has_been_deleted": "Team has been deleted",
+  "Team_Info": "Team Info",
+  "Team_Mapping": "Team Mapping",
+  "Team_Name": "Team Name",
+  "Team_Remove_from_team_modal_content": "Would you like to remove this Channel from {{teamName}}? The Channel will be moved back to the workspace.",
+  "Team_Remove_from_team": "Remove from team",
+  "Team_what_is_this_team_about": "What is this team about",
+  "Teams": "Teams",
+  "Teams_about_the_channels": "And about the Channels?",
+  "Teams_channels_didnt_leave": "You did not select the following Channels so you are not leaving them:",
+  "Teams_channels_last_owner_delete_channel_warning": "You are the last owner of this Channel. Once you convert the Team into a channel, the Channel will be moved to the Workspace.",
+  "Teams_channels_last_owner_leave_channel_warning": "You are the last owner of this Channel. Once you leave the Team, the Channel will be kept inside the Team but you will managing it from outside.",
+  "Teams_leaving_team": "You are leaving this Team.",
+  "Teams_channels": "Team channels",
+  "Teams_convert_channel_to_team": "Convert to Team",
+  "Teams_delete_team_choose_channels": "Select the Channels you would like to delete. The ones you decide to keep, will be available on your workspace.",
+  "Teams_delete_team_public_notice": "Notice that public Channels will still be public and visible to everyone.",
+  "Teams_delete_team_Warning": "Once you delete a Team, all chat content and configuration will be deleted.",
+  "Teams_delete_team": "You are about to delete this Team.",
+  "Teams_deleted_channels": "The following Channels are going to be deleted:",
+  "Teams_Errors_Already_exists": "The team `{{name}}` already exists.",
+  "Teams_Errors_team_name": "You can't use \"{{name}}\" as a team name.",
+  "Teams_move_channel_to_team": "Move to Team",
+  "Teams_move_channel_to_team_description_first": "Moving a Channel inside a Team means that this Channel will be added in the Team’s context, however, all Channel’s members, which are not members of the respective Team, will still have access to this Channel, but will not be added as Team’s members.",
+  "Teams_move_channel_to_team_description_second": "All Channel’s management will still be made by the owners of this Channel.",
+  "Teams_move_channel_to_team_description_third": "Team’s members and even Team’s owners, if not a member of this Channel, can not have access to the Channel’s content.",
+  "Teams_move_channel_to_team_description_fourth": "Please notice that the Team’s owner will be able to remove members from the Channel.",
+  "Teams_move_channel_to_team_confirm_description": "After reading the previous instructions about this behavior, do you want to move forward with this action?",
+  "Teams_New_Title": "Create team",
+  "Teams_new_description": "Teams allow a group of people to collaborate and can contain multiple channels.",
+  "Teams_New_Name_Label": "Name",
+  "Teams_Info": "Team info",
+  "Teams_kept_channels": "You did not select the following Channels so they will be moved to the Workspace:",
+  "Teams_kept__username__channels": "You did not select the following Channels so {{username}} will be kept on them:",
+  "Teams_leave_channels": "Select the Team’s Channels you would like to leave.",
+  "Teams_leave": "Leave Team",
+  "Teams_left_team_successfully": "Left the Team successfully",
+  "Teams_members": "Teams Members",
+  "Teams_New_Add_members_Label": "Members",
+  "Teams_New_Broadcast_Description": "Only team owners can write new messages but anyone can reply in a thread",
+  "Teams_New_Broadcast_Label": "Broadcast",
+  "Teams_New_Description_Label": "Topic",
+  "Teams_New_Description_Placeholder": "What is this team about",
+  "Teams_New_Encrypted_Description_Disabled": "Only available for private team",
+  "Teams_New_Encrypted_Description_Enabled": "End-to-end encrypted team. Search will not work with encrypted Teams and notifications may not show the messages content.",
+  "Teams_New_Encrypted_Label": "Encrypted",
+  "Teams_New_Private_Description_Disabled": "Anyone can access",
+  "Teams_New_Private_Description_Enabled": "People can only join by being invited",
+  "Teams_New_Private_Label": "Private",
+  "Teams_New_Read_only_Description": "All users in this team can write messages",
+  "Teams_Public_Team": "Public Team",
+  "Teams_Private_Team": "Private Team",
+  "Teams_removing_member": "Removing Member",
+  "Teams_removing__username__from_team": "You are removing {{username}} from this Team",
+  "Teams_removing__username__from_team_and_channels": "You are removing {{username}} from this Team and all its Channels.",
+  "Teams_Select_a_team": "Select a team",
+  "Teams_Search_teams": "Search Teams",
+  "Teams_New_Read_only_Label": "Read-only",
+  "Temporarily_unavailable": "Temporarily unavailable",
+  "Technology_Services": "Technology Services",
+  "Upgrade_tab_connection_error_description": "Looks like you have no internet connection. This may be because your workspace is installed on a fully-secured air-gapped server",
+  "Terms": "Terms",
+  "Terms_of_use": "Terms of use",
+  "Upgrade_tab_connection_error_restore": "Restore your connection to learn about features you are missing out on.",
+  "Test_Connection": "Test Connection",
+  "Upgrade_tab_go_fully_featured": "Go fully featured",
+  "Upgrade_tab_trial_guide": "Trial guide",
+  "Test_Desktop_Notifications": "Test Desktop Notifications",
+  "Test_LDAP_Search": "Test LDAP Search",
+  "test-admin-options": "Test options on admin panel",
+  "test-admin-options_description": "Permission to test options on admin panel such as LDAP login.",
+  "test-push-notifications": "Test push notifications",
+  "test-push-notifications_description": "Permission to test push notifications",
+  "Texts": "Texts",
+  "Text": "Text",
+  "Thank_you_for_your_feedback": "Thank you for your feedback",
+  "The_application_name_is_required": "The application name is required",
+  "The_application_will_be_able_to": "<1>{{appName}}</1> will be able to:",
+  "The_channel_name_is_required": "The channel name is required",
+  "The_emails_are_being_sent": "The emails are being sent.",
+  "The_empty_room__roomName__will_be_removed_automatically": "The empty room <span style=\"font-weight: bold;\">{{roomName}}</span> will be removed automatically.",
+  "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The image resize will not work because we can not detect ImageMagick or GraphicsMagick installed on your server.",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "The message is a discussion you will not be able to recover the messages!",
+  "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "The mobile notifications were disabled to all users, go to \"Admin > Push\" to enable the Push Gateway again",
+  "The_necessary_browser_permissions_for_location_sharing_are_not_granted": "The necessary browser permissions for location sharing are not granted",
+  "The_peer__peer__does_not_exist": "The peer <em>{{peer}}</em> does not exist.",
+  "The_redirectUri_is_required": "The redirectUri is required",
+  "The_selected_user_is_not_a_monitor": "The selected user is not a monitor",
+  "The_selected_user_is_not_an_agent": "The selected user is not an agent",
+  "The_server_will_restart_in_s_seconds": "The server will restart in %s seconds",
+  "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "The setting <strong>%s</strong> is configured to <strong>%s</strong> and you are accessing from <strong>%s</strong>!",
+  "The_user_s_will_be_removed_from_role_s": "The user %s will be removed from role %s",
+  "The_user_will_be_removed_from_s": "The user will be removed from %s",
+  "The_user_wont_be_able_to_type_in_s": "The user won't be able to type in %s",
+  "The_workspace_has_exceeded_the_monthly_limit_of_active_contacts": "The workspace has exceeded the monthly limit of active contacts.",
+  "Theme": "Theme",
+  "Themes": "Themes",
+  "Choose_theme_description": "Choose the interface appearance that best suits your needs.",
+  "theme-color-attention-color": "Attention Color",
+  "theme-color-component-color": "Component Color",
+  "theme-color-content-background-color": "Content Background Color",
+  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
+  "theme-color-error-color": "Error Color",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Link Font Color",
+  "theme-color-pending-color": "Pending Color",
+  "theme-color-primary-action-color": "Primary Action Color",
+  "theme-color-primary-background-color": "Primary Background Color",
+  "theme-color-primary-font-color": "Primary Font Color",
+  "theme-color-rc-color-alert": "Alert",
+  "theme-color-rc-color-alert-light": "Alert Light",
+  "theme-color-rc-color-alert-message-primary": "Alert Message Primary",
+  "theme-color-rc-color-alert-message-primary-background": "Alert Message Primary Background",
+  "theme-color-rc-color-alert-message-secondary": "Alert Message Secondary",
+  "theme-color-rc-color-alert-message-secondary-background": "Alert Message Secondary Background",
+  "theme-color-rc-color-alert-message-warning": "Alert Message Warning",
+  "theme-color-rc-color-alert-message-warning-background": "Alert Message Warning Background",
+  "theme-color-rc-color-announcement-text": "Announcement Text Color",
+  "theme-color-rc-color-announcement-background": "Announcement Background Color",
+  "theme-color-rc-color-announcement-text-hover": "Announcement Text Color Hover",
+  "theme-color-rc-color-announcement-background-hover": "Announcement Background Color Hover",
+  "theme-color-rc-color-button-primary": "Button Primary",
+  "theme-color-rc-color-button-primary-light": "Button Primary Light",
+  "theme-color-rc-color-content": "Content",
+  "theme-color-rc-color-error": "Error",
+  "theme-color-rc-color-error-light": "Error Light",
+  "theme-color-rc-color-link-active": "Link Active",
+  "theme-color-rc-color-primary": "Primary",
+  "theme-color-rc-color-primary-background": "Primary Background",
+  "theme-color-rc-color-primary-dark": "Primary Dark",
+  "theme-color-rc-color-primary-darkest": "Primary Darkest",
+  "theme-color-rc-color-primary-light": "Primary Light",
+  "theme-color-rc-color-primary-light-medium": "Primary Light Medium",
+  "theme-color-rc-color-primary-lightest": "Primary Lightest",
+  "theme-color-rc-color-success": "Success",
+  "theme-color-rc-color-success-light": "Success Light",
+  "theme-color-secondary-action-color": "Secondary Action Color",
+  "theme-color-secondary-background-color": "Secondary Background Color",
+  "theme-color-secondary-font-color": "Secondary Font Color",
+  "theme-color-selection-color": "Selection Color",
+  "theme-color-status-away": "Away Status Color",
+  "theme-color-status-busy": "Busy Status Color",
+  "theme-color-status-offline": "Offline Status Color",
+  "theme-color-status-online": "Online Status Color",
+  "theme-color-success-color": "Success Color",
+  "theme-color-transparent-dark": "Transparent Dark",
+  "theme-color-transparent-darker": "Transparent Darker",
+  "theme-color-transparent-lightest": "Transparent Lightest",
+  "theme-color-unread-notification-color": "Unread Notifications Color",
+  "theme-custom-css": "Custom CSS",
+  "theme-font-body-font-family": "Body Font Family",
+  "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.",
+  "There_are_no_applications": "No OAuth Applications have been added yet.",
+  "There_are_no_applications_installed": "There are currently no Rocket.Chat Applications installed.",
+  "There_are_no_available_monitors": "There are no available monitors",
+  "There_are_no_departments_added_to_this_tag_yet": "There are no departments added to this tag yet",
+  "There_are_no_departments_added_to_this_unit_yet": "There are no departments added to this unit yet",
+  "There_are_no_departments_available": "There are no departments available",
+  "There_are_no_integrations": "There are no integrations",
+  "There_are_no_monitors_added_to_this_unit_yet": "There are no monitors added to this unit yet",
+  "There_are_no_personal_access_tokens_created_yet": "There are no Personal Access Tokens created yet.",
+  "There_are_no_rooms_for_the_given_search_criteria": "There are no rooms for the given search criteria",
+  "There_are_no_users_in_this_role": "There are no users in this role.",
+  "There_is_no_video_conference_history_in_this_room": "There is no conference call history in this room",
+  "There_is_one_or_more_apps_in_an_invalid_state_Click_here_to_review": "There is one or more apps in an invalid state. Click here to review.",
+  "There_has_been_an_error_installing_the_app": "There has been an error installing the app",
+  "These_notes_will_be_available_in_the_call_summary": "These notes will be available in the call summary",
+  "This_agent_was_already_selected": "This agent was already selected",
+  "this_app_is_included_with_subscription": "This app is included with {{bundleName}} plans",
+  "This_cant_be_undone": "This can't be undone.",
+  "This_conversation_is_already_closed": "This conversation is already closed.",
+  "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "This email has already been used and has not been verified. Please change your password.",
+  "This_feature_is_currently_in_alpha": "This feature is currently in alpha!",
+  "This_is_a_desktop_notification": "This is a desktop notification",
+  "This_is_a_deprecated_feature_alert": "This is a deprecated feature. It may not work as expected and will not get new updates.",
+  "Zapier_integration_has_been_deprecated": "The Zapier integration has been deprecated, may not work as expected and will not receive updates",
+  "Install_Zapier_from_marketplace": "Install the Zapier app from Marketplace to avoid disruptions",
+  "Input": "Input",
+  "This_is_a_push_test_messsage": "This is a push test message",
+  "This_message_was_rejected_by__peer__peer": "This message was rejected by <em>{{peer}}</em> peer.",
+  "This_monitor_was_already_selected": "This monitor was already selected",
+  "This_month": "This Month",
+  "This_room_has_been_archived_by__username_": "This room has been archived by {{username}}",
+  "This_room_has_been_unarchived_by__username_": "This room has been unarchived by {{username}}",
+  "This_room_has_been_archived": "archived room",
+  "This_room_has_been_unarchived": "unarchived room",
+  "This_server_will_be_available_while_your_session_is_active": "This server will be available while your session is active",
+  "This_week": "This Week",
+  "thread": "thread",
+  "thread_message": "thread message",
+  "Thread_message_list": "Thread message list",
+  "Thread_message": "Commented on *{{username}}'s* message: _ {{msg}} _",
+  "Threads": "Threads",
+  "Threads_Description": "Threads allow organized discussions around a specific message.",
+  "Threads_unavailable_for_federation": "Threads are unavailable for Federated rooms",
+  "Thursday": "Thursday",
+  "Time_in_minutes": "Time in minutes",
+  "Time_in_seconds": "Time in seconds",
+  "Timeout": "Timeout",
+  "Timeout_in_miliseconds": "Timeout (in miliseconds)",
+  "Timeout_in_miliseconds_cant_be_negative_number": "Timeout (in miliseconds) can't a negative number",
+  "Timeout_in_miliseconds_hint": "The time in milliseconds to wait for an external service to respond before canceling the request.",
+  "Timeouts": "Timeouts",
+  "Timezone": "Timezone",
+  "Title": "Title",
+  "Title_bar_color": "Title bar color",
+  "Title_bar_color_offline": "Title bar color offline",
+  "Title_offline": "Title offline",
+  "To": "To",
+  "To_additional_emails": "To additional emails",
+  "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "To install Rocket.Chat Livechat in your website, copy &amp; paste this code above the last <strong>&lt;/body&gt;</strong> tag on your site.",
+  "To_prevent_seeing_this_message_again_allow_popups_from_workspace_URL": "To prevent seeing this message again, make sure your browser settings allow pop-ups to be opened from the workspace URL: ",
+  "to_see_more_details_on_how_to_integrate": "to see more details on how to integrate.",
+  "To_users": "To Users",
+  "Today": "Today",
+  "Toggle_original_translated": "Toggle original/translated",
+  "toggle-room-e2e-encryption": "Toggle Room E2E Encryption",
+  "toggle-room-e2e-encryption_description": "Permission to toggle e2e encryption room",
+  "Token": "Token",
+  "Token_Access": "Token Access",
+  "Token_Controlled_Access": "Token Controlled Access",
+  "Token_has_been_removed": "Token has been removed",
+  "Token_required": "Token required",
+  "Tokens_Minimum_Needed_Balance": "Minimum needed token balance",
+  "Tokens_Minimum_Needed_Balance_Description": "Set minimum needed balance on each token. Blank or \"0\" for not limit.",
+  "Tokens_Minimum_Needed_Balance_Placeholder": "Balance value",
+  "Tokens_Required": "Tokens required",
+  "Tokens_Required_Input_Description": "Type one or more tokens asset names separated by comma.",
+  "Tokens_Required_Input_Error": "Invalid typed tokens.",
+  "Tokens_Required_Input_Placeholder": "Tokens asset names",
+  "Topic": "Topic",
+  "Top_5_agents_with_the_most_conversations": "Top 5 agents with the most conversations",
+  "Total": "Total",
+  "Total_abandoned_chats": "Total Abandoned Chats",
+  "Total_conversations": "Total Conversations",
+  "Total_Discussions": "Discussions",
+  "Total_messages": "Total Messages",
+  "Total_rooms": "Total Rooms",
+  "Total_Threads": "Threads",
+  "Total_visitors": "Total Visitors",
+  "TOTP Invalid [totp-invalid]": "Code or password invalid",
+  "TOTP_reset_email": "Two Factor TOTP Reset Notification",
+  "TOTP_Reset_Other_Key_Warning": "Reset the current Two Factor TOTP will log out the user. The user will be able to set the Two Factor again later.",
+  "totp-disabled": "You do not have 2FA login enabled for your user",
+  "totp-invalid": "Code or password invalid",
+  "totp-required": "TOTP Required",
+  "totp-max-attempts": "Maximum OTP failed attempts reached. A new code will be generated.",
+  "Transcript": "Transcript",
+  "Transcript_Enabled": "Ask Visitor if They Would Like a Transcript After Chat Closed",
+  "Transcript_message": "Message to Show When Asking About Transcript",
+  "Transcript_of_your_livechat_conversation": "Transcript of your omnichannel conversation.",
+  "Transcript_Request": "Transcript Request",
+  "onboarding.form.registeredServerForm.continueStandalone": "Continue as standalone",
+  "transfer-livechat-guest": "Transfer Livechat Guests",
+  "transfer-livechat-guest_description": "Permission to transfer livechat guests",
+  "Transfer_to": "Transfer to",
+  "Transfer_call": "Transfer call",
+  "Transferred": "Transferred",
+  "Translate": "Translate",
+  "Translated": "Translated",
+  "Translate_to": "Translate to",
+  "Translations": "Translations",
+  "Travel_and_Places": "Travel & Places",
+  "Trigger_removed": "Trigger removed",
+  "Trigger_Words": "Trigger Words",
+  "Trigger": "Trigger",
+  "Triggers": "Triggers",
+  "Troubleshoot": "Troubleshoot",
+  "Troubleshoot_Description": "Configure how troubleshooting is handled on your workspace.",
+  "Troubleshoot_Disable_Data_Exporter_Processor": "Disable Data Exporter Processor",
+  "Troubleshoot_Disable_Data_Exporter_Processor_Alert": "This setting stops the processing of all export requests from users, so they will not receive the link to download their data!",
+  "Troubleshoot_Disable_Instance_Broadcast": "Disable Instance Broadcast",
+  "Troubleshoot_Disable_Instance_Broadcast_Alert": "This setting prevents the Rocket.Chat instances from sending events to the other instances, it may cause syncing problems and misbehavior!",
+  "Troubleshoot_Disable_Livechat_Activity_Monitor": "Disable Livechat Activity Monitor",
+  "Troubleshoot_Disable_Livechat_Activity_Monitor_Alert": "This setting stops the processing of livechat visitor sessions causing the statistics to stop working correctly!",
+  "Troubleshoot_Disable_Notifications": "Disable Notifications",
+  "Troubleshoot_Disable_Notifications_Alert": "This setting completely disables the notifications system; sounds, desktop notifications, mobile notifications, and emails will stop!",
+  "Troubleshoot_Disable_Presence_Broadcast": "Disable Presence Broadcast",
+  "Troubleshoot_Disable_Presence_Broadcast_Alert": "This setting prevents all instances form sending the status changes of the users to their clients keeping all the users with their presence status from the first load!",
+  "Troubleshoot_Disable_Sessions_Monitor": "Disable Sessions Monitor",
+  "Troubleshoot_Disable_Sessions_Monitor_Alert": "This setting stops the processing of user sessions causing the statistics to stop working correctly!",
+  "Troubleshoot_Disable_Teams_Mention": "Disable Teams mention",
+  "Troubleshoot_Disable_Teams_Mention_Alert": "This setting disables the teams mention feature. User's won't be able to mention a Team by name in a message and get its members notified.",
+  "Troubleshoot_Force_Caching_Version": "Force browsers to clear networking cache based on version change",
+  "Troubleshoot_Force_Caching_Version_Alert": "If the value provided is not empty and different from previous one the browsers will try to clear the cache. This setting should not be set for a long period since it affects the browser performance, please clear it as soon as possible.",
+  "True": "True",
+  "Try_now": "Try now",
+  "Try_searching_in_the_marketplace_instead": "Try searching in the Marketplace instead",
+  "Tuesday": "Tuesday",
+  "Turn_OFF": "Turn OFF",
+  "Turn_ON": "Turn ON",
+  "Turn_on_video": "Turn on video",
+  "Turn_on_answer_chats": "Turn on answer chats",
+  "Turn_on_answer_calls": "Turn on answer calls",
+  "Turn_on_microphone": "Turn on microphone",
+  "Turn_off_microphone": "Turn off microphone",
+  "Turn_off_answer_chats": "Turn off answer chats",
+  "Turn_off_answer_calls": "Turn off answer calls",
+  "Turn_off_video": "Turn off video",
+  "Two Factor Authentication": "Two Factor Authentication",
+  "Two-factor_authentication": "Two-factor authentication",
+  "Two-factor_authentication_via_TOTP": "Two-factor authentication via TOTP",
+  "Two-factor_authentication_disabled": "Two-factor authentication disabled",
+  "Two-factor_authentication_email": "Two-factor authentication via email",
+  "Two-factor_authentication_email_is_currently_disabled": "Two-factor authentication via Email is currently disabled",
+  "Two-factor_authentication_enabled": "Two-factor authentication enabled",
+  "Two-factor_authentication_is_currently_disabled": "Two-factor authentication via TOTP is currently disabled",
+  "Two-factor_authentication_native_mobile_app_warning": "WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.",
+  "Type": "Type",
+  "typing": "typing",
+  "Types": "Types",
+  "Types_and_Distribution": "Types and Distribution",
+  "Type_your_email": "Type your email",
+  "Type_your_job_title": "Type your job title",
+  "Type_your_message": "Type your message",
+  "Type_your_name": "Type your name",
+  "Type_your_password": "Type your password",
+  "Type_your_username": "Type your username",
+  "UI_Allow_room_names_with_special_chars": "Allow Special Characters in Room Names",
+  "UI_Click_Direct_Message": "Click to Create Direct Message",
+  "UI_Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
+  "UI_DisplayRoles": "Display Roles",
+  "UI_Group_Channels_By_Type": "Group channels by type",
+  "UI_Merge_Channels_Groups": "Merge Private Groups with Channels",
+  "UI_Show_top_navbar_embedded_layout": "Show top navbar in embedded layout",
+  "UI_Unread_Counter_Style": "Unread Counter Style",
+  "UI_Use_Name_Avatar": "Use Full Name Initials to Generate Default Avatar",
+  "UI_Use_Real_Name": "Use Real Name",
+  "unable-to-get-file": "Unable to get file",
+  "Unable_to_load_active_connections": "Unable to load active connections",
+  "Unable_to_complete_call": "Unable to complete call",
+  "Unable_to_make_calls_while_another_is_ongoing": "Unable to make calls while another call is ongoing",
+  "Unarchive": "Unarchive",
+  "unarchive-room": "Unarchive Room",
+  "unarchive-room_description": "Permission to unarchive channels",
+  "Unassigned": "Unassigned",
+  "Unassign_extension": "Unassign extension",
+  "unauthorized": "Not authorized",
+  "Unavailable": "Unavailable",
+  "Unavailable_in_encrypted_channels": "Unavailable in encrypted channels",
+  "Unblock": "Unblock",
+  "Unblock_User": "Unblock User",
+  "Uncheck_All": "Uncheck All",
+  "Uncollapse": "Uncollapse",
+  "Undefined": "Undefined",
+  "Unfavorite": "Unfavorite",
+  "Unfollow_message": "Unfollow message",
+  "Unignore": "Unignore",
+  "Uninstall": "Uninstall",
+  "Units": "Units",
+  "Unit_removed": "Unit Removed",
+  "Unique_ID_change_detected_description": "Information that identifies this workspace has changed. This can happen when the site URL or database connection string are changed or when a new workspace is created from a copy of an existing database.<br/><br/>Would you like to proceed with a configuration update to the existing workspace or create a new workspace and unique ID?",
+  "Unique_ID_change_detected_learn_more_link": "<a href=\"https://go.rocket.chat/i/fingerprint-changed-faq\" target=\"_blank\">Learn more</a>",
+  "Unique_ID_change_detected": "Unique ID change detected",
+  "Unknown_Import_State": "Unknown Import State",
+  "Unknown_User": "Unknown User",
+  "Unlimited": "Unlimited",
+  "Unmute": "Unmute",
+  "Unmute_someone_in_room": "Unmute someone in the room",
+  "Unmute_user": "Unmute user",
+  "Unnamed": "Unnamed",
+  "Unpin": "Unpin",
+  "Unpin_Message": "Unpin Message",
+  "unpinning-not-allowed": "Unpinning is not allowed",
+  "Unprioritized": "Unprioritized",
+  "Unread": "Unread",
+  "Unread_Count": "Unread Count",
+  "Unread_Count_DM": "Unread Count for Direct Messages",
+  "Unread_Count_Omni": "Unread Count for Omnichannel Chats",
+  "Unread_Messages": "Unread Messages",
+  "Unread_on_top": "Unread on top",
+  "Unread_Rooms": "Unread Rooms",
+  "Unread_Rooms_Mode": "Unread Rooms Mode",
+  "Unread_Requested_First": "Unread requested first",
+  "Unread_Requested_Last": "Unread requested last",
+  "Unread_Tray_Icon_Alert": "Unread Tray Icon Alert",
+  "Unstar_Message": "Remove star",
+  "Unmute_microphone": "Unmute Microphone",
+  "Update": "Update",
+  "Update_EnableChecker": "Enable the Update Checker",
+  "Update_EnableChecker_Description": "Checks automatically for new updates / important messages from the Rocket.Chat developers and receives notifications when available. The notification appears once per new version as a clickable banner and as a message from the Rocket.Cat bot, both visible only for administrators.",
+  "Update_every": "Update every",
+  "Update_LatestAvailableVersion": "Update Latest Available Version",
+  "Update_to_version": "Update to {{version}}",
+  "Update_your_RocketChat": "Update your Rocket.Chat",
+  "Updated_at": "Updated at",
+  "Upgrade_tab_upgrade_your_plan": "Upgrade your plan",
+  "Upload": "Upload",
+  "Uploads": "Uploads",
+  "Upload_private_app": "Upload private app",
+  "Upload_file_description": "File description",
+  "Upload_file": "Upload file",
+  "Upload_file_name": "File name",
+  "Upload_file_question": "Upload file?",
+  "Upload_Folder_Path": "Upload Folder Path",
+  "Upload_From": "Upload from {{name}}",
+  "Upload_user_avatar": "Upload avatar",
+  "Uploading_file": "Uploading file...",
+  "Uptime": "Uptime",
+  "URL": "URL",
+  "URLs": "URLs",
+  "Usage": "Usage",
+  "Use": "Use",
+  "Use_account_preference": "Use account preference",
+  "Use_Emojis": "Use Emojis",
+  "Use_Global_Settings": "Use Global Settings",
+  "Use_initials_avatar": "Use your username initials",
+  "Use_minor_colors": "Use minor color palette (defaults inherit major colors)",
+  "Use_Room_configuration": "Overwrites the server configuration and use room config",
+  "Use_Server_configuration": "Use server configuration",
+  "Use_service_avatar": "Use %s avatar",
+  "Use_this_response": "Use this response",
+  "Use_response": "Use response",
+  "Use_this_username": "Use this username",
+  "Use_uploaded_avatar": "Use uploaded avatar",
+  "Use_url_for_avatar": "Use URL for avatar",
+  "Use_User_Preferences_or_Global_Settings": "Use User Preferences or Global Settings",
+  "User": "User",
+  "User_card_actions": "User card actions",
+  "User_menu": "User menu",
+  "User Search": "User Search",
+  "User Search (Group Validation)": "User Search (Group Validation)",
+  "User__username__is_now_a_leader_of__room_name_": "User {{username}} is now a leader of {{room_name}}",
+  "User__username__is_now_a_moderator_of__room_name_": "User {{username}} is now a moderator of {{room_name}}",
+  "User__username__is_now_an_owner_of__room_name_": "User {{username}} is now an owner of {{room_name}}",
+  "User__username__muted_in_room__roomName__": "User {{username}} muted in room {{roomName}}",
+  "User__username__removed_from__room_name__leaders": "User {{username}} removed from {{room_name}} leaders",
+  "User__username__removed_from__room_name__moderators": "User {{username}} removed from {{room_name}} moderators",
+  "User__username__removed_from__room_name__owners": "User {{username}} removed from {{room_name}} owners",
+  "User__username__unmuted_in_room__roomName__": "User {{username}} unmuted in room {{roomName}}",
+  "User_added": "User added",
+  "User_added_by": "User {{user_added}} added by {{user_by}}.",
+  "User_added_to": "added {{user_added}}",
+  "User_added_successfully": "User added successfully",
+  "User_and_group_mentions_only": "User and group mentions only",
+  "User_cant_be_empty": "User cannot be empty",
+  "User_created_successfully!": "User create successfully!",
+  "User_default": "User default",
+  "User_doesnt_exist": "No user exists by the name of `@%s`.",
+  "User_e2e_key_was_reset": "User E2E key was reset successfully.",
+  "User_first_log_in": "User first log in",
+  "User_has_been_activated": "User has been activated",
+  "User_has_been_deactivated": "User has been deactivated",
+  "User_has_been_deleted": "User has been deleted",
+  "User_has_been_ignored": "User has been ignored",
+  "User_has_been_muted_in_s": "User has been muted in %s",
+  "User_has_been_removed_from_s": "User has been removed from %s",
+  "User_has_been_removed_from_team": "User has been removed from team",
+  "User_has_been_unignored": "User is no longer ignored",
+  "User_Info": "User Info",
+  "User_Interface": "User Interface",
+  "User_is_blocked": "User is blocked",
+  "User_is_no_longer_an_admin": "User is no longer an admin",
+  "User_is_now_an_admin": "User is now an admin",
+  "User_is_unblocked": "User is unblocked",
+  "User_joined_channel": "Has joined the channel.",
+  "User_joined_conversation": "Has joined the conversation",
+  "User_joined_team": "<strong>joined</strong> this Team",
+  "User_joined_the_channel": "joined the channel",
+  "User_joined_the_conversation": "joined the conversation",
+  "User_joined_the_team": "joined this team",
+  "user_joined_otr": "Has joined OTR chat.",
+  "user_key_refreshed_successfully": "key refreshed successfully",
+  "user_requested_otr_key_refresh": "Has requested key refresh.",
+  "User_left": "Has left the channel.",
+  "User_left_team": "<strong>left</strong> this Team",
+  "User_left_this_channel": "left the channel",
+  "User_left_this_team": "left this team",
+  "User_logged_out": "User is logged out",
+  "User_management": "User Management",
+  "User_mentions_only": "User mentions only",
+  "User_muted": "User Muted",
+  "User_muted_by": "User {{user_muted}} muted by {{user_by}}.",
+  "User_has_been_muted": "muted {{user_muted}}",
+  "User_not_found": "User not found",
+  "User_not_found_or_incorrect_password": "User not found or incorrect password",
+  "User_or_channel_name": "User or channel name",
+  "User_Presence": "User Presence",
+  "User_removed": "User removed",
+  "User_removed_by": "User {{user_removed}} removed by {{user_by}}.",
+  "User_has_been_removed": "removed {{user_removed}}",
+  "User_sent_a_message_on_channel": "<strong>{{username}}</strong> sent a message on <strong>{{channel}}</strong>",
+  "User_sent_a_message_to_you": "<strong>{{username}}</strong> sent you a message",
+  "user_sent_an_attachment": "{{user}} sent an attachment",
+  "User_Settings": "User Settings",
+  "User_started_a_new_conversation": "{{username}} started a new conversation",
+  "User_unmuted_by": "User {{user_unmuted}} unmuted by {{user_by}}.",
+  "User_has_been_unmuted": "unmuted {{user_unmuted}}",
+  "User_unmuted_in_room": "User unmuted in room",
+  "User_updated_successfully": "User updated successfully",
+  "User_uploaded_a_file_on_channel": "<strong>{{username}}</strong> uploaded a file on <strong>{{channel}}</strong>",
+  "User_uploaded_a_file_to_you": "<strong>{{username}}</strong> sent you a file",
+  "User_uploaded_file": "Uploaded a file",
+  "User_uploaded_image": "Uploaded an image",
+  "User_extension_not_found": "User extension not found",
+  "user-generate-access-token": "User Generate Access Token",
+  "user-generate-access-token_description": "Permission for users to generate access tokens",
+  "UserData_EnableDownload": "Enable User Data Download",
+  "UserData_FileSystemPath": "System Path (Exported Files)",
+  "view-livechat-facebook": "View Omnichannel Facebook",
+  "UserData_FileSystemZipPath": "System Path (Compressed File)",
+  "view-livechat-facebook_description": "Permission to view Omnichannel Facebook",
+  "UserData_MessageLimitPerRequest": "Message Limit per Request",
+  "UserData_ProcessingFrequency": "Processing Frequency (Minutes)",
+  "UserDataDownload": "User Data Download",
+  "UserDataDownload_Description": "Configurations to allow or disallow workspace members from downloading of workspace data.",
+  "UserDataDownload_CompletedRequestExisted_Text": "Your data file was already generated. Check your email account for the download link.",
+  "UserDataDownload_CompletedRequestExistedWithLink_Text": "Your data file was already generated. Click <a href=\"{{download_link}}\" target=\"_blank\">here</a> to download it.",
+  "UserDataDownload_EmailBody": "Your data file is now ready to download. Click <a href=\"{{download_link}}\">here</a> to download it.",
+  "UserDataDownload_EmailSubject": "Your Data File is Ready to Download",
+  "UserDataDownload_Requested": "Download File Requested",
+  "UserDataDownload_Requested_Text": "Your data file will be generated. A link to download it will be sent to your email address when ready. There are <strong>{{pending_operations}}</strong> queued operations to run before yours.",
+  "UserDataDownload_RequestExisted_Text": "Your data file is already being generated. A link to download it will be sent to your email address when ready. There are <strong>{{pending_operations}}</strong> queued operations to run before yours.",
+  "Username": "Username",
+  "Username_already_exist": "Username already exists. Please try another username.",
+  "Username_and_message_must_not_be_empty": "Username and message must not be empty.",
+  "Username_cant_be_empty": "The username cannot be empty",
+  "Username_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of usernames",
+  "Username_denied_the_OTR_session": "{{username}} denied the OTR session",
+  "Username_description": "The username is used to allow others to mention you in messages.",
+  "Username_doesnt_exist": "The username `%s` doesn't exist.",
+  "Username_ended_the_OTR_session": "{{username}} ended the OTR session",
+  "Username_invalid": "<strong>%s</strong> is not a valid username,<br/> use only letters, numbers, dots, hyphens and underscores",
+  "Username_is_already_in_here": "`@%s` is already in here.",
+  "Username_Placeholder": "Please enter usernames...",
+  "Username_title": "Register username",
+  "Username_has_been_updated": "Username has been updated",
+  "Username_wants_to_start_otr_Do_you_want_to_accept": "{{username}} wants to start OTR. Do you want to accept?",
+  "Username_name_email": "Username, name or e-mail",
+  "Users": "Users",
+  "Users must use Two Factor Authentication": "Users must use Two Factor Authentication",
+  "Users_added": "The users have been added",
+  "Users_and_rooms": "Users and Rooms",
+  "Users_by_time_of_day": "Users by time of day",
+  "Users_in_role": "Users in role",
+  "Users_key_has_been_reset": "User's key has been reset",
+  "Users_reacted": "Users that Reacted",
+  "Users_TOTP_has_been_reset": "User's TOTP has been reset",
+  "User_Without_Extensions": "Users without extensions",
+  "Uses": "Uses",
+  "Uses_left": "Uses left",
+  "UTC_Timezone": "UTC Timezone",
+  "Utilities": "Utilities",
+  "UTF8_Names_Slugify": "UTF8 Names Slugify",
+  "UTF8_User_Names_Validation": "UTF8 Usernames Validation",
+  "UTF8_User_Names_Validation_Description": "RegExp that will be used to validate usernames",
+  "UTF8_Channel_Names_Validation": "UTF8 Channel Names Validation",
+  "UTF8_Channel_Names_Validation_Description": "RegExp that will be used to validate channel names",
+  "Videocall_enabled": "Video Call Enabled",
+  "Validate_email_address": "Validate Email Address",
+  "Validation": "Validation",
+  "Value_messages": "{{value}} messages",
+  "Value_users": "{{value}} users",
+  "Verification": "Verification",
+  "Verification_Description": "You may use the following placeholders:  \n - `[Verification_Url]` for the verification URL.  \n - `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.  \n - `[email]` for the user's email.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
+  "Verification_Email": "Click <a href=\"[Verification_Url]\">here</a> to verify your email address.",
+  "Verification_email_body": "Please, click on the button below to confirm your email address.",
+  "Verification_email_sent": "Verification email sent",
+  "Verification_Email_Subject": "[Site_Name] - Email address verification",
+  "Verified": "Verified",
+  "Verify": "Verify",
+  "Verify_your_email": "Verify your email",
+  "Version": "Version",
+  "Version_version": "Version {{version}}",
+  "App_Request_Admin_Message": "Hi {{admin_name}}, {{user_name}} submitted a request to install {{app_name}} app on this workspace.  \n  \n This is the message they included:  \n>{{message}}  \n  \n To learn more and install the {{app_name}} app, [click here]({{learn_more}}).",
+  "App_version_incompatible_tooltip": "App incompatible with Rocket.Chat version",
+  "App_request_enduser_message": "The app you requested, {{appName}}, has just been installed on this workspace.  \n [Click here]({{learnmore}}) to learn about the app.",
+  "App_requests_by_workspace": "App requests by workspace members appear here",
+  "Video_Conference_Description": "Configure conferencing calls for your workspace.",
+  "Video_Chat_Window": "Video Chat",
+  "Video_Conference": "Conference Call",
+  "Video_Call_unavailable_for_this_type_of_room": "Video Call is unavailable for this type of room",
+  "Video_call": "Video call",
+  "Video_Conferences": "Conference Calls",
+  "Video_Conference_Info": "Meeting Information",
+  "Video_Conference_Url": "Meeting URL",
+  "video-conf-provider-not-configured": "**Conference call not enabled**: A workspace admin needs to enable the conference calls feature first.",
+  "Video_message": "Video message",
+  "Videocall_declined": "Video Call Declined.",
+  "Video_and_Audio_Call": "Video and Audio Call",
+  "video_conference_started": "_Started a call._",
+  "video_conference_started_by": "**{{username}}** _started a call._",
+  "video_conference_ended": "_Call has ended._",
+  "video_conference_ended_by": "**{{username}}** _ended a call._",
+  "video_livechat_started": "_Started a video call._",
+  "video_livechat_missed": "_Started a video call that wasn't answered._",
+  "video_direct_calling": "_Is calling._",
+  "video_direct_ended": "_Call has ended._",
+  "video_direct_ended_by": "**{{username}}** _ended a call._",
+  "video_direct_missed": "_Started a call that wasn't answered._",
+  "video_direct_started": "_Started a call._",
+  "VideoConf_Default_Provider": "Default Provider",
+  "VideoConf_Default_Provider_Description": "If you have multiple provider apps installed, select which one should be used for new conference calls.",
+  "VideoConf_Enable_Channels": "Enable in public channels",
+  "VideoConf_Enable_Groups": "Enable in private channels",
+  "VideoConf_Enable_DMs": "Enable in direct messages",
+  "VideoConf_Enable_Teams": "Enable in teams",
+  "VideoConf_Enable_Persistent_Chat": "Enable Persistent Chat",
+  "VideoConf_Enable_Persistent_Chat_description": "When persistent chat is enabled, Rocket.Chat will create a discussion every time a conference call is initiated. The provider app is responsible for sending the chat messages to this discussion.",
+  "VideoConf_Enable_Persistent_Chat_Alert": "Persistent Chat will not work if discussions are disabled on the workspace. It will also not work if the provider app being used do not explicitly support this feature.",
+  "VideoConf_Persistent_Chat_Discussion_Name": "Persistent Chat Discussion Name",
+  "VideoConf_Mobile_Ringing": "Enable mobile ringing",
+  "VideoConf_Mobile_Ringing_Description": "When enabled, direct calls to mobile users will ring their device as a phone call.",
+  "VideoConf_Mobile_Ringing_Alert": "This feature is currently in an experimental stage and may not yet be fully supported by the mobile app. When enabled it will send additional Push Notifications to users.",
+  "videoconf-ring-users": "Ring other users when calling",
+  "videoconf-ring-users_description": "Permission to ring other users when calling",
+  "Video_record": "Video record",
+  "Videos": "Videos",
+  "View_mode": "View Mode",
+  "View_All": "View All Members",
+  "View_channels": "View channels",
+  "view-agent-canned-responses": "View Agent Canned Responses",
+  "view-agent-canned-responses_description": "Permission to view agent canned responses",
+  "view-agent-extension-association": "View Agent Extension Association",
+  "view-agent-extension-association_description": "Permission to view agent extension association",
+  "view-all-canned-responses": "View All Canned Responses",
+  "view-all-canned-responses_description": "Permission to view all canned responses",
+  "view-import-operations": "View Import Operations",
+  "view-import-operations_description": "Permission to view import operations",
+  "view-omnichannel-contact-center": "View Omnichannel Contact Center",
+  "view-omnichannel-contact-center_description": "Permission to view and interact with the Omnichannel Contact Center",
+  "View_Logs": "View Logs",
+  "View_original": "View Original",
+  "View_the_Logs_for": "View the logs for: \"{{name}}\"",
+  "view-all-teams": "View All Teams",
+  "view-all-teams_description": "Permission to view all teams",
+  "view-all-team-channels": "View All Team Channels",
+  "view-all-team-channels_description": "Permission to view all team's channels",
+  "view-members-list-all-rooms": "Can view members in all rooms",
+  "view-members-list-all-rooms_description": "Gives the ability to see the members list in all rooms, even those the user is not part of",
+  "Room_members_list": "Members list",
+  "view-broadcast-member-list": "View Members List in Broadcast Room",
+  "view-broadcast-member-list_description": "Permission to view list of users in broadcast channel",
+  "view-c-room": "View Public Channel",
+  "view-c-room_description": "Permission to view public channels",
+  "view-canned-responses": "View Canned Responses",
+  "view-canned-responses_description": "Permission to view canned responses",
+  "view-d-room": "View Direct Messages",
+  "view-d-room_description": "Permission to view direct messages",
+  "view-device-management": "View Device Management",
+  "view-device-management_description": "Permission to view device management dashboard",
+  "view-engagement-dashboard": "View Engagement Dashboard",
+  "view-engagement-dashboard_description": "Permission to view engagement dashboard",
+  "view-federation-data": "View Federation Data",
+  "view-federation-data_description": "Permission to view federation data",
+  "View_full_conversation": "View full conversation",
+  "view-full-other-user-info": "View Full Other User Info",
+  "view-full-other-user-info_description": "Permission to view full profile of other users including account creation date, last login, etc.",
+  "view-history": "View History",
+  "view-history_description": "Permission to view the channel history",
+  "onboarding.component.form.action.registerNow": "Register now",
+  "view-join-code": "View Join Code",
+  "view-join-code_description": "Permission to view the channel join code",
+  "view-joined-room": "View Joined Room",
+  "view-joined-room_description": "Permission to view the currently joined channels",
+  "view-l-room": "View Omnichannel Rooms",
+  "create-livechat-contact": "Create Omnichannel contacts",
+  "update-livechat-contact": "Update Omnichannel contacts",
+  "view-l-room_description": "Permission to view Omnichannel rooms",
+  "view-livechat-analytics": "View Omnichannel Analytics",
+  "onboarding.page.awaitingConfirmation.subtitle": "We have sent you an email to {{emailAddress}} with a confirmation link. Please verify that the security code below matches the one in the email.",
+  "view-livechat-analytics_description": "Permission to view live chat analytics",
+  "view-livechat-appearance": "View Omnichannel Appearance",
+  "view-livechat-appearance_description": "Permission to view live chat appearance",
+  "view-livechat-business-hours": "View Omnichannel Business-Hours",
+  "view-livechat-business-hours_description": "Permission to view live chat business hours",
+  "view-livechat-current-chats": "View Omnichannel Current Chats",
+  "view-livechat-current-chats_description": "Permission to view live chat current chats",
+  "view-livechat-customfields": "View Omnichannel Custom Fields",
+  "view-livechat-customfields_description": "Permission to view Omnichannel custom fields",
+  "view-livechat-departments": "View Omnichannel Departments",
+  "view-livechat-departments_description": "Permission to view Omnichannel departments",
+  "view-livechat-installation": "View Omnichannel Installation",
+  "view-livechat-installation_description": "Permission to view Omnichannel installation",
+  "view-livechat-manager": "View Omnichannel Manager",
+  "view-livechat-manager_description": "Permission to view other Omnichannel managers",
+  "view-livechat-monitor": "View Livechat Monitors",
+  "view-livechat-queue": "View Omnichannel Queue",
+  "view-livechat-queue_description": "Permission to view Omnichannel queue",
+  "view-livechat-real-time-monitoring": "View Omnichannel Real-time Monitoring",
+  "view-livechat-room-closed-by-another-agent": "View Omnichannel Rooms closed by another agent",
+  "view-livechat-room-closed-by-another-agent_description": "Permission to view live chat rooms closed by another agent",
+  "view-livechat-room-closed-same-department": "View Omnichannel Rooms closed by another agent in the same department",
+  "view-livechat-room-closed-same-department_description": "Permission to view live chat rooms closed by another agent in the same department",
+  "view-livechat-room-customfields": "View Omnichannel Room Custom Fields",
+  "view-livechat-room-customfields_description": "Permission to view live chat room custom fields",
+  "view-livechat-rooms": "View Omnichannel Rooms",
+  "view-livechat-rooms_description": "Permission to view other Omnichannel rooms",
+  "view-livechat-triggers": "View Omnichannel Triggers",
+  "view-livechat-triggers_description": "Permission to view live chat triggers",
+  "view-livechat-webhooks": "View Omnichannel Webhooks",
+  "view-livechat-webhooks_description": "Permission to view live chat webhooks",
+  "view-livechat-unit": "View Livechat Units",
+  "view-logs": "View Logs",
+  "view-logs_description": "Permission to view the server logs ",
+  "view-other-user-channels": "View Other User Channels",
+  "view-other-user-channels_description": "Permission to view channels owned by other users",
+  "view-outside-room": "View Outside Room",
+  "view-outside-room_description": "Permission to view users outside the current room",
+  "view-p-room": "View Private Room",
+  "view-p-room_description": "Permission to view private channels",
+  "view-privileged-setting": "View Privileged Setting",
+  "view-privileged-setting_description": "Permission to view settings",
+  "view-moderation-console": "View Moderation Console",
+  "view-moderation-console_description": "Permission to view moderation console of the server",
+  "manage-moderation-actions": "Manage Moderation Actions",
+  "manage-moderation-actions_description": "Permission to manage moderation actions, perform actions on reported users",
+  "view-room-administration": "View Room Administration",
+  "view-room-administration_description": "Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives",
+  "view-statistics": "View Statistics",
+  "view-statistics_description": "Permission to view system statistics such as number of users logged in, number of rooms, operating system information",
+  "view-user-administration": "View User Administration",
+  "view-user-administration_description": "Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",
+  "view-user-voip-extension": "View User VoIP Extension",
+  "view-user-voip-extension_description": "Permission to view user's assigned VoIP Extension",
+  "view-voip-extension-details": "View VoIP Extension Details",
+  "view-voip-extension-details_description": "Permission to view the details associated with VoIP extensions",
+  "Viewing_room_administration": "Viewing room administration",
+  "Visibility": "Visibility",
+  "Visible": "Visible",
+  "Visible_To_Workspace": "Visible to workspace",
+  "Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today": "Visit [Site_URL] and try the best open source chat solution available today!",
+  "Visitor": "Visitor",
+  "Visitor_Email": "Visitor E-mail",
+  "Visitor_Info": "Visitor Info",
+  "Visitor_message": "Visitor Messages",
+  "Visitor_Name": "Visitor Name",
+  "Visitor_Name_Placeholder": "Please enter a visitor name...",
+  "Visitor_not_found": "Visitor not found",
+  "Visitor_does_not_exist": "Visitor does not exist!",
+  "Visitor_Navigation": "Visitor Navigation",
+  "Visitor_page_URL": "Visitor page URL",
+  "Visitor_time_on_site": "Visitor time on site",
+  "Voice_Call": "Voice Call",
+  "Voice_call": "Voice call",
+  "Voice_call_extension": "Voice call extension",
+  "Voice_calling_disabled": "Voice calling is disabled",
+  "Voice_calling_enabled": "Voice calling is enabled",
+  "Voice_calling_registration_failed": "Voice calling registration failed",
+  "Voice_Call_Extension": "Voice Call Extension",
+  "VoIP_Enable_Keep_Alive_For_Unstable_Networks": "Enable SIP Options Keep Alive",
+  "VoIP_Enable_Keep_Alive_For_Unstable_Networks_Description": "Monitor the status of multiple external SIP gateways by sending periodic SIP OPTIONS messages. Used for unstable networks.",
+  "VoIP_Enabled": "Enable voice channel",
+  "VoIP_Enabled_Description": "Connect agents to customers through outbound and incoming calls",
+  "VoIP_Extension": "VoIP Extension",
+  "Voip_Server_Configuration": "Asterisk WebSocket Server",
+  "VoIP_Server_Websocket_Port": "Websocket Port",
+  "VoIP_Server_Name": "Server Name",
+  "VoIP_Server_Websocket_Path": "Websocket URL",
+  "VoIP_Retry_Count": "Retry Count",
+  "VoIP_Retry_Count_Description": "Defines the number of times the client will try to reconnect to the VoIP server if the connection is lost.",
+  "VoIP_Management_Server": "VoIP Management Server",
+  "VoIP_Management_Server_Host": "Server Host",
+  "VoIP_Management_Server_Port": "Server Port",
+  "VoIP_Management_Server_Name": "Server Name",
+  "VoIP_Management_Server_Username": "Username",
+  "VoIP_Management_Server_Password": "Password",
+  "Voip_call_started": "Call started at",
+  "Voip_call_duration": "Call lasted {{duration}}",
+  "Voip_call_declined": "Call hanged up by agent",
+  "Voip_call_on_hold": "Call placed on hold at",
+  "Voip_call_unhold": "Call resumed at",
+  "Voip_call_ended": "Call ended at",
+  "Voip_call_ended_unexpectedly": "Call ended unexpectedly: {{reason}}",
+  "Voip_call_wrapup": "Call wrapup notes added: {{comment}}",
+  "VoIP_JWT_Secret": "Secret key (JWT)",
+  "VoIP_JWT_Secret_description": "Set a secret key for sharing extension details from server to client as JWT instead of plain text. Extension registration details will be sent as plain text if a secret key has not been set.",
+  "Voip_is_disabled": "VoIP is disabled",
+  "Voip_is_disabled_description": "To view the list of extensions it is necessary to activate VoIP, do so in the Settings tab.",
+  "VoIP_TeamCollab": "VoIP for Team Collaboration",
+  "VoIP_TeamCollab_Enabled": "Enabled",
+  "VoIP_TeamCollab_FreeSwitch_Host": "FreeSwitch Host",
+  "VoIP_TeamCollab_FreeSwitch_Port": "FreeSwitch Port",
+  "VoIP_TeamCollab_FreeSwitch_Password": "FreeSwitch Password",
+  "VoIP_TeamCollab_FreeSwitch_Timeout": "FreeSwitch Request Timeout",
+  "VoIP_TeamCollab_FreeSwitch_WebSocket_Path": "WebSocket Path",
+  "VoIP_Toggle": "Enable/Disable VoIP",
+  "Chat_opened_by_visitor": "Chat opened by the visitor",
+  "Wait_activation_warning": "Before you can login, your account must be manually activated by an administrator.",
+  "Waiting_for_answer": "Waiting for answer",
+  "Waiting_queue": "Waiting queue",
+  "Enterprise_cap_description": "Enterprise workspaces have no cap on the presence service.",
+  "Waiting_queue_message": "Waiting queue message",
+  "Waiting_queue_message_description": "Message that will be displayed to the visitors when they get in the queue",
+  "More_about_Enterprise_Edition": "More about Enterprise Edition",
+  "Waiting_Time": "Waiting Time",
+  "Waiting_for_server_connection": "Waiting for server connection",
+  "Warning": "Warning",
+  "Warnings": "Warnings",
+  "WAU_value": "WAU {{value}}",
+  "We_appreciate_your_feedback": "We appreciate your feedback",
+  "We_are_offline_Sorry_for_the_inconvenience": "We are offline. Sorry for the inconvenience.",
+  "We_Could_not_retrive_any_data": "We couldn't retrive any data",
+  "We_have_sent_password_email": "We have sent you an email with password reset instructions. If you do not receive an email shortly, please come back and try again.",
+  "We_have_sent_registration_email": "We have sent you an email to confirm your registration. If you do not receive an email shortly, please come back and try again.",
+  "Webdav Integration": "Webdav Integration",
+  "Webdav Integration_Description": "A framework for users to create, change and move documents on a server. Used to link WebDAV servers such as Nextcloud.",
+  "WebDAV_Accounts": "WebDAV Accounts",
+  "Webdav_add_new_account": "Add new WebDAV account",
+  "Webdav_Integration_Enabled": "Webdav Integration Enabled",
+  "WebDAV_Integration_Not_Allowed": "WebDAV Integration Not Allowed",
+  "Webdav_Password": "WebDAV Password",
+  "Webdav_Server_URL": "WebDAV Server Access URL",
+  "Webdav_Username": "WebDAV Username",
+  "Webdav_account_removed": "WebDAV account removed",
+  "webdav-account-saved": "WebDAV account saved",
+  "webdav-account-updated": "WebDAV account updated",
+  "webdav-server-not-found": "WebDAV server not found",
+  "Webhook_Details": "WebHook Details",
+  "Webhook_URL": "Webhook URL",
+  "Webhook_URL_not_set": "Webhook URL is not set",
+  "Webhooks": "Webhooks",
+  "WebRTC": "WebRTC",
+  "WebRTC_Description": "Broadcast audio and/or video material, as well as transmit arbitrary data between browsers without the need for a middleman.",
+  "WebRTC_Call": "WebRTC Call",
+  "WebRTC_Call_unavailable_for_federation": "WebRTC Call is unavailable for Federated rooms",
+  "WebRTC_direct_audio_call_from_%s": "Direct audio call from %s",
+  "WebRTC_direct_video_call_from_%s": "Direct video call from %s",
+  "WebRTC_Enable_Channel": "Enable for Public Channels",
+  "WebRTC_Enable_Direct": "Enable for Direct Messages",
+  "WebRTC_Enable_Private": "Enable for Private Channels",
+  "WebRTC_group_audio_call_from_%s": "Group audio call from %s",
+  "WebRTC_group_video_call_from_%s": "Group video call from %s",
+  "WebRTC_monitor_call_from_%s": "Monitor call from %s",
+  "WebRTC_Servers": "STUN/TURN Servers",
+  "WebRTC_Servers_Description": "A list of STUN and TURN servers separated by comma.  \n Username, password and port are allowed in the format `username:password@stun:host:port` or `username:password@turn:host:port`.",
+  "WebRTC_call_ended_message": "<i class=\"icon-phone\"></i> Call ended at {{endTime}} - Lasted {{callDuration}}",
+  "WebRTC_call_declined_message": "<i class=\"icon-phone\"></i> Call Declined by Contact.",
+  "Website": "Website",
+  "Wednesday": "Wednesday",
+  "Weekly_Active_Users": "Weekly Active Users",
+  "Welcome": "Welcome <em>%s</em>.",
+  "Welcome_email_failed": "Failed to resend welcome email",
+  "Welcome_email_resent": "Welcome email resent",
+  "Welcome_to": "Welcome to [Site_Name]",
+  "Welcome_to_workspace": "Welcome to {{Site_Name}}",
+  "Welcome_to_the": "Welcome to the",
+  "When": "When",
+  "When_a_line_starts_with_one_of_there_words_post_to_the_URLs_below": "When a line starts with one of these words, post to the URL(s) below",
+  "When_is_the_chat_busier?": "When is the chat busier?",
+  "Where_are_the_messages_being_sent?": "Where are the messages being sent?",
+  "Why_did_you_chose__score__": "Why did you chose {{score}}?",
+  "Why_do_you_want_to_report_question_mark": "Why do you want to report?",
+  "Will_Appear_In_From": "Will appear in the From: header of emails you send.",
+  "will_be_able_to": "will be able to",
+  "Will_be_available_here_after_saving": "Will be available here after saving.",
+  "Without_priority": "Without priority",
+  "Without_SLA": "Without SLA",
+  "Workspace_now_using_device_management": "Workspace now using device management",
+  "Worldwide": "Worldwide",
+  "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?",
+  "Would_you_like_to_return_the_queue": "Would you like to move back this room to the queue? All conversation history will be kept on the room.",
+  "Would_you_like_to_place_chat_on_hold": "Would you like to place this chat On-Hold?",
+  "multiple_instance_solutions": "multiple instance solutions",
+  "Wrap_up_the_call": "Wrap-up the call",
+  "Wrap_Up_Notes": "Wrap-Up Notes",
+  "Workspace": "Workspace",
+  "Yes": "Yes",
+  "Yes_archive_it": "Yes, archive it!",
+  "Yes_clear_all": "Yes, clear all!",
+  "Yes_continue": "Yes, continue!",
+  "Yes_deactivate_it": "Yes, deactivate it!",
+  "Yes_delete_it": "Yes, delete",
+  "Yes_hide_it": "Yes, hide it!",
+  "Yes_leave_it": "Yes, leave it!",
+  "Yes_mute_user": "Yes, mute user!",
+  "Yes_prune_them": "Yes, prune them!",
+  "Yes_pin_message": "Yes, pin message",
+  "Yes_remove_user": "Yes, remove user!",
+  "Yes_unarchive_it": "Yes, unarchive it!",
+  "yesterday": "yesterday",
+  "Yesterday": "Yesterday",
+  "You": "You",
+  "You_reacted_with": "You reacted with {{emoji}}",
+  "Users_reacted_with": "{{users}} reacted with {{emoji}}",
+  "Users_and_more_reacted_with": "{{users}} and {{counter}} more reacted with {{emoji}}",
+  "You_and_users_Reacted_with": "You and {{users}} reacted with {{emoji}}",
+  "You_users_and_more_Reacted_with": "You, {{users}} and {{counter}} more reacted with {{emoji}}",
+  "You_are_converting_team_to_channel": "You are converting this Team to a Channel.",
+  "you_are_in_preview_mode_of": "You are in preview mode of channel #<strong>{{room_name}}</strong>",
+  "you_are_in_preview": "You are in preview mode",
+  "you_are_in_preview_please_insert_the_password": "Please insert the password",
+  "you_are_in_preview_mode_of_incoming_livechat": "You are in preview mode of this chat",
+  "You_are_logged_in_as": "You are logged in as",
+  "You_are_not_authorized_to_view_this_page": "You are not authorized to view this page.",
+  "You_can_change_a_different_avatar_too": "You can override the avatar used to post from this integration.",
+  "You_can_close_this_window_now": "You can close this window now.",
+  "You_can_do_from_account_preferences": "You can do this later from your account preferences",
+  "You_can_search_using_RegExp_eg": "You can search using <a href=\"https://en.wikipedia.org/wiki/Regular_expression\" target=\"_blank\">Regular Expression</a>. e.g. <code class='code-colors inline'>/^text$/i</code>",
+  "You_can_try_to": "You can try to",
+  "You_can_use_an_emoji_as_avatar": "You can also use an emoji as an avatar.",
+  "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "You can use webhooks to easily integrate Omnichannel with your CRM.",
+  "You_cant_leave_a_livechat_room_Please_use_the_close_button": "You can't leave a omnichannel room. Please, use the close button.",
+  "You_followed_this_message": "You followed this message.",
+  "You_have_a_new_message": "You have a new message",
+  "You_have_been_muted": "You have been muted and cannot speak in this room",
+  "You_have_been_removed_from__roomName_": "You've been removed from the room {{roomName}}",
+  "You_have_created_user": "You’ve created 1 user",
+  "You_have_joined_a_new_call_with": "You have joined a new call with",
+  "You_have_n_codes_remaining": "You have {{number}} codes remaining.",
+  "You_have_not_verified_your_email": "You have not verified your email.",
+  "You_have_successfully_unsubscribed": "You have successfully unsubscribed from our Mailling List.",
+  "You_must_join_to_view_messages_in_this_channel": "You must join to view messages in this channel",
+  "You_mentioned___mentions__but_theyre_not_in_this_room": "You mentioned {{mentions}}, but they're not in this room.",
+  "You_mentioned___mentions__but_theyre_not_in_this_room_You_can_ask_a_room_admin_to_add_them": "You mentioned {{mentions}}, but they're not in this room. You can ask a room admin to add them.",
+  "You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm": "You mentioned {{mentions}}, but they're not in this room. You let them know via DM.",
+  "You_need_confirm_email": "You need to confirm your email to login!",
+  "You_need_install_an_extension_to_allow_screen_sharing": "You need install an extension to allow screen sharing",
+  "You_need_to_change_your_password": "You need to change your password",
+  "You_need_to_type_in_your_password_in_order_to_do_this": "You need to type in your password in order to do this!",
+  "You_need_to_type_in_your_username_in_order_to_do_this": "You need to type in your username in order to do this!",
+  "You_need_to_verifiy_your_email_address_to_get_notications": "You need to verify your email address to get notifications",
+  "You_need_to_write_something": "You need to write something!",
+  "You_reached_the_maximum_number_of_guest_users_allowed_by_your_license": "You reached the maximum number of guest users allowed by your license.",
+  "You_should_inform_one_url_at_least": "You should define at least one URL.",
+  "You_should_name_it_to_easily_manage_your_integrations": "You should name it to easily manage your integrations.",
+  "You_unfollowed_this_message": "You unfollowed this message.",
+  "You_will_be_asked_for_permissions": "You will be asked for permissions",
+  "You_will_not_be_able_to_recover": "You will not be able to recover this message!",
+  "You_will_not_be_able_to_recover_email_inbox": "You will not be able to recover this email inbox",
+  "You_will_not_be_able_to_recover_file": "You will not be able to recover this file!",
+  "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "You won't receive email notifications because you have not verified your email.",
+  "Your_e2e_key_has_been_reset": "Your e2e key has been reset.",
+  "Your_email_address_has_changed": "Your email address has been changed.",
+  "Your_email_has_been_queued_for_sending": "Your email has been queued for sending",
+  "Your_entry_has_been_deleted": "Your entry has been deleted.",
+  "Your_file_has_been_deleted": "Your file has been deleted.",
+  "Your_invite_link_will_expire_after__usesLeft__uses": "Your invite link will expire after {{usesLeft}} uses.",
+  "Your_invite_link_will_expire_on__date__": "Your invite link will expire on {{date}}.",
+  "Your_invite_link_will_expire_on__date__or_after__usesLeft__uses": "Your invite link will expire on {{date}} or after {{usesLeft}} uses.",
+  "Your_invite_link_will_never_expire": "Your invite link will never expire.",
+  "your_message": "your message",
+  "your_message_optional": "your message (optional)",
+  "Your_new_email_is_email": "Your new email address is <strong>[email]</strong>.",
+  "Your_E2EE_password_is": "Your E2EE password is:",
+  "Your_password_is_wrong": "Your password is wrong!",
+  "Your_E2EE_password_is_incorrect": "Your E2EE password is incorrect",
+  "Your_password_was_changed_by_an_admin": "Your password was changed by an admin.",
+  "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices",
+  "Your_request_to_join__roomName__has_been_made_it_could_take_up_to_15_minutes_to_be_processed": "Your request to join {{roomName}} has been made, it could take up to 15 minutes to be processed. You'll be notified when it's ready to go.",
+  "Your_question": "Your question",
+  "Your_server_link": "Your server link",
+  "Your_temporary_password_is_password": "Your temporary password is <strong>[password]</strong>.",
+  "Your_TOTP_has_been_reset": "Your Two Factor TOTP has been reset.",
+  "Your_web_browser_blocked_Rocket_Chat_from_opening_tab": "Your web browser blocked Rocket.Chat from opening a new tab.",
+  "Your_workspace_is_ready": "Your workspace is ready to use 🎉",
+  "Youre_not_a_part_of__channel__and_I_mentioned_you_there": "You're not a part of {{channel}} and I mentioned you there",
+  "Zapier": "Zapier",
+  "registration.page.login.errors.wrongCredentials": "User not found or incorrect password",
+  "registration.page.login.errors.invalidEmail": "Invalid Email",
+  "registration.page.login.errors.loginBlockedForIp": "Login has been temporarily blocked for this IP",
+  "registration.page.login.errors.loginBlockedForUser": "Login has been temporarily blocked for this User",
+  "registration.page.login.errors.licenseUserLimitReached": "The maximum number of users has been reached.",
+  "registration.page.login.errors.AppUserNotAllowedToLogin": "App users are not allowed to log in directly.",
+  "registration.page.registration.waitActivationWarning": "Before you can login, your account must be manually activated by an administrator.",
+  "registration.page.login.register": "New here? <1>Create an account</1>",
+  "registration.page.login.forgot": "Forgot your password?",
+  "registration.page.register.back": "Back to Login",
+  "registration.page.emailVerification.subTitle": "This server requires verified email addresses. Please check your email inbox for a verification link.",
+  "registration.page.emailVerification.sent": "Verification email sent, please check your inbox.",
+  "registration.page.resetPassword.sent": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
+  "registration.page.resetPassword.sendInstructions": "Send instructions",
+  "registration.page.resetPassword.errors.invalidEmail": "Invalid Email",
+  "registration.page.poweredBy": "Powered by <1>Rocket.Chat</1>",
+  "registration.page.guest.chooseHowToJoin": "Choose how you want to join",
+  "registration.page.guest.loginWithRocketChat": "Login with Rocket.Chat",
+  "registration.page.guest.continueAsGuest": "Continue as guest",
+  "registration.component.welcome": "Welcome to <1>Rocket.Chat</1> workspace",
+  "registration.component.login": "Login",
+  "registration.component.login.userNotFound": "User not found",
+  "registration.component.login.incorrectPassword": "Incorrect password",
+  "registration.component.switchLanguage": "Change to <1>{{name}}</1>",
+  "registration.component.resetPassword": "Reset password",
+  "registration.component.form.emailOrUsername": "Email or username",
+  "registration.component.form.username": "Username",
+  "registration.component.form.name": "Name",
+  "registration.component.form.nameContainsInvalidChars": "Name contains invalid characters",
+  "registration.component.form.usernameContainsInvalidChars": "Username contains invalid characters",
+  "registration.component.form.nameOptional": "Name optional",
+  "registration.component.form.createAnAccount": "Create an account",
+  "registration.component.form.userAlreadyExist": "Username already exists. Please try another username.",
+  "registration.component.form.emailAlreadyExists": "Email already exists",
+  "registration.component.form.usernameAlreadyExists": "Username already exists. Please try another username.",
+  "registration.component.form.invalidEmail": "The email entered is invalid",
+  "registration.component.form.email": "Email",
+  "registration.component.form.emailPlaceholder": "example@example.com",
+  "registration.component.form.password": "Password",
+  "registration.component.form.divider": "or",
+  "registration.component.form.submit": "Submit",
+  "registration.component.form.requiredField": "This field is required",
+  "registration.component.form.joinYourTeam": "Join your team",
+  "registration.component.form.reasonToJoin": "Reason to Join",
+  "registration.component.form.invalidConfirmPass": "The password confirmation does not match password",
+  "registration.component.form.confirmPassword": "Confirm your password",
+  "registration.component.form.confirmation": "Confirmation",
+  "registration.component.form.sendConfirmationEmail": "Send confirmation email",
+  "registration.component.form.register": "Register",
+  "onboarding.component.form.requiredField": "This field is required",
+  "onboarding.component.form.steps": "Step {{currentStep}} of {{stepCount}}",
+  "onboarding.component.form.action.back": "Back",
+  "onboarding.component.form.action.next": "Next",
+  "onboarding.component.form.action.skip": "Skip this step",
+  "onboarding.component.form.action.register": "Register",
+  "onboarding.component.form.action.registerWorkspace": "Register workspace",
+  "onboarding.component.form.action.registerOffline": "Register offline",
+  "onboarding.component.form.action.confirm": "Confirm",
+  "onboarding.component.form.action.pasteHere": "Paste here...",
+  "onboarding.component.form.action.completeRegistration": "Complete registration",
+  "onboarding.component.form.termsAndConditions": "I agree with <1>Terms and Conditions</1> and <3>Privacy Policy</3>",
+  "onboarding.component.emailCodeFallback": "Didn’t receive email? <1>Resend</1> or <3>Change email</3>.",
+  "onboarding.page.form.title": "Let's launch your workspace",
+  "onboarding.page.emailConfirmed.title": "Email Confirmed!",
+  "onboarding.page.emailConfirmed.subtitle": "You can return to your Rocket.Chat application – we have launched your workspace already.",
+  "onboarding.page.checkYourEmail.title": "Check your email",
+  "onboarding.page.checkYourEmail.subtitle": "Your request has been sent successfully.<1></1>Check your email inbox to launch your Premium plan trial.<1></1>The link will expire in 30 minutes.",
+  "onboarding.page.confirmationProcess.title": "Confirmation in Process",
+  "onboarding.page.cloudDescription.title": "Let's launch your workspace and <1>14-day trial</1>",
+  "onboarding.page.cloudDescription.tryGold": "Try our best Gold plan for 14 days for free",
+  "onboarding.page.cloudDescription.numberOfIntegrations": "1,000 integrations",
+  "onboarding.page.cloudDescription.availability": "High availability",
+  "onboarding.page.cloudDescription.auditing": "Message audit panel / Audit logs",
+  "onboarding.page.cloudDescription.engagement": "Engagement Dashboard",
+  "onboarding.page.cloudDescription.ldap": "LDAP enhanced sync",
+  "onboarding.page.cloudDescription.omnichannel": "Omnichannel premium",
+  "onboarding.page.cloudDescription.sla": "SLA: Premium",
+  "onboarding.page.cloudDescription.push": "Secured push notifications",
+  "onboarding.page.cloudDescription.goldIncludes": "* Golden plan includes all features from other plans",
+  "onboarding.page.alreadyHaveAccount": "Already have an account? <1>Manage your workspaces.</1>",
+  "onboarding.page.invalidLink.title": "Your Link is no Longer Valid",
+  "onboarding.page.invalidLink.content": "Seems like you have already used invite link. It’s generated for a single sign in. Request a new one to join your workspace.",
+  "onboarding.page.invalidLink.button.text": "Request new link",
+  "onboarding.page.requestTrial.title": "Request a <1>30-day Trial</1>",
+  "onboarding.page.requestTrial.subtitle": "Try our best Premium plan for 30 days for free",
+  "onboarding.page.magicLinkEmail.title": "We emailed you a login link",
+  "onboarding.page.magicLinkEmail.subtitle": "Click the link in the email we just sent you to sign in to your workspace. <1>The link will expire in 30 minutes.</1>",
+  "onboarding.form.adminInfoForm.title": "Admin Info",
+  "onboarding.form.adminInfoForm.subtitle": "We need this information to create an admin profile for your workspace.",
+  "onboarding.form.adminInfoForm.fields.fullName.label": "Full name",
+  "onboarding.form.adminInfoForm.fields.fullName.placeholder": "First and last name",
+  "onboarding.form.adminInfoForm.fields.username.label": "Username",
+  "onboarding.form.adminInfoForm.fields.username.placeholder": "@username",
+  "onboarding.form.adminInfoForm.fields.email.label": "Email",
+  "onboarding.form.adminInfoForm.fields.email.placeholder": "Email",
+  "onboarding.form.adminInfoForm.fields.password.label": "Password",
+  "onboarding.form.adminInfoForm.fields.password.placeholder": "Create password",
+  "onboarding.form.adminInfoForm.fields.keepPosted.label": "Keep me posted about Rocket.Chat updates",
+  "onboarding.form.awaitConfirmationForm.title": "Awaiting confirmation",
+  "onboarding.form.awaitConfirmationForm.content.securityCode": "Security code",
+  "onboarding.form.awaitConfirmationForm.content.sentEmail": "Email sent to <1>{{emailAddress}}</1> with a confirmation link.Please verify that the security code below matches the one in the email.",
+  "onboarding.form.organizationInfoForm.title": "Organization Info",
+  "onboarding.form.organizationInfoForm.subtitle": "We need to know who you are.",
+  "onboarding.form.organizationInfoForm.fields.organizationName.label": "Organization name",
+  "onboarding.form.organizationInfoForm.fields.organizationName.placeholder": "Organization name",
+  "onboarding.form.organizationInfoForm.fields.organizationType.label": "Organization type",
+  "onboarding.form.organizationInfoForm.fields.organizationType.placeholder": "Select",
+  "onboarding.form.organizationInfoForm.fields.organizationIndustry.label": "Organization industry",
+  "onboarding.form.organizationInfoForm.fields.organizationIndustry.placeholder": "Select",
+  "onboarding.form.organizationInfoForm.fields.organizationSize.label": "Organization size",
+  "onboarding.form.organizationInfoForm.fields.organizationSize.placeholder": "Select",
+  "onboarding.form.organizationInfoForm.fields.country.label": "Country",
+  "onboarding.form.organizationInfoForm.fields.country.placeholder": "Select",
+  "onboarding.form.registerOfflineForm.title": "Register Offline",
+  "onboarding.form.registerOfflineForm.copyStep.description": "If for any reason your workspace can’t be connected to the internet, follow these steps:<1></1>1. Go to: <2>cloud.rocket.chat > Workspaces</2> and click “<3>Register self-managed</3>”<4></4>2. Click “<5>Continue offline</5>”<6></6>3. In the <7>Register offline workspace</7> dialog in cloud.rocket.chat, paste the token in the box below",
+  "onboarding.form.registerOfflineForm.pasteStep.description": "1. In <1>cloud.rocket.chat</1> get the generated text and paste below to complete your registration process",
+  "onboarding.form.registerOfflineForm.fields.registrationToken.inputLabel": "Registration token",
+  "onboarding.form.registeredServerForm.title": "Register your workspace",
+  "onboarding.form.registeredServerForm.included.push": "Mobile push notifications",
+  "onboarding.form.registeredServerForm.included.externalProviders": "Integration with external providers (WhatsApp, Facebook, Telegram, Twitter)",
+  "onboarding.form.registeredServerForm.included.apps": "Access to marketplace apps",
+  "onboarding.form.registeredServerForm.fields.accountEmail.inputLabel": "Admin email",
+  "onboarding.form.registeredServerForm.fields.accountEmail.inputPlaceholder": "Insert your email to continue",
+  "onboarding.form.registeredServerForm.keepInformed": "Keep me informed about news and events",
+  "onboarding.form.registeredServerForm.registerLater": "Register later",
+  "onboarding.form.registeredServerForm.notConnectedToInternet": "The server is not connected to the internet, so you’ll have to do an offline registration for this workspace.",
+  "onboarding.form.registeredServerForm.registrationEngagement": "Registration allows automatic license updates, notifications of critical vulnerabilities and access to Rocket.Chat Cloud services. No sensitive workspace data is shared; statistics sent to Rocket.Chat are made visible to you within the administration area.",
+  "onboarding.form.registeredServerForm.registrationKeepInformed": "By submitting this form you consent to receive more information about Rocket.Chat products, events and updates, according to our <1>privacy policy</1>. You may unsubscribe at any time.",
+  "onboarding.form.standaloneServerForm.title": "Standalone Server Confirmation",
+  "onboarding.form.standaloneServerForm.servicesUnavailable": "Some of the services will be unavailable or will require manual setup",
+  "onboarding.form.standaloneServerForm.publishOwnApp": "In order to send push notitications you need to compile and publish your own app to Google Play and App Store",
+  "onboarding.form.standaloneServerForm.manuallyIntegrate": "Need to manually integrate with external services",
+  "subscription.callout.servicesDisruptionsMayOccur": "Services disruptions may occur",
+  "subscription.callout.servicesDisruptionsOccurring": "Services disruptions occurring",
+  "subscription.callout.capabilitiesDisabled": "Capabilities disabled",
+  "subscription.callout.description.limitsExceeded_one": "Your workspace exceeded the <1>{{val}}</1> license limit. <3>Manage your subscription</3> to increase limits.",
+  "subscription.callout.description.limitsExceeded_other": "Your workspace exceeded the <1>{{val, list}}</1> license limits. <3>Manage your subscription</3> to increase limits.",
+  "subscription.callout.description.limitsExceeded_two": "Your workspace exceeded the <1>{{val, list}}</1> license limits. <3>Manage your subscription</3> to increase limits.",
+  "subscription.callout.description.limitsReached_one": "Your workspace reached the <1>{{val}}</1> license limit. <3>Manage your subscription</3> to increase limits.",
+  "subscription.callout.description.limitsReached_other": "Your workspace reached the <1>{{val, list}}</1> license limits. <3>Manage your subscription</3> to increase limits.",
+  "subscription.callout.description.limitsReached_two": "Your workspace reached the <1>{{val, list}}</1> license limits. <3>Manage your subscription</3> to increase limits.",
+  "subscription.callout.allPremiumCapabilitiesDisabled": "All premium capabilities disabled",
+  "subscription.callout.activeUsers": "seats",
+  "subscription.callout.guestUsers": "guests",
+  "subscription.callout.roomsPerGuest": "max guest per room",
+  "subscription.callout.privateApps": "installed private apps",
+  "subscription.callout.marketplaceApps": "installed marketplace apps",
+  "subscription.callout.monthlyActiveContacts": "monthly active contacts",
+  "Something_Went_Wrong": "Something went wrong",
+  "Toolbox_room_actions": "Primary Room actions",
+  "Theme_light": "Light",
+  "Theme_light_description": "More accessible for individuals with visual impairments and a good choice for well-lit environments.",
+  "Theme_dark": "Dark",
+  "Theme_dark_description": "Reduce eye strain and fatigue in low-light conditions by minimizing the amount of light emitted by the screen.",
+  "Enable_of_limit_apps_currently_enabled": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.**  \n  \nWorkspaces on Community can have up to {{limit}} {{context}} apps enabled.  \n  \n**{{appName}} will be disabled by default.** Disable another {{context}} app or upgrade to Premium to enable this app.",
+  "Enable_of_limit_apps_currently_enabled_exceeded": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.**  \n  \nCommunity app limit has been exceeded.  \n  \nWorkspaces on Community can have up to {{limit}} {{context}} apps enabled.  \n  \n**{{appName}} will be disabled by default.** You will need to disable at least {{exceed}} other {{context}} apps or upgrade to a Premium plan to enable this app.",
+  "Workspaces_on_Community_edition_install_app": "Community workspaces can have up to {{limit}} {{context}} apps enabled. Upgrade to a Premium plan to enable unlimited apps.",
+  "Apps_Currently_Enabled": "{{enabled}} of {{limit}} {{context}} apps currently enabled",
+  "Disable_another_app": "Disable another app or upgrade to a Premium plan to enable this app.",
+  "Upload_anyway": "Upload anyway",
+  "App_limit_reached": "App limit reached",
+  "App_limit_exceeded": "App limit exceeded",
+  "Private_apps_limit_reached": "Private apps limit reached",
+  "Private_apps_limit_exceeded": "Private apps limit exceeded",
+  "Disable_at_least_more_apps": "You will need to disable at least {{numberOfExceededApps}} other apps or upgrade to a Premium plan to enable this app.",
+  "Community_Private_apps_limit_exceeded": "Community app limit has been exceeded.",
+  "Theme_match_system": "Match system",
+  "Theme_match_system_description": "Automatically match the appearance of your system.",
+  "Theme_high_contrast": "High contrast",
+  "Theme_high_contrast_description": "Maximum tonal differentiation with bold colors and sharp contrasts provide enhanced accessibility.",
+  "Highlighted_chosen_word": "Highlighted chosen word",
+  "Join_your_team": "Join your team",
+  "Create_a_password": "Create a password",
+  "Create_an_account": "Create an account",
+  "Get_all_apps": "Get all the apps your team needs",
+  "Workspaces_on_community_edition_trial_on": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Start a free Premium trial to remove these limits today!",
+  "Workspaces_on_community_edition_trial_off": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Upgrade to Premium to remove limits and supercharge your workspace.",
+  "No_private_apps_installed": "No private apps installed",
+  "Private_apps_are_side-loaded": "Private apps are side-loaded and are not available on the Marketplace.",
+  "Chat_transcript": "Chat transcript",
+  "Conversational_transcript": "Conversational transcript",
+  "Conversations_by_agents": "Conversations by agents",
+  "Conversations_by_channel": "Conversations by channel",
+  "Conversations_by_department": "Conversations by department",
+  "Conversations_by_status": "Conversations by status",
+  "Conversations_by_tag": "Conversations by tag",
+  "Send_conversation_transcript_via_email": "Send conversation transcript via email",
+  "Always_send_the_transcript_to_contacts_at_the_end_of_the_conversations": "Always send the transcript to contacts at the end of the conversations.",
+  "Export_conversation_transcript_as_PDF": "Export conversation transcript as PDF",
+  "Omnichannel_transcript_email": "Send chat transcript via email.",
+  "Accounts_Default_User_Preferences_omnichannelTranscriptEmail_Description": "Always send the transcript to contacts at the end of the conversations. This preference may be overriden by an admin setting.",
+  "Omnichannel_transcript_pdf": "Export chat transcript as PDF.",
+  "Accounts_Default_User_Preferences_omnichannelTranscriptPDF_Description": "Always export the transcript as PDF at the end of conversations.",
+  "Contact_email": "Contact email",
+  "Customer": "Customer",
+  "Time": "Time",
+  "Omnichannel_Agent": "Omnichannel Agent",
+  "This_attachment_is_not_supported": "Attachment format not supported",
+  "Send_transcript": "Send transcript",
+  "Undo_request": "Undo request",
+  "No_permission": "No permission",
+  "Users_Table_Generic_No_users": "No %s users",
+  "Users_Table_no_all_users_description": "No Users found.",
+  "Users_Table_no_pending_users_description": "Users who are pending activation or have been manually created but haven't logged in yet appear here.",
+  "Users_Table_no_active_users_description": "Active users appear here.",
+  "Users_Table_no_deactivated_users_description": "Deactivated users appear here.",
+  "Community_cap_description": "Community workspaces have a limit of 200 concurrent connections. If this limit is exceeded it will no longer be possible for users to see each others status. This does not affect sending and receiving of messages.",
+  "Premium_cap_description": "Premium plans do not have a presence service limit.",
+  "Service_status": "Service status",
+  "More_about_Premium_plans": "More about Premium plans",
+  "Presence_service_cap": "Presence service cap",
+  "User_Status": "User status",
+  "User_status_menu": "User status menu",
+  "Active_connections": "Active connections",
+  "Presence_service": "Presence service",
+  "Presence_broadcast_disabled": "Presence broadcast disabled internally",
+  "Presence_broadcast_disabled_Description": "This shows if the presence broadcast has been disabled automatically. This can happen if you don't have an Premium License and have more than 200 concurrent connections.",
+  "New_custom_status": "New custom status",
+  "Service_disabled": "The service is now disabled",
+  "Service_disabled_description": "You can't reenable it again until there's less than 200 active connections at the same time",
+  "User_status_disabled": "User status temporarily disabled to maintain performance.",
+  "User_status_disabled_learn_more": "User status disabled",
+  "User_status_disabled_learn_more_description": "Due to high volume of active connections, the service that handles user status is temporarily disabled. Administrators can re-enable this manually in the workspace settings.",
+  "Go_to_workspace_settings": "Go to workspace settings",
+  "User_status_temporarily_disabled": "User status temporarily disabled",
+  "Use_token": "Use token",
+  "Disconnected": "Disconnected",
+  "Disconnect_workspace": "Disconnect workspace",
+  "Awaiting_confirmation": "Awaiting confirmation",
+  "Security_code": "Security code",
+  "Registration_Token": "Registration Token",
+  "RegisterWorkspace_Button": "Register workspace",
+  "ConnectWorkspace_Button": "Connect workspace",
+  "Workspace_registered": "Workspace registered",
+  "Workspace_not_connected": "Workspace not connected",
+  "Token_Not_Recognized": "Token not recognized",
+  "RegisterWorkspace_Registered_Description": "These services are available",
+  "RegisterWorkspace_Registered_Subtitle": "Because this workspace is registered the following is available",
+  "RegisterWorkspace_Registered_Benefits": "Registration allows automatic license updates, notifications of critical vulnerabilities and access to Rocket.Chat Cloud services. No sensitive workspace data is shared with Rocket.Chat.",
+  "RegisterWorkspace_NotRegistered_Title": "Workspace not registered",
+  "RegisterWorkspace_NotRegistered_Subtitle": "Register this workspace and get",
+  "RegisterWorkspace_NotConnected_Title": "Workspace disconnected",
+  "RegisterWorkspace_NotConnected_Subtitle": "Connect this workspace and get",
+  "RegisterWorkspace_NotRegistered_Description": "Benefits of registering workspace",
+  "RegisterWorkspace_Disconnect_Subtitle": "Disconnecting your workspace will result in the loss of the following",
+  "RegisterWorkspace_Disconnect_Error": "An error occured disconnecting",
+  "RegisterWorkspace_Features_MobileNotifications_Title": "Mobile push notifications",
+  "RegisterWorkspace_Features_MobileNotifications_Description": "Allows workspace members to receive notifications on their mobile devices.",
+  "RegisterWorkspace_Features_MobileNotifications_Disconnect": "Workspace members will no longer receive notifications on their mobile devices.",
+  "RegisterWorkspace_Features_Marketplace_Title": "Marketplace",
+  "RegisterWorkspace_Features_Marketplace_Description": "Install Rocket.Chat Marketplace apps on this workspace.",
+  "RegisterWorkspace_Features_Marketplace_Disconnect": "It will no longer be possible to install apps.",
+  "RegisterWorkspace_Features_Omnichannel_Title": "Omnichannel",
+  "RegisterWorkspace_Features_Omnichannel_Description": "Talk to your audience, where they are, through the most popular social channels in the world.",
+  "RegisterWorkspace_Features_Omnichannel_Disconnect": "Omnichannel capabilities  will no longer be available.",
+  "RegisterWorkspace_Features_ThirdPartyLogin_Title": "Third-party login",
+  "RegisterWorkspace_Features_ThirdPartyLogin_Description": "Let workspace members log in using a set of third-party applications.",
+  "RegisterWorkspace_Features_ThirdPartyLogin_Disconnect": "Third-party login options will no longer be available.",
+  "RegisterWorkspace_Token_Title": "Register workspace with token",
+  "RegisterWorkspace_Token_Step_Two": "Copy the token and paste it below.",
+  "RegisterWorkspace_with_email": "Register workspace with email",
+  "RegisterWorkspace_Setup_Subtitle": "To register this workspace it needs to be associated it with a Rocket.Chat Cloud account.",
+  "RegisterWorkspace_Setup_Steps": "Step {{step}} of {{numberOfSteps}}",
+  "RegisterWorkspace_Setup_Label": "Cloud account email",
+  "RegisterWorkspace_Setup_Have_Account_Title": "Have an account?",
+  "RegisterWorkspace_Setup_Have_Account_Subtitle": "Enter your Cloud account email to associate this workspace with your account.",
+  "RegisterWorkspace_Setup_No_Account_Title": "Don't have an account?",
+  "RegisterWorkspace_Setup_No_Account_Subtitle": "Enter your email to create a new Cloud account and associate this workspace.",
+  "cloud.RegisterWorkspace_Setup_Email_Confirmation": "Email sent to <1>email</1> with a confirmation link.",
+  "RegisterWorkspace_Setup_Email_Verification": "Please verify that the security code below matches the one in the email.",
+  "RegisterWorkspace_Syncing_Error": "An error occured syncing your workspace",
+  "RegisterWorkspace_Syncing_Complete": "Sync Complete",
+  "RegisterWorkspace_Connection_Error": "An error occured connecting",
+  "cloud.RegisterWorkspace_Token_Step_One": "1. Go to: <1>cloud.rocket.chat > Workspaces</1> and click <3>'Register self-managed'</3>.",
+  "cloud.RegisterWorkspace_Setup_Terms_Privacy": "I agree with <1>Terms and Conditions</1> and <3>Privacy Policy</3>",
+  "Larger_amounts_of_active_connections": "For larger amounts of active connections you can consider our <1>multiple instance solutions</1>.",
+  "Uninstall_grandfathered_app": "Uninstall {{appName}}?",
+  "App_will_lose_grandfathered_status": "**This {{context}} app will lose its grandfathered status.**  \n  \nWorkspaces on Community can have up to {{limit}} {{context}} apps enabled. Grandfathered apps count towards the limit but the limit is not applied to them.",
+  "All_rooms": "All rooms",
+  "All_visible": "All visible",
+  "all": "all",
+  "Filter_by_room": "Filter by room type",
+  "Filter_by_visibility": "Filter by visibility",
+  "Theme_Appearence": "Theme Appearence",
+  "mentions_counter_one": "{{count}} mention",
+  "mentions_counter_other": "{{count}} mentions",
+  "mentions_counter_two": "{{count}} mentions",
+  "threads_counter_one": "{{count}} unread threaded message",
+  "threads_counter_other": "{{count}} unread threaded messages",
+  "threads_counter_two": "{{count}} unread threaded messages",
+  "group_mentions_counter_one": "{{count}} group mention",
+  "group_mentions_counter_other": "{{count}} group mentions",
+  "group_mentions_counter_two": "{{count}} group mentions",
+  "unread_messages_counter_one": "{{count}} unread message",
+  "unread_messages_counter_other": "{{count}} unread messages",
+  "unread_messages_counter_two": "{{count}} unread messages",
+  "Premium": "Premium",
+  "Enterprise": "Premium",
+  "Premium_capability": "Premium capability",
+  "Operating_withing_plan_limits": "Operating within plan limits",
+  "Plan_limits_reached": "Plan limits reached",
+  "Workspace_not_registered": "Workspace not registered",
+  "Users_Connected": "Users connected",
+  "Solve_issues": "Solve issues",
+  "Update_version": "Update version",
+  "Version_not_supported": "Version <1>not supported</1>",
+  "Version_supported_until": "Version <1>supported</1> until {{date}}",
+  "Check_support_availability": "Check <1>support</1> availability",
+  "Outdated": "Outdated",
+  "Latest": "Latest",
+  "New_version_available": "New version available",
+  "trial": "trial",
+  "Subscription": "Subscription",
+  "Manage_subscription": "Manage subscription",
+  "ActiveSessionsPeak": "Active sessions peak",
+  "ActiveSessionsPeak_InfoText": "Highest amount of active connections in the past 30 days",
+  "ActiveSessions": "Active sessions",
+  "ActiveSessions_available": "sessions available",
+  "Monthly_active_contacts": "Monthly active contacts",
+  "Upgrade": "Upgrade",
+  "Seats": "Seats",
+  "Marketplace_apps": "Marketplace apps",
+  "Private_apps": "Private apps",
+  "Finish_your_purchase_trial": "Finish your purchase to avoid <1>downgrade consequences.</1>",
+  "Contact_sales_trial": "Contact sales to finish your purchase and avoid <1>downgrade consequences.</1>",
+  "Why_has_a_trial_been_applied_to_this_workspace": "<0>Why has a trial been applied to this workspace?</0>",
+  "Compare_plans": "Compare plans",
+  "n_days_left": "{{n}} days left",
+  "Contact_sales": "Contact sales",
+  "Finish_purchase": "Finish purchase",
+  "Self_managed_hosting": "Self-managed hosting",
+  "Cloud_hosting": "Rocket.Chat cloud hosting",
+  "free_per_month_user": "$0 per month/user",
+  "Trial_active": "Trial active",
+  "Contact_sales_renew_date": "<0>Contact sales</0> to check plan renew date",
+  "Renews_DATE": "Renews {{date}}",
+  "UpgradeToGetMore_Headline": "Upgrade to get more",
+  "UpgradeToGetMore_Subtitle": "Supercharge your workspace with advanced capabilities.",
+  "UpgradeToGetMore_scalability_Title": "High scalabaility",
+  "UpgradeToGetMore_scalability_Body": "Improve efficiency, decrease costs and increase concurrent users usage by switching from monolithic to microservices or multi-instance.",
+  "UpgradeToGetMore_accessibility-certification_Title": "WCAG 2.1 and BITV 2.0",
+  "UpgradeToGetMore_accessibility-certification_Body": "Comply with WCAG and BITV standards with Rocket.Chat's accessibility program.",
+  "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
+  "UpgradeToGetMore_engagement-dashboard_Body": "Gain insights into user, message, and channel usage through the engagement dashboard.",
+  "UpgradeToGetMore_oauth-enterprise_Title": "Advanced authentication",
+  "UpgradeToGetMore_oauth-enterprise_Body": "Ensure proper access permissions through LDAP/SAML/Oauth with group roles mapping, channel subscription, auto logout and more.",
+  "UpgradeToGetMore_custom-roles_Title": "Custom roles",
+  "UpgradeToGetMore_custom-roles_Body": "Ensure a safe and productive work environment by setting specific roles and permissions for people in your workspace.",
+  "UpgradeToGetMore_auditing_Title": "Message auditing",
+  "UpgradeToGetMore_auditing_Body": "Audit conversations in one single place to ensure communication quality with customers, suppliers, and internal teams.",
+  "Seats_InfoText": "Each unique user occupies one seat. Deactivated users do not occupy seats. Total number of seats is defined by active license type.",
+  "CountSeats_InfoText": "Each unique user occupies one seat. Deactivated users do not occupy seats.",
+  "MAC_InfoText": "(MAC) the number of unique omnichannel contacts engaged with during the billing month.",
+  "CountMAC_InfoText": "(MAC) the number of unique omnichannel contacts engaged with during the calendar month.",
+  "ActiveSessions_InfoText": "Total concurrent connections. A single user can be connected multiple times. User presence service is disabled at 200 or more to prevent performance issues.",
+  "Apps_InfoText": "Community allows up to 3 private apps and 5 marketplace apps to be enabled",
+  "Remove_RocketChat_Watermark_InfoText": "Watermark is automatically removed when a paid license is active.",
+  "Remove_RocketChat_Watermark": "Remove Rocket.Chat watermark",
+  "High_scalabaility": "High scalabaility",
+  "Premium_and_unlimited_apps": "Premium and unlimited apps",
+  "Message_actions": "Message actions",
+  "Message_audit": "Message auditing",
+  "Message_list": "Message list",
+  "Premium_omnichannel_capabilities": "Premium omnichannel capabilities",
+  "Video_call_manager": "Video call manager",
+  "Unlimited_push_notifications": "Unlimited push notifications",
+  "Buy_more": "Buy more",
+  "Upgrade_to_Pro": "Upgrade to Pro",
+  "Sync_license_update": "Sync license update",
+  "Sync_license_update_Callout_Title": "We're updating your license",
+  "Sync_license_update_Callout": "If you don't notice any changes in your workspace within a few minutes, sync the license update.",
+  "Includes": "Includes",
+  "Unlock_premium_capabilities": "Unlock premium capabilities",
+  "Unlimited_seats": "Unlimited seats",
+  "Unlimited_MACs": "Unlimited MACs",
+  "Unlimited_seats_MACs": "Unlimited seats and MACs",
+  "Seat_limit_reached": "Seat limit reached",
+  "Seat_limit_reached_Description": "Your workspace reached its contractual seat limit. Buy more seats to add more users.",
+  "Buy_more_seats": "Buy more seats",
+  "Anyone_can_react_to_messages": "Anyone can react to messages",
+  "Name_cannot_have_spaces": "Name cannot have spaces",
+  "No_spaces": "No spaces",
+  "Add_people": "Add people",
+  "Anyone_can_access": "Anyone can access",
+  "Only_invited_people": "People can only join by being invited",
+  "Broadcast_hint_enabled": "Only {{roomType}} owners can write new messages but anyone can reply in a thread",
+  "Federation_is_currently_disabled_on_this_workspace": "Federation is currently disabled on this workspace",
+  "Search_options": "Search options",
+  "First_message_hint": "A discussion can start with a question like \"How do I upload a picture?\"",
+  "Delete_roomType": "Delete {{roomType}}",
+  "Delete_roomType_description": "Deleting this {{roomType}} will also delete all contained message. This cannot be undone.",
+  "Deleted_roomType": "{{roomName}} {{roomType}} has been deleted",
+  "unread_messages_one": "{{count}} unread message",
+  "unread_messages_other": "{{count}} unread messages",
+  "unread_messages_two": "{{count}} unread messages",
+  "Encrypted_messages": "End-to-end encrypted {{roomType}}. Search will not work with encrypted {{roomType}} and notifications may not show the messages content.",
+  "Encrypted_messages_false": "Messages are not encrypted",
+  "Encrypted_content_will_not_appear_search": "Room encrypted, encrypted content will not appear in search",
+  "Encrypted_content_cannot_be_searched_and_audited": "Encrypted content cannot be searched and audited",
+  "Encrypted_content_cannot_be_searched_and_audited_subtitle": "There are one or more encrypted rooms selected for audit.",
+  "Not_available_for_broadcast": "Not available for broadcast {{roomType}}",
+  "Not_available_for_this_workspace": "Not available for this workspace",
+  "People_can_only_join_by_being_invited": "People can only join by being invited",
+  "Go_to_href": "Go to: {{href}}",
+  "Anyone_can_send_new_messages": "Anyone can send new messages",
+  "Select_messages_to_hide": "Select messages to hide",
+  "Name_cannot_have_special_characters": "Name cannot have spaces or special characters",
+  "Resize": "Resize",
+  "Zoom_out": "Zoom out",
+  "Zoom_in": "Zoom in",
+  "Close_gallery": "Close gallery",
+  "Next_image": "Next Image",
+  "Previous_image": "Previous image",
+  "Image_gallery": "Image gallery",
+  "Add_topic": "Add topic",
+  "Chat_with_leader": "Chat with leader",
+  "You_cant_take_chats_unavailable": "You cannot take new conversations because you're unavailable",
+  "You_cant_take_chats_offline": "You cannot take new conversations because you're offline",
+  "New_navigation": "Enhanced navigation experience",
+  "New_navigation_description": "Explore our improved navigation, designed with clear scopes for easy access to what you need. This change serves as the foundation for future advancements in navigation management.",
+  "Workspace_and_user_settings": "Workspace and user settings",
+  "Sidebar_Sections_Order": "Sidebar sections order",
+  "Sidebar_Sections_Order_Description": "Select the categories in your preferred order",
+  "Incoming_Calls": "Incoming calls",
+  "Advanced_settings": "Advanced settings",
+  "Security_and_permissions": "Security and permissions",
+  "Sidepanel_navigation": "Secondary navigation for teams",
+  "Sidepanel_navigation_description": "Display channels and/or discussions associated with teams by default. This allows team owners to customize communication methods to best meet their team’s needs. This is currently in feature preview and will be a premium capability once fully released.",
+  "Show_channels_description": "Show team channels in second sidebar",
+  "Show_discussions_description": "Show team discussions in second sidebar"
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index d6cf085ad972..ea85c9bcbd85 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -2375,7 +2375,7 @@
   "Thank_you_for_your_feedback": "Ďakujeme vám za vašu spätnú väzbu",
   "The_application_name_is_required": "Názov aplikácie je povinný",
   "The_channel_name_is_required": "Názov kanála je povinný",
-  "The_emails_are_being_sent": "Posielajú sa e-maily.",   
+  "The_emails_are_being_sent": "Posielajú sa e-maily.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmena veľkosti obrázka nebude fungovať, pretože na vašom serveri nemôžeme nájsť aplikácie ImageMagick alebo GraphicsMagick.",
   "The_redirectUri_is_required": "Vyžaduje sa presmerovanie",
   "The_server_will_restart_in_s_seconds": "Server sa reštartuje v%s",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 64900b03860d..341e415aafd5 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -2355,7 +2355,7 @@
   "Thank_you_for_your_feedback": "Hvala za vaše mnenje",
   "The_application_name_is_required": "Ime aplikacije je obvezno",
   "The_channel_name_is_required": "Ime kanala je obvezno",
-  "The_emails_are_being_sent": "Pošiljanje e-poštnih sporočil.",   
+  "The_emails_are_being_sent": "Pošiljanje e-poštnih sporočil.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Velikost slike ne bo delovala, ker ne moremo zaznati ImageMagick ali GraphicsMagick, nameščenega na vašem strežniku.",
   "The_redirectUri_is_required": "Preusmeritveni uri (redirectUri) je zahtevan",
   "The_server_will_restart_in_s_seconds": "Strežnik se bo znova zagnal v %s sekundah",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index c5fb06df9529..32dd0a32fff3 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -2365,7 +2365,7 @@
   "Thank_you_for_your_feedback": "Faleminderit për komentin tuaj",
   "The_application_name_is_required": "Emri i aplikimit është e nevojshme",
   "The_channel_name_is_required": "Emri kanal është e nevojshme",
-  "The_emails_are_being_sent": "Email janë duke u dërguar.",   
+  "The_emails_are_being_sent": "Email janë duke u dërguar.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Imazhi resize nuk do të funksionojë, sepse ne nuk mund të zbulojë ImageMagick ose GraphicsMagick instaluar në serverin tuaj.",
   "The_redirectUri_is_required": "RedirectUri është e nevojshme",
   "The_server_will_restart_in_s_seconds": "Serveri do të rifillojë në %s sekonda",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index d60ff9ce80fe..74efaa8ffe90 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -2170,7 +2170,7 @@
   "Thank_you_for_your_feedback": "Хвала на повратним информацијама",
   "The_application_name_is_required": "Име апликације је потребно",
   "The_channel_name_is_required": "Име канала је потребно",
-  "The_emails_are_being_sent": "Е-поруке се шаљу.",   
+  "The_emails_are_being_sent": "Е-поруке се шаљу.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ресизе слика неће радити, јер не можемо открити ИмагеМагицк или грапхицсмагицк инсталиран на вашем серверу.",
   "The_redirectUri_is_required": "РедирецтУри је потребна",
   "The_server_will_restart_in_s_seconds": "Сервер ће се поново покренути у %s секунди",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 4f091bb77fa5..e16c30490b17 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -1580,6 +1580,7 @@
   "Direct_message_someone": "Skicka direktmeddelande till någon",
   "Direct_message_you_have_joined": "Du har anslutit till ett nytt direktmeddelande med",
   "Direct_Messages": "Direktmeddelanden",
+  "Direct_message": "Direktmeddelande",
   "Direct_Reply": "Direktsvar",
   "Direct_Reply_Advice": "Du kan svara direkt på detta mail. Ändra inte i tidigare mejl i tråden.",
   "Direct_Reply_Debug": "Debug Direct Reply (direktsvar)",
@@ -4735,7 +4736,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> kommer att kunna:",
   "The_channel_name_is_required": "Kanalnamnet krävs ",
   "The_emails_are_being_sent": "E-postmeddelandena  skickas.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",   
+  "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Det kommer inte att gå att ändra storlek på bilden, eftersom vi inte kan hitta ImageMagick eller GraphicsMagick på din server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelandet är en diskussion. Du kan inte återskapa meddelandena.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilaviseringar inaktiverades för alla användare. Gå till \"Administration > Push\" om du vill aktivera en gateway för pushmeddelanden igen",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index 520f6ce3a20f..699a6a408eff 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -2359,7 +2359,7 @@
   "Thank_you_for_your_feedback": "ขอบคุณสำหรับความคิดเห็นของคุณ",
   "The_application_name_is_required": "ต้องระบุชื่อแอ็พพลิเคชัน",
   "The_channel_name_is_required": "ต้องระบุชื่อช่อง",
-  "The_emails_are_being_sent": "กำลังส่งอีเมล",   
+  "The_emails_are_being_sent": "กำลังส่งอีเมล",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "การปรับขนาดภาพจะไม่ทำงานเนื่องจากเราไม่สามารถตรวจพบ ImageMagick หรือ GraphicsMagick ที่ติดตั้งบนเซิร์ฟเวอร์ของคุณ",
   "The_redirectUri_is_required": "จำเป็นต้องมี redirectUri",
   "The_server_will_restart_in_s_seconds": "เซิร์ฟเวอร์จะรีสตาร์ทเป็น %s วินาที",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index c3e879031912..8bba28e0c950 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -2801,7 +2801,7 @@
   "Thank_you_for_your_feedback": "Görüşleriniz için teşekkür ederiz",
   "The_application_name_is_required": "Uygulama adı gerekli",
   "The_channel_name_is_required": "Kanal adı gerekli",
-  "The_emails_are_being_sent": "E-postalar gönderiliyor.",   
+  "The_emails_are_being_sent": "E-postalar gönderiliyor.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Biz ImageMagick veya GraphicsMagick sunucunuzda yüklü algılayamaz çünkü resim boyutlandırmak çalışmaz.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Bu ileti bir tartışma olduğu için iletileri geri getiremeyeceksiniz!",
   "The_peer__peer__does_not_exist": "<em>{{peer}}</em> adında bir eş yok.",
diff --git a/packages/i18n/src/locales/ug.i18n.json b/packages/i18n/src/locales/ug.i18n.json
index b576cd5102cd..c177d0dfa065 100644
--- a/packages/i18n/src/locales/ug.i18n.json
+++ b/packages/i18n/src/locales/ug.i18n.json
@@ -1045,7 +1045,7 @@
   "Thank_you_for_your_feedback": "سىزنىڭ ئىنكاسىڭىزگە كۆپتىن كۆپ رەھمەت",
   "The_application_name_is_required": "ئەپنىڭ ئىسمىنى چوقۇم تولدۇرىسىز",
   "The_channel_name_is_required": "قانالنىڭ ئىسمىنى چوقۇم تولدۇرۇڭ",
-  "The_emails_are_being_sent": "ئىلخەت يوللاندى",   
+  "The_emails_are_being_sent": "ئىلخەت يوللاندى",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تاپالمىدۇق.GraphicsMagickنى ياكىImageMagick رەسىمنىڭ چوڭ كىچىكلىكىنى ئۆزگەرتكىلى بولمىدى، چۈنكى بىز مۇلازىمتېردا قاچىلىنىپ بولغان",
   "The_redirectUri_is_required": "چوقۇم تولدۇرۇڭURIسەكرەپ يۆتكەلگەن",
   "The_server_will_restart_in_s_seconds": "سېكۇنتتىن كېيىن قايتىدىن قوزغىتىلىدۇ %s مۇلازىمىتېر",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index eb2b8542d4e3..4ef4d2bc3084 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -477,6 +477,7 @@
   "AutoTranslate_DeepL": "DeepL",
   "AutoTranslate_Enabled": "Увімкнути автоматичний переклад",
   "AutoTranslate_Enabled_Description": "Увімкнення автоматичного перекладу дозволить користувачам з `доступом до автоматичного перекладу`  перекладати всі повідомлення на вибрану мову. Може стягуватись додаткова плата.",
+  "message_counter_many": "{{count}} повідомлень",
   "AutoTranslate_Google": "Google",
   "AutoTranslate_Microsoft": "Microsoft",
   "AutoTranslate_Microsoft_API_Key": "Ocp-Apim-Subscription-Key",
@@ -522,6 +523,7 @@
   "Blockstack_ButtonLabelText": "Текст мітки кнопки",
   "Blockstack_Generate_Username": "Згенерувати логін",
   "Body": "Тіло",
+  "message_counter_few": "{{count}} повідомлень",
   "bot_request": "Запит бота",
   "BotHelpers_userFields": "Поля користувача",
   "BotHelpers_userFields_Description": "CSV полів користувачів, до яких можна отримати доступ допоміжними методами ботів.",
@@ -568,7 +570,6 @@
   "CAS_enabled": "Увімкнено",
   "CAS_Login_Layout": "Стиль входу в CAS",
   "CAS_login_url": "URL-адреса входу в SSO",
-  "message_counter_many": "{{count}} повідомлень",
   "CAS_login_url_Description": "URL-адреса для входу зовнішньої служби SSO, наприклад: https: //sso.example.undef/sso/login",
   "CAS_popup_height": "Висота виринаючого вікна входу",
   "CAS_popup_width": "Ширина спливаючого вікна входу",
@@ -626,7 +627,6 @@
   "clear_history": "Очистити історію",
   "Click_here": "Натисніть тут",
   "Click_here_for_more_info": "Натисніть тут, щоб отримати додаткову інформацію",
-  "message_counter_few": "{{count}} повідомлень",
   "Click_here_to_enter_your_encryption_password": "Натисніть тут, щоб ввести пароль шифрування",
   "Click_here_to_view_and_copy_your_password": "Натисніть тут, щоб переглянути та скопіювати свій пароль.",
   "Click_the_messages_you_would_like_to_send_by_email": "Натисніть повідомлення, які ви хочете надіслати електронною поштою",
@@ -2911,7 +2911,7 @@
   "Thank_you_for_your_feedback": "Спасибі за ваш відгук",
   "The_application_name_is_required": "Ім'я програми потрібен",
   "The_channel_name_is_required": "Назва каналу потрібно",
-  "The_emails_are_being_sent": "Електронні листи відправляються.",   
+  "The_emails_are_being_sent": "Електронні листи відправляються.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Зміни розміру зображення не буде працювати, тому що ми не можемо виявити ImageMagick або GraphicsMagick встановлений на вашому сервері.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Повідомлення - це обговорення яке ви не зможете відновити!",
   "The_redirectUri_is_required": "RedirectUri потрібно",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index e4ff1343a079..8f4968e91396 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -2465,7 +2465,7 @@
   "Thank_you_for_your_feedback": "Cảm ơn phản hồi của bạn",
   "The_application_name_is_required": "Tên ứng dụng là bắt buộc",
   "The_channel_name_is_required": "Tên kênh là bắt buộc",
-  "The_emails_are_being_sent": "Các email đang được gửi.",   
+  "The_emails_are_being_sent": "Các email đang được gửi.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Thay đổi kích thước hình ảnh sẽ không hoạt động vì chúng tôi không thể phát hiện ImageMagick hoặc GraphicsMagick được cài đặt trên máy chủ của bạn.",
   "The_redirectUri_is_required": "RedirectUri là bắt buộc",
   "The_server_will_restart_in_s_seconds": "Máy chủ sẽ khởi động lại trong%s giây",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index 2da4905ae336..c1419e790e41 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -2392,7 +2392,7 @@
   "Thank_you_for_your_feedback": "感谢您的反馈意见",
   "The_application_name_is_required": "应用程序名称是必需的",
   "The_channel_name_is_required": "频道名称是必需的",
-  "The_emails_are_being_sent": "电子邮件正在发送。",   
+  "The_emails_are_being_sent": "电子邮件正在发送。",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "图像大小调整不起作用，因为我们无法检测到服务器上安装的ImageMagick或GraphicsMagick。",
   "The_redirectUri_is_required": "redirectUri是必需的",
   "The_server_will_restart_in_s_seconds": "服务器将以％s秒为单位重新启动",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 7b8dc7495a84..cfa0fab38c3b 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -3896,7 +3896,7 @@
   "The_application_name_is_required": "應用程式名稱是必需的",
   "The_channel_name_is_required": "頻道名稱是必需的",
   "The_emails_are_being_sent": "電子郵件傳送中",
-  "The_empty_room__roomName__will_be_removed_automatically": "空房間 <span style=\"font-weight: bold;\">{{roomName}}</span> 將自動刪除。",   
+  "The_empty_room__roomName__will_be_removed_automatically": "空房間 <span style=\"font-weight: bold;\">{{roomName}}</span> 將自動刪除。",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "圖片大小調整不會起作用，因為在我們偵測不到伺服器上安裝的 ImageMagick 或 GraphicsMagick 工具",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "此訊息是在論壇中您不可以復原訊息!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "所有使用者都停用了手機通知，請到“管理>推送”以再次啟用推送閘道",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index f3e8c2e0fc9e..9e4ebbc4e647 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -3556,7 +3556,7 @@
   "The_application_name_is_required": "应用名称必填",
   "The_channel_name_is_required": "频道名称为必填",
   "The_emails_are_being_sent": "邮件已发送。",
-  "The_empty_room__roomName__will_be_removed_automatically": "空房间 <span style=\"font-weight: bold;\">{{roomName}}</span> 将被自动移除。",   
+  "The_empty_room__roomName__will_be_removed_automatically": "空房间 <span style=\"font-weight: bold;\">{{roomName}}</span> 将被自动移除。",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "无法调整图片尺寸，因为我们无法在服务器上找到已安装的 ImageMagick 或 GraphicsMagick 。",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "此消息是一个讨论你将无法恢复此消息!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "所有用户的移动端通知都已禁用。前往 “管理 > 推送” 再次启用推送网关",

From 8663c2ea7e4f57acb55fac8c626d144e22bdcff7 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 10 Oct 2024 10:37:45 -0700
Subject: [PATCH 163/170] chore: remove pm2 dependency (#33524)

---
 apps/meteor/.gitignore                      |   1 -
 apps/meteor/ee/server/services/package.json |   3 -
 apps/meteor/package.json                    |   1 -
 yarn.lock                                   | 788 +-------------------
 4 files changed, 41 insertions(+), 752 deletions(-)

diff --git a/apps/meteor/.gitignore b/apps/meteor/.gitignore
index a9fd54ab8711..6411fe002c51 100644
--- a/apps/meteor/.gitignore
+++ b/apps/meteor/.gitignore
@@ -70,7 +70,6 @@ Thumbs.db
 thumbs.db
 tramp
 ecosystem.json
-pm2.json
 settings.json
 /public/livechat
 packages/rocketchat-i18n/i18n/livechat.*
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 506fd09eb15a..6c9ca9047fdc 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -5,8 +5,6 @@
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
-		"dev": "pm2 start ecosystem.config.js",
-		"pm2": "pm2",
 		"typecheck": "tsc --noEmit --skipLibCheck",
 		"build": "tsc",
 		"build-containers": "npm run build && docker-compose build && rm -rf ./dist",
@@ -61,7 +59,6 @@
 		"@types/ws": "^8.5.12",
 		"npm-run-all": "^4.1.5",
 		"pino-pretty": "^7.6.1",
-		"pm2": "^5.2.0",
 		"ts-node": "^10.9.2",
 		"typescript": "~5.5.4"
 	},
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index ef7882341fea..e05ad2d77c58 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -31,7 +31,6 @@
 		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
 		"stylelint:fix": "stylelint --fix \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
 		"typecheck": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" tsc -p tsconfig.typecheck.json",
-		"deploy": "yarn build && pm2 startOrRestart pm2.json",
 		"coverage": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' nyc -r html mocha --config ./.mocharc.js",
 		"test:e2e": "playwright test",
 		"test:e2e:federation": "playwright test --config=playwright-federation.config.ts",
diff --git a/yarn.lock b/yarn.lock
index 5a5a1b180a93..69a1a2b87c36 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5644,42 +5644,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opencensus/core@npm:0.0.9":
-  version: 0.0.9
-  resolution: "@opencensus/core@npm:0.0.9"
-  dependencies:
-    continuation-local-storage: ^3.2.1
-    log-driver: ^1.2.7
-    semver: ^5.5.0
-    shimmer: ^1.2.0
-    uuid: ^3.2.1
-  checksum: 37af50394cbf759a835182eedf9fbf328232916bdd2174e75221cf9f29393621d0d05eaf24bb61b89b50c740bc4f625e5c8f891e2db627ce6dbf1888d98857e5
-  languageName: node
-  linkType: hard
-
-"@opencensus/core@npm:^0.0.8":
-  version: 0.0.8
-  resolution: "@opencensus/core@npm:0.0.8"
-  dependencies:
-    continuation-local-storage: ^3.2.1
-    log-driver: ^1.2.7
-    semver: ^5.5.0
-    shimmer: ^1.2.0
-    uuid: ^3.2.1
-  checksum: b4ad6c9a4963407195ab9c2f2751888b1462807c547bd9a7ceb561c473073aacc17555afa9e37cbda01805be5e954085284629e502ed5d3fe7b3c628d9ec2882
-  languageName: node
-  linkType: hard
-
-"@opencensus/propagation-b3@npm:0.0.8":
-  version: 0.0.8
-  resolution: "@opencensus/propagation-b3@npm:0.0.8"
-  dependencies:
-    "@opencensus/core": ^0.0.8
-    uuid: ^3.2.1
-  checksum: c480bd181062ac15f23d5c833a1b1760f2734e013ab7d0bc3fc24d7d1f8330f38f426a56df6d1baf1384727b3dbc1f9ba2851caaac2125500327117fbafa8f70
-  languageName: node
-  linkType: hard
-
 "@pkgjs/parseargs@npm:^0.11.0":
   version: 0.11.0
   resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -5698,67 +5662,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pm2/agent@npm:~2.0.0":
-  version: 2.0.1
-  resolution: "@pm2/agent@npm:2.0.1"
-  dependencies:
-    async: ~3.2.0
-    chalk: ~3.0.0
-    dayjs: ~1.8.24
-    debug: ~4.3.1
-    eventemitter2: ~5.0.1
-    fast-json-patch: ^3.0.0-1
-    fclone: ~1.0.11
-    nssocket: 0.6.0
-    pm2-axon: ~4.0.1
-    pm2-axon-rpc: ~0.7.0
-    proxy-agent: ~5.0.0
-    semver: ~7.2.0
-    ws: ~7.4.0
-  checksum: d15e1ccec8e25bd020eabf2a59e0d2896082414b7950e918a1a19485ef1001012d7df6063fb720f453d9a2cd887abc80d576f985d2c28c127a7c1a16b95aee65
-  languageName: node
-  linkType: hard
-
-"@pm2/io@npm:~5.0.0":
-  version: 5.0.0
-  resolution: "@pm2/io@npm:5.0.0"
-  dependencies:
-    "@opencensus/core": 0.0.9
-    "@opencensus/propagation-b3": 0.0.8
-    async: ~2.6.1
-    debug: ~4.3.1
-    eventemitter2: ^6.3.1
-    require-in-the-middle: ^5.0.0
-    semver: 6.3.0
-    shimmer: ^1.2.0
-    signal-exit: ^3.0.3
-    tslib: 1.9.3
-  checksum: f912096e823003de941a539d1098243cdc39b896704dea176e75a1d4fb0e0573b552c0a30e5198c2415fee9e1d8365ce0a8e78257eb85a8bfb994f1fb8153af1
-  languageName: node
-  linkType: hard
-
-"@pm2/js-api@npm:~0.6.7":
-  version: 0.6.7
-  resolution: "@pm2/js-api@npm:0.6.7"
-  dependencies:
-    async: ^2.6.3
-    axios: ^0.21.0
-    debug: ~4.3.1
-    eventemitter2: ^6.3.1
-    ws: ^7.0.0
-  checksum: 43d1e4d06328ad18d8929225a0732fa20701694dea0e3af0ea692239e0adc45ef2f48a794599a8df88bc705d2e428b5b8018deb3709983c91ed0b74a834b2f21
-  languageName: node
-  linkType: hard
-
-"@pm2/pm2-version-check@npm:latest":
-  version: 1.0.4
-  resolution: "@pm2/pm2-version-check@npm:1.0.4"
-  dependencies:
-    debug: ^4.3.1
-  checksum: 663438d9154db3c11bc7d41a4838162542db9cb4cf989fe8936e9bd9e5b99e3a58d73c8888afa1180a8cb93375c1d165bb397939de8a5ab8507d13d2aed2a086
-  languageName: node
-  linkType: hard
-
 "@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.3":
   version: 0.5.7
   resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.7"
@@ -16146,7 +16049,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:6, agent-base@npm:^6.0.0, agent-base@npm:^6.0.2":
+"agent-base@npm:6, agent-base@npm:^6.0.2":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
   dependencies:
@@ -16303,22 +16206,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"amp-message@npm:~0.1.1":
-  version: 0.1.2
-  resolution: "amp-message@npm:0.1.2"
-  dependencies:
-    amp: 0.3.1
-  checksum: 30c93c1118aa157b5762cdf026c994dc3ebc0391e96dd047e1fddc471f11a93e5868fa21df48c0bdbc6ef7444f6a75284f9a2be4bb7e1cfcf6b5943023710ddb
-  languageName: node
-  linkType: hard
-
-"amp@npm:0.3.1, amp@npm:~0.3.1":
-  version: 0.3.1
-  resolution: "amp@npm:0.3.1"
-  checksum: d87c786ff03681b4a1d16396a84b9fefdbfc293d9aad4b2a10aa7ae53256f614ce103096b6e38f3cd93d5269fa13b152f9ce33f0f83551362530f4b8169c9ba2
-  languageName: node
-  linkType: hard
-
 "another-json@npm:^0.2.0":
   version: 0.2.0
   resolution: "another-json@npm:0.2.0"
@@ -17042,15 +16929,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ast-types@npm:^0.13.2":
-  version: 0.13.4
-  resolution: "ast-types@npm:0.13.4"
-  dependencies:
-    tslib: ^2.0.1
-  checksum: 5a51f7b70588ecced3601845a0e203279ca2f5fdc184416a0a1640c93ec0a267241d6090a328e78eebb8de81f8754754e0a4f1558ba2a3d638f8ccbd0b1f0eff
-  languageName: node
-  linkType: hard
-
 "ast-types@npm:^0.14.2":
   version: 0.14.2
   resolution: "ast-types@npm:0.14.2"
@@ -17088,16 +16966,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async-listener@npm:^0.6.0":
-  version: 0.6.10
-  resolution: "async-listener@npm:0.6.10"
-  dependencies:
-    semver: ^5.3.0
-    shimmer: ^1.1.0
-  checksum: f64cb835ad1a07d4ee800df6c1532f2a4f99e1c2a11da8e83c1bd4452bc01729a85552377bc120f144abc17be6c0bd0f740ebedfdf4b79ebd18844a51e307326
-  languageName: node
-  linkType: hard
-
 "async-retry@npm:^1.3.3":
   version: 1.3.3
   resolution: "async-retry@npm:1.3.3"
@@ -17121,7 +16989,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^2.6.3, async@npm:~2.6.1":
+"async@npm:^2.6.3":
   version: 2.6.4
   resolution: "async@npm:2.6.4"
   dependencies:
@@ -17130,7 +16998,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^3.2.0, async@npm:^3.2.3, async@npm:~3.2.0":
+"async@npm:^3.2.3":
   version: 3.2.3
   resolution: "async@npm:3.2.3"
   checksum: c4bee57ab2249af3dc83ca3ef9acfa8e822c0d5e5aa41bae3eaf7f673648343cd64ecd7d26091ffd357f3f044428b17b5f00098494b6cf8b6b3e9681f0636ca1
@@ -17284,7 +17152,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.21.0, axios@npm:^0.21.1":
+"axios@npm:^0.21.1":
   version: 0.21.4
   resolution: "axios@npm:0.21.4"
   dependencies:
@@ -17998,15 +17866,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"blessed@npm:0.1.81":
-  version: 0.1.81
-  resolution: "blessed@npm:0.1.81"
-  bin:
-    blessed: ./bin/tput.js
-  checksum: a8f96978cc8e3e5ac887c43df8523074ba4352b9a055d8b078c60ae1f9f62837c9eb620e5fc78ccbb005119167234fcf788915a16428c1c397a7fbf9f630b42c
-  languageName: node
-  linkType: hard
-
 "bluebird@npm:3.7.2, bluebird@npm:^3.1.5, bluebird@npm:^3.3.5, bluebird@npm:^3.5.0, bluebird@npm:^3.5.5":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
@@ -18049,13 +17908,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bodec@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "bodec@npm:0.1.0"
-  checksum: caa05f96954e2d412ce9ac164612a8532387c412f4811acedb3b724bfc7a819d5b8527d533d002dae8c31dcdc070bb11d52a4978fb6d889c2ea7cd242034c0f0
-  languageName: node
-  linkType: hard
-
 "body-parser@npm:1.20.1":
   version: 1.20.1
   resolution: "body-parser@npm:1.20.1"
@@ -19153,16 +19005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:3.0.0, chalk@npm:^3.0.0, chalk@npm:~3.0.0":
-  version: 3.0.0
-  resolution: "chalk@npm:3.0.0"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505
-  languageName: node
-  linkType: hard
-
 "chalk@npm:4.1.2, chalk@npm:^4, chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
@@ -19186,6 +19028,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "chalk@npm:3.0.0"
+  dependencies:
+    ansi-styles: ^4.1.0
+    supports-color: ^7.1.0
+  checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505
+  languageName: node
+  linkType: hard
+
 "change-case@npm:^4.1.2":
   version: 4.1.2
   resolution: "change-case@npm:4.1.2"
@@ -19267,13 +19119,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"charm@npm:~0.1.1":
-  version: 0.1.2
-  resolution: "charm@npm:0.1.2"
-  checksum: fe64983d7a87e7dacf225bd1fc10d34554110e128d3f3b8a91cfefb370b92211d0f1f7a9ff43df3ccfcb81d7f91525750b998519ab6b8e3c9dd249a3529ad783
-  languageName: node
-  linkType: hard
-
 "chart.js@npm:^3.8.0":
   version: 3.8.0
   resolution: "chart.js@npm:3.8.0"
@@ -19515,15 +19360,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-tableau@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "cli-tableau@npm:2.0.1"
-  dependencies:
-    chalk: 3.0.0
-  checksum: fcf6da84395744124562cd294e85bfc8272666c9dccbadc51ef8fa7648dd5ca5f9e49c00eeaa93013ef0b467ae3dab8a3fb342dbd84881146bf66508ce2b5ffc
-  languageName: node
-  linkType: hard
-
 "cli-width@npm:^2.0.0":
   version: 2.2.1
   resolution: "cli-width@npm:2.2.1"
@@ -19902,13 +19738,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:2.15.1":
-  version: 2.15.1
-  resolution: "commander@npm:2.15.1"
-  checksum: a1b6b66a98cd1862084fcb230d11f56d3af0e5a42c307158d987464d65112fd9f8de2a682895247d2e475f925895e70e5bda21379b1286b21c55dd5c17f0d5fa
-  languageName: node
-  linkType: hard
-
 "commander@npm:^10.0.0, commander@npm:^10.0.1":
   version: 10.0.1
   resolution: "commander@npm:10.0.1"
@@ -20174,16 +20003,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"continuation-local-storage@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "continuation-local-storage@npm:3.2.1"
-  dependencies:
-    async-listener: ^0.6.0
-    emitter-listener: ^1.1.1
-  checksum: 5ac1dcf354563a7121fc1653676ed8dda93565c469698dd7454c3485d9e2c3ca61347d754d02179d13d9e51665d23fffe6bf9e53e89a1865a0c5530384258c2f
-  languageName: node
-  linkType: hard
-
 "convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
   version: 1.8.0
   resolution: "convert-source-map@npm:1.8.0"
@@ -20514,13 +20333,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"croner@npm:~4.1.92":
-  version: 4.1.97
-  resolution: "croner@npm:4.1.97"
-  checksum: f4af304ee263685ee727a96ecceff9bff02b840582ab937b1254f9eacfc2248e014e51438165448d3ba5d03952ab6f8cd2e24080d1cb5d73d051536df8f184d3
-  languageName: node
-  linkType: hard
-
 "cross-env@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-env@npm:7.0.3"
@@ -21017,13 +20829,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"culvert@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "culvert@npm:0.1.2"
-  checksum: 86446c95b86bb3dec71503755b578db370a00397a332f9fd507b3cbbf514146535b840d5abf52611dcc84318004cfff3f00ef30549a3624c489d03fe2c1b1ef1
-  languageName: node
-  linkType: hard
-
 "currently-unhandled@npm:^0.4.1":
   version: 0.4.1
   resolution: "currently-unhandled@npm:0.4.1"
@@ -21279,13 +21084,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-uri-to-buffer@npm:3":
-  version: 3.0.1
-  resolution: "data-uri-to-buffer@npm:3.0.1"
-  checksum: c59c3009686a78c071806b72f4810856ec28222f0f4e252aa495ec027ed9732298ceea99c50328cf59b151dd34cbc3ad6150bbb43e41fc56fa19f48c99e9fc30
-  languageName: node
-  linkType: hard
-
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -21385,13 +21183,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dayjs@npm:~1.8.24, dayjs@npm:~1.8.25":
-  version: 1.8.36
-  resolution: "dayjs@npm:1.8.36"
-  checksum: 27079e08fd2c25178a2027cd5c10d7585e7b4e90f927b7387f9bb3458756205307dc0a980159ac1b1cd3ddba5528329d285ef8cf4ee1a8691bb511bd0e479981
-  languageName: node
-  linkType: hard
-
 "dbly-linked-list@npm:0.3.4":
   version: 0.3.4
   resolution: "dbly-linked-list@npm:0.3.4"
@@ -21410,7 +21201,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:~4.3.1":
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -21775,18 +21566,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"degenerator@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "degenerator@npm:3.0.2"
-  dependencies:
-    ast-types: ^0.13.2
-    escodegen: ^1.8.1
-    esprima: ^4.0.0
-    vm2: ^3.9.8
-  checksum: 6a8fffe1ddde692931a1d74c0636d9e6963f2aa16748d4b95f4833cdcbe8df571e5c127e4f1d625a4c340cc60f5a969ac9e5aa14baecfb6f69b85638e180cd97
-  languageName: node
-  linkType: hard
-
 "delaunator@npm:4":
   version: 4.0.1
   resolution: "delaunator@npm:4.0.1"
@@ -22552,15 +22331,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emitter-listener@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "emitter-listener@npm:1.1.2"
-  dependencies:
-    shimmer: ^1.2.0
-  checksum: 05166bad42a27e51a765ebac3b7d26ac111564fc2d36443cd819f95ef88ea1b9ba6f2895becbcea36f8009890a2a8cb7c36eb9e776d4978e370bd33cb0a181e8
-  languageName: node
-  linkType: hard
-
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
@@ -22721,7 +22491,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enquirer@npm:2.3.6, enquirer@npm:^2.3.0, enquirer@npm:^2.3.5":
+"enquirer@npm:^2.3.0, enquirer@npm:^2.3.5":
   version: 2.3.6
   resolution: "enquirer@npm:2.3.6"
   dependencies:
@@ -23219,25 +22989,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^1.8.1":
-  version: 1.14.3
-  resolution: "escodegen@npm:1.14.3"
-  dependencies:
-    esprima: ^4.0.1
-    estraverse: ^4.2.0
-    esutils: ^2.0.2
-    optionator: ^0.8.1
-    source-map: ~0.6.1
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0
-  languageName: node
-  linkType: hard
-
 "escodegen@npm:^2.0.0":
   version: 2.0.0
   resolution: "escodegen@npm:2.0.0"
@@ -23713,7 +23464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0":
+"estraverse@npm:^4.1.1":
   version: 4.3.0
   resolution: "estraverse@npm:4.3.0"
   checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
@@ -23784,27 +23535,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eventemitter2@npm:5.0.1, eventemitter2@npm:~5.0.1":
-  version: 5.0.1
-  resolution: "eventemitter2@npm:5.0.1"
-  checksum: 61cb074b8a71d6e0bcbbf3107aa08cede21b5a588858ef5faf6308d868f277eb30c1a65c5da0cb4e35960c6b2d5bcfb42dbfb7d0302decff94b68da368852b14
-  languageName: node
-  linkType: hard
-
-"eventemitter2@npm:^6.3.1, eventemitter2@npm:^6.4.9":
+"eventemitter2@npm:^6.4.9":
   version: 6.4.9
   resolution: "eventemitter2@npm:6.4.9"
   checksum: be59577c1e1c35509c7ba0e2624335c35bbcfd9485b8a977384c6cc6759341ea1a98d3cb9dbaa5cea4fff9b687e504504e3f9c2cc1674cf3bd8a43a7c74ea3eb
   languageName: node
   linkType: hard
 
-"eventemitter2@npm:~0.4.14":
-  version: 0.4.14
-  resolution: "eventemitter2@npm:0.4.14"
-  checksum: 214603a32aba5f49c0d7a68202a0d5e01e89b3c872c7c32172e80b513aaa06ee74d54de212705483a01c03dda7b396874b3576cbe9bc96d92bae0912dad89eb2
-  languageName: node
-  linkType: hard
-
 "eventemitter3@npm:^3.1.0":
   version: 3.1.2
   resolution: "eventemitter3@npm:3.1.2"
@@ -24252,13 +23989,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-patch@npm:^3.0.0-1":
-  version: 3.1.1
-  resolution: "fast-json-patch@npm:3.1.1"
-  checksum: c4525b61b2471df60d4b025b4118b036d99778a93431aa44d1084218182841d82ce93056f0f3bbd731a24e6a8e69820128adf1873eb2199a26c62ef58d137833
-  languageName: node
-  linkType: hard
-
 "fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
@@ -24377,13 +24107,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fclone@npm:1.0.11, fclone@npm:~1.0.11":
-  version: 1.0.11
-  resolution: "fclone@npm:1.0.11"
-  checksum: 016eb1eac443b0c896adf938f6b300bfc86365444f5160ccf3d68a598d1372d00ca96ab8e116185dc9f316cec83de5f2df157fe7fe365a57bcba1ccc17491f61
-  languageName: node
-  linkType: hard
-
 "fd-slicer@npm:~1.1.0":
   version: 1.1.0
   resolution: "fd-slicer@npm:1.1.0"
@@ -24566,13 +24289,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-uri-to-path@npm:2":
-  version: 2.0.0
-  resolution: "file-uri-to-path@npm:2.0.0"
-  checksum: 4a71a99ddaa6ae7ae7bffe2948c34da59982ed465d930a0af9cb59fcc10fcd93366cc356ec3337c18373fde5df7ac52afda4558f155febd1799d135552207edb
-  languageName: node
-  linkType: hard
-
 "filename-reserved-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "filename-reserved-regex@npm:2.0.0"
@@ -25254,16 +24970,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ftp@npm:^0.3.10":
-  version: 0.3.10
-  resolution: "ftp@npm:0.3.10"
-  dependencies:
-    readable-stream: 1.1.x
-    xregexp: 2.0.0
-  checksum: ddd313c1d44eb7429f3a7d77a0155dc8fe86a4c64dca58f395632333ce4b4e74c61413c6e0ef66ea3f3d32d905952fbb6d028c7117d522f793eb1fa282e17357
-  languageName: node
-  linkType: hard
-
 "function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
@@ -25559,20 +25265,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-uri@npm:3":
-  version: 3.0.2
-  resolution: "get-uri@npm:3.0.2"
-  dependencies:
-    "@tootallnate/once": 1
-    data-uri-to-buffer: 3
-    debug: 4
-    file-uri-to-path: 2
-    fs-extra: ^8.1.0
-    ftp: ^0.3.10
-  checksum: 5325b2906b08ca37529ca421cf52bc50376e75c6a945e0a8064e3f76b4bb67b8ab1e316a2fc7a307c8c606ab36d030720f39a57c97b027ff1134335e12102946
-  languageName: node
-  linkType: hard
-
 "get-value@npm:^2.0.3, get-value@npm:^2.0.6":
   version: 2.0.6
   resolution: "get-value@npm:2.0.6"
@@ -25651,20 +25343,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"git-node-fs@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "git-node-fs@npm:1.0.0"
-  checksum: 296b0c90e789de469879a924b8c0c10a2dd2821071fcf078621ff6203da7bd55dedf82a5143c4ed62f6f41a56567daf0313220865e649d8c35df7e7d48cb482e
-  languageName: node
-  linkType: hard
-
-"git-sha1@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "git-sha1@npm:0.1.2"
-  checksum: f34de0d11c02dd3131599022cec79b2920229745b4a757f3ad6141a752cf5b0af4e22a4d768229020616bf03099b4a6645496489232841f378a4953fb42848fc
-  languageName: node
-  linkType: hard
-
 "github-from-package@npm:0.0.0":
   version: 0.0.0
   resolution: "github-from-package@npm:0.0.0"
@@ -25755,7 +25433,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
+"glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
   dependencies:
@@ -26888,7 +26566,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^4.0.0, http-proxy-agent@npm:^4.0.1":
+"http-proxy-agent@npm:^4.0.1":
   version: 4.0.1
   resolution: "http-proxy-agent@npm:4.0.1"
   dependencies:
@@ -26964,7 +26642,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:5, https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
+"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
   dependencies:
@@ -27690,13 +27368,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip@npm:^1.1.5":
-  version: 1.1.8
-  resolution: "ip@npm:1.1.8"
-  checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
-  languageName: node
-  linkType: hard
-
 "ip@npm:^2.0.0":
   version: 2.0.0
   resolution: "ip@npm:2.0.0"
@@ -29532,18 +29203,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-git@npm:^0.7.8":
-  version: 0.7.8
-  resolution: "js-git@npm:0.7.8"
-  dependencies:
-    bodec: ^0.1.0
-    culvert: ^0.1.2
-    git-sha1: ^0.1.2
-    pako: ^0.2.5
-  checksum: ec4ffb5b1c19e93398db20838aaf3815ed7fc9d1cfff786eef0e4d3a4fb46860e7dd2bbb41b2028ea291c16c63b53efd3cd74eb8c4ca97109d61fb805dcf698a
-  languageName: node
-  linkType: hard
-
 "js-sha256@npm:^0.9.0":
   version: 0.9.0
   resolution: "js-sha256@npm:0.9.0"
@@ -29782,7 +29441,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.1":
+"json-stringify-safe@npm:~5.0.1":
   version: 5.0.1
   resolution: "json-stringify-safe@npm:5.0.1"
   checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee
@@ -30234,13 +29893,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lazy@npm:~1.0.11":
-  version: 1.0.11
-  resolution: "lazy@npm:1.0.11"
-  checksum: fa1ae5fccb7c72c9c0b56c271dd21e2e0caf95da9e5fbf8a230a12d5c132c6a2b09236250cb73ab2b29ecfaec7cb2208745c290272f3bb82761accef3566b3a7
-  languageName: node
-  linkType: hard
-
 "lazystream@npm:^1.0.0":
   version: 1.0.1
   resolution: "lazystream@npm:1.0.1"
@@ -30763,13 +30415,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"log-driver@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "log-driver@npm:1.2.7"
-  checksum: 14949119f830d897f52a0f83b058d8af3d13b9d21deedcc341c65c523091d4f95b0c151798b0bb988ed2712f487d9d44c302cd95b177708a80ac8e47a6a28a16
-  languageName: node
-  linkType: hard
-
 "log-symbols@npm:4.1.0, log-symbols@npm:^4.1.0":
   version: 4.1.0
   resolution: "log-symbols@npm:4.1.0"
@@ -32061,15 +31706,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:1.0.4, mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "mkdirp@npm:1.0.4"
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
-  languageName: node
-  linkType: hard
-
 "mkdirp@npm:^0.5.0, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
@@ -32081,6 +31717,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "mkdirp@npm:1.0.4"
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
+  languageName: node
+  linkType: hard
+
 "mocha@npm:^9.2.2":
   version: 9.2.2
   resolution: "mocha@npm:9.2.2"
@@ -32148,13 +31793,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"module-details-from-path@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "module-details-from-path@npm:1.0.3"
-  checksum: 378a8a26013889aa3086bfb0776b7860c5bb957336253e1ba5d779c2f239a218930b145ca76e52c1dd7c8079d52b2af64b8eec30822f81ffdb0dfa27d6fe6f33
-  languageName: node
-  linkType: hard
-
 "module-not-found-error@npm:^1.0.1":
   version: 1.0.1
   resolution: "module-not-found-error@npm:1.0.1"
@@ -32653,19 +32291,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"needle@npm:2.4.0":
-  version: 2.4.0
-  resolution: "needle@npm:2.4.0"
-  dependencies:
-    debug: ^3.2.6
-    iconv-lite: ^0.4.4
-    sax: ^1.2.4
-  bin:
-    needle: ./bin/needle
-  checksum: 140de239917090e659d2dd5eb51811a0929330063f8317d804ac67f99d4bfdf077987b4f4358a12cbcd98059899cec4fca530e017427b2d735d5f50fb203e118
-  languageName: node
-  linkType: hard
-
 "needle@npm:^2.2.1":
   version: 2.9.1
   resolution: "needle@npm:2.9.1"
@@ -32707,13 +32332,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"netmask@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "netmask@npm:2.0.2"
-  checksum: c65cb8d3f7ea5669edddb3217e4c96910a60d0d9a4b52d9847ff6b28b2d0277cd8464eee0ef85133cdee32605c57940cacdd04a9a019079b091b6bba4cb0ec22
-  languageName: node
-  linkType: hard
-
 "new-event-polyfill@npm:^1.0.1":
   version: 1.0.1
   resolution: "new-event-polyfill@npm:1.0.1"
@@ -33273,16 +32891,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nssocket@npm:0.6.0":
-  version: 0.6.0
-  resolution: "nssocket@npm:0.6.0"
-  dependencies:
-    eventemitter2: ~0.4.14
-    lazy: ~1.0.11
-  checksum: 43ffcb4013407e328578fb8c628509da19759cb2dc947b23df3a15955b40dafc9cbe58e40c74d01a2dca67853a858f035c9ff163df586833755b6b87a155789e
-  languageName: node
-  linkType: hard
-
 "nth-check@npm:^1.0.2":
   version: 1.0.2
   resolution: "nth-check@npm:1.0.2"
@@ -34091,34 +33699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pac-proxy-agent@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "pac-proxy-agent@npm:5.0.0"
-  dependencies:
-    "@tootallnate/once": 1
-    agent-base: 6
-    debug: 4
-    get-uri: 3
-    http-proxy-agent: ^4.0.1
-    https-proxy-agent: 5
-    pac-resolver: ^5.0.0
-    raw-body: ^2.2.0
-    socks-proxy-agent: 5
-  checksum: cfd26a0e2ebfea4ca6162465018ce093bf147d26cf6c8fb3e7155bc7c184370d80d4d09a1c097e3db7676d0e3f574ea1cb56a4aa7d1d2e5cca6238935fabf010
-  languageName: node
-  linkType: hard
-
-"pac-resolver@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "pac-resolver@npm:5.0.0"
-  dependencies:
-    degenerator: ^3.0.1
-    ip: ^1.1.5
-    netmask: ^2.0.1
-  checksum: d6c0f86917bcb759136f47ded0818f14bf2b424a1c3efe6e11bdb9728e5465bfefd05c163f9808766b06605aa0d211c538583293c72dca4c499452493550f4d7
-  languageName: node
-  linkType: hard
-
 "package-hash@npm:^3.0.0":
   version: 3.0.0
   resolution: "package-hash@npm:3.0.0"
@@ -34679,24 +34259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pidusage@npm:^2.0.21":
-  version: 2.0.21
-  resolution: "pidusage@npm:2.0.21"
-  dependencies:
-    safe-buffer: ^5.2.1
-  checksum: af26115e48de2368138fceb7a99b418ab6c4dd9d6e1ed6991aef2d09e49d076987f395cddd8340ecdf1ccaf126574c2bc5b5c9c392ffacff8ee8a642271f9b12
-  languageName: node
-  linkType: hard
-
-"pidusage@npm:~3.0":
-  version: 3.0.0
-  resolution: "pidusage@npm:3.0.0"
-  dependencies:
-    safe-buffer: ^5.2.1
-  checksum: 1bf9303f8e335b22c297ded9bc9d4569c78c59e9470ac15f00df27bac83b872e9bbaee2256fa5f86704977b924c268941e867ece038d66ee92ec7cccca77a1cf
-  languageName: node
-  linkType: hard
-
 "pify@npm:^2.0.0, pify@npm:^2.2.0, pify@npm:^2.3.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
@@ -34892,105 +34454,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pm2-axon-rpc@npm:~0.7.0, pm2-axon-rpc@npm:~0.7.1":
-  version: 0.7.1
-  resolution: "pm2-axon-rpc@npm:0.7.1"
-  dependencies:
-    debug: ^4.3.1
-  checksum: 1739fefcf4806f70062cc8ea7251a66d5d0051e4d2e5fb547e571de94811f7b4e11d218ffcd7fab44a1db121d6173e099a68a547768b7fb7fe434295b6526181
-  languageName: node
-  linkType: hard
-
-"pm2-axon@npm:~4.0.1":
-  version: 4.0.1
-  resolution: "pm2-axon@npm:4.0.1"
-  dependencies:
-    amp: ~0.3.1
-    amp-message: ~0.1.1
-    debug: ^4.3.1
-    escape-string-regexp: ^4.0.0
-  checksum: e6d73a34069c43b72609f40d07b74ed0cd09149101befb0d7b23d01af745bc6c60c1f4cf7d2d50541e5bc83e969323ca425f089154909adefb8ada0b811aaf60
-  languageName: node
-  linkType: hard
-
-"pm2-deploy@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "pm2-deploy@npm:1.0.2"
-  dependencies:
-    run-series: ^1.1.8
-    tv4: ^1.3.0
-  checksum: f80623678d73c1c763821a3d500c8d2752918866be0913cf6648c11bd2421cb92c6af4f99deefbb9ef07cf1953a1e1b2b1ad6be72c21fef47d45879b21425f9c
-  languageName: node
-  linkType: hard
-
-"pm2-multimeter@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "pm2-multimeter@npm:0.1.2"
-  dependencies:
-    charm: ~0.1.1
-  checksum: 78b6b7a66dfb3841e504d7f13945834aac72343f46dfb3a1111fda903b0292a3b1f7f578d808e98de747497acdedd7d8da0073eb7187b510f0ee74af5b5ba938
-  languageName: node
-  linkType: hard
-
-"pm2-sysmonit@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "pm2-sysmonit@npm:1.2.8"
-  dependencies:
-    async: ^3.2.0
-    debug: ^4.3.1
-    pidusage: ^2.0.21
-    systeminformation: ^5.7
-    tx2: ~1.0.4
-  checksum: 85dae7ee1033dee92ebfa20ee2cbbc16c0252494e567067d375b87705e723d53c442115472db491aaf9ee71758ea8edc45e7add4e035fa90cef41e2ff0802f75
-  languageName: node
-  linkType: hard
-
-"pm2@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "pm2@npm:5.2.0"
-  dependencies:
-    "@pm2/agent": ~2.0.0
-    "@pm2/io": ~5.0.0
-    "@pm2/js-api": ~0.6.7
-    "@pm2/pm2-version-check": latest
-    async: ~3.2.0
-    blessed: 0.1.81
-    chalk: 3.0.0
-    chokidar: ^3.5.1
-    cli-tableau: ^2.0.0
-    commander: 2.15.1
-    croner: ~4.1.92
-    dayjs: ~1.8.25
-    debug: ^4.3.1
-    enquirer: 2.3.6
-    eventemitter2: 5.0.1
-    fclone: 1.0.11
-    mkdirp: 1.0.4
-    needle: 2.4.0
-    pidusage: ~3.0
-    pm2-axon: ~4.0.1
-    pm2-axon-rpc: ~0.7.1
-    pm2-deploy: ~1.0.2
-    pm2-multimeter: ^0.1.2
-    pm2-sysmonit: ^1.2.8
-    promptly: ^2
-    semver: ^7.2
-    source-map-support: 0.5.19
-    sprintf-js: 1.1.2
-    vizion: ~2.2.1
-    yamljs: 0.3.0
-  dependenciesMeta:
-    pm2-sysmonit:
-      optional: true
-  bin:
-    pm2: bin/pm2
-    pm2-dev: bin/pm2-dev
-    pm2-docker: bin/pm2-docker
-    pm2-runtime: bin/pm2-runtime
-  checksum: 24b0805ddd2148a5ada4fdfa4338657d102a81f6c8f498389d0d1cff79a5456ac11cec5d9b99b5eb878426eb6d591e7cb7e71744dead1ff92510ba729147488e
-  languageName: node
-  linkType: hard
-
 "pngquant-bin@npm:^6.0.0":
   version: 6.0.1
   resolution: "pngquant-bin@npm:6.0.1"
@@ -36113,15 +35576,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promptly@npm:^2":
-  version: 2.2.0
-  resolution: "promptly@npm:2.2.0"
-  dependencies:
-    read: ^1.0.4
-  checksum: be68feb5d110883705804b67e565ffcb0945486ad45a02488939c2a6bacdc7f0646c02a99fd1c8041710a244aac790ea376522120bd5d3d7de1bf0188412568f
-  languageName: node
-  linkType: hard
-
 "prompts@npm:^2.0.1, prompts@npm:^2.4.0":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -36169,23 +35623,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-agent@npm:~5.0.0":
-  version: 5.0.0
-  resolution: "proxy-agent@npm:5.0.0"
-  dependencies:
-    agent-base: ^6.0.0
-    debug: 4
-    http-proxy-agent: ^4.0.0
-    https-proxy-agent: ^5.0.0
-    lru-cache: ^5.1.1
-    pac-proxy-agent: ^5.0.0
-    proxy-from-env: ^1.0.0
-    socks-proxy-agent: ^5.0.0
-  checksum: 3b0bb73a4d3a07711d3cad72b2fa4320880f7a6ec1959cdcc186ac6ffb173db8137d7c4046c27fdfa6e2207b2eb75e802f3d5e14c766700586ec4d47299a5124
-  languageName: node
-  linkType: hard
-
-"proxy-from-env@npm:^1.0.0, proxy-from-env@npm:^1.1.0":
+"proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
   checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
@@ -36647,7 +36085,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.2, raw-body@npm:^2.2.0, raw-body@npm:^2.3.3":
+"raw-body@npm:2.5.2, raw-body@npm:^2.3.3":
   version: 2.5.2
   resolution: "raw-body@npm:2.5.2"
   dependencies:
@@ -37337,7 +36775,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read@npm:^1.0.4, read@npm:~1.0.7":
+"read@npm:~1.0.7":
   version: 1.0.7
   resolution: "read@npm:1.0.7"
   dependencies:
@@ -37979,17 +37417,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"require-in-the-middle@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "require-in-the-middle@npm:5.1.0"
-  dependencies:
-    debug: ^4.1.1
-    module-details-from-path: ^1.0.3
-    resolve: ^1.12.0
-  checksum: 375f2e4b822c3fac5d65613082d93d5f9451cdbfb1cdfaf757febe2983aac3525ea5b8f95a10f2ee8304e6328d304d3c885830e255209d359faf66e5a3aa62e8
-  languageName: node
-  linkType: hard
-
 "require-main-filename@npm:^2.0.0":
   version: 2.0.0
   resolution: "require-main-filename@npm:2.0.0"
@@ -38055,7 +37482,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.4, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.3.2, resolve@npm:^1.4.0":
+"resolve@npm:^1.1.4, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.3.2, resolve@npm:^1.4.0":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -38081,7 +37508,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -38316,7 +37743,6 @@ __metadata:
     npm-run-all: ^4.1.5
     pino: ^8.15.0
     pino-pretty: ^7.6.1
-    pm2: ^5.2.0
     sodium-native: ^3.3.0
     sodium-plus: ^0.9.0
     ts-node: ^10.9.2
@@ -38379,13 +37805,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"run-series@npm:^1.1.8":
-  version: 1.1.9
-  resolution: "run-series@npm:1.1.9"
-  checksum: 375a2c8141715f6e10d5de47b140217f0d1b123bbf16f7d5d96bf12eafd7aed47c23dccc4ffd1c0b9d854f5076ef285628a4d21f4c58780ed77012efcfcd9b8c
-  languageName: node
-  linkType: hard
-
 "rxjs@npm:^6.4.0":
   version: 6.6.7
   resolution: "rxjs@npm:6.6.7"
@@ -38768,15 +38187,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:6.3.0":
-  version: 6.3.0
-  resolution: "semver@npm:6.3.0"
-  bin:
-    semver: ./bin/semver.js
-  checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9
-  languageName: node
-  linkType: hard
-
 "semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0, semver@npm:^6.3.1":
   version: 6.3.1
   resolution: "semver@npm:6.3.1"
@@ -38786,7 +38196,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -38806,15 +38216,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:~7.2.0":
-  version: 7.2.3
-  resolution: "semver@npm:7.2.3"
-  bin:
-    semver: bin/semver.js
-  checksum: e6a27b19853bb07829f863782647408afc20698f6a2b2cce9c60d1f4465cfc38848c47d9e8bbadc48dd62d096b9a4e7fd841e91274f307cb3a9d83a381c10b26
-  languageName: node
-  linkType: hard
-
 "send@npm:0.18.0":
   version: 0.18.0
   resolution: "send@npm:0.18.0"
@@ -39161,13 +38562,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shimmer@npm:^1.1.0, shimmer@npm:^1.2.0":
-  version: 1.2.1
-  resolution: "shimmer@npm:1.2.1"
-  checksum: aa0d6252ad1c682a4fdfda69e541be987f7a265ac7b00b1208e5e48cc68dc55f293955346ea4c71a169b7324b82c70f8400b3d3d2d60b2a7519f0a3522423250
-  languageName: node
-  linkType: hard
-
 "side-channel@npm:^1.0.4":
   version: 1.0.4
   resolution: "side-channel@npm:1.0.4"
@@ -39390,17 +38784,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:5, socks-proxy-agent@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "socks-proxy-agent@npm:5.0.1"
-  dependencies:
-    agent-base: ^6.0.2
-    debug: 4
-    socks: ^2.3.3
-  checksum: 1b60c4977b2fef783f0fc4dc619cd2758aafdb43f3cf679f1e3627cb6c6e752811cee5513ebb4157ad26786033d2f85029440f197d321e8293b38cc5aab01e06
-  languageName: node
-  linkType: hard
-
 "socks-proxy-agent@npm:^6.1.1":
   version: 6.1.1
   resolution: "socks-proxy-agent@npm:6.1.1"
@@ -39412,7 +38795,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks@npm:^2.3.3, socks@npm:^2.6.1, socks@npm:^2.7.1":
+"socks@npm:^2.6.1, socks@npm:^2.7.1":
   version: 2.7.1
   resolution: "socks@npm:2.7.1"
   dependencies:
@@ -39543,16 +38926,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:0.5.19":
-  version: 0.5.19
-  resolution: "source-map-support@npm:0.5.19"
-  dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: c72802fdba9cb62b92baef18cc14cc4047608b77f0353e6c36dd993444149a466a2845332c5540d4a6630957254f0f68f4ef5a0120c33d2e83974c51a05afbac
-  languageName: node
-  linkType: hard
-
 "source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20":
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
@@ -40915,15 +40288,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"systeminformation@npm:^5.7":
-  version: 5.11.9
-  resolution: "systeminformation@npm:5.11.9"
-  bin:
-    systeminformation: lib/cli.js
-  conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android)
-  languageName: node
-  linkType: hard
-
 "table@npm:^6.0.9, table@npm:^6.8.0":
   version: 6.8.0
   resolution: "table@npm:6.8.0"
@@ -41947,13 +41311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:1.9.3":
-  version: 1.9.3
-  resolution: "tslib@npm:1.9.3"
-  checksum: 56ef6325adb72c6477fb48256304507a2c475d69d7ead4644d61f5685fac2a275a38cf217c556e63fc3c177e729426d730e2c2e71c8042dc6cc57338a849edb2
-  languageName: node
-  linkType: hard
-
 "tslib@npm:2.4.0":
   version: 2.4.0
   resolution: "tslib@npm:2.4.0"
@@ -42170,13 +41527,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tv4@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "tv4@npm:1.3.0"
-  checksum: 075096cf3bc2db5727650e16717a343954625c5fde6b2bb5553c86a9a5ca7b9fd287c0f5ab7ac03094f39e982fe9288dc715c7223a90e1684fd2263460a74bbd
-  languageName: node
-  linkType: hard
-
 "tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
   version: 0.14.5
   resolution: "tweetnacl@npm:0.14.5"
@@ -42221,15 +41571,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tx2@npm:~1.0.4":
-  version: 1.0.5
-  resolution: "tx2@npm:1.0.5"
-  dependencies:
-    json-stringify-safe: ^5.0.1
-  checksum: b3b7986b288d26e771f645ebec61b3d257b52ece1501d7c41a225ad782ea69ef540c82c013b75c849547c98058e19b6d2c8004b5e68e5ac16c0464a5da55cfc4
-  languageName: node
-  linkType: hard
-
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"
@@ -43355,7 +42696,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^3.0.1, uuid@npm:^3.2.1, uuid@npm:^3.3.2":
+"uuid@npm:^3.0.1, uuid@npm:^3.3.2":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
   bin:
@@ -43566,18 +42907,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vizion@npm:~2.2.1":
-  version: 2.2.1
-  resolution: "vizion@npm:2.2.1"
-  dependencies:
-    async: ^2.6.3
-    git-node-fs: ^1.0.0
-    ini: ^1.3.5
-    js-git: ^0.7.8
-  checksum: cabd47c7b9a457a0e881c18812ff259637a6aeee1e81d644ef388cb00b46535f22a4e5010669b1174b075e99a335ed0c3d2203338c59f029c3d4b2c6bd45c90c
-  languageName: node
-  linkType: hard
-
 "vm-browserify@npm:^1.0.0, vm-browserify@npm:^1.0.1, vm-browserify@npm:^1.1.2":
   version: 1.1.2
   resolution: "vm-browserify@npm:1.1.2"
@@ -43585,7 +42914,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vm2@npm:^3.9.19, vm2@npm:^3.9.8":
+"vm2@npm:^3.9.19":
   version: 3.9.19
   resolution: "vm2@npm:3.9.19"
   dependencies:
@@ -44653,7 +43982,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^7.0.0, ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.3":
+"ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.3":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
   peerDependencies:
@@ -44683,21 +44012,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:~7.4.0":
-  version: 7.4.6
-  resolution: "ws@npm:7.4.6"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 3a990b32ed08c72070d5e8913e14dfcd831919205be52a3ff0b4cdd998c8d554f167c9df3841605cde8b11d607768cacab3e823c58c96a5c08c987e093eb767a
-  languageName: node
-  linkType: hard
-
 "x-default-browser@npm:^0.4.0":
   version: 0.4.0
   resolution: "x-default-browser@npm:0.4.0"
@@ -44806,13 +44120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xregexp@npm:2.0.0":
-  version: 2.0.0
-  resolution: "xregexp@npm:2.0.0"
-  checksum: de62d1f01c9f1a67c80cafe48a3dc081b324249a0e88e65dc9acae9cce6d8e63c9d91c0f97e2ad2d8c5351c856c139c04dc55ebd941e59b7d1d5c1169e164cff
-  languageName: node
-  linkType: hard
-
 "xsalsa20@npm:^1.1.0":
   version: 1.2.0
   resolution: "xsalsa20@npm:1.2.0"
@@ -44885,19 +44192,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yamljs@npm:0.3.0":
-  version: 0.3.0
-  resolution: "yamljs@npm:0.3.0"
-  dependencies:
-    argparse: ^1.0.7
-    glob: ^7.0.5
-  bin:
-    json2yaml: ./bin/json2yaml
-    yaml2json: ./bin/yaml2json
-  checksum: 76b770d34c7b9babdc4508e4c7c0cbdf371e17129cc027095d9eac0ae5b841c1b16fc2d625ebb542cc299ed4593478abdfcca172b3f0169e0939c6f2ed2e81a4
-  languageName: node
-  linkType: hard
-
 "yaqrcode@npm:^0.2.1":
   version: 0.2.1
   resolution: "yaqrcode@npm:0.2.1"

From 02debbe59b378026606e62fcb8fbd5be893685c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:47:32 -0300
Subject: [PATCH 164/170] feat: apply category reorder on `Enhanced navigation`
 (#33496)

---
 .changeset/strange-spies-clean.md             |  5 +++
 .../client/sidebarv2/hooks/useRoomList.ts     | 41 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/strange-spies-clean.md

diff --git a/.changeset/strange-spies-clean.md b/.changeset/strange-spies-clean.md
new file mode 100644
index 000000000000..68ec261509f6
--- /dev/null
+++ b/.changeset/strange-spies-clean.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Applied category reorder from admin setting also on new sidebar - Enhanced navigation feature preview
diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
index fa5dfd2797cb..afdc57086dc4 100644
--- a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
+++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
@@ -12,12 +12,39 @@ const query = { open: { $ne: false } };
 
 const emptyQueue: ILivechatInquiryRecord[] = [];
 
+const order: (
+	| 'Incoming_Calls'
+	| 'Incoming_Livechats'
+	| 'Open_Livechats'
+	| 'On_Hold_Chats'
+	| 'Unread'
+	| 'Favorites'
+	| 'Teams'
+	| 'Discussions'
+	| 'Channels'
+	| 'Direct_Messages'
+	| 'Conversations'
+)[] = [
+	'Incoming_Calls',
+	'Incoming_Livechats',
+	'Open_Livechats',
+	'On_Hold_Chats',
+	'Unread',
+	'Favorites',
+	'Teams',
+	'Discussions',
+	'Channels',
+	'Direct_Messages',
+	'Conversations',
+];
+
 export const useRoomList = (): Array<ISubscription & IRoom> => {
 	const [roomList, setRoomList] = useDebouncedState<(ISubscription & IRoom)[]>([], 150);
 
 	const showOmnichannel = useOmnichannelEnabled();
 	const sidebarGroupByType = useUserPreference('sidebarGroupByType');
 	const favoritesEnabled = useUserPreference('sidebarShowFavorites');
+	const sidebarOrder = useUserPreference<typeof order>('sidebarSectionsOrder') ?? order;
 	const isDiscussionEnabled = useSetting('Discussion_enabled');
 	const sidebarShowUnread = useUserPreference('sidebarShowUnread');
 
@@ -92,7 +119,7 @@ export const useRoomList = (): Array<ISubscription & IRoom> => {
 			});
 
 			const groups = new Map();
-			incomingCall.size && groups.set('Incoming Calls', incomingCall);
+			incomingCall.size && groups.set('Incoming_Calls', incomingCall);
 			showOmnichannel && inquiries.enabled && queue.length && groups.set('Incoming_Livechats', queue);
 			showOmnichannel && omnichannel.size && groups.set('Open_Livechats', omnichannel);
 			showOmnichannel && onHold.size && groups.set('On_Hold_Chats', onHold);
@@ -103,7 +130,16 @@ export const useRoomList = (): Array<ISubscription & IRoom> => {
 			sidebarGroupByType && channels.size && groups.set('Channels', channels);
 			sidebarGroupByType && direct.size && groups.set('Direct_Messages', direct);
 			!sidebarGroupByType && groups.set('Conversations', conversation);
-			return [...groups.entries()].flatMap(([key, group]) => [key, ...group]);
+			return sidebarOrder
+				.map((key) => {
+					const group = groups.get(key);
+					if (!group) {
+						return [];
+					}
+
+					return [key, ...group];
+				})
+				.flat();
 		});
 	}, [
 		rooms,
@@ -116,6 +152,7 @@ export const useRoomList = (): Array<ISubscription & IRoom> => {
 		sidebarGroupByType,
 		setRoomList,
 		isDiscussionEnabled,
+		sidebarOrder,
 	]);
 
 	return roomList;

From 3bd14c16d5672ed8542253a8016e47761d009098 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Thu, 10 Oct 2024 21:34:57 -0300
Subject: [PATCH 165/170] regression: disabled voip leaves empty section in the
 user menu (#33521)

---
 .../UserMenu/hooks/useUserMenu.tsx            | 10 +++---
 .../UserMenu/hooks/useVoipItemsSection.tsx}   | 34 ++++++++++---------
 .../sidebar/header/hooks/useUserMenu.tsx      | 10 +++---
 .../header/hooks/useVoipItemsSection.tsx}     | 34 +++++++++----------
 4 files changed, 43 insertions(+), 45 deletions(-)
 rename apps/meteor/client/{sidebar/header/hooks/useVoipItems.tsx => NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItemsSection.tsx} (72%)
 rename apps/meteor/client/{NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx => sidebar/header/hooks/useVoipItemsSection.tsx} (73%)

diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index fce9c3d14fd4..e554d3c16c82 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
@@ -7,14 +7,14 @@ import React from 'react';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
-import { useVoipItems } from './useVoipItems';
+import { useVoipItemsSection } from './useVoipItemsSection';
 
 export const useUserMenu = (user: IUser) => {
 	const t = useTranslation();
 
 	const statusItems = useStatusItems();
 	const accountItems = useAccountItems();
-	const voipItems = useVoipItems();
+	const voipSection = useVoipItemsSection();
 
 	const logout = useLogout();
 	const handleLogout = useEffectEvent(() => {
@@ -37,9 +37,7 @@ export const useUserMenu = (user: IUser) => {
 			title: t('Status'),
 			items: statusItems,
 		},
-		{
-			items: voipItems,
-		},
+		voipSection,
 		{
 			title: t('Account'),
 			items: accountItems,
@@ -47,5 +45,5 @@ export const useUserMenu = (user: IUser) => {
 		{
 			items: [logoutItem],
 		},
-	];
+	].filter((section) => section !== undefined);
 };
diff --git a/apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItemsSection.tsx
similarity index 72%
rename from apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx
rename to apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItemsSection.tsx
index d7cbf2428c32..9b126e4eb1e5 100644
--- a/apps/meteor/client/sidebar/header/hooks/useVoipItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItemsSection.tsx
@@ -6,7 +6,7 @@ import { useMutation } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-const useVoipItems = (): GenericMenuItemProps[] => {
+export const useVoipItemsSection = (): { items: GenericMenuItemProps[] } | undefined => {
 	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
@@ -45,23 +45,25 @@ const useVoipItems = (): GenericMenuItemProps[] => {
 
 	return useMemo(() => {
 		if (!isEnabled) {
-			return [];
+			return;
 		}
 
-		return [
-			{
-				id: 'toggle-voip',
-				icon: isRegistered ? 'phone-disabled' : 'phone',
-				disabled: !isReady || toggleVoip.isLoading,
-				onClick: () => toggleVoip.mutate(),
-				content: (
-					<Box is='span' title={tooltip}>
-						{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
-					</Box>
-				),
-			},
-		];
+		return {
+			items: [
+				{
+					id: 'toggle-voip',
+					icon: isRegistered ? 'phone-disabled' : 'phone',
+					disabled: !isReady || toggleVoip.isLoading,
+					onClick: () => toggleVoip.mutate(),
+					content: (
+						<Box is='span' title={tooltip}>
+							{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
+						</Box>
+					),
+				},
+			],
+		};
 	}, [isEnabled, isRegistered, isReady, tooltip, t, toggleVoip]);
 };
 
-export default useVoipItems;
+export default useVoipItemsSection;
diff --git a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
index e9ad8cc73836..030c248036a8 100644
--- a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
@@ -7,14 +7,14 @@ import React from 'react';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
-import useVoipItems from './useVoipItems';
+import { useVoipItemsSection } from './useVoipItemsSection';
 
 export const useUserMenu = (user: IUser) => {
 	const t = useTranslation();
 
 	const statusItems = useStatusItems();
 	const accountItems = useAccountItems();
-	const voipItems = useVoipItems();
+	const voipItemsSection = useVoipItemsSection();
 
 	const logout = useLogout();
 	const handleLogout = useMutableCallback(() => {
@@ -37,9 +37,7 @@ export const useUserMenu = (user: IUser) => {
 			title: t('Status'),
 			items: statusItems,
 		},
-		{
-			items: voipItems,
-		},
+		voipItemsSection,
 		{
 			title: t('Account'),
 			items: accountItems,
@@ -47,5 +45,5 @@ export const useUserMenu = (user: IUser) => {
 		{
 			items: [logoutItem],
 		},
-	];
+	].filter((section) => section !== undefined);
 };
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx b/apps/meteor/client/sidebar/header/hooks/useVoipItemsSection.tsx
similarity index 73%
rename from apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx
rename to apps/meteor/client/sidebar/header/hooks/useVoipItemsSection.tsx
index b3e4cbf22d52..35922ff68cf5 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useVoipItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useVoipItemsSection.tsx
@@ -6,7 +6,7 @@ import { useMutation } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-export const useVoipItems = (): GenericMenuItemProps[] => {
+export const useVoipItemsSection = (): { items: GenericMenuItemProps[] } | undefined => {
 	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
@@ -45,23 +45,23 @@ export const useVoipItems = (): GenericMenuItemProps[] => {
 
 	return useMemo(() => {
 		if (!isEnabled) {
-			return [];
+			return;
 		}
 
-		return [
-			{
-				id: 'toggle-voip',
-				icon: isRegistered ? 'phone-disabled' : 'phone',
-				disabled: !isReady || toggleVoip.isLoading,
-				onClick: () => toggleVoip.mutate(),
-				content: (
-					<Box is='span' title={tooltip}>
-						{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
-					</Box>
-				),
-			},
-		];
+		return {
+			items: [
+				{
+					id: 'toggle-voip',
+					icon: isRegistered ? 'phone-disabled' : 'phone',
+					disabled: !isReady || toggleVoip.isLoading,
+					onClick: () => toggleVoip.mutate(),
+					content: (
+						<Box is='span' title={tooltip}>
+							{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
+						</Box>
+					),
+				},
+			],
+		};
 	}, [isEnabled, isRegistered, isReady, tooltip, t, toggleVoip]);
 };
-
-export default useVoipItems;

From efacfb329e6e51276342ba258b300632bd9fded9 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Fri, 11 Oct 2024 00:16:08 -0300
Subject: [PATCH 166/170] chore: Recover `@rocket.chat/fuselage-ui-kit`
 storybook (#33531)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .../.storybook/DocsContainer.tsx              |   42 -
 packages/fuselage-ui-kit/.storybook/main.ts   |   19 +-
 .../fuselage-ui-kit/.storybook/preview.tsx    |   43 +-
 packages/fuselage-ui-kit/package.json         |   18 +-
 .../src/stories/Banner.stories.tsx            |    4 -
 .../src/stories/Message.stories.tsx           |    1 -
 .../src/stories/Modal.stories.tsx             |    4 -
 packages/fuselage-ui-kit/tsconfig.json        |    3 +-
 yarn.lock                                     | 1258 ++++++++++++++---
 9 files changed, 1150 insertions(+), 242 deletions(-)
 delete mode 100644 packages/fuselage-ui-kit/.storybook/DocsContainer.tsx

diff --git a/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx b/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx
deleted file mode 100644
index 39f4c0cccb0b..000000000000
--- a/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { DocsContainer as BaseContainer } from '@storybook/addon-docs/blocks';
-import { themes } from '@storybook/theming';
-import type { ComponentProps } from 'react';
-import { useDarkMode } from 'storybook-dark-mode';
-
-import { surface } from './helpers';
-
-export const DocsContainer = ({
-  children,
-  context,
-}: ComponentProps<typeof BaseContainer>) => {
-  const dark = useDarkMode();
-
-  return (
-    <BaseContainer
-      context={{
-        ...context,
-        storyById: (id) => {
-          const storyContext = context.storyById(id);
-          return {
-            ...storyContext,
-            parameters: {
-              ...storyContext?.parameters,
-              docs: {
-                ...storyContext?.parameters?.docs,
-                theme: dark
-                  ? {
-                      ...themes.dark,
-                      appContentBg: surface.main,
-                      barBg: surface.main,
-                    }
-                  : themes.light,
-              },
-            },
-          };
-        },
-      }}
-    >
-      {children}
-    </BaseContainer>
-  );
-};
diff --git a/packages/fuselage-ui-kit/.storybook/main.ts b/packages/fuselage-ui-kit/.storybook/main.ts
index 87e20c3f103b..4b44cb173365 100644
--- a/packages/fuselage-ui-kit/.storybook/main.ts
+++ b/packages/fuselage-ui-kit/.storybook/main.ts
@@ -1,12 +1,19 @@
-import { type StorybookConfig } from '@storybook/core-common';
+import type { StorybookConfig } from '@storybook/core-common';
 
-const config: StorybookConfig = {
+export default {
   stories: ['../src/**/*.stories.tsx', '../src/**/stories.tsx'],
-  addons: ['@storybook/addon-essentials', 'storybook-dark-mode'],
+  addons: [
+    '@storybook/addon-essentials',
+    'storybook-dark-mode',
+    {
+      name: '@newhighsco/storybook-addon-transpile-modules',
+      options: {
+        transpileModules: ['date-fns', 'typia', 'react-i18next'],
+      },
+    },
+  ],
   features: {
     postcss: false,
   },
   framework: '@storybook/react',
-};
-
-module.exports = config;
+} satisfies StorybookConfig;
diff --git a/packages/fuselage-ui-kit/.storybook/preview.tsx b/packages/fuselage-ui-kit/.storybook/preview.tsx
index 9982de43f6bb..d6871143c682 100644
--- a/packages/fuselage-ui-kit/.storybook/preview.tsx
+++ b/packages/fuselage-ui-kit/.storybook/preview.tsx
@@ -1,11 +1,13 @@
 import { PaletteStyleTag } from '@rocket.chat/fuselage';
+import { DocsContainer as BaseContainer } from '@storybook/addon-docs';
 import { type Parameters } from '@storybook/addons';
 import { type DecoratorFn } from '@storybook/react';
 import { themes } from '@storybook/theming';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { ComponentPropsWithoutRef } from 'react';
 import { useDarkMode } from 'storybook-dark-mode';
 
 import manifest from '../package.json';
-import { DocsContainer } from './DocsContainer';
 import { surface } from './helpers';
 import logo from './logo.svg';
 
@@ -14,6 +16,42 @@ import '@rocket.chat/icons/dist/rocketchat.css';
 import '@rocket.chat/fuselage-polyfills';
 import 'normalize.css/normalize.css';
 
+type DocsContainerProps = ComponentPropsWithoutRef<typeof BaseContainer>;
+
+const DocsContainer = (props: DocsContainerProps) => {
+  const dark = useDarkMode();
+
+  const { context } = props;
+
+  return (
+    <BaseContainer
+      {...props}
+      context={{
+        ...context,
+        storyById: (id) => {
+          const storyContext = context.storyById(id);
+          return {
+            ...storyContext,
+            parameters: {
+              ...storyContext?.parameters,
+              docs: {
+                ...storyContext?.parameters?.docs,
+                theme: dark
+                  ? {
+                      ...themes.dark,
+                      appContentBg: surface.main,
+                      barBg: surface.main,
+                    }
+                  : themes.light,
+              },
+            },
+          };
+        },
+      }}
+    />
+  );
+};
+
 export const parameters: Parameters = {
   actions: { argTypesRegex: '^on[A-Z].*' },
   backgrounds: {
@@ -49,6 +87,8 @@ export const parameters: Parameters = {
   },
 };
 
+const queryClient = new QueryClient();
+
 export const decorators: DecoratorFn[] = [
   (fn) => {
     const dark = useDarkMode();
@@ -60,4 +100,5 @@ export const decorators: DecoratorFn[] = [
       </>
     );
   },
+  (fn) => <QueryClientProvider client={queryClient} children={fn()} />,
 ];
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 83ad6627cfaa..6602d319b1f0 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -37,9 +37,10 @@
     "testunit": "jest",
     "typecheck": "tsc --noEmit",
     "docs": "cross-env NODE_ENV=production build-storybook -o ../../static/fuselage-ui-kit",
-    "storybook": "start-storybook -p 6006 --no-version-updates",
-    "build-storybook": "cross-env NODE_ENV=production build-storybook",
-    "bump-next": "bump-next"
+    "storybook": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' start-storybook -p 6006 --no-version-updates",
+    "build-storybook": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' NODE_ENV=production build-storybook",
+    "build-preview": "yarn build-storybook",
+    ".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./storybook-static ../../.preview/fuselage-ui-kit"
   },
   "peerDependencies": {
     "@rocket.chat/apps-engine": "*",
@@ -63,6 +64,7 @@
     "@babel/preset-env": "~7.22.20",
     "@babel/preset-react": "~7.22.15",
     "@babel/preset-typescript": "~7.22.15",
+    "@newhighsco/storybook-addon-transpile-modules": "^1.0.21",
     "@rocket.chat/apps-engine": "workspace:^",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
@@ -80,10 +82,8 @@
     "@rocket.chat/ui-video-conf": "workspace:^",
     "@storybook/addon-essentials": "~6.5.16",
     "@storybook/addons": "~6.5.16",
-    "@storybook/builder-webpack5": "~6.5.16",
-    "@storybook/manager-webpack5": "~6.5.16",
     "@storybook/react": "~6.5.16",
-    "@storybook/source-loader": "~6.5.16",
+    "@storybook/react-webpack5": "^8.3.5",
     "@storybook/theming": "~6.5.16",
     "@tanstack/react-query": "^4.16.1",
     "@testing-library/react": "~16.0.1",
@@ -102,15 +102,13 @@
     "react-dom": "^17.0.2",
     "react-i18next": "~13.2.2",
     "rimraf": "^3.0.2",
-    "storybook-dark-mode": "~3.0.3",
-    "tslib": "^2.5.3",
+    "storybook-dark-mode": "~2.1.1",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/gazzodown": "workspace:^",
-    "@rocket.chat/ui-kit": "workspace:~",
-    "tslib": "^2.5.3"
+    "@rocket.chat/ui-kit": "workspace:~"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx b/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx
index 81fd72d4771e..848135428827 100644
--- a/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx
+++ b/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx
@@ -35,10 +35,6 @@ const createStory = (blocks: readonly UiKit.LayoutBlock[], errors = {}) => {
       value={{
         action: action('action'),
         updateState: action('updateState'),
-        payload: {
-          appId: 'appId',
-          viewId: 'viewId',
-        },
         values: {},
         errors,
       }}
diff --git a/packages/fuselage-ui-kit/src/stories/Message.stories.tsx b/packages/fuselage-ui-kit/src/stories/Message.stories.tsx
index a64638126ed9..418904245370 100644
--- a/packages/fuselage-ui-kit/src/stories/Message.stories.tsx
+++ b/packages/fuselage-ui-kit/src/stories/Message.stories.tsx
@@ -2,7 +2,6 @@
 import { Message, Avatar } from '@rocket.chat/fuselage';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { action } from '@storybook/addon-actions';
-import React from 'react';
 
 import { UiKitContext, UiKitMessage } from '..';
 import * as payloads from './payloads';
diff --git a/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx b/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx
index 52d7ea7eb4cd..ed1267961781 100644
--- a/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx
+++ b/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx
@@ -77,10 +77,6 @@ const createStory = (blocks: readonly UiKit.LayoutBlock[], errors = {}) => {
         value={{
           action: action('action'),
           updateState: action('updateState'),
-          payload: {
-            appId: 'appId',
-            viewId: 'viewId',
-          },
           values: {},
           errors,
         }}
diff --git a/packages/fuselage-ui-kit/tsconfig.json b/packages/fuselage-ui-kit/tsconfig.json
index bad1623ca4d9..89b9f66cd0fd 100644
--- a/packages/fuselage-ui-kit/tsconfig.json
+++ b/packages/fuselage-ui-kit/tsconfig.json
@@ -4,6 +4,5 @@
     "noImplicitReturns": true,
     "noImplicitThis": true,
   },
-	"include": ["src", ".storybook/**/*"],
-  "exclude": ["node_modules", "src/**/*.stories.tsx", "src/**/*.spec.ts", "src/**/*.spec.tsx"]
+	"include": ["src", ".storybook/**/*", "jest.config.ts"]
 }
diff --git a/yarn.lock b/yarn.lock
index 69a1a2b87c36..6226b417dea3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -985,6 +985,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/code-frame@npm:7.25.7"
+  dependencies:
+    "@babel/highlight": ^7.25.7
+    picocolors: ^1.0.0
+  checksum: f235cdf9c5d6f172898a27949bd63731c5f201671f77bcf4c2ad97229bc462d89746c1a7f5671a132aecff5baf43f3d878b93a7ecc6aa71f9612d2b51270c53e
+  languageName: node
+  linkType: hard
+
 "@babel/code-frame@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/code-frame@npm:7.24.7"
@@ -1002,6 +1012,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/compat-data@npm:^7.25.7":
+  version: 7.25.8
+  resolution: "@babel/compat-data@npm:7.25.8"
+  checksum: 7ac648b110ec0fcd3a3d3fc62c69c0325b536b3c97bafea8a4392dfc68d9ea9ab1f36d1b2f231d404473fc81f503b4a630425677fc9a3cce2ee33d74842ea109
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:7.12.9":
   version: 7.12.9
   resolution: "@babel/core@npm:7.12.9"
@@ -1049,6 +1066,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:^7.18.9":
+  version: 7.25.8
+  resolution: "@babel/core@npm:7.25.8"
+  dependencies:
+    "@ampproject/remapping": ^2.2.0
+    "@babel/code-frame": ^7.25.7
+    "@babel/generator": ^7.25.7
+    "@babel/helper-compilation-targets": ^7.25.7
+    "@babel/helper-module-transforms": ^7.25.7
+    "@babel/helpers": ^7.25.7
+    "@babel/parser": ^7.25.8
+    "@babel/template": ^7.25.7
+    "@babel/traverse": ^7.25.7
+    "@babel/types": ^7.25.8
+    convert-source-map: ^2.0.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.3
+    semver: ^6.3.1
+  checksum: 77ddf693faf6997915e7bbe16e9f21ca1c0e58bc60ace9eac51c373b21d1b46ce50de650195c136a594b0e5fcb901ca17bb57c2d20bf175b3c325211138bcfde
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:~7.21.8":
   version: 7.21.8
   resolution: "@babel/core@npm:7.21.8"
@@ -1124,6 +1164,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/generator@npm:7.25.7"
+  dependencies:
+    "@babel/types": ^7.25.7
+    "@jridgewell/gen-mapping": ^0.3.5
+    "@jridgewell/trace-mapping": ^0.3.25
+    jsesc: ^3.0.2
+  checksum: f81cf9dc0191ae4411d82978114382ad6e047bfb678f9a95942bac5034a41719d88f047679f5e2f51ba7728b54ebd1cc32a10df7b556215d8a6ab9bdd4f11831
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -1155,6 +1207,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-compilation-targets@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-compilation-targets@npm:7.25.7"
+  dependencies:
+    "@babel/compat-data": ^7.25.7
+    "@babel/helper-validator-option": ^7.25.7
+    browserslist: ^4.24.0
+    lru-cache: ^5.1.1
+    semver: ^6.3.1
+  checksum: 5b57e7d4b9302c07510ad3318763c053c3d46f2d40a45c2ea0c59160ccf9061a34975ae62f36a32f15d8d03497ecd5ca43a96417c1fd83eb8c035e77a69840ef
+  languageName: node
+  linkType: hard
+
 "@babel/helper-create-class-features-plugin@npm:^7.17.6, @babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0, @babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
@@ -1280,6 +1345,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-imports@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-module-imports@npm:7.25.7"
+  dependencies:
+    "@babel/traverse": ^7.25.7
+    "@babel/types": ^7.25.7
+  checksum: a7255755e9799978de4bf72563b94b53cf955e5fc3d2acc67c783d3b84d5d34dd41691e473ecc124a94654483fff573deacd87eccd8bd16b47ac4455b5941b30
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.21.5, @babel/helper-module-transforms@npm:^7.22.20, @babel/helper-module-transforms@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/helper-module-transforms@npm:7.23.3"
@@ -1295,6 +1370,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-transforms@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-module-transforms@npm:7.25.7"
+  dependencies:
+    "@babel/helper-module-imports": ^7.25.7
+    "@babel/helper-simple-access": ^7.25.7
+    "@babel/helper-validator-identifier": ^7.25.7
+    "@babel/traverse": ^7.25.7
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: b1daeded78243da969d90b105a564ed918dcded66fba5cd24fe09cb13f7ee9e84d9b9dee789d60237b9a674582d9831a35dbaf6f0a92a3af5f035234a5422814
+  languageName: node
+  linkType: hard
+
 "@babel/helper-optimise-call-expression@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
@@ -1353,6 +1442,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-simple-access@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-simple-access@npm:7.25.7"
+  dependencies:
+    "@babel/traverse": ^7.25.7
+    "@babel/types": ^7.25.7
+  checksum: 684d0b0330c42d62834355f127df3ed78f16e6f1f66213c72adb7b3b0bcd6283ea8792f5b172868b3ca6518c479b54e18adac564219519072dda9053cca210bd
+  languageName: node
+  linkType: hard
+
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0, @babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
@@ -1385,6 +1484,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-string-parser@npm:7.25.7"
+  checksum: 0835fda5efe02cdcb5144a939b639acc017ba4aa1cc80524b44032ddb714080d3e40e8f0d3240832b7bd86f5513f0b63d4fe77d8fc52d8c8720ae674182c0753
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
@@ -1399,6 +1505,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-validator-identifier@npm:7.25.7"
+  checksum: 062f55208deead4876eb474dc6fd55155c9eada8d0a505434de3b9aa06c34195562e0f3142b22a08793a38d740238efa2fe00ff42956cdcb8ac03f0b6c542247
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.16.7, @babel/helper-validator-option@npm:^7.21.0, @babel/helper-validator-option@npm:^7.22.15":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
@@ -1406,6 +1519,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-option@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helper-validator-option@npm:7.25.7"
+  checksum: 87b801fe7d8337699f2fba5323243dd974ea214d27cf51faf2f0063da6dc5bb67c9bb7867fd337573870f9ab498d2788a75bcf9685442bd9430611c62b0195d1
+  languageName: node
+  linkType: hard
+
 "@babel/helper-wrap-function@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-wrap-function@npm:7.22.20"
@@ -1428,6 +1548,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helpers@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/helpers@npm:7.25.7"
+  dependencies:
+    "@babel/template": ^7.25.7
+    "@babel/types": ^7.25.7
+  checksum: a73242850915ef2956097431fbab3a840b7d6298555ad4c6f596db7d1b43cf769181716e7b65f8f7015fe48748b9c454d3b9c6cf4506cb840b967654463b0819
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/highlight@npm:7.23.4"
@@ -1451,6 +1581,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/highlight@npm:7.25.7"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.25.7
+    chalk: ^2.4.2
+    js-tokens: ^4.0.0
+    picocolors: ^1.0.0
+  checksum: b6aa45c5bf7ecc16b8204bbed90335706131ac6cacb0f1bfb1b862ada3741539c913b56c9d26beb56cece0c231ffab36f66aa36aac6b04b32669c314705203f2
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/parser@npm:7.23.5"
@@ -1471,6 +1613,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.25.7, @babel/parser@npm:^7.25.8":
+  version: 7.25.8
+  resolution: "@babel/parser@npm:7.25.8"
+  dependencies:
+    "@babel/types": ^7.25.8
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: c33f6d26542f156927c5dbe131265c791177d271e582338e960f803903086ec5c152bf25deae5f4c061b7bee14dc0b5fd2882ccb5a21c16ee0738d24fcc0406e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6, @babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.23.3
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
@@ -3045,6 +3198,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/template@npm:7.25.7"
+  dependencies:
+    "@babel/code-frame": ^7.25.7
+    "@babel/parser": ^7.25.7
+    "@babel/types": ^7.25.7
+  checksum: 83f025a4a777103965ee41b7c0fa2bb1c847ea7ed2b9f2cb258998ea96dfc580206176b532edf6d723d85237bc06fca26be5c8772e2af7d9e4fe6927e3bed8a3
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.22.20, @babel/traverse@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/traverse@npm:7.23.5"
@@ -3063,6 +3227,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.25.7":
+  version: 7.25.7
+  resolution: "@babel/traverse@npm:7.25.7"
+  dependencies:
+    "@babel/code-frame": ^7.25.7
+    "@babel/generator": ^7.25.7
+    "@babel/parser": ^7.25.7
+    "@babel/template": ^7.25.7
+    "@babel/types": ^7.25.7
+    debug: ^4.3.1
+    globals: ^11.1.0
+  checksum: 4d329b6e7a409a63f4815bbc0a08d0b0cb566c5a2fecd1767661fe1821ced213c554d7d74e6aca048672fed2c8f76071cb0d94f4bd5f120fba8d55a38af63094
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.4.3":
   version: 7.25.6
   resolution: "@babel/traverse@npm:7.25.6"
@@ -3089,6 +3268,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.18.9, @babel/types@npm:^7.25.7, @babel/types@npm:^7.25.8":
+  version: 7.25.8
+  resolution: "@babel/types@npm:7.25.8"
+  dependencies:
+    "@babel/helper-string-parser": ^7.25.7
+    "@babel/helper-validator-identifier": ^7.25.7
+    to-fast-properties: ^2.0.0
+  checksum: 93d84858e820dbfa0fc4882b3ba6a421544d224ee61455a58eed0af9fc3518b30dc2166b8ba48cdd2e91083c5885ed773c36acf46d177b7b1fad9c35b6eb7639
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.25.0, @babel/types@npm:^7.25.6, @babel/types@npm:^7.4.0":
   version: 7.25.6
   resolution: "@babel/types@npm:7.25.6"
@@ -4793,6 +4983,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/sourcemap-codec@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "@jridgewell/sourcemap-codec@npm:1.5.0"
+  checksum: 05df4f2538b3b0f998ea4c1cd34574d0feba216fa5d4ccaef0187d12abf82eafe6021cec8b49f9bb4d90f2ba4582ccc581e72986a5fcf4176ae0cfeb04cf52ec
+  languageName: node
+  linkType: hard
+
 "@jridgewell/trace-mapping@npm:0.3.9":
   version: 0.3.9
   resolution: "@jridgewell/trace-mapping@npm:0.3.9"
@@ -5189,6 +5386,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@newhighsco/storybook-addon-transpile-modules@npm:^1.0.21":
+  version: 1.0.21
+  resolution: "@newhighsco/storybook-addon-transpile-modules@npm:1.0.21"
+  peerDependencies:
+    "@storybook/react-webpack5": 7.6.17
+    storybook: 7.6.17
+  checksum: 68bcc9ee0bbb1eefb15c60302630410079b9bef097726a51f42479ec95deca22b4af453fac2fdc1731529be8b1180d76f3b198f8edfd6473e376ef0c9c54e0f7
+  languageName: node
+  linkType: hard
+
 "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1":
   version: 5.1.1-v1
   resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1"
@@ -8987,6 +9194,7 @@ __metadata:
     "@babel/preset-env": ~7.22.20
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
+    "@newhighsco/storybook-addon-transpile-modules": ^1.0.21
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -9005,10 +9213,8 @@ __metadata:
     "@rocket.chat/ui-video-conf": "workspace:^"
     "@storybook/addon-essentials": ~6.5.16
     "@storybook/addons": ~6.5.16
-    "@storybook/builder-webpack5": ~6.5.16
-    "@storybook/manager-webpack5": ~6.5.16
     "@storybook/react": ~6.5.16
-    "@storybook/source-loader": ~6.5.16
+    "@storybook/react-webpack5": ^8.3.5
     "@storybook/theming": ~6.5.16
     "@tanstack/react-query": ^4.16.1
     "@testing-library/react": ~16.0.1
@@ -9027,8 +9233,7 @@ __metadata:
     react-dom: ^17.0.2
     react-i18next: ~13.2.2
     rimraf: ^3.0.2
-    storybook-dark-mode: ~3.0.3
-    tslib: ^2.5.3
+    storybook-dark-mode: ~2.1.1
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/apps-engine": "*"
@@ -11391,7 +11596,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addons@npm:6.5.16, @storybook/addons@npm:~6.5.16":
+"@storybook/addons@npm:6.5.16, @storybook/addons@npm:^6.5.14, @storybook/addons@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/addons@npm:6.5.16"
   dependencies:
@@ -11427,7 +11632,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:6.5.16":
+"@storybook/api@npm:6.5.16, @storybook/api@npm:^6.5.14":
   version: 6.5.16
   resolution: "@storybook/api@npm:6.5.16"
   dependencies:
@@ -11516,55 +11721,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/builder-webpack5@npm:~6.5.16":
-  version: 6.5.16
-  resolution: "@storybook/builder-webpack5@npm:6.5.16"
+"@storybook/builder-webpack5@npm:8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/builder-webpack5@npm:8.3.5"
   dependencies:
-    "@babel/core": ^7.12.10
-    "@storybook/addons": 6.5.16
-    "@storybook/api": 6.5.16
-    "@storybook/channel-postmessage": 6.5.16
-    "@storybook/channels": 6.5.16
-    "@storybook/client-api": 6.5.16
-    "@storybook/client-logger": 6.5.16
-    "@storybook/components": 6.5.16
-    "@storybook/core-common": 6.5.16
-    "@storybook/core-events": 6.5.16
-    "@storybook/node-logger": 6.5.16
-    "@storybook/preview-web": 6.5.16
-    "@storybook/router": 6.5.16
-    "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.16
-    "@storybook/theming": 6.5.16
-    "@types/node": ^14.0.10 || ^16.0.0
-    babel-loader: ^8.0.0
-    babel-plugin-named-exports-order: ^0.0.2
+    "@storybook/core-webpack": 8.3.5
+    "@types/node": ^22.0.0
+    "@types/semver": ^7.3.4
     browser-assert: ^1.2.1
-    case-sensitive-paths-webpack-plugin: ^2.3.0
-    core-js: ^3.8.2
-    css-loader: ^5.0.1
-    fork-ts-checker-webpack-plugin: ^6.0.4
-    glob: ^7.1.6
-    glob-promise: ^3.4.0
-    html-webpack-plugin: ^5.0.0
+    case-sensitive-paths-webpack-plugin: ^2.4.0
+    cjs-module-lexer: ^1.2.3
+    constants-browserify: ^1.0.0
+    css-loader: ^6.7.1
+    es-module-lexer: ^1.5.0
+    express: ^4.19.2
+    fork-ts-checker-webpack-plugin: ^8.0.0
+    fs-extra: ^11.1.0
+    html-webpack-plugin: ^5.5.0
+    magic-string: ^0.30.5
     path-browserify: ^1.0.1
     process: ^0.11.10
-    stable: ^0.1.8
-    style-loader: ^2.0.0
-    terser-webpack-plugin: ^5.0.3
+    semver: ^7.3.7
+    style-loader: ^3.3.1
+    terser-webpack-plugin: ^5.3.1
     ts-dedent: ^2.0.0
+    url: ^0.11.0
+    util: ^0.12.4
     util-deprecate: ^1.0.2
-    webpack: ^5.9.0
-    webpack-dev-middleware: ^4.1.0
+    webpack: 5
+    webpack-dev-middleware: ^6.1.2
     webpack-hot-middleware: ^2.25.1
-    webpack-virtual-modules: ^0.4.1
+    webpack-virtual-modules: ^0.6.0
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    storybook: ^8.3.5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 0a6631f307c5ac56423860216d42ed95757906b004e949ed3dc2cce4f81d83d38de5cddbae65a0e65083eece6e4e8af05f6aabf5d78a80a7a7f62cf157a4e577
+  checksum: 919877ef84c2bfa140e5b2deade4c0c3d14327e4c220d82524f707c49f28179d3cb7da25bc61c89bd93eff8113fe2f32d13ba15b6806419132f1c43dd0a624a1
   languageName: node
   linkType: hard
 
@@ -11694,7 +11887,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:6.5.16":
+"@storybook/components@npm:6.5.16, @storybook/components@npm:^6.5.14":
   version: 6.5.16
   resolution: "@storybook/components@npm:6.5.16"
   dependencies:
@@ -11735,6 +11928,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/components@npm:^8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/components@npm:8.3.5"
+  peerDependencies:
+    storybook: ^8.3.5
+  checksum: 2f6198df20fd547f1f85fa33fe3b19b93765606ff75892d60e99dcc7e18d2deba2ca1a758f6baf15157c3add5d1ee0a05b5640f3a7ba8afa2461ba5538550c80
+  languageName: node
+  linkType: hard
+
 "@storybook/core-client@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/core-client@npm:6.5.16"
@@ -11834,7 +12036,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:6.5.16":
+"@storybook/core-events@npm:6.5.16, @storybook/core-events@npm:^6.5.14":
   version: 6.5.16
   resolution: "@storybook/core-events@npm:6.5.16"
   dependencies:
@@ -11922,6 +12124,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/core-webpack@npm:8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/core-webpack@npm:8.3.5"
+  dependencies:
+    "@types/node": ^22.0.0
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.3.5
+  checksum: 661bb2761c0204ca0bb4408255f9fa7326068d29b6b6368e7da87ea4204060481d8639323c1fd409d75f809c279bb9bab55ab9f58b5d989e3bf2fca03cd9d0bd
+  languageName: node
+  linkType: hard
+
 "@storybook/core@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/core@npm:6.5.16"
@@ -12108,6 +12322,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/manager-api@npm:^8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/manager-api@npm:8.3.5"
+  peerDependencies:
+    storybook: ^8.3.5
+  checksum: e2043aa681a9186d128ed820cafbd18e55e0c625c17dd9018e35a82ca2376d4095d3ff04a9afaa4855bf36b15ec64122c0a455a61d5113900cff3dbc91c42454
+  languageName: node
+  linkType: hard
+
 "@storybook/manager-webpack4@npm:6.5.16, @storybook/manager-webpack4@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/manager-webpack4@npm:6.5.16"
@@ -12157,52 +12380,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/manager-webpack5@npm:~6.5.16":
-  version: 6.5.16
-  resolution: "@storybook/manager-webpack5@npm:6.5.16"
-  dependencies:
-    "@babel/core": ^7.12.10
-    "@babel/plugin-transform-template-literals": ^7.12.1
-    "@babel/preset-react": ^7.12.10
-    "@storybook/addons": 6.5.16
-    "@storybook/core-client": 6.5.16
-    "@storybook/core-common": 6.5.16
-    "@storybook/node-logger": 6.5.16
-    "@storybook/theming": 6.5.16
-    "@storybook/ui": 6.5.16
-    "@types/node": ^14.0.10 || ^16.0.0
-    babel-loader: ^8.0.0
-    case-sensitive-paths-webpack-plugin: ^2.3.0
-    chalk: ^4.1.0
-    core-js: ^3.8.2
-    css-loader: ^5.0.1
-    express: ^4.17.1
-    find-up: ^5.0.0
-    fs-extra: ^9.0.1
-    html-webpack-plugin: ^5.0.0
-    node-fetch: ^2.6.7
-    process: ^0.11.10
-    read-pkg-up: ^7.0.1
-    regenerator-runtime: ^0.13.7
-    resolve-from: ^5.0.0
-    style-loader: ^2.0.0
-    telejson: ^6.0.8
-    terser-webpack-plugin: ^5.0.3
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
-    webpack: ^5.9.0
-    webpack-dev-middleware: ^4.1.0
-    webpack-virtual-modules: ^0.4.1
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 1349c6b2af9d0cebc3c35c929e2ea0f9ff8d12f7a04c30126160d9c89a45b92412218304abda9126cf96303a2d73fb288a689a191fec12b0189f19e5f2032977
-  languageName: node
-  linkType: hard
-
 "@storybook/mdx1-csf@npm:^0.0.1":
   version: 0.0.1
   resolution: "@storybook/mdx1-csf@npm:0.0.1"
@@ -12275,6 +12452,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/preset-react-webpack@npm:8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/preset-react-webpack@npm:8.3.5"
+  dependencies:
+    "@storybook/core-webpack": 8.3.5
+    "@storybook/react": 8.3.5
+    "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0
+    "@types/node": ^22.0.0
+    "@types/semver": ^7.3.4
+    find-up: ^5.0.0
+    fs-extra: ^11.1.0
+    magic-string: ^0.30.5
+    react-docgen: ^7.0.0
+    resolve: ^1.22.8
+    semver: ^7.3.7
+    tsconfig-paths: ^4.2.0
+    webpack: 5
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.3.5
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: b22384a3cfb85f2d63aef3d8541fd42df8c723a174f1b3ee5bd15102c29f6040ecd526b789bad8a9c5d024dcb6aa592b59b619ae34f4dd2fdc89efeb1ca6c8b9
+  languageName: node
+  linkType: hard
+
 "@storybook/preview-api@npm:7.3.2":
   version: 7.3.2
   resolution: "@storybook/preview-api@npm:7.3.2"
@@ -12297,6 +12502,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/preview-api@npm:^8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/preview-api@npm:8.3.5"
+  peerDependencies:
+    storybook: ^8.3.5
+  checksum: 9d605197376e218967332daaaf4958c908593663fa1e34fb65fd56d3783f74a32c82f345cbdcb6b7efa946dcb6b2d07de88f940761794326f24f8f1116e9c44f
+  languageName: node
+  linkType: hard
+
 "@storybook/preview-web@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/preview-web@npm:6.5.16"
@@ -12342,6 +12556,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0":
+  version: 1.0.6--canary.9.0c3f3b7.0
+  resolution: "@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0"
+  dependencies:
+    debug: ^4.1.1
+    endent: ^2.0.1
+    find-cache-dir: ^3.3.1
+    flat-cache: ^3.0.4
+    micromatch: ^4.0.2
+    react-docgen-typescript: ^2.2.2
+    tslib: ^2.0.0
+  peerDependencies:
+    typescript: ">= 4.x"
+    webpack: ">= 4"
+  checksum: 38c59c1dd7f9cdf5533e5ffe1991034f563f8d33c59e3cd33fa86719c72f5fe922276fde50315dd24f23f225d1ad5f3a261ecf4c70e82522805d09782272faff
+  languageName: node
+  linkType: hard
+
 "@storybook/react-docgen-typescript-plugin@patch:@storybook/react-docgen-typescript-plugin@npm%3A1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0#./.yarn/patches/@storybook-react-docgen-typescript-plugin-npm-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0-b31cc57c40.patch::locator=rocket.chat%40workspace%3A.":
   version: 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0
   resolution: "@storybook/react-docgen-typescript-plugin@patch:@storybook/react-docgen-typescript-plugin@npm%3A1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0#./.yarn/patches/@storybook-react-docgen-typescript-plugin-npm-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0-b31cc57c40.patch::version=1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0&hash=0878d5&locator=rocket.chat%40workspace%3A."
@@ -12360,6 +12592,76 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/react-dom-shim@npm:8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/react-dom-shim@npm:8.3.5"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.3.5
+  checksum: 2706f490aef844a2ce58ca486b3cf7a81e89cf145c6c2ecac86312b01fbab0ff927ad06746de8561962ed6625a2fcb1b57e9131c2bab90ca9f4706ebfc5ab8aa
+  languageName: node
+  linkType: hard
+
+"@storybook/react-webpack5@npm:^8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/react-webpack5@npm:8.3.5"
+  dependencies:
+    "@storybook/builder-webpack5": 8.3.5
+    "@storybook/preset-react-webpack": 8.3.5
+    "@storybook/react": 8.3.5
+    "@types/node": ^22.0.0
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.3.5
+    typescript: ">= 4.2.x"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 4d13f34625569d8621bb4e69d4ae1c40bf81d005ca31fb47ea3dc90b6d43beedbbcda34e9bac1f952727e470509a1f247a4a03327ba4868261b146485d99f412
+  languageName: node
+  linkType: hard
+
+"@storybook/react@npm:8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/react@npm:8.3.5"
+  dependencies:
+    "@storybook/components": ^8.3.5
+    "@storybook/global": ^5.0.0
+    "@storybook/manager-api": ^8.3.5
+    "@storybook/preview-api": ^8.3.5
+    "@storybook/react-dom-shim": 8.3.5
+    "@storybook/theming": ^8.3.5
+    "@types/escodegen": ^0.0.6
+    "@types/estree": ^0.0.51
+    "@types/node": ^22.0.0
+    acorn: ^7.4.1
+    acorn-jsx: ^5.3.1
+    acorn-walk: ^7.2.0
+    escodegen: ^2.1.0
+    html-tags: ^3.1.0
+    prop-types: ^15.7.2
+    react-element-to-jsx-string: ^15.0.0
+    semver: ^7.3.7
+    ts-dedent: ^2.0.0
+    type-fest: ~2.19
+    util-deprecate: ^1.0.2
+  peerDependencies:
+    "@storybook/test": 8.3.5
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.3.5
+    typescript: ">= 4.2.x"
+  peerDependenciesMeta:
+    "@storybook/test":
+      optional: true
+    typescript:
+      optional: true
+  checksum: 19409ded26d247c300a04659dbb3948b4e60b82bfe5a6a9b34aa72ecebca747f410a76fc8923ba11a8671b44dc5e443cd31e98782a9cf8e4c44c9426073d15a5
+  languageName: node
+  linkType: hard
+
 "@storybook/react@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/react@npm:6.5.16"
@@ -12478,7 +12780,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/source-loader@npm:6.5.16, @storybook/source-loader@npm:~6.5.16":
+"@storybook/source-loader@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/source-loader@npm:6.5.16"
   dependencies:
@@ -12584,7 +12886,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:6.5.16, @storybook/theming@npm:~6.5.16":
+"@storybook/theming@npm:6.5.16, @storybook/theming@npm:^6.5.14, @storybook/theming@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/theming@npm:6.5.16"
   dependencies:
@@ -12629,6 +12931,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/theming@npm:^8.3.5":
+  version: 8.3.5
+  resolution: "@storybook/theming@npm:8.3.5"
+  peerDependencies:
+    storybook: ^8.3.5
+  checksum: ba7d025b491b4404724faee440ae5ffc5afa42daeaf608d27270f02ca6167552460c7c11e9727f739d2bbf82352a7567fe8526df95ad974d28a67c16b585de53
+  languageName: node
+  linkType: hard
+
 "@storybook/types@npm:7.3.2":
   version: 7.3.2
   resolution: "@storybook/types@npm:7.3.2"
@@ -13073,6 +13384,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/babel__core@npm:^7.18.0":
+  version: 7.20.5
+  resolution: "@types/babel__core@npm:7.20.5"
+  dependencies:
+    "@babel/parser": ^7.20.7
+    "@babel/types": ^7.20.7
+    "@types/babel__generator": "*"
+    "@types/babel__template": "*"
+    "@types/babel__traverse": "*"
+  checksum: a3226f7930b635ee7a5e72c8d51a357e799d19cbf9d445710fa39ab13804f79ab1a54b72ea7d8e504659c7dfc50675db974b526142c754398d7413aa4bc30845
+  languageName: node
+  linkType: hard
+
 "@types/babel__generator@npm:*":
   version: 7.6.4
   resolution: "@types/babel__generator@npm:7.6.4"
@@ -13101,6 +13425,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/babel__traverse@npm:^7.18.0":
+  version: 7.20.6
+  resolution: "@types/babel__traverse@npm:7.20.6"
+  dependencies:
+    "@babel/types": ^7.20.7
+  checksum: 2bdc65eb62232c2d5c1086adeb0c31e7980e6fd7e50a3483b4a724a1a1029c84d9cb59749cf8de612f9afa2bc14c85b8f50e64e21f8a4398fa77eb9059a4283c
+  languageName: node
+  linkType: hard
+
 "@types/bad-words@npm:^3.0.3":
   version: 3.0.3
   resolution: "@types/bad-words@npm:3.0.3"
@@ -13659,6 +13992,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/doctrine@npm:^0.0.9":
+  version: 0.0.9
+  resolution: "@types/doctrine@npm:0.0.9"
+  checksum: 3909eaca42e7386b2ab866f082b78da3e00718d2fa323597e254feb0556c678b41f2c490729067433630083ac9c806ec6ae1e146754f7f8ba7d3e43ed68d6500
+  languageName: node
+  linkType: hard
+
 "@types/dompurify@npm:^2.3.3":
   version: 2.3.3
   resolution: "@types/dompurify@npm:2.3.3"
@@ -13691,6 +14031,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/escodegen@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "@types/escodegen@npm:0.0.6"
+  checksum: 7b25aeedd48dbef68345224082c6bc774845cbfc1d9b2ce91a477130fe7ccabf33da126c1d6d55e5dfd838db429a7c80890628a167e5aa55b6a4620974da38d3
+  languageName: node
+  linkType: hard
+
 "@types/eslint-scope@npm:^3.7.3":
   version: 3.7.4
   resolution: "@types/eslint-scope@npm:3.7.4"
@@ -13735,6 +14082,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/estree@npm:^1.0.5":
+  version: 1.0.6
+  resolution: "@types/estree@npm:1.0.6"
+  checksum: 8825d6e729e16445d9a1dd2fb1db2edc5ed400799064cd4d028150701031af012ba30d6d03fe9df40f4d7a437d0de6d2b256020152b7b09bde9f2e420afdffd9
+  languageName: node
+  linkType: hard
+
 "@types/express-rate-limit@npm:^5.1.3":
   version: 5.1.3
   resolution: "@types/express-rate-limit@npm:5.1.3"
@@ -14382,6 +14736,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:^22.0.0":
+  version: 22.7.5
+  resolution: "@types/node@npm:22.7.5"
+  dependencies:
+    undici-types: ~6.19.2
+  checksum: 1a8bbb504efaffcef7b8491074a428e5c0b5425b0c0ffb13e7262cb8462c275e8cc5eaf90a38d8fbf52a1eeda7c01ab3b940673c43fc2414140779c973e40ec6
+  languageName: node
+  linkType: hard
+
 "@types/nodemailer@npm:*":
   version: 6.4.13
   resolution: "@types/nodemailer@npm:6.4.13"
@@ -14628,6 +14991,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/resolve@npm:^1.20.2":
+  version: 1.20.6
+  resolution: "@types/resolve@npm:1.20.6"
+  checksum: dc35f5517606b6687cd971c0281ac58bdee2c50c051b030f04647d3991688be2259c304ee97e5b5d4b9936072c36767eb5933b54611a407d6557972bb6fea4f6
+  languageName: node
+  linkType: hard
+
 "@types/responselike@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/responselike@npm:1.0.0"
@@ -14688,6 +15058,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/semver@npm:^7.3.4":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
+  languageName: node
+  linkType: hard
+
 "@types/send@npm:*":
   version: 0.17.1
   resolution: "@types/send@npm:0.17.1"
@@ -15348,6 +15725,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/ast@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/helper-numbers": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+  checksum: 31bcc64147236bd7b1b6d29d1f419c1f5845c785e1e42dc9e3f8ca2e05a029e9393a271b84f3a5bff2a32d35f51ff59e2181a6e5f953fe88576acd6750506202
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/ast@npm:1.9.0"
@@ -15415,6 +15802,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-buffer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-buffer@npm:1.12.1"
+  checksum: c3ffb723024130308db608e86e2bdccd4868bbb62dffb0a9a1530606496f79c87f8565bd8e02805ce64912b71f1a70ee5fb00307258b0c082c3abf961d097eca
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-buffer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
@@ -15514,6 +15908,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-wasm-section@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": 1.12.1
+    "@webassemblyjs/helper-buffer": 1.12.1
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/wasm-gen": 1.12.1
+  checksum: c19810cdd2c90ff574139b6d8c0dda254d42d168a9e5b3d353d1bc085f1d7164ccd1b3c05592a45a939c47f7e403dc8d03572bb686642f06a3d02932f6f0bc8f
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-wasm-section@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0"
@@ -15649,6 +16055,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-edit@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-edit@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": 1.12.1
+    "@webassemblyjs/helper-buffer": 1.12.1
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/helper-wasm-section": 1.12.1
+    "@webassemblyjs/wasm-gen": 1.12.1
+    "@webassemblyjs/wasm-opt": 1.12.1
+    "@webassemblyjs/wasm-parser": 1.12.1
+    "@webassemblyjs/wast-printer": 1.12.1
+  checksum: ae23642303f030af888d30c4ef37b08dfec7eab6851a9575a616e65d1219f880d9223913a39056dd654e49049d76e97555b285d1f7e56935047abf578cce0692
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-gen@npm:1.11.1":
   version: 1.11.1
   resolution: "@webassemblyjs/wasm-gen@npm:1.11.1"
@@ -15675,6 +16097,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-gen@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-gen@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": 1.12.1
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/ieee754": 1.11.6
+    "@webassemblyjs/leb128": 1.11.6
+    "@webassemblyjs/utf8": 1.11.6
+  checksum: 5787626bb7f0b033044471ddd00ce0c9fe1ee4584e8b73e232051e3a4c99ba1a102700d75337151c8b6055bae77eefa4548960c610a5e4a504e356bd872138ff
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-gen@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-gen@npm:1.9.0"
@@ -15712,6 +16147,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-opt@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-opt@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": 1.12.1
+    "@webassemblyjs/helper-buffer": 1.12.1
+    "@webassemblyjs/wasm-gen": 1.12.1
+    "@webassemblyjs/wasm-parser": 1.12.1
+  checksum: 0e8fa8a0645304a1e18ff40d3db5a2e9233ebaa169b19fcc651d6fc9fe2cac0ce092ddee927318015ae735d9cd9c5d97c0cafb6a51dcd2932ac73587b62df991
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-opt@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-opt@npm:1.9.0"
@@ -15752,6 +16199,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-parser@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": 1.12.1
+    "@webassemblyjs/helper-api-error": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/ieee754": 1.11.6
+    "@webassemblyjs/leb128": 1.11.6
+    "@webassemblyjs/utf8": 1.11.6
+  checksum: 176015de3551ac068cd4505d837414f258d9ade7442bd71efb1232fa26c9f6d7d4e11a5c816caeed389943f409af7ebff6899289a992d7a70343cb47009d21a8
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-parser@npm:1.9.0"
@@ -15800,6 +16261,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wast-printer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wast-printer@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": 1.12.1
+    "@xtuc/long": 4.2.2
+  checksum: 2974b5dda8d769145ba0efd886ea94a601e61fb37114c14f9a9a7606afc23456799af652ac3052f284909bd42edc3665a76bc9b50f95f0794c053a8a1757b713
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wast-printer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wast-printer@npm:1.9.0"
@@ -15967,6 +16438,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-import-attributes@npm:^1.9.5":
+  version: 1.9.5
+  resolution: "acorn-import-attributes@npm:1.9.5"
+  peerDependencies:
+    acorn: ^8
+  checksum: 1c0c49b6a244503964ae46ae850baccf306e84caf99bc2010ed6103c69a423987b07b520a6c619f075d215388bd4923eccac995886a54309eda049ab78a4be95
+  languageName: node
+  linkType: hard
+
 "acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
@@ -17352,13 +17832,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-named-exports-order@npm:^0.0.2":
-  version: 0.0.2
-  resolution: "babel-plugin-named-exports-order@npm:0.0.2"
-  checksum: d918390a09c0148893ea93bdc9c4fc6a03447c688eaf40bed0f0682d036e985ecee830b90fec2ab149b8dc0cb3220a2c0ac5054e42626bdfe0b436b505b7ef22
-  languageName: node
-  linkType: hard
-
 "babel-plugin-polyfill-corejs2@npm:^0.3.3":
   version: 0.3.3
   resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3"
@@ -18337,6 +18810,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserslist@npm:^4.21.10, browserslist@npm:^4.24.0":
+  version: 4.24.0
+  resolution: "browserslist@npm:4.24.0"
+  dependencies:
+    caniuse-lite: ^1.0.30001663
+    electron-to-chromium: ^1.5.28
+    node-releases: ^2.0.18
+    update-browserslist-db: ^1.1.0
+  bin:
+    browserslist: cli.js
+  checksum: de200d3eb8d6ed819dad99719099a28fb6ebeb88016a5ac42fbdc11607e910c236a84ca1b0bbf232477d4b88ab64e8ab6aa67557cdd40a73ca9c2834f92ccce0
+  languageName: node
+  linkType: hard
+
 "bs-logger@npm:0.x":
   version: 0.2.6
   resolution: "bs-logger@npm:0.2.6"
@@ -18862,6 +19349,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"caniuse-lite@npm:^1.0.30001663":
+  version: 1.0.30001667
+  resolution: "caniuse-lite@npm:1.0.30001667"
+  checksum: f3c6a40c3e4115c6e5fb46c47884d903191285d29ec8a8b092546efbc9cdedcbd7183cce72dd3cab7dfc16c4d5b2745892876b3d6dda75d4cba49f9389239aa9
+  languageName: node
+  linkType: hard
+
 "capital-case@npm:^1.0.4":
   version: 1.0.4
   resolution: "capital-case@npm:1.0.4"
@@ -18889,7 +19383,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"case-sensitive-paths-webpack-plugin@npm:^2.3.0":
+"case-sensitive-paths-webpack-plugin@npm:^2.3.0, case-sensitive-paths-webpack-plugin@npm:^2.4.0":
   version: 2.4.0
   resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0"
   checksum: bcf469446eeee9ac0046e30860074ebb9aa4803aab9140e6bb72b600b23b1d70635690754be4504ce35cd99cdf05226bee8d894ba362a3f5485d5f6310fc6d02
@@ -19264,6 +19758,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cjs-module-lexer@npm:^1.2.3":
+  version: 1.4.1
+  resolution: "cjs-module-lexer@npm:1.4.1"
+  checksum: 2556807a99aec1f9daac60741af96cd613a707f343174ae7967da46402c91dced411bf830d209f2e93be4cecea46fc75cecf1f17c799d7d8a9e1dd6204bfcd22
+  languageName: node
+  linkType: hard
+
 "class-utils@npm:^0.3.5":
   version: 0.3.6
   resolution: "class-utils@npm:0.3.6"
@@ -19679,7 +20180,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^1.2.2, colorette@npm:^1.4.0":
+"colorette@npm:^1.4.0":
   version: 1.4.0
   resolution: "colorette@npm:1.4.0"
   checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3
@@ -20057,6 +20558,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie@npm:0.7.1":
+  version: 0.7.1
+  resolution: "cookie@npm:0.7.1"
+  checksum: cec5e425549b3650eb5c3498a9ba3cde0b9cd419e3b36e4b92739d30b4d89e0b678b98c1ddc209ce7cf958cd3215671fd6ac47aec21f10c2a0cc68abd399d8a7
+  languageName: node
+  linkType: hard
+
 "cookiejar@npm:^2.1.3":
   version: 2.1.3
   resolution: "cookiejar@npm:2.1.3"
@@ -20535,23 +21043,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-loader@npm:^5.0.1":
-  version: 5.2.7
-  resolution: "css-loader@npm:5.2.7"
+"css-loader@npm:^6.7.1":
+  version: 6.11.0
+  resolution: "css-loader@npm:6.11.0"
   dependencies:
     icss-utils: ^5.1.0
-    loader-utils: ^2.0.0
-    postcss: ^8.2.15
-    postcss-modules-extract-imports: ^3.0.0
-    postcss-modules-local-by-default: ^4.0.0
-    postcss-modules-scope: ^3.0.0
+    postcss: ^8.4.33
+    postcss-modules-extract-imports: ^3.1.0
+    postcss-modules-local-by-default: ^4.0.5
+    postcss-modules-scope: ^3.2.0
     postcss-modules-values: ^4.0.0
-    postcss-value-parser: ^4.1.0
-    schema-utils: ^3.0.0
-    semver: ^7.3.5
+    postcss-value-parser: ^4.2.0
+    semver: ^7.5.4
   peerDependencies:
-    webpack: ^4.27.0 || ^5.0.0
-  checksum: fb0742b30ac0919f94b99a323bdefe6d48ae46d66c7d966aae59031350532f368f8bba5951fcd268f2e053c5e6e4655551076268e9073ccb58e453f98ae58f8e
+    "@rspack/core": 0.x || 1.x
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 5c8d35975a7121334905394e88e28f05df72f037dbed2fb8fec4be5f0b313ae73a13894ba791867d4a4190c35896da84a7fd0c54fb426db55d85ba5e714edbe3
   languageName: node
   linkType: hard
 
@@ -22271,6 +22783,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"electron-to-chromium@npm:^1.5.28":
+  version: 1.5.36
+  resolution: "electron-to-chromium@npm:1.5.36"
+  checksum: 1f83daebdf88dd4817565660fa68a827bdca2866032d4902bfd79c6f16d97acbd731b63c09029dd5aa1af4aadbe567834cf3c89b52a37602d375352185d68cf4
+  languageName: node
+  linkType: hard
+
 "element-closest-polyfill@npm:^1.0.6":
   version: 1.0.6
   resolution: "element-closest-polyfill@npm:1.0.6"
@@ -22434,6 +22953,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"encodeurl@npm:~2.0.0":
+  version: 2.0.0
+  resolution: "encodeurl@npm:2.0.0"
+  checksum: abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe
+  languageName: node
+  linkType: hard
+
 "encoding-japanese@npm:1.0.30":
   version: 1.0.30
   resolution: "encoding-japanese@npm:1.0.30"
@@ -22491,6 +23017,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"enhanced-resolve@npm:^5.17.1":
+  version: 5.17.1
+  resolution: "enhanced-resolve@npm:5.17.1"
+  dependencies:
+    graceful-fs: ^4.2.4
+    tapable: ^2.2.0
+  checksum: 4bc38cf1cea96456f97503db7280394177d1bc46f8f87c267297d04f795ac5efa81e48115a2f5b6273c781027b5b6bfc5f62b54df629e4d25fa7001a86624f59
+  languageName: node
+  linkType: hard
+
 "enquirer@npm:^2.3.0, enquirer@npm:^2.3.5":
   version: 2.3.6
   resolution: "enquirer@npm:2.3.6"
@@ -22729,6 +23265,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-module-lexer@npm:^1.5.0":
+  version: 1.5.4
+  resolution: "es-module-lexer@npm:1.5.4"
+  checksum: a0cf04fb92d052647ac7d818d1913b98d3d3d0f5b9d88f0eafb993436e4c3e2c958599db68839d57f2dfa281fdf0f60e18d448eb78fc292c33c0f25635b6854f
+  languageName: node
+  linkType: hard
+
 "es-object-atoms@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-object-atoms@npm:1.0.0"
@@ -22954,6 +23497,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escalade@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "escalade@npm:3.2.0"
+  checksum: 47b029c83de01b0d17ad99ed766347b974b0d628e848de404018f3abee728e987da0d2d370ad4574aa3d5b5bfc368754fd085d69a30f8e75903486ec4b5b709e
+  languageName: node
+  linkType: hard
+
 "escape-goat@npm:^3.0.0":
   version: 3.0.0
   resolution: "escape-goat@npm:3.0.0"
@@ -23008,6 +23558,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escodegen@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "escodegen@npm:2.1.0"
+  dependencies:
+    esprima: ^4.0.1
+    estraverse: ^5.2.0
+    esutils: ^2.0.2
+    source-map: ~0.6.1
+  dependenciesMeta:
+    source-map:
+      optional: true
+  bin:
+    escodegen: bin/escodegen.js
+    esgenerate: bin/esgenerate.js
+  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
+  languageName: node
+  linkType: hard
+
 "esl@github:pierre-lehnen-rc/esl":
   version: 11.1.1
   resolution: "esl@https://github.com/pierre-lehnen-rc/esl.git#commit=22f2167a4acaa129d214592cfb0d46a419d08663"
@@ -23827,6 +24395,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"express@npm:^4.19.2":
+  version: 4.21.1
+  resolution: "express@npm:4.21.1"
+  dependencies:
+    accepts: ~1.3.8
+    array-flatten: 1.1.1
+    body-parser: 1.20.3
+    content-disposition: 0.5.4
+    content-type: ~1.0.4
+    cookie: 0.7.1
+    cookie-signature: 1.0.6
+    debug: 2.6.9
+    depd: 2.0.0
+    encodeurl: ~2.0.0
+    escape-html: ~1.0.3
+    etag: ~1.8.1
+    finalhandler: 1.3.1
+    fresh: 0.5.2
+    http-errors: 2.0.0
+    merge-descriptors: 1.0.3
+    methods: ~1.1.2
+    on-finished: 2.4.1
+    parseurl: ~1.3.3
+    path-to-regexp: 0.1.10
+    proxy-addr: ~2.0.7
+    qs: 6.13.0
+    range-parser: ~1.2.1
+    safe-buffer: 5.2.1
+    send: 0.19.0
+    serve-static: 1.16.2
+    setprototypeof: 1.2.0
+    statuses: 2.0.1
+    type-is: ~1.6.18
+    utils-merge: 1.0.1
+    vary: ~1.1.2
+  checksum: 5ac2b26d8aeddda5564fc0907227d29c100f90c0ead2ead9d474dc5108e8fb306c2de2083c4e3ba326e0906466f2b73417dbac16961f4075ff9f03785fd940fe
+  languageName: node
+  linkType: hard
+
 "ext-list@npm:^2.0.0":
   version: 2.2.2
   resolution: "ext-list@npm:2.2.2"
@@ -24400,6 +25007,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"finalhandler@npm:1.3.1":
+  version: 1.3.1
+  resolution: "finalhandler@npm:1.3.1"
+  dependencies:
+    debug: 2.6.9
+    encodeurl: ~2.0.0
+    escape-html: ~1.0.3
+    on-finished: 2.4.1
+    parseurl: ~1.3.3
+    statuses: 2.0.1
+    unpipe: ~1.0.0
+  checksum: a8c58cd97c9cd47679a870f6833a7b417043f5a288cd6af6d0f49b476c874a506100303a128b6d3b654c3d74fa4ff2ffed68a48a27e8630cda5c918f2977dcf4
+  languageName: node
+  linkType: hard
+
 "find-cache-dir@npm:^2.0.0, find-cache-dir@npm:^2.1.0":
   version: 2.1.0
   resolution: "find-cache-dir@npm:2.1.0"
@@ -24718,6 +25340,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fork-ts-checker-webpack-plugin@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "fork-ts-checker-webpack-plugin@npm:8.0.0"
+  dependencies:
+    "@babel/code-frame": ^7.16.7
+    chalk: ^4.1.2
+    chokidar: ^3.5.3
+    cosmiconfig: ^7.0.1
+    deepmerge: ^4.2.2
+    fs-extra: ^10.0.0
+    memfs: ^3.4.1
+    minimatch: ^3.0.4
+    node-abort-controller: ^3.0.1
+    schema-utils: ^3.1.1
+    semver: ^7.3.5
+    tapable: ^2.2.1
+  peerDependencies:
+    typescript: ">3.6.0"
+    webpack: ^5.11.0
+  checksum: aad4cbc5b802e6281a2700a379837697c93ad95288468f9595219d91d9c26674736d37852bb4c4341e9122f26181e9e05fc1a362e8d029fdd88e99de7816037b
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^2.5.0":
   version: 2.5.1
   resolution: "form-data@npm:2.5.1"
@@ -24852,6 +25497,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-extra@npm:^10.0.0":
+  version: 10.1.0
+  resolution: "fs-extra@npm:10.1.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^11.1.0":
+  version: 11.2.0
+  resolution: "fs-extra@npm:11.2.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8
+  languageName: node
+  linkType: hard
+
 "fs-extra@npm:^7.0.1":
   version: 7.0.1
   resolution: "fs-extra@npm:7.0.1"
@@ -25731,7 +26398,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
   checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
@@ -26448,7 +27115,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:^5.0.0, html-webpack-plugin@npm:^5.5.3":
+"html-webpack-plugin@npm:^5.5.0":
+  version: 5.6.0
+  resolution: "html-webpack-plugin@npm:5.6.0"
+  dependencies:
+    "@types/html-minifier-terser": ^6.0.0
+    html-minifier-terser: ^6.0.2
+    lodash: ^4.17.21
+    pretty-error: ^4.0.0
+    tapable: ^2.0.0
+  peerDependencies:
+    "@rspack/core": 0.x || 1.x
+    webpack: ^5.20.0
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 32a6e41da538e798fd0be476637d7611a5e8a98a3508f031996e9eb27804dcdc282cb01f847cf5d066f21b49cfb8e21627fcf977ffd0c9bea81cf80e5a65070d
+  languageName: node
+  linkType: hard
+
+"html-webpack-plugin@npm:^5.5.3":
   version: 5.5.3
   resolution: "html-webpack-plugin@npm:5.5.3"
   dependencies:
@@ -29365,6 +30053,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsesc@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "jsesc@npm:3.0.2"
+  bin:
+    jsesc: bin/jsesc
+  checksum: a36d3ca40574a974d9c2063bf68c2b6141c20da8f2a36bd3279fc802563f35f0527a6c828801295bdfb2803952cf2cf387786c2c90ed564f88d5782475abfe3c
+  languageName: node
+  linkType: hard
+
 "jsesc@npm:~0.5.0":
   version: 0.5.0
   resolution: "jsesc@npm:0.5.0"
@@ -30601,6 +31298,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.30.5":
+  version: 0.30.11
+  resolution: "magic-string@npm:0.30.11"
+  dependencies:
+    "@jridgewell/sourcemap-codec": ^1.5.0
+  checksum: e041649453c9a3f31d2e731fc10e38604d50e20d3585cd48bc7713a6e2e1a3ad3012105929ca15750d59d0a3f1904405e4b95a23b7e69dc256db3c277a73a3ca
+  languageName: node
+  linkType: hard
+
 "mailparser@npm:^3.4.0":
   version: 3.4.0
   resolution: "mailparser@npm:3.4.0"
@@ -30991,7 +31697,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memfs@npm:^3.1.2, memfs@npm:^3.2.2, memfs@npm:^3.4.3":
+"memfs@npm:^3.1.2, memfs@npm:^3.4.1, memfs@npm:^3.4.12, memfs@npm:^3.4.3":
   version: 3.5.3
   resolution: "memfs@npm:3.5.3"
   dependencies:
@@ -31141,6 +31847,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"merge-descriptors@npm:1.0.3":
+  version: 1.0.3
+  resolution: "merge-descriptors@npm:1.0.3"
+  checksum: 52117adbe0313d5defa771c9993fe081e2d2df9b840597e966aadafde04ae8d0e3da46bac7ca4efc37d4d2b839436582659cd49c6a43eacb3fe3050896a105d1
+  languageName: node
+  linkType: hard
+
 "merge-source-map@npm:^1.1.0":
   version: 1.1.0
   resolution: "merge-source-map@npm:1.1.0"
@@ -31357,7 +32070,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.30, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -32388,7 +33101,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-abort-controller@npm:^3.1.1":
+"node-abort-controller@npm:^3.0.1, node-abort-controller@npm:^3.1.1":
   version: 3.1.1
   resolution: "node-abort-controller@npm:3.1.1"
   checksum: 2c340916af9710328b11c0828223fc65ba320e0d082214a211311bf64c2891028e42ef276b9799188c4ada9e6e1c54cf7a0b7c05dd9d59fcdc8cd633304c8047
@@ -32626,6 +33339,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-releases@npm:^2.0.18":
+  version: 2.0.18
+  resolution: "node-releases@npm:2.0.18"
+  checksum: ef55a3d853e1269a6d6279b7692cd6ff3e40bc74947945101138745bfdc9a5edabfe72cb19a31a8e45752e1910c4c65c77d931866af6357f242b172b7283f5b3
+  languageName: node
+  linkType: hard
+
 "node-rsa@npm:^1.1.1":
   version: 1.1.1
   resolution: "node-rsa@npm:1.1.1"
@@ -34060,6 +34780,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-to-regexp@npm:0.1.10":
+  version: 0.1.10
+  resolution: "path-to-regexp@npm:0.1.10"
+  checksum: ab7a3b7a0b914476d44030340b0a65d69851af2a0f33427df1476100ccb87d409c39e2182837a96b98fb38c4ef2ba6b87bdad62bb70a2c153876b8061760583c
+  languageName: node
+  linkType: hard
+
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
@@ -34236,7 +34963,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.1":
+"picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
   version: 1.1.0
   resolution: "picocolors@npm:1.1.0"
   checksum: a64d653d3a188119ff45781dfcdaeedd7625583f45280aea33fcb032c7a0d3959f2368f9b192ad5e8aade75b74dbd954ffe3106c158509a45e4c18ab379a2acd
@@ -34839,12 +35566,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-modules-extract-imports@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-extract-imports@npm:3.0.0"
+"postcss-modules-extract-imports@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "postcss-modules-extract-imports@npm:3.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 4b65f2f1382d89c4bc3c0a1bdc5942f52f3cb19c110c57bd591ffab3a5fee03fcf831604168205b0c1b631a3dce2255c70b61aaae3ef39d69cd7eb450c2552d2
+  checksum: b9192e0f4fb3d19431558be6f8af7ca45fc92baaad9b2778d1732a5880cd25c3df2074ce5484ae491e224f0d21345ffc2d419bd51c25b019af76d7a7af88c17f
   languageName: node
   linkType: hard
 
@@ -34860,16 +35587,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-modules-local-by-default@npm:^4.0.0":
-  version: 4.0.3
-  resolution: "postcss-modules-local-by-default@npm:4.0.3"
+"postcss-modules-local-by-default@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "postcss-modules-local-by-default@npm:4.0.5"
   dependencies:
     icss-utils: ^5.0.0
     postcss-selector-parser: ^6.0.2
     postcss-value-parser: ^4.1.0
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 2f8083687f3d6067885f8863dd32dbbb4f779cfcc7e52c17abede9311d84faf6d3ed8760e7c54c6380281732ae1f78e5e56a28baf3c271b33f450a11c9e30485
+  checksum: ca9b01f4a0a3dfb33e016299e2dfb7e85c3123292f7aec2efc0c6771b9955648598bfb4c1561f7ee9732fb27fb073681233661b32eef98baab43743f96735452
   languageName: node
   linkType: hard
 
@@ -34883,14 +35610,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-modules-scope@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-scope@npm:3.0.0"
+"postcss-modules-scope@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "postcss-modules-scope@npm:3.2.0"
   dependencies:
     postcss-selector-parser: ^6.0.4
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 330b9398dbd44c992c92b0dc612c0626135e2cc840fee41841eb61247a6cfed95af2bd6f67ead9dd9d0bb41f5b0367129d93c6e434fa3e9c58ade391d9a5a138
+  checksum: 2ffe7e98c1fa993192a39c8dd8ade93fc4f59fbd1336ce34fcedaee0ee3bafb29e2e23fb49189256895b30e4f21af661c6a6a16ef7b17ae2c859301e4a4459ae
   languageName: node
   linkType: hard
 
@@ -35117,7 +35844,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.6":
+"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.6":
   version: 6.0.13
   resolution: "postcss-selector-parser@npm:6.0.13"
   dependencies:
@@ -35127,6 +35854,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-selector-parser@npm:^6.0.4":
+  version: 6.1.2
+  resolution: "postcss-selector-parser@npm:6.1.2"
+  dependencies:
+    cssesc: ^3.0.0
+    util-deprecate: ^1.0.2
+  checksum: ce9440fc42a5419d103f4c7c1847cb75488f3ac9cbe81093b408ee9701193a509f664b4d10a2b4d82c694ee7495e022f8f482d254f92b7ffd9ed9dea696c6f84
+  languageName: node
+  linkType: hard
+
 "postcss-sorting@npm:^7.0.1":
   version: 7.0.1
   resolution: "postcss-sorting@npm:7.0.1"
@@ -35218,7 +35955,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.23":
+"postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.23":
   version: 8.4.31
   resolution: "postcss@npm:8.4.31"
   dependencies:
@@ -35229,6 +35966,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:^8.4.33":
+  version: 8.4.47
+  resolution: "postcss@npm:8.4.47"
+  dependencies:
+    nanoid: ^3.3.7
+    picocolors: ^1.1.0
+    source-map-js: ^1.2.1
+  checksum: f78440a9d8f97431dd2ab1ab8e1de64f12f3eff38a3d8d4a33919b96c381046a314658d2de213a5fa5eb296b656de76a3ec269fdea27f16d5ab465b916a0f52c
+  languageName: node
+  linkType: hard
+
 "postcss@npm:~8.4.45":
   version: 8.4.45
   resolution: "postcss@npm:8.4.45"
@@ -36255,6 +37003,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-docgen@npm:^7.0.0":
+  version: 7.0.3
+  resolution: "react-docgen@npm:7.0.3"
+  dependencies:
+    "@babel/core": ^7.18.9
+    "@babel/traverse": ^7.18.9
+    "@babel/types": ^7.18.9
+    "@types/babel__core": ^7.18.0
+    "@types/babel__traverse": ^7.18.0
+    "@types/doctrine": ^0.0.9
+    "@types/resolve": ^1.20.2
+    doctrine: ^3.0.0
+    resolve: ^1.22.1
+    strip-indent: ^4.0.0
+  checksum: f5dbabd16a25b3c424c4962df4b4073d03ca124c3a5c99871f8436e30468854de115f959d0d5f03df77ad8dbe54f21e679fb48ba47bc125d61ae527bc5bcf0bf
+  languageName: node
+  linkType: hard
+
 "react-dom@npm:16.14.0":
   version: 16.14.0
   resolution: "react-dom@npm:16.14.0"
@@ -36308,6 +37074,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-element-to-jsx-string@npm:^15.0.0":
+  version: 15.0.0
+  resolution: "react-element-to-jsx-string@npm:15.0.0"
+  dependencies:
+    "@base2/pretty-print-object": 1.0.1
+    is-plain-object: 5.0.0
+    react-is: 18.1.0
+  peerDependencies:
+    react: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
+    react-dom: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
+  checksum: c3907cc4c1d3e9ecc8ca7727058ebcba6ec89848d9e07bfd2c77ee8f28f1ad99bf55e38359dec8a1125de83d41ac09a2874f53c41415edc86ffa9840fa1b7856
+  languageName: node
+  linkType: hard
+
 "react-error-boundary@npm:^3.1.4":
   version: 3.1.4
   resolution: "react-error-boundary@npm:3.1.4"
@@ -36375,6 +37155,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:18.1.0":
+  version: 18.1.0
+  resolution: "react-is@npm:18.1.0"
+  checksum: d206a0fe6790851bff168727bfb896de02c5591695afb0c441163e8630136a3e13ee1a7ddd59fdccddcc93968b4721ae112c10f790b194b03b35a3dc13a355ef
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^16.13.1, react-is@npm:^16.7.0, react-is@npm:^16.8.6":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
@@ -37482,7 +38269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.4, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.3.2, resolve@npm:^1.4.0":
+"resolve@npm:^1.1.4, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.22.8, resolve@npm:^1.3.2, resolve@npm:^1.4.0":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -37508,7 +38295,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.8#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -38237,6 +39024,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"send@npm:0.19.0":
+  version: 0.19.0
+  resolution: "send@npm:0.19.0"
+  dependencies:
+    debug: 2.6.9
+    depd: 2.0.0
+    destroy: 1.2.0
+    encodeurl: ~1.0.2
+    escape-html: ~1.0.3
+    etag: ~1.8.1
+    fresh: 0.5.2
+    http-errors: 2.0.0
+    mime: 1.6.0
+    ms: 2.1.3
+    on-finished: 2.4.1
+    range-parser: ~1.2.1
+    statuses: 2.0.1
+  checksum: 5ae11bd900c1c2575525e2aa622e856804e2f96a09281ec1e39610d089f53aa69e13fd8db84b52f001d0318cf4bb0b3b904ad532fc4c0014eb90d32db0cff55f
+  languageName: node
+  linkType: hard
+
 "sentence-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "sentence-case@npm:3.0.4"
@@ -38340,6 +39148,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"serve-static@npm:1.16.2":
+  version: 1.16.2
+  resolution: "serve-static@npm:1.16.2"
+  dependencies:
+    encodeurl: ~2.0.0
+    escape-html: ~1.0.3
+    parseurl: ~1.3.3
+    send: 0.19.0
+  checksum: dffc52feb4cc5c68e66d0c7f3c1824d4e989f71050aefc9bd5f822a42c54c9b814f595fc5f2b717f4c7cc05396145f3e90422af31186a93f76cf15f707019759
+  languageName: node
+  linkType: hard
+
 "serve@npm:^11.3.2":
   version: 11.3.2
   resolution: "serve@npm:11.3.2"
@@ -38896,7 +39716,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:^1.2.0":
+"source-map-js@npm:^1.2.0, source-map-js@npm:^1.2.1":
   version: 1.2.1
   resolution: "source-map-js@npm:1.2.1"
   checksum: 4eb0cd997cdf228bc253bcaff9340afeb706176e64868ecd20efbe6efea931465f43955612346d6b7318789e5265bdc419bc7669c1cebe3db0eb255f57efa76b
@@ -39321,6 +40141,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"storybook-dark-mode@npm:~2.1.1":
+  version: 2.1.1
+  resolution: "storybook-dark-mode@npm:2.1.1"
+  dependencies:
+    "@storybook/addons": ^6.5.14
+    "@storybook/api": ^6.5.14
+    "@storybook/components": ^6.5.14
+    "@storybook/core-events": ^6.5.14
+    "@storybook/global": ^5.0.0
+    "@storybook/theming": ^6.5.14
+    fast-deep-equal: ^3.1.3
+    memoizerific: ^1.11.3
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 44d6313013a1d63f47c95e2e8e0d11c24d467b3540259e152ceb3236636dbadf7a46c6f7f183946b105ee53173cb13815f1f88ca6da41fc74673c3c11f619863
+  languageName: node
+  linkType: hard
+
 "storybook-dark-mode@npm:~3.0.3":
   version: 3.0.3
   resolution: "storybook-dark-mode@npm:3.0.3"
@@ -39932,15 +40776,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-loader@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "style-loader@npm:2.0.0"
-  dependencies:
-    loader-utils: ^2.0.0
-    schema-utils: ^3.0.0
+"style-loader@npm:^3.3.1":
+  version: 3.3.4
+  resolution: "style-loader@npm:3.3.4"
   peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 21425246a5a8f14d1625a657a3a56f8a323193fa341a71af818a2ed2a429efa2385a328b4381cf2f12c2d0e6380801eb9e0427ed9c3a10ff95c86e383184d632
+    webpack: ^5.0.0
+  checksum: caac3f2fe2c3c89e49b7a2a9329e1cfa515ecf5f36b9c4885f9b218019fda207a9029939b2c35821dec177a264a007e7c391ccdd3ff7401881ce6287b9c8f38b
   languageName: node
   linkType: hard
 
@@ -40339,7 +41180,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0":
+"tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0, tapable@npm:^2.2.1":
   version: 2.2.1
   resolution: "tapable@npm:2.2.1"
   checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
@@ -40605,7 +41446,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:^5.0.3, terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.7":
+"terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10, terser-webpack-plugin@npm:^5.3.7":
   version: 5.3.10
   resolution: "terser-webpack-plugin@npm:5.3.10"
   dependencies:
@@ -41311,6 +42152,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsconfig-paths@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "tsconfig-paths@npm:4.2.0"
+  dependencies:
+    json5: ^2.2.2
+    minimist: ^1.2.6
+    strip-bom: ^3.0.0
+  checksum: 28c5f7bbbcabc9dabd4117e8fdc61483f6872a1c6b02a4b1c4d68c5b79d06896c3cc9547610c4c3ba64658531caa2de13ead1ea1bf321c7b53e969c4752b98c7
+  languageName: node
+  linkType: hard
+
 "tslib@npm:2.4.0":
   version: 2.4.0
   resolution: "tslib@npm:2.4.0"
@@ -41325,7 +42177,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.3":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
@@ -41652,7 +42504,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^2.19.0":
+"type-fest@npm:^2.19.0, type-fest@npm:~2.19":
   version: 2.19.0
   resolution: "type-fest@npm:2.19.0"
   checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278
@@ -42309,6 +43161,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"update-browserslist-db@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "update-browserslist-db@npm:1.1.1"
+  dependencies:
+    escalade: ^3.2.0
+    picocolors: ^1.1.0
+  peerDependencies:
+    browserslist: ">= 4.21.0"
+  bin:
+    update-browserslist-db: cli.js
+  checksum: 2ea11bd2562122162c3e438d83a1f9125238c0844b6d16d366e3276d0c0acac6036822dc7df65fc5a89c699cdf9f174acf439c39bedf3f9a2f3983976e4b4c3e
+  languageName: node
+  linkType: hard
+
 "update-check@npm:1.5.2":
   version: 1.5.2
   resolution: "update-check@npm:1.5.2"
@@ -43026,6 +43892,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"watchpack@npm:^2.4.1":
+  version: 2.4.2
+  resolution: "watchpack@npm:2.4.2"
+  dependencies:
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.1.2
+  checksum: 92d9d52ce3d16fd83ed6994d1dd66a4d146998882f4c362d37adfea9ab77748a5b4d1e0c65fa104797928b2d40f635efa8f9b925a6265428a69f1e1852ca3441
+  languageName: node
+  linkType: hard
+
 "wbuf@npm:^1.1.0, wbuf@npm:^1.7.3":
   version: 1.7.3
   resolution: "wbuf@npm:1.7.3"
@@ -43241,34 +44117,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-dev-middleware@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "webpack-dev-middleware@npm:4.3.0"
+"webpack-dev-middleware@npm:^5.3.1":
+  version: 5.3.3
+  resolution: "webpack-dev-middleware@npm:5.3.3"
   dependencies:
-    colorette: ^1.2.2
-    mem: ^8.1.1
-    memfs: ^3.2.2
-    mime-types: ^2.1.30
+    colorette: ^2.0.10
+    memfs: ^3.4.3
+    mime-types: ^2.1.31
     range-parser: ^1.2.1
-    schema-utils: ^3.0.0
+    schema-utils: ^4.0.0
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 113389f9aa488312758b329f9fdd34ff646a50822c197d0e1dc7ce171b1d826a607c92702a60439fead24e495d5b2c9959d90948fc272f7472a301d37cec1e8d
+  checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621
   languageName: node
   linkType: hard
 
-"webpack-dev-middleware@npm:^5.3.1":
-  version: 5.3.3
-  resolution: "webpack-dev-middleware@npm:5.3.3"
+"webpack-dev-middleware@npm:^6.1.2":
+  version: 6.1.3
+  resolution: "webpack-dev-middleware@npm:6.1.3"
   dependencies:
     colorette: ^2.0.10
-    memfs: ^3.4.3
+    memfs: ^3.4.12
     mime-types: ^2.1.31
     range-parser: ^1.2.1
     schema-utils: ^4.0.0
   peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+  checksum: ddedaa913cc39d7ac7f971d902f181ecc5c4ab0b91f9eda5923f0ea513ecf458f71046f2ed423cb4fc657c2177fe279186453e395bd1051f0949e265c3124665
   languageName: node
   linkType: hard
 
@@ -43433,10 +44311,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-virtual-modules@npm:^0.4.1":
-  version: 0.4.6
-  resolution: "webpack-virtual-modules@npm:0.4.6"
-  checksum: cb056ba8c50b35436ae43149554b051b80065b0cf79f2d528ca692ddf344a422ac71c415adb9da83dc3acc6e7e58f518388cc1cd11cb4fa29dc04f2c4494afe3
+"webpack-virtual-modules@npm:^0.6.0":
+  version: 0.6.2
+  resolution: "webpack-virtual-modules@npm:0.6.2"
+  checksum: 7e8e1d63f35864c815420cc2f27da8561a1e028255040698a352717de0ba46d3b3faf16f06c1a1965217054c4c2894eb9af53a85451870e919b5707ce9c5822d
   languageName: node
   linkType: hard
 
@@ -43478,7 +44356,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:>=4.0.0 <6.0.0, webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5, webpack@npm:^5.89.0, webpack@npm:^5.9.0":
+"webpack@npm:5":
+  version: 5.95.0
+  resolution: "webpack@npm:5.95.0"
+  dependencies:
+    "@types/estree": ^1.0.5
+    "@webassemblyjs/ast": ^1.12.1
+    "@webassemblyjs/wasm-edit": ^1.12.1
+    "@webassemblyjs/wasm-parser": ^1.12.1
+    acorn: ^8.7.1
+    acorn-import-attributes: ^1.9.5
+    browserslist: ^4.21.10
+    chrome-trace-event: ^1.0.2
+    enhanced-resolve: ^5.17.1
+    es-module-lexer: ^1.2.1
+    eslint-scope: 5.1.1
+    events: ^3.2.0
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.2.11
+    json-parse-even-better-errors: ^2.3.1
+    loader-runner: ^4.2.0
+    mime-types: ^2.1.27
+    neo-async: ^2.6.2
+    schema-utils: ^3.2.0
+    tapable: ^2.1.1
+    terser-webpack-plugin: ^5.3.10
+    watchpack: ^2.4.1
+    webpack-sources: ^3.2.3
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 0c3dfe288de4d62f8f3dc25478a618894883cab739121330763b7847e43304630ea2815ae2351a5f8ff6ab7c9642caf530d503d89bda261fe2cd220e524dd5d1
+  languageName: node
+  linkType: hard
+
+"webpack@npm:>=4.0.0 <6.0.0, webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5, webpack@npm:^5.89.0":
   version: 5.89.0
   resolution: "webpack@npm:5.89.0"
   dependencies:

From f70954e0289bb9178e44cd93802d5ee12e39be4e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 11 Oct 2024 00:40:23 -0300
Subject: [PATCH 167/170] chore: bump minor deps (#33512)

---
 apps/meteor/ee/server/services/package.json   |   4 +-
 apps/meteor/package.json                      |  18 +-
 apps/uikit-playground/package.json            |   2 +-
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/queue-worker/package.json             |   2 +-
 ee/packages/omnichannel-services/package.json |   2 +-
 ee/packages/pdf-worker/package.json           |   2 +-
 package.json                                  |   2 +-
 packages/agenda/package.json                  |   2 +-
 packages/apps-engine/package.json             |   8 +-
 packages/ddp-client/package.json              |   2 +-
 packages/fuselage-ui-kit/package.json         |   3 +-
 packages/gazzodown/package.json               |   2 +-
 packages/livechat/package.json                |   2 +-
 packages/message-parser/package.json          |   4 +-
 packages/peggy-loader/package.json            |   2 +-
 packages/release-action/package.json          |   2 +-
 packages/tools/package.json                   |   2 +-
 packages/ui-voip/package.json                 |   2 +-
 yarn.lock                                     | 577 ++++++------------
 21 files changed, 216 insertions(+), 428 deletions(-)

diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 6c9ca9047fdc..1ea056a08606 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -32,7 +32,7 @@
 		"body-parser": "^1.20.3",
 		"colorette": "^2.0.20",
 		"cookie": "^0.5.0",
-		"cookie-parser": "^1.4.6",
+		"cookie-parser": "^1.4.7",
 		"ejson": "^2.2.3",
 		"eventemitter3": "^4.0.7",
 		"express": "^4.17.3",
@@ -46,7 +46,7 @@
 		"sodium-native": "^3.3.0",
 		"sodium-plus": "^0.9.0",
 		"uuid": "^8.3.2",
-		"ws": "^8.8.1"
+		"ws": "^8.18.0"
 	},
 	"devDependencies": {
 		"@rocket.chat/icons": "~0.38.0",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e05ad2d77c58..3b9af8419230 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -190,7 +190,7 @@
 		"outdent": "~0.8.0",
 		"pino-pretty": "^7.6.1",
 		"playwright-qase-reporter": "^1.2.2",
-		"postcss": "~8.4.45",
+		"postcss": "~8.4.47",
 		"postcss-custom-properties": "^11.0.0",
 		"postcss-easy-import": "^3.0.0",
 		"postcss-load-config": "^3.1.4",
@@ -315,12 +315,12 @@
 		"chalk": "^4.0.0",
 		"change-case": "^4.1.2",
 		"chart.js": "^3.8.0",
-		"codemirror": "^5.65.17",
+		"codemirror": "^5.65.18",
 		"colorette": "^2.0.20",
 		"colors": "^1.4.0",
 		"connect": "^3.7.0",
 		"cookie": "^0.5.0",
-		"cookie-parser": "^1.4.6",
+		"cookie-parser": "^1.4.7",
 		"cors": "^2.8.5",
 		"cron": "~1.8.2",
 		"css-vars-ponyfill": "^2.4.9",
@@ -381,7 +381,7 @@
 		"mkdirp": "^1.0.4",
 		"moleculer": "^0.14.34",
 		"moment": "^2.29.4",
-		"moment-timezone": "^0.5.45",
+		"moment-timezone": "^0.5.46",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.6.1",
@@ -416,7 +416,7 @@
 		"react-virtuoso": "^4.7.1",
 		"redis": "^4.0.6",
 		"sanitize-html": "^2.7.2",
-		"semver": "^7.3.7",
+		"semver": "^7.6.3",
 		"sharp": "^0.32.6",
 		"sip.js": "^0.20.1",
 		"sodium-native": "^3.3.0",
@@ -426,15 +426,15 @@
 		"strict-uri-encode": "^2.0.0",
 		"string-strip-html": "^7.0.3",
 		"suretype": "~2.4.1",
-		"swiper": "^9.3.2",
+		"swiper": "^9.4.1",
 		"tar-stream": "^1.6.2",
 		"textarea-caret": "^3.1.0",
 		"tinykeys": "^1.4.0",
-		"turndown": "^7.1.2",
+		"turndown": "^7.2.0",
 		"twilio": "^3.76.1",
 		"twit": "^2.2.11",
 		"typia": "~6.9.0",
-		"ua-parser-js": "^1.0.38",
+		"ua-parser-js": "^1.0.39",
 		"underscore": "^1.13.7",
 		"universal-perf-hooks": "^1.0.1",
 		"url-polyfill": "^1.1.12",
@@ -445,7 +445,7 @@
 		"webdav": "^4.11.4",
 		"xml-crypto": "~3.1.0",
 		"xml-encryption": "~3.0.2",
-		"xml2js": "~0.5.0",
+		"xml2js": "~0.6.2",
 		"yaqrcode": "^0.2.1"
 	},
 	"meteor": {
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 00e52229c2e3..786949280290 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -51,7 +51,7 @@
     "@vitejs/plugin-react": "^4.0.0",
     "eslint": "~8.45.0",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.11",
+    "eslint-plugin-react-refresh": "^0.4.12",
     "typescript": "~5.5.4",
     "vite": "^4.3.9"
   },
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 83e54f447188..1c70ea415859 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -41,7 +41,7 @@
 		"sharp": "^0.32.6",
 		"underscore": "^1.13.7",
 		"uuid": "^7.0.3",
-		"ws": "^8.8.1"
+		"ws": "^8.18.0"
 	},
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 493abc9cba4c..9f22cee1dc90 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -35,7 +35,7 @@
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
 		"moleculer": "^0.14.34",
-		"moment-timezone": "^0.5.45",
+		"moment-timezone": "^0.5.46",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index b0a1bda4dce2..f6a51d73f5b8 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -33,7 +33,7 @@
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
 		"moleculer": "^0.14.34",
-		"moment-timezone": "^0.5.45",
+		"moment-timezone": "^0.5.46",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 80e2cb56c3f8..257298431f79 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -28,7 +28,7 @@
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
 		"mem": "^8.1.1",
-		"moment-timezone": "^0.5.45",
+		"moment-timezone": "^0.5.46",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"pino": "^8.15.0"
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index b8f1555161f0..500d6951a1dd 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -38,7 +38,7 @@
 		"emoji-assets": "^7.0.1",
 		"emoji-toolkit": "^7.0.1",
 		"moment": "^2.29.4",
-		"moment-timezone": "^0.5.45",
+		"moment-timezone": "^0.5.46",
 		"react": "~18.3.1"
 	},
 	"volta": {
diff --git a/package.json b/package.json
index 54ed0f200304..346b93216664 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
 		"@types/chart.js": "^2.9.41",
 		"@types/js-yaml": "^4.0.9",
 		"ts-node": "^10.9.2",
-		"turbo": "^2.1.2"
+		"turbo": "^2.1.3"
 	},
 	"workspaces": [
 		"apps/*",
diff --git a/packages/agenda/package.json b/packages/agenda/package.json
index 2d1fc084c383..1373e1cda88c 100644
--- a/packages/agenda/package.json
+++ b/packages/agenda/package.json
@@ -8,7 +8,7 @@
 		"date.js": "~0.3.3",
 		"debug": "~4.1.1",
 		"human-interval": "^2.0.1",
-		"moment-timezone": "~0.5.45",
+		"moment-timezone": "~0.5.46",
 		"mongodb": "^4.17.2"
 	},
 	"devDependencies": {
diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json
index c229ff447000..fa1094a1632c 100644
--- a/packages/apps-engine/package.json
+++ b/packages/apps-engine/package.json
@@ -90,18 +90,18 @@
         "ts-node": "^6.2.0",
         "typedoc": "~0.24.8",
         "typescript": "~5.1.6",
-        "uglify-es": "^3.3.9"
+        "uglify-es": "^3.3.10"
     },
     "dependencies": {
         "@msgpack/msgpack": "3.0.0-beta2",
-        "adm-zip": "^0.5.9",
+        "adm-zip": "^0.5.16",
         "cryptiles": "^4.1.3",
-        "debug": "^4.3.4",
+        "debug": "^4.3.7",
         "esbuild": "^0.20.2",
         "jose": "^4.11.1",
         "jsonrpc-lite": "^2.2.0",
         "lodash.clonedeep": "^4.5.0",
-        "semver": "^5.7.1",
+        "semver": "^7.6.3",
         "stack-trace": "0.0.10",
         "uuid": "~8.3.2"
     },
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 9adb1186a028..928a4a75bbc1 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -9,7 +9,7 @@
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
 		"typescript": "~5.5.4",
-		"ws": "^8.13.0"
+		"ws": "^8.18.0"
 	},
 	"peerDependencies": {
 		"@rocket.chat/emitter": "*"
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 6602d319b1f0..d8bdf0ef83ba 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -102,7 +102,8 @@
     "react-dom": "^17.0.2",
     "react-i18next": "~13.2.2",
     "rimraf": "^3.0.2",
-    "storybook-dark-mode": "~2.1.1",
+    "storybook-dark-mode": "~3.0.3",
+    "tslib": "^2.7.0",
     "typescript": "~5.5.4"
   },
   "dependencies": {
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 9a506f80fb9a..bc9f37c765ee 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -22,7 +22,7 @@
 	},
 	"dependencies": {
 		"date-fns": "^3.3.1",
-		"dompurify": "^3.1.6",
+		"dompurify": "^3.1.7",
 		"highlight.js": "^11.5.1",
 		"react-error-boundary": "^3.1.4"
 	},
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 042e27064df5..ea41860707bc 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -87,7 +87,7 @@
 		"terser-webpack-plugin": "~4.2.3",
 		"typescript": "~5.5.4",
 		"url-loader": "^4.1.1",
-		"webpack": "^5.89.0",
+		"webpack": "^5.95.0",
 		"webpack-bundle-analyzer": "^4.9.1",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "~4.13.3"
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index 641505485564..44f29c48b3eb 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -69,8 +69,8 @@
     "ts-loader": "~9.4.4",
     "typedoc": "~0.24.8",
     "typescript": "~5.5.4",
-    "webpack": "~5.78.0",
-    "webpack-cli": "~5.0.2"
+    "webpack": "~5.95.0",
+    "webpack-cli": "~5.1.4"
   },
   "dependencies": {
     "tldts": "~5.7.112"
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index 1092615c1868..b043d5d23332 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -51,7 +51,7 @@
     "prettier": "~2.8.8",
     "rimraf": "^3.0.2",
     "typescript": "~5.5.4",
-    "webpack": "~5.78.0"
+    "webpack": "~5.95.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/release-action/package.json b/packages/release-action/package.json
index 0851b8b43fca..73f926ce5160 100644
--- a/packages/release-action/package.json
+++ b/packages/release-action/package.json
@@ -23,7 +23,7 @@
 		"mdast-util-to-string": "2.0.0",
 		"remark-parse": "9.0.0",
 		"remark-stringify": "9.0.1",
-		"semver": "^7.5.2",
+		"semver": "^7.6.3",
 		"unified": "9.2.2"
 	}
 }
diff --git a/packages/tools/package.json b/packages/tools/package.json
index bb38a8c5ae4f..c10fccdb5030 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -24,6 +24,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"moment-timezone": "^0.5.45"
+		"moment-timezone": "^0.5.46"
 	}
 }
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index bb0975c38598..da19a96db3a2 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -47,7 +47,7 @@
 		"@types/jest-axe": "~3.5.9",
 		"eslint": "~8.45.0",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
diff --git a/yarn.lock b/yarn.lock
index 6226b417dea3..a5726d3a46d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5204,6 +5204,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@mixmark-io/domino@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "@mixmark-io/domino@npm:2.2.0"
+  checksum: 547af4a8f74cb8e1f2f86e84dc968e7a722522d4748d8a1c9d30c5d1ce6a190ec400866338cc1f717b31beabed6e61c44edf17db5cf380317b63a1e7f253080f
+  languageName: node
+  linkType: hard
+
 "@mongodb-js/saslprep@npm:^1.1.0":
   version: 1.1.0
   resolution: "@mongodb-js/saslprep@npm:1.1.0"
@@ -8733,7 +8740,7 @@ __metadata:
     debug: ~4.1.1
     eslint: ~8.45.0
     human-interval: ^2.0.1
-    moment-timezone: ~0.5.45
+    moment-timezone: ~0.5.46
     mongodb: ^4.17.2
     typescript: ~5.5.4
   languageName: unknown
@@ -8776,11 +8783,11 @@ __metadata:
     "@types/uuid": ~8.3.4
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
-    adm-zip: ^0.5.9
+    adm-zip: ^0.5.16
     alsatian: ^2.4.0
     browserify: ^16.5.2
     cryptiles: ^4.1.3
-    debug: ^4.3.4
+    debug: ^4.3.7
     esbuild: ^0.20.2
     eslint: ~8.45.0
     jose: ^4.11.1
@@ -8790,13 +8797,13 @@ __metadata:
     npm-run-all: ^4.1.5
     nyc: ^14.1.1
     rimraf: ^6.0.1
-    semver: ^5.7.1
+    semver: ^7.6.3
     stack-trace: 0.0.10
     tap-bark: ^1.0.0
     ts-node: ^6.2.0
     typedoc: ~0.24.8
     typescript: ~5.1.6
-    uglify-es: ^3.3.9
+    uglify-es: ^3.3.10
     uuid: ~8.3.2
   peerDependencies:
     "@rocket.chat/ui-kit": "workspace:^"
@@ -8969,7 +8976,7 @@ __metadata:
     jest: ~29.7.0
     jest-websocket-mock: ~2.5.0
     typescript: ~5.5.4
-    ws: ^8.13.0
+    ws: ^8.18.0
   peerDependencies:
     "@rocket.chat/emitter": "*"
   languageName: unknown
@@ -9020,7 +9027,7 @@ __metadata:
     typescript: ~5.5.4
     underscore: ^1.13.7
     uuid: ^7.0.3
-    ws: ^8.8.1
+    ws: ^8.18.0
   languageName: unknown
   linkType: soft
 
@@ -9233,7 +9240,8 @@ __metadata:
     react-dom: ^17.0.2
     react-i18next: ~13.2.2
     rimraf: ^3.0.2
-    storybook-dark-mode: ~2.1.1
+    storybook-dark-mode: ~3.0.3
+    tslib: ^2.7.0
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/apps-engine": "*"
@@ -9311,7 +9319,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     babel-loader: ^8.3.0
     date-fns: ^3.3.1
-    dompurify: ^3.1.6
+    dompurify: ^3.1.7
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
@@ -9525,7 +9533,7 @@ __metadata:
     terser-webpack-plugin: ~4.2.3
     typescript: ~5.5.4
     url-loader: ^4.1.1
-    webpack: ^5.89.0
+    webpack: ^5.95.0
     webpack-bundle-analyzer: ^4.9.1
     webpack-cli: ^5.1.4
     webpack-dev-server: ~4.13.3
@@ -9606,8 +9614,8 @@ __metadata:
     ts-loader: ~9.4.4
     typedoc: ~0.24.8
     typescript: ~5.5.4
-    webpack: ~5.78.0
-    webpack-cli: ~5.0.2
+    webpack: ~5.95.0
+    webpack-cli: ~5.1.4
   languageName: unknown
   linkType: soft
 
@@ -9822,12 +9830,12 @@ __metadata:
     chalk: ^4.0.0
     change-case: ^4.1.2
     chart.js: ^3.8.0
-    codemirror: ^5.65.17
+    codemirror: ^5.65.18
     colorette: ^2.0.20
     colors: ^1.4.0
     connect: ^3.7.0
     cookie: ^0.5.0
-    cookie-parser: ^1.4.6
+    cookie-parser: ^1.4.7
     cors: ^2.8.5
     cron: ~1.8.2
     cross-env: ^7.0.3
@@ -9907,7 +9915,7 @@ __metadata:
     mocha: ^9.2.2
     moleculer: ^0.14.34
     moment: ^2.29.4
-    moment-timezone: ^0.5.45
+    moment-timezone: ^0.5.46
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.6.1
@@ -9927,7 +9935,7 @@ __metadata:
     pino: ^8.15.0
     pino-pretty: ^7.6.1
     playwright-qase-reporter: ^1.2.2
-    postcss: ~8.4.45
+    postcss: ~8.4.47
     postcss-custom-properties: ^11.0.0
     postcss-easy-import: ^3.0.0
     postcss-load-config: ^3.1.4
@@ -9957,7 +9965,7 @@ __metadata:
     redis: ^4.0.6
     rewire: ^6.0.0
     sanitize-html: ^2.7.2
-    semver: ^7.3.7
+    semver: ^7.6.3
     sharp: ^0.32.6
     sinon: ^14.0.2
     sip.js: ^0.20.1
@@ -9973,18 +9981,18 @@ __metadata:
     supertest: ^6.2.3
     supports-color: ~7.2.0
     suretype: ~2.4.1
-    swiper: ^9.3.2
+    swiper: ^9.4.1
     tar-stream: ^1.6.2
     template-file: ^6.0.1
     textarea-caret: ^3.1.0
     tinykeys: ^1.4.0
     ts-node: ^10.9.2
-    turndown: ^7.1.2
+    turndown: ^7.2.0
     twilio: ^3.76.1
     twit: ^2.2.11
     typescript: ~5.5.4
     typia: ~6.9.0
-    ua-parser-js: ^1.0.38
+    ua-parser-js: ^1.0.39
     underscore: ^1.13.7
     universal-perf-hooks: ^1.0.1
     url-polyfill: ^1.1.12
@@ -9995,7 +10003,7 @@ __metadata:
     webdav: ^4.11.4
     xml-crypto: ~3.1.0
     xml-encryption: ~3.0.2
-    xml2js: ~0.5.0
+    xml2js: ~0.6.2
     yaqrcode: ^0.2.1
   languageName: unknown
   linkType: soft
@@ -10104,7 +10112,7 @@ __metadata:
     fibers: ^5.0.3
     jest: ~29.7.0
     mem: ^8.1.1
-    moment-timezone: ^0.5.45
+    moment-timezone: ^0.5.46
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     pino: ^8.15.0
@@ -10140,7 +10148,7 @@ __metadata:
     gc-stats: ^1.4.1
     mem: ^8.1.1
     moleculer: ^0.14.34
-    moment-timezone: ^0.5.45
+    moment-timezone: ^0.5.46
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.4.0
@@ -10216,7 +10224,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     moment: ^2.29.4
-    moment-timezone: ^0.5.45
+    moment-timezone: ^0.5.46
     react: ~18.3.1
     react-dom: ~18.3.1
     typescript: ~5.5.4
@@ -10236,7 +10244,7 @@ __metadata:
     prettier: ~2.8.8
     rimraf: ^3.0.2
     typescript: ~5.5.4
-    webpack: ~5.78.0
+    webpack: ~5.95.0
   peerDependencies:
     peggy: "*"
     webpack: "*"
@@ -10342,7 +10350,7 @@ __metadata:
     gc-stats: ^1.4.1
     mem: ^8.1.1
     moleculer: ^0.14.34
-    moment-timezone: ^0.5.45
+    moment-timezone: ^0.5.46
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.4.0
@@ -10383,7 +10391,7 @@ __metadata:
     mdast-util-to-string: 2.0.0
     remark-parse: 9.0.0
     remark-stringify: 9.0.1
-    semver: ^7.5.2
+    semver: ^7.6.3
     typescript: ~5.5.4
     unified: 9.2.2
   languageName: unknown
@@ -10545,7 +10553,7 @@ __metadata:
     "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
-    moment-timezone: ^0.5.45
+    moment-timezone: ^0.5.46
     typescript: ~5.5.4
   languageName: unknown
   linkType: soft
@@ -10829,7 +10837,7 @@ __metadata:
     "@types/jest-axe": ~3.5.9
     eslint: ~8.45.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     jest: ~29.7.0
     jest-axe: ~9.0.0
@@ -10883,7 +10891,7 @@ __metadata:
     codemirror: ^6.0.1
     eslint: ~8.45.0
     eslint-plugin-react-hooks: ^4.6.2
-    eslint-plugin-react-refresh: ^0.4.11
+    eslint-plugin-react-refresh: ^0.4.12
     eslint4b-prebuilt: ^6.7.2
     moment: ^2.29.4
     rc-scrollbars: ^1.1.6
@@ -11596,7 +11604,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addons@npm:6.5.16, @storybook/addons@npm:^6.5.14, @storybook/addons@npm:~6.5.16":
+"@storybook/addons@npm:6.5.16, @storybook/addons@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/addons@npm:6.5.16"
   dependencies:
@@ -11632,7 +11640,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:6.5.16, @storybook/api@npm:^6.5.14":
+"@storybook/api@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/api@npm:6.5.16"
   dependencies:
@@ -11887,7 +11895,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:6.5.16, @storybook/components@npm:^6.5.14":
+"@storybook/components@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/components@npm:6.5.16"
   dependencies:
@@ -12036,7 +12044,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:6.5.16, @storybook/core-events@npm:^6.5.14":
+"@storybook/core-events@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/core-events@npm:6.5.16"
   dependencies:
@@ -12886,7 +12894,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:6.5.16, @storybook/theming@npm:^6.5.14, @storybook/theming@npm:~6.5.16":
+"@storybook/theming@npm:6.5.16, @storybook/theming@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/theming@npm:6.5.16"
   dependencies:
@@ -15705,16 +15713,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ast@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/ast@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/helper-numbers": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-  checksum: 1eee1534adebeece635362f8e834ae03e389281972611408d64be7895fc49f48f98fddbbb5339bf8a72cb101bcb066e8bca3ca1bf1ef47dadf89def0395a8d87
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
   version: 1.11.6
   resolution: "@webassemblyjs/ast@npm:1.11.6"
@@ -15746,13 +15744,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.1"
-  checksum: b8efc6fa08e4787b7f8e682182d84dfdf8da9d9c77cae5d293818bc4a55c1f419a87fa265ab85252b3e6c1fd323d799efea68d825d341a7c365c64bc14750e97
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
@@ -15767,13 +15758,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-api-error@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.1"
-  checksum: 0792813f0ed4a0e5ee0750e8b5d0c631f08e927f4bdfdd9fe9105dc410c786850b8c61bff7f9f515fdfb149903bec3c976a1310573a4c6866a94d49bc7271959
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-api-error@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
@@ -15788,13 +15772,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-buffer@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.1"
-  checksum: a337ee44b45590c3a30db5a8b7b68a717526cf967ada9f10253995294dbd70a58b2da2165222e0b9830cd4fc6e4c833bf441a721128d1fe2e9a7ab26b36003ce
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-buffer@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/helper-buffer@npm:1.11.6"
@@ -15841,17 +15818,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-numbers@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser": 1.11.1
-    "@webassemblyjs/helper-api-error": 1.11.1
-    "@xtuc/long": 4.2.2
-  checksum: 44d2905dac2f14d1e9b5765cf1063a0fa3d57295c6d8930f6c59a36462afecc6e763e8a110b97b342a0f13376166c5d41aa928e6ced92e2f06b071fd0db59d3a
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-numbers@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
@@ -15863,13 +15829,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1"
-  checksum: eac400113127832c88f5826bcc3ad1c0db9b3dbd4c51a723cfdb16af6bfcbceb608170fdaac0ab7731a7e18b291be7af68a47fcdb41cfe0260c10857e7413d97
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
@@ -15884,18 +15843,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-  checksum: 617696cfe8ecaf0532763162aaf748eb69096fb27950219bb87686c6b2e66e11cd0614d95d319d0ab1904bc14ebe4e29068b12c3e7c5e020281379741fe4bedf
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-wasm-section@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6"
@@ -15932,15 +15879,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ieee754@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/ieee754@npm:1.11.1"
-  dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 23a0ac02a50f244471631802798a816524df17e56b1ef929f0c73e3cde70eaf105a24130105c60aff9d64a24ce3b640dad443d6f86e5967f922943a7115022ec
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/ieee754@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/ieee754@npm:1.11.6"
@@ -15959,15 +15897,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/leb128@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/leb128@npm:1.11.1"
-  dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: 33ccc4ade2f24de07bf31690844d0b1ad224304ee2062b0e464a610b0209c79e0b3009ac190efe0e6bd568b0d1578d7c3047fc1f9d0197c92fc061f56224ff4a
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/leb128@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/leb128@npm:1.11.6"
@@ -15986,13 +15915,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/utf8@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/utf8@npm:1.11.1"
-  checksum: 972c5cfc769d7af79313a6bfb96517253a270a4bf0c33ba486aa43cac43917184fb35e51dfc9e6b5601548cd5931479a42e42c89a13bb591ffabebf30c8a6a0b
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/utf8@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/utf8@npm:1.11.6"
@@ -16007,22 +15929,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-edit@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/helper-wasm-section": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-    "@webassemblyjs/wasm-opt": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-    "@webassemblyjs/wast-printer": 1.11.1
-  checksum: 6d7d9efaec1227e7ef7585a5d7ff0be5f329f7c1c6b6c0e906b18ed2e9a28792a5635e450aca2d136770d0207225f204eff70a4b8fd879d3ac79e1dcc26dbeb9
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-edit@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-edit@npm:1.9.0"
@@ -16071,19 +15977,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/ieee754": 1.11.1
-    "@webassemblyjs/leb128": 1.11.1
-    "@webassemblyjs/utf8": 1.11.1
-  checksum: 1f6921e640293bf99fb16b21e09acb59b340a79f986c8f979853a0ae9f0b58557534b81e02ea2b4ef11e929d946708533fd0693c7f3712924128fdafd6465f5b
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-gen@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/wasm-gen@npm:1.11.6"
@@ -16123,18 +16016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-  checksum: 21586883a20009e2b20feb67bdc451bbc6942252e038aae4c3a08e6f67b6bae0f5f88f20bfc7bd0452db5000bacaf5ab42b98cf9aa034a6c70e9fc616142e1db
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-opt@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/wasm-opt@npm:1.11.6"
@@ -16171,20 +16052,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-api-error": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/ieee754": 1.11.1
-    "@webassemblyjs/leb128": 1.11.1
-    "@webassemblyjs/utf8": 1.11.1
-  checksum: 1521644065c360e7b27fad9f4bb2df1802d134dd62937fa1f601a1975cde56bc31a57b6e26408b9ee0228626ff3ba1131ae6f74ffb7d718415b6528c5a6dbfc2
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5":
   version: 1.11.6
   resolution: "@webassemblyjs/wasm-parser@npm:1.11.6"
@@ -16241,16 +16108,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@xtuc/long": 4.2.2
-  checksum: f15ae4c2441b979a3b4fce78f3d83472fb22350c6dc3fd34bfe7c3da108e0b2360718734d961bba20e7716cb8578e964b870da55b035e209e50ec9db0378a3f7
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wast-printer@npm:1.11.6":
   version: 1.11.6
   resolution: "@webassemblyjs/wast-printer@npm:1.11.6"
@@ -16282,7 +16139,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/configtest@npm:^2.0.1, @webpack-cli/configtest@npm:^2.1.1":
+"@webpack-cli/configtest@npm:^2.1.1":
   version: 2.1.1
   resolution: "@webpack-cli/configtest@npm:2.1.1"
   peerDependencies:
@@ -16292,7 +16149,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/info@npm:^2.0.1, @webpack-cli/info@npm:^2.0.2":
+"@webpack-cli/info@npm:^2.0.2":
   version: 2.0.2
   resolution: "@webpack-cli/info@npm:2.0.2"
   peerDependencies:
@@ -16302,7 +16159,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/serve@npm:^2.0.2, @webpack-cli/serve@npm:^2.0.5":
+"@webpack-cli/serve@npm:^2.0.5":
   version: 2.0.5
   resolution: "@webpack-cli/serve@npm:2.0.5"
   peerDependencies:
@@ -16429,7 +16286,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-import-assertions@npm:^1.7.6, acorn-import-assertions@npm:^1.9.0":
+"acorn-import-assertions@npm:^1.9.0":
   version: 1.9.0
   resolution: "acorn-import-assertions@npm:1.9.0"
   peerDependencies:
@@ -20056,10 +19913,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"codemirror@npm:^5.65.17":
-  version: 5.65.17
-  resolution: "codemirror@npm:5.65.17"
-  checksum: 8bc853524c6416826364d776b012f488b3f4736899e5c8026062f43927e09de773051dd1b34e8cfd25642d7e358679ca5b113f0034fdd6a295f4193b04f8c528
+"codemirror@npm:^5.65.18":
+  version: 5.65.18
+  resolution: "codemirror@npm:5.65.18"
+  checksum: 950015d587e0790cceae157423bbc70bf1da8256050c8f6739fe967045b050e22c63b332de6388ed6d9526d253a834806ace76c875006fc8078e2c15c9f275a7
   languageName: node
   linkType: hard
 
@@ -20527,13 +20384,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie-parser@npm:^1.4.6":
-  version: 1.4.6
-  resolution: "cookie-parser@npm:1.4.6"
+"cookie-parser@npm:^1.4.7":
+  version: 1.4.7
+  resolution: "cookie-parser@npm:1.4.7"
   dependencies:
-    cookie: 0.4.1
+    cookie: 0.7.2
     cookie-signature: 1.0.6
-  checksum: 1e5a63aa82e8eb4e02d2977c6902983dee87b02e87ec5ec43ac3cb1e72da354003716570cd5190c0ad9e8a454c9d3237f4ad6e2f16d0902205a96a1c72b77ba5
+  checksum: 243fa13f217e793d20a57675e6552beea08c5989fcc68495d543997a31646875335e0e82d687b42dcfd466df57891d22bae7f5ba6ab33b7705ed2dd6eb989105
   languageName: node
   linkType: hard
 
@@ -20544,13 +20401,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.4.1":
-  version: 0.4.1
-  resolution: "cookie@npm:0.4.1"
-  checksum: bd7c47f5d94ab70ccdfe8210cde7d725880d2fcda06d8e375afbdd82de0c8d3b73541996e9ce57d35f67f672c4ee6d60208adec06b3c5fc94cebb85196084cf8
-  languageName: node
-  linkType: hard
-
 "cookie@npm:0.5.0, cookie@npm:^0.5.0":
   version: 0.5.0
   resolution: "cookie@npm:0.5.0"
@@ -20565,6 +20415,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie@npm:0.7.2":
+  version: 0.7.2
+  resolution: "cookie@npm:0.7.2"
+  checksum: 9bf8555e33530affd571ea37b615ccad9b9a34febbf2c950c86787088eb00a8973690833b0f8ebd6b69b753c62669ea60cec89178c1fb007bf0749abed74f93e
+  languageName: node
+  linkType: hard
+
 "cookiejar@npm:^2.1.3":
   version: 2.1.3
   resolution: "cookiejar@npm:2.1.3"
@@ -21746,6 +21603,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"debug@npm:^4.3.7":
+  version: 4.3.7
+  resolution: "debug@npm:4.3.7"
+  dependencies:
+    ms: ^2.1.3
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 822d74e209cd910ef0802d261b150314bbcf36c582ccdbb3e70f0894823c17e49a50d3e66d96b633524263975ca16b6a833f3e3b7e030c157169a5fabac63160
+  languageName: node
+  linkType: hard
+
 "debug@npm:~3.1.0":
   version: 3.1.0
   resolution: "debug@npm:3.1.0"
@@ -22532,13 +22401,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domino@npm:^2.1.6":
-  version: 2.1.6
-  resolution: "domino@npm:2.1.6"
-  checksum: 9b1b6d2661efd8bf942b70d5e11ac0de6a63f17e49b7eb227d9a612fa7b7c12b7775520d64f498988a8ee334ea9c59a463c84ea510b0af17dd3e13fdce120410
-  languageName: node
-  linkType: hard
-
 "dommatrix@npm:^1.0.1":
   version: 1.0.3
   resolution: "dommatrix@npm:1.0.3"
@@ -22553,7 +22415,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:^3.1.6":
+"dompurify@npm:^3.1.7":
   version: 3.1.7
   resolution: "dompurify@npm:3.1.7"
   checksum: 0a9b811bbc94f3dba60cf6486962362b0f1a5b4ab789f5e1cbd4749b6ba1a1fad190a677a962dc8850ce28764424765fe425e9d6508e4e93ba648ef15d54bc24
@@ -23007,7 +22869,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.10.0, enhanced-resolve@npm:^5.15.0":
+"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.15.0":
   version: 5.15.0
   resolution: "enhanced-resolve@npm:5.15.0"
   dependencies:
@@ -23251,13 +23113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^0.9.0":
-  version: 0.9.3
-  resolution: "es-module-lexer@npm:0.9.3"
-  checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8
-  languageName: node
-  linkType: hard
-
 "es-module-lexer@npm:^1.2.1":
   version: 1.3.0
   resolution: "es-module-lexer@npm:1.3.0"
@@ -23730,7 +23585,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.0, eslint-plugin-react-hooks@npm:~4.6.2":
+"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.2":
   version: 4.6.2
   resolution: "eslint-plugin-react-hooks@npm:4.6.2"
   peerDependencies:
@@ -23739,12 +23594,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-refresh@npm:^0.4.11":
-  version: 0.4.11
-  resolution: "eslint-plugin-react-refresh@npm:0.4.11"
+"eslint-plugin-react-refresh@npm:^0.4.12":
+  version: 0.4.12
+  resolution: "eslint-plugin-react-refresh@npm:0.4.12"
   peerDependencies:
     eslint: ">=7"
-  checksum: 55c9efb14c3dadf6422bb96af8a561d3f1385f1dc68e7ca9d388cc4adc69907644e1bb509ecfbb033a8ec19ea326beb99577c82d4a2530000809d897b08bf3d4
+  checksum: 7492caa57cc7f461f55781e5503086ae2473489c235e3457baf8123b5c325a215062af002a8b6858f54509dd756c86f7b253b3cda68b411b75a0cab08eec6597
   languageName: node
   linkType: hard
 
@@ -32700,12 +32555,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:^0.5.45, moment-timezone@npm:~0.5.45":
-  version: 0.5.45
-  resolution: "moment-timezone@npm:0.5.45"
+"moment-timezone@npm:^0.5.46, moment-timezone@npm:~0.5.46":
+  version: 0.5.46
+  resolution: "moment-timezone@npm:0.5.46"
   dependencies:
     moment: ^2.29.4
-  checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0
+  checksum: 3974b467a98e5eb5dece66187d251aa0f97b087413c9a6a607b38ae6fa67032e12a107649dd857cfbcc31c194f004eb13ecc9fcd582b6a168a9a19355ec5a2e3
   languageName: node
   linkType: hard
 
@@ -32836,7 +32691,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
+"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
   checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -34963,7 +34818,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
+"picocolors@npm:^1.1.0":
   version: 1.1.0
   resolution: "picocolors@npm:1.1.0"
   checksum: a64d653d3a188119ff45781dfcdaeedd7625583f45280aea33fcb032c7a0d3959f2368f9b192ad5e8aade75b74dbd954ffe3106c158509a45e4c18ab379a2acd
@@ -35966,7 +35821,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.33":
+"postcss@npm:^8.4.33, postcss@npm:~8.4.47":
   version: 8.4.47
   resolution: "postcss@npm:8.4.47"
   dependencies:
@@ -35977,17 +35832,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:~8.4.45":
-  version: 8.4.45
-  resolution: "postcss@npm:8.4.45"
-  dependencies:
-    nanoid: ^3.3.7
-    picocolors: ^1.0.1
-    source-map-js: ^1.2.0
-  checksum: 3223cdad4a9392c0b334ee3ee7e4e8041c631cb6160609cef83c18d2b2580e931dd8068ab13cc6000c1a254d57492ac6c38717efc397c5dcc9756d06bc9c44f3
-  languageName: node
-  linkType: hard
-
 "postis@npm:^2.2.0":
   version: 2.2.0
   resolution: "postis@npm:2.2.0"
@@ -38485,7 +38329,7 @@ __metadata:
     "@types/js-yaml": ^4.0.9
     node-gyp: ^9.4.1
     ts-node: ^10.9.2
-    turbo: ^2.1.2
+    turbo: ^2.1.3
   languageName: unknown
   linkType: soft
 
@@ -38517,7 +38361,7 @@ __metadata:
     body-parser: ^1.20.3
     colorette: ^2.0.20
     cookie: ^0.5.0
-    cookie-parser: ^1.4.6
+    cookie-parser: ^1.4.7
     ejson: ^2.2.3
     eventemitter3: ^4.0.7
     express: ^4.17.3
@@ -38535,7 +38379,7 @@ __metadata:
     ts-node: ^10.9.2
     typescript: ~5.5.4
     uuid: ^8.3.2
-    ws: ^8.8.1
+    ws: ^8.18.0
   languageName: unknown
   linkType: soft
 
@@ -38852,7 +38696,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
+"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
   version: 3.3.0
   resolution: "schema-utils@npm:3.3.0"
   dependencies:
@@ -38965,7 +38809,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.1":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0":
   version: 5.7.1
   resolution: "semver@npm:5.7.1"
   bin:
@@ -38983,7 +38827,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -38994,6 +38838,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
+  bin:
+    semver: bin/semver.js
+  checksum: 4110ec5d015c9438f322257b1c51fe30276e5f766a3f64c09edd1d7ea7118ecbc3f379f3b69032bacf13116dc7abc4ad8ce0d7e2bd642e26b0d271b56b61a7d8
+  languageName: node
+  linkType: hard
+
 "semver@npm:~5.3.0":
   version: 5.3.0
   resolution: "semver@npm:5.3.0"
@@ -39716,7 +39569,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:^1.2.0, source-map-js@npm:^1.2.1":
+"source-map-js@npm:^1.2.1":
   version: 1.2.1
   resolution: "source-map-js@npm:1.2.1"
   checksum: 4eb0cd997cdf228bc253bcaff9340afeb706176e64868ecd20efbe6efea931465f43955612346d6b7318789e5265bdc419bc7669c1cebe3db0eb255f57efa76b
@@ -40141,30 +39994,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook-dark-mode@npm:~2.1.1":
-  version: 2.1.1
-  resolution: "storybook-dark-mode@npm:2.1.1"
-  dependencies:
-    "@storybook/addons": ^6.5.14
-    "@storybook/api": ^6.5.14
-    "@storybook/components": ^6.5.14
-    "@storybook/core-events": ^6.5.14
-    "@storybook/global": ^5.0.0
-    "@storybook/theming": ^6.5.14
-    fast-deep-equal: ^3.1.3
-    memoizerific: ^1.11.3
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    react:
-      optional: true
-    react-dom:
-      optional: true
-  checksum: 44d6313013a1d63f47c95e2e8e0d11c24d467b3540259e152ceb3236636dbadf7a46c6f7f183946b105ee53173cb13815f1f88ca6da41fc74673c3c11f619863
-  languageName: node
-  linkType: hard
-
 "storybook-dark-mode@npm:~3.0.3":
   version: 3.0.3
   resolution: "storybook-dark-mode@npm:3.0.3"
@@ -41085,12 +40914,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swiper@npm:^9.3.2":
-  version: 9.3.2
-  resolution: "swiper@npm:9.3.2"
+"swiper@npm:^9.4.1":
+  version: 9.4.1
+  resolution: "swiper@npm:9.4.1"
   dependencies:
     ssr-window: ^4.0.2
-  checksum: 9ccb6a0ef67d71ac780d7d1f3b2c2daf6f1846d3df8810aff6dcb8501c87b7769540a869cdd83eb902e5278396e5379cb32d9ed397234f7700ef55f0209f4592
+  checksum: 1180b3b766f25cbe636fafbb56adbddf8a240077c504a335a62d1773f4452df1bd9ca09bccfe86478c3b9401879c4e8f7ed3824e74299f8b48953e8fc7f08bc3
   languageName: node
   linkType: hard
 
@@ -41446,7 +41275,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10, terser-webpack-plugin@npm:^5.3.7":
+"terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10, terser-webpack-plugin@npm:^5.3.7":
   version: 5.3.10
   resolution: "terser-webpack-plugin@npm:5.3.10"
   dependencies:
@@ -42184,7 +42013,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.6.2":
+"tslib@npm:^2.6.2, tslib@npm:^2.7.0":
   version: 2.7.0
   resolution: "tslib@npm:2.7.0"
   checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
@@ -42299,58 +42128,58 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-darwin-64@npm:2.1.2":
-  version: 2.1.2
-  resolution: "turbo-darwin-64@npm:2.1.2"
+"turbo-darwin-64@npm:2.1.3":
+  version: 2.1.3
+  resolution: "turbo-darwin-64@npm:2.1.3"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-darwin-arm64@npm:2.1.2":
-  version: 2.1.2
-  resolution: "turbo-darwin-arm64@npm:2.1.2"
+"turbo-darwin-arm64@npm:2.1.3":
+  version: 2.1.3
+  resolution: "turbo-darwin-arm64@npm:2.1.3"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-linux-64@npm:2.1.2":
-  version: 2.1.2
-  resolution: "turbo-linux-64@npm:2.1.2"
+"turbo-linux-64@npm:2.1.3":
+  version: 2.1.3
+  resolution: "turbo-linux-64@npm:2.1.3"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm64@npm:2.1.2":
-  version: 2.1.2
-  resolution: "turbo-linux-arm64@npm:2.1.2"
+"turbo-linux-arm64@npm:2.1.3":
+  version: 2.1.3
+  resolution: "turbo-linux-arm64@npm:2.1.3"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-windows-64@npm:2.1.2":
-  version: 2.1.2
-  resolution: "turbo-windows-64@npm:2.1.2"
+"turbo-windows-64@npm:2.1.3":
+  version: 2.1.3
+  resolution: "turbo-windows-64@npm:2.1.3"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-windows-arm64@npm:2.1.2":
-  version: 2.1.2
-  resolution: "turbo-windows-arm64@npm:2.1.2"
+"turbo-windows-arm64@npm:2.1.3":
+  version: 2.1.3
+  resolution: "turbo-windows-arm64@npm:2.1.3"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "turbo@npm:2.1.2"
-  dependencies:
-    turbo-darwin-64: 2.1.2
-    turbo-darwin-arm64: 2.1.2
-    turbo-linux-64: 2.1.2
-    turbo-linux-arm64: 2.1.2
-    turbo-windows-64: 2.1.2
-    turbo-windows-arm64: 2.1.2
+"turbo@npm:^2.1.3":
+  version: 2.1.3
+  resolution: "turbo@npm:2.1.3"
+  dependencies:
+    turbo-darwin-64: 2.1.3
+    turbo-darwin-arm64: 2.1.3
+    turbo-linux-64: 2.1.3
+    turbo-linux-arm64: 2.1.3
+    turbo-windows-64: 2.1.3
+    turbo-windows-arm64: 2.1.3
   dependenciesMeta:
     turbo-darwin-64:
       optional: true
@@ -42366,16 +42195,16 @@ __metadata:
       optional: true
   bin:
     turbo: bin/turbo
-  checksum: ee3d12a69fa512d30b325369c49a490cd2112547a59aca7bd3c9407b12bd9bd9ffd682e801c1e2e5711669c155ef06b0a090b0bbffa84fd60ddc5df0a1c855e6
+  checksum: 1a3198b52fb8a8ac2a8c36930625779bbc6a2989d801cd7591092d7ee42d4c52188ff873c788f7b5c9f79bc9c0e834eff48195e837fdee840a7d3c317164b3f3
   languageName: node
   linkType: hard
 
-"turndown@npm:^7.1.2":
-  version: 7.1.2
-  resolution: "turndown@npm:7.1.2"
+"turndown@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "turndown@npm:7.2.0"
   dependencies:
-    domino: ^2.1.6
-  checksum: 4779580c3439d0385e7dd71144bf0f72884cf7fb492bd2f5600ff256fa7c9ae9663ef284507021de90d54d62885fc027d740d578a3e11a1ae83e84a107eedd38
+    "@mixmark-io/domino": ^2.2.0
+  checksum: a0bdf2fcc8cd531c94edbd7c384ae58a13251e7b472f7245fac74a316c08f8d04eb9dddfce6a5e6170ddb09c0494154a0d69312e5d9c2a7223a936a7e369ac7c
   languageName: node
   linkType: hard
 
@@ -42699,10 +42528,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ua-parser-js@npm:^1.0.38":
-  version: 1.0.38
-  resolution: "ua-parser-js@npm:1.0.38"
-  checksum: d0772b22b027338d806ab17d1ac2896ee7485bdf9217c526028159f3cd6bb10272bb18f6196d2f94dde83e3b36dc9d2533daf08a414764f6f4f1844842383838
+"ua-parser-js@npm:^1.0.39":
+  version: 1.0.39
+  resolution: "ua-parser-js@npm:1.0.39"
+  bin:
+    ua-parser-js: script/cli.js
+  checksum: 19455df8c2348ef53f2e150e7406d3a025a619c2fd69722a1e63363d5ba8d91731ef7585f2dce7d8f14c8782734b4d704c05f246dca5f7565b5ae7d318084f2a
   languageName: node
   linkType: hard
 
@@ -42713,7 +42544,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uglify-es@npm:^3.3.9":
+"uglify-es@npm:^3.3.10":
   version: 3.3.10
   resolution: "uglify-es@npm:3.3.10"
   dependencies:
@@ -44038,7 +43869,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-cli@npm:^5.1.4":
+"webpack-cli@npm:^5.1.4, webpack-cli@npm:~5.1.4":
   version: 5.1.4
   resolution: "webpack-cli@npm:5.1.4"
   dependencies:
@@ -44070,38 +43901,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-cli@npm:~5.0.2":
-  version: 5.0.2
-  resolution: "webpack-cli@npm:5.0.2"
-  dependencies:
-    "@discoveryjs/json-ext": ^0.5.0
-    "@webpack-cli/configtest": ^2.0.1
-    "@webpack-cli/info": ^2.0.1
-    "@webpack-cli/serve": ^2.0.2
-    colorette: ^2.0.14
-    commander: ^10.0.1
-    cross-spawn: ^7.0.3
-    envinfo: ^7.7.3
-    fastest-levenshtein: ^1.0.12
-    import-local: ^3.0.2
-    interpret: ^3.1.1
-    rechoir: ^0.8.0
-    webpack-merge: ^5.7.3
-  peerDependencies:
-    webpack: 5.x.x
-  peerDependenciesMeta:
-    "@webpack-cli/generators":
-      optional: true
-    webpack-bundle-analyzer:
-      optional: true
-    webpack-dev-server:
-      optional: true
-  bin:
-    webpack-cli: bin/cli.js
-  checksum: 98816d84c51487b90e1008ddbcda8827dcb7ae9ab7892f4d742f0d7b93f90a4a18a6ec2671b380e5a7ee4b0917cf0c43921119419d8ba9e1b14ea060115684fd
-  languageName: node
-  linkType: hard
-
 "webpack-dev-middleware@npm:^3.7.3":
   version: 3.7.3
   resolution: "webpack-dev-middleware@npm:3.7.3"
@@ -44356,7 +44155,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5":
+"webpack@npm:5, webpack@npm:^5.95.0, webpack@npm:~5.95.0":
   version: 5.95.0
   resolution: "webpack@npm:5.95.0"
   dependencies:
@@ -44392,7 +44191,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:>=4.0.0 <6.0.0, webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5, webpack@npm:^5.89.0":
+"webpack@npm:>=4.0.0 <6.0.0, webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5":
   version: 5.89.0
   resolution: "webpack@npm:5.89.0"
   dependencies:
@@ -44429,43 +44228,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:~5.78.0":
-  version: 5.78.0
-  resolution: "webpack@npm:5.78.0"
-  dependencies:
-    "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^0.0.51
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/wasm-edit": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-    acorn: ^8.7.1
-    acorn-import-assertions: ^1.7.6
-    browserslist: ^4.14.5
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.10.0
-    es-module-lexer: ^0.9.0
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.9
-    json-parse-even-better-errors: ^2.3.1
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.1.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.1.3
-    watchpack: ^2.4.0
-    webpack-sources: ^3.2.3
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: 4213e5bcc23e54c2f2a589e8e96f1fb71a2c05d5033ffda6dd8bae32284abfa0eb6b6d0707806e8dcfa48a8fcda2448d3af6c4539061679251d94c0996bebf99
-  languageName: node
-  linkType: hard
-
 "websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4":
   version: 0.7.4
   resolution: "websocket-driver@npm:0.7.4"
@@ -44911,7 +44673,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.2.3, ws@npm:^8.8.1":
+"ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.2.3":
   version: 8.17.0
   resolution: "ws@npm:8.17.0"
   peerDependencies:
@@ -44926,6 +44688,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.18.0":
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975
+  languageName: node
+  linkType: hard
+
 "x-default-browser@npm:^0.4.0":
   version: 0.4.0
   resolution: "x-default-browser@npm:0.4.0"
@@ -44982,7 +44759,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml2js@npm:0.5.0, xml2js@npm:~0.5.0":
+"xml2js@npm:0.5.0":
   version: 0.5.0
   resolution: "xml2js@npm:0.5.0"
   dependencies:
@@ -44992,6 +44769,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml2js@npm:~0.6.2":
+  version: 0.6.2
+  resolution: "xml2js@npm:0.6.2"
+  dependencies:
+    sax: ">=0.6.0"
+    xmlbuilder: ~11.0.0
+  checksum: 458a83806193008edff44562c0bdb982801d61ee7867ae58fd35fab781e69e17f40dfeb8fc05391a4648c9c54012066d3955fe5d993ffbe4dc63399023f32ac2
+  languageName: node
+  linkType: hard
+
 "xmlbuilder@npm:^13.0.2":
   version: 13.0.2
   resolution: "xmlbuilder@npm:13.0.2"

From 305b591bfc27d1c33c795901b306f5e1b471142f Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 11 Oct 2024 01:23:12 -0300
Subject: [PATCH 168/170] regression: fix preview (#33536)

---
 packages/fuselage-ui-kit/package.json |  3 +--
 yarn.lock                             | 39 +++++++++++++++++++++------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index d8bdf0ef83ba..6602d319b1f0 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -102,8 +102,7 @@
     "react-dom": "^17.0.2",
     "react-i18next": "~13.2.2",
     "rimraf": "^3.0.2",
-    "storybook-dark-mode": "~3.0.3",
-    "tslib": "^2.7.0",
+    "storybook-dark-mode": "~2.1.1",
     "typescript": "~5.5.4"
   },
   "dependencies": {
diff --git a/yarn.lock b/yarn.lock
index a5726d3a46d8..c8ce498bf255 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9240,8 +9240,7 @@ __metadata:
     react-dom: ^17.0.2
     react-i18next: ~13.2.2
     rimraf: ^3.0.2
-    storybook-dark-mode: ~3.0.3
-    tslib: ^2.7.0
+    storybook-dark-mode: ~2.1.1
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/apps-engine": "*"
@@ -11604,7 +11603,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addons@npm:6.5.16, @storybook/addons@npm:~6.5.16":
+"@storybook/addons@npm:6.5.16, @storybook/addons@npm:^6.5.14, @storybook/addons@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/addons@npm:6.5.16"
   dependencies:
@@ -11640,7 +11639,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:6.5.16":
+"@storybook/api@npm:6.5.16, @storybook/api@npm:^6.5.14":
   version: 6.5.16
   resolution: "@storybook/api@npm:6.5.16"
   dependencies:
@@ -11895,7 +11894,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:6.5.16":
+"@storybook/components@npm:6.5.16, @storybook/components@npm:^6.5.14":
   version: 6.5.16
   resolution: "@storybook/components@npm:6.5.16"
   dependencies:
@@ -12044,7 +12043,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:6.5.16":
+"@storybook/core-events@npm:6.5.16, @storybook/core-events@npm:^6.5.14":
   version: 6.5.16
   resolution: "@storybook/core-events@npm:6.5.16"
   dependencies:
@@ -12894,7 +12893,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:6.5.16, @storybook/theming@npm:~6.5.16":
+"@storybook/theming@npm:6.5.16, @storybook/theming@npm:^6.5.14, @storybook/theming@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/theming@npm:6.5.16"
   dependencies:
@@ -39994,6 +39993,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"storybook-dark-mode@npm:~2.1.1":
+  version: 2.1.1
+  resolution: "storybook-dark-mode@npm:2.1.1"
+  dependencies:
+    "@storybook/addons": ^6.5.14
+    "@storybook/api": ^6.5.14
+    "@storybook/components": ^6.5.14
+    "@storybook/core-events": ^6.5.14
+    "@storybook/global": ^5.0.0
+    "@storybook/theming": ^6.5.14
+    fast-deep-equal: ^3.1.3
+    memoizerific: ^1.11.3
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 44d6313013a1d63f47c95e2e8e0d11c24d467b3540259e152ceb3236636dbadf7a46c6f7f183946b105ee53173cb13815f1f88ca6da41fc74673c3c11f619863
+  languageName: node
+  linkType: hard
+
 "storybook-dark-mode@npm:~3.0.3":
   version: 3.0.3
   resolution: "storybook-dark-mode@npm:3.0.3"
@@ -42013,7 +42036,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.6.2, tslib@npm:^2.7.0":
+"tslib@npm:^2.6.2":
   version: 2.7.0
   resolution: "tslib@npm:2.7.0"
   checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28

From 6ece177eb9680438680718fea907002717d69788 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Fri, 11 Oct 2024 10:11:05 -0300
Subject: [PATCH 169/170] feat: new fields contact (#33504)

---
 .../app/livechat/server/api/lib/livechat.ts   |  1 +
 .../server/hooks/saveContactLastChat.ts       |  7 +++-
 .../app/livechat/server/lib/Contacts.ts       |  1 +
 apps/meteor/app/livechat/server/lib/Helper.ts |  3 +-
 .../server/models/raw/LivechatContacts.ts     |  6 ++-
 .../tests/end-to-end/api/livechat/contacts.ts | 39 ++++++++++++++++++-
 packages/core-typings/src/ILivechatContact.ts |  5 +++
 packages/core-typings/src/IRoom.ts            |  4 +-
 .../src/models/ILivechatContactsModel.ts      |  3 +-
 9 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/apps/meteor/app/livechat/server/api/lib/livechat.ts b/apps/meteor/app/livechat/server/api/lib/livechat.ts
index 8041566d796e..01c4d9736c66 100644
--- a/apps/meteor/app/livechat/server/api/lib/livechat.ts
+++ b/apps/meteor/app/livechat/server/api/lib/livechat.ts
@@ -57,6 +57,7 @@ export function findGuest(token: string): Promise<ILivechatVisitor | null> {
 			visitorEmails: 1,
 			department: 1,
 			activity: 1,
+			contactId: 1,
 		},
 	});
 }
diff --git a/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts b/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts
index 9969f03bf8bb..d8014dd3ecc0 100644
--- a/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts
+++ b/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts
@@ -1,5 +1,5 @@
 import { isOmnichannelRoom } from '@rocket.chat/core-typings';
-import { LivechatVisitors } from '@rocket.chat/models';
+import { LivechatContacts, LivechatVisitors } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
 
@@ -12,7 +12,7 @@ callbacks.add(
 
 		const {
 			_id,
-			v: { _id: guestId },
+			v: { _id: guestId, contactId },
 		} = room;
 
 		const lastChat = {
@@ -20,6 +20,9 @@ callbacks.add(
 			ts: new Date(),
 		};
 		await LivechatVisitors.setLastChatById(guestId, lastChat);
+		if (contactId) {
+			await LivechatContacts.updateLastChatById(contactId, lastChat);
+		}
 	},
 	callbacks.priority.MEDIUM,
 	'livechat-save-last-chat',
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index 8d440e297249..166f370bc634 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -201,6 +201,7 @@ export async function createContact(params: CreateContactParams): Promise<string
 		channels,
 		customFields,
 		unknown,
+		createdAt: new Date(),
 	});
 
 	return insertedId;
diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
index 17f21d8d7b04..1416ed8b028f 100644
--- a/apps/meteor/app/livechat/server/lib/Helper.ts
+++ b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -85,7 +85,7 @@ export const createLivechatRoom = async <
 	);
 
 	const extraRoomInfo = await callbacks.run('livechat.beforeRoom', roomInfo, extraData);
-	const { _id, username, token, department: departmentId, status = 'online' } = guest;
+	const { _id, username, token, department: departmentId, status = 'online', contactId } = guest;
 	const newRoomAt = new Date();
 
 	const { activity } = guest;
@@ -109,6 +109,7 @@ export const createLivechatRoom = async <
 			username,
 			token,
 			status,
+			contactId,
 			...(activity?.length && { activity }),
 		},
 		cl: false,
diff --git a/apps/meteor/server/models/raw/LivechatContacts.ts b/apps/meteor/server/models/raw/LivechatContacts.ts
index 1036205d1539..a2697bdd810a 100644
--- a/apps/meteor/server/models/raw/LivechatContacts.ts
+++ b/apps/meteor/server/models/raw/LivechatContacts.ts
@@ -1,7 +1,7 @@
 import type { ILivechatContact, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { FindPaginated, ILivechatContactsModel } from '@rocket.chat/model-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import type { Collection, Db, RootFilterOperators, Filter, FindOptions, FindCursor, IndexDescription } from 'mongodb';
+import type { Collection, Db, RootFilterOperators, Filter, FindOptions, FindCursor, IndexDescription, UpdateResult } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -60,4 +60,8 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 			},
 		);
 	}
+
+	updateLastChatById(contactId: string, lastChat: ILivechatContact['lastChat']): Promise<UpdateResult> {
+		return this.updateOne({ _id: contactId }, { $set: { lastChat } });
+	}
 }
diff --git a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
index cfbae3db4872..5ea29db03f59 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -1,11 +1,11 @@
 import { faker } from '@faker-js/faker';
-import type { ILivechatAgent, IUser } from '@rocket.chat/core-typings';
+import type { ILivechatAgent, ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
 import { before, after, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';
-import { createAgent } from '../../../data/livechat/rooms';
+import { closeOmnichannelRoom, createAgent, createLivechatRoom, createVisitor, deleteVisitor } from '../../../data/livechat/rooms';
 import { removeAgent } from '../../../data/livechat/users';
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { createUser, deleteUser } from '../../../data/users.helper';
@@ -597,6 +597,7 @@ describe('LIVECHAT - contacts', () => {
 
 			expect(res.status).to.be.equal(200);
 			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact).to.have.property('createdAt');
 			expect(res.body.contact._id).to.be.equal(contactId);
 			expect(res.body.contact.name).to.be.equal(contact.name);
 			expect(res.body.contact.emails).to.be.deep.equal(contact.emails);
@@ -631,6 +632,40 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
 			expect(res.body.errorType).to.be.equal('invalid-params');
 		});
+
+		describe('Last Chat', () => {
+			let visitor: ILivechatVisitor;
+			let room: IOmnichannelRoom;
+
+			before(async () => {
+				visitor = await createVisitor();
+				room = await createLivechatRoom(visitor.token);
+			});
+
+			after(async () => {
+				await closeOmnichannelRoom(room._id);
+				await deleteVisitor(visitor._id);
+			});
+
+			it('should return the last chat', async () => {
+				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: visitor.contactId });
+
+				expect(res.status).to.be.equal(200);
+				expect(res.body).to.have.property('success', true);
+				expect(res.body.contact).to.have.property('lastChat');
+				expect(res.body.contact.lastChat).to.have.property('ts');
+				expect(res.body.contact.lastChat._id).to.be.equal(room._id);
+			});
+
+			it('should not return the last chat if contact never chatted', async () => {
+				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId });
+
+				expect(res.status).to.be.equal(200);
+				expect(res.body).to.have.property('success', true);
+				expect(res.body.contact).to.have.property('_id', contactId);
+				expect(res.body.contact).to.not.have.property('lastChat');
+			});
+		});
 	});
 
 	describe('[GET] omnichannel/contacts.search', () => {
diff --git a/packages/core-typings/src/ILivechatContact.ts b/packages/core-typings/src/ILivechatContact.ts
index 1e7bd4ff5399..d434493c3b99 100644
--- a/packages/core-typings/src/ILivechatContact.ts
+++ b/packages/core-typings/src/ILivechatContact.ts
@@ -22,4 +22,9 @@ export interface ILivechatContact extends IRocketChatRecord {
 	conflictingFields?: ILivechatContactConflictingField[];
 	customFields?: Record<string, string | unknown>;
 	channels?: ILivechatContactChannel[];
+	createdAt: Date;
+	lastChat?: {
+		_id: string;
+		ts: Date;
+	};
 }
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index 95f2836da1e7..8ef3fa838557 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -193,7 +193,7 @@ export interface IOmnichannelSourceFromApp extends IOmnichannelSource {
 
 export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featured' | 'broadcast'> {
 	t: 'l' | 'v';
-	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'activity'> & {
+	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'activity' | 'contactId'> & {
 		lastMessageTs?: Date;
 		phone?: string;
 	};
@@ -332,7 +332,7 @@ export interface IVoipRoom extends IOmnichannelGenericRoom {
 	queue: string;
 	// The ID assigned to the call (opaque ID)
 	callUniqueId?: string;
-	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token'> & { lastMessageTs?: Date; phone?: string };
+	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'contactId'> & { lastMessageTs?: Date; phone?: string };
 	// Outbound means the call was initiated from Rocket.Chat and vise versa
 	direction: 'inbound' | 'outbound';
 }
diff --git a/packages/model-typings/src/models/ILivechatContactsModel.ts b/packages/model-typings/src/models/ILivechatContactsModel.ts
index 9f7bc23e7c2c..8412adf11e91 100644
--- a/packages/model-typings/src/models/ILivechatContactsModel.ts
+++ b/packages/model-typings/src/models/ILivechatContactsModel.ts
@@ -1,9 +1,10 @@
 import type { ILivechatContact } from '@rocket.chat/core-typings';
-import type { FindCursor, FindOptions } from 'mongodb';
+import type { FindCursor, FindOptions, UpdateResult } from 'mongodb';
 
 import type { FindPaginated, IBaseModel } from './IBaseModel';
 
 export interface ILivechatContactsModel extends IBaseModel<ILivechatContact> {
 	updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact>;
 	findPaginatedContacts(searchText?: string, options?: FindOptions): FindPaginated<FindCursor<ILivechatContact>>;
+	updateLastChatById(contactId: string, lastChat: ILivechatContact['lastChat']): Promise<UpdateResult>;
 }

From bd5a5ff9e27e83d3ae073cd165b8fc787040caa1 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Fri, 11 Oct 2024 09:27:47 -0600
Subject: [PATCH 170/170] fix: Custom sounds not working when storage is set to
 filesystem (#33424)

---
 .changeset/seven-hotels-collect.md                       | 5 +++++
 .../app/custom-sounds/server/startup/custom-sounds.js    | 1 +
 apps/meteor/app/file/server/file.server.ts               | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/seven-hotels-collect.md

diff --git a/.changeset/seven-hotels-collect.md b/.changeset/seven-hotels-collect.md
new file mode 100644
index 000000000000..7eb22980d29f
--- /dev/null
+++ b/.changeset/seven-hotels-collect.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a problem with custom sounds causing files to not be playable when using filesystem storage.
diff --git a/apps/meteor/app/custom-sounds/server/startup/custom-sounds.js b/apps/meteor/app/custom-sounds/server/startup/custom-sounds.js
index 87d13f1deffd..2f4f77aa0bd2 100644
--- a/apps/meteor/app/custom-sounds/server/startup/custom-sounds.js
+++ b/apps/meteor/app/custom-sounds/server/startup/custom-sounds.js
@@ -76,6 +76,7 @@ Meteor.startup(() => {
 		} else {
 			res.setHeader('Last-Modified', new Date().toUTCString());
 		}
+
 		res.setHeader('Content-Type', file.contentType);
 		res.setHeader('Content-Length', file.length);
 
diff --git a/apps/meteor/app/file/server/file.server.ts b/apps/meteor/app/file/server/file.server.ts
index e0190d06a729..3d4f6cf02609 100644
--- a/apps/meteor/app/file/server/file.server.ts
+++ b/apps/meteor/app/file/server/file.server.ts
@@ -6,6 +6,7 @@ import stream from 'stream';
 
 import type { ObjectId } from 'bson';
 import { MongoInternals } from 'meteor/mongo';
+import mime from 'mime-type/with-db';
 import mkdirp from 'mkdirp';
 import type { GridFSBucketReadStream } from 'mongodb';
 import { GridFSBucket } from 'mongodb';
@@ -166,11 +167,13 @@ class FileSystem implements IRocketChatFileStore {
 			const rs = this.createReadStream(fileName);
 			return {
 				readStream: rs,
-				// contentType: file.contentType
+				// We currently don't store the content type of uploaded custom sounds when using
+				// The filesystem storage. We will use mime to infer its type from the extension.
+				contentType: (mime.lookup(fileName) as string) || 'application/octet-stream',
 				length: stat.size,
 			};
 		} catch (error1) {
-			//
+			console.error(error1);
 		}
 	}
 
@@ -197,7 +200,7 @@ class FileSystem implements IRocketChatFileStore {
 		try {
 			return await this.remove(fileName);
 		} catch (error1) {
-			//
+			console.error(error1);
 		}
 	}
 }